解决冲突

wb_new_ui/assets/Main_Majiang/Main_new/Main/Player_card_info_1.xml

@@ -8,8 +8,9 @@
       <gearXY controller="3d" pages="0,1" values="252,-141|517,-145"/>
       <gearSize controller="3d" pages="0,1" values="2022,111,1,1|300,117,1,1"/>
     </component>
-    <component id="n25" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="0,0" pivot="0.5,0.5" size="2400,249" aspect="true">
+    <component id="n25" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="2,2" pivot="0.5,0.5" size="2400,249" aspect="true">
       <relation target="n26" sidePair="leftext-right"/>
+      <relation target="" sidePair="bottom-bottom"/>
     </component>
     <component id="n26" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="0,0" size="11,249"/>
     <text id="n29" name="area_mask" xy="71,-997" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;fz_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;oder3d&quot;:&quot;left_right&quot;,&#xA;    &quot;adjust3d&quot;:0,&#xA;    &quot;comp&quot;:&quot;Fz_0_jiangxi_&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;202_&quot;&#xA;    },&#xA;&quot;handcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;comp_back&quot;:&quot;Back_top_jiangxi&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;comp&quot;:&quot;Mp_self_card_new&quot;&#xA;},&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;left_right&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_self_jiangxi&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;202_&quot;,&#xA;    &quot;multi_oder&quot;:&quot;down_up&quot;,&#xA;    &quot;num&quot;:28,&#xA;    &quot;multi_draw_oder&quot;:1,&#xA;    &quot;num3d&quot;:8,&#xA;    &quot;multi_oder3d&quot;:&quot;up_down&quot;,&#xA;    &quot;sorting_order3d&quot;:1&#xA;    }&#xA;}"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2.xml

@@ -44,9 +44,9 @@
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n118_pkx5" name="player_card_info1" src="pkx5sr" fileName="Main_new/Main/Player_card_info_1.xml" xy="66,915">
+    <component id="n118_pkx5" name="player_card_info1" src="pkx5sr" fileName="Main_new/Main/Player_card_info_1.xml" xy="10,914">
       <gearDisplay controller="state" pages="1,3"/>
-      <relation target="" sidePair="center-center,bottom-bottom"/>
+      <relation target="" sidePair="left-left,bottom-bottom%"/>
     </component>
     <component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="3264,798" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -107,6 +107,7 @@
     </component>
     <component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="9,975">
       <gearDisplay controller="state" pages="1,3,4"/>
+      <relation target="" sidePair="width-width,bottom-bottom"/>
     </component>
     <text id="n176_eqmd" name="remaining_card" xy="759,489" size="358,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="56" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="余999张">
       <gearDisplay controller="state" pages="1,3"/>

wb_unity_pro/Assets/Scripts/Tool.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: af5fd386b2b51a24c956d3eb18c7bbc3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: