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

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -16,7 +16,7 @@ namespace GameLogic.Hero
         {
             FabaoConfig = ConfigComponent.Instance.Get<FabaoConfig>(id);
             FabaoPowerupConfig = ConfigComponent.Instance.Get<FabaoPowerupConfig>(powerupId);
-            star = FabaoConfig.Star;
+            star = 1;
         }
     }
 }

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -64,14 +64,14 @@ namespace GameLogic.Hero
 
                 for (int i = 0; i < star; i++)
                 {
-                    if (faBaoInfo.FabaoConfig.StarupShuxingIDs.Length <= i)
-                    {
-                        break;
-                    }
-
-                    int shuxingID = faBaoInfo.FabaoConfig.StarupShuxingIDs[i];
-                    int shuxingValue = faBaoInfo.FabaoConfig.StarupShuxingValues[i];
-                    ComputeHeroAttributeType(shuxingID, shuxingValue);
+                    // if (faBaoInfo.FabaoConfig.StarupShuxingIDs.Length <= i)
+                    // {
+                    //     break;
+                    // }
+                    //
+                    // int shuxingID = faBaoInfo.FabaoConfig.StarupShuxingIDs[i];
+                    // int shuxingValue = faBaoInfo.FabaoConfig.StarupShuxingValues[i];
+                    // ComputeHeroAttributeType(shuxingID, shuxingValue);
                 }
             }
 

Assets/Scripts/GameLogic/Player/GongFaControl.cs

@@ -76,8 +76,7 @@ namespace GameLogic.Player
             for (var i = 0; i < allSkill.Count; i++)
             {
                 allSkill[i].index = -1;
-                AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.First(s => s.id == allSkill[i].skillConfig.IDGroup);
-                skillData.useIndex = -1;
+                allSkill[i].SkillData.useIndex = -1;
             }
 
             for (var i = 0; i < allUseSkill.Length; i++)
@@ -86,8 +85,7 @@ namespace GameLogic.Player
                 if (allUseSkill[i] != null)
                 {
                     allUseSkill[i].index = i;
-                    AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.First(s => s.id == allSkill[i].skillConfig.IDGroup);
-                    skillData.useIndex = i;
+                    allUseSkill[i].SkillData.useIndex = i;
                 }
             }