亲友圈全部页面，登录动图

lua_probject/base_project/Game/View/LoginView.lua

@@ -49,7 +49,6 @@ function M:init()
             end
             ViewUtil.CloseModalWait()
             ViewUtil.ErrorTip(10000, "微信登录失败！")
-			
         end)
         if (not GameApplication.Instance.accountTest) then
             GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack))
@@ -82,6 +81,8 @@ function M:init()
     btn_phone.onClick:Set(function()
         self:PhoneLogin()
     end)
+
+    self:InitClip()
 end
 
 function M:Destroy()
@@ -89,11 +90,13 @@ function M:Destroy()
         self._agreement:Destroy()
     end
     BaseView.Destroy(self)
+    coroutine.stop(self.donhua)
 end
 
 function M:Show()
     BaseView.Show(self)
     self:QuickLogin()
+    self:InitClip()
 end
 
 local function __goto_lobby(response)
@@ -155,7 +158,6 @@ local function __login_response(self,response)
         end
 
         if user.update ~= 0 then
-          
             ExtendHotupdate.UpdateGameList(user.games, f_enterLobby)
         else
             f_enterLobby()
@@ -180,7 +182,6 @@ function M:PhoneLogin()
     _phoneView:Show()
 end
 
-
 function M:IDLogin()
     local _idView = nil
     _idView = IDLoginView.new(function(res)
@@ -192,7 +193,6 @@ function M:IDLogin()
     _idView:Show()
 end
 
-
 function M:QuickLogin()
     if (not GameApplication.Instance.accountTest) then
         local session_id = PlayerPrefs.GetString("session_id")
@@ -207,7 +207,6 @@ function M:QuickLogin()
     end
 end
 
-
 function M:LoginCallBack(result, data)
     self.isWXCallBackMark = true
     --print("微信登录返回================================================================")
@@ -255,3 +254,33 @@ function M:Destroy()
     UIPackage.RemovePackage("base/login/ui/Login")
     -- ResourcesManager.UnLoad("base/ui/Login.bytes")
 end
+
+function M:InitClip()
+    local yunqueEnd = 120
+    local yunqueName = "ui://Login/yunque_00"
+    local yunque = self._view:GetChild('clip_yueque')
+    local yunqueIndex = 0
+
+    local xuehuaEnd = 120
+    local xuehuaName = "ui://Login/xuehua_00"
+    local xuehua = self._view:GetChild('clip_xuehua')
+    local xuehuaIndex = 0
+
+    self.donhua = coroutine.start(
+        function()
+            while true do
+                yunqueIndex = self:ReplaceClip1(yunqueEnd, yunque, yunqueIndex, yunqueName)
+                xuehuaIndex = self:ReplaceClip1(xuehuaEnd, xuehua, xuehuaIndex, xuehuaName)
+                coroutine.wait(0.080)
+            end
+        end
+    )
+end
+
+function M:ReplaceClip1(e, t, i, n)
+    if i > e then
+        i = 0
+    end
+    t.url = string.format("%s%03d", n, i)
+    return i + 2
+end

lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua

@@ -66,6 +66,7 @@ function M:init(url, btn_type)
                 local item = lst_index:AddItemFromPool()
                 local title = page.title
                 item:GetChild("title").text = title
+                item:GetChild("title2").text = title
                 if i == 1 then
                     item.selected = true
                 end

lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua

@@ -64,12 +64,12 @@ MngPageConfig.Config = {
 	{
 		-- 盟主
 		--{19,  16, 7, 3, 8, 9, 13, 17},
-		{ 19, 16, 7, 3, 8, 13, 17, 9, 22 },
+		{ 9,  17, 16, 7 },
 		-- 管理员
 		--{19,  16, 7, 3, 8, 9, 13, 17},
-		{ 19, 16, 7, 3, 8, 13, 17, 9, 22 },
+		{ 9,  17, 16, 7 },
 		-- 合伙人
-		{ 19, 9,  7, 17 },
+		{ 17, 16, 7 },
 		--{19,16,7, 8,17,22},
 		-- 普通玩家
 		--{9, 17},

lua_probject/base_project/Game/View/NewGroup/MngView/TimeSettingPanel.lua

@@ -12,7 +12,7 @@ function TimeSettingPanel.new(parent, btn_date1, btn_date2, posX, posY, callback
     self.posX = posX or 0
     self.posY = posY or 0
     self.callback = callback
-    self.show_day = flag and 3 or 3
+    self.show_day = flag and 7 or 7
     self:initView()
     return self
 end

lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua

@@ -52,8 +52,9 @@ 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.GAME_EVT_DANIAO_TIP] = self.OnDaNiao
 end
+
 -- function M:Oener(evt_data)
 --     local seat = evt_data["owner"]
 --     self._cacheEvent:Enqueue(function()
@@ -92,6 +93,13 @@ function M:SendXiPaiAction(callBack)
     self.XiPaiCallBack = callBack
 end
 
+function M:SendDaNiaoAction(flag)
+    local _data = {}
+    _data["niaoflag"] = flag
+    local _client = ControllerManager.GameNetClinet
+    _client:send(RunFast_Protocol.GAME_DANIAO, _data)
+end
+
 function M:OnEventXiPai(evt_data)
     if evt_data["result"] == 0 then
         if self.XiPaiCallBack then
@@ -100,11 +108,8 @@ function M:OnEventXiPai(evt_data)
     else
         ViewUtil.ErrorTip(1000000, "申请洗牌失败")
     end
-    
 end
 
-
-
 function M:OnEventXiPaiAnim(evt_data)
     printlog("洗牌动画===》》》》")
     pt(evt_data)
@@ -127,7 +132,6 @@ function M:OnEventXiPaiAnim(evt_data)
     end)
 end
 
-
 function M:SendCard(cards, currentCard)
     local _data = {}
     _data["card"] = cards
@@ -231,7 +235,8 @@ function M:OnPlaySuccCheck(evt_data)
             player.hand_count = remain
             local card_type, number, length, plan_three_count = self:GetCardListInfo(out_card_list)
             player.out_card_list = self:GetSortOutCardList(out_card_list, card_type, number, plan_three_count)
-            DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPlaySucc, player, remain, card_type, number, otherList,length)
+            DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPlaySucc, player, remain, card_type, number, otherList,
+                length)
         end
     )
 end
@@ -244,11 +249,16 @@ function M:OnPlaySuccCheckHandCard(evt_data)
             DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPassSuccCheckCard, seat, cards)
         end
     )
-	
 end
 
-
-
+function M:OnDaNiao(evt_data)
+    self._cacheEvent:Enqueue(
+        function()
+            DispatchEvent(self._dispatcher, RunFast_GameEvent.OnDaNiao)
+            ControllerManager.IsSendCard = true
+        end
+    )
+end
 
 function M:OnPassSucc(evt_data)
     local seat = evt_data["seat"]
