布局调整，牌的图片替换

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

@@ -534,7 +534,7 @@ function M:UpdateOutLine()
     elseif self:getCardSize() == 2 then
         self._data_outLinePos = 160 - (195 * 3)
     end
-    self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height
+    self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 80
 end
 
 function M:UpdateIsOnClick(isOut)
@@ -795,7 +795,7 @@ end
 --计算手牌位置
 function M:GetHandCardPos(cards_view, cards)
     local x, y = 0, 0
-    local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) - 2 -- 牌的宽度
+    local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) + 4 -- 牌的宽度
 
     local middle_x = self._area_handcard_list.width / 2
     local start_x = middle_x - (cards / 2 * (card_width))
@@ -814,9 +814,9 @@ function M:GetHandCardPos(cards_view, cards)
     elseif self:getCardSize() == 1.6 then
         y = 100 - (147 * cards_view.index_Y)
     elseif self:getCardSize() == 1.8 then
-        y = 100 - (135 * cards_view.index_Y)
+        y = 105 - (162 * cards_view.index_Y)
     elseif self:getCardSize() == 2 then
-        y = 100 - (150 * cards_view.index_Y)
+        y = 105 - (180 * cards_view.index_Y)
     end
     return Vector2.New(x, y)
 end

wb_new_ui/.objs/workspace.json

@@ -6,18 +6,18 @@
     "ui://lkq9ne9speuq5a",
     "ui://lkq9ne9speuq59",
     "ui://lkq9ne9speuq6p",
+    "ui://lkq9ne9speuqc",
     "ui://lkq9ne9ssyh3rk",
     "ui://lkq9ne9speuq3",
     "ui://lkq9ne9speuq9d",
     "ui://lkq9ne9speuq9f",
     "ui://lkq9ne9speuq9",
-    "ui://lkq9ne9speuqcu",
-    "ui://lkq9ne9speuq9n"
+    "ui://lkq9ne9speuqcu"
   ],
   "test.device": "Huawei Mate20",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://lkq9ne9speuq9n",
+  "doc.activeDoc": "ui://lkq9ne9speuqc",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
@@ -29,6 +29,10 @@
     "lkq9ne9s",
     "/buttons/",
     "lkq9ne9s",
+    "/component/",
+    "lkq9ne9s",
+    "/component/option/",
+    "lkq9ne9s",
     "/images/",
     "yzaioi79",
     "/",

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

@@ -119,7 +119,7 @@
     </component>
     <component id="n198_h5b1" name="safe_bg" src="o0c1ru" fileName="component/Main/main_2_safe_bg.xml" xy="2335,0" size="200,1170"/>
     <component id="n193_syh3" name="btn_safe" src="syh3rj" fileName="component/Main/btn_safe.xml" xy="2383,19" size="109,109"/>
-    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="636,14" group="n183_yfzf"/>
+    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="1896,27" group="n183_yfzf"/>
     <component id="n166_o49p" name="btn_back_lobby" src="peuq3r" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="2381,201" size="109,109" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
@@ -132,7 +132,7 @@
     <component id="n168_o49p" name="btn_setting" src="peuq3c" fileName="component/Main/component/Folder/component/phone_info/Btn_setting.xml" xy="2383,380" size="109,109" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <group id="n183_yfzf" name="n183" xy="636,14" size="1856,637" advanced="true">
+    <group id="n183_yfzf" name="n183" xy="1896,27" size="596,624" advanced="true">
       <relation target="" sidePair=""/>
     </group>
   </displayList>

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

@@ -8,7 +8,7 @@
     <list id="n36_lr5d" name="windcard_list" xy="2494,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="1068,201" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="18" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
+    <list id="n35_lr5d" name="area_fz_list" xy="1068,201" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="20" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="rightext-left,topext-bottom,bottomext-bottom,leftext-left"/>
       <item/>
       <item/>
@@ -20,7 +20,7 @@
     <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="16,-177" size="1577,5">
       <gearDisplay controller="chupai" pages="1"/>
     </component>
-    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1178,-851" size="100,100"/>
+    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1178,-869" size="100,100"/>
     <component id="n39_j34t" name="piao0" src="peuq5f" fileName="component/piao/btn_nopiao.xml" xy="668,-20" group="n45_j34t">
       <gearDisplay controller="piao" pages="1,3,4"/>
       <Button controller="piaovalue" page="0"/>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" opaque="false" initName="player_card_info">
   <displayList>
-    <list id="n47_lr5d" name="area_fz_list" xy="84,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="18" align="right" vAlign="bottom"/>
+    <list id="n47_lr5d" name="area_fz_list" xy="84,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="20" align="right" vAlign="bottom"/>
     <list id="n48_lr5d" name="windcard_list" xy="84,350" size="535,530" touchable="false" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw"/>
     <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="264,-55" size="100,100"/>
+    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="289,-26" size="100,100"/>
     <component id="n51_n7o4" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="226,230" size="717,533" touchable="false"/>
   </displayList>
   <transition name="t0">

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

@@ -7,7 +7,7 @@
     <loader id="n1_wyal" name="icon" xy="0,0" size="130,387" url="ui://lkq9ne9speuqb" fill="scale" clearOnPublish="true"/>
   </displayList>
   <transition name="mopai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="148.076,438.809" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="133.508,395.639" duration="7"/>
     <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="40,-60" endValue="0,-1" duration="7"/>
     <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@@ -15,7 +15,7 @@
     <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
   </transition>
   <transition name="mopai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="146.63,434.524" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="130.737,387.426" duration="7"/>
     <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="300,50" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@@ -23,7 +23,7 @@
     <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
   </transition>
   <transition name="mopai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="145.626,431.55" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="131.573,389.905" duration="7"/>
     <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="722,167" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@@ -31,37 +31,37 @@
     <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
   </transition>
   <transition name="cpai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="146.441,433.963" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.57,389.895" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="240,100" endValue="0,0" duration="7"/>
   </transition>
   <transition name="cpai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="148.163,439.069" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.471,389.603" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-180,280" endValue="0,0" duration="7"/>
   </transition>
   <transition name="cpai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="145.577,431.406" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.6,389.987" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-536,162" endValue="0,0" duration="7"/>
   </transition>
   <transition name="mopai4">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="145.112,430.025" duration="5"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="131.559,389.862" duration="5"/>
     <item time="0" type="Size" target="n2_ddb9" tween="true" startValue="31.2,56.19" endValue="240.996,552.874" duration="5"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-250,0" endValue="0,0" duration="5"/>
     <item time="0" type="XY" target="n2_ddb9" tween="true" startValue="-258,-5" endValue="-56.266,-51.14" duration="5"/>
   </transition>
   <transition name="cpai4">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="147.204,436.228" duration="4"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="132.943,393.966" duration="4"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="295,252" endValue="0,0" duration="4"/>
   </transition>
   <transition name="qipai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="162.954,482.9" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="130.278,386.067" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="216,677" duration="7"/>
   </transition>
   <transition name="qipai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="162.246,480.802" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="132.001,391.173" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="-254,259" duration="7"/>
   </transition>
   <transition name="qipai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="163.242,483.754" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="130.956,388.077" endValue="0,0" duration="7"/>
     <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="466,248" duration="7"/>
   </transition>
 </component>