diff options
30 files changed, 363 insertions, 56 deletions
diff --git a/marching/Assets/Scripts/Properties.meta b/marching/Assets/Bundle/characters.meta index 9373032..ec113be 100644 --- a/marching/Assets/Scripts/Properties.meta +++ b/marching/Assets/Bundle/characters.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0e1f659d9914604f95ecf114f926cc3 +guid: 5f8586d07fbc19d49aa2afe65fc17904 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/marching/Assets/Bundle/characters/ronin.meta b/marching/Assets/Bundle/characters/ronin.meta new file mode 100644 index 0000000..86eaa3f --- /dev/null +++ b/marching/Assets/Bundle/characters/ronin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc2f2ed52e612914eb9c770b3e409d18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/characters/ronin/sprites.meta b/marching/Assets/Bundle/characters/ronin/sprites.meta new file mode 100644 index 0000000..6e2bf44 --- /dev/null +++ b/marching/Assets/Bundle/characters/ronin/sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd40284acb5a21c4c8233bd60e49665d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/configs.meta b/marching/Assets/Bundle/configs.meta new file mode 100644 index 0000000..6ed672c --- /dev/null +++ b/marching/Assets/Bundle/configs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5ac2e23f504ee84ea0347c2ba9d99bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/metadata.meta b/marching/Assets/Bundle/metadata.meta new file mode 100644 index 0000000..1deb4ec --- /dev/null +++ b/marching/Assets/Bundle/metadata.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 765e503054946cc41b973e41e310878a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/metadata/default_buffs.csv b/marching/Assets/Bundle/metadata/default_buffs.csv new file mode 100644 index 0000000..0768a9d --- /dev/null +++ b/marching/Assets/Bundle/metadata/default_buffs.csv @@ -0,0 +1 @@ +uid,name,icon diff --git a/marching/Assets/Bundle/metadata/default_buffs.csv.meta b/marching/Assets/Bundle/metadata/default_buffs.csv.meta new file mode 100644 index 0000000..da57153 --- /dev/null +++ b/marching/Assets/Bundle/metadata/default_buffs.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 110edb11eefebb54daddabb7f432e201 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/metadata/default_stats.csv b/marching/Assets/Bundle/metadata/default_stats.csv new file mode 100644 index 0000000..66d44b8 --- /dev/null +++ b/marching/Assets/Bundle/metadata/default_stats.csv @@ -0,0 +1,12 @@ +uid,name_key,icon,type +#默认的角色属性，可以扩展,,, +level,LEVEL,,int +max_level,MAX_LEVEL,,int +health,HEALTH,,int +max_health,MAX_HEALTH,,int +exp,EXP,,int +max_exp,MAX_EXP,,int +health_recover,HEALTH_RECOVER,,int +move_speed,MOVE_SPEED,,int +damage,DAMAGE,,int +attack_speed,ATTACK_SPEED,,int diff --git a/marching/Assets/Bundle/metadata/default_stats.csv.meta b/marching/Assets/Bundle/metadata/default_stats.csv.meta new file mode 100644 index 0000000..5b5d47e --- /dev/null +++ b/marching/Assets/Bundle/metadata/default_stats.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69815191d90875e41a95ca962128f5c8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Buffs/Buff.cs b/marching/Assets/Scripts/Buffs/Buff.cs new file mode 100644 index 0000000..2320176 --- /dev/null +++ b/marching/Assets/Scripts/Buffs/Buff.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// Buff结构 +/// </summary> +public abstract class Buff +{ + // 元数据 + public BuffDef metadata; + + // buff效果器 + public BuffEfectorBase effector; + +} diff --git a/marching/Assets/Scripts/Buffs/BuffBase.cs.meta b/marching/Assets/Scripts/Buffs/Buff.cs.meta index 2028306..2028306 100644 --- a/marching/Assets/Scripts/Buffs/BuffBase.cs.meta +++ b/marching/Assets/Scripts/Buffs/Buff.cs.meta diff --git a/marching/Assets/Scripts/Buffs/BuffBase.cs b/marching/Assets/Scripts/Buffs/BuffBase.cs deleted file mode 100644 index 017d23f..0000000 --- a/marching/Assets/Scripts/Buffs/BuffBase.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class BuffBase : MonoBehaviour -{ - #region 搴忓垪鍖 - - #endregion - - #region 鍏叡瀛楁 - - #endregion - - #region 绉佹湁瀛楁 - - #endregion - - private void Awake() - { - // 绉佹湁瀛楁璧嬪 - - // 鍏叡瀛楁璧嬪 - - // 鍒濆鍖 - } - -} diff --git a/marching/Assets/Scripts/Buffs/BuffDef.cs b/marching/Assets/Scripts/Buffs/BuffDef.cs new file mode 100644 index 0000000..835589b --- /dev/null +++ b/marching/Assets/Scripts/Buffs/BuffDef.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BuffDef +{ + + public string uid; + + public string name_key; + + public string icon; + +} diff --git a/marching/Assets/Scripts/Properties/PropertyBase.cs.meta b/marching/Assets/Scripts/Buffs/BuffDef.cs.meta index 419acc5..2fbd7ff 100644 --- a/marching/Assets/Scripts/Properties/PropertyBase.cs.meta +++ b/marching/Assets/Scripts/Buffs/BuffDef.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7cc8f2c879c6fd1459eb53a16286b9a2 +guid: 52d9cd8616a5d4d42a5f8241da35ec5e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/marching/Assets/Scripts/Buffs/BuffEfectorBase.cs b/marching/Assets/Scripts/Buffs/BuffEfectorBase.cs new file mode 100644 index 0000000..b90beb8 --- /dev/null +++ b/marching/Assets/Scripts/Buffs/BuffEfectorBase.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BuffEfectorBase +{ + private CharacterBase m_Character; + + /// <summary> + /// buff鐢熸垚鏃跺 + /// </summary> + public virtual void OnCreate() + { + + } + + /// <summary> + /// 鏇存柊 + /// </summary> + public virtual void OnUpdate() + { + + } + + /// <summary> + /// 瑙掕壊姝讳骸 + /// </summary> + public virtual void OnCharacterDeath() + { + } + +} diff --git a/marching/Assets/Scripts/Buffs/BuffEfectorBase.cs.meta b/marching/Assets/Scripts/Buffs/BuffEfectorBase.cs.meta new file mode 100644 index 0000000..a433744 --- /dev/null +++ b/marching/Assets/Scripts/Buffs/BuffEfectorBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5dabb53754f969c4194ad10b2b9fc154 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Common/SingletonMB.cs b/marching/Assets/Scripts/Common/SingletonMB.cs new file mode 100644 index 0000000..5debe57 --- /dev/null +++ b/marching/Assets/Scripts/Common/SingletonMB.cs @@ -0,0 +1,58 @@ +using Newtonsoft.Json.Utilities; +using UnityEngine; + +public abstract class SingletonMB<T> : MonoBehaviour where T : class +{ + protected static T m_Instance; + + public static T Instance + { + get { return m_Instance; } + set + { + if (m_Instance != null) + { + throw new System.ApplicationException("An instance was created duplicate!"); + } + + m_Instance = value; + } + } + + protected virtual void Awake() + { + //if (null != m_Instance) + //{ + // LogHelper.LogError(StringUtil.Concat("Exception: Duplicated Instance!! type is ", typeof(T).ToString(), ", plz send this error msg to hanjun!")); + //} + + m_Instance = gameObject.GetComponent<T>(); + } + + /// <summary> + /// CN: 鍔犺繖涓嚱鏁版槸涓轰簡鍚屼竴涓狦ameObject鎸備簡澶氫釜Manager绫伙紝鍐峅nDestroy閲岃缃嚜宸辩殑鍗曚緥涓簄ull + /// </summary> + protected virtual void OnDestroy() + { + //m_Instance = null; + DoWhenOnDestroy(); + } + + protected virtual void DoWhenOnDestroy() + { + + } + + public void ReleaseInstance() + { + if (m_Instance != null) + { + UnityEngine.Object.Destroy(this.gameObject); + //m_Instance = null; + } + else + { + Debug.LogError("m_Instance is already null!! type is " + typeof(T).ToString()); + } + } +}
\ No newline at end of file diff --git a/marching/Assets/Scripts/Common/SingletonMB.cs.meta b/marching/Assets/Scripts/Common/SingletonMB.cs.meta new file mode 100644 index 0000000..2305ad2 --- /dev/null +++ b/marching/Assets/Scripts/Common/SingletonMB.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4f80ac80ccf55c443ae18ec55cc8f37e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Perks/PerkBase.cs b/marching/Assets/Scripts/Perks/PerkBase.cs index b5cb22b..18e39ea 100644 --- a/marching/Assets/Scripts/Perks/PerkBase.cs +++ b/marching/Assets/Scripts/Perks/PerkBase.cs @@ -2,27 +2,12 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class PerkBase : MonoBehaviour +/// <summary> +/// 琚姩鎶鑳絓鐘舵佸姞鎴 +/// </summary> +public class PerkBase { - #region 搴忓垪鍖 - - #endregion - - #region 鍏叡瀛楁 - - #endregion - - #region 绉佹湁瀛楁 - - #endregion - - private void Awake() - { - // 绉佹湁瀛楁璧嬪 - - // 鍏叡瀛楁璧嬪 - - // 鍒濆鍖 - } + + } diff --git a/marching/Assets/Scripts/Physics/PhysicsSystem.cs b/marching/Assets/Scripts/Physics/PhysicsSystem.cs new file mode 100644 index 0000000..5c7283f --- /dev/null +++ b/marching/Assets/Scripts/Physics/PhysicsSystem.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PhysicsSystem : SingletonMB<PhysicsSystem> +{ + + protected override void Awake() + { + base.Awake(); + } + + protected override void OnDestroy() + { + base.OnDestroy(); + } + + protected override void DoWhenOnDestroy() + { + base.DoWhenOnDestroy(); + } + +} diff --git a/marching/Assets/Scripts/Physics/PhysicsSystem.cs.meta b/marching/Assets/Scripts/Physics/PhysicsSystem.cs.meta new file mode 100644 index 0000000..098c3e2 --- /dev/null +++ b/marching/Assets/Scripts/Physics/PhysicsSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 424982e85f480904d9712074785f9227 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Stats.meta b/marching/Assets/Scripts/Stats.meta new file mode 100644 index 0000000..6a41c6d --- /dev/null +++ b/marching/Assets/Scripts/Stats.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebd4258fc51f0a4428fe390c968ad7c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Stats/CharacterStatsBase.cs b/marching/Assets/Scripts/Stats/CharacterStatsBase.cs new file mode 100644 index 0000000..a2e5fe2 --- /dev/null +++ b/marching/Assets/Scripts/Stats/CharacterStatsBase.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 角色基础属性 +/// </summary> +public abstract class CharacterStatsBase +{ + /// <summary> + /// 属性唯一标识 + /// </summary> + public string UID; + + +} diff --git a/marching/Assets/Scripts/Stats/CharacterStatsBase.cs.meta b/marching/Assets/Scripts/Stats/CharacterStatsBase.cs.meta new file mode 100644 index 0000000..758018e --- /dev/null +++ b/marching/Assets/Scripts/Stats/CharacterStatsBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 749cbea7742c65244b0d1a662be4fb9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Stats/CharacterStatsDef.cs b/marching/Assets/Scripts/Stats/CharacterStatsDef.cs new file mode 100644 index 0000000..87eeecd --- /dev/null +++ b/marching/Assets/Scripts/Stats/CharacterStatsDef.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CharacterStatsDef +{ + public string uid; + + public string name_key; + + public int type; + +} diff --git a/marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta b/marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta new file mode 100644 index 0000000..a8d9a08 --- /dev/null +++ b/marching/Assets/Scripts/Stats/CharacterStatsDef.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 63006c2b6a413714bb852f46b214df90 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Properties/PropertyBase.cs b/marching/Assets/Scripts/Unit/Characters/CharacterBase.cs index 1bdd340..d27d853 100644 --- a/marching/Assets/Scripts/Properties/PropertyBase.cs +++ b/marching/Assets/Scripts/Unit/Characters/CharacterBase.cs @@ -2,10 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -/// <summary> -/// 鍗曚釜灞炴 -/// </summary> -public abstract class PropertyBase +public class CharacterBase { -}
\ No newline at end of file +} diff --git a/marching/Assets/Scripts/Unit/Characters/CharacterBase.cs.meta b/marching/Assets/Scripts/Unit/Characters/CharacterBase.cs.meta new file mode 100644 index 0000000..87e3ef5 --- /dev/null +++ b/marching/Assets/Scripts/Unit/Characters/CharacterBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4997650a838b19e4a963da681b75b2d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Unit/Characters/CharacterInfo.cs b/marching/Assets/Scripts/Unit/Characters/CharacterInfo.cs new file mode 100644 index 0000000..4a39895 --- /dev/null +++ b/marching/Assets/Scripts/Unit/Characters/CharacterInfo.cs @@ -0,0 +1,37 @@ +using JetBrains.Annotations; +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEngine; + +public class CharacterInfo +{ + + /// <summary> + /// 角色所有属性 + /// </summary> + private List<CharacterStatsBase> m_Stats; + + /// <summary> + /// 角色当前所有buff + /// </summary> + private List<Buff> m_Buffs; + + /// <summary> + /// 角色当前所有被动 + /// </summary> + private List<PerkBase> m_Perks; + + public CharacterStatsBase GetStats(string statsUID) + { + for(int i = 0; i < m_Stats.Count; ++i) + { + if (m_Stats[i].UID == statsUID) + { + return m_Stats[i]; + } + } + return null; + } + +} diff --git a/marching/Assets/Scripts/Unit/Characters/CharacterInfo.cs.meta b/marching/Assets/Scripts/Unit/Characters/CharacterInfo.cs.meta new file mode 100644 index 0000000..b3d2f04 --- /dev/null +++ b/marching/Assets/Scripts/Unit/Characters/CharacterInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 546d4837ddb2405438fd9a65adc9c5ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: |