diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 6056d7cb..e385ef84 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -261,10 +261,10 @@ function M:InitBigResult(room, fontsize) local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') big_result:GetChild('txt_play').text = str_roominfo - -- if room.hpOnOff == 1 and room.score_times ~= 1 then - big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) - big_result:GetController('time').selectedIndex = 1 - -- end + -- if room.hpOnOff == 1 and room.score_times ~= 1 then + big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) + big_result:GetController('time').selectedIndex = 1 + -- end local maxScore = 0 local isWin = false @@ -305,8 +305,8 @@ function M:InitBigResult(room, fontsize) if item:GetChild('txt_userid') then item:GetChild('txt_userid').text = player_info.userId end - - ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) + + -- ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 @@ -354,18 +354,18 @@ function M:InitBigResult(room, fontsize) pitem:GetChild('txt_key').text = player_info.param[i].key pitem:GetChild('txt_value').text = player_info.param[i].value - if fontsize ~= nil and fontsize > 0 then - pitem:GetChild('txt_key').textFormat.size = fontsize - pitem:GetChild('txt_value').textFormat.size = fontsize - else - if big then - pitem:GetChild('txt_key').textFormat.size = 30 - pitem:GetChild('txt_value').textFormat.size = 12 - else - pitem:GetChild('txt_key').textFormat.size = 24 - pitem:GetChild('txt_value').textFormat.size = 8 - end - end + -- if fontsize ~= nil and fontsize > 0 then + -- pitem:GetChild('txt_key').textFormat.size = fontsize + -- pitem:GetChild('txt_value').textFormat.size = fontsize + -- else + -- if big then + -- pitem:GetChild('txt_key').textFormat.size = 30 + -- pitem:GetChild('txt_value').textFormat.size = 12 + -- else + -- pitem:GetChild('txt_key').textFormat.size = 24 + -- pitem:GetChild('txt_value').textFormat.size = 8 + -- end + -- end end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 24c801db..4f23d041 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -562,7 +562,24 @@ function M:EventInit() ) end ) + local func = _gamectr:PopEvent() + if (func ~= nil) then + if self._flag_fanpaofa then + self._popEvent = false + end + local result, resultInfo = pcall(func) + if result then + else + printlog("game_error", resultInfo) + printlog("game_error_tra", debug.traceback()) + self._gamectr = ControllerManager.GetController(GameController) + if self._gamectr then + self._gamectr:ResetConnect() + end + end + --func() + end _gamectr:AddEventListener( GameEvent.ZPResult1, function(...) @@ -638,7 +655,6 @@ function M:EventInit() GameEvent.ZPResult2, function(...) -- self._popEvent = true - print("结算监听======22222222222222222") self._left_time = 0 local arg = { ... } local total_result = arg[2] diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 634ba2b2..06b6dd2a 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -400,41 +400,41 @@ function M:UpdateFzList(fz_list, ispaly, seat, flag_pengPao) end function M:playAnim(fzitem, fzcards, size, i, ispaly, flag_pengPao) - print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) - if (ispaly == nil) then - ispaly = false - end - if (ispaly and i == size and not flag_pengPao) then - local fristCard = self.card_list[1].btn_card - print("lingmeng btn_card", self.card_list[1].index_X) - -- self._area_handcard_list:AddChild(fzcards) - fzcards:SetPivot(0.5, 0.5) - fzcards.rotation = 180 - fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) - --[[ - fzcards:TweenMove( - self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - - self._area_handcard_list.xy, 0.2) - fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) - --]] - fzcards:RemoveFromParent() - fzcards.xy = Vector2.zero - fzcards.rotation = 0 - fzcards:SetScale(1, 1) - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - --[[ - coroutine.start( - function() - coroutine.wait(0.21) + -- print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) + -- if (ispaly == nil) then + -- ispaly = false + -- end + -- if (ispaly and i == size and not flag_pengPao) then + -- local fristCard = self.card_list[1].btn_card + -- print("lingmeng btn_card", self.card_list[1].index_X) + -- -- self._area_handcard_list:AddChild(fzcards) + -- fzcards:SetPivot(0.5, 0.5) + -- fzcards.rotation = 180 + -- fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) + -- --[[ + -- fzcards:TweenMove( + -- self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - + -- self._area_handcard_list.xy, 0.2) + -- fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) + -- --]] + -- fzcards:RemoveFromParent() + -- fzcards.xy = Vector2.zero + -- fzcards.rotation = 0 + -- fzcards:SetScale(1, 1) + -- fzitem:AddChild(fzcards) + -- self._area_fz_list:AddChildAt(fzitem, 0) + -- --[[ + -- coroutine.start( + -- function() + -- coroutine.wait(0.21) - end - ) - --]] - else - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - end + -- end + -- ) + -- --]] + -- else + -- fzitem:AddChild(fzcards) + -- self._area_fz_list:AddChildAt(fzitem, 0) + -- end end --出牌提示动画 diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index d04551a1..17ce7d71 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -1,10 +1,16 @@ { "objectStatus": { + "n84_rbpg": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, "n85_rbpg": { "hidden": true }, - "n84_rbpg": { - "hidden": true + "n19_pt1r": { + "collapsed": true }, "n4_fux2": { "hidden": true diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info new file mode 100644 index 00000000..816f7036 --- /dev/null +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n19_of6w": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml new file mode 100644 index 00000000..f936b351 --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml @@ -0,0 +1,9 @@ + + + + + + + +