diff --git a/Assets/MMOModule/Resources/MMOUI/MMOUISkinPiece.prefab b/Assets/MMOModule/Resources/MMOUI/MMOUISkinPiece.prefab
index acf0127f..ee7f9465 100644
--- a/Assets/MMOModule/Resources/MMOUI/MMOUISkinPiece.prefab
+++ b/Assets/MMOModule/Resources/MMOUI/MMOUISkinPiece.prefab
@@ -63,6 +63,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -137,6 +138,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.1882353, g: 0.23137255, b: 0.23921569, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -252,17 +254,18 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
+    m_FontSize: 25
     m_FontStyle: 1
     m_BestFit: 1
-    m_MinSize: 18
-    m_MaxSize: 25
+    m_MinSize: 2
+    m_MaxSize: 35
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -331,6 +334,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -405,6 +409,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -481,6 +486,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -555,6 +561,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -630,6 +637,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -704,6 +712,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -778,6 +787,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -852,6 +862,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -930,6 +941,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1055,6 +1067,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1135,6 +1148,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1163,6 +1177,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1253,6 +1268,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1415,6 +1431,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1443,6 +1460,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1533,6 +1551,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1607,6 +1626,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1718,6 +1738,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1795,6 +1816,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1869,6 +1891,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
diff --git a/Assets/MMOModule/Scripts/MMOCore/MMOUIMgr/MMOUIBase.cs b/Assets/MMOModule/Scripts/MMOCore/MMOUIMgr/MMOUIBase.cs
index 0b1af4b8..4519683a 100644
--- a/Assets/MMOModule/Scripts/MMOCore/MMOUIMgr/MMOUIBase.cs
+++ b/Assets/MMOModule/Scripts/MMOCore/MMOUIMgr/MMOUIBase.cs
@@ -90,7 +90,7 @@ namespace MMO
                     }
                 }
 
-                if (Mathf.Abs((float)Screen.height / Screen.width - 2436 / 1125f) <= 0.01f)
+                if (((float)Screen.height / Screen.width) > 1.95f)
                     return true;
 
                 return false;
diff --git a/Assets/MMOModule/Scripts/MMOModule.cs b/Assets/MMOModule/Scripts/MMOModule.cs
index 50d8341b..9bb551a0 100644
--- a/Assets/MMOModule/Scripts/MMOModule.cs
+++ b/Assets/MMOModule/Scripts/MMOModule.cs
@@ -172,8 +172,6 @@ public partial class MMOModule : MonoBehaviour
             return;
         }
 
-        MMOInnerSDKManager.Instance.LogEvent("Robux_" + IsAccessible);
-
         mDelCheckOver = pDelCheckOver;
 
         MMOUserData.Instance.IsMMOUser = pIsMMOUser;
@@ -190,6 +188,11 @@ public partial class MMOModule : MonoBehaviour
         }
     }
 
+    public void LogMMOUser(bool pIsMMO)
+    {
+        MMOInnerSDKManager.Instance.LogEvent("Robux_" + pIsMMO);
+    }
+
     private void OnLoadOver()
     {
         MMOUserData.Instance.FinishLoading();
diff --git a/Assets/MMOModule/Scripts/MMOStorage/MMOUserData.cs b/Assets/MMOModule/Scripts/MMOStorage/MMOUserData.cs
index 93bda0e6..81ffd5cd 100644
--- a/Assets/MMOModule/Scripts/MMOStorage/MMOUserData.cs
+++ b/Assets/MMOModule/Scripts/MMOStorage/MMOUserData.cs
@@ -81,8 +81,6 @@ namespace MMO
             set
             {
                 mDiamond = value;
-                DelUpdateDiamond?.Invoke(mDiamond);
-                
                 Save();
             }
         }
diff --git a/Assets/MMOModule/Scripts/MMOUIs/CustomControls/MMOTaskList/MMOTaskList.cs b/Assets/MMOModule/Scripts/MMOUIs/CustomControls/MMOTaskList/MMOTaskList.cs
index 2ab2eba9..d85394ae 100644
--- a/Assets/MMOModule/Scripts/MMOUIs/CustomControls/MMOTaskList/MMOTaskList.cs
+++ b/Assets/MMOModule/Scripts/MMOUIs/CustomControls/MMOTaskList/MMOTaskList.cs
@@ -131,6 +131,7 @@ namespace MMO
                 if (tRecord.TaskType == MMOTaskType.GetDiamond)
                 {
                     MMOUserData.Instance.Diamond -= tRecord.TargetNum;
+                    MMOModule.Instance.UIMgr.GetUI<MMOUITop>().DiamondBar.PopRes(-tRecord.TargetNum, MMOUserData.Instance.Diamond);
                 }
 
                 MMOUserData.Instance.FinishTask(tTask.TaskType);
