放炮发手感调整，以及设置修正

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

@@ -1009,7 +1009,6 @@ function M:OnFangziAction(...)
                         info:DeleteHandCard(fz.opcard[i])
                     end
                 end)
-
         elseif fz.type == RB_FZType.Pao then
             if num > 0 then
                 for i = 1, #fz.opcard do
@@ -1073,7 +1072,6 @@ function M:OnFangziAction(...)
                     effect:Dispose()
                 end
             )
-            
         elseif fz.type == RB_FZType.ChouWei then
             self:PlaySound(player.self_user.sex, 'F_' .. fz.card)
             info:UpdateOutCardList(fz.card, true, true, fz.from_seat)
@@ -1096,7 +1094,6 @@ function M:OnFangziAction(...)
                     effect:Dispose()
                 end
             )
-
         elseif fz.type == RB_FZType.Pao then
             --  effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "pao")
             self:PlaySound(player.self_user.sex, 'F_KaiDuo')
@@ -1114,7 +1111,6 @@ function M:OnFangziAction(...)
                     coroutine.wait(1.2)
                     self:PlaySound(player.self_user.sex, 'F_SaoChuan')
                     info:PlayingOutCardAnima()
-                    
                 end)
 
             coroutine.start(
@@ -1138,8 +1134,6 @@ function M:OnFangziAction(...)
                 end
             )
         end
-        
-
     end
     if (player == self._room.self_player) then
         coroutine.start(

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

@@ -13,7 +13,6 @@ function M.new(view,mainView)
     return self
 end
 
-
 function M:onTouchBegin(context)
     if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
@@ -23,15 +22,14 @@ function M:onTouchBegin(context)
     if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then
         self:ShowHuTip(card.card_item)
     end
-    card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_",card.card_item)
+    card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/204_", card.card_item)
+    -- card.btn_card:GetController('touch').selectedIndex = 1
     card.btn_card.sortingOrder = 100
     local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
     card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50)
     card.touch_pos = xy - button.xy
-
 end
 
-
 function M:__OnDragEnd(context)
     if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
@@ -80,7 +78,7 @@ function M:__OnDragEnd(context)
                 maxmark = #self.card_list - 1
             end
         end
-        if button.x+button.width/2 < self.card_list[minmark].btn_card.x and #CountCards<10 then
+        if button.x + button.width / 2 < self.card_list[minmark].btn_card.x and #CountCards < 10 and button.y > -380 then
             list_remove(self.card_list, card)
             local num = 0
             for i = 1, #self.card_list do
@@ -106,7 +104,7 @@ function M:__OnDragEnd(context)
             card.index_Y = 1
             table.insert(self.card_list, 1, card)
             isChangeCard = true
-        elseif button.x+button.width/2 > (self.card_list[maxmark].btn_card.x +button.width) and #CountCards<10 then
+        elseif button.x + button.width / 2 > (self.card_list[maxmark].btn_card.x + button.width) and #CountCards < 10 and button.y > -380 then
             list_remove(self.card_list, card)
             local num = 0
             for i = 1, #self.card_list do
@@ -135,9 +133,8 @@ function M:__OnDragEnd(context)
             for i = 1, #CountCards do
                 local card_view = CountCards[i][1]
                 if card_view ~= nil then
-                    if button.x+button.width/2 > card_view.old_postion.x and button.x+button.width/2 < (card_view.old_postion.x+button.width) then
+                    if button.x + button.width / 2 > card_view.old_postion.x and button.x + button.width / 2 < (card_view.old_postion.x + button.width) and button.y > -380 then
                         if card ~= card_view and #CountCards[i] < 4 and card.index_X ~= card_view.index_X then
-                             
                             MoveCardPos = i
                             MoveCardY = #CountCards[i] + 1
                             MoveCard = true
@@ -148,7 +145,10 @@ function M:__OnDragEnd(context)
             end
             local MoveCardindex = 0
             -- local MoveCardY = 0
-            if button.x+button.width/2 > card.old_postion.x and button.x+button.width/2 < (card.old_postion.x+button.width) then           
+            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 + 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
                         local _cv = CountCards[card.index_X][i]
@@ -185,8 +185,8 @@ function M:__OnDragEnd(context)
                         end
                     end
                 end
-          
             end
+            print("lingmeng end", MoveCard, MoveCardindex)
             if MoveCard == true and MoveCardindex == 0 then
                 local num = 0
                 for i = 1, #self.card_list do
