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

Assets/Res/Config/FabaoConfig.json

@@ -16,22 +16,6 @@
       ],
       "SkillGroupID": 3101
     },
-    {
-      "ID": 10002,
-      "ItemID": 10002,
-      "name": "破天斧",
-      "Type": 1,
-      "magicAttribute": 1,
-      "model": "fb_xuanguidun",
-      "fragmentID": 11002,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3102
-    },
     {
       "ID": 10003,
       "ItemID": 10003,
@@ -48,38 +32,6 @@
       ],
       "SkillGroupID": 3201
     },
-    {
-      "ID": 10004,
-      "ItemID": 10004,
-      "name": "混沌珠",
-      "Type": 1,
-      "magicAttribute": 2,
-      "model": "fb_3202",
-      "fragmentID": 11004,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3202
-    },
-    {
-      "ID": 10005,
-      "ItemID": 10005,
-      "name": "琉璃宝塔",
-      "Type": 1,
-      "magicAttribute": 2,
-      "model": "fb_linglongta",
-      "fragmentID": 11005,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3203
-    },
     {
       "ID": 10006,
       "ItemID": 10006,
@@ -96,54 +48,6 @@
       ],
       "SkillGroupID": 3301
     },
-    {
-      "ID": 10007,
-      "ItemID": 10007,
-      "name": "玉莲守心灯",
-      "Type": 1,
-      "magicAttribute": 4,
-      "model": "fb_3302",
-      "fragmentID": 11007,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3302
-    },
-    {
-      "ID": 10008,
-      "ItemID": 10008,
-      "name": "融灵塔",
-      "Type": 1,
-      "magicAttribute": 8,
-      "model": "fb_3401",
-      "fragmentID": 11008,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3401
-    },
-    {
-      "ID": 10009,
-      "ItemID": 10009,
-      "name": "禁元珠",
-      "Type": 1,
-      "magicAttribute": 8,
-      "model": "fb_BossPing",
-      "fragmentID": 11009,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3402
-    },
     {
       "ID": 10010,
       "ItemID": 10010,
@@ -159,22 +63,6 @@
         100
       ],
       "SkillGroupID": 3501
-    },
-    {
-      "ID": 10011,
-      "ItemID": 10011,
-      "name": "天殇血刃剑",
-      "Type": 1,
-      "magicAttribute": 16,
-      "model": "fb_ding1",
-      "fragmentID": 11011,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3502
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -2,23 +2,23 @@
   "configList": [
     {
       "ID": 1,
-      "txt": "亞瑟·龍焰"
+      "txt": "主角"
     },
     {
       "ID": 2,
-      "txt": "萊恩·天戟"
+      "txt": "小怪1"
     },
     {
       "ID": 3,
-      "txt": "達米安·虎嘯"
+      "txt": "小怪2"
     },
     {
       "ID": 4,
-      "txt": "維克多·鐵拳"
+      "txt": "小怪3"
     },
     {
       "ID": 5,
-      "txt": "加雷斯·風暴"
+      "txt": "BOSS1"
     },
     {
       "ID": 6,

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -148,8 +148,8 @@ namespace GameLogic.Combat.CombatType
                 cTaskAwaitBuffer.AddTask(heroEntity.InitForObject(gameObjectPool,new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
                     delegate(CombatHeroEntity entity)
                     {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
-                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        // entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
                         combatController.CombatHeroController.AddHero(entity);
                         CombatController.currActiveCombat.playerHeroEntity = heroEntity;
                     }, isPlayer: true));
@@ -163,8 +163,8 @@ namespace GameLogic.Combat.CombatType
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
                     delegate(CombatHeroEntity entity)
                     {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
-                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
+                        // entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
                         combatController.CombatHeroController.AddHero(entity);
                         CombatController.currActiveCombat.playerHeroEntity = heroEntity;
                     }, isPlayer: true));

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

@@ -241,8 +241,10 @@ public class CombatHeroInfo
     protected void CalBasicAttribute()
     {
         _AttributeCacheValue.Clear();
+        modelID=modelConfig.ID;
         if (isMonster)
         {
+           
             unLockSkills.Clear();
             hp = (EncryptionLong)(modelConfig.hp * MonsterPowerUpConfig.HPFactor);
             defense = (EncryptionLong)(modelConfig.def * MonsterPowerUpConfig.DEFFactor);

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -63,7 +63,7 @@ namespace GameLogic.Combat
             StartCombatInfo startCombatInfo = new StartCombatInfo();
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             await StartCombat(startCombatInfo);
-            levelBattleId = 100004;
+
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;
             if (levelBattleCombatType != null)
             {