0929同步

2025-09-29 16:09:08 +08:00 · 2025-09-29 16:09:08 +08:00 · 79269e5a09
parent eea3f58d62
commit 79269e5a09
68 changed files with 350 additions and 145 deletions
--- 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)
--- 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)]
--- 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
--- 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

--- 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)
--- 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

--- 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)
--- 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 "有精可胡")
--- 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)
--- 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

--- 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)
--- 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
--- 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
--- 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
+return RunFast_GameEvent
--- 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
--- 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))
--- 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
+return RunFast_Protocol
--- 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
--- 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 @@
  <controller name="button" pages="0,up,1,down" selected="0"/>
  <controller name="choose" pages="0,,1," selected="1"/>
  <displayList>
-    <loader id="n4_ckvb" name="icon" xy="0,0" size="278,328" group="n6_ckvb" url="ui://lx6k641grmtwhm" align="center" vAlign="middle" fill="scaleFree"/>
-    <image id="n7_diqo" name="n7" src="diqocna" fileName="Main_New/Component/Image/bg_mask.png" xy="-2,-8" size="284,336" group="n6_ckvb">
+    <loader id="n4_ckvb" name="icon" xy="0,0" size="278,328" group="n6_ckvb" url="ui://lx6k641grmtwhm" align="center" vAlign="middle" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n7_diqo" name="n7" src="diqocna" fileName="Main_New/Component/Image/bg_mask.png" xy="-2,-8" size="286,336" group="n6_ckvb">
      <gearDisplay controller="choose" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%"/>
    </image>
-    <group id="n6_ckvb" name="body" xy="-2,-8" size="284,336" advanced="true">
+    <group id="n6_ckvb" name="body" xy="-2,-8" size="286,336" advanced="true">
      <gearXY controller="button" pages="0,1" values="-2,-8|0,-65"/>
    </group>
  </displayList>
--- 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 @@
  <controller name="text_color" pages="0,,1," selected="0"/>
  <controller name="cScore" pages="0,,1," selected="0"/>
  <controller name="baodan" pages="0,,1," selected="0"/>
-  <controller name="piaoWin" pages="0,,1," selected="0"/>
+  <controller name="piaoWin" pages="0,,1," selected="1"/>
  <displayList>
    <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="-1,-113" visible="false">
      <gearDisplay controller="read" pages="1"/>
@ -86,11 +86,11 @@
    <image id="n63_n9qr" name="n63" src="n9qrcm6" fileName="Main_New/Image/alarm1.png" xy="-45,230" pivot="0.47,0.25" size="260,243" rotation="-20">
      <gearDisplay controller="baodan" pages="1"/>
    </image>
-    <text id="n64_diqo" name="text_piaoScoreAdd" xy="-37,167" size="219,67" visible="false" font="ui://27vd145bdiqo7jd9" fontSize="42" text="+1000">
+    <text id="n64_diqo" name="text_piaoScoreAdd" xy="-37,167" pivot="0.5,0.5" size="219,67" visible="false" font="ui://27vd145bdiqo7jd9" fontSize="42" text="+1000">
      <gearDisplay controller="piaoWin" pages="1"/>
      <relation target="" sidePair="center-center"/>
    </text>
-    <text id="n65_diqo" name="text_piaoScoreLess" xy="-37,167" size="219,67" visible="false" font="ui://27vd145bdiqocn2" fontSize="42" text="-1000">
+    <text id="n65_diqo" name="text_piaoScoreLess" xy="-37,167" pivot="0.5,0.5" size="219,67" visible="false" font="ui://27vd145bdiqocn2" fontSize="42" text="-1000">
      <gearDisplay controller="piaoWin" pages="0"/>
      <relation target="" sidePair="center-center"/>
    </text>
@ -102,11 +102,15 @@
    <item time="18" type="Rotation" target="n63_n9qr" tween="true" startValue="20" endValue="0" duration="6" ease="Linear"/>
  </transition>
  <transition name="piaoScore">
+    <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,1" endValue="0,0" duration="0" ease="Linear"/>
+    <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="0" type="Scale" target="n65_diqo" tween="true" startValue="0,0" endValue="1.1,1.1" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n64_diqo" value="true"/>
    <item time="0" type="Visible" target="n64_diqo" value="true"/>
    <item time="0" type="Visible" target="n65_diqo" value="true"/>