@@ -270,6 +280,7 @@ function M:OnPutError(evt_data)
         end
     )
 end
+
 function M:TuoGuan(isTuo)
     local _data = {}
     _data["tuoguan"] = isTuo
@@ -284,6 +295,7 @@ function M:Game_TuoGuan(evt_data)
         DispatchEvent(self._dispatcher, RunFast_GameEvent.Game_TuoGuan, tuoguan, seat)
     end)
 end
+
 function M:OnIndexMove(evt_data)
     local seat = evt_data["index"]
     self._cacheEvent:Enqueue(
@@ -319,7 +331,6 @@ function M:OnPiaoTip(evt_data)
     local reload = evt_data["reload"]
     self._cacheEvent:Enqueue(
         function()
-            
             DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPiaoTips, piao, reload)
         end
     )
@@ -331,7 +342,6 @@ function M:OnPiaoAction(evt_data)
 
     self._cacheEvent:Enqueue(
         function()
-            
             DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPiaoAction, seat, piao)
         end
     )
@@ -393,6 +403,7 @@ function M:OnConfrimToNextGameSucc(evt_data)
         end
     )
 end
+
 function M:Game_TuoGuan(evt_data)
     local tuoguan = evt_data["tuoguan"]
     local seat = evt_data["seat"]
@@ -400,6 +411,7 @@ function M:Game_TuoGuan(evt_data)
         DispatchEvent(self._dispatcher, RunFast_GameEvent.Game_TuoGuan, tuoguan, seat)
     end)
 end
+
 function M:ChangeCodeByFrom(cardList, isSort)
     isSort = isSort or false
     local new_card_list = {}
@@ -520,7 +532,6 @@ end
 --Bomb = 11
 -- 牌型，大小， 长度
 function M:GetCardListInfo(cardlist)
-   
     if #cardlist == 0 then
         return 0, 0, 0, 0
     end
@@ -541,9 +552,7 @@ function M:GetCardListInfo(cardlist)
             card_type = RunFast_CardType.Bomb
         else
             card_type = RunFast_CardType.Three
-            
         end
-       
     elseif #cardlist == 4 then
         local max_key = 0
         for k, v in pairs(card_map) do
@@ -600,9 +609,7 @@ function M:GetCardListInfo(cardlist)
         local max_one_key, max_two_key, max_three_key = 0, 0, 0
 
         for k, v in pairs(card_map) do
-            
             if #v == 2 then
-                
                 if k > max_two_key then
                     max_two_key = k
                 end
@@ -612,7 +619,6 @@ function M:GetCardListInfo(cardlist)
                     card_num = max_two_key
                 end
             elseif #v == 1 then
-                
                 if k > max_one_key then
                     max_one_key = k
                 end
@@ -622,7 +628,6 @@ function M:GetCardListInfo(cardlist)
                     card_num = max_one_key
                 end
             elseif #v == 3 then
-               
                 if max_three_key == 0 then
                     max_three_key = k
                     three_count = three_count + 1
@@ -655,21 +660,13 @@ function M:GetCardListInfo(cardlist)
         if three_count * 3 == #cardlist then
             card_type = RunFast_CardType.Plane
             card_num = max_three_key
-          
         elseif three_count * 4 >= #cardlist and #cardlist % 4 == 0 then
             card_type = RunFast_CardType.PlaneAndOne
             card_num = max_three_key
-         
-            
         elseif three_count * 5 >= #cardlist and #cardlist % 5 == 0 then
             card_type = RunFast_CardType.PlaneAndTwo
             card_num = max_three_key
-            
-           
         end
-   
-    
-     
     end
 
     return card_type, card_num, card_length, plan_three_count

lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua

@@ -19,5 +19,6 @@ local RunFast_GameEvent = {
     Game_TuoGuan = "Game_TuoGuan",
     EventXiPai = "EventXiPai",
     OnPassSuccCheckCard = "OnPassSuccCheckCard",
+    OnDaNiao = "OnDaNiao",
 }
 return RunFast_GameEvent

lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua

@@ -30,7 +30,8 @@ local bg_config = {
 function M:InitView(url)
     local room = self._room
     UIPackage.AddPackage("extend/poker/runfast/ui/Extend_Poker_RunFastNew")
-    PKMainView.InitView(self, "ui://Extend_Poker_RunFastNew/RunFast_Main_" .. room.room_config.people_num,nil,1,default_bg,bg_config,nil,"ui://Extend_Poker_RunFastNew/SettingWindow1")
+    PKMainView.InitView(self, "ui://Extend_Poker_RunFastNew/RunFast_Main_" .. room.room_config.people_num, nil, 1,
+        default_bg, bg_config, nil, "ui://Extend_Poker_RunFastNew/SettingWindow1")
     local _room = DataManager.CurrenRoom
     local user_id = DataManager.SelfUser.account_id
     local json_data = Utils.LoadLocalFile(user_id .. _room.game_id .. "pai")
@@ -77,7 +78,6 @@ function M:InitView(url)
 
     self._rightPanelView = RunFast_RightPanelView.new(self, rightpanel)
     for i = 1, #self._room.player_list do
-        
         if self._room.self_player.seat == self._room.player_list[i].seat and self._room.self_player.self_user.account_id ~= self._room.player_list[i].self_user.account_id then
             -- body
             local ErrorMsgTip = UIPackage.CreateObject("Common", "Win_ConnectTip")
@@ -135,7 +135,6 @@ function M:InitView(url)
             else
                 self._ctr_action.selectedIndex = 2
             end
-			
         else
             self._ctr_action.selectedIndex = 1
         end
@@ -152,10 +151,8 @@ function M:InitView(url)
             self:ReConnectForStart()
         end
     else
-
         self._state.selectedIndex = StateType.Palying
         self:ReconnectForClearing()
-        
     end
 
     self._view:GetChild("btn_back_jiesan").onClick:Set(function()
@@ -165,7 +162,6 @@ function M:InitView(url)
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:AskDismissRoom()
         end
-        
     end)
     --local tempdsaf=self._view:GetChild("btn_back_jiesan")
     --tempdsaf:GetChild("n3").displayObject.gameObject:SetActive(false)
@@ -203,7 +199,22 @@ function M:InitView(url)
             self._view:GetChild("shengyu"):GetChild("shengyu").text = "剩余16张"
         end
     end
+
+    --打鸟
+    if self._view:GetChild('btn_daNiao') then
+        self._view:GetChild('btn_daNiao').onClick:Set(function()
+            self._gamectr:SendDaNiaoAction(1)
+            self._ctr_action.selectedIndex = 0
+        end)
     end
+    if self._view:GetChild('btn_buDaNiao') then
+        self._view:GetChild('btn_buDaNiao').onClick:Set(function()
+            self._gamectr:SendDaNiaoAction(0)
+            self._ctr_action.selectedIndex = 0
+        end)
+    end
+end
+
 function M:UpdateCard(index)
     self._room.pai = index
     local card_info = self._player_card_info[1]
@@ -305,7 +316,6 @@ function M:OnPlayerLeave(...)
             else
                 self._ctr_action.selectedIndex = 2
             end
-			
         else
             self._ctr_action.selectedIndex = 1
         end
@@ -314,7 +324,6 @@ function M:OnPlayerLeave(...)
     end
 end
 
-
 function M:EventInit()
     local _gamectr = ControllerManager.GetController(GameController)
     MainView.EventInit(self)
@@ -324,7 +333,6 @@ function M:EventInit()
 
 
     _gamectr:AddEventListener(RunFast_GameEvent.EventXiPai, function(...)
-		
         if self.result_view ~= nil then
             self.result_view:Destroy()
             self.result_view = nil
@@ -366,16 +374,12 @@ function M:EventInit()
 
                 -- body
                 head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. p.hand_count .. "张"
-               
-                
-                
             end
             p:Clear()
             head_info:FillData(p)
             local card_info = self._player_card_info[self:GetPos(p.seat)]
             card_info:Clear()
             head_info:Ready(false)
-			
         end
 
 
@@ -401,12 +405,10 @@ function M:EventInit()
         local currentPlayer2 = arg[2]
         self._popEvent = false
         if (currentPlayer1) then
-			
             local xipaiCB = function()
                 self._popEvent = true
             end
             self:PlayXiPai(xipaiCB)
-			
         end
 
 
@@ -417,9 +419,6 @@ function M:EventInit()
             end
             self:PlayXiPai1(xipaiCB2)
         end
-		
-		
-		
     end)
 
     _gamectr:AddEventListener(RunFast_GameEvent.OnMingCard, function(...)
@@ -478,9 +477,6 @@ function M:EventInit()
 
                 -- body
                 head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. p.hand_count .. "张"
-               
-                
-                
             end
             p:Clear()
             head_info:FillData(p)
@@ -495,7 +491,6 @@ function M:EventInit()
                 else
                     card_info:InitPoker(cardlist, true)
                 end
-                
             else
                 --card_info:UpdateHandPoker(#cardlist,true,false)  --todo
                 --card_info:UpdateRemainCard(#cardlist,true)
@@ -583,8 +578,6 @@ function M:EventInit()
                 -- body
                 head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. card_number .. "张"
             end
-            
-           
         end
         local card_info = self._player_card_info[index]
         card_info:SetOutCardInfo(p.out_card_list, false, true)
@@ -635,7 +628,6 @@ function M:EventInit()
             --     end
             -- end
             self:_Effect(cardstype, p)
-            
         else
             if cardstype == 11 and cardstype ~= 12 then
                 self:_Effect(cardstype, p)
@@ -654,7 +646,6 @@ function M:EventInit()
                 self:PlaySound(p.self_user.sex, "card_1")
             end)
         end
-    
     end)
 
 
@@ -679,7 +670,6 @@ function M:EventInit()
         end
 
         self._popEvent = true
-        
     end)
 
     _gamectr:AddEventListener(RunFast_GameEvent.OnPassSucc, function(...)
@@ -712,7 +702,6 @@ function M:EventInit()
         local piao = arg[1]
         local reload = arg[2]
         if reload == 0 then
-
             if self._room.room_config.people_num == 3 and self._room.room_config.fangzuobi == 1 then
                 -- body
                 self.MypokerList = cardlist
@@ -866,19 +855,19 @@ function M:EventInit()
                     if DataManager.CurrenRoom.pai == 0 then
                         if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
                             -- body
-                            card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..card_n.."_1")
+                            card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n ..
+                                "_1")
                         else
                             card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n)
                         end
-                       
                     else
                         if card_n == 310 and DataManager.CurrenRoom.room_config.Heart10 == 1 then
                             -- body
-                            card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/"..card_n.."_2")
+                            card_code_obj = UIPackage.CreateObjectFromURL("ui://Extend_Poker_RunFastNew/" .. card_n ..
+                                "_2")
                         else
                             card_code_obj = UIPackage.CreateObjectFromURL("ui://Main_Poker/" .. card_n .. "_2")
                         end
-                        
                     end
                     if card_code_obj ~= nil then
                         card_code_obj:SetScale(0.6, 0.6)
@@ -886,14 +875,9 @@ function M:EventInit()
                             poker_item:AddChild(card_code_obj)
                             otherpoker_list:AddChild(poker_item)
                         end
-                        
                     end
-                    
                 end)
-            
-            
             end
-        
         end
         if self._cor_sound ~= nil then
             coroutine.stop(self._cor_sound)
@@ -919,8 +903,6 @@ function M:EventInit()
                     ViewUtil.PlaySound("RunFastNew_PK", "base/common/sound/win new.mp3")
                 end
                 -- local url = #sprint_seat_list > 0 and "ui://Extend_Poker_RunFastNew/Spring" or "ui://Extend_Poker_RunFastNew/Win_Mine"
-                
-               
             else
                 local beigang = false
                 if #self:GetSpringSeats(info) > 0 then
@@ -934,12 +916,10 @@ function M:EventInit()
                             beigang = true
                         end
                     end
-                    
                 end
                 -- if beigang == false then
                 --     self:CreateRankEff()
                 -- end
-                
             end
             for i = 1, #info do
                 local player = info[i]
@@ -988,7 +968,8 @@ function M:EventInit()
                 -- coroutine.wait(2)
             end
 
-            self.result_view = RunFast_ResultView.new(self._root_view, info, self._room.room_id, over, win_seat, 0, remaincards)
+            self.result_view = RunFast_ResultView.new(self._root_view, info, self._room.room_id, over, win_seat, 0,
+                remaincards)
             self.result_view:Show()
             if self.WinItem_view ~= nil then
                 self.WinItem_view:Dispose()
@@ -1023,12 +1004,10 @@ function M:EventInit()
             -- body
             self:UnmarkSelfTuoguan()
             ControllerManager.ChangeController(LoddyController)
-
         end
     end)
 
     _gamectr:AddEventListener(RunFast_GameEvent.OnResultByDissolve, function(...)
-            
         local arg = { ... }
         local over = arg[1]
         local info = arg[2]
@@ -1071,10 +1050,17 @@ function M:EventInit()
         local player_info = self._player_info[self:GetPos(p.seat)]
         player_info:Ready(true)
     end)
