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

Assets/Res/Config/GroupConfig.json

@@ -757,10 +757,10 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        5
+        200
       ],
       "GroupMonster": [
-        9002
+        9005
       ]
     },
     {

Assets/Res/Config/HeroModelConfig.json

@@ -58,6 +58,64 @@
       ],
       "heroStory": 0
     },
+    {
+      "ID": 102,
+      "nickName": -1,
+      "name": 1,
+      "headicon": "icon_tx102",
+      "model": "Nanzhu",
+      "isUseGpu": false,
+      "heroType": 1,
+      "attack": 250,
+      "hp": 250,
+      "def": 100,
+      "shield": 250,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        2006,
+        1103,
+        -1,
+        2011,
+        1105,
+        -1,
+        2003,
+        1101,
+        2012,
+        1102
+      ],
+      "skillActiveLv": [
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fa_bao_id": [
+        10010,
+        10001,
+        10006,
+        10002
+      ],
+      "fabaoActiveLv": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "heroStory": 0
+    },
     {
       "ID": 1001,
       "nickName": -1,
@@ -1163,7 +1221,7 @@
       "nickName": -1,
       "name": 5,
       "headicon": "icon_tx9005",
-      "model": "Boss_fenghuang",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 4,
       "attack": 270,
@@ -1179,16 +1237,16 @@
         100
       ],
       "skillID": [
+        2005,
+        1404,
+        2002,
+        1401,
+        2007,
         -1,
-        9061,
-        -1,
-        9064,
-        9062,
-        9063,
-        -1,
-        -1,
-        -1,
-        9063
+        1402,
+        2017,
+        1403,
+        -1
       ],
       "skillActiveLv": [
         1,
@@ -1203,10 +1261,10 @@
         1
       ],
       "fa_bao_id": [
-        -1,
-        -1,
-        -1,
-        -1
+        10007,
+        10010,
+        10002,
+        10004
       ],
       "fabaoActiveLv": [
         1,

Assets/Res/Config/LevelbattleConfig.json

@@ -543,7 +543,7 @@
     {
       "ID": 10001,
       "Group": [
-        100001
+        10001
       ],
       "combatTime": 120.0,
       "combatType": 1,

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/CombatType/LevelBattleCombatType.cs

@@ -180,14 +180,18 @@ namespace GameLogic.Combat.CombatType
             heroEntity.IsEnemy = false;
             heroEntity.number = 0;
 
-
+            HeroInfo heroInfo = PlayerManager.Instance.myHero;
+            if (_startCombatInfo.levelBattleId== 10001)
+            {
+                heroInfo = PlayerManager.Instance.yindaoHeroData;
+            }
             if (CombatController.currActiveCombat.playerHeroEntity != null)
             {
                 GameObjectPool gameObjectPool = CombatController.currActiveCombat.playerHeroEntity.combatHeroGameObject
                     .GameObjectPool;
                 Vector3 pos = gameObjectPool.own.transform.position;
                 await (heroEntity.InitForObject(gameObjectPool, new CombatHeroAi(),
-                    PlayerManager.Instance.myHero, pos,
+                    heroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
                         // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
@@ -198,11 +202,13 @@ namespace GameLogic.Combat.CombatType
             }
             else
             {
+                
+
                 Vector3 heroPoint = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
                 CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                     Vector3.forward);
                 Vector3 pos = heroPoint;
-                await (heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
+                await (heroEntity.Init(new CombatHeroAi(), heroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
                         // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);

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

@@ -43,7 +43,6 @@ namespace GameLogic.Combat.Hero
         /// </summary>
         public SkillBasic taoismSkillBasic;
 
-        
 
         public SkillTurntable SkillTurntable;
 
@@ -58,7 +57,15 @@ namespace GameLogic.Combat.Hero
             }
             else
             {
-                await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
+                if (_combatHeroEntity.CurrCombatHeroInfo.MonsterPowerUpConfig.ID > 0)
+                {
+                    await SetNewSkill(_combatHeroEntity.CurrCombatHeroInfo.unLockSkills.ToArray());
+                }
+                else
+
+                {
+                    await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
+                }
             }
 
             InitTaoismSkill(_combatHeroEntity.CurrCombatHeroInfo.TaoismSkillId);
@@ -96,14 +103,14 @@ namespace GameLogic.Combat.Hero
                 float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum *
                     PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    cd + SkillTurntable.skillAddSkillCd+_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
+                    cd + SkillTurntable.skillAddSkillCd + _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
             }
             else
             {
                 float cd = (SkillTurntable.skillCount * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill) /
                            1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    cd + SkillTurntable.skillAddSkillCd+_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
+                    cd + SkillTurntable.skillAddSkillCd + _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
             }
         }
 
@@ -128,7 +135,6 @@ namespace GameLogic.Combat.Hero
             skill.DelayUseSkillCd = 0.5f;
 
             SkillCommands.Add(skill);
-          
         }
 
         public void RemoveCommandSkill(SkillBasic skill)
@@ -179,7 +185,6 @@ namespace GameLogic.Combat.Hero
             // SkillBasic skillBasic = null;
             for (int i = 0; i < SkillCommands.size; i++)
             {
-               
                 if (!SkillCommands[i].IsCanUse())
                 {
                     continue;

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -61,7 +61,7 @@ public class PlayerManager : Singleton<PlayerManager>
     private TimerEntity _timerEntity;
 
     public bool isLogin;
-    
+
     /// <summary>
     /// 当前引导id
     /// </summary>
@@ -300,16 +300,17 @@ public class PlayerManager : Singleton<PlayerManager>
         myHero.TaoismSkillId = 601011;
 
 
-        HeroInfo yindaoHeroData = new HeroInfo();
-        yindaoHeroData.InitHero(AccountFileInfo.Instance.playerData.yindaoHeroData);
-        yindaoHeroData = heroInfo;
+        yindaoHeroData = new HeroInfo();
+        yindaoHeroData.InitMonster(102, 200);
+        yindaoHeroData.isMonster = false;
+        // yindaoHeroData = heroInfo;
         yindaoHeroData.TaoismSkillId = 601011;
-
+        // myHero= yindaoHeroData;
         BagController.Init();
 
         //初始化关卡
         CurrentsmallPlaces = GetSmallPlacesData(GetMaxSmallPlacesId());
-      
+
         StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
     }
@@ -399,7 +400,9 @@ public class PlayerManager : Singleton<PlayerManager>
                 isUpdate = true;
                 keyValuePair.isLeave = true;
 
-                AccountFileInfo.DaoYouData daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(d => d.id == keyValuePair.daoyouDataID);
+                AccountFileInfo.DaoYouData daoYouData =
+                    AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(d =>
+                        d.id == keyValuePair.daoyouDataID);
 
                 DaoyouModelConfig daoyouModelConfig =
                     ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
@@ -449,54 +452,58 @@ public class PlayerManager : Singleton<PlayerManager>
             isUpdate = false;
         }
     }
-    
-        public async void ChangeMap(int mapId)
+
+    public async void ChangeMap(int mapId)
+    {
+        SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
+        if (smallPlacesConfig.ID == 0)
+            return;
+        AccountFileInfo.SmallPlacesData lastSmallPlacesData =
+            PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
+        SmallPlacesConfig lastSmallPlacesConfig =
+            ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesConfig.ID - 1);
+        if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null ||
+                                         lastSmallPlacesData.completionEventCount <
+                                         lastSmallPlacesConfig.CompletionEventCount))
         {
+            return;
+        }
 
