diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index be8e046a..acdcdbbc 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -987,11 +987,10 @@ function M:OnUpdate() local func = self._gamectr:PopEvent() if (func ~= nil) then local result, resultInfo = pcall(func) - print("lingmeng PopEvent", result, resultInfo) if result then else - printlog("lingmeng eror", resultInfo) + error(resultInfo) self._gamectr = ControllerManager.GetController(GameController) if self._gamectr then self._gamectr:ResetConnect() 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 463d8bc8..df687a09 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua @@ -19,6 +19,7 @@ end function M:initData() self.lst_record.numItems = 0 self.record_data = {} + self.ctr_search = self._view:GetController('search') local now_time = os.date("*t", now) local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) @@ -44,12 +45,32 @@ function M:NewRecordTable(lev) obj:GetController("more").selectedIndex = 1 end +function M:NewRecordTableFind(data) + self.record_total_data_Find = {} + local item_result = self._view:GetChild('lst_member_find') + item_result:RemoveChildren() + + local mainRecord = data + local obj = self.item_result:AddItemFromPool() + self:OnRenderRecordItemNew(obj, mainRecord) + local tempTable = {} + tempTable.obj = obj + tempTable.father = DataManager.SelfUser.account_id + tempTable.childCount = 0 + tempTable.list = obj:GetChild("lst_record") + tempTable.list.height = 0 + self.record_total_data_Find[mainRecord.uid] = tempTable + obj:GetController("more").selectedIndex = 1 +end + function M:NewRecordTableChildHou(table, isMe, fatherId) + local show_total_table = self.ctr_search.selectedIndex == 0 and self.record_total_data or self + .record_total_data_Find isMe = isMe or 0 print("lingmeng NewRecordTableChild", isMe, fatherId) pt(table) local childNum = #table - isMe - local fatherList = self.record_total_data[fatherId].list + local fatherList = show_total_table[fatherId].list self:RecursionChangeHeight(fatherId, childNum) for i = 1 + isMe, childNum + isMe do local mainRecord = table[i] @@ -63,21 +84,24 @@ function M:NewRecordTableChildHou(table, isMe, fatherId) tempTable.list = obj:GetChild("lst_record") tempTable.list.height = 0 tempTable.obj.height = 113 - self.record_total_data[mainRecord.uid] = tempTable + show_total_table[mainRecord.uid] = tempTable end + self.lst_record.scrollPane:SetPosY(self.lastY or 0, false) end function M:NewRecordTableChildQian(table, isMe, fatherId) + local show_total_table = self.ctr_search.selectedIndex == 0 and self.record_total_data or self + .record_total_data_Find isMe = isMe or 0 print("lingmeng NewRecordTableChild", isMe, fatherId) pt(table) local childNum = #table - isMe - local fatherList = self.record_total_data[fatherId].list - if self.record_total_data[fatherId].showMumber then + local fatherList = show_total_table[fatherId].list + if show_total_table[fatherId].showMumber then ViewUtil.ErrorTip(nil, "已展示全部普通成员") return end - self.record_total_data[fatherId].showMumber = true + show_total_table[fatherId].showMumber = true self:RecursionChangeHeight(fatherId, childNum) for i = 1 + isMe, childNum + isMe do local mainRecord = table[i] @@ -91,8 +115,9 @@ function M:NewRecordTableChildQian(table, isMe, fatherId) tempTable.list = obj:GetChild("lst_record") tempTable.list.height = 0 tempTable.obj.height = 113 - self.record_total_data[mainRecord.uid] = tempTable + show_total_table[mainRecord.uid] = tempTable end + self.lst_record.scrollPane:SetPosY(self.lastY or 0, false) end -- function M:ShowPeopleNum() @@ -203,25 +228,21 @@ function M:InitView() else self._view:GetChild('tex_id').text = '' ctr_search.selectedIndex = 1 - local item_result = self._view:GetChild('lst_member_find') - item_result:RemoveChildren() - - for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillRecordItem(res.Data.members[j], tem) - end + self.item_result = self._view:GetChild('lst_member_find') + self.item_result:RemoveChildren() + self:NewRecordTableFind(res.Data.members[1]) end end ) end ) - local btn_back = self._view:GetChild('btn_back') - btn_back.onClick:Set( - function() - self.lst_record.numItems = #self.record_data - end - ) + -- local btn_back = self._view:GetChild('btn_back') + -- btn_back.onClick:Set( + -- function() + -- self.lst_record.numItems = #self.record_data + -- end + -- ) end function M:GetRecordData(index) @@ -480,9 +501,13 @@ function M:MoreChanged(context, id) if self.begin_time ~= nil and self.end_time ~= nil then time_type = 0 end + local show_total_table = self.ctr_search.selectedIndex == 0 and self.record_total_data or + self.record_total_data_Find + self.lastY = self.lst_record.scrollPane.posY if context.sender.selectedIndex == 1 then self.record_data = {} - local myInfo = self.record_total_data[id] + + local myInfo = show_total_table[id] pt(myInfo, id, self.group_id) if myInfo then ViewUtil:ShowModalWait() @@ -509,7 +534,7 @@ function M:MoreChanged(context, id) ViewUtil.ErrorTip(nil, "统计页面失效,请重新打开") end else - local info = self.record_total_data[id] + local info = show_total_table[id] info.list:RemoveChildrenToPool() self:RecursionChangeHeight(id, -info.childCount) end @@ -714,11 +739,22 @@ function M:RecursionGetAllRecordData(index, id, root_id) end function M:RecursionChangeHeight(fatherId, childNum) - self.record_total_data[fatherId].childCount = self.record_total_data[fatherId].childCount + childNum - self.record_total_data[fatherId].list.height = self.record_total_data[fatherId].list.height + childNum * 113 - self.record_total_data[fatherId].obj.height = self.record_total_data[fatherId].obj.height + childNum * 113 - if self.record_total_data[fatherId].father ~= nil then - self:RecursionChangeHeight(self.record_total_data[fatherId].father, childNum) + if self.ctr_search.selectedIndex == 0 then + self.record_total_data[fatherId].childCount = self.record_total_data[fatherId].childCount + childNum + self.record_total_data[fatherId].list.height = self.record_total_data[fatherId].list.height + childNum * 113 + self.record_total_data[fatherId].obj.height = self.record_total_data[fatherId].obj.height + childNum * 113 + if self.record_total_data[fatherId].father ~= nil then + self:RecursionChangeHeight(self.record_total_data[fatherId].father, childNum) + end + else + self.record_total_data_Find[fatherId].childCount = self.record_total_data_Find[fatherId].childCount + childNum + self.record_total_data_Find[fatherId].list.height = self.record_total_data_Find[fatherId].list.height + + childNum * 113 + self.record_total_data_Find[fatherId].obj.height = self.record_total_data_Find[fatherId].obj.height + + childNum * 113 + if self.record_total_data_Find[fatherId].father ~= nil and self.record_total_data_Find[fatherId].father ~= DataManager.SelfUser.account_id then + self:RecursionChangeHeight(self.record_total_data_Find[fatherId].father, childNum) + end end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua index 8b8eab02..69507cab 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua @@ -412,7 +412,9 @@ function M:CmdAddCard(cmd, index) data.cmd = cmd.cmd local _room = self._room local u = data.player_card_data[cmd.seat] - u.card_list[#u.card_list + 1] = cmd.data.card + if u then + u.card_list[#u.card_list + 1] = cmd.data.card + end --pt(u.card_list) end diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml index f625aa9d..8164635b 100644 --- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml +++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml @@ -2,7 +2,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -88,15 +88,15 @@ - +