+
+    _gamectr:AddEventListener(RunFast_GameEvent.OnDaNiao, function(...)
+        local arg = { ... }
+        -- local seat = arg[1]
+        -- local piao = arg[2]
+        -- local head_info = self._player_info[self:GetPos(1)]
+        self._ctr_action.selectedIndex = 3
+    end)
 end
 
 function M:ReConnectForStart()
-    
     local _gamectr = ControllerManager.GetController(GameController)
     self._room.is_new_bout = _gamectr:GetIsNewBout(self._room.curren_turn_seat)
     self._state.selectedIndex = 1
@@ -1122,23 +1108,16 @@ function M:ReConnectForStart()
 
             -- body
             head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. player.hand_count .. "张"
-           
-            
-            
         end
         if player.seat == self._room.self_player.seat then
             if player.open ~= nil and player.open == 0 and self._room.room_config.people_num == 3 and self._room.room_config.fangzuobi == 1 then
                 -- body
                 self.MypokerList = player.hand_list
                 player_card_info:InitPoker(player.hand_list, false, 1)
-            
             else
-                
                 player_card_info:InitPoker(player.hand_list, false)
             end
-            
         else
-            
             player_card_info:SetRemainCardNumber(player.hand_count == 1)
             if player.hand_count == 1 then
                 self.bgm_index = 2
@@ -1202,18 +1181,15 @@ function M:ReconnectForClearing()
 
             -- body
             head_info._view:GetChild("shengyu"):GetChild("shengyu").text = "剩" .. player.hand_count .. "张"
-        
         end
 
 
         if player.seat == self._room.self_player.seat then
-
             player_card_info:InitPoker(player.hand_list, false)
         else
             player_card_info:UpdateHandPoker(player.hand_list, false, true)
         end
         if player.out_card_list[1] == 0 then
-
             player_card_info:SetOutCardInfo(nil, false)
         else
             player_card_info:SetOutCardInfo(player.out_card_list, false)
@@ -1224,19 +1200,17 @@ function M:ReconnectForClearing()
 
     local remaincards = self._room.remaincards
     if self._room.game_status == 1 then
-
-
         -- body
         coroutine.start(function()
             coroutine.wait(0.3)
 
-        self.result_view = RunFast_ResultView.new(self._root_view, self._room.player_list, self._room.room_id, 0, win_seat,0,remaincards)
+            self.result_view = RunFast_ResultView.new(self._root_view, self._room.player_list, self._room.room_id, 0,
+                win_seat, 0, remaincards)
             self.result_view:Show()
             local card_info = self._player_card_info[1]
             card_info._view:GetChild("out_card_list").visible = true
         end)
         if remaincards then
-
             local newremaincards = self._gamectr:ChangeCodeByFrom(remaincards, true)
 
             -- body
@@ -1354,6 +1328,7 @@ function M:_Effect( type1 ,player)
     end)
     -- end
 end
+
 -- function M:_Effect(type1, player)
 -- if type1 < 7 and type1 ~= 4 then return end
 -- local eff_code = 0
@@ -1493,7 +1468,6 @@ function M:PlayCardEff(card)
         coroutine.wait(1)
         self._popEvent = true
     end)
-
 end
 
 function M:ResetPoker()
@@ -1504,7 +1478,6 @@ function M:ResetPoker()
 end
 
 function M:PlaySound(sex, path)
-
     local sex_path = ViewUtil.Sex_Chat[sex] -- 1 男   2 女
     local sound_path = string.format("extend/poker/runfast/sound/%s/%s.mp3", sex_path, path)
     ViewUtil.PlaySound("RunFastNew_PK", sound_path)
@@ -1518,6 +1491,7 @@ function M:ChangeBgmMusic(bgm_index)
     end
     ViewUtil.PlayMuisc("RunFastNew_PK", string.format("extend/poker/runfast/sound/bgm%d.mp3", 1))
 end
+
 function M:OnPlayerEnter(...)
     local arg = { ... }
     local p = arg[1]

lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua

@@ -38,6 +38,10 @@ local RunFast_Protocol = {
     GAME_EVENT_XIPAI              = "20837",
     GAME_EVENT_NOTIFY_XIPAI       = "20838",
     GAME_EVT_CARDINHAND           = "202022",
+
+    --打鸟
+    GAME_EVT_DANIAO_TIP           = "832",
+    GAME_DANIAO                   = "831"
 }
 
 return RunFast_Protocol

wb_new_ui/.objs/fonts.json

@@ -53,3 +53,4 @@ ui://4skil1l6vmtu1kv
 ui://4skil1l6vmtu1l8
 ui://4skil1l6piv91ln
 ui://4skil1l6jsw9117
+ui://m7iejg46eany7iev

wb_new_ui/.objs/metas/0khx14ar/e0py2.info

