DESKTOP-FB72PO8\Administrator 3 minggu lalu
induk
melakukan
a5b1c9bbc8

+ 2 - 2
Assets/Res/Config/BuffConfig.json

@@ -129,12 +129,12 @@
       "buffName": 500003,
       "buffEffectDes": 500044,
       "buffGroup": 1007,
-      "overlayCount": 20,
+      "overlayCount": 50,
       "effectValue": [
         0.0
       ],
       "timeType": 1,
-      "buffTime": 9.0,
+      "buffTime": -1.0,
       "buffType": 2,
       "dispelType": 1,
       "IsControlBuff": 0,

+ 7 - 7
Assets/Res/Config/HeroModelConfig.json

@@ -16,7 +16,7 @@
       "attack": 100,
       "def": 50,
       "shield": 100,
-      "speed_atk": 20.0,
+      "speed_atk": 4.0,
       "skillID": [
         -1,
         -1,
@@ -53,7 +53,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 4.0,
       "skillID": [
         1201,
         2001,
@@ -90,7 +90,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 4.0,
       "skillID": [
         1202,
         2002,
@@ -127,7 +127,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 4.0,
       "skillID": [
         1201,
         2003,
@@ -164,7 +164,7 @@
       "attack": 100,
       "def": 50,
       "shield": 200,
-      "speed_atk": 3.0,
+      "speed_atk": 4.0,
       "skillID": [
         9003,
         9004,
@@ -179,9 +179,9 @@
       ],
       "fa_bao_id": [
         10001,
-        10003,
+        -1,
         10006,
-        10010
+        -1
       ],
       "heroStory": null
     }

+ 37 - 37
Assets/Res/Config/SkillConfig.json

@@ -11,7 +11,7 @@
       "scriptName": "S1101",
       "IDGroup": 1101,
       "timelineName": "1101_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -35,7 +35,7 @@
       "scriptName": "S1101",
       "IDGroup": 1101,
       "timelineName": "1101_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -62,7 +62,7 @@
       "scriptName": "S1101",
       "IDGroup": 1101,
       "timelineName": "1101_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -92,7 +92,7 @@
       "scriptName": "S1101",
       "IDGroup": 1101,
       "timelineName": "1101_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -120,7 +120,7 @@
       "scriptName": "S1101",
       "IDGroup": 1101,
       "timelineName": "1101_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -151,7 +151,7 @@
       "scriptName": "S1101",
       "IDGroup": 1101,
       "timelineName": "1101_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -176,7 +176,7 @@
       "scriptName": "S1102",
       "IDGroup": 1102,
       "timelineName": "1102_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -199,7 +199,7 @@
       "scriptName": "S1102",
       "IDGroup": 1102,
       "timelineName": "1102_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -226,7 +226,7 @@
       "scriptName": "S1102",
       "IDGroup": 1102,
       "timelineName": "1102_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -256,7 +256,7 @@
       "scriptName": "S1102",
       "IDGroup": 1102,
       "timelineName": "1102_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -283,7 +283,7 @@
       "scriptName": "S1102",
       "IDGroup": 1102,
       "timelineName": "1102_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -313,7 +313,7 @@
       "scriptName": "S1102",
       "IDGroup": 1102,
       "timelineName": "1102_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -339,7 +339,7 @@
       "scriptName": "S1103",
       "IDGroup": 1103,
       "timelineName": "1103_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -363,7 +363,7 @@
       "scriptName": "S1103",
       "IDGroup": 1103,
       "timelineName": "1103_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -388,7 +388,7 @@
       "scriptName": "S1103",
       "IDGroup": 1103,
       "timelineName": "1103_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -419,7 +419,7 @@
       "scriptName": "S1103",
       "IDGroup": 1103,
       "timelineName": "1103_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -447,7 +447,7 @@
       "scriptName": "S1103",
       "IDGroup": 1103,
       "timelineName": "1103_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -478,7 +478,7 @@
       "scriptName": "S1103",
       "IDGroup": 1103,
       "timelineName": "1103_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -2196,7 +2196,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -2220,7 +2220,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -2247,7 +2247,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -2277,7 +2277,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -2304,7 +2304,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -2334,7 +2334,7 @@
       "scriptName": "S1401",
       "IDGroup": 1401,
       "timelineName": "1401_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -2359,7 +2359,7 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -2382,7 +2382,7 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -2406,7 +2406,7 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -2436,7 +2436,7 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -2464,7 +2464,7 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -2495,7 +2495,7 @@
       "scriptName": "S1402",
       "IDGroup": 1402,
       "timelineName": "1402_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -2521,7 +2521,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -2545,7 +2545,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 2,
       "effectValue": [
@@ -2570,7 +2570,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 3,
       "effectValue": [
@@ -2601,7 +2601,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 4,
       "effectValue": [
@@ -2626,7 +2626,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 5,
       "effectValue": [
@@ -2657,7 +2657,7 @@
       "scriptName": "S1403",
       "IDGroup": 1403,
       "timelineName": "1403_timeline_TD",
-      "cd": 1.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 6,
       "effectValue": [
@@ -6468,7 +6468,7 @@
       "scriptName": "S9001",
       "IDGroup": 9001,
       "timelineName": "BossSk1_timeline_TD",
-      "cd": 4.0,
+      "cd": 6.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [

+ 9 - 5
Assets/Scenes/testCombat.scene

@@ -2193,7 +2193,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
-      value: 1405500
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
@@ -2201,15 +2201,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 9101
+      value: 9201
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].skill.Array.size
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.data[0]
@@ -2217,7 +2217,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].skill.Array.data[0]
-      value: 14055
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size

+ 60 - 7
Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCollisionInfo.cs

@@ -28,6 +28,7 @@ namespace GameLogic.Combat.CombatTool
 
         private IUnRegister _unRegister;
         protected bool _isOne;
+        private bool _isPengZhuang;
 
         protected ParticleSystemPool ParticleSystemPool;
         private int triigerCount;
@@ -49,17 +50,63 @@ namespace GameLogic.Combat.CombatTool
 
         private void OnTriggerEnter(Collider collider, ITriggerEntity triggerEntity)
         {
-            HeroEntityMono heroEntityMono = collider.GetComponent<HeroEntityMono>();
-            if (heroEntityMono == null || (heroEntityMono.combatHeroEntity != b))
-            {
-                return;
-            }
+            // HeroEntityMono heroEntityMono = collider.GetComponent<HeroEntityMono>();
+            // if (heroEntityMono == null || (heroEntityMono.combatHeroEntity != b))
+            // {
+            //     return;
+            // }
+            //
+            // if (State != 1)
+            // {
+            //     return;
+            // }
+            //
+            // if (triigerCount >= 2)
+            // {
+            //     MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
+            //         CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
+            //     rollingStateData.target = b;
+            //
+            //     a.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
+            //         rollingStateData);
+            //     MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData2 =
+            //         CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
+            //     rollingStateData.target = a;
+            //     b.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
+            //         rollingStateData2);
+            //     State = 2;
+            //     _currTime = 0;
+            //     CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_dian",
+            //         a.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
+            //         {
+            //             particleSystemPool.transform.rotation =
+            //                 a.GameObject.transform.rotation;
+            //             ParticleSystemPool = particleSystemPool;
+            //         });
+            // }
+            // else
+            // {
+            //     CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_hit",
+            //         collider.transform.position, null, false, null, delegate(ParticleSystemPool particleSystemPool)
+            //         {
+            //             particleSystemPool.transform.rotation =
+            //                 a.GameObject.transform.rotation;
+            //         });
+            //     triigerCount++;
+            //     // a.ReduceHp(40);
+            //     // _trigger = true;
+            //     // _triggerTime = 0.5f;
+            // }
+        }
 
-            if (State != 1)
+        protected void PongZhuang()
+        {
+            if (State != 1||_isPengZhuang)
             {
                 return;
             }
 
+            _isPengZhuang = true;
             if (triigerCount >= 2)
             {
                 MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
@@ -86,7 +133,7 @@ namespace GameLogic.Combat.CombatTool
             else
             {
                 CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_hit",
-                    collider.transform.position, null, false, null, delegate(ParticleSystemPool particleSystemPool)
+                    a.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
                     {
                         particleSystemPool.transform.rotation =
                             a.GameObject.transform.rotation;
@@ -188,10 +235,16 @@ namespace GameLogic.Combat.CombatTool
                 a.GameObject.transform.rotation = Quaternion.LookRotation((a1 - a2).normalized);
                 b.combatHeroGameObject.SetPosition(b1);
                 b.GameObject.transform.rotation = Quaternion.LookRotation((b1 - b2).normalized);
+                if (_currTime > 0.48f)
+                {
+                    PongZhuang();
+                }
+
                 if (_currTime >= 1)
                 {
                     _currTime = 0;
                     _isOne = !_isOne;
+                    _isPengZhuang = false;
                 }
             }
             else if (State == 2)

+ 1 - 0
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -27,6 +27,7 @@ public class CombatHeroInfo
     public EncryptionLong attack = new EncryptionLong();
 
 
+    // public long 
     public EncryptionFloat attSpeed
     {
         get { return _attSpeed; }

+ 17 - 1
Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -28,6 +28,7 @@ namespace GameLogic.Combat.Hero
         /// 充能额外速度
         /// </summary>
         public float cdAddSpeed;
+        
         // public float cdSpeed=1;
         /// <summary>
         /// 是否拥有法宝宝典
@@ -166,6 +167,21 @@ namespace GameLogic.Combat.Hero
             return 1;
         }
 
+        public bool IsCanUse()
+        {
+            if (cd > 0)
+            {
+                return false;
+            }
+
+            if (_rootMagicWeaponControl.globalMagicWeaponCd > 0)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         public void UseMagicWeapon()
         {
             if (cd > 0 || _rootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget == null)
@@ -192,7 +208,7 @@ namespace GameLogic.Combat.Hero
                 if (b1008 == null)
                 {
                     cd -= t;
-                    if (_rootMagicWeaponControl.isAutoUse)
+                    if (IsCanUse())
                     {
                         UseMagicWeapon();
                     }

+ 11 - 0
Assets/Scripts/GameLogic/Combat/Hero/MagicWeaponControl.cs

@@ -17,6 +17,11 @@ namespace GameLogic.Combat.Hero
         public bool isAutoUse;
         private BetterList<CombatMagicWeaponEntity> _allMagicWeapon = new BetterList<CombatMagicWeaponEntity>();
 
+        /// <summary>
+        /// 全局CD
+        /// </summary>
+        public float globalMagicWeaponCd;
+
         public CombatMagicWeaponEntity[] AllMagicWeapon
         {
             get { return _allMagicWeapon.ToArray(true); }
@@ -77,6 +82,7 @@ namespace GameLogic.Combat.Hero
 
         public void UseMagicWeapon(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
+            globalMagicWeaponCd = 2;
             UseMagicWeaponEventData useMagicWeaponEventData = UseMagicWeaponEventData.Create();
             useMagicWeaponEventData.combatHeroEntity = combatHeroEntity;
             useMagicWeaponEventData.combatMagicWeaponEntity = combatMagicWeaponEntity;
@@ -97,6 +103,11 @@ namespace GameLogic.Combat.Hero
 
         public void Update(float t)
         {
+            if (globalMagicWeaponCd > 0)
+            {
+                globalMagicWeaponCd -= t;
+            }
+
             for (int i = 0; i < _allMagicWeapon.Count; i++)
             {
                 _allMagicWeapon[i].Update(t);

+ 1 - 0
Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroXiuMianState.cs

@@ -40,6 +40,7 @@ namespace GameLogic.Combat.Hero.State
             _timerEntity = TimerComponent.Instance.AddTimer(CombatCalculateTool.Instance.GetOdd(0, 300),
                 delegate
                 {
+                    _timerEntity = null;
                     combatHeroEntity.GameObject.SetActive(true);
                     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Active);
                 });

+ 9 - 9
Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidget.cs

@@ -33,19 +33,19 @@ namespace Fort23.Mono
                 {
                     // SkillConfig skillConfig = SkillBasic.SelfSkillConfig;
                     CombatController.currActiveCombat.isUpdate = false;
-                    SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.name), LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.model),
-                        delegate()
-                        {
-                            CombatController.currActiveCombat.isUpdate = true;
-                        });
+                    SkillMassgePanel.OpenSkillSelectPanel(
+                        LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.name),
+                        LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.model),
+                        delegate() { CombatController.currActiveCombat.isUpdate = true; });
                     return;
                 }
 
-                if (combatMagicWeaponEntity == null || combatMagicWeaponEntity.cd > 0)
+                if (combatMagicWeaponEntity == null || !combatMagicWeaponEntity.IsCanUse())
                 {
                     return;
                 }
-                b_1008 b1008=  combatMagicWeaponEntity.BuffControl.GetBuffBasicForType<b_1008>();
+
+                b_1008 b1008 = combatMagicWeaponEntity.BuffControl.GetBuffBasicForType<b_1008>();
                 if (b1008 != null)
                 {
                     return;
@@ -67,8 +67,8 @@ namespace Fort23.Mono
                 return;
             }
 
-            float d = combatMagicWeaponEntity.cd / combatMagicWeaponEntity.MaxCd;
-            cd.fillAmount = 1-d;
+            float d = (combatMagicWeaponEntity.cd+combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) / (combatMagicWeaponEntity.MaxCd);
+            cd.fillAmount = 1 - d;
         }
     }
 }

TEMPAT SAMPAH
Excel2Json/Excel/Buff.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/FabaoConfig.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/HeroModel.xlsx


TEMPAT SAMPAH
Excel2Json/Excel/skill.xlsx


+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -24,6 +24,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F78_003F5e834fc5_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AQuaternion_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F14_003Fb8fbfefc_003FQuaternion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AQuaternion_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2008d2d6093f4149aaeafd5f414aa7a517c400_003Fe8_003F196a10dc_003FQuaternion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AQueue_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fb6_003F5769248b_003FQueue_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARandom_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F9f_003F293a2b71_003FRandom_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARandom_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F4c_003Fb5eddf34_003FRandom_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AS2002_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa01b6d4ffd8a40da9aa90b33ff5055f23dc00_003Fce_003Fab212403_003FS2002_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>