Browse Source

雅集祈福修改

huangxiaoyue 1 year ago
parent
commit
b615ec1a57

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Data/VO/LeagueData.cs

@@ -23,6 +23,7 @@ namespace GFGGame
         public long WeekContribution;//本周贡献值
         public long AllContribution;//累计贡献值
         public long JoinLeagueTime;//加入联盟时间
+        public long AllCoin;//累计资金
     }
 
     public class LeagueListData

+ 2 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -256,6 +256,7 @@ namespace GFGGame
             {
                 leagueData.LeagueMemberDatas[message.RoleId].WeekContribution = message.WeekContribution;
                 leagueData.LeagueMemberDatas[message.RoleId].AllContribution = message.AllContribution;
+                leagueData.LeagueMemberDatas[message.RoleId].AllCoin = message.AllCoin;
             }
 
             await ETTask.CompletedTask;
@@ -850,6 +851,7 @@ namespace GFGGame
             memberData.WeekContribution = memberDetailInfoProto.WeekContribution;
             memberData.AllContribution = memberDetailInfoProto.AllContribution;
             memberData.JoinLeagueTime = memberDetailInfoProto.JoinLeagueTime;
+            memberData.AllCoin = memberDetailInfoProto.AllCoin;
             return memberData;
         }
 

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -252,8 +252,8 @@ namespace GFGGame
 
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId, memberData.RoleInfo.roleLv);
             item.m_txtName.text = memberData.RoleInfo.roleName;
-            item.m_txtWeekContribuation.text = memberData.WeekContribution.ToString();
             item.m_txtAllContribuation.text = memberData.AllContribution.ToString();
+            item.m_txtWeekContribuation.text = memberData.AllCoin.ToString();
             // item.m_loaTitle.visible = memberData.Pos != LeaguePos.Member;
             item.m_loaTitle.url = memberData.Pos == LeaguePos.Member ? "" : string.Format("ui://League/lm_chenghao_{0}", memberData.Pos);
             if (memberData.RoleInfo.offlineTimeSec == 0)
@@ -304,8 +304,8 @@ namespace GFGGame
                 if (memberDataA.Pos != LeaguePos.Flower && memberDataB.Pos == LeaguePos.Flower) return 1;
                 if (memberDataA.RoleInfo.offlineTimeSec == 0 && memberDataB.RoleInfo.offlineTimeSec != 0) return -1;
                 if (memberDataA.RoleInfo.offlineTimeSec != 0 && memberDataB.RoleInfo.offlineTimeSec == 0) return 1;
-                if (memberDataA.WeekContribution > memberDataB.WeekContribution) return -1;
-                if (memberDataA.WeekContribution < memberDataB.WeekContribution) return 1;
+                if (memberDataA.AllCoin > memberDataB.AllCoin) return -1;
+                if (memberDataA.AllCoin < memberDataB.AllCoin) return 1;
                 if (memberDataA.AllContribution > memberDataB.AllContribution) return -1;
                 if (memberDataA.AllContribution < memberDataB.AllContribution) return 1;
                 if (memberDataA.RoleInfo.roleLv > memberDataB.RoleInfo.roleLv) return -1;

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes