diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index acdcdbbc..43b6ca00 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -990,7 +990,7 @@ function M:OnUpdate() if result then else - error(resultInfo) + -- error(resultInfo) 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 dee3ab91..a9adfd29 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -944,6 +944,7 @@ end function M:OnFangziAction(...) local arg = { ... } local _player_card_info = self._player_card_info + local fz = arg[1] local player = arg[2] local num = arg[3] @@ -957,7 +958,17 @@ function M:OnFangziAction(...) self._popEvent = false local info = _player_card_info[self:GetPos(player.seat)] - info:UpdateFzList(player.fz_list, true, player.seat) --更新放子数组 + if fz.type == RB_FZType.Wei or fz.type==RB_FZType.ChouWei then + coroutine.start( + function() + coroutine.wait(1.4) + info:UpdateFzList(player.fz_list, true, player.seat) + end) + else + info:UpdateFzList(player.fz_list, true, player.seat) --更新放子数组 + end + + if (player == self._room.self_player) then if fz.type == RB_FZType.Chi then for i = 1, #fz.opcard do @@ -978,13 +989,27 @@ function M:OnFangziAction(...) end info:UpdateKan(fz.card) elseif fz.type == RB_FZType.Wei then - for i = 1, #fz.opcard do - info:DeleteHandCard(fz.opcard[i]) - end + --显示wei 的牌 + coroutine.start( + function() + coroutine.wait(1.4) + for i = 1, #fz.opcard do + info:DeleteHandCard(fz.opcard[i]) + end + end) elseif fz.type == RB_FZType.ChouWei then - for i = 1, #fz.opcard do + --[[ for i = 1, #fz.opcard do info:DeleteHandCard(fz.opcard[i]) - end + end]] + + coroutine.start( + function() + coroutine.wait(1.4) + for i = 1, #fz.opcard do + info:DeleteHandCard(fz.opcard[i]) + end + end) + elseif fz.type == RB_FZType.Pao then if num > 0 then for i = 1, #fz.opcard do @@ -1000,9 +1025,9 @@ function M:OnFangziAction(...) end coroutine.start( function() - coroutine.wait(1.3) + coroutine.wait(0.3) if fz.type ~= RB_FZType.Kan then - info:SendChangeCard() + info:SendChangeCard() end end ) @@ -1012,8 +1037,8 @@ function M:OnFangziAction(...) --printlog("jefe self RB_FZType 2=======") local info = _player_card_info[self:GetPos(player.seat)] local pNode = info._mask_liangpai - local effect = UIPackage.CreateObject('Extend_Poker_FanPaoFa', 'FzEffect') - + local effect = UIPackage.CreateObject('Main_RunBeard', 'FzEffect') + if fz.type == RB_FZType.Peng then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "peng") self:PlaySound(player.self_user.sex, 'F_Peng') @@ -1026,33 +1051,95 @@ function M:OnFangziAction(...) --printlog("jefe self RB_FZType 4=======") elseif fz.type == RB_FZType.Wei then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "wei") - self:PlaySound(player.self_user.sex, 'F_GuoSao') - effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei') + self:PlaySound(player.self_user.sex, 'F_' .. fz.card) + + info:UpdateOutCardList(fz.card,true,true,fz.from_seat) + + coroutine.start( + function() + coroutine.wait(0.8) + info:PlayingOutCardAnima() + self:PlaySound(player.self_user.sex, 'F_GuoSao') + effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei') + effect.touchable = false + effect.x, effect.y = -250, -200 + effect:GetTransition('t0'):Play() + pNode:AddChild(effect) + end) + + coroutine.start( + function() + coroutine.wait(1.8) + effect:Dispose() + end + ) + elseif fz.type == RB_FZType.ChouWei then - -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Extend_Poker_FanPaoFa", "chouwei") - self:PlaySound(player.self_user.sex, 'F_GuoSao') - effect:GetChild('icon1').icon = UIPackage.GetItemURL('Extend_Poker_FanPaoFa', 'chouwei') + self:PlaySound(player.self_user.sex, 'F_' .. fz.card) + info:UpdateOutCardList(fz.card,true,true,fz.from_seat) + + coroutine.start( + function() + coroutine.wait(1.2) + info:PlayingOutCardAnima() + self:PlaySound(player.self_user.sex, 'F_GuoSao') + effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei') + effect.touchable = false + effect.x, effect.y = -250, -200 + effect:GetTransition('t0'):Play() + pNode:AddChild(effect) + end) + + coroutine.start( + function() + coroutine.wait(1.7) + effect:Dispose() + end + ) elseif fz.type == RB_FZType.Pao then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "pao") self:PlaySound(player.self_user.sex, 'F_KaiDuo') effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'pao') elseif fz.type == RB_FZType.Ti then - self:PlaySound(player.self_user.sex, 'F_SaoChuan') + self:PlaySound(player.self_user.sex, 'F_' .. fz.card) + info:UpdateOutCardList(fz.card,true,true,fz.from_seat) effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'ti') + effect.touchable = false + effect.x, effect.y = -250, -200 + effect:GetTransition('t0'):Play() + pNode:AddChild(effect) + coroutine.start( + function() + coroutine.wait(1.2) + self:PlaySound(player.self_user.sex, 'F_SaoChuan') + info:PlayingOutCardAnima() + + end) + + coroutine.start( + function() + coroutine.wait(1.7) + effect:Dispose() + end + ) -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "ti") end + + if fz.type~=RB_FZType.Wei and fz.type~=RB_FZType.ChouWei then + effect.touchable = false + effect.x, effect.y = -250, -200 + effect:GetTransition('t0'):Play() + pNode:AddChild(effect) + coroutine.start( + function() + coroutine.wait(0.4) + effect:Dispose() + end + ) + end + - effect.touchable = false - effect.x, effect.y = -250, -200 - effect:GetTransition('t0'):Play() - pNode:AddChild(effect) - coroutine.start( - function() - coroutine.wait(0.5) - effect:Dispose() - end - ) end if (player == self._room.self_player) then coroutine.start( @@ -1063,28 +1150,34 @@ function M:OnFangziAction(...) end ) end - --printlog("seft rbtpe1") + local removeOutcard = _player_card_info[self:GetPos(fz.from_seat)] local p = self._room:GetPlayerBySeat(fz.from_seat) - --printlog("seft rbtpe133") + if p.DiceCard ~= nil and fz.active_card == p.DiceCard then - --printlog("seft rbtpeeee2") - removeOutcard:ClearOutCard() - --printlog("seft rbtpeeee") + if fz.type==RB_FZType.Wei or fz.type==RB_FZType.ChouWei or fz.type==RB_FZType.Ti or fz.type==RB_FZType.Pao then + coroutine.start( + function() + coroutine.wait(0.8) + removeOutcard:ClearOutCard() + end) + else + removeOutcard:ClearOutCard() + end p.DiceCard = nil end - --printlog("seft rbtpe2") + local list = self._room.player_list for i = 1, #list do local p = list[i] local info = self._player_info[self:GetPos(p.seat)] info._view:GetChild('huxi').text = p.hu_xi end - --printlog("seft rbtpe3") + self._popEvent = true coroutine.start( function() - coroutine.wait(1.3) + coroutine.wait(0.3) local info = _player_card_info[1] info:UpdateIsOnClick(true) end 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 2a2f0772..3a5b4592 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -313,7 +313,7 @@ function M:FillLiuJuItemData(room, data,item) else local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 + cards:GetController('c1').selectedIndex = 0 cards:GetChild('card_type').text = '将' cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi cards:GetChild('card_1').icon = @@ -444,7 +444,7 @@ function M:FillLiuJuItemData(room, data,item) end else local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 1 + cards:GetController('c1').selectedIndex = 0 cards:GetChild('card_type').text = '将' cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi cards:GetChild('card_1').icon = diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua index 4cc2c520..d0c0e6ce 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua @@ -58,7 +58,7 @@ function M:UpdateFzList( fz_list ,ispaly,seat) fzcards:GetChild("card_"..1).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)--jefe fzcards.x,fzcards.y = 0,0 self:playAnim(fzitem,fzcards,#fz_list,i,ispaly,seat) - + elseif fz_list[i].type == RB_FZType.ChouWei then local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") -- for j=1,2 do @@ -118,28 +118,6 @@ function M:playAnim(fzitem,fzcards, size,i,ispaly,seat) if(ispaly and i == size)then --匹配最后一个牌 local faArray= fzitem:GetChild("chiwei1") - if(DataManager.CurrenRoom.room_config.people_num ==3)then - if(DataManager.CurrenRoom.self_player.seat == 1)then - if(seat == 2)then - faArray= fzitem:GetChild("chiwei1") - else - faArray= fzitem:GetChild("chiwei") - end - elseif(DataManager.CurrenRoom.self_player.seat == 2) then - if(seat == 3)then - faArray= fzitem:GetChild("chiwei1") - else - faArray= fzitem:GetChild("chiwei") - end - elseif(DataManager.CurrenRoom.self_player.seat == 3)then - if(seat == 1)then - faArray= fzitem:GetChild("chiwei1") - else - faArray= fzitem:GetChild("chiwei") - end - end - end - if(faArray~=nil)then faArray:AddChild(fzcards) else @@ -189,6 +167,7 @@ function M:PlayingOutCardAnima(card) end function M:UpdateOutCardList(outcard,isShow,isMopai,seat) + if(isShow == nil) then isShow = false end @@ -200,7 +179,7 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat) local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") if outcard==0 then - outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" + -- outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" else outcards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/203_",outcard) -- self._bgview.selectedIndex=1 diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 773800be..f470b093 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -271,7 +271,7 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat) local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") if outcard==0 then - outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" + --outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" else outcards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/203_",outcard) end @@ -301,7 +301,6 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat) show_di_bg.visible = false end self._area_outcard_list:AddChild(outcards) - --self._bgview.selectedIndex = 1 end --弃牌 @@ -339,7 +338,6 @@ function M:UpdateFzList( fz_list ,ispaly) if(ispaly == false)then fzitem:RemoveChildren(0,-1,true) end - --printlog(fzitem.width)--printlog(fzitem.height) end if fz_list[i].type == RB_FZType.Chi or fz_list[i].type == RB_FZType.Bi then @@ -417,7 +415,6 @@ function M:playAnim( fzitem,fzcards, size,i,ispaly ) if(ispaly == nil)then ispaly =false end - --printlog("jefe self playAnim 2=======") if(ispaly and i == size)then local faArray= fzitem:GetChild("chiwei") if(faArray~=nil)then @@ -464,7 +461,6 @@ end table.insert(player.handcard_list, card) table.sort( player.handcard_list, ViewUtil.HandCardSort) end - -- print("ChuPaiTiShi",#mark_ting,vardump(player)) if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then self._view :GetController("chupai").selectedIndex =1 if #mark_ting>0 then diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua index 1b51014d..2be11ebc 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua @@ -241,7 +241,7 @@ end function M:UpdateOutCardList(outcard) - + printlog("UpdateOutCardList2222") self._area_outcard_list:RemoveChildren(0,-1,true) local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") if outcard==0 then 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 ef147b8c..234c5ec4 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -368,10 +368,10 @@ function M:onTouchBegin(context) self:ShowHuTip(card.card_item) end card.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/203_', card.card_item) - card.btn_card.sortingOrder = 100 + -- card.btn_card.sortingOrder = 100 local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) - card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 30) + card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50) card.touch_pos = xy - button.xy end @@ -461,7 +461,7 @@ function M:UpdateHandCardsPos() card_view.btn_card:RemoveFromParent() self._area_handcard_list:AddChild(card_view.btn_card) card_view.old_postion = self:GetHandCardPos(card_view, #CountCards) - card_view.btn_card:TweenMove(card_view.old_postion, 0.6) + card_view.btn_card:TweenMove(card_view.old_postion, 0.3) end self:ShowHuTip() end @@ -478,7 +478,7 @@ function M:UpdateCardDisplay() card_view.btn_card:RemoveFromParent() card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item) self._area_handcard_list:AddChild(card_view.btn_card) - card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.5) + card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) end end @@ -858,6 +858,7 @@ end --出牌 function M:UpdateOutCardList(outcard) + printlog("UpdateOutCardListss"..outcard) self._area_outcard_list:RemoveChildren(0, -1, true) local outcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Gcm_OutCard') if outcard == 0 then diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgzf0.info b/wb_new_ui/.objs/metas/9n9stu2e/prgzf0.info index 6f54223d..d38f1ada 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/prgzf0.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgzf0.info @@ -1,25 +1,19 @@ { "objectStatus": { - "n112_rnez": { - "collapsed": true - }, - "n123_thxk": { - "collapsed": true - }, - "n86_q50p": { - "collapsed": true - }, "n13": { "collapsed": true }, + "n112_rnez": { + "collapsed": true + }, "n102_t2e2": { "hidden": true }, "n35_k3io": { "hidden": true }, - "n93_eclw": { - "collapsed": true + "n121_thxk": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 2aede8fe..51d59abb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -15,9 +15,6 @@ "n241_n6w8": { "hidden": true }, - "n175_mn85": { - "collapsed": true - }, "n74_i7lq": { "locked": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/iaes7idb.info b/wb_new_ui/.objs/metas/m7iejg46/iaes7idb.info new file mode 100644 index 00000000..8537bc59 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/iaes7idb.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n53_n96g": { + "hidden": true + }, + "n55_vena": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/iaes7idc.info b/wb_new_ui/.objs/metas/m7iejg46/iaes7idc.info new file mode 100644 index 00000000..2d67d7b2 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/iaes7idc.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n57_ufim": { + "hidden": true + }, + "n55_vena": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7i9l.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7i9l.info index 9e26dfee..a6d0f289 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7i9l.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7i9l.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n53_n96g": { + "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 23a4762c..1cefcc55 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info @@ -19,9 +19,6 @@ "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 3b2dfef6..e027424f 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -31,30 +31,19 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, -<<<<<<< HEAD - "doc.activeDoc": "ui://v6yvqp7wf55qw5", -======= "doc.activeDoc": "ui://v0j9abjygq7m8f", ->>>>>>> b23014eefe67e06cde41b68d1c0f5ddd80843723 "libview.twoColumn": false, "libview.expandedNodes": [ "v0j9abjy", "/", -<<<<<<< HEAD -======= "v0j9abjy", "/Main_style_2/", ->>>>>>> b23014eefe67e06cde41b68d1c0f5ddd80843723 "v6yvqp7w", "/", "v6yvqp7w", "/component/", "v6yvqp7w", -<<<<<<< HEAD - "/component/Main/" -======= "/image/" ->>>>>>> b23014eefe67e06cde41b68d1c0f5ddd80843723 ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml index a033541f..d2f8afa5 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml @@ -6,7 +6,7 @@ - + @@ -19,6 +19,6 @@ - + \ 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 c1c0ced5..78e9c2c2 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,37 +46,38 @@ - + - + - + - + - + + - +