间距调大，第二服牌拿起的牌加入

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

@@ -90,7 +90,7 @@ 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.4
+            self._room.change_card_size = 1.3
         elseif typeface == 1 then
             self._room.change_card_size = 1.2
         elseif typeface == 2 then
@@ -303,7 +303,7 @@ end
 function M:UpdateCardSize(index)
     print("lingmeng UpdateCardSize")
     if index == 0 then
-        self._room.change_card_size = 1.4
+        self._room.change_card_size = 1.3
     elseif index == 1 then
         self._room.change_card_size = 1.2
     elseif index == 2 then

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

@@ -215,7 +215,6 @@ function M:InitHandCard(isPlayAni, index)
                             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())
                             self.card_width = btn_card.width * self:getCardSize()
                             self.card_hight = btn_card.height * self:getCardSize()
                             local x, y = 500, (j * 85) - 500
@@ -266,7 +265,6 @@ function M:InitHandCard(isPlayAni, index)
                 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())
                 self.card_width = btn_card.width * self:getCardSize()
                 self.card_hight = btn_card.height * self:getCardSize()
                 self._area_handcard_list:AddChild(btn_card)
@@ -770,20 +768,23 @@ end
 --计算手牌位置
 function M:GetHandCardPos(cards_view, cards)
     local x, y = 0, 0
-    local card_width = self.card_width - 5 -- 牌的宽度
+    print("lingmeng change_card_display", card_width)
+    local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) -- 牌的宽度
+    print("lingmeng change_card_display", self.card_width, self._room.change_card_display == "8_", card_width)
+
     local middle_x = self._area_handcard_list.width / 2
     local start_x = middle_x - (cards / 2 * (card_width))
     x = start_x + (card_width) * (cards_view.index_X - 1)
 
-    local card_height = self.card_hight
+    -- local card_height = self.card_hight
-    y = 90 - card_height * 0.66 * cards_view.index_Y
+    -- y = 90 - card_height * 0.66 * cards_view.index_Y
-    -- if self:getCardSize() == 1.4 then
+    if self:getCardSize() == 1.3 then
-    --     y = 90 - (85 * cards_view.index_Y)
+        y = 90 - (119 * cards_view.index_Y)
-    -- elseif self:getCardSize() == 1.2 then
+    elseif self:getCardSize() == 1.2 then
-    --     y = 90 - (110 * cards_view.index_Y)
+        y = 90 - (110 * cards_view.index_Y)
-    -- elseif self:getCardSize() == 0.8 then
+    elseif self:getCardSize() == 0.8 then
-    --     y = 100 - (65 * cards_view.index_Y)
+        y = 100 - (65 * cards_view.index_Y)
-    -- end
+    end
     return Vector2.New(x, y)
 end
 

wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml

@@ -3,7 +3,7 @@
   <controller name="state" pages="0,,1,,2," selected="0"/>
   <controller name="bg" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="cards" pages="0,,1,,2,,3," selected="0"/>
-  <controller name="size" pages="0,,1,,2," selected="1"/>
+  <controller name="size" pages="0,,1,,2," selected="0"/>
   <controller name="fangyan" pages="0,,1," selected="0"/>
   <controller name="yuyin" pages="0,,1," selected="0"/>
   <controller name="chupai" pages="0,,1," selected="0"/>
@@ -12,25 +12,25 @@
     <graph id="n0_mk2u" name="btn_close" xy="-800,859" size="2548,1026" visible="false" touchable="false" type="rect" lineSize="0" fillColor="#00000000">
       <relation target="" sidePair="right-right"/>
     </graph>
-    <component id="n90_voqg" name="btn_dismiss_room" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="1537,1599" size="270,0" group="n135_voqg" hideByEditor="true" visible="false">
+    <component id="n90_voqg" name="btn_dismiss_room" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="1537,1599" size="270,0" group="n135_voqg" visible="false">
       <Button icon="ui://v6yvqp7wmk2u12s"/>
     </component>