@@ -224,13 +224,11 @@ function M:__OnDragEnd(context)
                         if MoveCardindex == -1 then
                             if self.card_list[i].index_Y < card.index_Y and self.card_list[i].index_Y >= MoveCardY then
                                 self.card_list[i].index_Y = self.card_list[i].index_Y + 1
-                            
                             end
                             --向上移动
                         else
                             if self.card_list[i].index_Y > card.index_Y and self.card_list[i].index_Y <= MoveCardY then
                                 self.card_list[i].index_Y = self.card_list[i].index_Y - 1
-                               
                             end
                         end
                     end
@@ -251,7 +249,6 @@ function M:__OnDragEnd(context)
                 isChangeCard = false
                 self._area_handcard_list:AddChild(button)
             end
-
         end
         self:UpdateHandCardsPos()
         if isChangeCard == true then
@@ -287,7 +284,6 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
                 if outcard ~= 0 then
                     outcards:GetTransition("mopai" .. seat):Play(function()
                         --  show_di_bg.visible = true
-                 
                     end)
                 end
             else
@@ -328,7 +324,6 @@ function M:PlayingOutCardAnima( card)
 end
 
 function M:UpdateFzList(fz_list, ispaly)
-
     --printlog("UpdateFzList area_fz_list2")
     self._area_fz_list:RemoveChildren(0, -1, true)
     for i = 1, #fz_list do
@@ -341,7 +336,6 @@ function M:UpdateFzList( fz_list ,ispaly)
         end
 
         if fz_list[i].type == RB_FZType.Chi or fz_list[i].type == RB_FZType.Bi then
-
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
             fzcards:GetChild("card_" .. 1).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].active_card)
             fzcards:GetController("c2").selectedIndex = 1
@@ -350,18 +344,14 @@ function M:UpdateFzList( fz_list ,ispaly)
             fzcards.x, fzcards.y = 0, 0
 
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
-
         elseif fz_list[i].type == RB_FZType.Peng then
-
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
             for j = 1, 3 do
                 fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
             end
             fzcards.x, fzcards.y = 0, 0
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
-
         elseif fz_list[i].type == RB_FZType.Wei then
-
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
             fzcards:GetController("c1").selectedIndex = 1
             for j = 1, 3 do
@@ -381,18 +371,14 @@ function M:UpdateFzList( fz_list ,ispaly)
             fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
             fzcards.x, fzcards.y = 0, 0
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
-
         elseif fz_list[i].type == RB_FZType.Pao then
-
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
             for j = 1, 4 do
                 fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card)
             end
             fzcards.x, fzcards.y = 0, 0
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
-
         elseif fz_list[i].type == RB_FZType.Ti then
-
             local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
             for j = 1, 4 do
                 if j == 1 then
@@ -403,14 +389,10 @@ function M:UpdateFzList( fz_list ,ispaly)
             end
             fzcards.x, fzcards.y = 0, 0
             self:playAnim(fzitem, fzcards, #fz_list, i, ispaly)
-        
         end
     end
-
-
 end
 
-
 function M:playAnim(fzitem, fzcards, size, i, ispaly)
     if (ispaly == nil) then
         ispaly = false
@@ -428,7 +410,6 @@ function M:playAnim( fzitem,fzcards, size,i,ispaly )
     self._area_fz_list:AddChild(fzitem)
 end
 
-
 --出牌提示动画
 function M:ChuPaiTiShi()
     if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
@@ -455,7 +436,6 @@ end
             end
         end
         if #tingList > 0 and isKan == false then
-          
             mark_ting[#mark_ting + 1] = card
         end
         table.insert(player.handcard_list, card)
@@ -478,7 +458,6 @@ end
         for k = 1, #self.card_list do
             local card_view = self.card_list[k]
             card_view.btn_card:GetController("mark_ting").selectedIndex = 0
-                   
         end
     end
 end

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

@@ -1,5 +1,3 @@
-
-
 local M = {
     btn_card = nil,
     card_item = 0,
@@ -64,7 +62,7 @@ function M:getCardSize()
     if self._room.change_card_size ~= nil then
         return self._room.change_card_size
     else
-        return 1
+        return 1.2
     end
 end
 

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

@@ -90,11 +90,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         local typeface = _data['game_cardsize']
         local _gamectr = self._gamectr
         if typeface == 0 then
-            self._room.change_card_size = 1.2
+            self._room.change_card_size = 1.4
         elseif typeface == 1 then
-            self._room.change_card_size = 1
+            self._room.change_card_size = 1.2
         elseif typeface == 2 then
-            self._room.change_card_size = 0.8
+            self._room.change_card_size = 1.2
         end
     else
         self._room.change_card_size = change_card_size
@@ -173,7 +173,6 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
 			self._ctr_action.selectedIndex = 1
 		end]]
         self._ctr_action.selectedIndex = 2
-		
     else
         self._ctr_action.selectedIndex = 0
     end
@@ -213,8 +212,6 @@ function M:PlayXiPai(xipaiCallBack)
                 xipaiCallBack()
             end
         end)
