diff --git a/xiaofang/Assets/Resources/Ain/操作.fbx b/xiaofang/Assets/Resources/Ain/操作.fbx new file mode 100644 index 00000000..8a40e7a8 Binary files /dev/null and b/xiaofang/Assets/Resources/Ain/操作.fbx differ diff --git a/xiaofang/Assets/Resources/Ain/操作.fbx.meta b/xiaofang/Assets/Resources/Ain/操作.fbx.meta new file mode 100644 index 00000000..ad3a05e8 --- /dev/null +++ b/xiaofang/Assets/Resources/Ain/操作.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: cc4620b993709984793494741d531e79 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/Ain/操作失败.fbx b/xiaofang/Assets/Resources/Ain/操作失败.fbx new file mode 100644 index 00000000..c988823c Binary files /dev/null and b/xiaofang/Assets/Resources/Ain/操作失败.fbx differ diff --git a/xiaofang/Assets/Resources/Ain/操作失败.fbx.meta b/xiaofang/Assets/Resources/Ain/操作失败.fbx.meta new file mode 100644 index 00000000..ec5be028 --- /dev/null +++ b/xiaofang/Assets/Resources/Ain/操作失败.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: fb297f1762aafba40998bbfdce00eca8 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/Ain/救护.fbx b/xiaofang/Assets/Resources/Ain/救护.fbx new file mode 100644 index 00000000..d100d6ba Binary files /dev/null and b/xiaofang/Assets/Resources/Ain/救护.fbx differ diff --git a/xiaofang/Assets/Resources/Ain/救护.fbx.meta b/xiaofang/Assets/Resources/Ain/救护.fbx.meta new file mode 100644 index 00000000..75cf2255 --- /dev/null +++ b/xiaofang/Assets/Resources/Ain/救护.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 633d22694a56af94498196bf0853dab9 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Scenes/firetest.unity b/xiaofang/Assets/Scenes/firetest.unity index ed1e885d..40385f88 100644 --- a/xiaofang/Assets/Scenes/firetest.unity +++ b/xiaofang/Assets/Scenes/firetest.unity @@ -3039,6 +3039,8 @@ GameObject: m_Component: - component: {fileID: 1594313789} - component: {fileID: 1594313790} + - component: {fileID: 1594313792} + - component: {fileID: 1594313791} m_Layer: 0 m_Name: GameObject m_TagString: Untagged @@ -3080,6 +3082,32 @@ MonoBehaviour: spreadRadius: 3 windDirection: 0 SpreadFireNumber: 3 +--- !u!135 &1594313791 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594313788} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 3 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1594313792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594313788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f4189fe310885b45b10fb435499ae64, type: 3} + m_Name: + m_EditorClassIdentifier: + extinguishTime: 3 --- !u!1001 &1660298594 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Script/Item/Fire.cs b/xiaofang/Assets/Script/Item/Fire.cs index ce8d8965..16279b18 100644 --- a/xiaofang/Assets/Script/Item/Fire.cs +++ b/xiaofang/Assets/Script/Item/Fire.cs @@ -13,10 +13,15 @@ public class Fire : MonoBehaviour private CharacterControl characterControl;//ҿ void Start() { - FireEffect = transform.Find("FireEffect").gameObject; + //FireEffect = transform.Find("FireEffect").gameObject; } + public void SetFire(GameObject fire) + { + FireEffect = fire; + } + void Update() { // ǷڷΧҰס "E" diff --git a/xiaofang/Assets/Script/Item/Firelive.cs b/xiaofang/Assets/Script/Item/Firelive.cs index 0bb25249..e9d34dc3 100644 --- a/xiaofang/Assets/Script/Item/Firelive.cs +++ b/xiaofang/Assets/Script/Item/Firelive.cs @@ -60,7 +60,8 @@ public class Firelive : MonoBehaviour isBurning = true; // ʼposλСԤ - currentFire = Instantiate(minfire, transform.position, Quaternion.identity); + currentFire = Instantiate(minfire, transform.position, Quaternion.identity); + transform.GetComponent().SetFire(currentFire); } } @@ -72,6 +73,7 @@ public class Firelive : MonoBehaviour Destroy(currentFire); currentFire=Instantiate(bigfire, transform.position, Quaternion.identity); Canbig = false; + transform.GetComponent().SetFire(currentFire); StartCoroutine(DelayedSpread()); } diff --git a/xiaofang/Assets/Script/npc/DiStributionbox.cs b/xiaofang/Assets/Script/npc/DiStributionbox.cs index cc095085..26825aac 100644 --- a/xiaofang/Assets/Script/npc/DiStributionbox.cs +++ b/xiaofang/Assets/Script/npc/DiStributionbox.cs @@ -6,7 +6,7 @@ public class DiStributionbox : MonoBehaviour { private Button disbtn; // Start is called before the first frame update - void Start() + void AWake() { disbtn = GameObject.Find("Canvas/Distribution box").GetComponent