Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -234,8 +234,13 @@ namespace GFGGame
             {
                 List<int> skillLvsA = SkillDataManager.Instance.GetCardSkillLvs(a.id);
                 List<int> skillLvsB = SkillDataManager.Instance.GetCardSkillLvs(b.id);
-                double addA = a.scores[scoreType] * ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.CLICK_SCORE / ConstScoreSystem.PART_SCORE * 6d;
-                double addB = b.scores[scoreType] * ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.CLICK_SCORE / ConstScoreSystem.PART_SCORE * 6d;
+                //start===============================
+                //double addA = a.scores[scoreType] * ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.CLICK_SCORE / ConstScoreSystem.PART_SCORE * 6d;
+                //double addB = b.scores[scoreType] * ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.CLICK_SCORE / ConstScoreSystem.PART_SCORE * 6d;
+                //因为这里只是排序，不需要计算完整分数
+                //end=================================
+                double addA = a.scores[scoreType];
+                double addB = b.scores[scoreType];
                 double scoreA = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, a.id, a.scores[scoreType], skillLvsA) + addA;
                 double scoreB = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, b.id, b.scores[scoreType], skillLvsB) + addB;
                 if (scoreA < scoreB)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_TaskListItem.cs

@@ -15,7 +15,7 @@ namespace UI.CommonGame
         public GList m_listTaskReward;
         public UI_Button22 m_GetRewardBt;
         public UI_Button22 m_ComeBt;
-        public UI_Button22 m_GetRewardBt_2;
+        public UI_Button22 m_GetRewardBt1;
         public GProgressBar m_taskBar;
         public const string URL = "ui://eg2y0ldplh8v5";
         public const string PACKAGE_NAME = "CommonGame";
@@ -72,7 +72,7 @@ namespace UI.CommonGame
             m_listTaskReward = (GList)comp.GetChild("listTaskReward");
             m_GetRewardBt = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt"));
             m_ComeBt = (UI_Button22)UI_Button22.Create(comp.GetChild("ComeBt"));
-            m_GetRewardBt_2 = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt"));
+            m_GetRewardBt1 = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt1"));
             m_taskBar = (GProgressBar)comp.GetChild("taskBar");
         }
         public void Dispose(bool disposeTarget = false)
@@ -87,8 +87,8 @@ namespace UI.CommonGame
             m_GetRewardBt = null;
             m_ComeBt.Dispose();
             m_ComeBt = null;
-            m_GetRewardBt_2.Dispose();
-            m_GetRewardBt_2 = null;
+            m_GetRewardBt1.Dispose();
+            m_GetRewardBt1 = null;
             m_taskBar = null;
             if(disposeTarget && target != null)
             {