diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index 67177b0f..4240e24f 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -269,8 +269,13 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
         local outcard = self._view_outCardList:AddItemFromPool()
         self:fillCard2(outcard, outCardName, outlist[i + 1])
         if cursor and i == #outlist - 1 then
-            outcard:AddChild(cursor)
-            cursor:Center()
+            Timer.New(function()
+                self._view:AddChild(cursor)
+                -- GRoot.inst:AddChild(cursor)
+                cursor.xy = self._view_outCardList.xy +
+                    self._view_outCardList:GlobalToLocal(outcard:LocalToGlobal(Vector2.New(outcard.width * 0.5,
+                        outcard.height * 0.5)))
+            end, Time.deltaTime, 1, false):Start()
         end
     end
 end
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml
index a30060d2..e0aaa0e6 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="117,117" pivot="0.5,0.5">
+<component size="117,117" pivot="0.5,0.5" overflow="hidden">
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,0" url="ui://Main_Majiang/b202_101" fill="scale">
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml
index 05b5638e..6d27ad49 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml
@@ -3,9 +3,9 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
-  <controller name="getCard" pages="0,,1," selected="1"/>
+  <controller name="getCard" pages="0,,1," selected="0"/>
   <controller name="seletedGetCard" pages="0,,1," selected="0"/>
-  <controller name="tip" pages="0,,1," selected="1"/>
+  <controller name="tip" pages="0,,1," selected="0"/>
   <controller name="showGuoHu" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
@@ -46,7 +46,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n35_gi99" name="List_OutCard" xy="304,-555" pivot="0.5,0.5" size="2079,502" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
+    <list id="n35_gi99" name="List_OutCard" xy="304,-555" pivot="0.5,0.5" size="2079,502" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" margin="0,40,0,0" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
       <item/>
       <item/>
       <item/>
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml
index c04b467d..80845505 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml
@@ -3,7 +3,7 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
-  <controller name="getCard" pages="0,,1," selected="1"/>
+  <controller name="getCard" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
       <gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@@ -44,7 +44,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="-84,173" pivot="0.5,0.5" size="2079,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
+    <list id="n41_gi99" name="List_OutCard" xy="-84,133" pivot="0.5,0.5" size="2079,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
       <item/>
       <item/>
       <item/>
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
index 10d47715..e8c566a4 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" pivot="0.5,0.5">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -9,7 +9,7 @@
   <controller name="more" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
-  <controller name="cHuCardEffect" pages="0,,1," selected="1">
+  <controller name="cHuCardEffect" pages="0,,1," selected="0">
     <remark page="0" value="关"/>
     <remark page="1" value="开"/>
   </controller>
@@ -131,23 +131,23 @@
     <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
+      <gearXY controller="state" pages="0,1,2" values="1189,909|100,796|1183,909" default="1183,909"/>
       <gearSize controller="state" pages="0,1" values="153,132,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="56,796" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="56,796|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,223|1834,63|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,37" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,37|1740,46|1752,62" default="1192,928"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -260,10 +260,10 @@
     <group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
       <gearDisplay controller="voice" pages="1"/>
     </group>
-    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,848" group="n59_v38k">
+    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,847" group="n59_v38k">
       <gearDisplay controller="state" pages="3"/>
     </component>
-    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1140,904" group="n59_v38k">
+    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1140,903" group="n59_v38k">
       <relation target="" sidePair="center-center"/>
     </component>
     <group id="n59_v38k" name="huifang" xy="0,848" size="2532,165"/>
diff --git a/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml b/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml
index 6e814edb..08ec7e5a 100644
--- a/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1,1">
+<component size="1,1" pivot="0.5,0.5">
   <displayList>
-    <image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-27,-150" scale="1.5,1.5"/>
+    <image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-25,-66" size="51,67" aspect="true"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Icon" target="n0" value=""/>
-    <item time="0" type="XY" target="n0" tween="true" startValue="-27,-110" endValue="-27,-83" duration="12" ease="Linear"/>
-    <item time="12" type="XY" target="n0" tween="true" startValue="-27,-83" endValue="-27,-110" duration="12" ease="Linear"/>
-    <item time="24" type="XY" target="n0" value="-27,-110"/>
+    <item time="0" type="XY" target="n0" tween="true" startValue="-,-108" endValue="-,-81" duration="12" ease="Linear"/>
+    <item time="12" type="XY" target="n0" tween="true" startValue="-,-81" endValue="-,-108" duration="12" ease="Linear"/>
   </transition>
 </component>
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
index 4e440b60..87a2806d 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 3ad3937da18bb154e8135801fe276a86
+=======
 guid: f5dfe2527407f0847b118e5033b6d3ca
+>>>>>>> 2e92757ba3fe3e5c4b058b254d41c2efd68dec7a
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -88,5 +92,9 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
+<<<<<<< HEAD
+  assetBundleName: 
+=======
   assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+>>>>>>> 2e92757ba3fe3e5c4b058b254d41c2efd68dec7a
   assetBundleVariant: