ss

lua_probject/base_project/Game/Controller/GameController.lua

@@ -261,9 +261,12 @@ end
 
 -- 玩家进
 function M:OnEventPlayerEnter(evt_data)
-    --print("进入房间++++++++++++++++++++++++++++++++++++++")
+    print("进入房间++++++++++++++++++++++++++++++++++++++")
+
+
     self._cacheEvent:Enqueue(
         function()
+            printlog("PlayerEnter:2222")
             local p = self._room:NewPlayer()
             local _user
             _user = User.new()
@@ -285,10 +288,12 @@ function M:OnEventPlayerEnter(evt_data)
             p.self_user = _user
             p.line_state = 1
             DataManager.CurrenRoom:AddPlayer(p)
+            printlog("PlayerEnter:")
             DispatchEvent(self._dispatcher, GameEvent.PlayerEnter, p)
             
         end
     )
+    self:ReturnToRoom()
 end
 
 -- 玩家离开

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

@@ -115,7 +115,7 @@ local function __getReason(data)
     if data.reason == 6 then
         return data.info
     elseif data.reason == 7 then
-        return string.format("系统衰减(%s)", data.roomid)
+        return string.format("房卡(%s)", data.roomid)
     elseif data.reason == 8 then
         return string.format("[color=#FF6600]%s[/color](%s) %s", s_nick, data.mgr_id, "操作增加")
     elseif data.reason == 9 then

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

@@ -274,7 +274,6 @@ function M:OnDaNiaoShow(evt_data)
 end
 
 function M:OnPassSucc(evt_data)
-    print("lingmeng OnPassSucc", os.time())
     local seat = evt_data["seat"]
     self._cacheEvent:Enqueue(
         function()
@@ -283,7 +282,7 @@ function M:OnPassSucc(evt_data)
             DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPassSucc, p)
         end
     )
-    print("lingmeng OnPassSucc2", os.time())
+   
 end
 
 function M:OnPutError(evt_data)

lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua

@@ -200,7 +200,7 @@ function M:EventInit()
             if tex_round ~= nil then
                 tex_round.text = '第 ' .. _room.curren_round .. ' 局'
             end
-            self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. ' 局 百息结算 '
+            self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. ' 局 '
 
             self._state.selectedIndex = 1
             self:closeTipOnTuoguan()
@@ -244,7 +244,7 @@ function M:EventInit()
             if tex_round ~= nil then
                 tex_round.text = '第 ' .. _room.curren_round .. ' 局'
             end
-            self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. ' 局  百息结算'
+            self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. ' 局 '
 
             self._state.selectedIndex = 1
             self:closeTipOnTuoguan()
@@ -961,7 +961,7 @@ function M:OnFangziAction(...)
     if fz.type == RB_FZType.Wei or fz.type == RB_FZType.ChouWei then
         coroutine.start(
             function()
-                coroutine.wait(1.4)
+                coroutine.wait(1.2)
                 info:UpdateFzList(player.fz_list, true, player.seat)
             end)
     else
