diff options
Diffstat (limited to 'SurvivalTest/Assets/Scripts')
14 files changed, 140 insertions, 11 deletions
diff --git a/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs index 08cd3a1..dec9d67 100644 --- a/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs +++ b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs @@ -18,4 +18,10 @@ public static class EditorTools UnityEditor.SceneManagement.EditorSceneManager.OpenScene("Assets/Scenes/UIEditScene.unity"); } + [MenuItem("Tools/场景/动画编辑场景 _F7")] + public static void OpenAnimationEditScene() + { + UnityEditor.SceneManagement.EditorSceneManager.OpenScene("Assets/Scenes/AnimationEditScene.unity"); + } + } diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs index 45450c1..d533ee5 100644 --- a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs @@ -7,8 +7,8 @@ using UnityEngine; /// </summary> public class Item_ExecutorHead : Item_ExecutorPart { - public override string name => "执行者的头颅"; + public override string name => "执行者头颅"; - public override string iconPath => "art/ui/item/executor_head"; + public override string iconPath => "art/ui/item/executor/executor_head"; } diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs new file mode 100644 index 0000000..ffdbc1e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 宸﹁噦 +/// </summary> +public class Item_ExecutorLeftArm : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭乏鑷"; + + public override string iconPath => "art/ui/item/executor/executor_left_arm"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs.meta new file mode 100644 index 0000000..b946d08 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eca0d264d28abbc44bb5f7f83e1d8080 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs new file mode 100644 index 0000000..388db21 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 宸﹁吙 +/// </summary> +public class Item_ExecutorLeftLeg : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭乏鑵"; + + public override string iconPath => "art/ui/item/executor/executor_left_leg"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs.meta new file mode 100644 index 0000000..afdfaa2 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 35f1315e849e0b043a058c7aa4d35498 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs new file mode 100644 index 0000000..dc35b5e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 鍙宠噦 +/// </summary> +public class Item_ExecutorRightArm : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭彸鑷"; + + public override string iconPath => "art/ui/item/executor/executor_right_arm"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs.meta new file mode 100644 index 0000000..7ba6fab --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 28b80635484b8494ca6c1b9f39ddc72f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs new file mode 100644 index 0000000..50b0cc0 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 鍙宠吙 +/// </summary> +public class Item_ExecutorRightLeg : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭彸鑵"; + + public override string iconPath => "art/ui/item/executor/executor_right_leg"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs.meta new file mode 100644 index 0000000..8d416cd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 99038c63e8dcb93478f5d06ae2cc20c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs new file mode 100644 index 0000000..8020e27 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 执行者的头 +/// </summary> +public class Item_ExecutorTorso : Item_ExecutorPart +{ + public override string name => "执行者躯干"; + + public override string iconPath => "art/ui/item/executor/executor_torso"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs.meta new file mode 100644 index 0000000..480e9b5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4b521e36f89b72044a82da40f5772db6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs index 581cfdd..f7359c5 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -19,10 +19,15 @@ public partial class PlayerManager : Singleton<PlayerManager> m_Items.Add(new Item_SwordSpectrum()); m_Items.Add(new Item_Wrench()); m_Items.Add(new Item_ExecutorHead()); + m_Items.Add(new Item_ExecutorTorso()); + m_Items.Add(new Item_ExecutorLeftArm()); + m_Items.Add(new Item_ExecutorRightArm()); + m_Items.Add(new Item_ExecutorLeftLeg()); + m_Items.Add(new Item_ExecutorRightLeg()); } void UpdateItems() { - } + }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs index c8a1f26..9727c6c 100644 --- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs +++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs @@ -219,21 +219,14 @@ public class TestPeaceMaker : CrewScript if (bJoytick) { m_ControlMode = ControlMode.Joystick; + dir = new Vector2(xAxis, -yAxis).normalized; } if (bMouse) { m_ControlMode = ControlMode.Mouse; - } - - if (m_ControlMode == ControlMode.Mouse) - { Vector2 camPos = GetCameraPosition(); dir = (camPos - centrePos).normalized; } - else - { - dir = new Vector2(xAxis, -yAxis).normalized; - } } if (dir.magnitude > 0) |