diff --git a/Assets/Resources/Material/Block_Forbidden.mat b/Assets/Resources/Material/Block_Forbidden.mat
index 5601a9fd..a5948a5c 100644
--- a/Assets/Resources/Material/Block_Forbidden.mat
+++ b/Assets/Resources/Material/Block_Forbidden.mat
@@ -8,17 +8,15 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Block_Forbidden
-  m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
   m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
     _ALPHABLEND_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - ALWAYS
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -42,6 +40,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -106,6 +108,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -117,6 +123,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DirectIntensityOutline: 1
+    - _Dissolve: 0
     - _DistortionBlend: 0.5
     - _DistortionEnabled: 0
     - _DistortionStrength: 1
@@ -132,6 +139,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HardSide: 0
     - _HighLightBoundry: 1
     - _HighLightSmooth: 0.001
     - _IndirectIntensity: 1
@@ -207,7 +215,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 1, g: 0.04438341, b: 0, a: 0.40392157}
+    - _Color: {r: 1, g: 0.04438341, b: 0, a: 0.34901962}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmiColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@@ -232,3 +240,4 @@ Material:
     - _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
     - _lightcolor: {r: 1, g: 1, b: 1, a: 1}
     - _shadowcolor: {r: 1, g: 0.99412984, b: 0.68235296, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Resources/Material/Block_Mergable.mat b/Assets/Resources/Material/Block_Mergable.mat
index 554368f1..ed6a8768 100644
--- a/Assets/Resources/Material/Block_Mergable.mat
+++ b/Assets/Resources/Material/Block_Mergable.mat
@@ -8,17 +8,15 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Block_Mergable
-  m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
   m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
     _ALPHABLEND_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - ALWAYS
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -42,6 +40,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -106,6 +108,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -117,6 +123,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DirectIntensityOutline: 1
+    - _Dissolve: 0
     - _DistortionBlend: 0.5
     - _DistortionEnabled: 0
     - _DistortionStrength: 1
@@ -132,6 +139,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HardSide: 0
     - _HighLightBoundry: 1
     - _HighLightSmooth: 0.001
     - _IndirectIntensity: 1
@@ -207,7 +215,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0, g: 1, b: 0.025922537, a: 0.40392157}
+    - _Color: {r: 0, g: 1, b: 0.025922537, a: 0.34901962}
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmiColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@@ -232,3 +240,4 @@ Material:
     - _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
     - _lightcolor: {r: 1, g: 1, b: 1, a: 1}
     - _shadowcolor: {r: 1, g: 0.99412984, b: 0.68235296, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Resources/Material/Block_Movable.mat b/Assets/Resources/Material/Block_Movable.mat
index 7484d8e4..228616b6 100644
--- a/Assets/Resources/Material/Block_Movable.mat
+++ b/Assets/Resources/Material/Block_Movable.mat
@@ -8,17 +8,15 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Block_Movable
-  m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
   m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
     _ALPHABLEND_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - ALWAYS
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -42,6 +40,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -106,6 +108,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -117,6 +123,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DirectIntensityOutline: 1
+    - _Dissolve: 0
     - _DistortionBlend: 0.5
     - _DistortionEnabled: 0
     - _DistortionStrength: 1
@@ -132,6 +139,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HardSide: 0
     - _HighLightBoundry: 1
     - _HighLightSmooth: 0.001
     - _IndirectIntensity: 1
@@ -207,7 +215,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.6132076, g: 0.17357485, b: 0, a: 1}
+    - _Color: {r: 0.9811321, g: 0.972549, b: 0, a: 0.34901962}
     - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
     - _EmiColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@@ -232,3 +240,4 @@ Material:
     - _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
     - _lightcolor: {r: 1, g: 1, b: 1, a: 1}
     - _shadowcolor: {r: 0.68235296, g: 1, b: 0.99999994, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Resources/Material/Block_Picked.mat b/Assets/Resources/Material/Block_Picked.mat
index 2052f7cd..f7d9a068 100644
--- a/Assets/Resources/Material/Block_Picked.mat
+++ b/Assets/Resources/Material/Block_Picked.mat
@@ -8,17 +8,15 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Block_Picked
-  m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: dea34df890f55cf479bde59c7a5ed961, type: 3}
   m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_UV_NORMALS_FULL
     _ALPHABLEND_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - ALWAYS
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -42,6 +40,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -106,6 +108,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 835fce0f56be3874b8ddbe92b9aca073, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -117,6 +123,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DirectIntensityOutline: 1
+    - _Dissolve: 0
     - _DistortionBlend: 0.5
     - _DistortionEnabled: 0
     - _DistortionStrength: 1
@@ -132,6 +139,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HardSide: 0
     - _HighLightBoundry: 1
     - _HighLightSmooth: 0.001
     - _IndirectIntensity: 1