-    <item time="0" type="XY" target="n64_diqo" tween="true" startValue="-37,167" endValue="-,-1,-0.257,-0.007" duration="18" ease="Linear"/>
-    <item time="0" type="XY" target="n65_diqo" tween="true" startValue="-37,167" endValue="-,0,-0.257,0" duration="18" ease="Linear"/>
-    <item time="30" type="Visible" target="n64_diqo" value="false"/>
-    <item time="30" type="Visible" target="n65_diqo" value="false"/>
+    <item time="0" type="XY" target="n64_diqo" tween="true" startValue="-,77" endValue="-,20" duration="18" ease="Linear"/>
+    <item time="0" type="XY" target="n65_diqo" tween="true" startValue="-,77" endValue="-,20" duration="18" ease="Linear"/>
+    <item time="48" type="Visible" target="n64_diqo" value="false"/>
+    <item time="48" type="Visible" target="n65_diqo" value="false"/>
  </transition>
 </component>
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="144,144" opaque="false" initName="gcm_info">
-  <controller name="room_owner" pages="0,,1," selected="0"/>
+  <controller name="room_owner" pages="0,,1," selected="1"/>
  <controller name="bank" pages="0,,1," selected="0"/>
  <controller name="read" pages="0,,1," selected="0"/>
  <controller name="offline" pages="0,,1," selected="0"/>
@ -14,9 +14,7 @@
  <controller name="baodan" pages="0,,1," selected="0"/>
  <controller name="piaoWin" pages="0,,1," selected="0"/>
  <displayList>
-    <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="7,149">
-      <gearDisplay controller="read" pages="1"/>
-    </image>
+    <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="7,149" visible="false"/>
    <component id="n39_fove" name="n39" src="prgzag" fileName="component/newcard/3/310.xml" xy="136,28" scale="0.4,0.4">
      <gearDisplay controller="Oener" pages="1"/>
    </component>
@ -36,6 +34,9 @@
    <text id="n45_kx91" name="text_jifen" xy="-129,76" size="48,59" scale="1.3,1" font="FZCuYuan-M03" fontSize="44" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoClearText="true" text="01">
      <relation target="n59_n9qr" sidePair="middle-middle,right-left"/>
    </text>
+    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="0,76" visible="false">
+      <gearDisplay controller="room_owner" pages="1"/>
+    </image>
    <text id="n51_ckvb" name="name" xy="-248,5" size="240,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="4" autoClearText="true" text="奥利奥生...">
      <relation target="" sidePair="right-left,bottom-top"/>
    </text>
@ -43,19 +44,16 @@
    <component id="n34_u4l2" name="zhuang" src="prgzac" fileName="component/head/touxiang.xml" xy="-371,-254" group="n33_e7qn" visible="false">
      <gearDisplay controller="bank" pages="1"/>
    </component>
-    <image id="n6" name="fangzhu" src="e54q3y" fileName="font/images/head/owner.png" pkg="27vd145b" xy="-239,-225" group="n33_e7qn" visible="false">
-      <gearDisplay controller="room_owner" pages="1"/>
-    </image>
    <component id="n36_h4ge" name="n36" xy="-333,-216" size="100,100" group="n33_e7qn" touchable="false">
      <gearDisplay controller="dismiss_room" pages="1"/>
    </component>
-    <group id="n33_e7qn" name="n33" xy="-371,-254" size="157,155" group="n52_ckvb"/>
+    <group id="n33_e7qn" name="n33" xy="-371,-254" size="155,155" group="n52_ckvb"/>
    <text id="n41_i3h6" name="piao" xy="-338,-248" size="92,29" group="n52_ckvb" fontSize="20" color="#ffd100" align="center" vAlign="middle" autoSize="none" text=""/>
    <component id="n29_e54q" name="info" src="jdf3hy" fileName="component/head/HeadNameBG.xml" xy="-360,-121" group="n52_ckvb"/>
    <image id="n44_kx91" name="n44" src="jdf3hx" fileName="component/head/jfk.png" xy="-352,-71" size="132,35" group="n47_kx91"/>
    <text id="n46_kx91" name="n46" xy="-346,-69" size="48,32" group="n47_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
    <group id="n47_kx91" name="zhanji" xy="-352,-71" size="132,35" group="n52_ckvb" advanced="true"/>
-    <group id="n52_ckvb" name="n52" xy="-371,-254" size="157,218" visible="false" advanced="true"/>
+    <group id="n52_ckvb" name="n52" xy="-371,-254" size="155,218" visible="false" advanced="true"/>
    <graph id="n32_kba2" name="offLine" xy="0,0" size="144,144" group="n53_ckvb" aspect="true" touchable="false" type="rect" lineSize="0" fillColor="#b3000000">
      <gearDisplay controller="offline" pages="1"/>
      <relation target="" sidePair="width-width,height-height"/>