-			
-		
     end
 end
 
@@ -243,12 +240,9 @@ function M:PlayXiPai1(xipaiCallBack)
                 xipaiCallBack()
             end
         end)
-			
-		
     end
 end
 
-
 function M:NewSettingView(cardIndex)
     local settingView = ZPSettingView.new(self._view, 2, self.default_btn, cardIndex)
     settingView:FillBgSection(
@@ -307,12 +301,13 @@ end
 
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
+    print("lingmeng UpdateCardSize")
     if index == 0 then
-        self._room.change_card_size = 1.2
+        self._room.change_card_size = 1.4
     elseif index == 1 then
-        self._room.change_card_size = 1
+        self._room.change_card_size = 1.2
     elseif index == 2 then
-        self._room.change_card_size = 0.8
+        self._room.change_card_size = 1.2
     end
     local info = self._player_card_info[1]
     info:UpdateCardSize()
@@ -322,6 +317,7 @@ end
 function M:UpdateFangyan(index)
     self._room.fangyan_typeface = index
 end
+
 --刷新手牌排列 按钮   三种 排列方法  在   PendulumRule 里
 function M:ResetHandCard(...)
     local btn_reset = self._view:GetChild('btn_reset')
@@ -407,4 +403,5 @@ function M:Destroy()
     UIPackage.RemovePackage('base/main_zipai/ui/Main_RunBeard')
     MainView.Destroy(self)
 end
+
 return M

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

@@ -211,11 +211,13 @@ 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)
                             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())
-                            self.card_width = 95 * self:getCardSize()
-                            self.card_hight = 123 * 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
                             btn_card:SetXY(x, y)
                             self._area_handcard_list:AddChild(btn_card)
@@ -259,11 +261,14 @@ 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)
+
                 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())
-                self.card_width = 95 * self:getCardSize()
-                self.card_hight = 123 * 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)
                 self._area_handcard_list:SetChildIndex(btn_card, 5 - j)
                 local card_view = NewCardView(btn_card, card_code, i, j)
@@ -310,8 +315,8 @@ function M:UpdateHandCards(list)
         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())
-        self.card_width = 87 * self:getCardSize()
-        self.card_hight = 110 * self:getCardSize()
+        self.card_width = btn_card.width * self:getCardSize()
+        self.card_hight = btn_card.height * self:getCardSize()
         local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y)
         --存牌堆
         self.card_list[#self.card_list + 1] = card_view
@@ -369,7 +374,6 @@ function M:onTouchBegin(context)
     end
     card.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/203_', card.card_item)
     -- card.btn_card.sortingOrder = 100
-
     local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
     card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50)
     card.touch_pos = xy - button.xy
@@ -380,6 +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)
 end
 
 --出牌提示动画
@@ -461,7 +466,7 @@ function M:UpdateHandCardsPos()
         card_view.btn_card:RemoveFromParent()
         self._area_handcard_list:AddChild(card_view.btn_card)
         card_view.old_postion = self:GetHandCardPos(card_view, #CountCards)
-        card_view.btn_card:TweenMove(card_view.old_postion, 0.3)
+        card_view.btn_card:TweenMove(card_view.old_postion, 0.2)
     end
     self:ShowHuTip()
 end
@@ -477,13 +482,17 @@ function M:UpdateCardDisplay()
         local card_view = self.card_list[i]
         card_view.btn_card:RemoveFromParent()
         card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item)
+        self.card_width = card_view.btn_card.width * self:getCardSize()
+        self.card_hight = card_view.btn_card.height * self:getCardSize()
         self._area_handcard_list:AddChild(card_view.btn_card)
-        card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
+        -- card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
     end