@@ -207,7 +215,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 0.77254903, g: 0.74509805, b: 0.7176471, a: 1}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.6132076, g: 0.17357485, b: 0, a: 1}
+    - _Color: {r: 0, g: 0.6392157, b: 1, a: 0.34901962}
     - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
     - _EmiColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@@ -232,3 +240,4 @@ Material:
     - _SpecularColor: {r: 0.14150941, g: 0.13969748, b: 0.13817193, a: 1}
     - _lightcolor: {r: 1, g: 1, b: 1, a: 1}
     - _shadowcolor: {r: 0.68235296, g: 1, b: 0.99999994, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Scripts/Core/AudioManager/AudioManager.cs b/Assets/Scripts/Core/AudioManager/AudioManager.cs
index 130c83b1..e9e27a2b 100644
--- a/Assets/Scripts/Core/AudioManager/AudioManager.cs
+++ b/Assets/Scripts/Core/AudioManager/AudioManager.cs
@@ -81,7 +81,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         if (tClip == null)
             return;
 
-        if (mMusicPlayer.enabled)
+        if (mMusicPlayer.clip != tClip)
         {
             mMusicPlayer.clip = tClip;
             mMusicPlayer.loop = true;
@@ -147,16 +147,18 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         if (tClip == null)
             return null;
 
-        AudioSource tLoopAudio = gameObject.AddComponent<AudioSource>();
-        tLoopAudio.clip = tClip;
-        tLoopAudio.loop = true;
-        tLoopAudio.volume *= pVolumeScale;
         if (mSoundPlayer.enabled)
         {
+            AudioSource tLoopAudio = gameObject.AddComponent<AudioSource>();
+            tLoopAudio.clip = tClip;
+            tLoopAudio.loop = true;
+            tLoopAudio.volume *= pVolumeScale;
             tLoopAudio.Play();
+
+            return tLoopAudio;
         }
 
-        return tLoopAudio;
+        return null;
     }
 
     public void StopSoundLoop(AudioSource pAudioSrc)
diff --git a/Assets/Scripts/Core/SkipSplash.cs b/Assets/Scripts/Core/SkipSplash.cs
new file mode 100644
index 00000000..8a16aa65
--- /dev/null
+++ b/Assets/Scripts/Core/SkipSplash.cs
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------- */
+/*                    Skip Unity Splash Screen                      */
+/*                      Create by psygames                          */
+/*            https://github.com/psygames/UnitySkipSplash           */
+/* ---------------------------------------------------------------- */
+
+#if !UNITY_EDITOR
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class SkipSplash
+{
+    [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)]
+    private static void BeforeSplashScreen()
+    {
+#if UNITY_WEBGL
+        Application.focusChanged += Application_focusChanged;
+#else
+        System.Threading.Tasks.Task.Run(AsyncSkip);
+#endif
+    }
+
+#if UNITY_WEBGL
+    private static void Application_focusChanged(bool obj)
+    {
+        Application.focusChanged -= Application_focusChanged;
+        SplashScreen.Stop(SplashScreen.StopBehavior.StopImmediate);
+    }
+#else
+    private static void AsyncSkip()
+    {
+        SplashScreen.Stop(SplashScreen.StopBehavior.StopImmediate);
+    }
+#endif
+}
+#endif
\ No newline at end of file
diff --git a/Assets/Scripts/Core/SkipSplash.cs.meta b/Assets/Scripts/Core/SkipSplash.cs.meta
new file mode 100644
index 00000000..72c429e4
--- /dev/null
+++ b/Assets/Scripts/Core/SkipSplash.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 975b24b136a404fe88d0bf8293d93815
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Core/UITools/XAdaptor.cs b/Assets/Scripts/Core/UITools/XAdaptor.cs
index f4539426..2b9388a1 100644
--- a/Assets/Scripts/Core/UITools/XAdaptor.cs
+++ b/Assets/Scripts/Core/UITools/XAdaptor.cs
@@ -43,7 +43,7 @@ public class XAdaptor : MonoBehaviour
                 }
             }
 
-            if (Mathf.Abs((float)Screen.height / Screen.width - 2436 / 1125f) <= 0.01f)
+            if (((float)Screen.height / Screen.width) > 1.95f)
                 return true;
 
             return false;
diff --git a/Assets/Scripts/Storage/PlayerData.cs b/Assets/Scripts/Storage/PlayerData.cs
index 59fcb9a3..809962ab 100644
--- a/Assets/Scripts/Storage/PlayerData.cs
+++ b/Assets/Scripts/Storage/PlayerData.cs
@@ -225,6 +225,7 @@ public class PlayerData : StorageBase<PlayerData>
         {
             case Touka.FunctionType.Function_wangz:
                 IsMMOUser = pOn;
+                MMOModule.Instance.LogMMOUser(IsMMOUser);
                 Debug.Log("Usersource is mmo :" + IsMMOUser);
                 break;
             case Touka.FunctionType.Function_IP:
diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs
index 1b320707..ff05fd95 100644
--- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs
+++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs
@@ -11,7 +11,7 @@ namespace Touka
     {
         private static TKGNativeInterface _instance;
 
-        private string UnitySDKVersion = "2.2.7";
+        private string UnitySDKVersion = "2.2.8";
 
         public static TKGNativeInterface Instance
         {