@ -93,11 +91,11 @@
    <image id="n63_n9qr" name="n63" src="n9qrcm6" fileName="Main_New/Image/alarm1.png" xy="-63,313" pivot="0.47,0.25" size="260,243" rotation="-20">
      <gearDisplay controller="baodan" pages="1"/>
    </image>
-    <text id="n64_diqo" name="text_piaoScoreAdd" xy="-37,156" size="219,67" visible="false" font="ui://27vd145bdiqo7jd9" fontSize="42" text="+1000">
+    <text id="n64_diqo" name="text_piaoScoreAdd" xy="-37,156" pivot="0.5,0.5" size="219,67" visible="false" font="ui://27vd145bdiqo7jd9" fontSize="42" text="+1000">
      <gearDisplay controller="piaoWin" pages="1"/>
      <relation target="" sidePair="center-center"/>
    </text>
-    <text id="n65_diqo" name="text_piaoScoreLess" xy="-37,156" size="219,67" visible="false" font="ui://27vd145bdiqocn2" fontSize="42" text="-1000">
+    <text id="n65_diqo" name="text_piaoScoreLess" xy="-37,156" pivot="0.5,0.5" size="219,67" visible="false" font="ui://27vd145bdiqocn2" fontSize="42" text="-1000">
      <gearDisplay controller="piaoWin" pages="0"/>
      <relation target="" sidePair="center-center"/>
    </text>
@ -109,11 +107,13 @@
    <item time="45" type="Rotation" target="n63_n9qr" tween="true" startValue="25" endValue="0" duration="15" ease="Linear"/>
  </transition>
  <transition name="piaoScore">
+    <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="0" type="Scale" target="n65_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
    <item time="0" type="Visible" target="n64_diqo" value="true"/>
    <item time="0" type="Visible" target="n65_diqo" value="true"/>
-    <item time="0" type="XY" target="n64_diqo" tween="true" startValue="-37,156" endValue="-,-1,-0.257,-0.007" duration="18" ease="Linear"/>
-    <item time="0" type="XY" target="n65_diqo" tween="true" startValue="-37,156" endValue="-,1,-0.257,0.007" duration="18" ease="Linear"/>
-    <item time="30" type="Visible" target="n64_diqo" value="false"/>
-    <item time="30" type="Visible" target="n65_diqo" value="false"/>
+    <item time="0" type="XY" target="n64_diqo" tween="true" startValue="-,77" endValue="-,18.992" duration="18" ease="Linear"/>
+    <item time="0" type="XY" target="n65_diqo" tween="true" startValue="-,77" endValue="-,21.008" duration="18" ease="Linear"/>
+    <item time="48" type="Visible" target="n64_diqo" value="false"/>
+    <item time="48" type="Visible" target="n65_diqo" value="false"/>
  </transition>
 </component>
--- 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 @@
  <controller name="baodan" pages="0,,1," selected="0"/>
  <controller name="piaoWin" pages="0,,1," selected="0"/>
  <displayList>
-    <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="7,149">
-      <gearDisplay controller="read" pages="1"/>
-    </image>
+    <image id="n8" name="ready" src="jdf3hz" fileName="component/Result/yzb.png" xy="7,149" visible="false"/>
    <component id="n39_fove" name="n39" src="prgzag" fileName="component/newcard/3/310.xml" xy="136,28" scale="0.4,0.4">
      <gearDisplay controller="Oener" pages="1"/>
    </component>
@ -93,11 +91,11 @@
    <image id="n63_n9qr" name="n63" src="n9qrcm6" fileName="Main_New/Image/alarm1.png" xy="-63,313" pivot="0.47,0.25" size="260,243" rotation="-20">
      <gearDisplay controller="baodan" pages="1"/>
    </image>
-    <text id="n64_diqo" name="text_piaoScoreAdd" xy="-37,156" size="219,67" visible="false" font="ui://27vd145bdiqo7jd9" fontSize="42" text="+1000">
+    <text id="n64_diqo" name="text_piaoScoreAdd" xy="-37,156" pivot="0.5,0.5" size="219,67" visible="false" font="ui://27vd145bdiqo7jd9" fontSize="42" text="+1000">
      <gearDisplay controller="piaoWin" pages="1"/>
      <relation target="" sidePair="center-center"/>
    </text>
