diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
index f972e270..acc62358 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
@@ -148,6 +148,7 @@ function M:InitData(over, room, result, total_result, callback)
         )
 
         -- 自动跳转
+        
          coroutine.start(
                 function()
                     coroutine.wait(3)
diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png
index e078dbbb..85f03107 100644
Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes
index f8239774..8d46756e 100644
Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ
diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png
index ab4b6654..78256ea4 100644
Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes
index 56e7d1a4..b821e7f0 100644
Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml
index 9fbf6da5..7c84d70b 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml
@@ -2,38 +2,22 @@
 <component size="270,240" extention="Button">
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-<<<<<<< HEAD
-    <component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="8,13" size="250,221"/>
-    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="100,131" size="104,126" scale="0.7,0.7" visible="false">
-      <relation target="" sidePair="center-center%"/>
-      <Button title=" " icon="ui://m7iejg46h60mhyq"/>
-    </component>
-    <text id="n53_n96g" name="tex_round" xy="116,91" size="44,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
-=======
-    <component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="-6,27"/>
+    <component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="13,21"/>
     <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,131" size="104,126" scale="0.7,0.7" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
     <text id="n53_n96g" name="tex_round" xy="116,91" size="43,31" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="8/1">
->>>>>>> 65128f05d0c0b1dfb1cbad90a1d1ef8eb1f8f281
       <relation target="" sidePair="center-center,middle-middle"/>
-      <relation target="n52_n96g" sidePair="top-bottom"/>
     </text>
-    <text id="n52_n96g" name="tex_gamename" xy="72,61" size="129,34" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="height" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
-      <relation target="" sidePair="center-center,top-top%"/>
+    <text id="n52_n96g" name="tex_gamename" xy="72,61" size="129,35" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-<<<<<<< HEAD
-    <text id="n54_hugj" name="tex_limit" xy="123,131" size="27,26" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
-=======
     <text id="n54_hugj" name="tex_limit" xy="123,132" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
->>>>>>> 65128f05d0c0b1dfb1cbad90a1d1ef8eb1f8f281
       <relation target="" sidePair="center-center,middle-middle"/>
-      <relation target="n56_ilon" sidePair="center-center,middle-middle"/>
     </text>
     <image id="n56_ilon" name="n56" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="119,127">
       <relation target="" sidePair="center-center,middle-middle"/>
-      <relation target="n53_n96g" sidePair="top-bottom"/>
     </image>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
diff --git a/wb_unity_pro_2/Library/ArtifactDB b/wb_unity_pro_2/Library/ArtifactDB
index 570293f6..90307670 100644
Binary files a/wb_unity_pro_2/Library/ArtifactDB and b/wb_unity_pro_2/Library/ArtifactDB differ
diff --git a/wb_unity_pro_2/Library/Artifacts/33/33b810b332f8db1daf265a4a1d63bfdc b/wb_unity_pro_2/Library/Artifacts/33/33b810b332f8db1daf265a4a1d63bfdc
deleted file mode 100644
index 20c5db34..00000000
Binary files a/wb_unity_pro_2/Library/Artifacts/33/33b810b332f8db1daf265a4a1d63bfdc and /dev/null differ
diff --git a/wb_unity_pro_2/Library/Artifacts/3f/3f7ef73cd1186e367ac6a01894479e74 b/wb_unity_pro_2/Library/Artifacts/3f/3f7ef73cd1186e367ac6a01894479e74
deleted file mode 100644
index fa99400f..00000000
Binary files a/wb_unity_pro_2/Library/Artifacts/3f/3f7ef73cd1186e367ac6a01894479e74 and /dev/null differ
diff --git a/wb_unity_pro_2/Library/Artifacts/40/4080be33ed97b606ea5ae6ee2eed2c15 b/wb_unity_pro_2/Library/Artifacts/40/4080be33ed97b606ea5ae6ee2eed2c15
deleted file mode 100644
index 73119723..00000000
Binary files a/wb_unity_pro_2/Library/Artifacts/40/4080be33ed97b606ea5ae6ee2eed2c15 and /dev/null differ
diff --git a/wb_unity_pro_2/Library/Artifacts/51/51d2ca22d148c4fbcc244abf9c9e9d00 b/wb_unity_pro_2/Library/Artifacts/51/51d2ca22d148c4fbcc244abf9c9e9d00
deleted file mode 100644
index 250857b7..00000000
Binary files a/wb_unity_pro_2/Library/Artifacts/51/51d2ca22d148c4fbcc244abf9c9e9d00 and /dev/null differ
diff --git a/wb_unity_pro_2/Library/Artifacts/c8/c80ed4f727a0ef774f809b5c6e1663c1 b/wb_unity_pro_2/Library/Artifacts/c8/c80ed4f727a0ef774f809b5c6e1663c1
deleted file mode 100644
index 496609b2..00000000
Binary files a/wb_unity_pro_2/Library/Artifacts/c8/c80ed4f727a0ef774f809b5c6e1663c1 and /dev/null differ
diff --git a/wb_unity_pro_2/Library/Artifacts/e1/e143be2a9acd27cbb1f44297c4ef0cfc b/wb_unity_pro_2/Library/Artifacts/e1/e143be2a9acd27cbb1f44297c4ef0cfc
deleted file mode 100644
index 42febd7b..00000000
Binary files a/wb_unity_pro_2/Library/Artifacts/e1/e143be2a9acd27cbb1f44297c4ef0cfc and /dev/null differ
diff --git a/wb_unity_pro_2/Library/CurrentLayout-default.dwlt b/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
index 8e042d31..602a8367 100644
--- a/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
+++ b/wb_unity_pro_2/Library/CurrentLayout-default.dwlt
@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 66
+    x: -8.666667
     y: 58
     width: 906
     height: 854.6667
@@ -51,7 +51,7 @@ MonoBehaviour:
   - {fileID: 10}
   - {fileID: 11}
   m_Selected: 0
-  m_LastSelected: 2
+  m_LastSelected: 1
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -216,7 +216,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 66
+    x: -8.666667
     y: 471.33334
     width: 906
     height: 401
@@ -242,17 +242,17 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 409
-    width: 1126
-    height: 353
+    x: -8.666667
+    y: 471.33334
+    width: 906
+    height: 401
   m_ViewDataDictionary: {fileID: 0}
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 60fbffff
+      m_ExpandedIDs: ac96c5ffc496c5ff4a9ac5ff5c9ac5ff6a9ac5ff1265c6ffdc65c6ffee65c6ff2c6feaff6a73eaff7c73eaff8a73eaff0890eaff0c90eaff9ebef7ff68bff7ff7abff7ff60fbfffff4ffffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -268,7 +268,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 2}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -432,7 +432,7 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 66
+    x: -8.666667
     y: 88
     width: 906
     height: 362
