Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/HeroModelConfig.json

@@ -1399,7 +1399,7 @@
       "isUseGpu": false,
       "heroType": 2,
       "attack": 85,
-      "hp": 85,
+      "hp": 102,
       "def": 100,
       "shield": 85,
       "speed_atk": 0.0,

Assets/Res/Config/InitialPlayerConfig.json

@@ -12,7 +12,7 @@
       "itemAmount": [
         50000,
         5000,
-        3000,
+        8000,
         1,
         300
       ],

Assets/Res/Config/SkillConfig.json

@@ -4712,7 +4712,7 @@
       "level": 1,
       "effectUpK": 20,
       "effectValue": [
-        20.0
+        10.0
       ],
       "intensifierIndex": [
         1
@@ -4740,7 +4740,7 @@
       "level": 2,
       "effectUpK": 20,
       "effectValue": [
-        25.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -4777,7 +4777,7 @@
       "level": 3,
       "effectUpK": 20,
       "effectValue": [
-        30.0
+        14.0
       ],
       "intensifierIndex": [
         1
@@ -4814,7 +4814,7 @@
       "level": 4,
       "effectUpK": 20,
       "effectValue": [
-        35.0
+        16.0
       ],
       "intensifierIndex": [
         1
@@ -4851,7 +4851,7 @@
       "level": 5,
       "effectUpK": 20,
       "effectValue": [
-        40.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -4888,7 +4888,7 @@
       "level": 6,
       "effectUpK": 20,
       "effectValue": [
-        45.0
+        20.0
       ],
       "intensifierIndex": [
         1
@@ -5544,7 +5544,7 @@
       "level": 1,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        6.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5573,7 +5573,7 @@
       "level": 2,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        7.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5611,7 +5611,7 @@
       "level": 3,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        8.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5649,7 +5649,7 @@
       "level": 4,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        9.0,
         9.0
       ],
       "intensifierIndex": [
@@ -5725,7 +5725,7 @@
       "level": 6,
       "effectUpK": 10,
       "effectValue": [
-        10.0,
+        11.0,
         9.0,
         15.0
       ],
@@ -5759,10 +5759,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        80.0
       ],
       "intensifierIndex": [
         2
@@ -5788,7 +5788,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
         100.0
@@ -5826,10 +5826,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        120.0
       ],
       "intensifierIndex": [
         2
@@ -5864,10 +5864,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        140.0
       ],
       "intensifierIndex": [
         2
@@ -5902,10 +5902,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         1.0,
-        100.0
+        160.0
       ],
       "intensifierIndex": [
         2
@@ -5940,10 +5940,10 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 30,
+      "effectUpK": 100,
       "effectValue": [
         2.0,
-        100.0,
+        180.0,
         1.0
       ],
       "intensifierIndex": [
@@ -6390,7 +6390,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         550.0
       ],
@@ -6414,7 +6414,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         650.0
       ],
@@ -6447,7 +6447,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         750.0
       ],
@@ -6480,7 +6480,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         850.0
       ],
@@ -6513,7 +6513,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         950.0
       ],
@@ -6546,7 +6546,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 20,
+      "effectUpK": 40,
       "effectValue": [
         1050.0
       ],
@@ -6948,7 +6948,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         20.0,
@@ -6978,7 +6978,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         30.0,
@@ -7017,7 +7017,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         4.0,
         40.0,
@@ -7056,7 +7056,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         4.0,
         50.0,
@@ -7095,7 +7095,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         4.0,
         60.0,
@@ -7134,7 +7134,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         3.0,
         70.0,

Assets/Scripts/Core/BRG/BRG_backgrond.cs

@@ -42,7 +42,7 @@ public class BRG_backgrond : MonoBehaviour
                 BGRGameObjectInfo info = new BGRGameObjectInfo();
                 info.pos = new Vector3(i * 2, j , 0); // 增加间距，使物体更容易看到
                 info.rot = Vector3.zero;
-                info.scale = Vector3.one; // 调整尺寸
+                info.scale = Vector3.one; 
                 m_gameObjectInfos.Add(info);
             }
         }