-    <text id="n65_diqo" name="text_piaoScoreLess" xy="-37,156" size="219,67" visible="false" font="ui://27vd145bdiqocn2" fontSize="42" text="-1000">
+    <text id="n65_diqo" name="text_piaoScoreLess" xy="-37,156" pivot="0.5,0.5" size="219,67" visible="false" font="ui://27vd145bdiqocn2" fontSize="42" text="-1000">
      <gearDisplay controller="piaoWin" pages="0"/>
      <relation target="" sidePair="center-center"/>
    </text>
@ -109,11 +107,13 @@
    <item time="45" type="Rotation" target="n63_n9qr" tween="true" startValue="25" endValue="0" duration="15" ease="Linear"/>
  </transition>
  <transition name="piaoScore">
+    <item time="0" type="Scale" target="n64_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="0" type="Scale" target="n65_diqo" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Linear"/>
    <item time="0" type="Visible" target="n64_diqo" value="true"/>
    <item time="0" type="Visible" target="n65_diqo" value="true"/>
-    <item time="0" type="XY" target="n64_diqo" tween="true" startValue="-37,156" endValue="-,-1,-0.257,-0.007" duration="18" ease="Linear"/>
-    <item time="0" type="XY" target="n65_diqo" tween="true" startValue="-37,156" endValue="-,1,-0.257,0.007" duration="18" ease="Linear"/>
-    <item time="21" type="Visible" target="n64_diqo" value="false"/>
-    <item time="21" type="Visible" target="n65_diqo" value="false"/>
+    <item time="0" type="XY" target="n64_diqo" tween="true" startValue="-,77" endValue="-,18.992" duration="18" ease="Linear"/>
+    <item time="0" type="XY" target="n65_diqo" tween="true" startValue="-,77" endValue="-,21.008" duration="18" ease="Linear"/>
+    <item time="48" type="Visible" target="n64_diqo" value="false"/>
+    <item time="48" type="Visible" target="n65_diqo" value="false"/>
  </transition>
 </component>
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2280,328" opaque="false" initName="player_card_info">
  <controller name="output" pages="0,,1,,2," selected="0"/>
-  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
+  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="1"/>
  <controller name="put_error" pages="0,,1," selected="0"/>
  <controller name="piao" pages="0,,1,,2,,3," selected="0"/>
  <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
@ -78,6 +78,9 @@
      <item/>
      <item/>
      <item/>
+      <item/>
+      <item/>
+      <item/>
    </list>
    <list id="n70_ckvb" name="List_Out" xy="260,-311" pivot="0.5,0.5" size="1760,210" layout="row" selectionMode="none" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="center" vAlign="middle">
      <gearDisplay controller="output" pages="1"/>
@ -98,8 +101,12 @@
      <item/>
      <item/>
    </list>
