diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index c8c25ae9..0e6c74e4 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -15,7 +15,7 @@ local MngPermission = import('.MngPermission') local GroupMngMemberHpListView = { numberMap = { {}, {} }, backTable = {}, - pageNum = 20, + pageNum = 10, start = 1, page = 1 } @@ -163,6 +163,7 @@ function M:FillView() local tempTable = self.numberMap[tempIndex[1]][tempIndex[2]] self.lst_member_find.numItems = #tempTable else + self.backTable = {} self._ctr_search.selectedIndex = 0 self.lst_member.numItems = self:GetChildNumForPage() end @@ -233,9 +234,17 @@ function M:GetMemberData(index) if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') else - self.member_data = group.members + self.all_member_data = group.members + self.member_data = self.all_member_data + -- self.member_data = {} + -- for i = 1, #self.all_member_data do + -- local number = self.all_member_data[i] + -- if number.uid == DataManager.SelfUser.account_id or number.parentId == DataManager.SelfUser.account_id then + -- table.insert(self.member_data, number) + -- end + -- end + self.page = math.ceil(#self.member_data / self.pageNum) self.lst_member.numItems = self:GetChildNumForPage() - self.page = math.ceil(#group.members / self.pageNum) self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) if index == 0 then -- self._view:GetChild('tex_memb_num').text = res.Data.member_num @@ -479,8 +488,8 @@ function M:FillItem(obj, member, refresh, index) local tempNumberList = self.numberMap[2][text] if tempNumberList == nil then tempNumberList = {} - for j = 1, #self.member_data do - local number = self.member_data[j] + for j = 1, #self.all_member_data do + local number = self.all_member_data[j] if number.uid == text then table.insert(tempNumberList, number) end @@ -502,8 +511,8 @@ function M:FillItem(obj, member, refresh, index) local tempNumberList = self.numberMap[1][text] if tempNumberList == nil then tempNumberList = {} - for j = 1, #self.member_data do - local number = self.member_data[j] + for j = 1, #self.all_member_data do + local number = self.all_member_data[j] if number.parentId == text then table.insert(tempNumberList, number) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua index 9dbd610a..20e79fa9 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -509,6 +509,44 @@ function M:FillItem(obj, member, refresh) ) end ) + + obj:GetController('all').selectedIndex = 0 + obj:GetChild("all_btn").onClick:Set( + function() + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + if member.lev == 1 then + fgCtr:FG_GetMembersCount(self.group_id, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + obj:GetChild("tex_all").text = d2ad(res.Data.hp_num1 + res.Data.otherHp) + obj:GetController('all').selectedIndex = 1 + else + ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值") + end + end) + else + fgCtr:FG_GetTotalHp(self.group_id, member.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local hp = d2ad(res.Data.hp) + obj:GetChild("tex_all").text = hp + obj:GetController('all').selectedIndex = 1 + else + fgCtr:FG_FindMember(self.group_id, member.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！") + else + obj:GetChild("tex_all").text = d2ad(res.Data.members[1].hp) + obj:GetController('all').selectedIndex = 1 + end + end) + end + end) + end + end + ) end function M:OnRenderItem(index, obj) 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 d3249af2..7559f1ff 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua @@ -155,7 +155,7 @@ end function M:GetRecordData(index) ViewUtil.ShowModalWait() - + local group = DataManager.groups:get(self.group_id) local time_type = self._view:GetController("type").selectedIndex if self.begin_time ~= nil and self.end_time ~= nil then time_type = 0 @@ -167,12 +167,37 @@ function M:GetRecordData(index) if res.ReturnCode == 0 then local members = res.Data.members - -- printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc") - -- pt(members) - for i = 1, #members do - self.record_data[#self.record_data + 1] = members[i] + printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc") + pt(members) + if group.lev == 1 then + ViewUtil.ShowModalWait() + fgCtr:FG_GetPropLog(self.group_id, 0, 8, self.begin_time, self.end_time, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") + else + local info = res.Data + self.groupumberTemp = {} + self.groupumberTemp.uid = group.owner + self.groupumberTemp.nick = group.o_nick + self.groupumberTemp.total_round = info.count + self.groupumberTemp.valid_round = info.valid_count * 100 + self.groupumberTemp.reward_hp = 0 + self.groupumberTemp.total_win = 0 + self.record_data[1] = self.groupumberTemp + for i = 1, #members do + self.record_data[#self.record_data + 1] = members[i] + end + self.lst_record.numItems = #self.record_data + end + end) + else + self.record_data[1] = self.groupumberTemp + for i = 1, #members do + self.record_data[#self.record_data + 1] = members[i] + end + self.lst_record.numItems = #self.record_data end - self.lst_record.numItems = #self.record_data end end) end @@ -189,13 +214,16 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng) end function M:FillRecordItem(data, obj) - local group = DataManager.groups:get(self.group_id) + local group = DataManager.groups:get(self.group_id) + if group.lev == 1 then + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + else + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) .. "(" .. data.total .. ")" + end + obj:GetChild("tex_id").text = "ID:" .. data.uid - obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) .. "(" .. data.total .. ")" - obj:GetChild("tex_id").text = "ID:" .. data.uid - - local tex_total_score = obj:GetChild("tex_total_score") - local ctr_show_total = obj:GetController("show_total") + 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 ctr_show_total.selectedIndex = 1 @@ -213,17 +241,29 @@ function M:FillRecordItem(data, obj) btn_check_members.onClick:Set(function() ViewUtil.ShowModalWait(self._root_view) local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode == 0 then - local hp = d2ad(res.Data.hp) - tex_total_score.text = hp - data._total_hp = hp - data.total = res.Data.total_member - 1 - obj:GetChild("tex_name").text = data.nick .. "(" .. data.total .. ")" - ctr_show_total.selectedIndex = 1 - end - end) + if data.uid == DataManager.SelfUser.account_id then + fgCtr:FG_GetMembersCount(self.group_id, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + tex_total_score.text = d2ad(res.Data.hp_num1 + res.Data.otherHp) + ctr_show_total.selectedIndex = 1 + else + ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值") + end + end) + else + fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local hp = d2ad(res.Data.hp) + tex_total_score.text = hp + data._total_hp = hp + data.total = res.Data.total_member - 1 + obj:GetChild("tex_name").text = data.nick .. "(" .. data.total .. ")" + ctr_show_total.selectedIndex = 1 + end + end) + end end) diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index 78256ea4..ab4b6654 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index b821e7f0..56e7d1a4 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info index 7be8286d..d85e1b98 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ias.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n145_imp5": { + "hidden": true + }, "n132_z384": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info index 5e6aa941..5695d903 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info @@ -3,8 +3,8 @@ "n44_rpaz": { "collapsed": true }, - "n51_t1hq": { - "collapsed": true + "n79_imp5": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index 291a102b..77c33874 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -1,19 +1,22 @@ { "objectStatus": { - "n58_ocx0": { - "hidden": true - }, "n57_ocx0": { "hidden": true }, "n78_iaes": { "hidden": true }, + "n69_z384": { + "hidden": true + }, "n44_rpaz": { "collapsed": true }, "n72_mtk5": { "hidden": true + }, + "n58_ocx0": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 112cab31..d5fcf377 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -10,6 +10,9 @@ "doc.openedDocs": [ "ui://2d9xdj6zfn7fao", "ui://m7iejg4610snh5j", + "ui://m7iejg46kwi0hma", + "ui://m7iejg46gltdhc9", + "ui://m7iejg46irlqi02", "ui://m7iejg46imp57ih2", "ui://m7iejg46ilon7i9l", "ui://m7iejg46ilon7i9m", @@ -33,7 +36,7 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46imp57igy", + "doc.activeDoc": "ui://m7iejg4610snh5j", "libview.twoColumn": false, "libview.expandedNodes": [ "0khx14ar", diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml index 3044daf1..9a8d4f57 100644 --- a/wb_new_ui/assets/Lobby/Main.xml +++ b/wb_new_ui/assets/Lobby/Main.xml @@ -36,7 +36,7 @@ - + diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml index 0ce3145d..46ccb149 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml @@ -2,7 +2,7 @@ - + diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml index b175682b..47c5430e 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml @@ -2,7 +2,7 @@ - + diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml index 942908df..7dc20a2b 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml @@ -2,22 +2,25 @@ - - + +