@@ -992,7 +992,7 @@ function M:OnFangziAction(...)
             --显示wei 的牌
             coroutine.start(
                 function()
-                    coroutine.wait(1.4)
+                    coroutine.wait(1.2)
                     for i = 1, #fz.opcard do
                         info:DeleteHandCard(fz.opcard[i])
                     end
@@ -1004,7 +1004,7 @@ function M:OnFangziAction(...)
 
             coroutine.start(
                 function()
-                    coroutine.wait(1.4)
+                    coroutine.wait(1.2)
                     for i = 1, #fz.opcard do
                         info:DeleteHandCard(fz.opcard[i])
                     end
@@ -1056,7 +1056,7 @@ function M:OnFangziAction(...)
 
             coroutine.start(
                 function()
-                    coroutine.wait(0.8)
+                    coroutine.wait(1.0)
                     info:PlayingOutCardAnima()
                     self:PlaySound(player.self_user.sex, 'F_GuoSao')
                     effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei')
@@ -1068,7 +1068,7 @@ function M:OnFangziAction(...)
 
             coroutine.start(
                 function()
-                    coroutine.wait(1.8)
+                    coroutine.wait(2)
                     effect:Dispose()
                 end
             )
@@ -1268,7 +1268,7 @@ function M:ReloadRoom()
     if tex_round ~= nil then
         tex_round.text = '第 ' .. room.curren_round .. ' 局'
     end
-    self._view:GetChild('tex_round').text = '第 ' .. room.curren_round .. ' 局  百息结算'
+    self._view:GetChild('tex_round').text = '第 ' .. room.curren_round .. ' 局 '
 end
 
 function M:PlayChatSound(sex, chat_index)

lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua

@@ -58,7 +58,7 @@ function M:GetDes(sp)
 end
 
 function M:GetGameName()
-    return self.maxPlayers .. "人娄底放炮罚"
+    return "娄底放炮罚"
 end
 
 function M:GetGameJS()

lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua

@@ -223,7 +223,7 @@ function M:FillLiuJuItemData(room, data,item)
     
     qipai_list:RemoveChildrenToPool()
     
-    if data.throw_card ~= nil and #data.throw_card > 0 then
+   --[[ if data.throw_card ~= nil and #data.throw_card > 0 then
         _dipaiC.selectedIndex = 1
         local hand_card = PendulumRule.GetHandCard(data.throw_card, 3)
         for k = 1, #hand_card do
@@ -234,7 +234,7 @@ function M:FillLiuJuItemData(room, data,item)
         end
     else
         _dipaiC.selectedIndex = 0
-    end
+    end]]
  
     for i = 1, #data.info_list do
          if data.info_list[i].seat == room.banker_seat then 
@@ -244,8 +244,10 @@ function M:FillLiuJuItemData(room, data,item)
             local btn_head = self._view:GetChild('btn_head')
             ImageLoad.Load(p.self_user.head_url, btn_head._iconObject)
         end
-    
+        printlog("ddddd==========")
-        if data.info_list[i].seat == room.banker_seat and #data.info_list[i].hand_card > 0 then
+        printlog(room.banker_seat)
+        printlog(data.info_list[i].seat)
+        if data.info_list[i].seat == room.banker_seat  then
             local card_list
            --[[if #data.info_list == 2 then
                 card_list = self._view:GetChild('card_list_2')
@@ -257,6 +259,7 @@ function M:FillLiuJuItemData(room, data,item)
                 end
             end]] 
             card_list = self._view:GetChild('card_list_2')
+            card_list.visible =true
             
             card_list:RemoveChildrenToPool()
             
@@ -265,15 +268,25 @@ function M:FillLiuJuItemData(room, data,item)
                 local fztype = data.info_list[i].opCardList[k].type
                 if fztype == RB_FZType.Kan then
                     local cards = card_list:AddItemFromPool()
-                    cards:GetController('c1').selectedIndex = 2
+                    cards:GetController('c1').selectedIndex = 1
                     cards:GetChild('card_type').text = '坎'
                     cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
                     for j = 1, 3 do
                         cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
                     end
-                elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then
+
+                elseif fztype == RB_FZType.Peng then
                     local cards = card_list:AddItemFromPool()
                     cards:GetController('c1').selectedIndex = 2
+                    cards:GetChild('card_type').text = '碰'
+                    cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
+                    for j = 1, 3 do
+                        cards:GetChild('card_' .. j).icon =
+                            self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
+                    end
+                elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then
+                    local cards = card_list:AddItemFromPool()
+                    cards:GetController('c1').selectedIndex = 1
                     cards:GetChild('card_type').text = '畏'
                     cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
                     for j = 1, 3 do
@@ -313,8 +326,8 @@ function M:FillLiuJuItemData(room, data,item)
                 else
                     
                     local cards = card_list:AddItemFromPool()
-                     cards:GetController('c1').selectedIndex = 0
+                    cards:GetController('c1').selectedIndex = 1
-                     cards:GetChild('card_type').text = '将'
+                    cards:GetChild('card_type').text = '将'
                     cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
                     cards:GetChild('card_1').icon =
                         self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
@@ -324,7 +337,7 @@ function M:FillLiuJuItemData(room, data,item)
             end
 
             local hand_card = {}
-            if #data.info_list[i].hand_card>2 then
+            if #data.info_list[i].hand_card>=2 then
                 hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3)
                 for k = 1, #hand_card do
                     local cards = card_list:AddItemFromPool()
@@ -339,7 +352,7 @@ function M:FillLiuJuItemData(room, data,item)
                 hand_card = data.info_list[i].hand_card
 
                 local item = card_list:AddItemFromPool()
-                item:GetController('c1').selectedIndex = 2
+                item:GetController('c1').selectedIndex = 1
                 for j = 1, #hand_card do
                     item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[j])
                 end
@@ -444,7 +457,7 @@ function M:FillLiuJuItemData(room, data,item)
                     end
                 else
                      local cards = card_list:AddItemFromPool()
-                     cards:GetController('c1').selectedIndex = 0
+                     cards:GetController('c1').selectedIndex = 1
                      cards:GetChild('card_type').text = '将'
                     cards:GetChild('card_huxi').text = info_list[i].opCardList[k].hu_xi
                     cards:GetChild('card_1').icon =

lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua

@@ -15,8 +15,8 @@ end
 
 
 function M:UpdateFzList( fz_list ,ispaly,seat)
-    print("lingmeng UpdateFzList")
+   -- print("lingmeng UpdateFzList")
-    pt(fz_list)
+   -- pt(fz_list)
     self._area_fz_list:RemoveChildren(0,-1,true)
     for i = 1,#fz_list do
         local fzitem = nil

lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua

@@ -145,9 +145,9 @@ function M:__OnDragEnd(context)
             end
             local MoveCardindex = 0
             -- local MoveCardY = 0
-            print("lingmeng end", button.y, MoveCard, button.y > -380,
+           -- print("lingmeng end", button.y, MoveCard, button.y > -380,
-                button.x + button.width / 2 > card.old_postion.x and
+            --    button.x + button.width / 2 > card.old_postion.x and
-                button.x + button.width / 2 < (card.old_postion.x + button.width) and button.y > -380)
+            --    button.x + button.width / 2 < (card.old_postion.x + button.width) and button.y > -380)
             if button.x + button.width / 2 > card.old_postion.x and button.x + button.width / 2 < (card.old_postion.x + button.width) and button.y > -380 then
                 if #CountCards[card.index_X] > 1 then
                     for i = 1, #CountCards[card.index_X] do
@@ -186,7 +186,7 @@ function M:__OnDragEnd(context)
                     end
                 end
             end
-            print("lingmeng end", MoveCard, MoveCardindex)
+           -- print("lingmeng end", MoveCard, MoveCardindex)
             if MoveCard == true and MoveCardindex == 0 then
                 local num = 0
                 for i = 1, #self.card_list do
@@ -407,7 +407,8 @@ function M:playAnim(fzitem, fzcards, size, i, ispaly)
     else
         fzitem:AddChild(fzcards)
     end
-    self._area_fz_list:AddChild(fzitem)
+    self._area_fz_list:AddChildAt(fzitem,0)
+    
 end
 
 --出牌提示动画

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua

@@ -27,7 +27,7 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         end
         if self._room.score_times ~= nil and self._room.score_times > 0 then
             self._view:GetChild('di_text').text =
-                self._room.room_config:GetGameName() .. ' ' .. qihu .. '胡息起  ' .. self._room.score_times .. '倍'
+                self._room.room_config:GetGameName() .. self._room.score_times .. '倍'
         else
             self._view:GetChild('di_text').text = self._room.room_config:GetGameName() .. ' ' .. qihu .. '胡息1起'
         end
@@ -301,7 +301,7 @@ end
 
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
-    print("lingmeng UpdateCardSize")
+  --  print("lingmeng UpdateCardSize")
     if index == 0 then
         self._room.change_card_size = 1.4
     elseif index == 1 then

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua

@@ -211,11 +211,11 @@ function M:InitHandCard(isPlayAni, index)
                         for j = 1, #pokerList[i] do
                             local card_code = pokerList[i][j]
                             local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Btn_Card')
-                            print("lingmeng", self._room.change_card_display, card_code)
+                           -- print("lingmeng", self._room.change_card_display, card_code)
                             btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
                             btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
                             btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-                            btn_card:GetChild('n9'):SetScale(self:getCardSize(), self:getCardSize())
+                           -- btn_card:GetChild('n9'):SetScale(self:getCardSize(), self:getCardSize())
                             self.card_width = btn_card.width * self:getCardSize()
                             self.card_hight = btn_card.height * self:getCardSize()
                             local x, y = 500, (j * 85) - 500
@@ -261,12 +261,12 @@ function M:InitHandCard(isPlayAni, index)
             for j = 1, #pokerList[i] do
                 local card_code = pokerList[i][j]
                 local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Btn_Card')
-                print("lingmeng", self._room.change_card_display, card_code)
+               -- print("lingmeng", self._room.change_card_display, card_code)
 
                 btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
                 btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
                 btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-                btn_card:GetChild('n9'):SetScale(self:getCardSize(), self:getCardSize())
+               -- btn_card:GetChild('n9'):SetScale(self:getCardSize(), self:getCardSize())
                 self.card_width = btn_card.width * self:getCardSize()
                 self.card_hight = btn_card.height * self:getCardSize()
                 self._area_handcard_list:AddChild(btn_card)
@@ -384,7 +384,7 @@ function M:onTouchMove(context)
     local card = button.data
     local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
     button.xy = xy - card.touch_pos
-    print("lingmeng", xy.x, xy.y)
+   -- print("lingmeng", xy.x, xy.y)
 end
 
 --出牌提示动画
@@ -492,7 +492,7 @@ end
 
 --更新手牌大小
 function M:UpdateCardSize()
-    print("lingmeng UpdateCardSize")
+  --  print("lingmeng UpdateCardSize")
     local CountCards = {}
     for i = 1, #self.card_list do
         CountCards[self.card_list[i].index_X] =
@@ -519,7 +519,7 @@ end
 --  结束 拖拽事件
 -- 根据牌结束点的位置 判断是出牌还是调整位置  button.xy 和 牌的xy比较
 function M:__OnDragEnd(context)
-    print("lingmeng buyaojina __OnDragEnd")
+   -- print("lingmeng buyaojina __OnDragEnd")
     if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
     end
@@ -791,6 +791,7 @@ end
 function M:UpdateFzList(fz_list)
     --printlog("UpdateFzList area_fz_list1")
     self._area_fz_list:RemoveChildren(0, -1, true)
+
     for i = 1, #fz_list do
         local fzitem = nil
         if fz_list[i].type ~= RB_FZType.Kan then

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

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

wb_new_ui/.objs/metas/m7iejg46/l7wn7i80.info

@@ -0,0 +1,34 @@
+{
+  "objectStatus": {
+    "n112_l7wn": {
+      "hidden": true
+    },
+    "n115_l7wn": {
+      "hidden": true
+    },
+    "n114_l7wn": {
+      "hidden": true
+    },
+    "n113_l7wn": {
+      "hidden": true
+    },
+    "n116_l7wn": {
+      "hidden": true
+    },
+    "n119_l7wn": {
+      "hidden": true
+    },
+    "n118_l7wn": {
+      "hidden": true
+    },
+    "n117_l7wn": {
+      "hidden": true
+    },
+    "n111_l7wn": {
+      "hidden": true
+    },
+    "n110_l7wn": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n92_omkm": {
+      "collapsed": true
+    }
+  }
+}

wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info

@@ -10,9 +10,6 @@
       "hidden": true,
       "collapsed": true
     },
-    "n154_r1mo": {
-      "collapsed": true
-    },
     "n152_8th3": {
       "hidden": true
     },

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml

@@ -149,7 +149,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n53_rx2e" name="card_list_2" xy="537,179" pivot="0.5,0.5" size="261,198" group="n55_rx2e" visible="false" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
+    <list id="n53_rx2e" name="card_list_2" xy="537,179" pivot="0.5,0.5" size="261,198" group="n55_rx2e" visible="false" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" align="right" vAlign="middle">
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml

@@ -6,19 +6,22 @@
     <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" 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="1277,24" size="55,74">
+    <component id="n1" name="btn_setting" src="prgzdi" fileName="component/phone_info/Btn_setting.xml" xy="26,10" size="66,76">
       <relation target="" sidePair="left-right%"/>
     </component>
-    <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="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="69,0" size="73,39" fontSize="28" color="#ffffff" vAlign="middle" text="13:00"/>
+    <component id="n5" name="pb_batteryLevel" src="prgzdk" fileName="component/phone_info/ProgressBar2.xml" xy="1262,10" size="57,28" group="n22_mcgb" touchable="false">
+      <ProgressBar value="62" max="100"/>
+    </component>
+    <component id="n6" name="gcm_xinhao" src="prgzdl" fileName="component/phone_info/Component3(1).xml" xy="1146,11" group="n22_mcgb" touchable="false">
+      <gearDisplay controller="xinhao" pages="0"/>
+    </component>
+    <text id="n12_yyhx" name="tex_time" xy="1035,9" size="89,39" group="n22_mcgb" fontSize="28" color="#ffffff" vAlign="middle" autoSize="none" text="13:00"/>
+    <group id="n22_mcgb" name="n22" xy="1035,9" size="284,39" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="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,开始,3,打鸟" selected="3"/>
+  <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
   <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"/>