-    <component id="n74_ckvb" name="Btn_SendCard" src="ckvbcix" fileName="Main_New/Component/Btn_SendCard.xml" xy="1172,-193" size="384,125" group="n73_ckvb"/>
-    <component id="n75_ckvb" name="Btn_Tip" src="ckvbciy" fileName="Main_New/Component/Btn_Tip.xml" xy="742,-197" size="384,125" group="n73_ckvb"/>
+    <component id="n74_ckvb" name="Btn_SendCard" src="ckvbcix" fileName="Main_New/Component/Btn_SendCard.xml" xy="1172,-193" size="384,125" group="n73_ckvb">
+      <Button sound=""/>
+    </component>
+    <component id="n75_ckvb" name="Btn_Tip" src="ckvbciy" fileName="Main_New/Component/Btn_Tip.xml" xy="742,-197" size="384,125" group="n73_ckvb">
+      <Button sound=""/>
+    </component>
    <group id="n73_ckvb" name="btn" xy="742,-197" size="814,129" advanced="true">
      <gearDisplay controller="out_card_option" pages="1,2"/>
    </group>
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sidaisab.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/te_sidaisab.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="300,97" pivot="0.5,0.5" anchor="true">
+  <displayList>
+    <image id="n8_diqo" name="n8" src="11k4tcqf" fileName="Main_New/texiao/图层 5.png" xy="64,4"/>
+    <image id="n9_diqo" name="n9" src="11k4tcqg" fileName="Main_New/texiao/图层 6.png" xy="103,-6"/>
+    <image id="n10_diqo" name="n10" src="11k4tcqh" fileName="Main_New/texiao/组 1 拷贝.png" xy="143,7"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n10_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n8_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="0" type="Alpha" target="n9_diqo" value="0"/>
+    <item time="0" type="XY" target="n10_diqo" tween="true" startValue="143,58,0.477,0.598" endValue="143,4" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n8_diqo" tween="true" startValue="64,58" endValue="64,4" duration="6" ease="Linear"/>
+    <item time="6" type="Alpha" target="n9_diqo" tween="true" startValue="0" endValue="1" duration="4" ease="Linear"/>
+    <item time="6" type="XY" target="n10_diqo" tween="true" startValue="143,4" endValue="212,4" duration="6" ease="Linear"/>
+    <item time="6" type="XY" target="n8_diqo" tween="true" startValue="64,4" endValue="6,4" duration="6" ease="Linear"/>
+    <item time="6" type="XY" target="n9_diqo" tween="true" startValue="103,-85" endValue="103,34" duration="6" ease="Linear"/>
+    <item time="12" type="XY" target="n10_diqo" tween="true" startValue="212,4" endValue="177,4" duration="3" ease="Linear"/>
+    <item time="12" type="XY" target="n8_diqo" tween="true" startValue="6,4" endValue="27,4" duration="3" ease="Linear"/>
+    <item time="12" type="XY" target="n9_diqo" tween="true" startValue="103,34" endValue="105,1" duration="3" ease="Linear"/>
+    <item time="21" type="Alpha" target="n10_diqo" value="1"/>
+    <item time="21" type="Alpha" target="n8_diqo" value="1"/>
+    <item time="21" type="Alpha" target="n9_diqo" value="1"/>
+  </transition>
+</component>
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/图层
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/图层
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/图层
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/图层
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/组
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/texiao/组
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
@ -134,7 +134,7 @@
    <component id="n69_sdax" name="player_card_info_1" src="ckvbcjl" fileName="Main_New/Player_card_info_1.xml" xy="126,838" group="n122_ckvb">
      <gearDisplay controller="state" pages="1,3"/>
      <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
-      <relation target="" sidePair="bottom-bottom"/>
+      <relation target="" sidePair="width-width%,height-height%,center-center,bottom-bottom"/>
    </component>
    <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="447,175" group="n122_ckvb" touchable="false">
      <gearDisplay controller="state" pages="1,3"/>
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
@ -676,6 +676,10 @@
    <component id="11k4tcq6" name="PlayerHead_3.xml" path="/Main_New/"/>
    <component id="11k4tcq7" name="Player_card_info_3.xml" path="/Main_New/"/>
    <image id="11k4tcqe" name="logo_301.png" path="/"/>
+    <image id="11k4tcqf" name="图层 5.png" path="/Main_New/texiao/"/>
+    <image id="11k4tcqg" name="图层 6.png" path="/Main_New/texiao/"/>
+    <image id="11k4tcqh" name="组 1 拷贝.png" path="/Main_New/texiao/"/>
+    <component id="11k4tcqi" name="te_sidaisab.xml" path="/Main_New/texiao/" exported="true"/>
  </resources>
  <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>
--- a/wb_new_ui/assets/Family/Record/Component/btn_lastPage.xml
+++ b/wb_new_ui/assets/Family/Record/Component/btn_lastPage.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,100" extention="Button" initName="btn_lastPage">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="donTouch" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n3_11k4t" name="n3" src="11k4t7d73" fileName="Record/Image/table_btn_green_background1.png" xy="0,0" size="250,100">
+      <gearDisplay controller="donTouch" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n5_11k4t" name="n5" src="11k4t7d74" fileName="Record/Image/table_btn_green_background2.png" xy="0,0" size="250,100">
+      <gearDisplay controller="donTouch" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n6_11k4t" name="n6" xy="59,26" size="112,49" scale="1.2,1" font="Arial" fontSize="36" text="上一页"/>
+  </displayList>
+  <Button/>
+</component>
--- a/wb_new_ui/assets/Family/Record/Component/btn_nextPage.xml
+++ b/wb_new_ui/assets/Family/Record/Component/btn_nextPage.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,100" extention="Button" initName="btn_nextPage">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="donTouch" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n3_11k4t" name="n3" src="11k4t7d73" fileName="Record/Image/table_btn_green_background1.png" xy="0,0" size="250,100">
+      <gearDisplay controller="donTouch" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n5_11k4t" name="n5" src="11k4t7d75" fileName="Record/Image/table_btn_green_background3.png" xy="0,0" size="250,100">
+      <gearDisplay controller="donTouch" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n6_11k4t" name="n6" xy="59,26" size="112,49" scale="1.2,1" font="Arial" fontSize="36" text="下一页"/>
+  </displayList>
+  <Button/>
+</component>
--- a/wb_new_ui/assets/Family/Record/Image/table_btn_green_background1.png
+++ b/wb_new_ui/assets/Family/Record/Image/table_btn_green_background1.png
--- a/wb_new_ui/assets/Family/Record/Image/table_btn_green_background2.png
+++ b/wb_new_ui/assets/Family/Record/Image/table_btn_green_background2.png
--- a/wb_new_ui/assets/Family/Record/Image/table_btn_green_background3.png
+++ b/wb_new_ui/assets/Family/Record/Image/table_btn_green_background3.png
--- a/wb_new_ui/assets/Family/Record/com_Record.xml
+++ b/wb_new_ui/assets/Family/Record/com_Record.xml
@ -4,6 +4,7 @@
    <remark page="0" value="亲友圈战绩"/>
    <remark page="1" value="房间战绩"/>
  </controller>