+    self:UpdateHandCardsPos()
 end
 
 --更新手牌大小
 function M:UpdateCardSize()
+    print("lingmeng UpdateCardSize")
     local CountCards = {}
     for i = 1, #self.card_list do
         CountCards[self.card_list[i].index_X] =
@@ -495,11 +504,12 @@ function M:UpdateCardSize()
         card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item)
         card_view.btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
         card_view.btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
-        self.card_width = 87 * self:getCardSize()
-        self.card_hight = 110 * self:getCardSize()
+        self.card_width = card_view.btn_card.width * self:getCardSize()
+        self.card_hight = card_view.btn_card.height * self:getCardSize()
         self._area_handcard_list:AddChild(card_view.btn_card)
-        card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
+        -- card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
     end
+    self:UpdateHandCardsPos()
 end
 
 function M:UpdateIsOnClick(isOut)
@@ -509,6 +519,7 @@ end
 --  结束 拖拽事件
 -- 根据牌结束点的位置 判断是出牌还是调整位置  button.xy 和 牌的xy比较
 function M:__OnDragEnd(context)
+    print("lingmeng buyaojina __OnDragEnd")
     if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
     end
@@ -764,13 +775,15 @@ function M:GetHandCardPos(cards_view, cards)
     local start_x = middle_x - (cards / 2 * (card_width))
     x = start_x + (card_width) * (cards_view.index_X - 1)
 
-    if self:getCardSize() == 1 then
-        y = 90 - (85 * cards_view.index_Y)
-    elseif self:getCardSize() == 1.2 then
-        y = 90 - (110 * cards_view.index_Y)
-    elseif self:getCardSize() == 0.8 then
-        y = 100 - (65 * cards_view.index_Y)
-    end
+    local card_height = self.card_hight
+    y = 90 - card_height * 0.66 * cards_view.index_Y
+    -- if self:getCardSize() == 1.4 then
+    --     y = 90 - (85 * cards_view.index_Y)
+    -- elseif self:getCardSize() == 1.2 then
+    --     y = 90 - (110 * cards_view.index_Y)
+    -- elseif self:getCardSize() == 0.8 then
+    --     y = 100 - (65 * cards_view.index_Y)
+    -- end
     return Vector2.New(x, y)
 end
 
@@ -910,7 +923,7 @@ function M:getCardSize()
     if self._room.change_card_size ~= nil then
         return self._room.change_card_size
     else
-        return 1
+        return 1.2
     end
 end
 

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

@@ -27,9 +27,9 @@ function ZPSettingView.new(blur_view, index, open_social,cardIndex)
     self.cd_time = 0
     self._btn_dismiss_room_enable = false
     self._close_destroy = true
-    self.bigSize = 1.2
-    self.mediumSize = 1
-    self.smallSize = 0.8
+    self.bigSize = 1.4
+    self.mediumSize = 1.2
+    self.smallSize = 1.2
     self._full = true
     self._anim_pop = 2
     self._open_social = open_social
@@ -78,7 +78,6 @@ function M:init(url)
 
     local size = self._view:GetController('size')
     if room.change_card_size ~= nil then
-        
         if room.change_card_size == self.bigSize then
             size.selectedIndex = 0
         elseif room.change_card_size == self.mediumSize then
@@ -235,6 +234,7 @@ function M:Show()
     self:UpdateIndex()
     self:UpdateCardSizeIndex()
 end
+
 --根据存的数据改变设置里面的控制器
 
 function M:UpdateIndex()
@@ -257,6 +257,7 @@ function M:UpdateIndex()
         end
     end
 end
+
 function M:UpdateCardSizeIndex()
     local room = DataManager.CurrenRoom
     local size = self._view:GetController('size')
@@ -321,6 +322,7 @@ function M:FillBgSection(cb, game_id, default_bg, room, qihu)
         end
     end
 end
+
 function M:Destroy()
     local bg_id = self._view:GetController('bg').selectedIndex + 1
     if self._bg ~= bg_id then

wb_new_ui/.objs/metas/v6yvqp7w/voqg1dy.info