-    <text id="n91_voqg" name="n91" xy="1827,1617" size="63,38" group="n135_voqg" hideByEditor="true" visible="false" fontSize="30" color="#624720" vAlign="middle" autoSize="none" text="(30)"/>
+    <text id="n91_voqg" name="n91" xy="1827,1617" size="63,38" group="n135_voqg" visible="false" fontSize="30" color="#624720" vAlign="middle" autoSize="none" text="(30)"/>
-    <component id="n92_voqg" name="btn_quit" src="lwcl2n" fileName="buttons/Button_1.xml" pkg="27vd145b" xy="1118,1860" size="288,0" group="n135_voqg" hideByEditor="true" visible="false" touchable="false">
+    <component id="n92_voqg" name="btn_quit" src="lwcl2n" fileName="buttons/Button_1.xml" pkg="27vd145b" xy="1118,1860" size="288,0" group="n135_voqg" visible="false" touchable="false">
       <Button icon="ui://823o5jy4n6fsh1"/>
     </component>
-    <component id="n93_voqg" name="btn_logout" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="1507,1860" size="298,0" group="n135_voqg" hideByEditor="true" visible="false">
+    <component id="n93_voqg" name="btn_logout" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="1507,1860" size="298,0" group="n135_voqg" visible="false">
       <Button icon="ui://v6yvqp7wmk2u12t"/>
     </component>
     <component id="n94_voqg" name="btn_close22" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1714,759" size="101,100" group="n135_voqg" visible="false" controller="style,0"/>
-    <component id="n96_voqg" name="btn_sound" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="0,0" size="113,0" group="n102_voqg" hideByEditor="true" visible="false">
+    <component id="n96_voqg" name="btn_sound" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="0,0" size="113,0" group="n102_voqg" visible="false">
       <Button icon="ui://v6yvqp7wmk2u132"/>
     </component>
-    <component id="n97_voqg" name="btn_music" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="4,2" size="113,0" group="n102_voqg" hideByEditor="true" visible="false"/>
+    <component id="n97_voqg" name="btn_music" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="4,2" size="113,0" group="n102_voqg" visible="false"/>
-    <component id="n98_voqg" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="213,154" size="347,45" group="n102_voqg" hideByEditor="true" visible="false">
+    <component id="n98_voqg" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="213,154" size="347,45" group="n102_voqg" visible="false">
       <Slider value="50" max="100"/>
     </component>
-    <component id="n101_voqg" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="213,225" size="347,45" group="n102_voqg" hideByEditor="true" visible="false">
+    <component id="n101_voqg" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="213,225" size="347,45" group="n102_voqg" visible="false">
       <Slider value="50" max="100"/>
     </component>
     <group id="n102_voqg" name="n102" xy="0,0" size="560,270" group="n135_voqg" advanced="true"/>
@@ -42,17 +42,11 @@
     <image id="n105_voqg" name="n105" src="mk2u13d" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="1318,1492" group="n111_voqg"/>
     <image id="n106_voqg" name="n106" src="mk2u13e" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="1529,1492" group="n111_voqg" visible="false"/>
     <component id="n107_voqg" name="n107" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1397,1377" group="n111_voqg">
-      <Button checked="true" page="0"/>
+      <Button checked="true"/>
-    </component>
-    <component id="n108_voqg" name="n108" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1615,1377" group="n111_voqg">
-      <Button page="1"/>
-    </component>
-    <component id="n109_voqg" name="n109" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1397,1506" group="n111_voqg">
-      <Button page="2"/>
-    </component>
-    <component id="n110_voqg" name="n110" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1615,1506" group="n111_voqg" visible="false">
-      <Button page="3"/>
     </component>
+    <component id="n108_voqg" name="n108" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1615,1377" group="n111_voqg"/>
+    <component id="n109_voqg" name="n109" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1397,1506" group="n111_voqg"/>
+    <component id="n110_voqg" name="n110" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1615,1506" group="n111_voqg" visible="false"/>
     <group id="n111_voqg" name="n111" xy="1318,1354" size="420,227" group="n135_voqg" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
@@ -69,28 +63,28 @@
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n116_voqg" name="n116" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1362,1936" group="n118_voqg">
-      <Button checked="true" title="方言" titleColor="#624720" titleFontSize="35" page="0"/>
+      <Button checked="true" title="方言" titleColor="#624720" titleFontSize="35"/>
     </component>
     <component id="n117_voqg" name="n117" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1567,1936" group="n118_voqg">
-      <Button title="普通话" titleColor="#624720" titleFontSize="35" page="1"/>
+      <Button title="普通话" titleColor="#624720" titleFontSize="35"/>
     </component>
     <group id="n118_voqg" name="n118" xy="1362,1936" size="328,47" group="n135_voqg" advanced="true"/>
     <component id="n119_voqg" name="n119" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1501,1850" group="n122_voqg">