+  <controller name="page" pages="0,,1," selected="0"/>
  <displayList>
    <image id="n65_g238" name="n65" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" size="2531,1170" group="n67_g238">
      <relation target="" sidePair="width-width,height-height"/>
@ -44,29 +45,35 @@
      <relation target="" sidePair="center-center"/>
    </text>
    <image id="n72_ofwa" name="n72" src="ofwa7d6n" fileName="Main/Image/hall_club_BG_landifang.png" xy="559,250" size="138,62" group="n57_slrk"/>
-    <text id="n49_slrk" name="n49" xy="583,250" size="88,106" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="房号">
+    <text id="n49_slrk" name="n49" xy="583,250" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="房号">
      <relation target="" sidePair="center-center"/>
    </text>
    <image id="n73_ofwa" name="n73" src="ofwa7d6n" fileName="Main/Image/hall_club_BG_landifang.png" xy="699,250" size="142,62" group="n57_slrk"/>
-    <text id="n58_slrk" name="n58" xy="726,254" size="88,106" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="房卡">
+    <text id="n58_slrk" name="n58" xy="726,254" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="房卡">
      <relation target="" sidePair="center-center"/>
    </text>
    <image id="n74_ofwa" name="n74" src="ofwa7d6n" fileName="Main/Image/hall_club_BG_landifang.png" xy="843,250" size="1094,62" group="n57_slrk"/>
-    <text id="n56_slrk" name="n56" xy="1346,254" size="88,106" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="结算">
+    <text id="n56_slrk" name="n56" xy="1346,254" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="结算">
      <relation target="" sidePair="center-center"/>
    </text>
    <image id="n75_ofwa" name="n75" src="ofwa7d6n" fileName="Main/Image/hall_club_BG_landifang.png" xy="1939,250" size="325,62" group="n57_slrk" flip="hz"/>
-    <text id="n54_slrk" name="n54" xy="2062,253" size="88,106" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="备注">
+    <text id="n54_slrk" name="n54" xy="2062,253" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="备注">
      <relation target="" sidePair="center-center"/>
    </text>
    <image id="n71_ofwa" name="n71" src="ofwa7d6o" fileName="Main/Image/hall_club_BG_landiyuan.png" xy="2266,250" size="159,62" group="n57_slrk" flip="hz"/>
-    <text id="n55_slrk" name="n55" xy="2303,252" size="88,106" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="回放">
+    <text id="n55_slrk" name="n55" xy="2303,252" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="回放">
      <relation target="" sidePair="center-center"/>
    </text>
    <component id="n63_ghku" name="combBox_time" src="ghku7d4d" fileName="Record/Component/combBox_time.xml" xy="1804,169" size="435,76" group="n57_slrk">
      <ComboBox visibleItemCount="10"/>
    </component>
-    <list id="n59_slrk" name="list_record_family" xy="99,321" size="2328,748" group="n57_slrk" layout="flow_hz" overflow="scroll" lineGap="15" defaultItem="ui://htcn7v3rslrk7d3b" align="center">
+    <list id="n59_slrk" name="list_record_family" xy="99,321" size="2328,748" group="n57_slrk" pageController="page" layout="pagination" overflow="scroll" scrollBarFlags="8" lineGap="15" lineItemCount="1" lineItemCount2="5" defaultItem="ui://htcn7v3rslrk7d3b" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
      <item/>
      <item/>
      <item/>
@ -74,6 +81,18 @@
    <group id="n57_slrk" name="n57" xy="99,169" size="2328,900" advanced="true">
      <gearDisplay controller="cWindow" pages="0"/>
    </group>
