From 498174a1a50b8c22e2b225add2f6d0e52cb0c8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8F=B7=E6=95=AC?= <153802103@qq.com> Date: Tue, 17 Dec 2024 17:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E7=81=AD=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Particles/VFX_Fire_01_Big.prefab | 6 + xiaofang/Assets/Scenes/Tmap 1.unity | 358 ++++++++++-------- xiaofang/Assets/Script/Item/Fire.cs | 13 +- xiaofang/Assets/Script/XFS.cs | 4 + 4 files changed, 211 insertions(+), 170 deletions(-) diff --git a/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab b/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab index 334a06ef..a21069ea 100644 --- a/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab +++ b/xiaofang/Assets/NatureManufacture Assets/Fire and Smoke Particles/Prefabs/Free Fire VFX/Particles/VFX_Fire_01_Big.prefab @@ -38841,6 +38841,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: extinguishTime: 3 + fireHurt: 10 + dis: 0 + maxfiredis: 2 + firedis: 20 + ps: {fileID: 0} + us: {fileID: 0} --- !u!135 &5825030608256766515 SphereCollider: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index 2e686d97..d72b0f80 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -3697,7 +3697,7 @@ MonoBehaviour: point2: {fileID: 0} point2Dir: {x: 0, y: 1, z: 0} update: 1 - mesh: {fileID: 1933848870} + mesh: {fileID: 1797554496} --- !u!65 &272591052 BoxCollider: m_ObjectHideFlags: 0 @@ -3760,7 +3760,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272591050} - m_Mesh: {fileID: 1933848870} + m_Mesh: {fileID: 1797554496} --- !u!4 &272591055 Transform: m_ObjectHideFlags: 0 @@ -19472,7 +19472,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1402647585} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6d461a5fb54d89b4f8e206a82b5c033c, type: 3} m_Name: @@ -19485,6 +19485,8 @@ MonoBehaviour: XFsTransform: {fileID: 1604673292} ShuiguanGameObject: {fileID: 272591050} firewater: {fileID: 8607906409360804035, guid: b5be25eadef55294691fff85129cc656, type: 3} + water: {fileID: 0} + IShavewater: 0 --- !u!1001 &1402705621 PrefabInstance: m_ObjectHideFlags: 0 @@ -24709,6 +24711,170 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4992915516971869870, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3} +--- !u!43 &1797554496 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pipe + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 0 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 0 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1805548635 PrefabInstance: m_ObjectHideFlags: 0 @@ -25356,6 +25522,28 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: xfs: {fileID: 1402647585} +--- !u!114 &1855712074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855712066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d461a5fb54d89b4f8e206a82b5c033c, type: 3} + m_Name: + m_EditorClassIdentifier: + ConnectGun: {fileID: 947202401} + ConnectFa: {fileID: 1301153375} + OpenFa: {fileID: 1039752002} + Gun: {fileID: 919132149155446097, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} + Hand: {fileID: 1036449735} + XFsTransform: {fileID: 1604673292} + ShuiguanGameObject: {fileID: 272591050} + firewater: {fileID: 8607906409360804035, guid: b5be25eadef55294691fff85129cc656, type: 3} + water: {fileID: 0} + IShavewater: 0 --- !u!1001 &1875190416 PrefabInstance: m_ObjectHideFlags: 0 @@ -25827,170 +26015,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 431404, guid: 406416920addf5d408961e0385a837f5, type: 3} m_PrefabInstance: {fileID: 1912789160} m_PrefabAsset: {fileID: 0} ---- !u!43 &1933848870 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Pipe - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 0 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 0 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: - m_VertexData: - serializedVersion: 3 - m_VertexCount: 0 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 0 - _typelessdata: - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1948499801 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/xiaofang/Assets/Script/Item/Fire.cs b/xiaofang/Assets/Script/Item/Fire.cs index 1d27c475..65ec710b 100644 --- a/xiaofang/Assets/Script/Item/Fire.cs +++ b/xiaofang/Assets/Script/Item/Fire.cs @@ -20,7 +20,7 @@ public class Fire : MonoBehaviour public float dis; public float maxfiredis = 2f; - public float firedis = 4f; + public float firedis = 20f; public PlayerState ps; @@ -42,7 +42,10 @@ public class Fire : MonoBehaviour HurtPeople(); - + if (XFS.instance.IShavewater) + { + MieFire(); + } if (us.currentItem == null) { return; @@ -107,7 +110,10 @@ public class Fire : MonoBehaviour { // 计算玩家与火源的距离 dis = Vector3.Distance(GameObject.Find("player").transform.position, this.transform.position); - + if (XFS.instance.IShavewater) + { + XFS.instance.water.SetActive(true); + } // 如果玩家距离火源足够近且按下鼠标左键才触发灭火 if (dis <= firedis) { @@ -123,6 +129,7 @@ public class Fire : MonoBehaviour // 如果玩家按住键达到指定时间，停止火焰 StopFire(); isExtinguishing = true; // 防止重复触发灭火 + XFS.instance.water.SetActive(false); } } } diff --git a/xiaofang/Assets/Script/XFS.cs b/xiaofang/Assets/Script/XFS.cs index 148261d5..30286d66 100644 --- a/xiaofang/Assets/Script/XFS.cs +++ b/xiaofang/Assets/Script/XFS.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using UnityEditor.Build; using UnityEngine; using UnityEngine.UI; @@ -17,6 +18,7 @@ public class XFS : MonoBehaviour private GameObject gun; public GameObject firewater; public GameObject water; + public bool IShavewater=false; void Start() { instance=this; @@ -47,6 +49,8 @@ public class XFS : MonoBehaviour water.transform.SetParent(gun.transform); water.transform.localPosition = new Vector3(0, 0, 0); water.transform.localRotation = new Quaternion(0, 180, 0, 0); + water.SetActive(false); + IShavewater = true; } // Update is called once per frame void Update()