@@ -33,11 +33,11 @@
       <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="1147,146" size="120,151">
+    <component id="n18" name="player_info2" src="prgzam" fileName="component/head/PlayerHead_2.xml" xy="1118,133" size="120,151">
       <gearXY controller="state" pages="0,1,2,3" values="1118,133|1147,146|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="1,299" size="150,154">
+    <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,299|37,355|9,334"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
@@ -46,7 +46,7 @@
       <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n71_sdax" name="player_card_info_2" src="prgz8d" fileName="component/card_info/Player_card_info_2.xml" xy="776,157" touchable="false">
+    <component id="n71_sdax" name="player_card_info_2" src="prgz8d" fileName="component/card_info/Player_card_info_2.xml" xy="747,144" touchable="false">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
@@ -91,20 +91,25 @@
     <component id="n77_ij2y" name="gcm_chat" src="h1uu2p" fileName="Gcm_chat.xml" pkg="l0ds4ys6" xy="1237,356">
       <relation target="" sidePair="right-right%"/>
     </component>
-    <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="1242,543" 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="3,5" size="1331,108" group="n86_q50p">
+    <component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="0,0" size="1331,95" group="n86_q50p">
       <gearDisplay controller="state" pages="0,1,2,3"/>
       <relation target="" sidePair="width-width%"/>
     </component>
-    <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="498,-1" size="271,41" group="n86_q50p" touchable="false">
+    <component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="349,10" size="60,74" group="n86_q50p">
+      <gearDisplay controller="state" pages="0,3"/>
+    </component>
+    <component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="248,9" size="57,71" group="n86_q50p">
+      <gearDisplay controller="state" pages="0,1,3"/>
+    </component>
+    <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="539,9" size="271,50" group="n86_q50p" touchable="false">
       <relation target="" sidePair="right-right%"/>
     </component>
-    <component id="n85_q50p" name="btn_rule" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="142,12" size="89,77" group="n86_q50p"/>
+    <component id="n85_q50p" name="btn_rule" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="118,8" size="89,64" group="n86_q50p"/>
-    <component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="272,-122" size="147,77" group="n86_q50p" touchable="false"/>
+    <component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="760,7" size="147,64" group="n86_q50p" visible="false" touchable="false"/>
-    <group id="n86_q50p" name="n86" xy="3,-122" size="1331,235" advanced="true">
+    <group id="n86_q50p" name="n86" xy="0,0" size="1331,95" 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">
@@ -137,7 +142,7 @@
       <item url="ui://9n9stu2eprgzdn"/>
       <item url="ui://9n9stu2eprgzdn"/>
     </list>
-    <text id="n74_bzpj" name="round" xy="547,34" size="168,39" font="Microsoft YaHei" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=" 1/10局">
+    <text id="n74_bzpj" name="round" xy="591,46" size="174,44" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=" 1/10局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="left-left%,top-top%"/>
     </text>
@@ -147,29 +152,19 @@
       <relation target="" sidePair="left-right%"/>
       <Button controller="showBtn" page="1"/>
     </component>
