diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua index de7d76a8..8b865e1c 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua @@ -39,6 +39,8 @@ function M:init() self._viewList_record = self._view:GetChild('list_record_family') self._viewList_record:SetVirtual() + self._viewList_record.scrollPane.touchEffect = false -- 禁止拖动滚动 + self._viewList_record.scrollPane.bouncebackEffect = false -- 关闭回弹效果 self._viewList_record.itemRenderer = function(index, obj) self:RecordItemRenderer(self.records[index + 1], obj) end @@ -57,6 +59,10 @@ function M:init() end end) + --分页 + self._btn_nextPage = self._view:GetChild('btn_nextPage') + self._btn_lastPage = self._view:GetChild('btn_lastPage') + self._text_pageNum = self._view:GetChild('_text_pageNum') self:ShowNumberRecord() end @@ -224,6 +230,10 @@ function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime) self:RecursionRecord(fgCtr, index + 1, uid, leftTime, rightTime) else self._viewList_record.numItems = #self.records + local currentPage = self._viewList_record.scrollPane.currentPageY + local pageCount = self._viewList_record.scrollPane.pageCountY + self._text_pageNum.text = "" + self._text_pageNum.text = string.format("%d/%d", currentPage, pageCount) end end end) diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index db3c8d97..7b693834 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -1156,11 +1156,14 @@ function M:OnUpdateInfo(...) -- 托管状态变化 if t == 5 then if p == DataManager.CurrenRoom.self_player then + local player_info = self._player_info[self:GetPos(p.seat)] if p.entrust then self:closeTipOnTuoguan() self:MarkSelfTuoguan() + player_info:MarkTuoguan() else self:UnmarkSelfTuoguan() + player_info:UnmarkTuoguan() end else local player_info = self._player_info[self:GetPos(p.seat)] diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index 76bfecf6..b13b59e2 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -181,7 +181,7 @@ function M:FillData(player) self:UpdateScore() self:Ready(player.ready) - if player.entrust and player ~= room.self_player then + if player.entrust then self:MarkTuoguan() end end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua index c6fcbae0..09bd3fac 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua @@ -224,6 +224,11 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata) returnString = string.format("%s%s", returnString, configData.zhuangfenfanbei == 0 and ",庄家积分翻倍" or ",庄家积分不翻倍") end + if hpData then + if hpData.BanChat then + returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "") + end + end return returnString end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index a40f6892..85247040 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -817,14 +817,14 @@ function M:RunNiao(list, start_seat) --顯示正面 local item = list_niao_card:AddItemFromPool() local card = list[i].card - coroutine.wait(2 / #list) - -- item:GetTransition("appear"):Play() item.icon = UIPackage.GetItemURL("Main_Majiang", "b202_" .. card) if list[i].score > 0 then item:GetController("select").selectedIndex = 1 else item:GetController("select").selectedIndex = 0 end + coroutine.wait(2 / #list) + -- item:GetTransition("appear"):Play() end coroutine.start(function() coroutine.wait(0.3) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua index 9a7ea335..572bab14 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua @@ -219,6 +219,11 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata) returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",字可成顺" or ",字不可成顺") end + if hpData then + if hpData.BanChat then + returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "") + end + end return returnString end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index efcc4261..a25800ff 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -819,14 +819,14 @@ function M:RunNiao(list, start_seat) --顯示正面 local item = list_niao_card:AddItemFromPool() local card = list[i].card - coroutine.wait(2 / #list) - -- item:GetTransition("appear"):Play() item.icon = UIPackage.GetItemURL("Main_Majiang", "b202_" .. card) if list[i].score > 0 then item:GetController("select").selectedIndex = 1 else item:GetController("select").selectedIndex = 0 end + coroutine.wait(2 / #list) + -- item:GetTransition("appear"):Play() end coroutine.start(function() coroutine.wait(0.3) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua index 0b458ed1..13876f63 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua @@ -178,12 +178,18 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata) end if configData.zimo then - returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸") + returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮 可自摸" or "必须自摸") end if configData.jingbibo then returnString = string.format("%s,%s", returnString, configData.jingbibo == 1 and "有精必博" or "有精可胡") end + if hpData then + if hpData.BanChat then + returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "") + end + end + return returnString end @@ -210,7 +216,7 @@ function M:LoadConfigToDetail(data, hpdata) returnString = string.format("%s人数%s人", returnString, configData.maxPlayers) if configData.zimo then - returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸") + returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮 可自摸" or "必须自摸") end if configData.jingbibo then returnString = string.format("%s,%s", returnString, configData.jingbibo == 1 and "有精必博" or "有精可胡") diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index c561ee2b..e2c40150 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -235,6 +235,9 @@ function M:EventInit() card_info:Clear() card_info:UpdateHandCard() end + if _room.curren_round == 1 then + self._touxiangMove:Play() + end end) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) local arg = { ... } @@ -817,14 +820,14 @@ function M:RunNiao(list, start_seat) --顯示正面 local item = list_niao_card:AddItemFromPool() local card = list[i].card - coroutine.wait(2 / #list) - -- item:GetTransition("appear"):Play() item.icon = UIPackage.GetItemURL("Main_Majiang", "b202_" .. card) if list[i].score > 0 then item:GetController("select").selectedIndex = 1 else item:GetController("select").selectedIndex = 0 end + coroutine.wait(2 / #list) + -- item:GetTransition("appear"):Play() end coroutine.start(function() coroutine.wait(0.3) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua index 986490fd..9fabef3b 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua @@ -232,6 +232,12 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata) if configData.jiahu then returnString = string.format("%s,%s", returnString, configData.jiahu == 0 and "算假胡" or "不算假胡") end + + if hpData then + if hpData.BanChat then + returnString = string.format("%s%s", returnString, hpData.BanChat == 1 and ",不允许快捷聊天" or "") + end + end return returnString end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 984015b0..825daee3 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -818,14 +818,14 @@ function M:RunNiao(list, start_seat) --顯示正面 local item = list_niao_card:AddItemFromPool() local card = list[i].card - coroutine.wait(2 / #list) - -- item:GetTransition("appear"):Play() item.icon = UIPackage.GetItemURL("Main_Majiang", "b202_" .. card) if list[i].score > 0 then item:GetController("select").selectedIndex = 1 else item:GetController("select").selectedIndex = 0 end + coroutine.wait(2 / #list) + -- item:GetTransition("appear"):Play() end coroutine.start(function() coroutine.wait(0.3) diff --git a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua index 3f430e83..630d3f3f 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua @@ -20,6 +20,9 @@ end function M:FillData(player) PlayerInfoView.FillData(self, player) + if player.seat == 1 then + self._view:GetController('room_owner').selectedIndex = 1 + end -- if player.cur_hp ~= nil then -- self:UpdateScore(d2ad(player.cur_hp)) -- else @@ -35,8 +38,8 @@ function M:SetBaoDan(flag) self._view:GetController('baodan').selectedIndex = flag and 1 or 0 end -function M:PlayScore(score, win) - if win then +function M:PlayScore(score) + if score >= 0 then self._view:GetController('piaoWin').selectedIndex = 1 self._view:GetChild('text_piaoScoreAdd').text = "+" .. score else diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua index 2544b20c..fe8e90eb 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua @@ -52,6 +52,7 @@ function M:RegisterEvt() self._eventmap[RunFast_Protocol.GAME_EVENT_NOTIFY_XIPAI] = self.OnEventXiPaiAnim self._eventmap[RunFast_Protocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard + self._eventmap[RunFast_Protocol.RunFast_Bomb_Score_New] = self.OnBompScoreNew end -- function M:Oener(evt_data) @@ -194,12 +195,12 @@ function M:OnBombScore(evt_data) local scoreList = evt_data["gold_list"] self._cacheEvent:Enqueue( function() - for i = 1, #scoreList do - local score = scoreList[i].bom_score - local player = self._room:GetPlayerById(scoreList[i].aid) - player.total_score = player.total_score + score - end - DispatchEvent(self._dispatcher, RunFast_GameEvent.OnBombScore, scoreList) + -- for i = 1, #scoreList do + -- local score = scoreList[i].bom_score + -- local player = self._room:GetPlayerById(scoreList[i].aid) + -- player.total_score = player.total_score + score + -- end + -- DispatchEvent(self._dispatcher, RunFast_GameEvent.OnBombScore, scoreList) end ) end @@ -347,6 +348,8 @@ function M:OnResult(evt_data) function() for i = 1, #info do local p = self._room:GetPlayerBySeat(info[i]["seat"]) + print("lingmeng log200", info[i]["score"], p.total_score) + info[i].card_score = info[i]["score"] - p.total_score p.total_score = info[i]["score"] info[i]["self_user"] = p.self_user end @@ -360,6 +363,8 @@ function M:OnResult(evt_data) function() for i = 1, #info do local p = self._room:GetPlayerBySeat(info[i]["seat"]) + print("lingmeng log200", info[i]["score"], p.total_score) + info[i].card_score = info[i]["score"] - p.total_score p.total_score = info[i]["score"] info[i]["self_user"] = p.self_user end @@ -700,4 +705,21 @@ function M:LevelRoom(callBack) ) end +--炸弹分显示,新协议 +function M:OnBompScoreNew(evt_data) + local scoreList = evt_data["PlayerScoreList"] + self._cacheEvent:Enqueue( + function() + for i = 1, #scoreList do + local score = scoreList[i].pomSore + local player = self._room:GetPlayerBySeat(scoreList[i].seat) + print("lingmeng log20011", player.total_score) + player.total_score = player.total_score + score + print("lingmeng log20012", player.total_score) + end + DispatchEvent(self._dispatcher, RunFast_GameEvent.OnBompScoreNew, scoreList) + end + ) +end + return M diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua index dcb139a5..492aa41a 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua @@ -16,8 +16,9 @@ local RunFast_GameEvent = { OnResult = "OnResult", OnResultByDissolve = "OnResultByDissolve", OnConfrimToNextGameSucc = "OnConfrimToNextGameSucc", - Game_TuoGuan="Game_TuoGuan", - EventXiPai="EventXiPai", - OnPassSuccCheckCard="OnPassSuccCheckCard", + Game_TuoGuan = "Game_TuoGuan", + EventXiPai = "EventXiPai", + OnPassSuccCheckCard = "OnPassSuccCheckCard", + OnBompScoreNew = "OnBompScoreNew" } -return RunFast_GameEvent \ No newline at end of file +return RunFast_GameEvent diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index 91a42ae8..eb3c2288 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -554,16 +554,16 @@ function M:EventInit() -- end -- end - if index == 1 then - local card_info = self._player_card_info[index] - card_info:SetOutCardInfo(nil, false) - -- if self.MypokerList ~= nil then - -- -- body - -- card_info:Clear() - -- card_info:InitPoker(self.MypokerList, false) - -- self.MypokerList = nil - -- end - end + -- if index == 1 then + local card_info = self._player_card_info[index] + card_info:SetOutCardInfo(nil, false) + -- if self.MypokerList ~= nil then + -- -- body + -- card_info:Clear() + -- card_info:InitPoker(self.MypokerList, false) + -- self.MypokerList = nil + -- end + -- end self._leftClock_continue = coroutine.start(function() coroutine.wait(1.2) for i = 1, #self._player_card_info do @@ -574,9 +574,9 @@ function M:EventInit() else card_info._ctr_time_clock.selectedIndex = 0 end - if self._room.is_new_bout then - card_info.ctr_outpoker.selectedIndex = 0 - end + -- if self._room.is_new_bout then + -- card_info.ctr_outpoker.selectedIndex = 0 + -- end end if self._left_time and self._left_time < 15 then self._left_time = 15 @@ -927,16 +927,7 @@ function M:EventInit() -- -- self:CreateRankEff() -- -- end -- end - for i = 1, #info do - local player = info[i] - local p = self._room:GetPlayerBySeat(player.seat) - local head_info = self._player_info[self:GetPos(player.seat)] - local card_info = self._player_card_info[self:GetPos(player.seat)] - head_info:SetBaoDan(false) - head_info._view:GetChild('text_jifen').text = player.score - head_info:PlayScore(player.winscore, win_seat == player.seat) - end for i = 1, #info do local player = info[i] local p = self._room:GetPlayerBySeat(player.seat) @@ -944,14 +935,7 @@ function M:EventInit() local card_info = self._player_card_info[self:GetPos(player.seat)] if player.seat ~= self._room.self_player.seat then - local time = 1.5 - local oneTime = 0.2 - if #player.handCards > 5 then - time = time - #player.handCards * oneTime - else - time = 0.1 - oneTime = 1.5 / #player.handCards - end + local oneTime = 7 / 60 card_info:UpdateHandPoker(player.cards, false, true) @@ -962,13 +946,20 @@ function M:EventInit() local child_card = card_info._view_resultOut:AddItemFromPool() card_info:FillPoker(child_card, "", nil, player.handCards[i]) ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/fanCard.mp3") + printlog("lingmeng oneTime", oneTime) coroutine.wait(oneTime) end - coroutine.wait(time) end end - if win_seat ~= self._room.self_player.seat then - coroutine.wait(1.5) + for i = 1, #info do + local player = info[i] + local p = self._room:GetPlayerBySeat(player.seat) + local head_info = self._player_info[self:GetPos(player.seat)] + head_info:SetBaoDan(false) + + head_info._view:GetChild('text_jifen').text = player.score + -- head_info:PlayScore(player.winscore, win_seat == player.seat) + head_info:PlayScore(player.card_score, win_seat == player.seat) end self:ChangeBgmMusic(1) -- if over == 0 then @@ -979,10 +970,19 @@ function M:EventInit() -- -- -- print("333333333333333333") -- -- coroutine.wait(2) -- end - + coroutine.wait(2) self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, win_seat, 0, remaincards) + self.result_view:SetDestroryCallback(function() + for i = 1, #self._player_card_info do + local card_info = self._player_card_info[i] + card_info.ctr_outpoker.selectedIndex = 0 + if card_info._ctr_resultOut then + card_info._ctr_resultOut.selectedIndex = 0 + end + end + end) self.result_view:Show() if self.WinItem_view ~= nil then self.WinItem_view:Dispose() @@ -1067,6 +1067,18 @@ function M:EventInit() local player_info = self._player_info[self:GetPos(p.seat)] player_info:Ready(true) end) + + _gamectr:AddEventListener(RunFast_GameEvent.OnBompScoreNew, function(...) + local arg = { ... } + local scoreList = arg[1] + for i = 1, #scoreList do + local score = scoreList[i].pomSore + local player = self._room:GetPlayerBySeat(scoreList[i].seat) + local head_info = self._player_info[self:GetPos(scoreList[i].seat)] + head_info:PlayScore(score, true) + head_info:UpdateScore(player.total_score) + end + end) end function M:ReConnectForStart() @@ -1218,6 +1230,15 @@ function M:ReconnectForClearing() self.result_view = RunFast_ResultView.new(self, self._room.player_list, self._room.room_id, 0, win_seat, 0, remaincards) + self.result_view:SetDestroryCallback(function() + for i = 1, #self._player_card_info do + local card_info = self._player_card_info[i] + card_info.ctr_outpoker.selectedIndex = 0 + if card_info._ctr_resultOut then + card_info._ctr_resultOut.selectedIndex = 0 + end + end + end) self.result_view:Show() local card_info = self._player_card_info[1] card_info._view:GetChild("out_card_list").visible = true @@ -1274,8 +1295,7 @@ function M:CreateRankEff() end function M:_Effect(type1, player) - print("lingmeng_Effect", type1) - if type1 == 1 or type1 == 3 or type1 == 7 or type1 == 9 then + if type1 == 1 or type1 == 3 or type1 == 7 then self._popEvent = true return end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua index 7cbc6329..ee7c2eb6 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerPokerInfoView.lua @@ -376,6 +376,10 @@ function M:PlayEffect(type, callback) effect = "te_zhadan" y = self._view_Out.y + fristXy.y x = self._view_Out.x + (lastXy.x + fristXy.x) / 2 + elseif type == 9 then + effect = "te_sidaisab" + y = self._view_Out.y + fristXy.y + x = self._view_Out.x + (lastXy.x + fristXy.x) / 2 end if #effect > 0 then local obj = UIPackage.CreateObjectFromURL(string.format("ui://Extend_Poker_RunFastNew/%s", effect)) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua index 6fcf50a9..a53a681a 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua @@ -3,41 +3,42 @@ --- DateTime: 2017/12/13 10:51 --- local RunFast_Protocol = { - RunFast_ConfirmToNextGame = "1003", + RunFast_ConfirmToNextGame = "1003", - RunFast_Send_Card = "1013", + RunFast_Send_Card = "1013", - RunFast_Send_Guo = "1014", + RunFast_Send_Guo = "1014", - RunFast_Send_Piao = "1015", + RunFast_Send_Piao = "1015", - RunFast_Ming_Card = "2117", + RunFast_Ming_Card = "2117", - RunFast_Init_Card = "2011", + RunFast_Init_Card = "2011", - RunFast_Options = "2004", + RunFast_Options = "2004", - RunFast_Index_Move = "2016", + RunFast_Index_Move = "2016", - RunFast_Play_Succ = "2021", + RunFast_Play_Succ = "2021", - RunFast_Pass_Succ = "2030", + RunFast_Pass_Succ = "2030", - RunFast_Put_Error = "2111", + RunFast_Put_Error = "2111", - RunFast_Bomb_Score = "2118", + RunFast_Bomb_Score = "2118", + RunFast_Bomb_Score_New = "2110", - RunFast_Result = "2007", - RunFast_Piao_Tip = "2031", - RunFast_Piao_Action = "2032", + RunFast_Result = "2007", + RunFast_Piao_Tip = "2031", + RunFast_Piao_Action = "2032", RunFast_ConfirmToNextGameSucc = "2010", - PT_GAMETUOGUAN = "2029",--托管 - SEND_TUOGUAN = "1018",--托管 - GAME_XIPAI = "20836", - GAME_EVENT_XIPAI = "20837", - GAME_EVENT_NOTIFY_XIPAI = "20838", - GAME_EVT_CARDINHAND = "202022", + PT_GAMETUOGUAN = "2029", --托管 + SEND_TUOGUAN = "1018", --托管 + GAME_XIPAI = "20836", + GAME_EVENT_XIPAI = "20837", + GAME_EVENT_NOTIFY_XIPAI = "20838", + GAME_EVT_CARDINHAND = "202022", } -return RunFast_Protocol \ No newline at end of file +return RunFast_Protocol diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 29488f5b..8ccf73f2 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -199,7 +199,7 @@ function M:InitView(url, use_custom_bg, custom_bg_config) self._view:GetChild('wanfa_text').text = gamePlay self._laiziMove = self._view:GetTransition('laiziMove') - + self._touxiangMove = self._view:GetTransition('touxiangMove') --闹钟倒计时报时 self._leftTime_xiangling = 3 end diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml index e3b6104d..ac9b4a8f 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml @@ -3,11 +3,14 @@ - - + + + + + - + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml index 63ddde05..899c485a 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml @@ -11,7 +11,7 @@ - + @@ -86,11 +86,11 @@ - + - + @@ -102,11 +102,15 @@ + + + + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml index a7fd3450..ce2a5db2 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml @@ -1,6 +1,6 @@ - + @@ -14,9 +14,7 @@ - - - + @@ -36,6 +34,9 @@ + + + @@ -43,19 +44,16 @@ - - - - + - + @@ -93,11 +91,11 @@ - + - + @@ -109,11 +107,13 @@ + + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml index bfe11765..e14cc2a3 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml @@ -14,9 +14,7 @@ - - - + @@ -93,11 +91,11 @@ - + - + @@ -109,11 +107,13 @@ + + - - - - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml index a0e0e1c1..8a9a5074 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml @@ -1,7 +1,7 @@ - + @@ -78,6 +78,9 @@ + + + @@ -98,8 +101,12 @@ - - + +