+    <component id="n85_11k4t" name="btn_nextPage" src="11k4t7d77" fileName="Record/Component/btn_nextPage.xml" xy="2171,1028" group="n87_11k4t">
+      <relation target="" sidePair="right-right%,bottom-bottom"/>
+    </component>
+    <component id="n86_11k4t" name="btn_lastPage" src="11k4t7d78" fileName="Record/Component/btn_lastPage.xml" xy="1911,1028" group="n87_11k4t">
+      <relation target="" sidePair="right-right%,bottom-bottom"/>
+    </component>
+    <text id="n88_11k4t" name="text_pageNum" xy="1793,1050" size="74,66" group="n87_11k4t" scale="1.3,1" font="Arial" fontSize="50" text="1/2">
+      <relation target="" sidePair="right-right%,bottom-bottom"/>
+    </text>
+    <group id="n87_11k4t" name="page" xy="1793,1028" size="628,100" advanced="true">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </group>
    <component id="n61_o2rw" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
    <image id="n62_ghku" name="n62" src="ghku7d4c" fileName="Record/Image/Group 327.png" xy="1033,13"/>
  </displayList>
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@ -421,6 +421,11 @@
    <image id="kyrh7d70" name="矩形 1.png" path="/NumberRecord/Image/" scale="9grid" scale9grid="10,10,20,20"/>
    <image id="n9qr7d71" name="hideStartRoom.png" path="/Main/Image/"/>
    <image id="n9qr7d72" name="showStartRoom.png" path="/Main/Image/"/>
+    <image id="11k4t7d73" name="table_btn_green_background1.png" path="/Record/Image/"/>
+    <image id="11k4t7d74" name="table_btn_green_background2.png" path="/Record/Image/"/>
+    <image id="11k4t7d75" name="table_btn_green_background3.png" path="/Record/Image/"/>
+    <component id="11k4t7d77" name="btn_nextPage.xml" path="/Record/Component/"/>
+    <component id="11k4t7d78" name="btn_lastPage.xml" path="/Record/Component/"/>
  </resources>
  <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@ -49,14 +49,14 @@
      <gearXY controller="action" pages="2,0,1" values="8808,794|-16242,794|5853,170"/>
      <Button icon="ui://v0j9abjygq7m48"/>
    </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2734,480" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2733,480" group="n36_k3io" visible="false">
      <Button icon="ui://v0j9abjygq7m49"/>
    </component>
-    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2324,487" group="n36_k3io" scale="0.9,1">
+    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2323,487" group="n36_k3io" scale="0.9,1">
      <gearDisplay controller="action" pages="1"/>
      <Button icon="ui://v0j9abjygq7m4i"/>
    </component>
-    <group id="n36_k3io" name="n36" xy="-2734,480" size="11809,414" visible="false" advanced="true">
+    <group id="n36_k3io" name="n36" xy="-2733,480" size="11808,414" visible="false" advanced="true">
      <relation target="" sidePair="bottom-bottom,center-center"/>
    </group>
    <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -143,7 +143,7 @@
    </component>
    <text id="n136_lu84" name="text_roomId" xy="15,67" size="264,54" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
    <group id="n135_lu84" name="top_left" xy="15,15" size="276,169"/>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1191,875" size="153,132">
      <gearDisplay controller="state" pages="0,2"/>
      <relation target="" sidePair="center-center,bottom-bottom"/>
    </component>
@ -152,7 +152,7 @@
      <gearXY controller="state" pages="1,3,4" values="87,787|84,778|85,786" default="730,-60"/>
      <relation target="n118_pkx5" sidePair="right-left,top-top"/>
    </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1869,38" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,216" size="153,132">
      <gearDisplay controller="state" pages="0,2"/>
      <relation target="" sidePair="center-center,top-top"/>
    </component>
@ -286,4 +286,8 @@
    <item time="1" type="Visible" target="n132_swus" value="true"/>
    <item time="1" type="XY" target="n132_swus" tween="true" startValue="1209,524" endValue="405,25" duration="29" ease="Linear"/>
  </transition>
+  <transition name="touxiangMove" frameRate="30">
+    <item time="0" type="XY" target="n141_lu84" tween="true" startValue="1192,875" endValue="87,787" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n152_kxhm" tween="true" startValue="1188,216" endValue="1866,33" duration="12" ease="Linear"/>
+  </transition>
 </component>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
