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

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -64,7 +64,7 @@ namespace GameLogic.Hero
         {
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-            int allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
             heroData.exp += allexp;
             heroData.exp -= powerUpConfig.levelUpExp;
             heroData.upTime = TimeHelper.ClientNow();

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -678,7 +678,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public int heroPowerId;
 
-        public int exp;
+        public float exp;
 
         public long upTime;
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -187,7 +187,7 @@ namespace Fort23.Mono
             //扣除失败后的经验
             float failbl = failBl == 0 ? PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce : (float)(PlayerManager.Instance.myHero.powerUpConfig.FailureExpReduce * failBl * 0.01f);
             int failXw = (int)(PlayerManager.Instance.myHero.powerUpConfig.levelUpExp * failbl * 0.01f);
-            int allexp = HeroHerlp.GetHeroExp();
+            float allexp = HeroHerlp.GetHeroExp();
             PlayerManager.Instance.myHero.heroData.exp += allexp;
             PlayerManager.Instance.myHero.heroData.exp -= failXw;
             PlayerManager.Instance.myHero.heroData.upTime = TimeHelper.ClientNow();

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroHerlp.cs

@@ -119,11 +119,11 @@ namespace Fort23.Mono
             return heroAttributeDataList;
         }
 
-        public static int GetHeroExp()
+        public static float GetHeroExp()
         {
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-            int allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
             return allexp;
         }
     }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -91,7 +91,7 @@ namespace Fort23.Mono
                 {
                     int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-                    int allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+                    float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
                     if (PlayerManager.Instance.myHero.heroData.exp + allexp < PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
                     {
                         return;
@@ -159,9 +159,9 @@ namespace Fort23.Mono
             Text_Level.text = $"LV{PlayerManager.Instance.myHero.level}";
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-            int allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
 
-            int miao = (PlayerManager.Instance.myHero.powerUpConfig.levelUpExp - (PlayerManager.Instance.myHero.heroData.exp + allexp)) / PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp - (PlayerManager.Instance.myHero.heroData.exp + allexp)) / PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
                 Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{miao}秒";
@@ -189,13 +189,13 @@ namespace Fort23.Mono
         {
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-            int allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
 
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
 
             Text_exp.text = $"{PlayerManager.Instance.myHero.heroData.exp + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
-            int miao = (PlayerManager.Instance.myHero.powerUpConfig.levelUpExp - (PlayerManager.Instance.myHero.heroData.exp + allexp)) / PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp - (PlayerManager.Instance.myHero.heroData.exp + allexp)) / PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
                 Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{miao}秒";

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -259,7 +259,7 @@ namespace Fort23.Mono
 
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
 
-            int allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
 
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
         }

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs

@@ -68,7 +68,7 @@ namespace Fort23.Mono
                     }
                     else
                     {
-                        DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(qiankundaiConfig.DropCount[i]);
+                        DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(qiankundaiConfig.ChoukaID[i]);
                         foreach (var i1 in dropConfig.showItemId)
                         {
                             WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);