diff --git a/lua_probject/base_project/Game/View/Common/MsgWindow.lua b/lua_probject/base_project/Game/View/Common/MsgWindow.lua index 90b24f30..e11d98f5 100644 --- a/lua_probject/base_project/Game/View/Common/MsgWindow.lua +++ b/lua_probject/base_project/Game/View/Common/MsgWindow.lua @@ -45,12 +45,13 @@ function M:init(url) if (self._tip) then tex_message.text = self._tip end local btn_close = view:GetChild('btn_close1') + btn_close.visible = false if (btn_close~=nil) then btn_close.onClick:Add( function() self:CloseEvent() end - + --self:Destroy() ) end self.btnCheck = view:GetChild("btnCheck") diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index aa911e6a..4b4214cc 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -1000,12 +1000,7 @@ function M:OnUpdate() if pcall(func) then else - local success, result = pcall(func) - if success then - - else - error(result) - end + self._gamectr = ControllerManager.GetController(GameController) if self._gamectr then self._gamectr:ResetConnect() diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 1661062c..936195d8 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -1036,12 +1036,12 @@ function M:OnFangziAction(...) end printlog("jefe self RB_FZType 5=======") effect.touchable = false - effect.x, effect.y = 0, 0 + effect.x, effect.y = -250, -200 effect:GetTransition('t0'):Play() pNode:AddChild(effect) coroutine.start( function() - coroutine.wait(1) + coroutine.wait(3) effect:Dispose() end ) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua index 11f42359..7794beb7 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua @@ -633,10 +633,13 @@ function M:OnUpdate() if self._play then if (self._currentStep == #self.cmdList and self._playFoward) then self:ChangePlayState(false) + --显示结算 + self:ShowBackResult(1) ViewUtil.ErrorTip(nil, '当前已是录像结尾了，再次点击播放按钮可重新播放') return elseif (self._currentStep == 0 and not self._playFoward) then self:ChangePlayState(false) + ViewUtil.ErrorTip(nil, '当前已是录像开头了，再次点击播放按钮可重新播放') return end @@ -650,6 +653,11 @@ function M:OnUpdate() end end +function M:ShowBackResult(datas) + self._view:GetController("state").selectedIndex = 4 + +end + function M:Destroy() UpdateBeat:Remove(self.OnUpdate, self) PlayBackView.Destroy(self) 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 c0236e55..50882da6 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -272,8 +272,16 @@ function M:FillLiuJuItemData(room, data,item) for j = 1, 3 do cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) end - end - if fztype == RB_FZType.Ti then + elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_type').text = '畏' + cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi + for j = 1, 3 do + cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) + end + + elseif fztype == RB_FZType.Ti then local cards = card_list:AddItemFromPool() cards:GetController('c1').selectedIndex = 2 cards:GetChild('card_type').text = '提' @@ -281,8 +289,8 @@ function M:FillLiuJuItemData(room, data,item) for j = 1, 4 do cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) end - end - if fztype == RB_FZType.Pao then + + elseif fztype == RB_FZType.Pao then local cards = card_list:AddItemFromPool() cards:GetController('c1').selectedIndex = 2 cards:GetChild('card_type').text = '跑' @@ -290,28 +298,54 @@ function M:FillLiuJuItemData(room, data,item) for j = 1, 4 do cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) end - end - if fztype == RB_FZType.Chi then + + elseif fztype == RB_FZType.Chi then local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 + cards:GetController('c1').selectedIndex = 1 cards:GetChild('card_type').text = '顺' cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi - for j = 1, 3 do - cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) + + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card2) + cards:GetChild('card_3').icon = + self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card3) + else + + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 1 + cards:GetChild('card_type').text = '将' + cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi + cards:GetChild('card_1').icon = + self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1) + cards:GetChild('card_2').icon = + self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card2) + end + end + + local hand_card = {} + if #data.info_list[i].hand_card>2 then + hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3) + for k = 1, #hand_card do + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = hand_card[k].hu_xi + for j = 1, #hand_card[k] do + cards:GetChild('card_' .. (j)).icon = + self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) end end - end - - local hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3) - - for k = 1, #hand_card do + else + hand_card = data.info_list[i].hand_card + local item = card_list:AddItemFromPool() - item:GetController('c1').selectedIndex = 2 - item:GetChild('card_huxi').text = hand_card[k].hu_xi - for j = 1, #hand_card[k] do - item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + item:GetController('c1').selectedIndex = 2 + for j = 1, #hand_card do + item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[j]) end end + end end @@ -421,14 +455,39 @@ function M:FillLiuJuItemData(room, data,item) end end if #info_list[i].hand_card > 0 then - local hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3) - for k = 1, #hand_card do - local cards = card_list:AddItemFromPool() - for j = 1, #hand_card[k] do - cards:GetChild('card_' .. (j)).icon = - self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + + --local hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3) + local hand_card + if #info_list[i].hand_card>2 then + hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3) + + for k = 1, #hand_card do + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + cards:GetChild('card_huxi').text = hand_card[k].hu_xi + for j = 1, #hand_card[k] do + cards:GetChild('card_' .. (j)).icon = + self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j]) + end end + + else + hand_card = info_list[i].hand_card + local cards = card_list:AddItemFromPool() + cards:GetController('c1').selectedIndex = 2 + for j = 1, #hand_card do + cards:GetChild('card_' .. (j)).icon = + self:getCardItem('ui://Main_RunBeard/202_', hand_card[j]) + end + end + + + + + + + end end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua index a631a646..952aeda9 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -770,7 +770,7 @@ function M:GetHandCardPos(cards_view, cards) if self:getCardSize() == 1 then y = 90 - (85 * cards_view.index_Y) elseif self:getCardSize() == 1.2 then - y = 70 - (110 * cards_view.index_Y) + y = 90 - (110 * cards_view.index_Y) elseif self:getCardSize() == 0.8 then y = 100 - (65 * cards_view.index_Y) end diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info index 6a987a16..956a9e9d 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info @@ -1,13 +1,10 @@ { "objectStatus": { - "n40_ona1": { - "hidden": true - }, - "n31_piv9": { - "hidden": true - }, "n79_uwvl": { "collapsed": true + }, + "n40_ona1": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info index 6a52560d..b9cea015 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info @@ -7,14 +7,24 @@ "hidden": true }, "n163_o49p": { - "hidden": true + "hidden": true, + "collapsed": true + }, + "n154_r1mo": { + "collapsed": true }, "n152_8th3": { "hidden": true }, + "n150_8th3": { + "collapsed": true + }, "n170_o49p": { "hidden": true }, + "n183_yfzf": { + "collapsed": true + }, "n35_k3io": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 47c432ba..b2a9adca 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", "/", @@ -26,8 +26,12 @@ "ui://m7iejg46ilon7ibc", "ui://m7iejg46imp57ihp", "ui://9n9stu2eprgzf0", - "ui://v0j9abjygq7ms2", + "ui://v0j9abjygq7m8f", + "ui://v0j9abjygq7m6a", + "ui://v0j9abjygq7m8u", + "ui://v0j9abjygq7m6c", "ui://v0j9abjyp0aisn", + "ui://v0j9abjygq7med", "ui://v0j9abjyp0aism", "ui://v0j9abjygq7mgx", "ui://v0j9abjygq7mh1", @@ -48,16 +52,22 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7ms2", + "doc.activeDoc": "ui://v0j9abjygq7m8u", "libview.twoColumn": false, "libview.expandedNodes": [ - "s63l0suw", - "/", "v0j9abjy", "/", "v0j9abjy", + "/Main_style_2/", + "v0j9abjy", "/component/", "v0j9abjy", + "/component/clearing/", + "v0j9abjy", + "/component/clearing/clearing1/", + "v0j9abjy", + "/component/clearing/room/", + "v0j9abjy", "/images/" ], "auxline1": true, diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index 9635b4c2..86163b7d 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -1,13 +1,13 @@ - + - + @@ -90,7 +90,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -144,12 +144,12 @@ - + - + @@ -158,7 +158,7 @@ - + @@ -167,8 +167,8 @@ - - + + @@ -177,10 +177,10 @@ - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml b/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml index 0ed4315f..b3a5242e 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml @@ -90,28 +90,27 @@ - - -