-    <image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,63" size="80,78" group="n123_thxk">
+    <image id="n122_thxk" name="n122" src="thxkcim" fileName="images/Rectangle 397.png" xy="1239,63" size="80,163" group="n123_thxk">
       <gearSize controller="state" pages="0,1" values="80,163,1,1|80,78,1,1" default="80,258,1,1"/>
     </image>
     <image id="n125_thxk" name="n125" src="thxkcip" fileName="images/Line 23.png" xy="1250,146" group="n123_thxk">
       <gearDisplay controller="state" pages="0"/>
     </image>
     <component id="n100_n6fs" name="btn_back_jiesan" src="prgzdw" fileName="component/poker/Btn_back_jiesan.xml" xy="1258,69" group="n123_thxk">
-      <gearDisplay controller="state" pages="1"/>
+      <gearDisplay controller="state" pages=""/>
     </component>
-    <group id="n123_thxk" name="ShowMore" xy="1239,63" size="80,84" advanced="true">
+    <group id="n123_thxk" name="ShowMore" xy="1239,63" size="80,163" advanced="true">
       <gearDisplay controller="showBtn" pages="1"/>
       <relation target="" sidePair="left-right%"/>
     </group>
-    <component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="1192,8" size="47,74" group="n132_kt8n">
-      <gearDisplay controller="state" pages="0,3"/>
-    </component>
-    <component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="1274,105" size="57,65" group="n132_kt8n">
-      <gearDisplay controller="state" pages="0,1,3"/>
-    </component>
-    <group id="n132_kt8n" name="n132" xy="1192,8" size="139,162" advanced="true">
-      <gearDisplay controller="state" pages="0,1,2"/>
-      <relation target="" sidePair="right-right,top-top"/>
-    </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/phone_info/Btn_setting.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="44,65" extention="Button">
+<component size="52,77" 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/poker/Btn_back_lobby.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <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"/>
+    <image id="n4_qf80" name="n4" src="qf80che" fileName="images/fh_img.png" xy="0,0" size="52,74"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -2,7 +2,7 @@
 <component size="1334,750" designImage="ui://v0j9abjygq7m95">
   <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="1"/>
+  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
   <displayList>
     <text id="n93_nkur" name="wanfa_text" xy="334,238" pivot="0.5,0" size="644,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="玩法介绍">
@@ -50,7 +50,7 @@
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n86_8sat" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="466,38" size="274,41" group="n90_8sat" touchable="false"/>
-    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="5,0" size="1329,102" group="n90_8sat"/>
+    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="21,2" size="1329,102" group="n90_8sat"/>
     <component id="n88_8sat" name="btn_rule" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="142,12" group="n90_8sat"/>
     <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="295,12" size="110,75" group="n90_8sat">
       <gearDisplay controller="state" pages="1,2"/>
@@ -61,7 +61,7 @@
     <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="404,10" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <group id="n90_8sat" name="n90" xy="5,0" size="1329,102" advanced="true">
+    <group id="n90_8sat" name="n90" xy="21,2" size="1329,102" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
     <component id="n84_l2u4" name="btn_wxyqhy" src="gq7m1q" fileName="Main_style_2/component/room/btn_invite(1).xml" xy="521,295" group="n85_l2u4">
@@ -72,7 +72,7 @@
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="889,-4" visible="false" touchable="false">
+    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="905,-4" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>

wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml

@@ -2,11 +2,11 @@
 <component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
   <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="1"/>
+  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <text id="n176_fgao" name="di_text" xy="442,10" size="450,51" font="Microsoft YaHei" fontSize="32" color="#330000" align="center" vAlign="middle" autoSize="none" strokeColor="#296137" text="123456789">
+    <text id="n176_fgao" name="di_text" xy="473,11" size="450,51" font="Microsoft YaHei" fontSize="32" color="#330000" align="center" vAlign="middle" autoSize="none" strokeColor="#296137" text="123456789">
       <gearDisplay controller="state" pages="0,1,2"/>
       <gearColor controller="bg_state" pages="0,1" values="#330000,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
       <relation target="" sidePair="center-center"/>
@@ -82,11 +82,11 @@
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <text id="n42_lryk" name="tex_round" xy="565,150" size="267,36" group="n154_r1mo" fontSize="24" color="#ffffff" align="center" autoSize="none" text="剩余 5 张牌  1/8局">
+    <text id="n42_lryk" name="tex_round" xy="565,150" size="267,42" group="n154_r1mo" fontSize="30" color="#ffffff" align="center" autoSize="none" text="剩余 5 张牌  1/8局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <group id="n154_r1mo" name="n154" xy="565,150" size="267,36" advanced="true">
+    <group id="n154_r1mo" name="n154" xy="565,150" size="267,42" advanced="true">
       <gearDisplay controller="jushu" pages="1"/>
     </group>
     <loader id="n153_8th3" name="cardAnima" xy="625,86" size="50,30" visible="false" touchable="false" url="ui://3bfrwj0h8th37l" autoSize="true">

wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml

@@ -3,16 +3,13 @@
   <controller name="chupai" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,3,,4," selected="0"/>
   <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
-  <controller name="niao" pages="0,,1," selected="1"/>
+  <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
     <list id="n36_lr5d" name="windcard_list" xy="1331,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wlr5d31">
       <relation target="" sidePair="right-right"/>
     </list>
