From e56213a52df419b7c7aa42ee6735963bd0160391 Mon Sep 17 00:00:00 2001 From: huyulong <1838407198@qq.com> Date: Mon, 2 Dec 2024 15:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=9E=8B=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=96=B9=E4=BE=BF=E4=BB=A5=E5=90=8E=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=E7=89=A9=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/Character/Player.prefab | 71 +- xiaofang/Assets/Scenes/Tmap 1.unity | 838 ++++++++---------- .../Assets/Script/Character/CharacterAin.cs | 13 +- .../Character/PlayerMovement_Jpystick.cs | 2 +- .../Script/Character/Skills/Skill_Jump.cs | 2 +- .../Script/Character/Skills/Skill_Pick.cs | 24 +- .../Script/Character/Skills/Skill_watering.cs | 5 + .../Script/Character/Skills/UseSkill.cs | 32 +- xiaofang/Assets/Script/UI/SkillCoolDownUI.cs | 21 +- xiaofang/Assets/Script/hylScripts.meta | 8 + .../Assets/Script/hylScripts/NPCInitial.cs | 18 + .../Script/hylScripts/NPCInitial.cs.meta | 11 + xiaofang/Assets/Script/npc/FireHydrant.cs | 4 +- 13 files changed, 470 insertions(+), 579 deletions(-) create mode 100644 xiaofang/Assets/Script/hylScripts.meta create mode 100644 xiaofang/Assets/Script/hylScripts/NPCInitial.cs create mode 100644 xiaofang/Assets/Script/hylScripts/NPCInitial.cs.meta diff --git a/xiaofang/Assets/Resources/Character/Player.prefab b/xiaofang/Assets/Resources/Character/Player.prefab index 13a1856a..daf14f5b 100644 --- a/xiaofang/Assets/Resources/Character/Player.prefab +++ b/xiaofang/Assets/Resources/Character/Player.prefab @@ -10,9 +10,6 @@ GameObject: m_Component: - component: {fileID: 4133915569911699731} - component: {fileID: 8052069560183341929} - - component: {fileID: 4527286627946239905} - - component: {fileID: 4527286627946239907} - - component: {fileID: 4527286627946239904} - component: {fileID: 4527286627946239896} - component: {fileID: 4527286627946239897} - component: {fileID: 4527286627946239910} @@ -66,49 +63,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!54 &4527286627946239905 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3608877410834662313} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!136 &4527286627946239907 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3608877410834662313} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.3 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 1, z: 0} ---- !u!65 &4527286627946239904 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3608877410834662313} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.5, y: 1.5, z: 0.5} - m_Center: {x: 0, y: 1, z: 0} --- !u!114 &4527286627946239896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -116,7 +70,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8, type: 3} m_Name: @@ -130,13 +84,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b0e8bb916545c834b8981bdf116ec889, type: 3} m_Name: m_EditorClassIdentifier: relativePosition: {x: 0, y: 0, z: 0} - relativeRotation: {x: 180, y: 90, z: 0} + relativeRotation: {x: 180, y: 225, z: -45} pickUpRange: 2 --- !u!114 &4527286627946239910 MonoBehaviour: @@ -145,7 +99,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 776645053b40a604db295f0167ee1a67, type: 3} m_Name: @@ -164,7 +118,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 177156116ddbf5a4c811e0da050f8c9d, type: 3} m_Name: @@ -180,7 +134,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5ee0c437a82c154fbb3f7f2d268c19b, type: 3} m_Name: @@ -193,7 +147,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 340618fb82d9f7246a985879a59c7b4d, type: 3} m_Name: @@ -214,12 +168,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ea9eb82687dfa674e883273cd7c73386, type: 3} m_Name: m_EditorClassIdentifier: + ain: {fileID: 0} characterState: 0 + PlayerCollider: {fileID: 0} --- !u!114 &543450652475625313 MonoBehaviour: m_ObjectHideFlags: 0 @@ -227,7 +183,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a03ec7aa563e32d4ea7ce35cdd3e6f2b, type: 3} m_Name: @@ -241,7 +197,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3608877410834662313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c377cd4742c7966498dda3a5e984db05, type: 3} m_Name: @@ -249,8 +205,9 @@ MonoBehaviour: joystick: {fileID: 0} cameraTransform: {fileID: 0} moveSpeed: 5 - characterControl: {fileID: 0} + characterControl: {fileID: 4527286627946239909} mainCamera: {fileID: 0} + rb: {fileID: 0} normalFOV: 60 sprintFOV: 120 fovChangeSpeed: 2 diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index 41b55b9c..a1714b5c 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -1289,7 +1289,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &159663861 PrefabInstance: @@ -1917,11 +1917,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4210062203274906, guid: f83b67b7106d46a4089e1d7e2e7ad86d, type: 3} m_PrefabInstance: {fileID: 246032604} m_PrefabAsset: {fileID: 0} ---- !u!1 &269702850 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3608877410834662313, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - m_PrefabInstance: {fileID: 608017461} - m_PrefabAsset: {fileID: 0} --- !u!1001 &285549842 PrefabInstance: m_ObjectHideFlags: 0 @@ -2387,7 +2382,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &339787257 GameObject: @@ -2630,6 +2625,10 @@ PrefabInstance: propertyPath: m_Name value: Man objectReference: {fileID: 0} + - target: {fileID: 2548037664796076872, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2548037664796175855, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} propertyPath: m_Enabled value: 0 @@ -2774,6 +2773,235 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &382802809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 382802812} + - component: {fileID: 382802811} + - component: {fileID: 382802810} + - component: {fileID: 382802813} + - component: {fileID: 382802814} + - component: {fileID: 382802815} + - component: {fileID: 382802816} + - component: {fileID: 382802817} + - component: {fileID: 382802820} + - component: {fileID: 382802819} + - component: {fileID: 382802818} + - component: {fileID: 382802821} + m_Layer: 0 + m_Name: player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!136 &382802810 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.3 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 1, z: 0} +--- !u!54 &382802811 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!4 &382802812 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.38, y: 0, z: 3.26} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1948499802} + m_Father: {fileID: 0} + m_RootOrder: 26 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &382802813 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.5, y: 1.5, z: 0.5} + m_Center: {x: 0, y: 1, z: 0} +--- !u!114 &382802814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea9eb82687dfa674e883273cd7c73386, type: 3} + m_Name: + m_EditorClassIdentifier: + ain: {fileID: 1948499803} + characterState: 0 + PlayerCollider: {fileID: 382802810} +--- !u!114 &382802815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 340618fb82d9f7246a985879a59c7b4d, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 1 + mainCamera: {fileID: 1068997306} + JumpAbility: 1 + JumpMoveSpeed: 1 + normalFOV: 60 + sprintFOV: 120 + fovChangeSpeed: 2 + walkTime: 0 + runTime: 0 +--- !u!114 &382802816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c377cd4742c7966498dda3a5e984db05, type: 3} + m_Name: + m_EditorClassIdentifier: + joystick: {fileID: 1221713539} + cameraTransform: {fileID: 1068997307} + moveSpeed: 5 + characterControl: {fileID: 382802815} + mainCamera: {fileID: 1068997306} + rb: {fileID: 382802811} + normalFOV: 60 + sprintFOV: 120 + fovChangeSpeed: 2 + walkTime: 0 + runTime: 0 + cameraControl: {fileID: 1068997308} +--- !u!114 &382802817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5ee0c437a82c154fbb3f7f2d268c19b, type: 3} + m_Name: + m_EditorClassIdentifier: + currentItem: {fileID: 0} + _skill_Pick: {fileID: 0} + _skill_Jump: {fileID: 0} + _skill_Watering: {fileID: 0} +--- !u!114 &382802818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 177156116ddbf5a4c811e0da050f8c9d, type: 3} + m_Name: + m_EditorClassIdentifier: + detectionRadius: 10 + fireLayerMask: + serializedVersion: 2 + m_Bits: 0 +--- !u!114 &382802819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0e8bb916545c834b8981bdf116ec889, type: 3} + m_Name: + m_EditorClassIdentifier: + CharacterAnimator: {fileID: 1948499803} + player: {fileID: 382802812} + relativePosition: {x: 0, y: 0, z: 0} + relativeRotation: {x: 0, y: 0, z: 0} + pickUpRange: 2 +--- !u!114 &382802820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 776645053b40a604db295f0167ee1a67, type: 3} + m_Name: + m_EditorClassIdentifier: + vaultDistance: 2 + vaultHeight: 2 + vaultLayerMask: + serializedVersion: 2 + m_Bits: 0 + vaultForwardDistance: 0.5 + vaultUpwardHeight: 1 + characterRigidbody: {fileID: 0} +--- !u!114 &382802821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382802809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8, type: 3} + m_Name: + m_EditorClassIdentifier: + cha: {fileID: 0} + xfs: {fileID: 0} --- !u!1001 &383747424 PrefabInstance: m_ObjectHideFlags: 0 @@ -3892,7 +4120,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &479940076 MonoBehaviour: @@ -4059,7 +4287,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &542563896 GameObject: @@ -4398,7 +4626,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 592c918d965c16042858f85a5467ff62, type: 3} m_Name: m_EditorClassIdentifier: - Character: {fileID: 543450652475625301} + Character: {fileID: 382802812} target: {fileID: 1149486592} distanceText: {fileID: 1878753544} --- !u!1001 &558790587 @@ -4554,7 +4782,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &583497863 PrefabInstance: @@ -4852,111 +5080,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 443146, guid: a4c2fe2e63fba6d43b1e92cb7a6db598, type: 3} m_PrefabInstance: {fileID: 607673290} m_PrefabAsset: {fileID: 0} ---- !u!1001 &608017461 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 543450652475625314, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: mainCamera - value: - objectReference: {fileID: 1068997306} - - target: {fileID: 543450652475625314, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: cameraControl - value: - objectReference: {fileID: 1068997308} - - target: {fileID: 543450652475625314, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: cameraTransform - value: - objectReference: {fileID: 1068997307} - - target: {fileID: 543450652475625314, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: characterControl - value: - objectReference: {fileID: 608017462} - - target: {fileID: 3608877410834662313, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 3608877410834662313, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalPosition.x - value: -13.999404 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalPosition.y - value: 0.010001183 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalPosition.z - value: 6.93 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4527286627946239897, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: relativeRotation.y - value: 225 - objectReference: {fileID: 0} - - target: {fileID: 4527286627946239897, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: relativeRotation.z - value: -45 - objectReference: {fileID: 0} - - target: {fileID: 4527286627946239909, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - propertyPath: mainCamera - value: - objectReference: {fileID: 1068997306} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} ---- !u!114 &608017462 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4527286627946239909, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - m_PrefabInstance: {fileID: 608017461} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 269702850} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 340618fb82d9f7246a985879a59c7b4d, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &608017475 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3} - m_PrefabInstance: {fileID: 608017461} - m_PrefabAsset: {fileID: 0} --- !u!1001 &624720494 PrefabInstance: m_ObjectHideFlags: 0 @@ -5304,7 +5427,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &673038100 PrefabInstance: @@ -5690,7 +5813,7 @@ Transform: - {fileID: 1973166535} - {fileID: 1629676686} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &723314754 PrefabInstance: @@ -5902,7 +6025,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3} propertyPath: m_LocalPosition.x @@ -6499,7 +6622,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &810501282 MonoBehaviour: @@ -6795,7 +6918,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &860755619 PrefabInstance: @@ -7441,7 +7564,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &984914341 PrefabInstance: @@ -7535,7 +7658,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &996888830 MonoBehaviour: @@ -7852,7 +7975,7 @@ RectTransform: - {fileID: 303702331} - {fileID: 172478310} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8439,7 +8562,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bb2c0565bc902d478cc552b449b1445, type: 3} m_Name: m_EditorClassIdentifier: - Character: {fileID: 608017475} + Character: {fileID: 382802812} pivotOffset: {x: 0, y: 1.7, z: 0} camOffset: {x: 0.4, y: 0, z: -2} smooth: 10 @@ -9367,6 +9490,10 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 062c3db07b863f644a93bc3f63e6644b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: 062c3db07b863f644a93bc3f63e6644b, type: 3} propertyPath: m_TagString value: Wall @@ -9954,6 +10081,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2929252283123773939, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} m_PrefabInstance: {fileID: 172478309} m_PrefabAsset: {fileID: 0} +--- !u!114 &1221713539 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929252283123773951, guid: aaa2c939c0359ac4dbce3f49e8b90252, type: 3} + m_PrefabInstance: {fileID: 172478309} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221713538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45977bbae16431c46a013576a1aea384, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1227382122 PrefabInstance: m_ObjectHideFlags: 0 @@ -11785,7 +11923,7 @@ Transform: - {fileID: 1882199187} - {fileID: 119116319} m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1455035651 PrefabInstance: @@ -12002,7 +12140,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1480398099 PrefabInstance: @@ -12103,7 +12241,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1481704192 PrefabInstance: @@ -12281,7 +12419,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: yg: {fileID: 1221713538} - Player: {fileID: 269702850} + Player: {fileID: 382802809} horizontal: 0 vertical: 0 --- !u!114 &1490008726 @@ -12600,7 +12738,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &1517804048 PrefabInstance: @@ -12709,7 +12847,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1526740603 MonoBehaviour: @@ -15250,7 +15388,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} propertyPath: m_LocalPosition.x @@ -15300,6 +15438,10 @@ PrefabInstance: propertyPath: m_Name value: xfs objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 53b3ada11775bfd4282e07e6e63c968f, type: 3} --- !u!1 &1855712066 stripped @@ -15333,6 +15475,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 744bca1c174cbc84da35e566a7696d68, type: 3} m_Name: m_EditorClassIdentifier: + xfs: {fileID: 1402647585} --- !u!1001 &1875190416 PrefabInstance: m_ObjectHideFlags: 0 @@ -15726,7 +15869,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1912789160 PrefabInstance: @@ -15790,6 +15933,81 @@ Transform: m_CorrespondingSourceObject: {fileID: 431404, guid: 406416920addf5d408961e0385a837f5, type: 3} m_PrefabInstance: {fileID: 1912789160} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1948499801 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 382802812} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_Name + value: newPlayer + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: b6b0af1684cf4a3459f82fde7a3622e6, type: 2} + - target: {fileID: 5866666021909216657, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} +--- !u!4 &1948499802 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + m_PrefabInstance: {fileID: 1948499801} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1948499803 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} + m_PrefabInstance: {fileID: 1948499801} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1953218132 PrefabInstance: m_ObjectHideFlags: 0 @@ -16262,272 +16480,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 451052, guid: a76a24ac13d95fc45bd7fbcbc8b2caae, type: 3} m_PrefabInstance: {fileID: 1973606748} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1974768585 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_Name - value: newPlayer - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5866666021909216657, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: b6b0af1684cf4a3459f82fde7a3622e6, type: 2} - - target: {fileID: 5866666021909216657, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - propertyPath: m_ApplyRootMotion - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} ---- !u!1 &1974768586 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3} - m_PrefabInstance: {fileID: 1974768585} - m_PrefabAsset: {fileID: 0} ---- !u!136 &1974768587 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.3 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 1, z: 0} ---- !u!54 &1974768588 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &1974768590 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.5, y: 1.5, z: 0.5} - m_Center: {x: 0, y: 1, z: 0} ---- !u!114 &1974768591 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 340618fb82d9f7246a985879a59c7b4d, type: 3} - m_Name: - m_EditorClassIdentifier: - moveSpeed: 3 - mainCamera: {fileID: 1068997306} - JumpAbility: 1 - JumpMoveSpeed: 100 - normalFOV: 60 - sprintFOV: 120 - fovChangeSpeed: 2 - walkTime: 1.8 - runTime: 1.5 ---- !u!114 &1974768592 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f5ee0c437a82c154fbb3f7f2d268c19b, type: 3} - m_Name: - m_EditorClassIdentifier: - currentItem: {fileID: 0} ---- !u!114 &1974768593 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 177156116ddbf5a4c811e0da050f8c9d, type: 3} - m_Name: - m_EditorClassIdentifier: - detectionRadius: 10 - fireLayerMask: - serializedVersion: 2 - m_Bits: 0 ---- !u!114 &1974768594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 776645053b40a604db295f0167ee1a67, type: 3} - m_Name: - m_EditorClassIdentifier: - vaultDistance: 2 - vaultHeight: 2 - vaultLayerMask: - serializedVersion: 2 - m_Bits: 0 - vaultForwardDistance: 0.5 - vaultUpwardHeight: 1 ---- !u!114 &1974768595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b0e8bb916545c834b8981bdf116ec889, type: 3} - m_Name: - m_EditorClassIdentifier: - relativePosition: {x: 0, y: 0, z: 0} - relativeRotation: {x: 0, y: 0, z: 0} - pickUpRange: 2 ---- !u!114 &1974768596 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8, type: 3} - m_Name: - m_EditorClassIdentifier: - cha: {fileID: 0} - xfs: {fileID: 0} ---- !u!114 &1974768597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c377cd4742c7966498dda3a5e984db05, type: 3} - m_Name: - m_EditorClassIdentifier: - joystick: {fileID: 0} - cameraTransform: {fileID: 1068997307} - moveSpeed: 5 - characterControl: {fileID: 1974768591} - mainCamera: {fileID: 1068997306} - rb: {fileID: 0} - normalFOV: 60 - sprintFOV: 120 - fovChangeSpeed: 2 - walkTime: 0 - runTime: 0 - cameraControl: {fileID: 1068997308} ---- !u!114 &1974768598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a03ec7aa563e32d4ea7ce35cdd3e6f2b, type: 3} - m_Name: - m_EditorClassIdentifier: - Mp: 0 - Def: 0 ---- !u!114 &1974768599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974768586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ea9eb82687dfa674e883273cd7c73386, type: 3} - m_Name: - m_EditorClassIdentifier: - characterState: 0 --- !u!1001 &1975925687 PrefabInstance: m_ObjectHideFlags: 0 @@ -17067,7 +17019,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2120943303 PrefabInstance: @@ -17701,11 +17653,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9263a339010a182478c1a809e3f8ddf1, type: 3} ---- !u!4 &543450652475625301 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - m_PrefabInstance: {fileID: 4527286628662154822} - m_PrefabAsset: {fileID: 0} --- !u!1 &1242008297200351719 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5795828957522809712, guid: 2c4a835a9676e1a478c77d64f472c3ec, type: 3} @@ -17728,7 +17675,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} propertyPath: m_RootOrder - value: 16 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} propertyPath: m_LocalPosition.x @@ -17772,83 +17719,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb61a92f105ea18418e946bf54862340, type: 3} ---- !u!1001 &4527286628662154822 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 543450652475625314, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: mainCamera - value: - objectReference: {fileID: 1068997306} - - target: {fileID: 543450652475625314, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: cameraControl - value: - objectReference: {fileID: 1068997308} - - target: {fileID: 543450652475625314, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: cameraTransform - value: - objectReference: {fileID: 1068997307} - - target: {fileID: 3608877410834662313, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_Name - value: Testhuman - objectReference: {fileID: 0} - - target: {fileID: 3608877410834662313, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalPosition.x - value: -13.999404 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalPosition.y - value: 0.010001183 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalPosition.z - value: 6.93 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4133915569911699731, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4527286627946239909, guid: 006066e2380528243a52cbfc56f6d189, type: 3} - propertyPath: mainCamera - value: - objectReference: {fileID: 1068997306} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 006066e2380528243a52cbfc56f6d189, type: 3} --- !u!1001 &4706987623060023959 PrefabInstance: m_ObjectHideFlags: 0 @@ -18922,7 +18792,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6567720597980285386, guid: 2c4a835a9676e1a478c77d64f472c3ec, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6567720597980285386, guid: 2c4a835a9676e1a478c77d64f472c3ec, type: 3} propertyPath: m_LocalPosition.x diff --git a/xiaofang/Assets/Script/Character/CharacterAin.cs b/xiaofang/Assets/Script/Character/CharacterAin.cs index 7b5ce03c..2788ef5b 100644 --- a/xiaofang/Assets/Script/Character/CharacterAin.cs +++ b/xiaofang/Assets/Script/Character/CharacterAin.cs @@ -27,13 +27,16 @@ public enum CharacterSkill public class CharacterAin : MonoBehaviour { - private Animator ain; + [Header("动画")] + public Animator ain; private float timer; private float RunSpeed; - public CharacterState characterState; - + [HideInInspector] + public CharacterState characterState; + [Header("碰撞体")] + public Collider PlayerCollider; //玩家碰撞体 private Vector3 colExtents; @@ -58,8 +61,8 @@ public class CharacterAin : MonoBehaviour void Init() { - ain = transform.GetComponent(); - colExtents = GetComponent().bounds.extents; + //ain = transform.GetComponent(); + colExtents = PlayerCollider.bounds.extents; characterState = CharacterState.idle; SetPlayerState(characterState); } diff --git a/xiaofang/Assets/Script/Character/PlayerMovement_Jpystick.cs b/xiaofang/Assets/Script/Character/PlayerMovement_Jpystick.cs index 52c0114d..0e06fc7d 100644 --- a/xiaofang/Assets/Script/Character/PlayerMovement_Jpystick.cs +++ b/xiaofang/Assets/Script/Character/PlayerMovement_Jpystick.cs @@ -38,7 +38,7 @@ public class PlayerMovement_Jpystick : MonoBehaviour, IDragHandler { characterControl = GetComponent(); Characterain = GetComponent(); - rb = GetComponent(); + //rb = GetComponent(); Debug.Log("------------------"+rb); } diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_Jump.cs b/xiaofang/Assets/Script/Character/Skills/Skill_Jump.cs index fd05557b..0a86a202 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_Jump.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_Jump.cs @@ -15,7 +15,7 @@ public class Skill_Jump : MonoBehaviour private bool isVaulting = false; // 标志角色是否正在翻越 private Collider characterCollider; // 角色的碰撞体 - private Rigidbody characterRigidbody; // 角色的刚体 + public Rigidbody characterRigidbody; // 角色的刚体 private void Start() { diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs index f8d53567..40ee0fd8 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs @@ -7,7 +7,10 @@ public class Skill_Pick : MonoBehaviour //private CharacterAin CharacterAin; //角色动画控制器，用于获取角色具体身体Transform，捡东西 - private Animator CharacterAnimator; + public Animator CharacterAnimator; + + public Transform player; + private Transform rightHand, leftHand; @@ -20,10 +23,9 @@ public class Skill_Pick : MonoBehaviour // 用于检测玩家附近物品的范围 public float pickUpRange = 2.0f; - // Start is called before the first frame update void Start() { - CharacterAnimator = transform.GetComponent(); + //CharacterAnimator = transform.GetComponent(); if (CharacterAnimator != null) { rightHand = CharacterAnimator.GetBoneTransform(HumanBodyBones.RightHand); @@ -31,17 +33,16 @@ public class Skill_Pick : MonoBehaviour } else { - Debug.LogError("找不到 Animator "); + Debug.LogError(transform.name+"找不到 Animator "); } } - - // 捡起 public GameObject Pick() { + // 获取玩家当前位置 - Vector3 playerPosition = transform.position; + Vector3 playerPosition = player.transform.position; // 使用物理射线或重叠球检测来查找玩家附近的物品 Collider[] itemsInRange = Physics.OverlapSphere(playerPosition, pickUpRange, LayerMask.GetMask("Default")); @@ -63,12 +64,17 @@ public class Skill_Pick : MonoBehaviour item.transform.localPosition = relativePosition; // 假设玩家手中有一个默认的持物位置 item.transform.localRotation = Quaternion.Euler(relativeRotation); // 重置旋转 - + Debug.Log("^^^^^^^^^^^^^^^^^^^^^^^^^"); // 更新当前持有的物品 - return item; + return item; + } } + + Debug.Log("############################"); return null; + + } // 丢弃物品 diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs index db6cfdbe..5b0b791a 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs @@ -73,5 +73,10 @@ public class Skill_watering : MonoBehaviour transform.forward = directionToFire; } } + + + + + } diff --git a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs index 2a26a3a9..17c433e1 100644 --- a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs +++ b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs @@ -11,22 +11,23 @@ using UnityEngine; public class UseSkill : MonoBehaviour { //private CharacterAin CharacterAin; - + // 玩家手中当前持有的物品 + [HideInInspector] public GameObject currentItem = null; - private Skill_Pick skill_Pick; - private Skill_Jump skill_Jump; - private Skill_watering skill_Watering; + public Skill_Pick _skill_Pick; + public Skill_Jump _skill_Jump; + public Skill_watering _skill_Watering; //Fire fire = new Fire(); // Start is called before the first frame update - void Start() - { - skill_Pick = transform.GetComponent(); - skill_Jump = transform.GetComponent(); - skill_Watering = transform.GetComponent(); - + void Start() + { + _skill_Pick = transform.GetComponent(); + _skill_Jump = transform.GetComponent(); + _skill_Watering = transform.GetComponent(); + //Debug.LogError(_skill_Pick.Pick()); } // Update is called once per frame @@ -40,14 +41,15 @@ public class UseSkill : MonoBehaviour //拾取 void Skill_Pick() { - if (Input.GetKeyDown(KeyCode.F)) + if (Input.GetKeyDown(KeyCode.F)) { Debug.LogError("F"); - currentItem = skill_Pick.Pick(); + //Debug.LogError(skill_Pick.Pick()); + currentItem = _skill_Pick.Pick(); } if (Input.GetKeyDown(KeyCode.Q)) { - currentItem = skill_Pick.Drop(currentItem); + currentItem = _skill_Pick.Drop(currentItem); } } @@ -67,13 +69,13 @@ public class UseSkill : MonoBehaviour if (Input.GetMouseButtonDown(0)) { - skill_Watering.StartWatering(currentItem); + _skill_Watering.StartWatering(currentItem); } if (Input.GetMouseButtonUp(0)) { - skill_Watering.StopWatering(currentItem); + _skill_Watering.StopWatering(currentItem); } } diff --git a/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs b/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs index 7ce1f09a..1a978a04 100644 --- a/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs +++ b/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using System; +using System.Threading.Tasks; + public class SkillCoolDownUI : MonoBehaviour { public Image cooldownImage; // 拖动Image组件到这里 @@ -11,16 +13,18 @@ public class SkillCoolDownUI : MonoBehaviour private Coroutine countdownCoroutine; - public void StartCooldown(float cooldownTime) + public async void StartCooldown(float cooldownTime) { if (countdownCoroutine != null) { StopCoroutine(countdownCoroutine); } - countdownCoroutine = StartCoroutine(CooldownRoutine(cooldownTime)); + + // 调用异步方法来启动冷却 + await CooldownRoutine(cooldownTime); } - private IEnumerator CooldownRoutine(float cooldownTime) + public async Task CooldownRoutine(float cooldownTime) { float elapsed = 0f; cooldownImage.fillAmount = 1; // 设置为满 @@ -29,13 +33,16 @@ public class SkillCoolDownUI : MonoBehaviour { elapsed += Time.deltaTime; cooldownImage.fillAmount = 1 - (elapsed / cooldownTime); - cooldowntext.text =((1 - (elapsed / cooldownTime))*10).ToString("F1"); - yield return null; + cooldowntext.text = ((1 - (elapsed / cooldownTime)) * 10).ToString("F1"); + + // 使用 Task.Delay 来代替协程的 yield return + await Task.Yield(); // 让出当前帧，等待下次更新 } HandleCooldownFinished(); } + private void HandleCooldownFinished() { cooldownImage.fillAmount = 0; // 重新设置为0 @@ -43,4 +50,8 @@ public class SkillCoolDownUI : MonoBehaviour Destroy(gameObject); } + + + + } diff --git a/xiaofang/Assets/Script/hylScripts.meta b/xiaofang/Assets/Script/hylScripts.meta new file mode 100644 index 00000000..c8129668 --- /dev/null +++ b/xiaofang/Assets/Script/hylScripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4763ae0ee2aab246b910f494007d8ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Script/hylScripts/NPCInitial.cs b/xiaofang/Assets/Script/hylScripts/NPCInitial.cs new file mode 100644 index 00000000..d93c2809 --- /dev/null +++ b/xiaofang/Assets/Script/hylScripts/NPCInitial.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NPCInitial : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/xiaofang/Assets/Script/hylScripts/NPCInitial.cs.meta b/xiaofang/Assets/Script/hylScripts/NPCInitial.cs.meta new file mode 100644 index 00000000..0bf5403f --- /dev/null +++ b/xiaofang/Assets/Script/hylScripts/NPCInitial.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4d7df52381f65246820b1890ad97509 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Script/npc/FireHydrant.cs b/xiaofang/Assets/Script/npc/FireHydrant.cs index 4c21e128..70c93d0d 100644 --- a/xiaofang/Assets/Script/npc/FireHydrant.cs +++ b/xiaofang/Assets/Script/npc/FireHydrant.cs @@ -4,12 +4,12 @@ using UnityEngine; using UnityEngine.UI; public class FireHydrant : MonoBehaviour { - private GameObject xfs; + public GameObject xfs; // Start is called before the first frame update void Awake() { - xfs = GameObject.Find("Canvas/xfs"); + //xfs = GameObject.Find("Canvas/xfs"); }