From fb24f8e5b4027294bcd49a26b43d89e11b1f438a Mon Sep 17 00:00:00 2001 From: yyl <yyl> Date: 星期一, 16 六月 2025 14:53:58 +0800 Subject: [PATCH] 117 【武将】武将系统 --- Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction.meta | 8 Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs | 20 ++ Main/System/Hero/HeroType.cs | 1 Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs.meta | 11 + Main/System/Hero/HeroManager.cs | 2 Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs.meta | 11 + Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs.meta | 11 + Main/System/Hero/HeroConfigUtility.cs | 18 ++ Main/System/Hero/HeroInfo.Skin.cs | 26 ++ Main/Utility/EnumHelper.cs | 2 Main/Core/NetworkPackage/ServerPack/HB1_Role.meta | 8 Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs | 20 ++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs.meta | 11 + Main/System/Hero/HeroInfo.Skin.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs | 20 ++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs | 18 ++ Main/System/Hero/HeroInfo.cs | 73 +++++++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs | 20 ++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs | 22 ++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs.meta | 11 + Main/System/Hero/HeroConfigUtility.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs.meta | 11 + Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs | 18 ++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs | 24 ++ Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs | 18 ++ Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs | 34 +++ 30 files changed, 479 insertions(+), 5 deletions(-) diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction.meta new file mode 100644 index 0000000..4127a03 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d42ec0fa7931b44e86ac081b2b91ce7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs new file mode 100644 index 0000000..7721e7e --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using System.Collections; + +// B2 30 姝﹀皢鍗囩骇 #tagCSHeroLVUP + +public class CB230_tagCSHeroLVUP : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + + public CB230_tagCSHeroLVUP () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB230; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs.meta new file mode 100644 index 0000000..c1f93b4 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB230_tagCSHeroLVUP.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1c3231e477ebfee4d8deafe9d41108e7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs new file mode 100644 index 0000000..eceaffa --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +// B2 31 姝﹀皢鍗囨槦 #tagCSHeroStarUP + +public class CB231_tagCSHeroStarUP : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + public ushort UseItemIndex; //浣跨敤姝﹀皢鏉愭枡鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + + public CB231_tagCSHeroStarUP () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB231; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + WriteBytes (UseItemIndex, NetDataType.WORD); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs.meta new file mode 100644 index 0000000..601d4e4 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB231_tagCSHeroStarUP.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc4fbb4b44c090942bc23a269f722e3b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs new file mode 100644 index 0000000..408638a --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using System.Collections; + +// B2 32 姝﹀皢绐佺牬 #tagCSHeroBreak + +public class CB232_tagCSHeroBreak : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + + public CB232_tagCSHeroBreak () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB232; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs.meta new file mode 100644 index 0000000..7cbe6c5 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB232_tagCSHeroBreak.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 70c44c8df7eac3d43aefc63432708736 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs new file mode 100644 index 0000000..a1f2390 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using System.Collections; + +// B2 33 姝﹀皢瑙夐啋 #tagCSHeroAwake + +public class CB233_tagCSHeroAwake : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + + public CB233_tagCSHeroAwake () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB233; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs.meta new file mode 100644 index 0000000..c30f847 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB233_tagCSHeroAwake.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c4391fcbefa085a4bb3aa86e2a249dcf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs new file mode 100644 index 0000000..5dbbfaf --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +// B2 34 姝﹀皢瑙夐啋閫夋嫨澶╄祴 #tagCSHeroAwakeSelectTalent + +public class CB234_tagCSHeroAwakeSelectTalent : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + public byte SelectIndex; //閫夋嫨鏂拌В閿佹Ы浣嶇殑澶╄祴绱㈠紩 + + public CB234_tagCSHeroAwakeSelectTalent () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB234; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + WriteBytes (SelectIndex, NetDataType.BYTE); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs.meta new file mode 100644 index 0000000..e66edc3 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB234_tagCSHeroAwakeSelectTalent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 15991b59f7a952e41ac37ec01f2f9956 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs new file mode 100644 index 0000000..18a3665 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs @@ -0,0 +1,24 @@ +using UnityEngine; +using System.Collections; + +// B2 35 姝﹀皢娲楃偧 #tagCSHeroWash + +public class CB235_tagCSHeroWash : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + public byte LockCnt; + public byte[] LockTalentIndexs; //閿佸畾澶╄祴绱㈠紩鍒楄〃 + public byte OPType; // 鎿嶄綔绫诲瀷锛�0-鎵ц娲楃偧锛�1-鏇挎崲鍘熷ぉ璧嬶紱2-淇濈暀鍘熷ぉ璧� + + public CB235_tagCSHeroWash () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB235; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + WriteBytes (LockCnt, NetDataType.BYTE); + WriteBytes (LockTalentIndexs, NetDataType.BYTE, LockCnt); + WriteBytes (OPType, NetDataType.BYTE); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs.meta new file mode 100644 index 0000000..6786270 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB235_tagCSHeroWash.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b54be65ab99890d4994db9acdb7b48a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs new file mode 100644 index 0000000..fd9e278 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +// B2 36 姝﹀皢鎹㈣偆 #tagCSHeroWearSkin + +public class CB236_tagCSHeroWearSkin : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + public byte SkinIndex; //鐨偆绱㈠紩 + + public CB236_tagCSHeroWearSkin () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB236; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + WriteBytes (SkinIndex, NetDataType.BYTE); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs.meta new file mode 100644 index 0000000..f41b819 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB236_tagCSHeroWearSkin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d05540ed30efe1e45bcf656bf5fb9518 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs new file mode 100644 index 0000000..865bb6d --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using System.Collections; + +// B2 37 姝﹀皢鍥鹃壌婵�娲诲崌绾� #tagCSHeroBookUP + +public class CB237_tagCSHeroBookUP : GameNetPackBasic { + public uint HeroID; //姝﹀皢ID + public ushort ItemIndex; //鍏宠仈姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呯储寮曪紝婵�娲绘椂鍙笉鐢ㄥ彂 + public byte BookType; //鍥鹃壌婵�娲荤被鍨嬶細 0-鍒濆婵�娲伙紱1-鏄熺骇鍗囩骇锛�2-绐佺牬绛夌骇鍗囩骇 + + public CB237_tagCSHeroBookUP () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB237; + } + + public override void WriteToBytes () { + WriteBytes (HeroID, NetDataType.DWORD); + WriteBytes (ItemIndex, NetDataType.WORD); + WriteBytes (BookType, NetDataType.BYTE); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs.meta new file mode 100644 index 0000000..24638d3 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB237_tagCSHeroBookUP.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 127f74996550cee4681e7b1a361aaf3d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs new file mode 100644 index 0000000..f91a52c --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +// B2 38 姝﹀皢閿佸畾 #tagCSHeroLock + +public class CB238_tagCSHeroLock : GameNetPackBasic { + public ushort ItemIndex; //姝﹀皢鐗╁搧鎵�鍦ㄦ灏嗚儗鍖呬綅缃储寮� + public byte IsLock; //0-瑙i攣锛�1-閿佸畾 + + public CB238_tagCSHeroLock () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB238; + } + + public override void WriteToBytes () { + WriteBytes (ItemIndex, NetDataType.WORD); + WriteBytes (IsLock, NetDataType.BYTE); + } + +} diff --git a/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs.meta b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs.meta new file mode 100644 index 0000000..3db3316 --- /dev/null +++ b/Main/Core/NetworkPackage/ClientPack/CB2_NewFunction/CB238_tagCSHeroLock.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 827111ca5269c174080ecdcfa2f92427 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ServerPack/HB1_Role.meta b/Main/Core/NetworkPackage/ServerPack/HB1_Role.meta new file mode 100644 index 0000000..9fccb6e --- /dev/null +++ b/Main/Core/NetworkPackage/ServerPack/HB1_Role.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca6b1204eb2ae724c8c15139caa761e5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs b/Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs new file mode 100644 index 0000000..efee950 --- /dev/null +++ b/Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using System.Collections; + +// B1 22 姝﹀皢淇℃伅 #tagSCHeroInfo + +public class CB122_tagSCHeroInfo : GameNetPackBasic { + public ushort HeroCnt; + public tagSCHero[] HeroInfoList; + + public CB122_tagSCHeroInfo () { + combineCmd = (ushort)0x03FE; + _cmd = (ushort)0xB122; + } + + public override void WriteToBytes () { + WriteBytes (HeroCnt, NetDataType.WORD); + for (int i = 0; i < HeroCnt; i ++) { + WriteBytes (HeroInfoList[i].HeroID, NetDataType.DWORD); + WriteBytes (HeroInfoList[i].SkinState, NetDataType.DWORD); + WriteBytes (HeroInfoList[i].BookInitState, NetDataType.BYTE); + WriteBytes (HeroInfoList[i].BookStarLV, NetDataType.WORD); + WriteBytes (HeroInfoList[i].BookBreakLV, NetDataType.WORD); + } + } + + public struct tagSCHero { + public uint HeroID; // 姝﹀皢ID + public uint SkinState; // 姝﹀皢鐨偆宸茶В閿佺姸鎬佷俊鎭紝鎸夌毊鑲ゆ墍鍦ㄧ储寮曚簩杩涘埗浣嶈繍绠楀垽鏂槸鍚﹁В閿侊紝0绱㈠紩浣嶉粯璁ょ毊鑲わ紝涓嶇敤楠岃瘉 + public byte BookInitState; // 鍥鹃壌婵�娲荤姸鎬侊細0-鏈縺娲伙紱1-鍙縺娲伙紱2-宸叉縺娲� + public ushort BookStarLV; // 鍥鹃壌鏄熺骇绛夌骇 + public ushort BookBreakLV; // 鍥鹃壌绐佺牬绛夌骇 + } + +} diff --git a/Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs.meta b/Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs.meta new file mode 100644 index 0000000..b2c4ab0 --- /dev/null +++ b/Main/Core/NetworkPackage/ServerPack/HB1_Role/CB122_tagSCHeroInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 202d7c3220a898241b3bc011d6a629f9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/System/Hero/HeroConfigUtility.cs b/Main/System/Hero/HeroConfigUtility.cs new file mode 100644 index 0000000..c6716eb --- /dev/null +++ b/Main/System/Hero/HeroConfigUtility.cs @@ -0,0 +1,18 @@ + + +using System.Collections.Generic; +using System; + + +public static class HeroConfigUtility +{ + // private static Dictionary<> + + + // public static HeroAwakeConfig GetHeroAwakeConfig() + // { + + // } + + +} diff --git a/Main/System/Hero/HeroConfigUtility.cs.meta b/Main/System/Hero/HeroConfigUtility.cs.meta new file mode 100644 index 0000000..fd3a21a --- /dev/null +++ b/Main/System/Hero/HeroConfigUtility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0e5888e0c25bbc48bbf6aa354fad7b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/System/Hero/HeroInfo.Skin.cs b/Main/System/Hero/HeroInfo.Skin.cs new file mode 100644 index 0000000..46c8faf --- /dev/null +++ b/Main/System/Hero/HeroInfo.Skin.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using UnityEngine; + +public partial class HeroInfo +{ + // 鏈嶅姟鍣ㄦ暟鎹� 鐨偆绱㈠紩 + public int SkinIndex = 0; + + // 鏈嶅姟鍣ㄦ暟鎹� 鐨偆ID + public int SkinID + { + get + { + if (SkinIndex > heroConfig.SkinNPCIDList.Length && SkinIndex >= 0) + { + return heroConfig.SkinNPCIDList[SkinIndex]; + } + return 0; + } + } + + // 鐨偆閰嶇疆 + public HeroSkinConfig skinConfig; + + +} \ No newline at end of file diff --git a/Main/System/Hero/HeroInfo.Skin.cs.meta b/Main/System/Hero/HeroInfo.Skin.cs.meta new file mode 100644 index 0000000..b84b45f --- /dev/null +++ b/Main/System/Hero/HeroInfo.Skin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ea5da79a0f7a2104a9af3904fa28e088 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Main/System/Hero/HeroInfo.cs b/Main/System/Hero/HeroInfo.cs index 7043e73..bf47961 100644 --- a/Main/System/Hero/HeroInfo.cs +++ b/Main/System/Hero/HeroInfo.cs @@ -3,29 +3,92 @@ public partial class HeroInfo { + // 姝﹀皢鏈嶅姟鍣ㄥ敮涓�ID public long sid; + // 姝﹀皢閰嶇疆琛↖D public int heroId; + // 姝﹀皢绛夌骇 public int heroLevel; + // 姝﹀皢鏄熺骇 public int heroStar; + // 姝﹀皢绐佺牬绛夌骇 public int breakLevel; - // public List<int> heroEquipList; - // public List<int> heroRuneList; + public HeroCountry heroCountry + { + get + { + return (HeroCountry)heroConfig.Country; + } + } - // public List<int> heroMedalList; + public int Quality + { + get + { + return heroConfig.Quality; + } + } - // public HeroConfig heroConfig; + +#region 閰嶇疆 + // 姝﹀皢閰嶇疆 + public HeroConfig heroConfig; + + // 瑙夐啋閰嶇疆 + public HeroAwakeConfig awakeConfig; + + // 绐佺牬閰嶇疆 + public HeroBreakConfig breakConfig; + + // 缇佺粖閰嶇疆 + public HeroFetterConfig fetterConfig; + + // 鍝佽川瑙夐啋閰嶇疆 + public HeroQualityAwakeConfig qualityAwakeConfig; + + // 鍝佽川閰嶇疆 + public HeroQualityConfig qualityConfig; + + // 鍝佽川绐佺牬閰嶇疆 + public HeroQualityBreakConfig qualityBreakConfig; + + // 澶╄祴閰嶇疆 + public HeroTalentConfig talentConfig; +#endregion 閰嶇疆 + public HeroSkillMgr heroSkillMgr; - public HeroInfo(/*TODO 绛夊緟鏈嶅姟鍣ㄦ暟鎹�*/) + public HeroInfo(CB122_tagSCHeroInfo.tagSCHero scHeroInfo, ItemModel itemHero) { heroSkillMgr = new HeroSkillMgr(this); + // HeroConfigUtility +// 71 # 鑻遍泟澶╄祴ID鍒楄〃 +// 73 # 鑻遍泟澶╄祴ID绛夌骇鍒楄〃锛屽搴�71澶╄祴ID鐨勭瓑绾� +// 75 # 鑻遍泟澶╄祴娲楃偧閿佸畾绱㈠紩鍒楄〃锛屽搴�71澶╄祴ID绱㈠紩 +// 77 # 鑻遍泟澶╄祴娲楃偧闅忔満ID鍒楄〃 +// 79 # 鑻遍泟瑙夐啋鏃堕殢鏈哄ぉ璧嬮�夐」ID鍒楄〃 +// 70 # 鑻遍泟绛夌骇 +// 72 # 鑻遍泟鏄熺骇 +// 74 # 鑻遍泟绐佺牬绛夌骇 +// 76 # 鑻遍泟瑙夐啋绛夌骇 +// 78 # 鑻遍泟浣跨敤鐨勭毊鑲ょ储寮� +// 80 # 涓婚樀鍨嬩笂闃典綅缃� + + #region 鐨偆 + // skinConfig + #endregion 鐨偆 + + + #region 澶╄祴 + + #endregion 澶╄祴 } diff --git a/Main/System/Hero/HeroManager.cs b/Main/System/Hero/HeroManager.cs index 8042bd9..07c49f1 100644 --- a/Main/System/Hero/HeroManager.cs +++ b/Main/System/Hero/HeroManager.cs @@ -20,6 +20,8 @@ public override void RequestNessaryData() { base.RequestNessaryData(); + + } // public override bool IsNessaryDataReady() diff --git a/Main/System/Hero/HeroType.cs b/Main/System/Hero/HeroType.cs index 99c387b..2a6542e 100644 --- a/Main/System/Hero/HeroType.cs +++ b/Main/System/Hero/HeroType.cs @@ -1,6 +1,7 @@ public enum HeroCountry { + None, // 鏃� Wei, // 榄� Shu, // 铚� Wu, // 鍚� diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs index 712214c..66ffe05 100644 --- a/Main/Utility/EnumHelper.cs +++ b/Main/Utility/EnumHelper.cs @@ -746,6 +746,8 @@ DogzItem = 32, //绁炲吔鐗╁搧鑳屽寘 DogzEquip = 33, //绁炲吔瑁呭鑳屽寘锛堢鍏界┛鎴达級 + Hero = 35, // 姝﹀皢鑳屽寘 + //鍚庣画IL寮�鍙戞坊鍔犻璁� default1, //34 鍨冨溇鍥炴敹 default2, -- Gitblit v1.8.0