diff --git a/lua_probject/base_project/Game/View/PlayBackView.lua b/lua_probject/base_project/Game/View/PlayBackView.lua index 1815bd74..837f28d5 100644 --- a/lua_probject/base_project/Game/View/PlayBackView.lua +++ b/lua_probject/base_project/Game/View/PlayBackView.lua @@ -71,7 +71,12 @@ function M:InitView(url) local list = _room.player_list for i = 1, #list do local p = list[i] - local info = _player_info[self:GetPos(p.seat)] + if p.seat then + local info = _player_info[self:GetPos(p.seat)] + else + local info = _player_info[self:GetPos(1)] + end + info._view.visible = true info:FillData(p) info:MarkBank(p.seat == _room.banker_seat) @@ -310,7 +315,7 @@ end function M:GetPos(seat, myseat) local my_seat = 1 - if not myseat then + if not myseat and self._room.self_player ~= nil then my_seat = self._room.self_player.seat else my_seat = myseat diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 0cdfcda7..61b97005 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -997,7 +997,7 @@ function M:OnFangziAction(...) end coroutine.start( function() - coroutine.wait(0.3) + coroutine.wait(1.3) if fz.type ~= RB_FZType.Kan then info:SendChangeCard() end @@ -1080,7 +1080,7 @@ function M:OnFangziAction(...) self._popEvent = true coroutine.start( function() - coroutine.wait(0.3) + coroutine.wait(1.3) local info = _player_card_info[1] info:UpdateIsOnClick(true) end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua index 69507cab..9754a584 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua @@ -35,6 +35,7 @@ function M:InitView(url) self._gamectr = ControllerManager.GetController(GameController) UIPackage.AddPackage('base/main_zipai/ui/Main_RunBeard') UIPackage.AddPackage('extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa') + printlog("room.room_config.people_num"..room.room_config.people_num) ZPPlayBackView.InitView(self, 'ui://Main_RunBeard/Main_' .. room.room_config.people_num) UpdateBeat:Add(self.OnUpdate, self) @@ -44,9 +45,9 @@ function M:InitView(url) local _data = json.decode(json_data) local typeface = _data['game_typeface'] if typeface == 1 then - room.change_card_display = '2_' + room.change_card_display = '6_' else - room.change_card_display = '1_' + room.change_card_display = '6_' end end self._player_card_info = {} diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua index 960d7163..368577ba 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -754,7 +754,7 @@ function M:FillItemData(room, data, item) end end --printlog("FillItemData11333333") - if #win_data.hand_card > 0 then + --[[ if #win_data.hand_card > 0 then for i = 1, #win_data.hand_card, 4 do local cards = card_list:AddItemFromPool() cards:GetChild('card_type').text = '散' @@ -771,7 +771,7 @@ function M:FillItemData(room, data, item) end end end - end + end]] end item:RemoveChildrenToPool() --printlog("FillItemData133331") diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua index d6e6e97b..7e60d4a5 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua @@ -39,9 +39,9 @@ function M:init() local width = self._view.width local m_width = self._main_view._view.width local m_height = self._main_view._view.height - -- self._view.x = 0.5 * m_width - 0.5 * width - self._view.x = 0 - self._view.y = 0.7 * m_height + self._view.x = 0.115 * m_width --- 0.5 * width + --self._view.x = 0 + self._view.y = 0.65 * m_height SetObjEnabled(self._view, false) self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin)) self._view.onTouchMove:Add(handler(self, self.OnTouchMove)) diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 80ac3255..f025f63c 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 522, + "libview.firstColumnWidth": 297, "expanded_nodes": [ "27vd145b", "/", @@ -10,6 +10,7 @@ "doc.openedDocs": [ "ui://2d9xdj6zfn7fao", "ui://m7iejg46kwi0hma", + "ui://v6yvqp7wf55qwa", "ui://2d9xdj6zm16m7dqt", "ui://ppu1wv76j4mf9j", "ui://ppu1wv76j4mf9k", @@ -21,15 +22,15 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46kwi0hma", + "doc.activeDoc": "ui://v6yvqp7wf55qwa", "libview.twoColumn": false, "libview.expandedNodes": [ - "m7iejg46", + "v6yvqp7w", "/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/" + "v6yvqp7w", + "/component/", + "v6yvqp7w", + "/component/Main/" ], "auxline1": true, "snapToGrid": true, 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 97546909..c1c0ced5 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 @@ -1,9 +1,9 @@ - + - + @@ -33,11 +33,11 @@ - + - + @@ -46,11 +46,11 @@ - + - + @@ -146,7 +146,7 @@