-    <list id="n35_lr5d" name="area_fz_list" xy="787,-169" size="242,135" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="5" defaultItem="ui://v6yvqp7wlr5d30" vAlign="middle" renderOrder="descent">
+    <list id="n35_lr5d" name="area_fz_list" xy="787,-169" size="242,135" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="5" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="center-center"/>
-      <item url="ui://v6yvqp7wcyprwy"/>
-      <item url="ui://v6yvqp7wcyprww"/>
-      <item url="ui://v6yvqp7wcyprwy"/>
     </list>
     <component id="n25" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="127,98" size="1039,118">
       <relation target="" sidePair="center-center,bottom-bottom"/>

wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="135,135" pivot="0.5,0.5" extention="Button">
+<component size="160,160" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="hupai" pages="0,,1," selected="0"/>
+  <controller name="hupai" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n4_lr5d" name="icon" xy="0,0" size="135,135" url="ui://v6yvqp7wx8lf14l" align="center" vAlign="middle"/>
+    <loader id="n4_lr5d" name="icon" xy="12,12" size="135,135" url="ui://v6yvqp7wx8lf14l" align="center" vAlign="middle"/>
     <component id="n5_rjio" name="hupai" src="lvh412c" fileName="component/option/component/card/Btn_Card.xml" xy="28,-115">
       <gearDisplay controller="hupai" pages="1"/>
     </component>

wb_new_ui/assets/Main_RunBeard/component/option/Gcm_action_tips.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="678,162">
   <displayList>
-    <list id="n1_lr5d" name="lit_fanzi" xy="0,0" size="678,162" layout="row" selectionMode="none" colGap="40" defaultItem="ui://v6yvqp7wwyal85" autoItemSize="false" align="right" vAlign="middle"/>
+    <list id="n1_lr5d" name="lit_fanzi" xy="0,0" size="678,162" layout="row" selectionMode="none" colGap="40" defaultItem="ui://v6yvqp7wwyal85" autoItemSize="false" align="right" vAlign="middle">
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -31,7 +31,7 @@
     <image id="n245_ilon" name="n245" src="n6w87i9h" fileName="images/Rectangle 9.png" xy="0,1" size="1342,120">
       <relation target="" sidePair="width-width%"/>
     </image>
-    <image id="n244_n6w8" name="n244" src="n6w87i9h" fileName="images/Rectangle 9.png" xy="0,662" size="1334,86">
+    <image id="n244_n6w8" name="n244" src="n6w87i9h" fileName="images/Rectangle 9.png" xy="0,656" size="1334,90">
       <relation target="" sidePair="width-width%,height-height%"/>
     </image>
     <image id="n246_ilon" name="n246" src="ilon7i9i" fileName="Rectangle 12.png" xy="0,0" size="249,121"/>
@@ -163,7 +163,7 @@
       <Button icon="ui://m7iejg46cioehoj"/>
     </component>
     <group id="n175_mn85" name="n175" xy="740,-2" size="54,55"/>
-    <list id="n45_l0s4" name="lst_room" xy="0,150" size="1339,505" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="-25" colGap="-34" defaultItem="ui://m7iejg46ilon7i9l" align="center" autoClearItems="true">
+    <list id="n45_l0s4" name="lst_room" xy="0,152" size="1339,493" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="-25" colGap="-34" defaultItem="ui://m7iejg46ilon7i9l" align="center" autoClearItems="true">
       <gearDisplay controller="null" pages="0"/>
       <relation target="" sidePair="width-width%,center-center,middle-middle"/>
       <item/>

wb_new_ui/assets/NewGroup/Win_FagInput0.xml

@@ -54,9 +54,9 @@
     <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="344,385" group="n120_l7wn"/>
     <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="556,385" group="n120_l7wn"/>
     <group id="n120_l7wn" name="input_panel" xy="51,163" size="617,381" group="n92_omkm"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" group="n91_omkm"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" size="614,74" group="n91_omkm"/>
     <text id="n90_omkm" name="tex_num" xy="58,79" size="609,70" group="n91_omkm" font="Microsoft YaHei" fontSize="36" color="#367256" vAlign="middle" autoSize="none" text="123"/>
-    <group id="n91_omkm" name="show" xy="51,77" size="616,78" group="n92_omkm"/>
+    <group id="n91_omkm" name="show" xy="51,77" size="616,74" group="n92_omkm"/>
     <group id="n92_omkm" name="n92" xy="51,77" size="617,467" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>

wb_new_ui/assets/NewGroup/Win_FagInput1.xml

@@ -7,58 +7,61 @@
     <component id="n63_omkm" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="660,-22">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n98_l7wn" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,459" size="193,85" group="n120_l7wn">
+    <component id="n99_l7wn" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="501,471" size="193,85" group="n120_l7wn">
-      <Button title="删除" titleFontSize="1" icon="ui://27vd145bl7wn7iiq"/>
+      <Button title="确认" titleFontSize="1" icon="ui://m7iejg46mcgb7ijb"/>
     </component>
-    <component id="n99_l7wn" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,459" size="193,85" group="n120_l7wn">
+    <component id="n100_l7wn" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,155" size="193,85" group="n120_l7wn">
-      <Button title="确认" titleFontSize="1" icon="ui://27vd145bl7wn7iip"/>
+      <Button title="1" titleFontSize="1" icon="ui://m7iejg46mcgb7ija"/>
     </component>