@ -40,14 +40,14 @@
      <gearXY controller="action" pages="2,0,1" values="8810,794|-16246,794|5853,170"/>
      <Button icon="ui://v0j9abjygq7m48"/>
    </component>
-    <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2740,480" group="n230_ogwn" visible="false">
+    <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2739,480" group="n230_ogwn" visible="false">
      <Button icon="ui://v0j9abjygq7m49"/>
    </component>
-    <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2330,487" group="n230_ogwn" scale="0.9,1">
+    <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2329,487" group="n230_ogwn" scale="0.9,1">
      <gearDisplay controller="action" pages="1"/>
      <Button icon="ui://v0j9abjygq7m4i"/>
    </component>
-    <group id="n230_ogwn" name="n230" xy="-2740,480" size="11817,414" visible="false" advanced="true">
+    <group id="n230_ogwn" name="n230" xy="-2739,480" size="11816,414" visible="false" advanced="true">
      <relation target="" sidePair="bottom-bottom,center-center"/>
    </group>
    <component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -306,4 +306,9 @@
    <item time="1" type="Visible" target="n248_ogwn" value="true"/>
    <item time="1" type="XY" target="n248_ogwn" tween="true" startValue="1208,524" endValue="405,25" duration="29" ease="Linear"/>
  </transition>
+  <transition name="touxiangMove" frameRate="30">
+    <item time="0" type="XY" target="n140_lu84" tween="true" startValue="1888,519" endValue="2311,292" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n141_lu84" tween="true" startValue="1189,891" endValue="87,788" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n152_kxhm" tween="true" startValue="1189,239" endValue="1865,38" duration="12" ease="Linear"/>
+  </transition>
 </component>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_MaCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_MaCard.xml
@ -3,7 +3,7 @@
  <controller name="button" pages="0,up,1,down" selected="0"/>
  <controller name="select" pages="0,,1," selected="0"/>
  <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree" clearOnPublish="true">
      <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
      <relation target="" sidePair="width-width,height-height"/>
    </loader>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
@ -319,4 +319,10 @@
    <item time="1" type="Visible" target="n320_ogwn" value="true"/>
    <item time="1" type="XY" target="n320_ogwn" tween="true" startValue="1208,524" endValue="405,25" duration="29" ease="Linear"/>
  </transition>
+  <transition name="touxiangMove" frameRate="30">
+    <item time="0" type="XY" target="n140_lu84" tween="true" startValue="1891,522" endValue="2311,292" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n141_lu84" tween="true" startValue="1187,908" endValue="87,788" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n152_kxhm" tween="true" startValue="1187,224" endValue="1865,37" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n153_kxhm" tween="true" startValue="491,519" endValue="91,521" duration="12" ease="Linear"/>
+  </transition>
 </component>
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
+++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
+++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
--- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
@ -1,41 +1,41 @@
 [
  {
-    "ver": "1.0.32",
+    "ver": "1.0.33",
    "name": "跑得快",
    "check": true,
-    "version": "1.0.32",
+    "version": "1.0.33",
    "game_id": "66",
    "bundle": "extend/poker/runfast"
  },
  {
-    "ver": "1.0.52",
+    "ver": "1.0.53",
    "name": "南城麻将",
    "check": true,
-    "version": "1.0.52",
+    "version": "1.0.53",
    "game_id": "86",
    "bundle": "extend/majiang/nancheng"
  },
  {
-    "ver": "1.0.55",
+    "ver": "1.0.56",
    "name": "黎川麻将",
    "check": true,
-    "version": "1.0.55",
+    "version": "1.0.56",
    "game_id": "87",
    "bundle": "extend/majiang/lichuan"
  },
  {
-    "ver": "1.0.39",
+    "ver": "1.0.40",
    "name": "金溪麻将",
    "check": true,
-    "version": "1.0.39",
+    "version": "1.0.40",
    "game_id": "88",
    "bundle": "extend/majiang/jinxi"
  },
  {
-    "ver": "1.0.38",
+    "ver": "1.0.39",
    "name": "抚州麻将",
    "check": true,
-    "version": "1.0.38",
+    "version": "1.0.39",
    "game_id": "89",
    "bundle": "extend/majiang/fuzhou"
  }
--- a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.11.bytes
+++ b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.11.bytes
--- a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.39.bytes
+++ b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.39.bytes
--- a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.40.bytes
+++ b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.40.bytes
--- a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.56.bytes
+++ b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.56.bytes
--- a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.53.bytes
+++ b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.53.bytes
--- a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.33.bytes
+++ b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.33.bytes