@@ -524,10 +524,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 72.66667
-    width: 1186
-    height: 597
+    x: -8.666667
+    y: 88
+    width: 906
+    height: 362
   m_ViewDataDictionary: {fileID: 0}
   m_ShowContextualTools: 0
   m_WindowGUID: f873ccafec97ed441a3bee2c6f85cf99
@@ -539,9 +539,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 4.0907955, y: -1.5935472, z: -0.60360384}
+    m_Target: {x: -1.746438, y: -1.1915895, z: -1.0382763}
     speed: 2
-    m_Value: {x: 4.0907955, y: -1.5935472, z: -0.60360384}
+    m_Value: {x: -1.746438, y: -1.1915895, z: -1.0382763}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -591,9 +591,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 5.594339
+    m_Target: 9.469742
     speed: 2
-    m_Value: 5.594339
+    m_Value: 9.469742
   m_Ortho:
     m_Target: 1
     speed: 2
diff --git a/wb_unity_pro_2/Library/SceneVisibilityState.asset b/wb_unity_pro_2/Library/SceneVisibilityState.asset
index 98749ca5..86cae906 100644
Binary files a/wb_unity_pro_2/Library/SceneVisibilityState.asset and b/wb_unity_pro_2/Library/SceneVisibilityState.asset differ
diff --git a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll
index 79fdef7a..7714ae15 100644
Binary files a/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll and b/wb_unity_pro_2/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/wb_unity_pro_2/Library/SourceAssetDB b/wb_unity_pro_2/Library/SourceAssetDB
index d3d450b5..5a689a75 100644
Binary files a/wb_unity_pro_2/Library/SourceAssetDB and b/wb_unity_pro_2/Library/SourceAssetDB differ
diff --git a/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json b/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
index ae9e3c84..eb7b9bde 100644
--- a/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
+++ b/wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json
@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3828052,-3828028,-3827126,-3827108,-3827094,-3775214,-3775012,-3774994,-1413332,-1412246,-1412228,-1412214,-1404920,-1404916,-541026,-540824,-540806,-1184,-12],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
index ab5e9c24..e69de29b 100644
--- a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -1,2 +0,0 @@
-Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
-Cmd: initializeCompiler
diff --git a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe1.log b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe1.log
index e69de29b..86906963 100644
--- a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe1.log
+++ b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe1.log
@@ -0,0 +1,6 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+Cmd: compileSnippet
+  api=4 type=0 insize=2726 outsize=886 kw=GRAYED CLIPPED pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
+
+Quitting shader compiler process
diff --git a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe2.log b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe2.log
index e69de29b..5d1aed45 100644
--- a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe2.log
+++ b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe2.log
@@ -0,0 +1,6 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+Cmd: compileSnippet
+  api=4 type=1 insize=2726 outsize=590 kw=GRAYED CLIPPED pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
+
+Quitting shader compiler process