-      <Button checked="true" title="否" titleColor="#624720" titleFontSize="35" page="0"/>
+      <Button checked="true" title="否" titleColor="#624720" titleFontSize="35"/>
     </component>
     <component id="n120_voqg" name="n120" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1650,1850" group="n122_voqg">
-      <Button title="是" titleColor="#624720" titleFontSize="35" page="1"/>
+      <Button title="是" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <text id="n121_voqg" name="n121" xy="1265,1850" size="191,39" group="n122_voqg" fontSize="30" color="#624920" bold="true" text="禁止接收语音"/>
+    <text id="n121_voqg" name="n121" xy="1265,1850" size="184,42" group="n122_voqg" fontSize="30" color="#624920" bold="true" text="禁止接收语音"/>
-    <group id="n122_voqg" name="n122" xy="1265,1850" size="508,47" group="n127_voqg" collapsed="true"/>
+    <group id="n122_voqg" name="n122" xy="1265,1850" size="508,47" group="n127_voqg"/>
     <component id="n123_voqg" name="n123" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1501,1784" group="n126_voqg">
-      <Button checked="true" title="否" titleColor="#624720" titleFontSize="35" page="0"/>
+      <Button checked="true" title="否" titleColor="#624720" titleFontSize="35"/>
     </component>
     <component id="n124_voqg" name="n124" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1650,1784" group="n126_voqg">
-      <Button title="是" titleColor="#624720" titleFontSize="35" page="1"/>
+      <Button title="是" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <text id="n125_voqg" name="n125" xy="1265,1788" size="191,39" group="n126_voqg" fontSize="30" color="#624920" bold="true" text="开启快速吃牌"/>
+    <text id="n125_voqg" name="n125" xy="1265,1788" size="184,42" group="n126_voqg" fontSize="30" color="#624920" bold="true" text="开启快速吃牌"/>
-    <group id="n126_voqg" name="n126" xy="1265,1784" size="508,47" group="n127_voqg" collapsed="true"/>
+    <group id="n126_voqg" name="n126" xy="1265,1784" size="508,47" group="n127_voqg"/>
     <group id="n127_voqg" name="n127" xy="1265,1784" size="508,113" group="n135_voqg" advanced="true"/>
     <image id="n128_voqg" name="n128" src="fgao1do" fileName="component/setting/images/newsetting/szbt_img.png" xy="1364,767" group="n130_voqg"/>
     <image id="n129_voqg" name="n129" src="fgao1dp" fileName="component/setting/images/newsetting/szz_img.png" xy="1471,785" group="n130_voqg"/>

wb_new_ui/assets/Main_RunBeard/package.xml

@@ -898,26 +898,26 @@
     <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="daaw1iy" name="204_8_101.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1if" name="204_8_208.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1iz" 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="daaw1j0" 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="daaw1j1" 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="daaw1j2" 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="daaw1j3" 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="daaw1j4" 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="daaw1j5" 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="daaw1j6" 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="daaw1j7" name="204_8_110.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1io" name="203_8_209(1).png" path="/images/cards8/"/>
+    <image id="daaw1j8" name="204_8_109.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1ip" name="203_8_208(1).png" path="/images/cards8/"/>
+    <image id="daaw1j9" name="204_8_108.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1iq" name="203_8_207(1).png" path="/images/cards8/"/>
+    <image id="daaw1ja" name="204_8_107.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1ir" name="203_8_206(1).png" path="/images/cards8/"/>
+    <image id="daaw1jb" name="204_8_106.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1is" name="203_8_205(1).png" path="/images/cards8/"/>
+    <image id="daaw1jc" name="204_8_105.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1it" name="203_8_204(1).png" path="/images/cards8/"/>
+    <image id="daaw1jd" name="204_8_104.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1iu" name="203_8_203(1).png" path="/images/cards8/"/>
+    <image id="daaw1je" name="204_8_103.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1iv" name="203_8_202(1).png" path="/images/cards8/"/>
+    <image id="daaw1jf" name="204_8_102.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1iw" name="204_8_209.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1jg" name="204_8_209.png" path="/images/cards8/" exported="true"/>
-    <image id="daaw1ix" name="204_8_210.png" path="/images/cards8/" exported="true"/>
+    <image id="daaw1jh" 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>