-    <component id="n100_l7wn" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,163" size="193,85" group="n120_l7wn">
+    <component id="n101_l7wn" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,155" size="193,85" group="n120_l7wn">
-      <Button title="1" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="2" titleFontSize="1" icon="ui://m7iejg46mcgb7ijc"/>
     </component>
-    <component id="n101_l7wn" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,163" size="193,85" group="n120_l7wn">
+    <component id="n102_l7wn" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,155" size="193,85" group="n120_l7wn">
-      <Button title="2" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="3" titleFontSize="1" icon="ui://m7iejg46mcgb7ijd"/>
     </component>
-    <component id="n102_l7wn" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,163" size="193,85" group="n120_l7wn">
+    <component id="n103_l7wn" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,257" size="193,85" group="n120_l7wn">
-      <Button title="3" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="4" titleFontSize="1" icon="ui://m7iejg46mcgb7ije"/>
     </component>
-    <component id="n103_l7wn" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,262" size="193,85" group="n120_l7wn">
+    <component id="n104_l7wn" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,257" size="193,85" group="n120_l7wn">
-      <Button title="4" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="5" titleFontSize="1" icon="ui://m7iejg46mcgb7ijf"/>
     </component>
-    <component id="n104_l7wn" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,262" size="193,85" group="n120_l7wn">
+    <component id="n105_l7wn" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,257" size="193,85" group="n120_l7wn">
-      <Button title="5" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="6" titleFontSize="1" icon="ui://m7iejg46mcgb7ijg"/>
     </component>
-    <component id="n105_l7wn" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,262" size="193,85" group="n120_l7wn">
+    <component id="n106_l7wn" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="48,359" size="193,85" group="n120_l7wn">
-      <Button title="6" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="7" titleFontSize="1" icon="ui://m7iejg46mcgb7ijh"/>
     </component>
-    <component id="n106_l7wn" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="51,364" size="193,85" group="n120_l7wn">
+    <component id="n107_l7wn" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="273,359" size="193,85" group="n120_l7wn">
-      <Button title="7" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="8" titleFontSize="1" icon="ui://m7iejg46mcgb7iji"/>
     </component>
-    <component id="n107_l7wn" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,364" size="193,85" group="n120_l7wn">
+    <component id="n108_l7wn" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="498,359" size="193,85" group="n120_l7wn">
-      <Button title="8" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="9" titleFontSize="1" icon="ui://m7iejg46mcgb7ijj"/>
     </component>
-    <component id="n108_l7wn" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="475,364" size="193,85" group="n120_l7wn">
+    <component id="n109_l7wn" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="47,470" size="193,85" group="n120_l7wn">
-      <Button title="9" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+      <Button title="0" titleFontSize="1" icon="ui://m7iejg46mcgb7ijk"/>
     </component>
-    <component id="n109_l7wn" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="263,459" size="193,85" group="n120_l7wn">
+    <image id="n117_l7wn" name="n117" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" pkg="27vd145b" xy="105,380" group="n120_l7wn" visible="false"/>
-      <Button title="0" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
+    <image id="n116_l7wn" name="n116" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" pkg="27vd145b" xy="526,274" group="n120_l7wn" visible="false"/>
+    <image id="n115_l7wn" name="n115" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" pkg="27vd145b" xy="317,274" group="n120_l7wn" visible="false"/>
+    <image id="n114_l7wn" name="n114" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" pkg="27vd145b" xy="103,274" group="n120_l7wn" visible="false"/>
+    <image id="n113_l7wn" name="n113" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" pkg="27vd145b" xy="521,174" group="n120_l7wn" visible="false"/>
+    <image id="n112_l7wn" name="n112" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" pkg="27vd145b" xy="314,174" group="n120_l7wn" visible="false"/>
+    <image id="n111_l7wn" name="n111" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" pkg="27vd145b" xy="103,174" group="n120_l7wn" visible="false"/>
+    <image id="n110_l7wn" name="n110" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" pkg="27vd145b" xy="316,476" group="n120_l7wn" visible="false"/>
+    <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="316,380" group="n120_l7wn" visible="false"/>
+    <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="528,380" group="n120_l7wn" visible="false"/>
+    <component id="n121_mcgb" name="btn_10" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="272,470" size="185,85" group="n120_l7wn">
+      <Button title="." titleFontSize="1" icon="ui://m7iejg46mcgb7ijl"/>
     </component>
