From e1eca313c71ac6da78e76a9d4b643258ffbb525a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8F=B7=E6=95=AC?= <153802103@qq.com> Date: Fri, 27 Dec 2024 17:43:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=98=B2=E6=A0=93=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaofang/Assets/Scenes/Tmap 1.unity | 1588 ++--------------- .../Script/Character/Skills/Skill_Pick.cs | 14 +- .../Script/Character/Skills/Skill_watering.cs | 8 +- .../Script/Character/Skills/UseSkill.cs | 19 +- xiaofang/Assets/Script/Item/Fire.cs | 16 +- xiaofang/Assets/Script/Item/NoFire.cs | 4 + xiaofang/Assets/Script/XFS.cs | 9 +- xiaofang/Assets/Script/watergun.cs | 20 + xiaofang/Assets/Script/watergun.cs.meta | 11 + 9 files changed, 234 insertions(+), 1455 deletions(-) create mode 100644 xiaofang/Assets/Script/watergun.cs create mode 100644 xiaofang/Assets/Script/watergun.cs.meta diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index c6704b6c..a5f66e3a 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -127,7 +127,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1855712068} m_Modifications: - target: {fileID: 7256832922758735076, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_Name @@ -155,35 +155,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_RootOrder - value: 7 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalPosition.x - value: -27.56 + value: -0.63423073 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalPosition.y - value: -2.4 + value: -0.6481986 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalPosition.z - value: -17.915 + value: -3.3350005 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.w - value: 0.71317947 + value: 0.552457 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.x - value: -0.052518964 + value: 0.47660446 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.y - value: -0.6969423 + value: -0.44490138 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalRotation.z - value: -0.053742543 + value: -0.51932853 objectReference: {fileID: 0} - target: {fileID: 7256832922758735078, guid: 2b6da6cb0c6edad4eb364a43fc9035cd, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4770,7 +4770,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3} propertyPath: m_LocalPosition.x @@ -5646,7 +5646,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &159663861 PrefabInstance: @@ -6041,7 +6041,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &191232456 MeshCollider: @@ -7393,7 +7393,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 44 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &295391225 MeshCollider: @@ -8099,7 +8099,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &339719735 MeshCollider: @@ -8596,7 +8596,7 @@ Transform: - {fileID: 272025130} - {fileID: 1600741273} m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &382802813 BoxCollider: @@ -8684,6 +8684,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: currentItem: {fileID: 0} + Xfs: {fileID: 0} _skill_Pick: {fileID: 0} _skill_Jump: {fileID: 0} _skill_Watering: {fileID: 0} @@ -8719,6 +8720,7 @@ MonoBehaviour: m_EditorClassIdentifier: CharacterAnimator: {fileID: 1948499803} player: {fileID: 382802812} + xfs: {fileID: 0} relativePosition: {x: 0, y: 0, z: 0} relativeRotation: {x: 0, y: 0, z: 0} pickUpRange: 2 @@ -10494,7 +10496,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &479940076 MonoBehaviour: @@ -11185,6 +11187,52 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 41 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &516405356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 516405358} + - component: {fileID: 516405357} + m_Layer: 0 + m_Name: BurstCollisionWorld + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &516405357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516405356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} + m_Name: + m_EditorClassIdentifier: + cellSpans: + m_AlignBytes: 16 +--- !u!4 &516405358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516405356} + 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: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &526829806 @@ -11216,7 +11264,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &530412951 GameObject: @@ -11947,7 +11995,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &583497863 PrefabInstance: @@ -13044,7 +13092,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &673038100 PrefabInstance: @@ -13472,7 +13520,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3} propertyPath: m_AnchorMax.x @@ -13610,7 +13658,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 39 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &702577176 MonoBehaviour: @@ -13833,7 +13881,7 @@ Transform: - {fileID: 1973166535} - {fileID: 1629676686} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &712846462 GameObject: @@ -14160,7 +14208,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3} propertyPath: m_RootOrder - value: 23 + value: 22 objectReference: {fileID: 0} - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3} propertyPath: m_LocalPosition.x @@ -15024,7 +15072,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &810501282 MonoBehaviour: @@ -15449,7 +15497,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &860755619 PrefabInstance: @@ -17327,7 +17375,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &984064307 MonoBehaviour: @@ -17509,7 +17557,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &996888830 MonoBehaviour: @@ -18129,7 +18177,7 @@ RectTransform: - {fileID: 491544196} - {fileID: 1375880035} m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -21911,7 +21959,7 @@ Transform: - {fileID: 496425325} - {fileID: 1670656697} m_Father: {fileID: 0} - m_RootOrder: 40 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1298227765 GameObject: @@ -23479,7 +23527,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1402647586} - - component: {fileID: 1402647587} m_Layer: 5 m_Name: xfs m_TagString: Untagged @@ -23511,30 +23558,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1402647587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1402647585} - m_Enabled: 0 - 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: 0} - firewater: {fileID: 8607906409360804035, guid: b5be25eadef55294691fff85129cc656, type: 3} - water: {fileID: 0} - IShavewater: 0 - CharacterControl: {fileID: 0} - UseSkill: {fileID: 0} --- !u!1001 &1402705621 PrefabInstance: m_ObjectHideFlags: 0 @@ -24448,7 +24471,7 @@ Transform: - {fileID: 1882199187} - {fileID: 119116319} m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1453694928 MeshCollider: @@ -24856,7 +24879,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1474431325 GameObject: @@ -25037,7 +25060,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1481704192 PrefabInstance: @@ -25991,7 +26014,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1516610548 GameObject: @@ -26219,7 +26242,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 37 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1526740603 MonoBehaviour: @@ -26283,6 +26306,19 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ffc8f56811d7ca145812ba1f6a4be23a, type: 3} m_PrefabInstance: {fileID: 1893189251} m_PrefabAsset: {fileID: 0} +--- !u!114 &1528375188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1528375180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ee3f53d86720f249a148ad9823e0198, type: 3} + m_Name: + m_EditorClassIdentifier: + Xfs: {fileID: 0} --- !u!1001 &1542437476 PrefabInstance: m_ObjectHideFlags: 0 @@ -28098,7 +28134,7 @@ Transform: - {fileID: 58543477} - {fileID: 712846463} m_Father: {fileID: 0} - m_RootOrder: 42 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1670656696 GameObject: @@ -29985,52 +30021,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6160620039382372331, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3} ---- !u!1 &1787594730 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1787594732} - - component: {fileID: 1787594731} - m_Layer: 0 - m_Name: BurstCollisionWorld - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1787594731 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1787594730} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} - m_Name: - m_EditorClassIdentifier: - cellSpans: - m_AlignBytes: 16 ---- !u!4 &1787594732 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1787594730} - 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: 45 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1788785149 PrefabInstance: m_ObjectHideFlags: 0 @@ -30742,6 +30732,10 @@ PrefabInstance: propertyPath: m_Name value: KitchenFurniture03_2 objectReference: {fileID: 0} + - target: {fileID: 118614, guid: a9044b2d354aee04d88bdc91d8a7f9fb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 406788, guid: a9044b2d354aee04d88bdc91d8a7f9fb, type: 3} propertyPath: m_RootOrder value: 0 @@ -30820,7 +30814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalPosition.x - value: -26.899113 + value: -26.48 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalPosition.y @@ -30828,7 +30822,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalPosition.z - value: -18.536 + value: -9.53 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalRotation.w @@ -31592,7 +31586,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1912094932 GameObject: @@ -33456,99 +33450,99 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 221.01604 objectReference: {fileID: 0} - target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -85.8292 objectReference: {fileID: 0} - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 368.36008 objectReference: {fileID: 0} - target: {fileID: 948396698140814702, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -85.8292 objectReference: {fileID: 0} - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 73.67201 objectReference: {fileID: 0} - target: {fileID: 948396698298198961, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -85.8292 objectReference: {fileID: 0} - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 73.67201 objectReference: {fileID: 0} - target: {fileID: 948396698323786033, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -85.8292 objectReference: {fileID: 0} - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 368.36008 objectReference: {fileID: 0} - target: {fileID: 948396698339676344, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -85.8292 objectReference: {fileID: 0} - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 221.01604 objectReference: {fileID: 0} - target: {fileID: 948396699256012633, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -85.8292 objectReference: {fileID: 0} - target: {fileID: 1890959325714470828, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y @@ -33572,7 +33566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_RootOrder - value: 22 + value: 21 objectReference: {fileID: 0} - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.x @@ -33652,7 +33646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1986279549173157415, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1986279549232645831, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive @@ -33668,51 +33662,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 5824380172705816005, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -175 objectReference: {fileID: 0} - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 6164110187781327644, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -245 objectReference: {fileID: 0} - target: {fileID: 6389238419783627009, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_IsActive @@ -33728,51 +33722,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 8544101838369953969, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 220 objectReference: {fileID: 0} - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 110 objectReference: {fileID: 0} - target: {fileID: 8618474577547420637, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -105 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3} @@ -33991,7 +33985,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &2069562217 MeshCollider: @@ -35497,7 +35491,7 @@ Transform: - {fileID: 2112013849} - {fileID: 125672022} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &119908498058829656 MeshFilter: @@ -36022,7 +36016,7 @@ Transform: - {fileID: 6100007915572801067} - {fileID: 2865482816726376136} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &555576767404427943 MeshRenderer: @@ -39338,1264 +39332,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &2057924365034160256 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2057924365034160257} - - component: {fileID: 2057924365034160267} - - component: {fileID: 2057924365034160266} - - component: {fileID: 2057924365034160261} - - component: {fileID: 2057924365034160260} - - component: {fileID: 2057924365034160263} - - component: {fileID: 2057924365034160262} - m_Layer: 0 - m_Name: Obi Rod - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2057924365034160257 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.039, y: 2.82, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2057924365745864528} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2057924365034160260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c4747da60837c44f9ba4b4a86879bcc8, type: 3} - m_Name: - m_EditorClassIdentifier: - material: {fileID: 2100000, guid: 9bc0d93bc33e445c7a765578064cdd1e, type: 2} - renderParameters: - layer: 0 - lightProbeUsage: 1 - reflectionProbeUsage: 1 - shadowCastingMode: 1 - receiveShadows: 1 - motionVectors: 0 - renderingLayerMask: 4294967295 - uvAnchor: 0 - uvScale: {x: 1, y: 6} - normalizeV: 1 - section: {fileID: 11400000, guid: a0bc36a59515f413e90e10895929c938, type: 2} - thicknessScale: 0.8 ---- !u!114 &2057924365034160261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 958c969cfb16745f192d4d7bd28b7178, type: 3} - m_Name: - m_EditorClassIdentifier: - decimation: 0 - smoothing: 0 - twist: 0 - indexInSystem: 0 ---- !u!114 &2057924365034160262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d03c9194b7ab4aaba4dfa5afec22c69, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actor: {fileID: 2057924365034160266} - m_Target: {fileID: 0} - m_ParticleGroup: {fileID: -8261457959914663000, guid: 3e9b6c4ac1880bb439e8b82f09a5435d, type: 2} - m_AttachmentType: 0 - m_ConstrainOrientation: 1 - m_Compliance: 0 - m_BreakThreshold: Infinity ---- !u!114 &2057924365034160263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d03c9194b7ab4aaba4dfa5afec22c69, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actor: {fileID: 2057924365034160266} - m_Target: {fileID: 0} - m_ParticleGroup: {fileID: -5495592170153411203, guid: 3e9b6c4ac1880bb439e8b82f09a5435d, type: 2} - m_AttachmentType: 0 - m_ConstrainOrientation: 1 - m_Compliance: 0 - m_BreakThreshold: Infinity ---- !u!114 &2057924365034160266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8f2bc32c4faf04f039a86a6e3cea12a1, type: 3} - m_Name: - m_EditorClassIdentifier: - solverIndices: - serializedContents: - m_AlignBytes: 16 - groupID: 1 - m_CollisionMaterial: {fileID: 0} - m_SurfaceCollisions: 0 - m_SelfCollisions: 1 - restLength_: 17.214445 - elements: - - particle1: 0 - particle2: 1 - restLength: 0.09789419 - constraintForce: 0 - tearResistance: 0 - - particle1: 1 - particle2: 2 - restLength: 0.098410845 - constraintForce: 0 - tearResistance: 0 - - particle1: 2 - particle2: 3 - restLength: 0.09929651 - constraintForce: 0 - tearResistance: 0 - - particle1: 3 - particle2: 4 - restLength: 0.097801924 - constraintForce: 0 - tearResistance: 0 - - particle1: 4 - particle2: 5 - restLength: 0.09856528 - constraintForce: 0 - tearResistance: 0 - - particle1: 5 - particle2: 6 - restLength: 0.098728865 - constraintForce: 0 - tearResistance: 0 - - particle1: 6 - particle2: 7 - restLength: 0.098651856 - constraintForce: 0 - tearResistance: 0 - - particle1: 7 - particle2: 8 - restLength: 0.09852964 - constraintForce: 0 - tearResistance: 0 - - particle1: 8 - particle2: 9 - restLength: 0.09844952 - constraintForce: 0 - tearResistance: 0 - - particle1: 9 - particle2: 10 - restLength: 0.098445304 - constraintForce: 0 - tearResistance: 0 - - particle1: 10 - particle2: 11 - restLength: 0.09852525 - constraintForce: 0 - tearResistance: 0 - - particle1: 11 - particle2: 12 - restLength: 0.09868512 - constraintForce: 0 - tearResistance: 0 - - particle1: 12 - particle2: 13 - restLength: 0.09891513 - constraintForce: 0 - tearResistance: 0 - - particle1: 13 - particle2: 14 - restLength: 0.09837115 - constraintForce: 0 - tearResistance: 0 - - particle1: 14 - particle2: 15 - restLength: 0.098275185 - constraintForce: 0 - tearResistance: 0 - - particle1: 15 - particle2: 16 - restLength: 0.09865239 - constraintForce: 0 - tearResistance: 0 - - particle1: 16 - particle2: 17 - restLength: 0.09906906 - constraintForce: 0 - tearResistance: 0 - - particle1: 17 - particle2: 18 - restLength: 0.09099108 - constraintForce: 0 - tearResistance: 0 - - particle1: 18 - particle2: 19 - restLength: 0.09106356 - constraintForce: 0 - tearResistance: 0 - - particle1: 19 - particle2: 20 - restLength: 0.09099972 - constraintForce: 0 - tearResistance: 0 - - particle1: 20 - particle2: 21 - restLength: 0.09103656 - constraintForce: 0 - tearResistance: 0 - - particle1: 21 - particle2: 22 - restLength: 0.091048956 - constraintForce: 0 - tearResistance: 0 - - particle1: 22 - particle2: 23 - restLength: 0.09100628 - constraintForce: 0 - tearResistance: 0 - - particle1: 23 - particle2: 24 - restLength: 0.09102845 - constraintForce: 0 - tearResistance: 0 - - particle1: 24 - particle2: 25 - restLength: 0.091042876 - constraintForce: 0 - tearResistance: 0 - - particle1: 25 - particle2: 26 - restLength: 0.09105003 - constraintForce: 0 - tearResistance: 0 - - particle1: 26 - particle2: 27 - restLength: 0.096052885 - constraintForce: 0 - tearResistance: 0 - - particle1: 27 - particle2: 28 - restLength: 0.09609556 - constraintForce: 0 - tearResistance: 0 - - particle1: 28 - particle2: 29 - restLength: 0.09607279 - constraintForce: 0 - tearResistance: 0 - - particle1: 29 - particle2: 30 - restLength: 0.09607613 - constraintForce: 0 - tearResistance: 0 - - particle1: 30 - particle2: 31 - restLength: 0.09609997 - constraintForce: 0 - tearResistance: 0 - - particle1: 31 - particle2: 32 - restLength: 0.09606755 - constraintForce: 0 - tearResistance: 0 - - particle1: 32 - particle2: 33 - restLength: 0.09607458 - constraintForce: 0 - tearResistance: 0 - - particle1: 33 - particle2: 34 - restLength: 0.09608817 - constraintForce: 0 - tearResistance: 0 - - particle1: 34 - particle2: 35 - restLength: 0.09609771 - constraintForce: 0 - tearResistance: 0 - - particle1: 35 - particle2: 36 - restLength: 0.092900515 - constraintForce: 0 - tearResistance: 0 - - particle1: 36 - particle2: 37 - restLength: 0.09290719 - constraintForce: 0 - tearResistance: 0 - - particle1: 37 - particle2: 38 - restLength: 0.09291172 - constraintForce: 0 - tearResistance: 0 - - particle1: 38 - particle2: 39 - restLength: 0.09291434 - constraintForce: 0 - tearResistance: 0 - - particle1: 39 - particle2: 40 - restLength: 0.09291625 - constraintForce: 0 - tearResistance: 0 - - particle1: 40 - particle2: 41 - restLength: 0.092917204 - constraintForce: 0 - tearResistance: 0 - - particle1: 41 - particle2: 42 - restLength: 0.09291744 - constraintForce: 0 - tearResistance: 0 - - particle1: 42 - particle2: 43 - restLength: 0.09291744 - constraintForce: 0 - tearResistance: 0 - - particle1: 43 - particle2: 44 - restLength: 0.09291601 - constraintForce: 0 - tearResistance: 0 - - particle1: 44 - particle2: 45 - restLength: 0.09291577 - constraintForce: 0 - tearResistance: 0 - - particle1: 45 - particle2: 46 - restLength: 0.098606825 - constraintForce: 0 - tearResistance: 0 - - particle1: 46 - particle2: 47 - restLength: 0.098641634 - constraintForce: 0 - tearResistance: 0 - - particle1: 47 - particle2: 48 - restLength: 0.098670244 - constraintForce: 0 - tearResistance: 0 - - particle1: 48 - particle2: 49 - restLength: 0.09865403 - constraintForce: 0 - tearResistance: 0 - - particle1: 49 - particle2: 50 - restLength: 0.09862447 - constraintForce: 0 - tearResistance: 0 - - particle1: 50 - particle2: 51 - restLength: 0.09864807 - constraintForce: 0 - tearResistance: 0 - - particle1: 51 - particle2: 52 - restLength: 0.098670006 - constraintForce: 0 - tearResistance: 0 - - particle1: 52 - particle2: 53 - restLength: 0.09865165 - constraintForce: 0 - tearResistance: 0 - - particle1: 53 - particle2: 54 - restLength: 0.09862852 - constraintForce: 0 - tearResistance: 0 - - particle1: 54 - particle2: 55 - restLength: 0.09864521 - constraintForce: 0 - tearResistance: 0 - - particle1: 55 - particle2: 56 - restLength: 0.098659515 - constraintForce: 0 - tearResistance: 0 - - particle1: 56 - particle2: 57 - restLength: 0.09867334 - constraintForce: 0 - tearResistance: 0 - - particle1: 57 - particle2: 58 - restLength: 0.09862518 - constraintForce: 0 - tearResistance: 0 - - particle1: 58 - particle2: 59 - restLength: 0.09863758 - constraintForce: 0 - tearResistance: 0 - - particle1: 59 - particle2: 60 - restLength: 0.09864998 - constraintForce: 0 - tearResistance: 0 - - particle1: 60 - particle2: 61 - restLength: 0.09865999 - constraintForce: 0 - tearResistance: 0 - - particle1: 61 - particle2: 62 - restLength: 0.09866667 - constraintForce: 0 - tearResistance: 0 - - particle1: 62 - particle2: 63 - restLength: 0.096058846 - constraintForce: 0 - tearResistance: 0 - - particle1: 63 - particle2: 64 - restLength: 0.09608984 - constraintForce: 0 - tearResistance: 0 - - particle1: 64 - particle2: 65 - restLength: 0.09606409 - constraintForce: 0 - tearResistance: 0 - - particle1: 65 - particle2: 66 - restLength: 0.09608698 - constraintForce: 0 - tearResistance: 0 - - particle1: 66 - particle2: 67 - restLength: 0.09606695 - constraintForce: 0 - tearResistance: 0 - - particle1: 67 - particle2: 68 - restLength: 0.09608507 - constraintForce: 0 - tearResistance: 0 - - particle1: 68 - particle2: 69 - restLength: 0.09606886 - constraintForce: 0 - tearResistance: 0 - - particle1: 69 - particle2: 70 - restLength: 0.09608412 - constraintForce: 0 - tearResistance: 0 - - particle1: 70 - particle2: 71 - restLength: 0.09606886 - constraintForce: 0 - tearResistance: 0 - - particle1: 71 - particle2: 72 - restLength: 0.09608507 - constraintForce: 0 - tearResistance: 0 - - particle1: 72 - particle2: 73 - restLength: 0.09606838 - constraintForce: 0 - tearResistance: 0 - - particle1: 73 - particle2: 74 - restLength: 0.09608507 - constraintForce: 0 - tearResistance: 0 - - particle1: 74 - particle2: 75 - restLength: 0.09606838 - constraintForce: 0 - tearResistance: 0 - - particle1: 75 - particle2: 76 - restLength: 0.09608507 - constraintForce: 0 - tearResistance: 0 - - particle1: 76 - particle2: 77 - restLength: 0.096166134 - constraintForce: 0 - tearResistance: 0 - - particle1: 77 - particle2: 78 - restLength: 0.09617329 - constraintForce: 0 - tearResistance: 0 - - particle1: 78 - particle2: 79 - restLength: 0.09617329 - constraintForce: 0 - tearResistance: 0 - - particle1: 79 - particle2: 80 - restLength: 0.09616947 - constraintForce: 0 - tearResistance: 0 - - particle1: 80 - particle2: 81 - restLength: 0.096175194 - constraintForce: 0 - tearResistance: 0 - - particle1: 81 - particle2: 82 - restLength: 0.096170425 - constraintForce: 0 - tearResistance: 0 - - particle1: 82 - particle2: 83 - restLength: 0.096171856 - constraintForce: 0 - tearResistance: 0 - - particle1: 83 - particle2: 84 - restLength: 0.096175194 - constraintForce: 0 - tearResistance: 0 - - particle1: 84 - particle2: 85 - restLength: 0.096168995 - constraintForce: 0 - tearResistance: 0 - - particle1: 85 - particle2: 86 - restLength: 0.09617281 - constraintForce: 0 - tearResistance: 0 - - particle1: 86 - particle2: 87 - restLength: 0.096171856 - constraintForce: 0 - tearResistance: 0 - - particle1: 87 - particle2: 88 - restLength: 0.09617233 - constraintForce: 0 - tearResistance: 0 - - particle1: 88 - particle2: 89 - restLength: 0.09617281 - constraintForce: 0 - tearResistance: 0 - - particle1: 89 - particle2: 90 - restLength: 0.09761906 - constraintForce: 0 - tearResistance: 0 - - particle1: 90 - particle2: 91 - restLength: 0.097622395 - constraintForce: 0 - tearResistance: 0 - - particle1: 91 - particle2: 92 - restLength: 0.09761953 - constraintForce: 0 - tearResistance: 0 - - particle1: 92 - particle2: 93 - restLength: 0.09762049 - constraintForce: 0 - tearResistance: 0 - - particle1: 93 - particle2: 94 - restLength: 0.09762049 - constraintForce: 0 - tearResistance: 0 - - particle1: 94 - particle2: 95 - restLength: 0.09762192 - constraintForce: 0 - tearResistance: 0 - - particle1: 95 - particle2: 96 - restLength: 0.09762001 - constraintForce: 0 - tearResistance: 0 - - particle1: 96 - particle2: 97 - restLength: 0.09761906 - constraintForce: 0 - tearResistance: 0 - - particle1: 97 - particle2: 98 - restLength: 0.0976181 - constraintForce: 0 - tearResistance: 0 - - particle1: 98 - particle2: 99 - restLength: 0.097616196 - constraintForce: 0 - tearResistance: 0 - - particle1: 99 - particle2: 100 - restLength: 0.09762287 - constraintForce: 0 - tearResistance: 0 - - particle1: 100 - particle2: 101 - restLength: 0.09762573 - constraintForce: 0 - tearResistance: 0 - - particle1: 101 - particle2: 102 - restLength: 0.097620964 - constraintForce: 0 - tearResistance: 0 - - particle1: 102 - particle2: 103 - restLength: 0.097620964 - constraintForce: 0 - tearResistance: 0 - - particle1: 103 - particle2: 104 - restLength: 0.09762192 - constraintForce: 0 - tearResistance: 0 - - particle1: 104 - particle2: 105 - restLength: 0.09762001 - constraintForce: 0 - tearResistance: 0 - - particle1: 105 - particle2: 106 - restLength: 0.097616196 - constraintForce: 0 - tearResistance: 0 - - particle1: 106 - particle2: 107 - restLength: 0.09761429 - constraintForce: 0 - tearResistance: 0 - - particle1: 107 - particle2: 108 - restLength: 0.09761047 - constraintForce: 0 - tearResistance: 0 - - particle1: 108 - particle2: 109 - restLength: 0.090880394 - constraintForce: 0 - tearResistance: 0 - - particle1: 109 - particle2: 110 - restLength: 0.09087658 - constraintForce: 0 - tearResistance: 0 - - particle1: 110 - particle2: 111 - restLength: 0.09087372 - constraintForce: 0 - tearResistance: 0 - - particle1: 111 - particle2: 112 - restLength: 0.09087753 - constraintForce: 0 - tearResistance: 0 - - particle1: 112 - particle2: 113 - restLength: 0.09087753 - constraintForce: 0 - tearResistance: 0 - - particle1: 113 - particle2: 114 - restLength: 0.09087086 - constraintForce: 0 - tearResistance: 0 - - particle1: 114 - particle2: 115 - restLength: 0.09088135 - constraintForce: 0 - tearResistance: 0 - - particle1: 115 - particle2: 116 - restLength: 0.090875626 - constraintForce: 0 - tearResistance: 0 - - particle1: 116 - particle2: 117 - restLength: 0.09087181 - constraintForce: 0 - tearResistance: 0 - - particle1: 117 - particle2: 118 - restLength: 0.09001732 - constraintForce: 0 - tearResistance: 0 - - particle1: 118 - particle2: 119 - restLength: 0.09001541 - constraintForce: 0 - tearResistance: 0 - - particle1: 119 - particle2: 120 - restLength: 0.09001827 - constraintForce: 0 - tearResistance: 0 - - particle1: 120 - particle2: 121 - restLength: 0.090016365 - constraintForce: 0 - tearResistance: 0 - - particle1: 121 - particle2: 122 - restLength: 0.09001732 - constraintForce: 0 - tearResistance: 0 - - particle1: 122 - particle2: 123 - restLength: 0.09001541 - constraintForce: 0 - tearResistance: 0 - - particle1: 123 - particle2: 124 - restLength: 0.09001732 - constraintForce: 0 - tearResistance: 0 - - particle1: 124 - particle2: 125 - restLength: 0.09356594 - constraintForce: 0 - tearResistance: 0 - - particle1: 125 - particle2: 126 - restLength: 0.09355736 - constraintForce: 0 - tearResistance: 0 - - particle1: 126 - particle2: 127 - restLength: 0.09355068 - constraintForce: 0 - tearResistance: 0 - - particle1: 127 - particle2: 128 - restLength: 0.093559265 - constraintForce: 0 - tearResistance: 0 - - particle1: 128 - particle2: 129 - restLength: 0.09356117 - constraintForce: 0 - tearResistance: 0 - - particle1: 129 - particle2: 130 - restLength: 0.09354973 - constraintForce: 0 - tearResistance: 0 - - particle1: 130 - particle2: 131 - restLength: 0.09356117 - constraintForce: 0 - tearResistance: 0 - - particle1: 131 - particle2: 132 - restLength: 0.09355831 - constraintForce: 0 - tearResistance: 0 - - particle1: 132 - particle2: 133 - restLength: 0.09354782 - constraintForce: 0 - tearResistance: 0 - - particle1: 133 - particle2: 134 - restLength: 0.099793434 - constraintForce: 0 - tearResistance: 0 - - particle1: 134 - particle2: 135 - restLength: 0.09978771 - constraintForce: 0 - tearResistance: 0 - - particle1: 135 - particle2: 136 - restLength: 0.099788666 - constraintForce: 0 - tearResistance: 0 - - particle1: 136 - particle2: 137 - restLength: 0.09978199 - constraintForce: 0 - tearResistance: 0 - - particle1: 137 - particle2: 138 - restLength: 0.09977627 - constraintForce: 0 - tearResistance: 0 - - particle1: 138 - particle2: 139 - restLength: 0.09976673 - constraintForce: 0 - tearResistance: 0 - - particle1: 139 - particle2: 140 - restLength: 0.099752426 - constraintForce: 0 - tearResistance: 0 - - particle1: 140 - particle2: 141 - restLength: 0.099741936 - constraintForce: 0 - tearResistance: 0 - - particle1: 141 - particle2: 142 - restLength: 0.09976292 - constraintForce: 0 - tearResistance: 0 - - particle1: 142 - particle2: 143 - restLength: 0.099811554 - constraintForce: 0 - tearResistance: 0 - - particle1: 143 - particle2: 144 - restLength: 0.099793434 - constraintForce: 0 - tearResistance: 0 - - particle1: 144 - particle2: 145 - restLength: 0.0997715 - constraintForce: 0 - tearResistance: 0 - - particle1: 145 - particle2: 146 - restLength: 0.0997448 - constraintForce: 0 - tearResistance: 0 - - particle1: 146 - particle2: 147 - restLength: 0.09970951 - constraintForce: 0 - tearResistance: 0 - - particle1: 147 - particle2: 148 - restLength: 0.09983635 - constraintForce: 0 - tearResistance: 0 - - particle1: 148 - particle2: 149 - restLength: 0.09980297 - constraintForce: 0 - tearResistance: 0 - - particle1: 149 - particle2: 150 - restLength: 0.099749565 - constraintForce: 0 - tearResistance: 0 - - particle1: 150 - particle2: 151 - restLength: 0.09969139 - constraintForce: 0 - tearResistance: 0 - - particle1: 151 - particle2: 152 - restLength: 0.09432697 - constraintForce: 0 - tearResistance: 0 - - particle1: 152 - particle2: 153 - restLength: 0.09430885 - constraintForce: 0 - tearResistance: 0 - - particle1: 153 - particle2: 154 - restLength: 0.09428406 - constraintForce: 0 - tearResistance: 0 - - particle1: 154 - particle2: 155 - restLength: 0.09425163 - constraintForce: 0 - tearResistance: 0 - - particle1: 155 - particle2: 156 - restLength: 0.094202995 - constraintForce: 0 - tearResistance: 0 - - particle1: 156 - particle2: 157 - restLength: 0.09427929 - constraintForce: 0 - tearResistance: 0 - - particle1: 157 - particle2: 158 - restLength: 0.09433365 - constraintForce: 0 - tearResistance: 0 - - particle1: 158 - particle2: 159 - restLength: 0.09425926 - constraintForce: 0 - tearResistance: 0 - - particle1: 159 - particle2: 160 - restLength: 0.09416294 - constraintForce: 0 - tearResistance: 0 - - particle1: 160 - particle2: 161 - restLength: 0.09436607 - constraintForce: 0 - tearResistance: 0 - - particle1: 161 - particle2: 162 - restLength: 0.09427738 - constraintForce: 0 - tearResistance: 0 - - particle1: 162 - particle2: 163 - restLength: 0.09416485 - constraintForce: 0 - tearResistance: 0 - - particle1: 163 - particle2: 164 - restLength: 0.09438801 - constraintForce: 0 - tearResistance: 0 - - particle1: 164 - particle2: 165 - restLength: 0.094148636 - constraintForce: 0 - tearResistance: 0 - - particle1: 165 - particle2: 166 - restLength: 0.0943861 - constraintForce: 0 - tearResistance: 0 - - particle1: 166 - particle2: 167 - restLength: 0.094112396 - constraintForce: 0 - tearResistance: 0 - - particle1: 167 - particle2: 168 - restLength: 0.09282875 - constraintForce: 0 - tearResistance: 0 - - particle1: 168 - particle2: 169 - restLength: 0.092760086 - constraintForce: 0 - tearResistance: 0 - - particle1: 169 - particle2: 170 - restLength: 0.09270573 - constraintForce: 0 - tearResistance: 0 - - particle1: 170 - particle2: 171 - restLength: 0.09263992 - constraintForce: 0 - tearResistance: 0 - - particle1: 171 - particle2: 172 - restLength: 0.09254265 - constraintForce: 0 - tearResistance: 0 - - particle1: 172 - particle2: 173 - restLength: 0.09281731 - constraintForce: 0 - tearResistance: 0 - - particle1: 173 - particle2: 174 - restLength: 0.09295654 - constraintForce: 0 - tearResistance: 0 - - particle1: 174 - particle2: 175 - restLength: 0.09269619 - constraintForce: 0 - tearResistance: 0 - - particle1: 175 - particle2: 176 - restLength: 0.09237957 - constraintForce: 0 - tearResistance: 0 - - particle1: 176 - particle2: 177 - restLength: 0.092941284 - constraintForce: 0 - tearResistance: 0 - - particle1: 177 - particle2: 178 - restLength: 0.09277439 - constraintForce: 0 - tearResistance: 0 - - particle1: 178 - particle2: 179 - restLength: 0.09231186 - constraintForce: 0 - tearResistance: 0 - - particle1: 179 - particle2: 180 - restLength: 0.09248543 - constraintForce: 0 - tearResistance: 0 - _aerodynamicsEnabled: 1 - _drag: 0.05 - _lift: 0.02 - m_RodBlueprint: {fileID: 11400000, guid: 3e9b6c4ac1880bb439e8b82f09a5435d, type: 2} - _stretchShearConstraintsEnabled: 1 - _stretchCompliance: 0 - _shear1Compliance: 0 - _shear2Compliance: 0 - _bendTwistConstraintsEnabled: 1 - _torsionCompliance: 0 - _bend1Compliance: 0 - _bend2Compliance: 0 - _plasticYield: 0 - _plasticCreep: 0 - _chainConstraintsEnabled: 1 - _tightness: 1 ---- !u!114 &2057924365034160267 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365034160256} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c8b45ebbf86be4df6b0e6cd933812af2, type: 3} - m_Name: - m_EditorClassIdentifier: - material: {fileID: 2100000, guid: fb88690dea2394644849cde5abd037f9, type: 2} - renderParameters: - layer: 0 - lightProbeUsage: 1 - reflectionProbeUsage: 1 - shadowCastingMode: 1 - receiveShadows: 1 - motionVectors: 0 - renderingLayerMask: 4294967295 - k__BackingField: {r: 1, g: 1, b: 1, a: 1} - k__BackingField: 1 ---- !u!4 &2057924365745864528 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365745864530} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.43, y: -2.04, z: 32.59} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2057924365034160257} - m_Father: {fileID: 0} - m_RootOrder: 41 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2057924365745864529 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365745864530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0b94a15fe526a3343beea116b8b7515f, type: 3} - m_Name: - m_EditorClassIdentifier: - tar: {fileID: 1604673292} - tar2: {fileID: 466450966} - Obi: {fileID: 2057924365034160256} ---- !u!1 &2057924365745864530 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2057924365745864528} - - component: {fileID: 2057924365745864531} - - component: {fileID: 2057924365745864529} - m_Layer: 0 - m_Name: Solver (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &2057924365745864531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057924365745864530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d174fab52f0c4b8399f25d5c3ea524c, type: 3} - m_Name: - m_EditorClassIdentifier: - simulateWhenInvisible: 1 - m_Backend: 1 - substeps: 4 - maxStepsPerFrame: 1 - synchronization: 0 - parameters: - mode: 0 - interpolation: 1 - gravity: {x: 0, y: -9.81, z: 0} - ambientWind: {x: 0, y: 0, z: 0} - foamGravityScale: 1 - damping: 0 - maxAnisotropy: 3 - sleepThreshold: 0.001 - maxVelocity: 50 - maxAngularVelocity: 10 - collisionMargin: 0.02 - maxDepenetration: 5 - colliderCCD: 1 - particleCCD: 0 - shockPropagation: 0 - surfaceCollisionIterations: 8 - surfaceCollisionTolerance: 0.005 - m_MaxSurfaceChunks: 32768 - maxQueryResults: 8192 - maxFoamParticles: 8192 - maxParticleNeighbors: 128 - maxParticleContacts: 6 - gravity: {x: 0, y: -9.81, z: 0} - gravitySpace: 1 - ambientWind: {x: 0, y: 0, z: 0} - windSpace: 1 - foamSubsteps: 1 - maxFoamVelocityStretch: 0.3 - foamFade: {x: 0.05, y: 0.8} - foamAccelAgingRange: {x: 0.5, y: 0.8} - foamAccelAging: 4 - worldLinearInertiaScale: 0 - worldAngularInertiaScale: 0 - synchronousSpatialQueries: 0 - distanceConstraintParameters: - evaluationOrder: 0 - iterations: 3 - SORFactor: 1 - enabled: 0 - bendingConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 0 - particleCollisionConstraintParameters: - evaluationOrder: 0 - iterations: 5 - SORFactor: 1 - enabled: 1 - particleFrictionConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 1 - collisionConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 1 - frictionConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 1 - skinConstraintParameters: - evaluationOrder: 0 - iterations: 3 - SORFactor: 1 - enabled: 0 - volumeConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 0 - shapeMatchingConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 0 - tetherConstraintParameters: - evaluationOrder: 1 - iterations: 3 - SORFactor: 1 - enabled: 0 - pinConstraintParameters: - evaluationOrder: 0 - iterations: 10 - SORFactor: 1 - enabled: 0 - stitchConstraintParameters: - evaluationOrder: 1 - iterations: 2 - SORFactor: 1 - enabled: 0 - densityConstraintParameters: - evaluationOrder: 1 - iterations: 2 - SORFactor: 1 - enabled: 0 - stretchShearConstraintParameters: - evaluationOrder: 1 - iterations: 6 - SORFactor: 1 - enabled: 1 - bendTwistConstraintParameters: - evaluationOrder: 1 - iterations: 6 - SORFactor: 1 - enabled: 1 - chainConstraintParameters: - evaluationOrder: 0 - iterations: 3 - SORFactor: 1 - enabled: 1 --- !u!1 &2109942812500529382 GameObject: m_ObjectHideFlags: 0 @@ -44309,7 +43045,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} propertyPath: m_RootOrder - value: 25 + value: 24 objectReference: {fileID: 0} - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} propertyPath: m_LocalPosition.x @@ -45743,7 +44479,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} --- !u!114 &4163391439018457568 MonoBehaviour: @@ -60290,7 +59026,7 @@ RectTransform: - {fileID: 837023032066003696} - {fileID: 5640692782032870077} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -67507,6 +66243,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4995935176814719679, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5519024520137767209, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3} propertyPath: target value: @@ -67517,7 +66257,7 @@ PrefabInstance: objectReference: {fileID: 1493242969} - target: {fileID: 8479287258615548071, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8479287258615548071, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3} propertyPath: m_LocalPosition.x diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs index 8cd6747e..9ea7a0e6 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs @@ -11,7 +11,7 @@ public class Skill_Pick : MonoBehaviour public Animator CharacterAnimator; public Transform player; - + public XFS xfs; private Transform rightHand, leftHand; @@ -59,14 +59,17 @@ public class Skill_Pick : MonoBehaviour // 禁用物品的碰撞体，防止它与玩家或其他物体碰撞 itemCollider.enabled = false; - + if (item.transform.name == "gun") + { + xfs = item.GetComponent().Xfs; + } // 将物品设置为玩家手部的子对象，并调整其位置和旋转 item.transform.SetParent(rightHand, true); // false表示保持物品的世界旋转和位置 item.transform.localPosition = relativePosition; // 假设玩家手中有一个默认的持物位置 item.transform.localRotation = Quaternion.Euler(relativeRotation); // 重置旋转 Destroy(item.GetComponent()); - + Debug.Log("^^^^^^^^^^^^^^^^^^^^^^^^^"); // 更新当前持有的物品 return item; @@ -98,7 +101,10 @@ public class Skill_Pick : MonoBehaviour { itemCollider.enabled = true; } - + if (currentItem.transform.name == "gun") + { + xfs = null; + } currentItem.AddComponent(); // 将物品放置在玩家当前位置的地面上 diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs index 62f86994..9421bdb4 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs @@ -37,6 +37,10 @@ public class Skill_watering : MonoBehaviour { currentItem.GetComponent().StopFire(); } + if (currentItem.GetComponent() != null) + { + currentItem.GetComponent().water.SetActive(false); + } } public void StopWateringAnim( ) { @@ -72,9 +76,9 @@ public class Skill_watering : MonoBehaviour currentItem.GetComponent().StartFire(); } - if (currentItem.gameObject.name == "gun") + if (currentItem.GetComponent() != null) { - XFS.instance.water.SetActive(true); + currentItem.GetComponent().water.SetActive(true); } } } diff --git a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs index 7dec7409..17bf2068 100644 --- a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs +++ b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs @@ -18,7 +18,7 @@ public class UseSkill : MonoBehaviour // 玩家手中当前持有的物品 //[HideInInspector] public GameObject currentItem = null; - + public XFS Xfs; public Skill_Pick _skill_Pick; public Skill_Jump _skill_Jump; public Skill_watering _skill_Watering; @@ -44,8 +44,8 @@ public class UseSkill : MonoBehaviour { if(currentItem.gameObject.name=="gun") { - float dis= Vector3.Distance(GameObject.Find("player").transform.position, XFS.instance.transform.position); - if (dis >= 30f) + float dis= Vector3.Distance(GameObject.Find("player").transform.position, Xfs.gameObject.transform.position); + if (dis >= 20f) { Drop(); @@ -63,7 +63,7 @@ public class UseSkill : MonoBehaviour currentItem = null; } currentItem = _skill_Pick.Pick(); - + Xfs= _skill_Pick.xfs; if (currentItem.transform.name == "NoFire") { currentItem.transform.Rotate(180f, -80f, -30f); @@ -89,6 +89,7 @@ public class UseSkill : MonoBehaviour } if (currentItem.transform.name == "gun") { + currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); } } @@ -96,7 +97,7 @@ public class UseSkill : MonoBehaviour public void Drop() { currentItem = _skill_Pick.Drop(currentItem); - + Xfs = null; } //拾取 void Skill_Pick() @@ -109,13 +110,11 @@ public class UseSkill : MonoBehaviour if(currentItem.transform.name == "NoFire") { currentItem.transform.Rotate(180f, -80f, -30f); } - if (currentItem.transform.name == "gun") { currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); + if (currentItem.transform.name == "gun") { + currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); + Xfs = null; } - if (Input.GetKeyDown(KeyCode.Q)) - { - currentItem = _skill_Pick.Drop(currentItem); - } } diff --git a/xiaofang/Assets/Script/Item/Fire.cs b/xiaofang/Assets/Script/Item/Fire.cs index 95e2099b..65ba107a 100644 --- a/xiaofang/Assets/Script/Item/Fire.cs +++ b/xiaofang/Assets/Script/Item/Fire.cs @@ -12,7 +12,7 @@ public enum Firestate public class Fire : MonoBehaviour { - private bool isPlayerInRange = false; // 检查玩家是否在范围内 + public bool isPlayerInRange = false; // 检查玩家是否在范围内 private bool isExtinguishing = false; // 是否正在灭火 public float extinguishTime = 3f; // 灭火所需的时间 private float holdTime = 0f; // 按住按钮的计时 @@ -45,10 +45,7 @@ public class Fire : MonoBehaviour HurtPeople(); - if (XFS.instance.IShavewater) - { - MieFire(); - } + if (UseSkill == null) { @@ -58,8 +55,8 @@ public class Fire : MonoBehaviour { return; } - else if(UseSkill.currentItem.transform.name != "NoFire") - { + else if(UseSkill.currentItem.transform.name != "NoFire" && UseSkill.currentItem.transform.name!="gun") + { return; } MieFire(); @@ -114,6 +111,7 @@ public class Fire : MonoBehaviour // // 恢复玩家控制器 // if (!Input.GetMouseButton(0)) EnablePlayerControl(); //} + Debug.Log(11111111); if (isPlayerInRange&& UseSkill.IsWater) { // 计算玩家与火源的距离 @@ -135,10 +133,6 @@ public class Fire : MonoBehaviour // 如果玩家按住键达到指定时间，停止火焰 StopFire(); isExtinguishing = true; // 防止重复触发灭火 - if (XFS.instance.IShavewater) - { - XFS.instance.water.SetActive(false); - } } } diff --git a/xiaofang/Assets/Script/Item/NoFire.cs b/xiaofang/Assets/Script/Item/NoFire.cs index 1a2d48b2..f22cdf73 100644 --- a/xiaofang/Assets/Script/Item/NoFire.cs +++ b/xiaofang/Assets/Script/Item/NoFire.cs @@ -6,6 +6,8 @@ public class NoFire : MonoBehaviour { //喷射点 private GameObject MuzzlePos; + + public bool isuse = false; // Start is called before the first frame update void Start() { @@ -26,10 +28,12 @@ public class NoFire : MonoBehaviour public void StartFire() { MuzzlePos.SetActive(true); + isuse=true; } public void StopFire() { MuzzlePos.SetActive(false); + isuse=false; } } diff --git a/xiaofang/Assets/Script/XFS.cs b/xiaofang/Assets/Script/XFS.cs index 4b5cac9b..aaa6e419 100644 --- a/xiaofang/Assets/Script/XFS.cs +++ b/xiaofang/Assets/Script/XFS.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; public class XFS : MonoBehaviour { - public static XFS instance; + // Start is called before the first frame update public Button ConnectGun; public Button ConnectFa; @@ -22,7 +22,7 @@ public class XFS : MonoBehaviour void Start() { ShuiguanGameObject.SetActive(false); - instance =this; + UseSkill.Xfs = this; ConnectGun.onClick.AddListener((() => { PLayerLook(); @@ -62,14 +62,15 @@ public class XFS : MonoBehaviour public void openFa() { - water = Instantiate(firewater); + UseSkill.Initgun(); + water = Instantiate(firewater); water.transform.SetParent(Gun.transform); water.transform.localPosition = new Vector3(0, 0, 0); water.transform.localRotation = new Quaternion(0, 180, 0, 0); CharacterControl.enabled = true; water.SetActive(false); IShavewater = true; - UseSkill.Initgun(); + Gun.GetComponent().water=water; CharacterControl.DragTheScreen.enabled = true; } // Update is called once per frame diff --git a/xiaofang/Assets/Script/watergun.cs b/xiaofang/Assets/Script/watergun.cs new file mode 100644 index 00000000..ac5e80b9 --- /dev/null +++ b/xiaofang/Assets/Script/watergun.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class watergun : MonoBehaviour +{ + public XFS Xfs; + public GameObject water; + // Start is called before the first frame update + void Start() + { + Xfs=this.transform.parent.GetComponent(); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/xiaofang/Assets/Script/watergun.cs.meta b/xiaofang/Assets/Script/watergun.cs.meta new file mode 100644 index 00000000..ca9ce9ac --- /dev/null +++ b/xiaofang/Assets/Script/watergun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ee3f53d86720f249a148ad9823e0198 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: