diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index f9253fdb..fe08c682 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -1821,9 +1821,9 @@ function M:__loadGroupData() local btn_msg = self._view:GetChild('btn_msg') btn_msg.onClick:Set( function() - if not self.mng_view1 then - self.mng_view1 = GroupManagerView.new(self._root_view, self.curGroup.id, 1) - end + -- if not self.mng_view1 then + self.mng_view1 = GroupManagerView.new(self._root_view, self.curGroup.id, 1) + -- end self.mng_view1:Show(5) -- self:SetRoomListVisible(false) end @@ -1833,10 +1833,9 @@ function M:__loadGroupData() ---[[ btn_invite.onClick:Set(function() --print("成员..........................................") - if not self.mng_view_invite then - self.mng_view_invite = GroupMngMemberInviteView.new(self.curGroup.id) - end - print("lingmeng-self.mng_view_invite", self.mng_view_invite) + -- if not self.mng_view_invite then + self.mng_view_invite = GroupMngMemberInviteView.new(self.curGroup.id) + -- end self.mng_view_invite:Show() -- self:SetRoomListVisible(false) end) @@ -1844,9 +1843,9 @@ function M:__loadGroupData() --查看成员hp值，带分配 local btn_hp = self._view:GetChild('btn_hp') btn_hp.onClick:Set(function() - if not self.mng_view_hp then - self.mng_view_hp = GroupMngMemberHpListView.new(self.curGroup.id) - end + -- if not self.mng_view_hp then + self.mng_view_hp = GroupMngMemberHpListView.new(self.curGroup.id) + -- end self.mng_view_hp:Show() end) --]] @@ -2088,10 +2087,10 @@ function M:Destroy() self.mng_view4:Destroy() end if self.mng_view_invite then - self.mng_view_invite:Destroy() + self.mng_view_invite:Dispose() end if self.mng_view_hp then - self.mng_view_hp:Destroy() + self.mng_view_hp:Dispose() end DataManager.SelfUser.cur_group = nil if self._tw_notice then 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 7b7fa2f6..90dc37c8 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -639,4 +639,16 @@ function M:GetChildNumForPage() return self.pageNum end +function M:Destroy() + -- for i = 1, #self.page_config do + -- if self._view_map[i] then + -- self._view_map[i]._view:Dispose() + -- if self._view_map[i].clear_image then + -- ImageLoad.Clear(self._view_map[i].class) + -- end + -- end + -- end + BaseWindow.Destroy(self) +end + return M diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua index 0ca91630..60755cff 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua @@ -20,15 +20,15 @@ local RunFast_Record_Event = { local default_bg = 1 local bg_config = { - {id = 1, url = 'extend/poker/runfast/bg/bg1', thumb = 'ui://Extend_Poker_RunFastNew/table_bg1'}, - {id = 2, url = 'extend/poker/runfast/bg/bg2', thumb = 'ui://Extend_Poker_RunFastNew/table_bg2'}, - {id = 3, url = 'extend/poker/runfast/bg/bg3', thumb = 'ui://Extend_Poker_RunFastNew/table_bg3'} + { id = 1, url = 'extend/poker/runfast/bg/bg1', thumb = 'ui://Extend_Poker_RunFastNew/table_bg1' }, + { id = 2, url = 'extend/poker/runfast/bg/bg2', thumb = 'ui://Extend_Poker_RunFastNew/table_bg2' }, + { id = 3, url = 'extend/poker/runfast/bg/bg3', thumb = 'ui://Extend_Poker_RunFastNew/table_bg3' } } --- Create a new function M.new() - setmetatable(M, {__index = PKPlayBackView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = PKPlayBackView }) + local self = setmetatable({}, { __index = M }) self.class = 'RunFast_PlayBackView' self:init() @@ -42,7 +42,8 @@ function M:InitView(url) end self._gamectr = ControllerManager.GetController(GameController) UIPackage.AddPackage('extend/poker/runfast/ui/Extend_Poker_RunFastNew') - PKPlayBackView.InitView(self, 'ui://Extend_Poker_RunFastNew/RunFast_Main_' .. self._room.room_config.people_num, default_bg, bg_config) + PKPlayBackView.InitView(self, 'ui://Extend_Poker_RunFastNew/RunFast_Main_' .. self._room.room_config.people_num, + default_bg, bg_config) self._tex_round = self._view:GetChild('round') self._player_card_info = {} local _player_card_info = self._player_card_info @@ -54,8 +55,8 @@ function M:InitView(url) if self._rightPanelView ~= nil then self._rightPanelView:Destroy() end - - self._rightPanelView = RunFast_RightPanelView.new(self, rightpanel) + + self._rightPanelView = RunFast_RightPanelView.new(self, rightpanel) rightpanel:GetChild("btn_setting").onClick:Clear() self._player_info = {} @@ -65,7 +66,7 @@ function M:InitView(url) _player_info[i] = PlayerInfoView.new(tem, self) end local list = self._room.player_list - for i=1,#list do + for i = 1, #list do local p = list[i] local info = _player_info[self:GetPos(p.seat)] info._view.visible = true @@ -96,6 +97,7 @@ end function M:FillRoomData(data) print("hidezhanji 1111") self._currentStep = 1 + DataManager.CurrenRoom.pai = 0 local room = DataManager.CurrenRoom local _player_card_info = self._player_card_info local roominfo_panel = self._view:GetChild('roominfo_panel1') @@ -111,10 +113,10 @@ function M:FillRoomData(data) if p.total_hp then print("hidezhanji 2222") - head_info._view:GetChild('zhanji').visible=false + head_info._view:GetChild('zhanji').visible = false if room.hpOnOff == 1 or room:checkHpNonnegative() then - head_info._view:GetChild('zhanji').visible=true + head_info._view:GetChild('zhanji').visible = true head_info._view:GetChild('text_jifen').text = d2ad(p.total_hp) end end @@ -125,18 +127,17 @@ function M:FillRoomData(data) card_info:UpdateHandPoker(p.hand_list, false, true) end head_info:UpdatePiao(p.piao) - end self:UpdateRound() - + self:GenerateAllStepData(data) self:ShowStep(1) end function M:ShowStep(index) local step = self._step[index] - if step==nil then + if step == nil then return end for i = 1, #step.player_card_data do @@ -146,13 +147,12 @@ function M:ShowStep(index) p.hand_list = step.player_card_data[i].hand_list p.out_card_list = step.player_card_data[i].out_card_list p.hand_left_count = #p.hand_list - + if p.seat ~= self._room.self_player.seat then info:UpdateHandPoker(p.hand_list, false, true) else info:InitPoker(p.hand_list, false) end - end if step.cmd == RunFast_Record_Event.Evt_OutCard then @@ -194,7 +194,8 @@ function M:ShowStep(index) end if step.cmd == RunFast_Record_Event.Evt_Result then local Result = step.Result - self.result_view = RunFast_ResultView.new(self._root_view, Result.info, self._room.room_id, Result.type, Result.winseat, 0, Result.remaincards) + self.result_view = RunFast_ResultView.new(self._root_view, Result.info, self._room.room_id, Result.type, + Result.winseat, 0, Result.remaincards) local num = self._view:GetChildIndex(self._view:GetChild("panel_record")) self._view:AddChildAt(self.result_view._view, num) else @@ -257,6 +258,7 @@ function M:CmdPass(cmd, index) data.cmd = cmd.cmd data.current_out_seat = cmd.seat end + function M:Cmdresult(cmd, index) local data = self:CopyLastStep(index) data.cmd = cmd.cmd diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgzev.info b/wb_new_ui/.objs/metas/9n9stu2e/prgzev.info new file mode 100644 index 00000000..d16afb9e --- /dev/null +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgzev.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n7_f2pr": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index d0d0c178..8da9faae 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -3,6 +3,12 @@ "n86_kwi0": { "hidden": true }, + "n121_l679": { + "collapsed": true + }, + "n112_kwi0": { + "collapsed": true + }, "n122_j120": { "hidden": true } diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RoomInfoPanel1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RoomInfoPanel1.xml index bce0bff8..094e5470 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RoomInfoPanel1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RoomInfoPanel1.xml @@ -1,11 +1,11 @@ - - - + + + - - + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml index afad74ce..582ddfa5 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml @@ -3,10 +3,10 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -142,24 +142,22 @@