diff options
24 files changed, 278 insertions, 4 deletions
diff --git a/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity b/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity index fc02daf..3bdfefd 100644 --- a/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity +++ b/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity @@ -4022,6 +4022,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1127821130} m_Modifications: + - target: {fileID: 5053551693411879010, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 17.199646 + objectReference: {fileID: 0} + - target: {fileID: 5053551693411879010, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.0000667572 + objectReference: {fileID: 0} + - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} + propertyPath: m_FontData.m_BestFit + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} + propertyPath: m_FontData.m_MinSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} + propertyPath: m_FontData.m_FontSize + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} + propertyPath: m_FontData.m_RichText + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5053551695217443172, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_Name value: PanelLevelBar @@ -4052,7 +4076,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.9777778 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_SizeDelta.x @@ -4060,7 +4084,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_SizeDelta.y - value: 23.49 + value: -0.5100002 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_LocalPosition.x diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs new file mode 100644 index 0000000..5f156b1 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 靴子 +/// </summary> +public class Decoration_Boot : DecorationBase +{ + + + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta new file mode 100644 index 0000000..4a2bc5b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ebcc96daf380bd8468f21598f8b9ce2d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs new file mode 100644 index 0000000..0d1a22c --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_DefenseGem : Decoration_GemBase +{ + + +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta new file mode 100644 index 0000000..c0964a1 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88a39027075cea64198761d1c8d0dd02 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs new file mode 100644 index 0000000..6d701f7 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_GemBase : DecorationBase +{ + + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta new file mode 100644 index 0000000..0fdc4ea --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 82650d48a9bafb2408e00ff6cdceeb0a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs new file mode 100644 index 0000000..536fa98 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_LifeGem : Decoration_GemBase +{ + + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta new file mode 100644 index 0000000..4aa051e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: be6aa712c77087d49b88c1479d98b2b0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs new file mode 100644 index 0000000..3c0c8f4 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_LuckyGem : Decoration_GemBase +{ + +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta new file mode 100644 index 0000000..1f7bbcf --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ade20bcdbc8fee54fb992733a6d123c9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs new file mode 100644 index 0000000..e72d73b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_PowerGem : Decoration_GemBase +{ + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta new file mode 100644 index 0000000..2050c65 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 84a4837fdcbd630499d11e34e6b51f9a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs new file mode 100644 index 0000000..1e7a7d4 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 力量戒指 +/// </summary> +public class Decoration_PowerRing : DecorationBase +{ + +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta new file mode 100644 index 0000000..469d520 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6a4dc5304fcb7fd4eaceaa9f31ec491b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs new file mode 100644 index 0000000..3d684d3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_SpeedGem : Decoration_GemBase +{ + +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta new file mode 100644 index 0000000..54f130e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b364714184a532a49b5aaaea6d1518a5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs new file mode 100644 index 0000000..1af4143 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 超凡手套，集齐五颗宝石饰品解锁超武 +/// </summary> +public class Equip_MightyGlove : EquipBase +{ + public override AutoMode autoMode => AutoMode.Interval; + + public override void OnTrigger(GameObject owner) + { + } +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta new file mode 100644 index 0000000..1a7c505 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3fb783e0a66c9e349bbd4a5c0d51a55b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs new file mode 100644 index 0000000..1546e1b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 特斯拉线圈 +/// </summary> +public class Equip_TeslaCoil : EquipBase +{ + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 1f; + + public override void OnTrigger(GameObject owner) + { + throw new System.NotImplementedException(); + } + +} diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta new file mode 100644 index 0000000..b8d5d7f --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d7080bdedf9532d4bb649fe643619fab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/UnitManager.cs b/SurvivalTest/Assets/Scripts/Managers/UnitManager.cs new file mode 100644 index 0000000..88aa13c --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/UnitManager.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UnitManager : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SurvivalTest/Assets/Scripts/Managers/UnitManager.cs.meta b/SurvivalTest/Assets/Scripts/Managers/UnitManager.cs.meta new file mode 100644 index 0000000..eb9eddb --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/UnitManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9dc8d013c19c8c144817a461448c69c7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs index 6432354..2a7af2f 100644 --- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs +++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs @@ -214,14 +214,16 @@ public class TestPeaceMaker : MonoBehaviour bool LaunchGrenade() { - if (Input.GetButtonDown("Fire2") || (Input.GetAxis("BombTrigger") == 1)) + //if (Input.GetButtonDown("Fire2") || (Input.GetAxis("BombTrigger") == 1)) + if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1)) { if (m_CoLaunchGrenade == null) { m_CoLaunchGrenade = StartCoroutine(coLaunchGrenade(0.2f)); } } - if (!Input.GetButton("Fire2") && (Input.GetAxis("BombTrigger") == 0)) + //if (!Input.GetButton("Fire2") && (Input.GetAxis("BombTrigger") == 0)) + if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0)) { if (m_CoLaunchGrenade != null) { |