@@ -1,10 +1,16 @@
 {
   "objectStatus": {
+    "n28_thxk": {
+      "hidden": true
+    },
     "n24_xn94": {
       "hidden": true
     },
     "n18_nld2": {
       "hidden": true
+    },
+    "n20_nld2": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

wb_new_ui/.objs/metas/9n9stu2e/prgzet.info

@@ -1,6 +1,6 @@
 {
   "objectStatus": {
-    "n7": {
+    "n1": {
       "hidden": true
     },
     "n20_qpk6": {
@@ -8,6 +8,12 @@
     },
     "n15_qpk6": {
       "hidden": true
+    },
+    "n7": {
+      "hidden": true
+    },
+    "n21_n6fs": {
+      "hidden": true
     }
   }
 }

wb_new_ui/.objs/metas/9n9stu2e/prgzf0.info

@@ -1,8 +1,5 @@
 {
   "objectStatus": {
-    "n13": {
-      "collapsed": true
-    },
     "n93_eclw": {
       "collapsed": true
     },

wb_new_ui/.objs/metas/m7iejg46/10snh5j.info

@@ -9,6 +9,9 @@
     "n214_ovii": {
       "hidden": true
     },
+    "n74_i7lq": {
+      "locked": true
+    },
     "n229_csp4": {
       "hidden": true
     },

wb_new_ui/.objs/metas/m7iejg46/kwi0hmd.info

@@ -1 +1,7 @@
-{}
+{
+  "objectStatus": {
+    "n44_ugxq": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/m7iejg46/kwi0hme.info

@@ -1,7 +1,7 @@
 {
   "objectStatus": {
-    "n2_l0gd": {
-      "locked": true
+    "n16_hp03": {
+      "hidden": true
     }
   }
 }

wb_new_ui/.objs/metas/m7iejg46/l679hws.info

@@ -1,11 +1,5 @@
 {
   "objectStatus": {
-    "n121_l679": {
-      "collapsed": true
-    },
-    "n112_kwi0": {
-      "collapsed": true
-    },
     "n122_j120": {
       "hidden": true
     }

wb_new_ui/.objs/metas/m7iejg46/r0qx7i6v.info

@@ -3,8 +3,8 @@
     "n68_joap": {
       "hidden": true
     },
-    "n28_r8m8": {
-      "collapsed": true
+    "n51_r0qx": {
+      "hidden": true
     },
     "n67_joap": {
       "hidden": true

wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info

@@ -0,0 +1 @@
+{}

wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 297,
+  "libview.firstColumnWidth": 522,
   "expanded_nodes": [
     "27vd145b",
     "/",

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/btn_buDaNiao.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="390,136" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_thxk" name="n3" src="thxkcir" fileName="component/Result/Group 645.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/btn_daNiao.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="390,136" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_thxk" name="n3" src="thxkciq" fileName="component/Result/Group 644.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/btn_ready.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="390,136" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_thxk" name="n3" src="thxkciw" fileName="component/Result/Group 643.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/btn_xipai.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="390,136" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_thxk" name="n3" src="thxkcix" fileName="component/Result/Group 646.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml

@@ -4,19 +4,19 @@
   <controller name="log" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n15_qpk6" name="n15" src="prgzeu" fileName="images/sd.png" xy="-8,0" size="674,110" visible="false"/>
-    <image id="n21_n6fs" name="n21" src="m9jah8" fileName="images/dks02.png" xy="470,0" size="396,36"/>
+    <image id="n21_n6fs" name="n21" src="m9jah8" fileName="images/dks02.png" xy="470,0" size="396,36" visible="false"/>
     <component id="n20_qpk6" name="btn_log" src="prgzdg" fileName="component/phone_info/Btn_log.xml" xy="556,14" visible="false" touchable="false"/>
-    <component id="n1" name="btn_setting" src="prgzdi" fileName="component/phone_info/Btn_setting.xml" xy="11,12" size="55,74"/>
-    <component id="n5" name="pb_batteryLevel" src="prgzdk" fileName="component/phone_info/ProgressBar2.xml" xy="635,9" touchable="false">
+    <component id="n1" name="btn_setting" src="prgzdi" fileName="component/phone_info/Btn_setting.xml" xy="11,12" size="55,74" visible="false"/>
+    <component id="n5" name="pb_batteryLevel" src="prgzdk" fileName="component/phone_info/ProgressBar2.xml" xy="5,2" size="57,28" touchable="false">
       <ProgressBar value="62" max="100"/>
     </component>
-    <component id="n6" name="gcm_xinhao" src="prgzdl" fileName="component/phone_info/Component3(1).xml" xy="511,6" size="82,22" touchable="false">
+    <component id="n6" name="gcm_xinhao" src="prgzdl" fileName="component/phone_info/Component3(1).xml" xy="21,42" touchable="false">
       <gearDisplay controller="xinhao" pages="0"/>
     </component>
     <component id="n9" name="gcm_wifi" src="prgzdm" fileName="component/phone_info/Component3.xml" xy="473,5" aspect="true" touchable="false">
       <gearDisplay controller="xinhao" pages="1"/>
     </component>
     <text id="n7" name="tex_data" xy="314,50" size="121,34" visible="false" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="2017-07-09"/>
-    <text id="n12_yyhx" name="tex_time" xy="675,0" size="73,39" fontSize="28" color="#ffffff" vAlign="middle" text="13:00"/>
+    <text id="n12_yyhx" name="tex_time" xy="69,0" size="76,39" fontSize="28" color="#ffffff" vAlign="middle" text="13:00"/>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml

@@ -2,10 +2,11 @@
 <component size="1334,750" designImageAlpha="100" designImageLayer="1">
   <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
+  <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="2"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
   <controller name="card_eff" pages="0,,1," selected="0"/>
   <controller name="zidongtishi" pages="0,,1," selected="0"/>
+  <controller name="showBtn" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="-208,2" alpha="0">
       <gearDisplay controller="state" pages="1"/>
@@ -32,12 +33,12 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n18" name="player_info2" src="prgzam" fileName="component/head/PlayerHead_2.xml" xy="1162,107">
-      <gearXY controller="state" pages="0,1,2,3" values="1162,107|1182,90|1157,250|1174,84"/>
-      <relation target="" sidePair="right-right,middle-middle"/>
+    <component id="n18" name="player_info2" src="prgzam" fileName="component/head/PlayerHead_2.xml" xy="1105,106">
+      <gearXY controller="state" pages="0,1,2,3" values="1105,106|1112,111|1157,250|1174,84"/>
+      <relation target="" sidePair="right-right%,top-top%"/>
     </component>
-    <component id="n7" name="player_info1" src="prgzab" fileName="component/head/PlayerHead_1.xml" xy="25,469" size="150,154">
-      <gearXY controller="state" pages="0,1,2,3" values="25,469|1,295|37,355|9,334"/>
+    <component id="n7" name="player_info1" src="prgzab" fileName="component/head/PlayerHead_1.xml" xy="1,295" size="150,154">
+      <gearXY controller="state" pages="0,1,2,3" values="1,295|1,295|37,355|9,334"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     <component id="n69_sdax" name="player_card_info_1" src="prgz88" fileName="component/card_info/Player_card_info_1.xml" xy="142,517" size="1050,220">
@@ -45,7 +46,7 @@
       <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n71_sdax" name="player_card_info_2" src="prgz8d" fileName="component/card_info/Player_card_info_2.xml" xy="771,118" touchable="false">
+    <component id="n71_sdax" name="player_card_info_2" src="prgz8d" fileName="component/card_info/Player_card_info_2.xml" xy="815,117" touchable="false">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
@@ -53,22 +54,28 @@
       <gearDisplay controller="time" pages="1,2,3"/>
       <gearXY controller="time" pages="1,2" values="287,376|1199,8" default="625,198"/>
     </component>
-    <component id="n34_k3io" name="btn_ready" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="724,655" size="227,73" group="n36_k3io">
+    <component id="n34_k3io" name="btn_ready" src="thxkciu" fileName="component/Result/btn_ready.xml" xy="373,366" size="270,96" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
-      <gearXY controller="action" pages="2,0,1" values="724,655|492,655|389,656"/>
+      <gearXY controller="action" pages="2,0,1,3" values="678,643|557,450|373,366|657,264"/>
       <Button icon="ui://9n9stu2ehnkrcgt"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="425,640" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="422,-49" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://27vd145bk3io3t"/>
     </component>
-    <component id="n118_mncc" name="btn_xipai" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="648,654" group="n36_k3io" scale="1,0.9">
+    <component id="n118_mncc" name="btn_xipai" src="thxkciv" fileName="component/Result/btn_xipai.xml" xy="700,366" size="270,96" group="n36_k3io">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://27vd145bf40a7i6a"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="425,640" size="526,99" advanced="true">
+    <component id="n129_thxk" name="btn_daNiao" src="thxkcis" fileName="component/Result/btn_daNiao.xml" xy="364,366" size="270,96" group="n36_k3io">
+      <gearDisplay controller="action" pages="3"/>
+    </component>
+    <component id="n130_thxk" name="btn_buDaNiao" src="thxkcit" fileName="component/Result/btn_buDaNiao.xml" xy="700,366" size="270,96" group="n36_k3io">
+      <gearDisplay controller="action" pages="3"/>
+    </component>
+    <group id="n36_k3io" name="n36" xy="364,-49" size="606,511" advanced="true">
       <gearDisplay controller="state" pages="0"/>
-      <relation target="" sidePair="bottom-bottom,center-center"/>
+      <relation target="" sidePair="center-center%,bottom-bottom"/>
     </group>
     <component id="n68_pwv4" name="panel_record" src="rayb5j" fileName="component/record/Record.xml" pkg="27vd145b" xy="379,240">
       <gearDisplay controller="state" pages="3"/>
@@ -77,24 +84,18 @@
       <gearDisplay controller="state" pages="0,1,2"/>
     </text>
     <component id="n77_ij2y" name="gcm_chat" src="h1uu2p" fileName="Gcm_chat.xml" pkg="l0ds4ys6" xy="1237,355" visible="false"/>
-    <component id="n79_roef" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="531,10" visible="false" touchable="false">
+    <component id="n79_roef" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="537,10" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="0,0" size="1334,108" group="n86_q50p">
+    <component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="6,8" size="1334,108" group="n86_q50p">
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
-    <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="492,36" size="274,41" group="n86_q50p" touchable="false"/>
-    <component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="306,12" size="58,75" group="n86_q50p">
-      <gearDisplay controller="state" pages="0,3"/>
-    </component>
+    <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="839,-1" size="274,41" group="n86_q50p" touchable="false"/>
     <component id="n85_q50p" name="btn_rule" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="140,12" group="n86_q50p"/>
     <component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="270,-122" size="150,77" group="n86_q50p" touchable="false"/>
-    <component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="414,11" group="n86_q50p">
-      <gearDisplay controller="state" pages="0,3"/>
-    </component>
-    <group id="n86_q50p" name="n86" xy="0,-122" size="1334,230" advanced="true">
-      <relation target="" sidePair="center-center"/>
+    <group id="n86_q50p" name="n86" xy="6,-122" size="1334,238" advanced="true">
+      <relation target="" sidePair="width-width,center-center"/>
     </group>
     <component id="n75_jmab" name="poker_eff" src="prgz9k" fileName="component/effect/poker/poker_eff.xml" xy="618,10" touchable="false">
       <gearDisplay controller="card_eff" pages="1"/>
@@ -126,14 +127,34 @@
       <item url="ui://9n9stu2eprgzdn"/>
       <item url="ui://9n9stu2eprgzdn"/>
     </list>
-    <text id="n74_bzpj" name="round" xy="576,200" size="101,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=" 1/10局">
+    <text id="n74_bzpj" name="round" xy="934,42" size="101,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=" 1/10局">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="320,12" size="110,75">
-      <gearDisplay controller="state" pages="1"/>
-    </component>
     <graph id="n102_t2e2" name="n109" xy="-184,-46" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
     <component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="304,564" visible="false"/>
+    <component id="n121_thxk" name="btn_moreBtn" src="thxkcio" fileName="component/poker/btn_moreBtn.xml" xy="1255,18">
+      <Button controller="showBtn" page="1"/>
+    </component>
+    <image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,64" size="80,258" group="n123_thxk">
+      <gearSize controller="state" pages="1" values="80,169,1,1" default="80,258,1,1"/>
+    </image>
+    <component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="1258,160" size="44,65" group="n123_thxk">
+      <gearDisplay controller="state" pages="0,3"/>
+    </component>
+    <component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="1258,250" group="n123_thxk">
+      <gearDisplay controller="state" pages="0,3"/>
+    </component>
+    <image id="n124_thxk" name="n124" src="thxkcip" fileName="images/Line 23.png" xy="1251,147" group="n123_thxk"/>
+    <image id="n125_thxk" name="n125" src="thxkcip" fileName="images/Line 23.png" xy="1250,236" group="n123_thxk">
+      <gearDisplay controller="state" pages="0"/>
+    </image>
+    <component id="n126_thxk" name="Btn_setting" src="prgzdi" fileName="component/phone_info/Btn_setting.xml" xy="1258,72" group="n123_thxk"/>
+    <component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="1258,159" group="n123_thxk">
+      <gearDisplay controller="state" pages="1"/>
+    </component>
+    <group id="n123_thxk" name="ShowMore" xy="1239,64" size="80,258" advanced="true">
+      <gearDisplay controller="showBtn" pages="1"/>
+    </group>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/newcard/di(1).xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="129,191">
   <displayList>
-    <image id="n1_fwfg" name="n0" src="prgzai" fileName="component/newcard/素材/bg.png" xy="-5,0">
+    <image id="n1_fwfg" name="n0" src="prgzai" fileName="component/newcard/素材/bg.png" xy="0,0" size="129,191">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/phone_info/Btn_setting.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="52,77" extention="Button">
+<component size="44,65" extention="Button">
   <displayList>
     <image id="n1" name="n1" src="prgzdj" fileName="images/sz.png" xy="0,0" pivot="0.5,0.5" aspect="true"/>
   </displayList>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/phone_info/Component3(1).xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="92,26">
+<component size="104,26">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <image id="n4_h1uu" name="n4" src="prgzaw" fileName="component/images/phone_info/4g01.png" xy="17,0">
+    <image id="n4_h1uu" name="n4" src="prgzaw" fileName="component/images/phone_info/4g01.png" xy="25,-2" size="39,28">
       <gearColor controller="c1" pages="0,1,2" values="#ffffff|#666666|#666666"/>
     </image>
-    <image id="n5_h1uu" name="n5" src="prgzax" fileName="component/images/phone_info/4g02.png" xy="0,0">
+    <image id="n5_h1uu" name="n5" src="prgzax" fileName="component/images/phone_info/4g02.png" xy="-1,-2" size="39,28">
       <gearColor controller="c1" pages="0,1" values="#ffffff|#ffff00" default="#666666"/>
     </image>
-    <image id="n6_h1uu" name="n6" src="prgzay" fileName="component/images/phone_info/4g03.png" xy="-17,0">
+    <image id="n6_h1uu" name="n6" src="prgzay" fileName="component/images/phone_info/4g03.png" xy="-27,-2" size="39,28">
       <gearColor controller="c1" pages="0,1,2" values="#ffffff|#ffff00|#ff0000"/>
     </image>
-    <text id="n7_7paf" name="n7" xy="30,-1" size="62,26" fontSize="20" color="#00ff00" text="100 ms">
+    <text id="n7_7paf" name="n7" xy="42,3" size="70,29" fontSize="20" color="#00ff00" text="100 ms">
       <gearColor controller="c1" pages="0,1,2" values="#00ff00,#000000|#ffff00,#000000|#ff0000,#000000"/>
       <relation target="n5_h1uu" sidePair="middle-middle"/>
     </text>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/phone_info/ProgressBar2.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="34,16" extention="ProgressBar">
   <displayList>
-    <image id="n5_h1uu" name="n5" src="prgzau" xy="0,0"/>
-    <image id="n4" name="bar" src="prgzav" xy="0,0" fillMethod="hz"/>
+    <image id="n5_h1uu" name="n5" src="prgzau" fileName="component/images/phone_info/dianchi02.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n4" name="bar" src="prgzav" fileName="component/images/phone_info/dianchi01.png" xy="0,0" fillMethod="hz">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
   <ProgressBar/>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/Btn_back_jiesan.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="92,77" extention="Button" initName="btn_back_lobby">
+<component size="44,65" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n3_hp0b" name="n3" src="prgzdx" fileName="images/js.png" xy="0,0" pivot="0.5,0.5" size="92,77"/>
+    <image id="n3_hp0b" name="n3" src="prgzdx" fileName="images/js.png" xy="0,0" pivot="0.5,0.5"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/Btn_back_lobby.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="57,77" extention="Button" initName="btn_back_lobby">
+<component size="44,65" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n3_hp0b" name="n3" src="prgzdt" fileName="images/lk.png" xy="0,0" pivot="0.5,0.5" aspect="true" visible="false"/>
-    <image id="n4_qf80" name="n4" src="qf80che" fileName="images/fh_img.png" xy="0,0" size="57,76"/>
+    <image id="n3_hp0b" name="n3" src="prgzdt" fileName="images/lk.png" xy="-3,-4" pivot="0.5,0.5" aspect="true" visible="false"/>
+    <image id="n4_qf80" name="n4" src="qf80che" fileName="images/fh_img.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/Btn_leave_lobby.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="57,77" extention="Button" initName="btn_back_lobby">
+<component size="44,62" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n3_hp0b" name="n3" src="prgzdt" fileName="images/lk.png" xy="0,0" pivot="0.5,0.5" aspect="true"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/poker/btn_moreBtn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="48,40" extention="Button" initName="btn_moreBtn">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_thxk" name="n3" src="thxkcin" fileName="images/Vector.png" xy="0,0"/>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -424,6 +424,19 @@
     <component id="hxjccif" name="btn_invite(1).xml" path="/component/clearing/room/" exported="true"/>
     <image id="hxjccig" name="chat_button_blue.png" path="/component/clearing/clearing1/"/>
     <component id="vijocih" name="Btn_leave_lobby.xml" path="/component/poker/"/>
+    <image id="thxkcii" name="Group 648.png" path="/images/"/>
+    <image id="thxkcim" name="Rectangle 397.png" path="/images/" scale="9grid" scale9grid="16,22,49,217"/>
+    <image id="thxkcin" name="Vector.png" path="/images/"/>
+    <component id="thxkcio" name="btn_moreBtn.xml" path="/component/poker/"/>
+    <image id="thxkcip" name="Line 23.png" path="/images/"/>
+    <image id="thxkciq" name="Group 644.png" path="/component/Result/"/>
+    <image id="thxkcir" name="Group 645.png" path="/component/Result/"/>
+    <component id="thxkcis" name="btn_daNiao.xml" path="/component/Result/"/>
+    <component id="thxkcit" name="btn_buDaNiao.xml" path="/component/Result/"/>
+    <component id="thxkciu" name="btn_ready.xml" path="/component/Result/"/>
+    <component id="thxkciv" name="btn_xipai.xml" path="/component/Result/"/>
+    <image id="thxkciw" name="Group 643.png" path="/component/Result/"/>
+    <image id="thxkcix" name="Group 646.png" path="/component/Result/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Hotupdate/Version.xml

@@ -11,14 +11,15 @@
     <graph id="n18_nld2" name="n18" xy="-215,655" size="1772,100" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </graph>
-    <text id="n2" name="tex_info" xy="261,622" size="906,54" group="n8_rtsl" font="ui://27vd145bilon7ia1" fontSize="40" color="#ffffff" align="center" autoSize="shrink" bold="true" text="检查更新"/>
-    <component id="n20_nld2" name="pb_progress" src="pcy012" fileName="commpoent/Slider1.xml" xy="513,208" group="n8_rtsl">
+    <text id="n2" name="tex_info" xy="214,600" size="906,54" group="n8_rtsl" font="ui://27vd145bilon7ia1" fontSize="40" color="#ffffff" align="center" autoSize="shrink" bold="true" text="正在更新资源包。"/>
+    <component id="n20_nld2" name="pb_progress" src="pcy012" fileName="commpoent/Slider1.xml" xy="563,298" size="208,208" group="n8_rtsl" aspect="true" visible="false">
       <Slider max="100"/>
     </component>
-    <text id="n28_thxk" name="tex_value" xy="624,344" size="140,89" group="n8_rtsl" font="ui://27vd145bilon7ia1" fontSize="68" color="#ffffff" align="center" bold="true" text="80%">
+    <text id="n28_thxk" name="tex_value" xy="618,371" size="97,62" group="n8_rtsl" visible="false" font="ui://27vd145bilon7ia1" fontSize="46" color="#ffffff" align="center" bold="true" text="80%">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n8_rtsl" name="n8" xy="261,208" size="906,468" advanced="true">
+    <image id="n29_thxk" name="n29" src="thxk7i4y" fileName="images/Group 534.png" xy="365,96" group="n8_rtsl"/>
+    <group id="n8_rtsl" name="n8" xy="214,96" size="906,558" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>

wb_new_ui/assets/Hotupdate/package.xml

@@ -23,6 +23,7 @@
     <image id="99we7i4v" name="denglu_bg_01_bak.png" path="/"/>
     <image id="thxk7i4w" name="Ellipse 91.png" path="/images/"/>
     <image id="thxk7i4x" name="Union.png" path="/images/"/>
+    <image id="thxk7i4y" name="Group 534.png" path="/images/"/>
   </resources>
   <publish name="Hotupdate" path="..\wb_unity_pro\Assets\Resources\base\embed\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Lobby/Main.xml

@@ -4,8 +4,8 @@
     <action type="play_transition" fromPage="0" toPage="1" transition="t0"/>
   </controller>
   <displayList>
-    <image id="n141_ht5v" name="n141" src="ht5v7cnr" fileName="mainbg.png" xy="-145,0">
-      <relation target="" sidePair="height-height,center-center,middle-middle"/>
+    <image id="n141_ht5v" name="n141" src="ht5v7cnr" fileName="mainbg.png" xy="-145,0" aspect="true">
+      <relation target="" sidePair="height-height%,center-center,middle-middle"/>
     </image>
     <loader id="n145_h5le" name="clip_bg" xy="-145,0" size="1633,972" url="ui://2d9xdj6zy1us7d3u">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -19,21 +19,21 @@
     <image id="n140_csp4" name="n140" src="csp47cn2" fileName="component/index/images/renwu.png" xy="109,137" size="492,614" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <image id="n149_thxk" name="n149" src="thxk7dqu" fileName="images/index/Group 641.png" xy="88,31" size="272,95" group="n28">
+    <image id="n149_thxk" name="n149" src="thxk7dqu" fileName="images/index/Group 641.png" xy="88,21" size="272,95" group="n28">
       <relation target="" sidePair="left-left,top-top"/>
     </image>
-    <component id="n29" name="btn_head" src="zktq7d3s" fileName="component/button/Head.xml" xy="12,11" size="127,127" group="n28" aspect="true">
+    <component id="n29" name="btn_head" src="zktq7d3s" fileName="component/button/Head.xml" xy="12,11" size="114,114" group="n28" aspect="true">
       <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
     </component>
-    <text id="n26" name="tex_name" xy="139,35" size="202,44" group="n28" font="ui://27vd145bilon7ia1" fontSize="32" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="老司机带带我">
+    <text id="n26" name="tex_name" xy="126,24" size="202,44" group="n28" font="ui://27vd145bilon7ia1" fontSize="32" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="老司机带带我">
       <relation target="" sidePair="top-top%"/>
       <relation target="n29" sidePair="left-right"/>
     </text>
-    <text id="n84_mv8k" name="tex_id" xy="140,80" size="143,42" group="n28" font="ui://27vd145bilon7ia1" fontSize="30" color="#ffffff" bold="true" text="ID:123456">
+    <text id="n84_mv8k" name="tex_id" xy="127,69" size="143,42" group="n28" font="ui://27vd145bilon7ia1" fontSize="30" color="#ffffff" bold="true" text="ID:123456">
       <relation target="" sidePair="top-top%"/>
       <relation target="n29" sidePair="left-right"/>
     </text>
-    <group id="n28" name="player_info_panel" xy="12,11" size="348,127" advanced="true">
+    <group id="n28" name="player_info_panel" xy="12,11" size="348,114" advanced="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <image id="n82_m0ei" name="n82" src="thxk7dou" fileName="images/index/Rectangle 23.png" xy="42,645" size="1261,106" group="n7">

wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml

@@ -2,7 +2,7 @@
 <component size="178,51" extention="Button">
   <displayList>
     <image id="n9_ovii" name="n9" src="thxk7dog" fileName="images/index/Rectangle 29.png" xy="13,3" size="240,47"/>
-    <text id="n1_lwcl" name="title" xy="42,6" size="193,44" font="ui://27vd145bilon7ia1" fontSize="32" color="#ffffff" align="center" vAlign="middle" bold="true" text="0999999999"/>
+    <text id="n1_lwcl" name="title" xy="42,6" size="193,44" font="ui://27vd145bilon7ia1" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="0999999999"/>
     <image id="n7_ovii" name="n7" src="thxk7doc" fileName="images/index/Group 634.png" xy="0,0"/>
   </displayList>
   <Button/>

wb_new_ui/assets/Login/Main.xml

@@ -5,18 +5,22 @@
     <image id="n31_lwcl" name="n31" src="lwclq" fileName="denglu_bg_01.png" pkg="0khx14ar" xy="-216,0" size="1751,750">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
+    <loader id="n79_thxk" name="clip_xuehua" xy="0,0" size="1334,750" url="ui://2zlli80mthxk7cja" align="center" vAlign="middle"/>
+    <loader id="n80_thxk" name="clip_yueque" xy="366,162" size="602,425" url="ui://2zlli80mthxk7cms" align="center" vAlign="middle">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <image id="n74_xn94" name="n74" src="xn9417" fileName="hall_girl_bg@2x.png" pkg="0khx14ar" xy="355,106" visible="false">
       <relation target="" sidePair="center-center"/>
     </image>
-    <component id="n77_9q7v" name="btn_phone" src="9q7vcir" fileName="commpoent/Btn_phone.xml" xy="891,561" group="n27"/>
-    <component id="n78_9q7v" name="btn_wx" src="9q7vciq" fileName="commpoent/Btn_wx.xml" xy="194,561" group="n27"/>
-    <group id="n27" name="n27" xy="194,561" size="1019,122" advanced="true">
+    <component id="n77_9q7v" name="btn_phone" src="9q7vcir" fileName="commpoent/Btn_phone.xml" xy="326,524" group="n27"/>
+    <component id="n78_9q7v" name="btn_wx" src="9q7vciq" fileName="commpoent/Btn_wx.xml" xy="702,524" group="n27"/>
+    <group id="n27" name="n27" xy="326,524" size="682,96" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <graph id="n5" name="n5" xy="887,406" size="487,206" group="n26" type="rect" lineSize="0" fillColor="#66000000"/>
     <graph id="n6" name="n6" xy="1060,469" size="242,38" group="n9" type="rect" lineColor="#ff333333" fillColor="#ff666666"/>
     <text id="n7" name="tex_unionid" xy="1064,472" size="231,35" group="n9" fontSize="25" color="#ffffff" autoSize="height" text="test" input="true" prompt="输入账号" maxLength="30" keyboardType="1"/>
-    <text id="n8" name="n8" xy="956,472" size="103,35" group="n9" fontSize="25" color="#ffffff" text="测试账号"/>
+    <text id="n8" name="n8" xy="956,472" size="104,35" group="n9" fontSize="25" color="#ffffff" text="测试账号"/>
     <group id="n9" name="n9" xy="956,469" size="346,38" group="n26"/>
     <group id="n26" name="n26" xy="887,406" size="487,206" advanced="true">
       <gearDisplay controller="test" pages="1"/>

wb_new_ui/assets/Login/commpoent/Btn_phone.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="322,122" extention="Button">
+<component size="306,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_csp4" name="n4" src="r6cy18" fileName="images/btn_phone.png" xy="0,0"/>
+    <image id="n4_csp4" name="n4" src="thxk7cj6" fileName="images/Group 21.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Login/commpoent/Btn_wx.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="322,122" extention="Button">
+<component size="306,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_csp4" name="n4" src="lwclk" fileName="images/button_wx.png" xy="0,0"/>
+    <image id="n4_csp4" name="n4" src="thxk7cj8" fileName="images/Group 22.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>