-    <image id="n110_l7wn" name="n110" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" pkg="27vd145b" xy="344,481" group="n120_l7wn"/>
+    <group id="n120_l7wn" name="input_panel" xy="47,155" size="646,401" group="n92_omkm"/>
-    <image id="n111_l7wn" name="n111" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" pkg="27vd145b" xy="131,179" group="n120_l7wn"/>
+    <group id="n92_omkm" name="n92" xy="47,155" size="646,401" advanced="true">
-    <image id="n112_l7wn" name="n112" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" pkg="27vd145b" xy="342,179" group="n120_l7wn"/>
-    <image id="n113_l7wn" name="n113" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" pkg="27vd145b" xy="549,179" group="n120_l7wn"/>
-    <image id="n114_l7wn" name="n114" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" pkg="27vd145b" xy="131,279" group="n120_l7wn"/>
-    <image id="n115_l7wn" name="n115" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" pkg="27vd145b" xy="345,279" group="n120_l7wn"/>
-    <image id="n116_l7wn" name="n116" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" pkg="27vd145b" xy="554,279" group="n120_l7wn"/>
-    <image id="n117_l7wn" name="n117" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" pkg="27vd145b" xy="133,385" group="n120_l7wn"/>
-    <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="344,385" group="n120_l7wn"/>
-    <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="556,385" group="n120_l7wn"/>
-    <group id="n120_l7wn" name="input_panel" xy="51,163" size="617,381" group="n92_omkm"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" group="n91_omkm"/>
-    <text id="n90_omkm" name="tex_num" xy="58,79" size="609,70" group="n91_omkm" font="Microsoft YaHei" fontSize="36" color="#367256" vAlign="middle" autoSize="none" text="123"/>
-    <group id="n91_omkm" name="show" xy="51,77" size="616,78" group="n92_omkm"/>
-    <group id="n92_omkm" name="n92" xy="51,77" size="617,467" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
+    <group id="n91_omkm" name="show" xy="46,53" size="651,85"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="46,53" size="651,85" group="n91_omkm"/>
+    <text id="n90_omkm" name="tex_num" xy="77,61" size="509,71" group="n91_omkm" font="Microsoft YaHei" fontSize="42" color="#ffffff" align="right" vAlign="middle" autoSize="none" text=""/>
+    <component id="n98_l7wn" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="610,64" size="78,60">
+      <Button title="删除" titleFontSize="1" icon="ui://m7iejg46mcgb7ijm"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/Win_FagInput2.xml

@@ -56,9 +56,9 @@
     <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="344,385" group="n120_l7wn"/>
     <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="556,385" group="n120_l7wn"/>
     <group id="n120_l7wn" name="input_panel" xy="51,163" size="617,381" group="n92_omkm"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" group="n91_omkm"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" size="607,72" group="n91_omkm"/>
     <text id="n90_omkm" name="tex_num" xy="58,79" size="609,70" group="n91_omkm" font="Microsoft YaHei" fontSize="36" color="#367256" vAlign="middle" autoSize="none" text="123"/>
-    <group id="n91_omkm" name="show" xy="51,77" size="616,78" group="n92_omkm"/>
+    <group id="n91_omkm" name="show" xy="51,77" size="616,72" group="n92_omkm"/>
     <group id="n92_omkm" name="n92" xy="51,77" size="617,467" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>

wb_new_ui/assets/NewGroup/Win_FagInput3.xml

@@ -56,9 +56,9 @@
     <image id="n118_l7wn" name="n118" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" pkg="27vd145b" xy="344,385" group="n120_l7wn"/>
     <image id="n119_l7wn" name="n119" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" pkg="27vd145b" xy="556,385" group="n120_l7wn"/>
     <group id="n120_l7wn" name="input_panel" xy="51,163" size="617,381" group="n92_omkm"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" group="n91_omkm"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="51,77" size="615,76" group="n91_omkm"/>
     <text id="n90_omkm" name="tex_num" xy="58,79" size="609,70" group="n91_omkm" font="Microsoft YaHei" fontSize="36" color="#367256" vAlign="middle" autoSize="none" text="123"/>
-    <group id="n91_omkm" name="show" xy="51,77" size="616,78" group="n92_omkm"/>
+    <group id="n91_omkm" name="show" xy="51,77" size="616,76" group="n92_omkm"/>
     <group id="n92_omkm" name="n92" xy="51,77" size="617,467" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>

wb_new_ui/assets/NewGroup/package.xml

@@ -1131,6 +1131,20 @@
     <image id="kt8n7ij7" name="Rectangle 432.png" path="/component/Lst_room/"/>
     <image id="kt8n7ij8" name="Rectangle 441.png" path="/images/room/"/>
     <image id="kt8n7ij9" name="微信图片_20250625045736.jpg" path="/component/Lst_room/"/>
+    <image id="mcgb7ija" name="Group 288.png" path="/images/input/"/>
+    <image id="mcgb7ijb" name="Group 299.png" path="/images/input/"/>
+    <image id="mcgb7ijc" name="Group 504.png" path="/images/input/"/>
+    <image id="mcgb7ijd" name="Group 505.png" path="/images/input/"/>
+    <image id="mcgb7ije" name="Group 506.png" path="/images/input/"/>
+    <image id="mcgb7ijf" name="Group 507.png" path="/images/input/"/>
+    <image id="mcgb7ijg" name="Group 508.png" path="/images/input/"/>
+    <image id="mcgb7ijh" name="Group 509.png" path="/images/input/"/>
+    <image id="mcgb7iji" name="Group 510.png" path="/images/input/"/>
+    <image id="mcgb7ijj" name="Group 511.png" path="/images/input/"/>
+    <image id="mcgb7ijk" name="Group 512.png" path="/images/input/"/>
+    <image id="mcgb7ijl" name="Group 513.png" path="/images/input/"/>
+    <image id="mcgb7ijm" name="Vector.png" path="/images/input/"/>
+    <image id="mcgb7ijo" name="Rectangle 156.png" path="/images/input/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>