@@ -0,0 +1,19 @@
+{
+  "objectStatus": {
+    "n50_mk2u": {
+      "collapsed": true
+    },
+    "n46_mk2u": {
+      "hidden": true
+    },
+    "n60_mk2u": {
+      "hidden": true
+    },
+    "n45_mk2u": {
+      "hidden": true
+    },
+    "n65_mk2u": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 297,
+  "libview.firstColumnWidth": 522,
   "expanded_nodes": [
     "27vd145b",
     "/",
@@ -8,42 +8,36 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://2d9xdj6zfn7fao",
-    "ui://m7iejg4610snh5j",
-    "ui://m7iejg46kwi0hk0",
-    "ui://v0j9abjygq7m8f",
-    "ui://m7iejg46giw8hf7",
-    "ui://m7iejg46jiu8hef",
-    "ui://m7iejg46kwi0hma",
-    "ui://v6yvqp7wf55qwa",
-    "ui://v6yvqp7wf55qw5",
-    "ui://v6yvqp7wf55qvx",
-    "ui://m7iejg46kwi0hm5",
-    "ui://v6yvqp7wf55qw4",
-    "ui://2d9xdj6zm16m7dqt",
-    "ui://ppu1wv76j4mf9j",
-    "ui://ppu1wv76j4mf9k",
-    "ui://ppu1wv7699wej",
-    "ui://ppu1wv76j4mf9d",
-    "ui://ppu1wv76j4mf9e",
-    "ui://2d9xdj6zoviicm0"
+    "ui://v6yvqp7wyfzf1h4",
+    "ui://v6yvqp7wcyprwq",
+    "ui://v6yvqp7wlvh412c"
   ],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://v0j9abjygq7m8f",
+  "doc.activeDoc": "ui://v6yvqp7wcyprwq",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "v0j9abjy",
-    "/",
-    "v0j9abjy",
-    "/Main_style_2/",
     "v6yvqp7w",
     "/",
     "v6yvqp7w",
     "/component/",
     "v6yvqp7w",
-    "/image/"
+    "/component/cards/",
+    "v6yvqp7w",
+    "/component/option/",
+    "v6yvqp7w",
+    "/component/option/component/",
+    "v6yvqp7w",
+    "/component/option/component/card/",
+    "v6yvqp7w",
+    "/image/",
+    "v6yvqp7w",
+    "/images/",
+    "v6yvqp7w",
+    "/images/cards6/",
+    "v6yvqp7w",
+    "/images/cards8/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Main_RunBeard/component/cards/Btn_Card.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="88,110" extention="Button">
+<component size="97,287" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="Kan" pages="0,,1," selected="0"/>
   <controller name="mark_ting" pages="0,,1," selected="0"/>
+  <controller name="touch" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_lsou" name="icon" xy="0,0" size="88,110" autoSize="true"/>
-    <image id="n6_g098" name="n6" src="cyprwr" xy="0,0" size="88,110">
+    <loader id="n4_lsou" name="icon" xy="0,0" size="97,287" url="ui://v6yvqp7wlvh410b" autoSize="true" clearOnPublish="true"/>
+    <image id="n6_g098" name="n6" src="cyprwr" fileName="component/cards/images/00(1).png" xy="0,0" size="97,287">
       <gearDisplay controller="Kan" pages="1"/>
       <relation target="n4_lsou" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_cypr" name="n7" src="cyprws" xy="60,0">
+    <image id="n7_cypr" name="n7" src="cyprws" fileName="component/cards/images/tips.png" xy="59,0" size="37,79">
       <gearDisplay controller="mark_ting" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,right-right,top-top"/>
     </image>
   </displayList>
   <Button/>
+  <relation target="n4_lsou" sidePair="rightext-right,bottomext-bottom"/>
 </component>

wb_new_ui/assets/Main_RunBeard/component/option/component/card/Btn_Card.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="83,106" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="Kan" pages="0,,1," selected="1"/>
+  <controller name="Kan" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n3_hp0b" name="icon" xy="-3,2" size="86,104" url="ui://v6yvqp7wlr5dg" autoSize="true">
       <gearXY controller="button" pages="1" values="-3,-22" default="-3,2" tween="true"/>

wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml

@@ -32,41 +32,41 @@
     <component id="n38_mk2u" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="307,139" size="347,45" group="n41_mk2u">
       <Slider value="50" max="100"/>
     </component>
-    <text id="n39_mk2u" name="n39" xy="140,212" size="149,47" group="n41_mk2u" fontSize="34" color="#5c3c16" text="背景音乐:"/>
-    <text id="n40_mk2u" name="n40" xy="140,143" size="149,47" group="n41_mk2u" fontSize="34" color="#5c3c16" text="游戏音效:"/>
+    <text id="n39_mk2u" name="n39" xy="140,212" size="149,46" group="n41_mk2u" fontSize="34" color="#5c3c16" text="背景音乐:"/>
+    <text id="n40_mk2u" name="n40" xy="140,143" size="149,46" group="n41_mk2u" fontSize="34" color="#5c3c16" text="游戏音效:"/>
     <component id="n84_fgao" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="307,210" size="347,45" group="n41_mk2u">
       <Slider value="50" max="100"/>
     </component>
     <group id="n41_mk2u" name="n41" xy="140,139" size="514,116" group="n58_mk2u" advanced="true"/>
-    <image id="n44_mk2u" name="n44" src="mk2u13b" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="136,467" size="72,90" group="n50_mk2u"/>
-    <image id="n45_mk2u" name="n45" src="mk2u13c" fileName="component/Main/setting/images/setting/zipai_font_02.png" xy="338,466" size="72,91" group="n50_mk2u"/>
-    <image id="n46_mk2u" name="n46" src="mk2u13d" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="140,586" size="71,89" group="n50_mk2u" visible="false"/>
-    <image id="n47_mk2u" name="n47" src="mk2u13e" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="543,469" size="68,88" group="n50_mk2u"/>
-    <component id="n59_mk2u" name="n59" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="214,490" size="123,47" group="n50_mk2u">
+    <image id="n44_mk2u" name="n44" src="mk2u13b" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="184,468" size="72,90" group="n50_mk2u"/>
+    <image id="n45_mk2u" name="n45" src="mk2u13c" fileName="component/Main/setting/images/setting/zipai_font_02.png" xy="432,467" size="72,91" group="n50_mk2u" visible="false"/>
+    <image id="n46_mk2u" name="n46" src="mk2u13d" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="234,587" size="71,89" group="n50_mk2u" visible="false"/>
+    <image id="n47_mk2u" name="n47" src="mk2u13e" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="417,470" size="68,88" group="n50_mk2u"/>
+    <component id="n59_mk2u" name="n59" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="262,491" size="123,47" group="n50_mk2u">
       <Button checked="true" controller="cards" page="0"/>
     </component>
-    <component id="n60_mk2u" name="n60" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="423,490" size="71,47" group="n50_mk2u">
+    <component id="n60_mk2u" name="n60" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="517,491" size="71,47" group="n50_mk2u" visible="false">
       <Button controller="cards" page="1"/>
     </component>
-    <component id="n61_mk2u" name="n61" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="218,609" size="69,47" group="n50_mk2u" visible="false">
+    <component id="n61_mk2u" name="n61" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="312,610" size="69,47" group="n50_mk2u" visible="false">
       <Button controller="cards" page="2"/>
     </component>
-    <component id="n62_mk2u" name="n62" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="613,489" size="123,47" group="n50_mk2u">
+    <component id="n62_mk2u" name="n62" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="487,490" size="123,47" group="n50_mk2u">
       <Button controller="cards" page="3"/>
     </component>
-    <group id="n50_mk2u" name="n50" xy="136,466" size="600,209" group="n58_mk2u" advanced="true">
+    <group id="n50_mk2u" name="n50" xy="184,467" size="426,209" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n66_mk2u" name="n66" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="229,615" size="123,47" group="n54_mk2u">
+    <component id="n66_mk2u" name="n66" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="262,615" size="123,47" group="n54_mk2u">
       <Button checked="true" title="大" titleColor="#5c3c16" titleFontSize="34" controller="size" page="0"/>
     </component>
-    <component id="n64_mk2u" name="n64" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="365,615" size="123,47" group="n54_mk2u">
+    <component id="n64_mk2u" name="n64" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="488,615" size="123,47" group="n54_mk2u">
       <Button title="中" titleColor="#5c3c16" titleFontSize="34" controller="size" page="1"/>
     </component>
-    <component id="n65_mk2u" name="n65" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="500,615" size="123,47" group="n54_mk2u">
+    <component id="n65_mk2u" name="n65" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="533,615" size="123,47" group="n54_mk2u" visible="false">
       <Button title="小" titleColor="#5c3c16" titleFontSize="35" controller="size" page="2"/>
     </component>
-    <group id="n54_mk2u" name="n54" xy="229,615" size="394,47" group="n58_mk2u" advanced="true">
+    <group id="n54_mk2u" name="n54" xy="262,615" size="394,47" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n67_mk2u" name="n67" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="234,1041" size="214,57" group="n57_mk2u">
@@ -84,7 +84,7 @@
     <component id="n74_ra9v" name="n74" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="554,1178" size="123,47" group="n76_ra9v">
       <Button title="是" titleColor="#624720" titleFontSize="34" controller="yuyin" page="1"/>
     </component>
-    <text id="n75_ra9v" name="n75" xy="169,1178" size="208,47" group="n76_ra9v" fontSize="34" color="#5c3c16" text="禁止接收语音"/>
+    <text id="n75_ra9v" name="n75" xy="169,1178" size="208,46" group="n76_ra9v" fontSize="34" color="#5c3c16" text="禁止接收语音"/>
     <group id="n76_ra9v" name="n76" xy="169,1178" size="508,47" group="n78_ra9v"/>
     <component id="n70_ra9v" name="n70" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="432,1112" size="123,47" group="n77_ra9v">
       <Button checked="true" title="否" titleColor="#5c3c16" titleFontSize="34" controller="chupai" page="0"/>
@@ -92,7 +92,7 @@
     <component id="n71_ra9v" name="n71" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="554,1112" size="123,47" group="n77_ra9v">
       <Button title="是" titleColor="#5c3c16" titleFontSize="34" controller="chupai" page="1"/>
     </component>
-    <text id="n72_ra9v" name="n72" xy="169,1116" size="208,47" group="n77_ra9v" fontSize="34" color="#5c3c16" text="开启快速吃牌"/>
+    <text id="n72_ra9v" name="n72" xy="169,1116" size="208,46" group="n77_ra9v" fontSize="34" color="#5c3c16" text="开启快速吃牌"/>
     <group id="n77_ra9v" name="n77" xy="169,1112" size="508,47" group="n78_ra9v"/>
     <group id="n78_ra9v" name="n78" xy="169,1112" size="508,113" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>

wb_new_ui/assets/Main_RunBeard/package.xml

@@ -878,6 +878,46 @@
     <image id="hwlt1hr" name="1_05.png" path="/component/Main/images/"/>
     <component id="hwlt1hs" name="btn_backdetail.xml" path="/component/option/" exported="true"/>
     <component id="hwlt1ht" name="hideback.xml" path="/component/option/"/>
+    <image id="daaw1hu" name="204_6_101.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1hv" name="204_6_208.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1hw" name="204_6_207.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1hx" name="204_6_206.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1hy" name="204_6_205.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1hz" name="204_6_204.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i0" name="204_6_203.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i1" name="204_6_202.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i2" name="204_6_201.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i3" name="204_6_110.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i4" name="204_6_109.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i5" name="204_6_108.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i6" name="204_6_107.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i7" name="204_6_106.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i8" name="204_6_105.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1i9" name="204_6_104.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1ia" name="204_6_103.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1ib" name="204_6_102.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1ic" name="204_6_209.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1id" name="204_6_210.png" path="/images/cards6/" exported="true"/>
+    <image id="daaw1ie" name="203_8_201(1).png" path="/images/cards8/"/>
+    <image id="daaw1if" name="204_8_208.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1ig" name="204_8_207.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1ih" name="204_8_206.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1ii" name="204_8_205.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1ij" name="204_8_204.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1ik" name="204_8_203.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1il" name="204_8_202.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1im" name="204_8_201.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1in" name="204_8_110.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1io" name="203_8_209(1).png" path="/images/cards8/"/>
+    <image id="daaw1ip" name="203_8_208(1).png" path="/images/cards8/"/>
+    <image id="daaw1iq" name="203_8_207(1).png" path="/images/cards8/"/>
+    <image id="daaw1ir" name="203_8_206(1).png" path="/images/cards8/"/>
+    <image id="daaw1is" name="203_8_205(1).png" path="/images/cards8/"/>
+    <image id="daaw1it" name="203_8_204(1).png" path="/images/cards8/"/>
+    <image id="daaw1iu" name="203_8_203(1).png" path="/images/cards8/"/>
+    <image id="daaw1iv" name="203_8_202(1).png" path="/images/cards8/"/>
+    <image id="daaw1iw" name="204_8_209.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1ix" name="204_8_210.png" path="/images/cards8/" exported="true"/>
   </resources>
   <publish name="Main_RunBeard" path="..\wb_unity_pro\Assets\ART\base\main_zipai\ui" packageCount="2"/>
 </packageDescription>