wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消防bug

Browse Source
This commit is contained in:
杨号敬 2024-12-25 14:42:59 +08:00
parent 482f53edc7
commit e5a0613584
2 changed files with 96 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
xiaofang/Assets/Scenes/Tmap 1.unity
View File

@ -155,11 +155,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_RootOrder
value: 36
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalPosition.x
value: -8.43
value: -26.3
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalPosition.y
@ -167,23 +167,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalPosition.z
value: 32.59
value: -18.55
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.71520156
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0.69891834
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -191,7 +191,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: -88.681
objectReference: {fileID: 0}
- target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@ -2838,52 +2838,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2368487730057768969, guid: f7325740e682bf04a909abba74479379, type: 3}
m_PrefabInstance: {fileID: 88234507}
m_PrefabAsset: {fileID: 0}
--- !u!1 &88833288
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 88833290}
- component: {fileID: 88833289}
m_Layer: 0
m_Name: BurstCollisionWorld
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &88833289
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 88833288}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
m_Name:
m_EditorClassIdentifier:
cellSpans:
m_AlignBytes: 16
--- !u!4 &88833290
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 88833288}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 38
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &88925463
MeshCollider:
m_ObjectHideFlags: 0
@ -5432,7 +5386,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3}
propertyPath: m_LocalPosition.x
@ -6249,7 +6203,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &159663861
PrefabInstance:
@ -8235,7 +8189,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &339719735
MeshCollider:
@ -8731,7 +8685,7 @@ Transform:
- {fileID: 272025130}
- {fileID: 1600741273}
m_Father: {fileID: 0}
m_RootOrder: 32
m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &382802813
BoxCollider:
@ -10447,7 +10401,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 466450965}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -16.46, y: -3.617, z: -0.118}
m_LocalPosition: {x: -15.603, y: -3.975, z: -0.207}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -10498,7 +10452,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 29
m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &479940076
MonoBehaviour:
@ -11077,7 +11031,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &530412951
GameObject:
@ -11808,7 +11762,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 22
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &583497863
PrefabInstance:
@ -12787,7 +12741,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 26
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &673038100
PrefabInstance:
@ -13069,7 +13023,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 33
m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &702577176
MonoBehaviour:
@ -13292,7 +13246,7 @@ Transform:
- {fileID: 1973166535}
- {fileID: 1629676686}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &713484458
MeshCollider:
@ -13560,7 +13514,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
propertyPath: m_RootOrder
value: 17
value: 18
objectReference: {fileID: 0}
- target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
propertyPath: m_LocalPosition.x
@ -14424,7 +14378,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 28
m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &810501282
MonoBehaviour:
@ -14500,6 +14454,52 @@ Transform:
m_CorrespondingSourceObject: {fileID: 426926, guid: 363867a985f1ea248acb7ce0fb14b296, type: 3}
m_PrefabInstance: {fileID: 825899810}
m_PrefabAsset: {fileID: 0}
--- !u!1 &826696725
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 826696727}
- component: {fileID: 826696726}
m_Layer: 0
m_Name: BurstCollisionWorld
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &826696726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 826696725}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
m_Name:
m_EditorClassIdentifier:
cellSpans:
m_AlignBytes: 16
--- !u!4 &826696727
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 826696725}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 38
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &827349627
PrefabInstance:
m_ObjectHideFlags: 0
@ -14849,7 +14849,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &860755619
PrefabInstance:
@ -16266,7 +16266,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &984914341
PrefabInstance:
@ -16433,7 +16433,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 20
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &996888830
MonoBehaviour:
@ -17059,7 +17059,7 @@ RectTransform:
- {fileID: 491544196}
- {fileID: 1375880035}
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -20693,7 +20693,7 @@ Transform:
- {fileID: 496425325}
- {fileID: 1670656697}
m_Father: {fileID: 0}
m_RootOrder: 34
m_RootOrder: 35
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1298227765
GameObject:
@ -23170,7 +23170,7 @@ Transform:
- {fileID: 1882199187}
- {fileID: 119116319}
m_Father: {fileID: 0}
m_RootOrder: 30
m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &1453694928
MeshCollider:
@ -24533,7 +24533,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 27
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1480398099
PrefabInstance:
@ -24634,7 +24634,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 25
m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1481704192
PrefabInstance:
@ -25587,7 +25587,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1516610548
GameObject:
@ -25815,7 +25815,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 31
m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1526740603
MonoBehaviour:
@ -30222,7 +30222,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalPosition.x
value: -9.029114
value: -26.899113
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalPosition.y
@ -30230,27 +30230,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalPosition.z
value: 32.63
value: -18.509998
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalRotation.w
value: 0.07548644
value: 0.54537386
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalRotation.x
value: -0.07548641
value: -0.54537386
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7030661
value: 0.45007482
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalRotation.z
value: 0.70306593
value: 0.45007482
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
value: -89.98
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
@ -30258,7 +30258,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 167.744
value: 79.063
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3}
propertyPath: m_Materials.Array.data[0]
@ -30935,7 +30935,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 24
m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1912789160
PrefabInstance:
@ -32724,7 +32724,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 21
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &2069562217
MeshCollider:
@ -33935,7 +33935,7 @@ Transform:
- {fileID: 2112013849}
- {fileID: 125672022}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &119908498058829656
MeshFilter:
@ -34460,7 +34460,7 @@ Transform:
- {fileID: 6100007915572801067}
- {fileID: 2865482816726376136}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &555576767404427943
MeshRenderer:
@ -36701,7 +36701,7 @@ Transform:
m_Children:
- {fileID: 2057924365034160257}
m_Father: {fileID: 0}
m_RootOrder: 35
m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2057924365745864529
MonoBehaviour:
@ -38054,7 +38054,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -72.8, y: 26.2}
m_AnchoredPosition: {x: -72.8, y: -17}
m_SizeDelta: {x: 32, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2613237551621799913
@ -38761,7 +38761,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 63.993, y: 26.3}
m_AnchoredPosition: {x: 63.993, y: -16.899952}
m_SizeDelta: {x: 231.37, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2613237552207917863
@ -40581,7 +40581,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
propertyPath: m_RootOrder
value: 19
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
propertyPath: m_LocalPosition.x
@ -45849,7 +45849,7 @@ PrefabInstance:
objectReference: {fileID: 1493242969}
- target: {fileID: 8479287258615548071, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 8479287258615548071, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3}
propertyPath: m_LocalPosition.x

3
xiaofang/Assets/Script/Character/Skills/UseSkill.cs
View File

@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.EventSystems;
/*
* 使用技能，需要人物身上有动画控制脚本
@ -144,7 +145,7 @@ public class UseSkill : MonoBehaviour
}
if (Input.GetMouseButtonUp(0))
if (Input.GetMouseButtonUp(0) && EventSystem.current.IsPointerOverGameObject())
{
IsWater = false;
_skill_Watering.StopWatering(currentItem);