From 62f92c982c8d2c02f8b49f8fb0ab667a1e0329a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Sat, 21 Jun 2025 18:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MngView/GroupMngPartnerStatViewAlone.lua  | 73 ++++++++++++-------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
index 9f6fb825..eb498a3d 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
@@ -236,7 +236,23 @@ function M:GetRecordData(index)
         self.lst_record = self._view:GetChild("lst_record")
     end
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res)
+    if group.lev == 1 then
+        ViewUtil.ShowModalWait("获取盟主数据中")
+        self.groupumberTemp = {}
+        self.groupumberTemp.uid = group.owner
+        self.groupumberTemp.nick = group.o_nick
+        self.groupumberTemp.total_round = 0
+        self.groupumberTemp.valid_round = 0
+        self.groupumberTemp.reward_hp = 0
+        self.groupumberTemp.total_win = 0
+        self:RecursionGetPropLog({}, 0)
+    else
+        self:RecursionGetFristData(fgCtr, 0, time_type)
+    end
+end
+
+function M:RecursionGetFristData(fgCtr, index, time_type)
+    fgCtr:FG_GetPartnerStat(self.group_id, index * 67, 67, time_type, self.begin_time, self.end_time, function(res)
         ViewUtil.CloseModalWait()
 
         if res.ReturnCode == 0 then
@@ -246,32 +262,25 @@ function M:GetRecordData(index)
             print("lingmeng self.lst_record2", self.lst_record)
 
             local members = res.Data.members
-            pt(members)
-            if group.lev == 1 then
-                ViewUtil.ShowModalWait("获取盟主数据中")
-                self.groupumberTemp = {}
-                self.groupumberTemp.uid = group.owner
-                self.groupumberTemp.nick = group.o_nick
-                self.groupumberTemp.total_round = 0
-                self.groupumberTemp.valid_round = 0
-                self.groupumberTemp.reward_hp = 0
-                self.groupumberTemp.total_win = 0
-                self:RecursionGetPropLog(members, 0)
-            else
+            if members and #members and #self.record_data == 0 then
                 for i = 1, #members do
                     if members[i].uid == DataManager.SelfUser.account_id then
                         self.record_data[#self.record_data + 1] = members[i]
+                        self:NewRecordTable(0)
+                        return
                     end
                 end
-                if not members or #members == 0 then
+                self:RecursionGetFristData(fgCtr, index + 1, time_type)
+            else
+                if index == 0 and (not members or #members == 0) then
                     ViewUtil.ErrorTip(nil, "你不是合伙人")
                     return
                 end
-                print("lingmeng 合伙人 ", DataManager.SelfUser.account_id)
-                pt(self.record_data)
                 self:NewRecordTable(0)
-                -- self.lst_record.numItems = #self.record_data
             end
+            -- self.lst_record.numItems = #self.record_data
+        else
+            ViewUtil.ErrorTip(res.ReturnCode, "当前成员获取失败")
         end
     end)
 end
@@ -298,8 +307,8 @@ function M:FillRecordItem(data, obj)
 
     local tex_total_score       = obj:GetChild("tex_total_score")
     local ctr_show_total        = obj:GetController("show_total")
-    if data._total_hp then
-        tex_total_score.text = data._total_hp
+    if data.hpall then
+        tex_total_score.text = data.hpall.hp
         ctr_show_total.selectedIndex = 1
     else
         ctr_show_total.selectedIndex = 0
@@ -404,8 +413,8 @@ function M:OnRenderRecordItemNew(obj, mainRecord, root_id)
     obj:GetChild("tex_id").text   = "ID:" .. mainRecord.uid
     local tex_total_score         = obj:GetChild("tex_total_score")
     local ctr_show_total          = obj:GetController("show_total")
-    if mainRecord._total_hp then
-        tex_total_score.text = mainRecord._total_hp
+    if mainRecord.hpall then
+        tex_total_score.text = mainRecord.hpall.hp
         ctr_show_total.selectedIndex = 1
     else
         ctr_show_total.selectedIndex = 0
@@ -582,7 +591,7 @@ function M:RecursionGetNumberRecord(id, root_id, index)
     end
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetDirectMemberStat(self.group_id, id, root_id, index * 10, 10,
+    fgCtr:FG_GetDirectMemberStat(self.group_id, id, root_id, index * 67, 67,
         time_type,
         self.begin_time,
         self.end_time, function(res)
@@ -619,12 +628,20 @@ function M:RecursionGetPropLog(members, index)
             self.groupumberTemp.reward_hp = 0
             self.groupumberTemp.total_win = 0
             ViewUtil.CloseModalWait()
-            self.record_data[1] = self.groupumberTemp
-
-            for i = 1, #members do
-                self.record_data[#self.record_data + 1] = members[i]
-            end
-            self:NewRecordTable(1)
+            fgCtr:FG_GetMembersCount(self.group_id, function(res)
+                ViewUtil.CloseModalWait()
+                if res.ReturnCode == 0 then
+                    self.groupumberTemp.hpall = {}
+                    self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp
+                    self.record_data[1] = self.groupumberTemp
+                    -- for i = 1, #members do
+                    --     self.record_data[#self.record_data + 1] = members[i]
+                    -- end
+                    self:NewRecordTable(1)
+                else
+                    ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值")
+                end
+            end)
         end
         -- self.lst_record.numItems = #self.record_data
     end)