diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 67cb80f2..ff0d18cf 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -15,6 +15,7 @@ local GroupMngMemberInviteView = import(".MngView.GroupMngMemberInviteView") local GroupMngMemberHpListView = import(".MngView.GroupMngMemberHpListView") local GroupMngMenKangView = import(".MngView.GroupMngMenKangView") local GroupMngPiLaoZhi = import(".MngView.GroupMngPiLaoZhi") +local GroupShowMemberInfoView = import(".MngView.GroupShowMemberInfoView") -- local GroupPartnerRewardsView = import(".GroupPartnerRewardsView") -- local HeadView = require('Game/View/LobbyHeadView') @@ -1241,7 +1242,12 @@ function M:InitView(url) end self.mng_view_pilao:Show() end) - + self._view:GetChild('btn_gerenxinxi').onClick:Set(function() + if not self.mng_view_Player then + self.mng_view_Player = GroupShowMemberInfoView.new(self.curGroup.id, self.curGroup) + end + self.mng_view_Player:Show() + end) self:__loadGroupData() self:__refreshManager() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index 77a10773..fbf98428 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -92,7 +92,7 @@ function M:OnRenderRewardsItem(index, obj) obj:GetController("fandian").selectedIndex = self.showxipai --printlog("aaaaaaaaaaaaaaaaaaaaa ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)) obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data - .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) + .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) obj:GetChild("tex_rewards").text = d2ad(data.cur_value) obj:GetChild("tex_rewards_max").text = d2ad(data.max_value) obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, @@ -206,22 +206,22 @@ function M:OnRenderRewardsItem(index, obj) ViewUtil.ShowModalWait() fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value, single, function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败") - else - ViewUtil.ShowBannerOnScreenCenter("设置洗牌成功") - -- printlog("ccccccccccccccccc11111111111111111111111") - -- pt(res) - -- for i = 1, #self.rewards_data do - -- if self.rewards_data[i].xipai_rewardValueType == data.xipai_rewardValueType then - -- self.rewards_data[i].xipai_cur_value = data.xipai_cur_value - -- end - -- end - -- self.lst_rewards.numItems = #self.rewards_data - self:GetRewardsData() - end - end) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败") + else + ViewUtil.ShowBannerOnScreenCenter("设置洗牌成功") + -- printlog("ccccccccccccccccc11111111111111111111111") + -- pt(res) + -- for i = 1, #self.rewards_data do + -- if self.rewards_data[i].xipai_rewardValueType == data.xipai_rewardValueType then + -- self.rewards_data[i].xipai_cur_value = data.xipai_cur_value + -- end + -- end + -- self.lst_rewards.numItems = #self.rewards_data + self:GetRewardsData() + end + end) end) msg_win:Show() end) @@ -270,22 +270,22 @@ function M:OnRenderRewardsItem(index, obj) ViewUtil.ShowModalWait() fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value, single, function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败") - else - ViewUtil.ShowBannerOnScreenCenter("设置管理成功") - -- printlog("ccccccccccccccccc11111111111111111111111") - -- pt(res) - -- for i = 1, #self.rewards_data do - -- if self.rewards_data[i].xipai_rewardValueType == data.xipai_rewardValueType then - -- self.rewards_data[i].xipai_cur_value = data.anchou_cur_value - -- end - -- end - -- self.lst_rewards.numItems = #self.rewards_data - self:GetRewardsData() - end - end) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败") + else + ViewUtil.ShowBannerOnScreenCenter("设置管理成功") + -- printlog("ccccccccccccccccc11111111111111111111111") + -- pt(res) + -- for i = 1, #self.rewards_data do + -- if self.rewards_data[i].xipai_rewardValueType == data.xipai_rewardValueType then + -- self.rewards_data[i].xipai_cur_value = data.anchou_cur_value + -- end + -- end + -- self.lst_rewards.numItems = #self.rewards_data + self:GetRewardsData() + end + end) end) msg_win:Show() end) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua new file mode 100644 index 00000000..5f21a54e --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupShowMemberInfoView.lua @@ -0,0 +1,47 @@ +local GroupShowMemberInfoView = {} + +local M = GroupShowMemberInfoView + +function GroupShowMemberInfoView.new(group_id) + setmetatable(M, { __index = BaseView }) + local self = setmetatable({}, { __index = M }) + self.class = "GroupShowMemberInfoView" + self.group_id = group_id + self:init("ui://NewGroup/Win_PlayerInfoForAdd2") + return self +end + +function M:init(url) + BaseWindow.init(self, url) + local data = DataManager.SelfUser + self.Tx = self._view:GetChild("btn_head") + self.Name = self._view:GetChild("tex_name") + self.Id = self._view:GetChild("tex_id") + ImageLoad.Load(data.head_url, self.Tx._iconObject) + self.Name.text = data.nick_name + self.Id.text = data.account_id + self._view:GetChild("btn_close").onClick:Set( + function() + self:Destroy() + end + ) + self._view:GetChild("btn_qc").onClick:Set( + function() + self:Destroy() + end + ) + self._view:GetChild("btn_qd").onClick:Set( + function() + self:Destroy() + end + ) +end + +function M:SetAddMember(data) + ImageLoad.Load(data.portrait, self.Tx._iconObject) + self.Name.text = data.nick + self.Id.text = data.uid + self:Show() +end + +return M diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 8bd9061a..3554d73c 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -42,9 +42,6 @@ }, "n171_mpll": { "hidden": true - }, - "n261_imp5": { - "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info new file mode 100644 index 00000000..c26de666 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibl.info @@ -0,0 +1,19 @@ +{ + "objectStatus": { + "n81_jr1l": { + "hidden": true + }, + "n80_jr1l": { + "hidden": true + }, + "n95_imp5": { + "hidden": true + }, + "n96_imp5": { + "hidden": true + }, + "n91_j5s5": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index bf9c1d54..ec561ba0 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -218,7 +218,8 @@ - + + @@ -227,14 +228,17 @@