Assets/Scripts/Core/BRG/BatchShaderBind.cs

@@ -17,6 +17,8 @@ namespace Core.BRG
         private int _count;
         private int _size;
 
+        public int updateMinIndex;
+        public int updateMaxIndex;
         public void InitBuffer(int count)
         {
             this._count = count;

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -30,6 +30,7 @@ namespace GameLogic.Combat.CombatState
             }
 
             CombatController.currActiveCombat.CombatCameraControllder.EnterCombat();
+            CombatController.currActiveCombat.isPrepare = true;
         }
 
         protected override void ProExit()
@@ -50,6 +51,25 @@ namespace GameLogic.Combat.CombatState
 
             CombatHeroEntity[] allHero =
                 CombatController.currActiveCombat.CombatHeroController.GetHero(true, out int maxCount);
+            if (CombatController.currActiveCombat.isPrepare)
+            {
+                bool isPrepareFinish = true;
+                for (int i = 0; i < allHero.Length; i++)
+                {
+                    if (allHero[i].CombatAIBasic.stateControl.CurrStateName.Equals(CombatHeroStateType.Active))
+                    {
+                        isPrepareFinish = false;
+                        break;
+                    }
+                }
+
+                if (isPrepareFinish)
+                {
+                    CombatController.currActiveCombat.isPrepare = false;
+                    //准备完成
+                }
+            }
+
             IHero ihero = FindMinDixtance(allHero, maxCount, 500);
             if (ihero == null)
             {

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -55,6 +55,7 @@ namespace GameLogic.Combat.CombatTool
 
         public bool IsGameOver;
         public bool IsFightState;
+        public bool isPrepare;
 
         public System.Action<bool> combatFinish;
         public float combatTime;

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControlBasic.cs

@@ -94,6 +94,11 @@ namespace GameLogic.Combat.Hero
 
         public void Update(float t)
         {
+            if (CombatController.currActiveCombat.isPrepare)
+            {
+                return;
+            }
+
             for (int i = 0; i < allSkill.Count; i++)
             {
                 allSkill[i].CombatUpdate(t);

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -1,39 +1,69 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using Fort23.UTool;
+using UnityEngine;
 
 namespace GameLogic.Combat.Hero.State
 {
     public class CombatHeroActiveState : CombatHeroStateBasic
     {
+        private Vector3 stratPos;
+        private Vector3 endpos;
+        private float currTime;
+        private ParticleSystemPool loopFx;
+
         public CombatHeroActiveState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
+
         public override bool IsUpdateLockTarget()
         {
             return false;
         }
+
         protected override void ProEnter()
         {
-            combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-            //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-            //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
-            // if (timeLineEventLogicGroup != null)
-            // {
-            //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-            //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
-            //     {
-            //         // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            //         combatHeroEntity.CombatAIBasic.isAlert = false;
-            //     };
-            //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
-            // }
-            // else
-            // {
-            //     // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            //     combatHeroEntity.CombatAIBasic.isAlert = false;
-            //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            // }
+            stratPos = combatHeroEntity.dotPos;
+            currTime = 0;
+            // endpos
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab",
+                delegate(ParticleSystemPool obj)
+                {
+                    loopFx = obj;
+                    obj.own.transform.position = stratPos;
+                });
+            // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+            // // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+            // //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
+            // //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
+            // // if (timeLineEventLogicGroup != null)
+            // // {
+            // //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+            // //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
+            // //     {
+            // //         // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+            // //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            // //         combatHeroEntity.CombatAIBasic.isAlert = false;
+            // //     };
+            // //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+            // // }
+            // // else
+            // // {
+            // //     // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+            // //     combatHeroEntity.CombatAIBasic.isAlert = false;
+            // //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            // // }
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            currTime += t;
+            if (currTime > 2)
+            {
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_show.prefab",
+                    delegate(ParticleSystemPool obj) { obj.own.transform.position = stratPos; });
+                GObjectPool.Instance.Recycle(loopFx);
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            }
         }
     }
 }