-            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
-            if (smallPlacesConfig.ID == 0)
-                return;
-            AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
-            SmallPlacesConfig lastSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesConfig.ID - 1);
-            if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null || lastSmallPlacesData.completionEventCount < lastSmallPlacesConfig.CompletionEventCount))
+        if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+        {
+            AccountFileInfo.EventList eventList =
+                AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                    ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+            if (eventList == null || !eventList.isCompleted)
             {
                 return;
             }
+        }
 
-            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
-            {
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
-                if (eventList == null || !eventList.isCompleted)
-                {
-                 
-                    return;
-                }
-            }
+        AccountFileInfo.SmallPlacesData smallPlacesData =
+            PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
-            AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
+        if (smallPlacesData == null)
+        {
+            smallPlacesData = new AccountFileInfo.SmallPlacesData();
+            smallPlacesData.id = smallPlacesConfig.ID;
+            AccountFileInfo.Instance.playerData.smallPlacesDatas.Add(smallPlacesData);
+        }
 
-            if (smallPlacesData == null)
-            {
-                smallPlacesData = new AccountFileInfo.SmallPlacesData();
-                smallPlacesData.id = smallPlacesConfig.ID;
-                AccountFileInfo.Instance.playerData.smallPlacesDatas.Add(smallPlacesData);
-            }
 
+        AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.ID);
+        if (currentPlacesData == null)
+        {
+            currentPlacesData = new AccountFileInfo.PlacesData();
+            currentPlacesData.id = smallPlacesConfig.PlacesId;
+            AccountFileInfo.Instance.playerData.placesDatas.Add(currentPlacesData);
+        }
 
-            AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.ID);
-            if (currentPlacesData == null)
-            {
-                currentPlacesData = new AccountFileInfo.PlacesData();
-                currentPlacesData.id = smallPlacesConfig.PlacesId;
-                AccountFileInfo.Instance.playerData.placesDatas.Add(currentPlacesData);
-            }
+        PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
 
-            PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
-            
 
-  
-            EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
-        }
+        EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
+    }
 
     public void QianKunDaiAward()
     {
@@ -569,10 +576,15 @@ public class PlayerManager : Singleton<PlayerManager>
     public void CalculateOfflineRewards()
     {
         // return;
-        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime && AccountFileInfo.Instance.playerData.ExitTime > 0)
+        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <=
+            PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime &&
+            AccountFileInfo.Instance.playerData.ExitTime > 0)
         {
             int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
-            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao : miao;
+            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >=
+                   PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime
+                ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao
+                : miao;
             AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
             for (int i = 0; i < miao; i++)
             {

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -66,6 +66,7 @@ namespace GameLogic.Combat
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             startCombatInfo.isCombatOverUi = isCombatOverUi;
             startCombatInfo.monsterLevel = level;
+            startCombatInfo.levelBattleId= levelBattleId;
             await StartCombat(startCombatInfo);
 
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;