game 2

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

@@ -57,7 +57,7 @@ function M:InitView(url)
         hx = 15
     end
 
-    ZPMainView.InitView(self, 'ui://Main_RunBeard/Main_' .. _room.room_config.people_num, false, false, 1.2, hx)
+    ZPMainView.InitView(self, 'ui://Main_RunBeard/Main_' .. _room.room_config.people_num, false, false, 2, hx)
 
     self:PlayerChangeLineState()
     SettingView.onEXMainCallback = handler(self, self.UpdateCardDisplay)

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

@@ -520,6 +520,10 @@ function M:UpdateOutLine()
         self._data_outLinePos = 90 - (116 * 3)
     elseif self:getCardSize() == 0.8 then
         self._data_outLinePos = 100 - (93 * 3)
+    elseif self:getCardSize() == 1.5 then
+        self._data_outLinePos = 90 - (143 * 3)
+    elseif self:getCardSize() == 2 then
+        self._data_outLinePos = 110 - (155 * 3)
     end
     self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height
 end
@@ -796,6 +800,10 @@ function M:GetHandCardPos(cards_view, cards)
         y = 90 - (110 * cards_view.index_Y)
     elseif self:getCardSize() == 0.8 then
         y = 100 - (85 * cards_view.index_Y)
+    elseif self:getCardSize() == 1.5 then
+        y = 90 - (137 * cards_view.index_Y)
+    elseif self:getCardSize() == 2 then
+        y = 90 - (182 * cards_view.index_Y)
     end
     return Vector2.New(x, y)
 end

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

@@ -31,7 +31,7 @@
       <relation target="" sidePair="center-center"/>
     </image>
     <loader id="n156_mk2u" name="jiang" xy="456,85" size="65,75" fill="scaleFree"/>
-    <component id="n151_8th3" name="player_card_info2" src="peuq6p" fileName="component/Main/component/Player_card_info_2.xml" xy="159,52" size="343,304">
+    <component id="n151_8th3" name="player_card_info2" src="peuq6p" fileName="component/Main/component/Player_card_info_2.xml" xy="275,52" size="538,402">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n147_nu0l" sidePair="left-left"/>
     </component>

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

@@ -8,17 +8,17 @@
     <list id="n36_lr5d" name="windcard_list" xy="1331,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://lkq9ne9speuq2">
       <relation target="" sidePair="right-right"/>
     </list>
-    <list id="n35_lr5d" name="area_fz_list" xy="547,-304" pivot="0.5,0.5" size="242,135" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="5" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
+    <list id="n35_lr5d" name="area_fz_list" xy="551,-445" pivot="0.5,0.5" 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"/>
     </list>
     <component id="n25" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="123,98" size="1039,118">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
     <component id="n37_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="868,-248" size="5,5"/>
-    <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="116,-158">
+    <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="-298,-158" size="1891,170">
       <gearDisplay controller="chupai" pages="1"/>
     </component>
-    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="963,-452" size="65,84">
+    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1026,-664" size="65,84">
       <relation target="n35_lr5d" sidePair="right-right"/>
     </component>
     <component id="n39_j34t" name="piao0" src="peuq5f" fileName="component/piao/btn_nopiao.xml" xy="226,-126" group="n45_j34t">
@@ -49,13 +49,13 @@
       <Button icon="ui://lkq9ne9speuq5k" selectedIcon="ui://lkq9ne9speuq5k" controller="piaovalue" page="5"/>
     </component>
     <group id="n45_j34t" name="piao" xy="226,-126" size="949,103"/>
-    <component id="n46_cphv" name="daniao" src="peuq5q" fileName="component/niao/btn_niao.xml" xy="248,-115" size="250,90" group="n48_cphv">
+    <component id="n46_cphv" name="daniao" src="peuq5q" fileName="component/niao/btn_niao.xml" xy="216,-113" size="250,90" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <component id="n47_cphv" name="budaniao" src="peuq5s" fileName="component/niao/btn_noniao.xml" xy="862,-115" size="250,90" group="n48_cphv">
+    <component id="n47_cphv" name="budaniao" src="peuq5s" fileName="component/niao/btn_noniao.xml" xy="830,-113" size="250,90" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <group id="n48_cphv" name="niao" xy="248,-115" size="864,90" advanced="true">
+    <group id="n48_cphv" name="niao" xy="216,-113" size="864,90" advanced="true">
       <relation target="" sidePair=""/>
     </group>
   </displayList>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,750" opaque="false" initName="player_card_info">
   <displayList>
-    <list id="n47_lr5d" name="area_fz_list" xy="35,4" pivot="0.5,0.5" size="431,173" rotation="180" layout="row" scroll="horizontal" colGap="5" align="right" vAlign="bottom"/>
-    <list id="n48_lr5d" name="windcard_list" xy="18,196" size="280,78" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
+    <list id="n47_lr5d" name="area_fz_list" xy="4,29" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="5" align="right" vAlign="bottom"/>
+    <list id="n48_lr5d" name="windcard_list" xy="26,322" size="280,530" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
     <component id="n50_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="200,83" size="5,5"/>
-    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="322,19" size="67,182" touchable="false"/>
-    <component id="n51_n7o4" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="214,104" size="300,175" touchable="false"/>
+    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="210,-3" size="930,204" touchable="false"/>
+    <component id="n51_n7o4" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="227,230" size="717,533" touchable="false"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="XY" target="n25" tween="true" startValue="-63,105" endValue="121.45,295" duration="4"/>