diff --git a/Client/Assets/Editor/PlayModePlus.meta b/Client/Assets/AssetArt.meta
similarity index 77%
rename from Client/Assets/Editor/PlayModePlus.meta
rename to Client/Assets/AssetArt.meta
index 9d1429d..88ba2b2 100644
--- a/Client/Assets/Editor/PlayModePlus.meta
+++ b/Client/Assets/AssetArt.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b2046c8d71ec8bb4289cae8890231bc7
+guid: 67575953f50d8cf45b07e9b487d83559
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene.meta b/Client/Assets/AssetArt/Atlas.meta
similarity index 77%
rename from Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene.meta
rename to Client/Assets/AssetArt/Atlas.meta
index 1bfc5b7..ecb3f6a 100644
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene.meta
+++ b/Client/Assets/AssetArt/Atlas.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 73de723eec7ee2b49b4e14fbec861274
+guid: 3fb8ac29c02ab364dbe99fc9973c6652
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Client/Assets/AssetArt/Atlas/bg.spriteatlas b/Client/Assets/AssetArt/Atlas/bg.spriteatlas
new file mode 100644
index 0000000..d59f8c1
--- /dev/null
+++ b/Client/Assets/AssetArt/Atlas/bg.spriteatlas
@@ -0,0 +1,90 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: bg
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 0
+      compressionQuality: 0
+      maxTextureSize: 0
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 4
+      m_BuildTarget: Android
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 4
+      m_BuildTarget: iPhone
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 49
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 4
+      m_BuildTarget: WebGL
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 2
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 1
+      enableTightPacking: 0
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 2800000, guid: e81b97b271bf77d4cb197c547f16537f, type: 3}
+    - {fileID: 2800000, guid: ea4359b56c3b3a243b655926c67c0c18, type: 3}
+    - {fileID: 2800000, guid: be114b2ca0a3d674795409f008820559, type: 3}
+    - {fileID: 2800000, guid: 57dd6a509b573d84cbfacda79acd0ab3, type: 3}
+    - {fileID: 2800000, guid: c85435c2e44fba84aa4be72463b4848a, type: 3}
+    - {fileID: 2800000, guid: 7e8d3e1227cf0e349b1ec2314405ece9, type: 3}
+    - {fileID: 2800000, guid: f1a9b3e844ba0514bb068e4586261e57, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys: []
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites: []
+  m_PackedSpriteNamesToIndex: []
+  m_RenderDataMap: {}
+  m_Tag: bg
+  m_IsVariant: 0
diff --git a/Client/Assets/AssetArt/Atlas/bg.spriteatlas.meta b/Client/Assets/AssetArt/Atlas/bg.spriteatlas.meta
new file mode 100644
index 0000000..b97c5e2
--- /dev/null
+++ b/Client/Assets/AssetArt/Atlas/bg.spriteatlas.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1b2eafc0edfc5548b6b0af21419da22
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetArt/Atlas/icon.spriteatlas b/Client/Assets/AssetArt/Atlas/icon.spriteatlas
new file mode 100644
index 0000000..ce0c641
--- /dev/null
+++ b/Client/Assets/AssetArt/Atlas/icon.spriteatlas
@@ -0,0 +1,236 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: icon
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 0
+      compressionQuality: 0
+      maxTextureSize: 0
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 4
+      m_BuildTarget: Android
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 4
+      m_BuildTarget: iPhone
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 49
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 4
+      m_BuildTarget: WebGL
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 4
+      m_BuildTarget: DefaultTexturePlatform
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: -1
+      m_TextureCompression: 2
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 0
+      m_IgnorePlatformSupport: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 2
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 1
+      enableTightPacking: 0
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 2800000, guid: 6869fc80122cb044baa3653a39fb5ef7, type: 3}
+    - {fileID: 2800000, guid: a2a575f6955103f4790d548f79c02f87, type: 3}
+    - {fileID: 2800000, guid: fc7a3113730e6294f9356e3313ec8c29, type: 3}
+    - {fileID: 2800000, guid: 2edb4f8554e42ad4ab2c363984b1779a, type: 3}
+    - {fileID: 2800000, guid: b240487e45d919548ba914d0a4ea1b86, type: 3}
+    - {fileID: 2800000, guid: 0de97e3d44a95cb439c4c648661341c4, type: 3}
+    - {fileID: 2800000, guid: e064a3ffa125ceb46873323cc9e49357, type: 3}
+    - {fileID: 2800000, guid: 597a55492a6ed33438050b52e612583b, type: 3}
+    - {fileID: 2800000, guid: 47326838a1af98b4082c9df93928c5b6, type: 3}
+    - {fileID: 2800000, guid: ec15a14152d464c4bbc2bcdf4f35f482, type: 3}
+    - {fileID: 2800000, guid: d13b702962326f94d8d59ee61a984bd6, type: 3}
+    - {fileID: 2800000, guid: 5e376897c70591a49a22c1a8c4f3210e, type: 3}
+    - {fileID: 2800000, guid: ffdf66726d6b91b4784592c083d7a57e, type: 3}
+    - {fileID: 2800000, guid: 173522bfc7c3ccb4e96cee8dfe8334c9, type: 3}
+    - {fileID: 2800000, guid: 560e29c633a848542887affce73e6278, type: 3}
+    - {fileID: 2800000, guid: 471c3c90880bade4cb40904f210d48d0, type: 3}
+    - {fileID: 2800000, guid: ef2b3ac24322f834f8decdc2131ed686, type: 3}
+    - {fileID: 2800000, guid: 88165366b8632b94897f99d1810f9a75, type: 3}
+    - {fileID: 2800000, guid: 7374504dca26ca2478d1f7fe41c9fb54, type: 3}
+    - {fileID: 2800000, guid: 4403a4b028c0c44499e5a187ce5370a5, type: 3}
+    - {fileID: 2800000, guid: 3ed03072b758e9f4ea19c497fcb5e4ab, type: 3}
+    - {fileID: 2800000, guid: d12ec83d6f2c70949bedc01f27291df1, type: 3}
+    - {fileID: 2800000, guid: 86d9e0dd543c90943ab91d77285f0bcf, type: 3}
+    - {fileID: 2800000, guid: 96eb1554f1ba145448ab3d90120b5404, type: 3}
+    - {fileID: 2800000, guid: 5b5b949dd0e68db4aa5642846049a399, type: 3}
+    - {fileID: 2800000, guid: bcb13d916e03fb449bd6c3230db66dca, type: 3}
+    - {fileID: 2800000, guid: 1bfa534e0897dce4199d5feb00c844f5, type: 3}
+    - {fileID: 2800000, guid: 71d00a043a399624cb5ab9db80513e3a, type: 3}
+    - {fileID: 2800000, guid: ccbb6c0fbb7b136489c9329ce5d10fe7, type: 3}
+    - {fileID: 2800000, guid: 4e0c9d5e06b4ba045890aa4510716632, type: 3}
+    - {fileID: 2800000, guid: bf4333b609508034f9aa56c1e7a52517, type: 3}
+    - {fileID: 2800000, guid: 6344418ab9ff2434685154eadf87e8dc, type: 3}
+    - {fileID: 2800000, guid: a141b95fe758dca449f9ad5e133b54b5, type: 3}
+    - {fileID: 2800000, guid: f2128539ea77d2e46aebeddbaf8daa99, type: 3}
+    - {fileID: 2800000, guid: 68899d4f5d193974fb77cdc96746d377, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+    packedSpriteRenderDataKeys:
+    - 6869fc80122cb044baa3653a39fb5ef7: 21300000
+    - 471c3c90880bade4cb40904f210d48d0: 21300000
+    - 4403a4b028c0c44499e5a187ce5370a5: 21300000
+    - ec15a14152d464c4bbc2bcdf4f35f482: 21300000
+    - bcb13d916e03fb449bd6c3230db66dca: 21300000
+    - 3ed03072b758e9f4ea19c497fcb5e4ab: 21300000
+    - ffdf66726d6b91b4784592c083d7a57e: 21300000
+    - ef2b3ac24322f834f8decdc2131ed686: 21300000
+    - fc7a3113730e6294f9356e3313ec8c29: 21300000
+    - 71d00a043a399624cb5ab9db80513e3a: 21300000
+    - 96eb1554f1ba145448ab3d90120b5404: 21300000
+    - 2edb4f8554e42ad4ab2c363984b1779a: 21300000
+    - 88165366b8632b94897f99d1810f9a75: 21300000
+    - bf4333b609508034f9aa56c1e7a52517: 21300000
+    - 560e29c633a848542887affce73e6278: 21300000
+    - a2a575f6955103f4790d548f79c02f87: 21300000
+    - 5e376897c70591a49a22c1a8c4f3210e: 21300000
+    - 47326838a1af98b4082c9df93928c5b6: 21300000
+    - d13b702962326f94d8d59ee61a984bd6: 21300000
+    - f2128539ea77d2e46aebeddbaf8daa99: 21300000
+    - 597a55492a6ed33438050b52e612583b: 21300000
+    - 6344418ab9ff2434685154eadf87e8dc: 21300000
+    - d12ec83d6f2c70949bedc01f27291df1: 21300000
+    - 0de97e3d44a95cb439c4c648661341c4: 21300000
+    - 7374504dca26ca2478d1f7fe41c9fb54: 21300000
+    - 5b5b949dd0e68db4aa5642846049a399: 21300000
+    - 86d9e0dd543c90943ab91d77285f0bcf: 21300000
+    - 1bfa534e0897dce4199d5feb00c844f5: 21300000
+    - 4e0c9d5e06b4ba045890aa4510716632: 21300000
+    - b240487e45d919548ba914d0a4ea1b86: 21300000
+    - ccbb6c0fbb7b136489c9329ce5d10fe7: 21300000
+    - 68899d4f5d193974fb77cdc96746d377: 21300000
+    - a141b95fe758dca449f9ad5e133b54b5: 21300000
+    - 173522bfc7c3ccb4e96cee8dfe8334c9: 21300000
+    - e064a3ffa125ceb46873323cc9e49357: 21300000
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: 6869fc80122cb044baa3653a39fb5ef7, type: 3}
+  - {fileID: 21300000, guid: 471c3c90880bade4cb40904f210d48d0, type: 3}
+  - {fileID: 21300000, guid: 4403a4b028c0c44499e5a187ce5370a5, type: 3}
+  - {fileID: 21300000, guid: ec15a14152d464c4bbc2bcdf4f35f482, type: 3}
+  - {fileID: 21300000, guid: bcb13d916e03fb449bd6c3230db66dca, type: 3}
+  - {fileID: 21300000, guid: 3ed03072b758e9f4ea19c497fcb5e4ab, type: 3}
+  - {fileID: 21300000, guid: ffdf66726d6b91b4784592c083d7a57e, type: 3}
+  - {fileID: 21300000, guid: ef2b3ac24322f834f8decdc2131ed686, type: 3}
+  - {fileID: 21300000, guid: fc7a3113730e6294f9356e3313ec8c29, type: 3}
+  - {fileID: 21300000, guid: 71d00a043a399624cb5ab9db80513e3a, type: 3}
+  - {fileID: 21300000, guid: 96eb1554f1ba145448ab3d90120b5404, type: 3}
+  - {fileID: 21300000, guid: 2edb4f8554e42ad4ab2c363984b1779a, type: 3}
+  - {fileID: 21300000, guid: 88165366b8632b94897f99d1810f9a75, type: 3}
+  - {fileID: 21300000, guid: bf4333b609508034f9aa56c1e7a52517, type: 3}
+  - {fileID: 21300000, guid: 560e29c633a848542887affce73e6278, type: 3}
+  - {fileID: 21300000, guid: a2a575f6955103f4790d548f79c02f87, type: 3}
+  - {fileID: 21300000, guid: 5e376897c70591a49a22c1a8c4f3210e, type: 3}
+  - {fileID: 21300000, guid: 47326838a1af98b4082c9df93928c5b6, type: 3}
+  - {fileID: 21300000, guid: d13b702962326f94d8d59ee61a984bd6, type: 3}
+  - {fileID: 21300000, guid: f2128539ea77d2e46aebeddbaf8daa99, type: 3}
+  - {fileID: 21300000, guid: 597a55492a6ed33438050b52e612583b, type: 3}
+  - {fileID: 21300000, guid: 6344418ab9ff2434685154eadf87e8dc, type: 3}
+  - {fileID: 21300000, guid: d12ec83d6f2c70949bedc01f27291df1, type: 3}
+  - {fileID: 21300000, guid: 0de97e3d44a95cb439c4c648661341c4, type: 3}
+  - {fileID: 21300000, guid: 7374504dca26ca2478d1f7fe41c9fb54, type: 3}
+  - {fileID: 21300000, guid: 5b5b949dd0e68db4aa5642846049a399, type: 3}
+  - {fileID: 21300000, guid: 86d9e0dd543c90943ab91d77285f0bcf, type: 3}
+  - {fileID: 21300000, guid: 1bfa534e0897dce4199d5feb00c844f5, type: 3}
+  - {fileID: 21300000, guid: 4e0c9d5e06b4ba045890aa4510716632, type: 3}
+  - {fileID: 21300000, guid: b240487e45d919548ba914d0a4ea1b86, type: 3}
+  - {fileID: 21300000, guid: ccbb6c0fbb7b136489c9329ce5d10fe7, type: 3}
+  - {fileID: 21300000, guid: 68899d4f5d193974fb77cdc96746d377, type: 3}
+  - {fileID: 21300000, guid: a141b95fe758dca449f9ad5e133b54b5, type: 3}
+  - {fileID: 21300000, guid: 173522bfc7c3ccb4e96cee8dfe8334c9, type: 3}
+  - {fileID: 21300000, guid: e064a3ffa125ceb46873323cc9e49357, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - add_hover
+  - default
+  - item_hover
+  - cancel_normal
+  - list_press
+  - item_normal
+  - check_hover
+  - default_hover
+  - btn_hover
+  - ok_hover
+  - list_hover
+  - btn_normal
+  - default_press
+  - panel_appearance
+  - defaul_normal
+  - add_normal
+  - catb_hover
+  - cancel_hover
+  - catb_disable
+  - panel_plugin
+  - cancel_40px
+  - panel_general
+  - item_press
+  - btnLast
+  - hp_icon
+  - list_normal
+  - list_disable
+  - list_select
+  - panel_about
+  - btn_press
+  - ok_normal
+  - panel_sound
+  - panel_performance
+  - check_normal
+  - btnNext
+  m_RenderDataMap: {}
+  m_Tag: icon
+  m_IsVariant: 0
diff --git a/Client/Assets/AssetArt/Atlas/icon.spriteatlas.meta b/Client/Assets/AssetArt/Atlas/icon.spriteatlas.meta
new file mode 100644
index 0000000..0817747
--- /dev/null
+++ b/Client/Assets/AssetArt/Atlas/icon.spriteatlas.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c2e98ee83986024fbd79ac13c88d126
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/PlayModePlus/Resources.meta b/Client/Assets/AssetArt/Configs.meta
similarity index 77%
rename from Client/Assets/Editor/PlayModePlus/Resources.meta
rename to Client/Assets/AssetArt/Configs.meta
index 63a8dfa..894dee3 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources.meta
+++ b/Client/Assets/AssetArt/Configs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d1eb15f9bc309b6449e16be98bfb12fd
+guid: 6f7e89e728e5c5e4f822f57dce1bc197
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus.meta b/Client/Assets/AssetArt/Configs/json.meta
similarity index 77%
rename from Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus.meta
rename to Client/Assets/AssetArt/Configs/json.meta
index 5c04668..533c1a9 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus.meta
+++ b/Client/Assets/AssetArt/Configs/json.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 22d9cf2c9dbc41f4495ecf4e02a1c9c0
+guid: 77210781fe064024d81893b35c4b3917
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Client/Assets/AssetArt/Configs/json/tables_tblocalization.json b/Client/Assets/AssetArt/Configs/json/tables_tblocalization.json
new file mode 100644
index 0000000..cacd27e
--- /dev/null
+++ b/Client/Assets/AssetArt/Configs/json/tables_tblocalization.json
@@ -0,0 +1,686 @@
+[
+  {
+    "key": "ui_nav_document",
+    "ChineseSimplified": "游戏存档管理",
+    "English": "Save Data Management",
+    "Japanese": "セーブデータ管理"
+  },
+  {
+    "key": "ui_nav_setting",
+    "ChineseSimplified": "系统设置",
+    "English": "System Settings",
+    "Japanese": "システム設定"
+  },
+  {
+    "key": "ui_nav_voice",
+    "ChineseSimplified": "音效设置",
+    "English": "Sound Settings",
+    "Japanese": "サウンド設定"
+  },
+  {
+    "key": "ui_nav_text",
+    "ChineseSimplified": "文本设置",
+    "English": "Text Settings",
+    "Japanese": "テキスト設定"
+  },
+  {
+    "key": "ui_nav_keyboard",
+    "ChineseSimplified": "键盘设置",
+    "English": "Keyboard Settings",
+    "Japanese": "キーボード設定"
+  },
+  {
+    "key": "ui_nav_scene",
+    "ChineseSimplified": "场景设置",
+    "English": "Scene Settings",
+    "Japanese": "シーン設定"
+  },
+  {
+    "key": "ui_nav_touch",
+    "ChineseSimplified": "触摸设置",
+    "English": "Touch Settings",
+    "Japanese": "タッチ設定"
+  },
+  {
+    "key": "ui_nav_appreciation",
+    "ChineseSimplified": "鉴赏模式",
+    "English": "Gallery Mode",
+    "Japanese": "ギャラリーモード"
+  },
+  {
+    "key": "ui_nav_title",
+    "ChineseSimplified": "返回标题",
+    "English": "Return to Title",
+    "Japanese": "タイトルに戻る"
+  },
+  {
+    "key": "ui_nav_exit",
+    "ChineseSimplified": "离开游戏",
+    "English": "Exit Game",
+    "Japanese": "ゲームを終了"
+  },
+  {
+    "key": "ui_nav_newdoc",
+    "ChineseSimplified": "新建存档",
+    "English": "New Save",
+    "Japanese": "新規セーブ"
+  },
+  {
+    "key": "ui_nav_doc",
+    "ChineseSimplified": "存档",
+    "English": "Save",
+    "Japanese": "セーブ"
+  },
+  {
+    "key": "ui_nav_autodoc",
+    "ChineseSimplified": "自动存档",
+    "English": "Auto Save",
+    "Japanese": "オートセーブ"
+  },
+  {
+    "key": "ui_nav_fastdoc",
+    "ChineseSimplified": "快速存档",
+    "English": "Quick Save",
+    "Japanese": "クイックセーブ"
+  },
+  {
+    "key": "ui_nav_newold",
+    "ChineseSimplified": "由新到旧",
+    "English": "Newest First",
+    "Japanese": "新しい順"
+  },
+  {
+    "key": "ui_nav_oldnew",
+    "ChineseSimplified": "由旧到新",
+    "English": "Oldest First",
+    "Japanese": "古い順"
+  },
+  {
+    "key": "ui_nav_del",
+    "ChineseSimplified": "删除",
+    "English": "Delete",
+    "Japanese": "削除"
+  },
+  {
+    "key": "ui_nav_pic",
+    "ChineseSimplified": "画面",
+    "English": "Display",
+    "Japanese": "画面"
+  },
+  {
+    "key": "ui_nav_full",
+    "ChineseSimplified": "全屏",
+    "English": "Fullscreen",
+    "Japanese": "フルスクリーン"
+  },
+  {
+    "key": "ui_nav_window",
+    "ChineseSimplified": "窗口",
+    "English": "Windowed",
+    "Japanese": "ウィンドウ"
+  },
+  {
+    "key": "ui_nav_selectsave",
+    "ChineseSimplified": "出现选项时自动存档",
+    "English": "Auto save at choices",
+    "Japanese": "選択肢が表示される時にオートセーブ"
+  },
+  {
+    "key": "ui_nav_startsave",
+    "ChineseSimplified": "剧情开始时自动存档",
+    "English": "Auto save at story start",
+    "Japanese": "ストーリー開始時にオートセーブ"
+  },
+  {
+    "key": "ui_nav_endsave",
+    "ChineseSimplified": "游戏结束时自动存档",
+    "English": "Auto save at game end",
+    "Japanese": "ゲーム終了時にオートセーブ"
+  },
+  {
+    "key": "ui_nav_confirmsave",
+    "ChineseSimplified": "保存游戏时确认",
+    "English": "Confirm when saving",
+    "Japanese": "セーブ時に確認"
+  },
+  {
+    "key": "ui_nav_confirmload",
+    "ChineseSimplified": "读取游戏时确认",
+    "English": "Confirm when loading",
+    "Japanese": "ロード時に確認"
+  },
+  {
+    "key": "ui_nav_confirmdeldoc",
+    "ChineseSimplified": "删除存档时确认",
+    "English": "Confirm when deleting",
+    "Japanese": "削除時に確認"
+  },
+  {
+    "key": "ui_nav_confirmswitch",
+    "ChineseSimplified": "跳转场景时确认",
+    "English": "Confirm scene skip",
+    "Japanese": "シーンスキップ時に確認"
+  },
+  {
+    "key": "ui_nav_confirmreturn",
+    "ChineseSimplified": "返回标题时确认",
+    "English": "Confirm return to title",
+    "Japanese": "タイトルに戻る時に確認"
+  },
+  {
+    "key": "ui_nav_confirmexit",
+    "ChineseSimplified": "退出游戏时确认",
+    "English": "Confirm game exit",
+    "Japanese": "終了時に確認"
+  },
+  {
+    "key": "ui_nav_defaultbtn",
+    "ChineseSimplified": "恢复默认",
+    "English": "Restore Defaults",
+    "Japanese": "初期設定に戻す"
+  },
+  {
+    "key": "ui_nav_volume",
+    "ChineseSimplified": "主音量",
+    "English": "Master Volume",
+    "Japanese": "マスター音量"
+  },
+  {
+    "key": "ui_nav_bgm",
+    "ChineseSimplified": "BGM",
+    "English": "BGM",
+    "Japanese": "BGM"
+  },
+  {
+    "key": "ui_nav_chat",
+    "ChineseSimplified": "语音音量",
+    "English": "Voice Volume",
+    "Japanese": "ボイス音量"
+  },
+  {
+    "key": "ui_nav_chatsetting",
+    "ChineseSimplified": "语音设置",
+    "English": "Voice Settings",
+    "Japanese": "ボイス設定"
+  },
+  {
+    "key": "ui_nav_playspeed",
+    "ChineseSimplified": "播放速度",
+    "English": "Playback Speed",
+    "Japanese": "再生速度"
+  },
+  {
+    "key": "ui_nav_volumetest",
+    "ChineseSimplified": "音量测试",
+    "English": "Volume Test",
+    "Japanese": "音量テスト"
+  },
+  {
+    "key": "ui_nav_play",
+    "ChineseSimplified": "播放",
+    "English": "Play",
+    "Japanese": "再生"
+  },
+  {
+    "key": "ui_nav_noplay",
+    "ChineseSimplified": "不播放",
+    "English": "Don't Play",
+    "Japanese": "再生しない"
+  },
+  {
+    "key": "ui_nav_lowbgm",
+    "ChineseSimplified": "语音播放时降低BGM",
+    "English": "Lower BGM during Voice",
+    "Japanese": "ボイス再生時BGMを下げる"
+  },
+  {
+    "key": "ui_nav_textspeed",
+    "ChineseSimplified": "文本速度",
+    "English": "Text Speed",
+    "Japanese": "テキスト速度"
+  },
+  {
+    "key": "ui_nav_texttype",
+    "ChineseSimplified": "文本类型",
+    "English": "Text Type",
+    "Japanese": "テキストタイプ"
+  },
+  {
+    "key": "ui_nav_gradienteffect",
+    "ChineseSimplified": "渐变效果",
+    "English": "Fade Effect",
+    "Japanese": "フェード効果"
+  },
+  {
+    "key": "ui_nav_textfast",
+    "ChineseSimplified": "文本快进",
+    "English": "Text Skip",
+    "Japanese": "テキストスキップ"
+  },
+  {
+    "key": "ui_nav_autospeed",
+    "ChineseSimplified": "自动模式速度",
+    "English": "Auto Mode Speed",
+    "Japanese": "オートモード速度"
+  },
+  {
+    "key": "ui_nav_fastspeed",
+    "ChineseSimplified": "快速模式速度",
+    "English": "Fast Mode Speed",
+    "Japanese": "高速モード速度"
+  },
+  {
+    "key": "ui_nav_autocancel",
+    "ChineseSimplified": "选项后取消自动播放",
+    "English": "Disable Auto After Choice",
+    "Japanese": "選択後オート解除"
+  },
+  {
+    "key": "ui_nav_fastcancel",
+    "ChineseSimplified": "选项后取消快速模式",
+    "English": "Disable Skip After Choice",
+    "Japanese": "選択後スキップ解除"
+  },
+  {
+    "key": "ui_nav_noshowtext",
+    "ChineseSimplified": "不显示进行语音播放的文本",
+    "English": "Hide Text During Voice",
+    "Japanese": "音声再生中テキスト非表示"
+  },
+  {
+    "key": "ui_nav_noeffect",
+    "ChineseSimplified": "无效",
+    "English": "Disabled",
+    "Japanese": "無効"
+  },
+  {
+    "key": "ui_nav_light",
+    "ChineseSimplified": "明亮",
+    "English": "Bright",
+    "Japanese": "明るい"
+  },
+  {
+    "key": "ui_nav_normal",
+    "ChineseSimplified": "普通",
+    "English": "Normal",
+    "Japanese": "普通"
+  },
+  {
+    "key": "ui_nav_gray",
+    "ChineseSimplified": "灰暗",
+    "English": "Dark",
+    "Japanese": "暗い"
+  },
+  {
+    "key": "ui_nav_alltext",
+    "ChineseSimplified": "全文",
+    "English": "All Text",
+    "Japanese": "全文"
+  },
+  {
+    "key": "ui_nav_hasread",
+    "ChineseSimplified": "仅已读",
+    "English": "Read Only",
+    "Japanese": "既読のみ"
+  },
+  {
+    "key": "ui_nav_default",
+    "ChineseSimplified": "默认",
+    "English": "Default",
+    "Japanese": "デフォルト"
+  },
+  {
+    "key": "ui_nav_longclick",
+    "ChineseSimplified": "长按鼠标左键可以快进文本",
+    "English": "Hold left click to skip",
+    "Japanese": "左クリック長押しでスキップ"
+  },
+  {
+    "key": "ui_nav_leftclick",
+    "ChineseSimplified": "文字显示途中鼠标左击跳过",
+    "English": "Click to skip text",
+    "Japanese": "表示中にクリックでスキップ"
+  },
+  {
+    "key": "ui_nav_yes",
+    "ChineseSimplified": "是",
+    "English": "Yes",
+    "Japanese": "はい"
+  },
+  {
+    "key": "ui_nav_no",
+    "ChineseSimplified": "否",
+    "English": "No",
+    "Japanese": "いいえ"
+  },
+  {
+    "key": "ui_nav_auto",
+    "ChineseSimplified": "自动模式",
+    "English": "Auto Mode",
+    "Japanese": "オートモード"
+  },
+  {
+    "key": "ui_nav_fast",
+    "ChineseSimplified": "快速模式",
+    "English": "Fast Mode",
+    "Japanese": "高速モード"
+  },
+  {
+    "key": "ui_nav_voicesetting",
+    "ChineseSimplified": "音量设置",
+    "English": "Volume Settings",
+    "Japanese": "音量設定"
+  },
+  {
+    "key": "ui_nav_demotest",
+    "ChineseSimplified": "示例文本",
+    "English": "Sample Text",
+    "Japanese": "サンプル"
+  },
+  {
+    "key": "ui_nav_demo",
+    "ChineseSimplified": "这里是示例，展示自动模式下文字生成速度",
+    "English": "Sample text speed in auto mode",
+    "Japanese": "オートモードでの表示速度例"
+  },
+  {
+    "key": "ui_nav_delete",
+    "ChineseSimplified": "删除",
+    "English": "Delete",
+    "Japanese": "削除"
+  },
+  {
+    "key": "ui_nav_switchlang",
+    "ChineseSimplified": "是否要切换语言，并关闭游戏？（请先做好数据存档哦）",
+    "English": "Change language and exit? (Save your data first!)",
+    "Japanese": "言語変更して終了しますか？(セーブを忘れずに！)"
+  },
+  {
+    "key": "ui_nav_deldoc",
+    "ChineseSimplified": "是否删除存档?",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_returntitle",
+    "ChineseSimplified": "是否返回标题页?",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_confirmnew",
+    "ChineseSimplified": "是否新建存档?",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_loaddoc",
+    "ChineseSimplified": "是否加载存档",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_returnsetting",
+    "ChineseSimplified": "退出系统设置",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_autoplay",
+    "ChineseSimplified": "自动播放",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_close",
+    "ChineseSimplified": "关闭窗口",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_music",
+    "ChineseSimplified": "播放语音",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_pre",
+    "ChineseSimplified": "上一个选择",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_history",
+    "ChineseSimplified": "历史记录",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_fastread",
+    "ChineseSimplified": "快进已读",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_next",
+    "ChineseSimplified": "下一个选择",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_saved",
+    "ChineseSimplified": "存档",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_load",
+    "ChineseSimplified": "读档",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_quicksave",
+    "ChineseSimplified": "快速存档",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_quickload",
+    "ChineseSimplified": "快速读档",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_settings",
+    "ChineseSimplified": "设定界面",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_returntotitle",
+    "ChineseSimplified": "返回标题页",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_min",
+    "ChineseSimplified": "最小化",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_advdance",
+    "ChineseSimplified": "紧急回避模式",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_pause",
+    "ChineseSimplified": "中断游戏",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_stop",
+    "ChineseSimplified": "结束游戏",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_switch",
+    "ChineseSimplified": "切换画面模式",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_tool",
+    "ChineseSimplified": "打开工具栏",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_clickleft",
+    "ChineseSimplified": "鼠标左击",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_wheel",
+    "ChineseSimplified": "点击滚轮",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_clickright",
+    "ChineseSimplified": "鼠标右击",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_capture",
+    "ChineseSimplified": "截图保存",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_highspeed",
+    "ChineseSimplified": "高速模式",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_disable",
+    "ChineseSimplified": "清除按键",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "ui_nav_nodata",
+    "ChineseSimplified": "暂无存档",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "text_achievement_name_01",
+    "ChineseSimplified": "独自享受的日常",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "text_achievement_name_02",
+    "ChineseSimplified": "神社的守护者",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "text_achievement_content_1",
+    "ChineseSimplified": "您已解锁“独自享受的日常”路线！恭喜您！这是只属于您一人的物语！",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "text_achievement_content_2",
+    "ChineseSimplified": "您已赢得巫女玲奈的芳心，并肩负起守护神社的责任！（大概吧）",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "text_achievement_cover",
+    "ChineseSimplified": "成就未解锁",
+    "English": "",
+    "Japanese": ""
+  },
+  {
+    "key": "start_game",
+    "ChineseSimplified": "开始游戏",
+    "English": "Start Game",
+    "Japanese": "ゲームを始める"
+  },
+  {
+    "key": "load_game",
+    "ChineseSimplified": "读取游戏",
+    "English": "Load Game",
+    "Japanese": "ゲームをロード"
+  },
+  {
+    "key": "system_setting",
+    "ChineseSimplified": "系统设置",
+    "English": "Settings",
+    "Japanese": "設定"
+  },
+  {
+    "key": "gallerty",
+    "ChineseSimplified": "画廊设置",
+    "English": "Gallery",
+    "Japanese": "ギャラリー"
+  },
+  {
+    "key": "about",
+    "ChineseSimplified": "关于更多",
+    "English": "About",
+    "Japanese": "詳細情報"
+  },
+  {
+    "key": "exit_game",
+    "ChineseSimplified": "退出游戏",
+    "English": "Quit",
+    "Japanese": "終了"
+  },
+  {
+    "key": "pop_start_game",
+    "ChineseSimplified": "开始游戏",
+    "English": "New Game",
+    "Japanese": "新しいゲーム"
+  },
+  {
+    "key": "continue_game",
+    "ChineseSimplified": "继续上一次游戏",
+    "English": "Continue",
+    "Japanese": "続きから"
+  },
+  {
+    "key": "exit_submit",
+    "ChineseSimplified": "确定",
+    "English": "OK",
+    "Japanese": "決定"
+  },
+  {
+    "key": "exit_cancel",
+    "ChineseSimplified": "取消",
+    "English": "Cancel",
+    "Japanese": "キャンセル"
+  },
+  {
+    "key": "exit_title",
+    "ChineseSimplified": "是否退出游戏？",
+    "English": "Exit game?",
+    "Japanese": "ゲームを終了しますか？"
+  },
+  {
+    "key": "exit_label",
+    "ChineseSimplified": "始终需要确认",
+    "English": "Always confirm",
+    "Japanese": "常に確認する"
+  }
+]
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.audio/README.md.meta b/Client/Assets/AssetArt/Configs/json/tables_tblocalization.json.meta
similarity index 75%
rename from Client/Packages/com.alicizax.unity.audio/README.md.meta
rename to Client/Assets/AssetArt/Configs/json/tables_tblocalization.json.meta
index 0e66ae3..972f399 100644
--- a/Client/Packages/com.alicizax.unity.audio/README.md.meta
+++ b/Client/Assets/AssetArt/Configs/json/tables_tblocalization.json.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec9056fb3ba0b4a48822c0848143daa6
+guid: 06052681972e4274a933c92252a4a70f
 TextScriptImporter:
   externalObjects: {}
   userData: 
diff --git a/Client/Assets/AssetRaw/ShaderVariants.meta b/Client/Assets/AssetRaw/ShaderVariants.meta
new file mode 100644
index 0000000..bc17650
--- /dev/null
+++ b/Client/Assets/AssetRaw/ShaderVariants.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9602ad9f8198a8e459205ec2de5414f3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.json b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.json
new file mode 100644
index 0000000..7eda982
--- /dev/null
+++ b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.json
@@ -0,0 +1,218 @@
+{
+    "ShaderTotalCount": 15,
+    "VariantTotalCount": 17,
+    "ShaderVariantInfos": [
+        {
+            "AssetPath": "Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/FallbackShader.shader",
+            "ShaderName": "Hidden/Core/FallbackError",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/CoreBlit.shader",
+            "ShaderName": "Hidden/Universal/CoreBlit",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/FallbackError.shader",
+            "ShaderName": "Hidden/Universal Render Pipeline/FallbackError",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceAmbientOcclusion.shader",
+            "ShaderName": "Hidden/Universal Render Pipeline/ScreenSpaceAmbientOcclusion",
+            "ShaderVariantCount": 3,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                },
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "_BLUE_NOISE",
+                        "_SAMPLE_COUNT_MEDIUM",
+                        "_SOURCE_DEPTH_NORMALS"
+                    ]
+                },
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "_BLUE_NOISE",
+                        "_ORTHOGRAPHIC",
+                        "_SAMPLE_COUNT_MEDIUM",
+                        "_SOURCE_DEPTH_NORMALS"
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/BlitCopy",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-GUIRoundedRect",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-GUIRoundedRectWithColorPerBorder",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-GUITexture",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-GUITextureBlit",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-GUITextureClip",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-GUITextureClipText",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/Internal-UIRAtlasBlitCopy",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/TextCore/Distance Field SSD",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        ""
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Hidden/UIElements/EditorUIE",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "UIE_FORCE_GAMMA"
+                    ]
+                }
+            ]
+        },
+        {
+            "AssetPath": "Resources/unity_builtin_extra",
+            "ShaderName": "Skybox/Procedural",
+            "ShaderVariantCount": 1,
+            "ShaderVariantElements": [
+                {
+                    "PassType": 0,
+                    "Keywords": [
+                        "_SUNDISK_SIMPLE"
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/LICENSE.md.meta b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.json.meta
similarity index 75%
rename from Client/Assets/Editor/PlayModePlus/LICENSE.md.meta
rename to Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.json.meta
index b34965c..ffa6a3c 100644
--- a/Client/Assets/Editor/PlayModePlus/LICENSE.md.meta
+++ b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.json.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8da90e55807a3d24bac1ac41360d16bd
+guid: f67a9be33b772bf428d67651161439ac
 TextScriptImporter:
   externalObjects: {}
   userData: 
diff --git a/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.shadervariants b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.shadervariants
new file mode 100644
index 0000000..2797a5c
--- /dev/null
+++ b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.shadervariants
@@ -0,0 +1,89 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MyShaderVariants
+  m_Shaders:
+  - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: _SUNDISK_SIMPLE
+        passType: 0
+  - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: UIE_FORCE_GAMMA
+        passType: 0
+  - first: {fileID: 19011, guid: 0000000000000000f000000000000000, type: 0}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+      - keywords: _BLUE_NOISE _ORTHOGRAPHIC _SAMPLE_COUNT_MEDIUM _SOURCE_DEPTH_NORMALS
+        passType: 0
+      - keywords: _BLUE_NOISE _SAMPLE_COUNT_MEDIUM _SOURCE_DEPTH_NORMALS
+        passType: 0
+  - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
+  - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3}
+    second:
+      variants:
+      - keywords: 
+        passType: 0
diff --git a/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources/ProcedureComponentConfig.asset.meta b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.shadervariants.meta
similarity index 64%
rename from Client/Packages/com.alicizax.unity.procedure/Runtime/Resources/ProcedureComponentConfig.asset.meta
rename to Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.shadervariants.meta
index 352b8e5..fe761a1 100644
--- a/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources/ProcedureComponentConfig.asset.meta
+++ b/Client/Assets/AssetRaw/ShaderVariants/MyShaderVariants.shadervariants.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 414dbdb0f11b8a84180bbf2e4d01a69f
+guid: aef9d29d386ef144c84726c3a7f08f08
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 20000000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg.meta
new file mode 100644
index 0000000..5f32927
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a12851acb1ba0914fa6a685b9fd01bd4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine.png
new file mode 100644
index 0000000..855c122
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine.png.meta
new file mode 100644
index 0000000..a39cd7e
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: e81b97b271bf77d4cb197c547f16537f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine3D.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine3D.png
new file mode 100644
index 0000000..518858b
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine3D.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine3D.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine3D.png.meta
new file mode 100644
index 0000000..eb12aae
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/BottomLine3D.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: ea4359b56c3b3a243b655926c67c0c18
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLine3D.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLine3D.png
new file mode 100644
index 0000000..30ec0e6
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLine3D.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLine3D.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLine3D.png.meta
new file mode 100644
index 0000000..7a2e70e
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLine3D.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 7e8d3e1227cf0e349b1ec2314405ece9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLineBack.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLineBack.png
new file mode 100644
index 0000000..c1d629f
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLineBack.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLineBack.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLineBack.png.meta
new file mode 100644
index 0000000..e7430ff
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/TopLineBack.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: f1a9b3e844ba0514bb068e4586261e57
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud01.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud01.png
new file mode 100644
index 0000000..1625c1f
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud01.png differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayStopButton.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud01.png.meta
similarity index 68%
rename from Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayStopButton.png.meta
rename to Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud01.png.meta
index 50e467e..3d23bb5 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayStopButton.png.meta
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud01.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 403347ecfd3420b4fbd207759127cfe3
+guid: be114b2ca0a3d674795409f008820559
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -38,7 +38,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -49,7 +49,7 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -63,7 +63,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -113,54 +113,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: tvOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud02.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud02.png
new file mode 100644
index 0000000..5fb5772
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud02.png differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud02.png.meta
similarity index 68%
rename from Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png.meta
rename to Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud02.png.meta
index 0474c54..16a3701 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png.meta
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud02.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e663f57b9e7db7544b771960de59b03f
+guid: 57dd6a509b573d84cbfacda79acd0ab3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -38,7 +38,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -49,7 +49,7 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -63,7 +63,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -113,54 +113,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: tvOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud03.png b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud03.png
new file mode 100644
index 0000000..325f603
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud03.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud03.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud03.png.meta
new file mode 100644
index 0000000..4a6bc6a
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/bg/cloud03.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: c85435c2e44fba84aa4be72463b4848a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon.meta
new file mode 100644
index 0000000..7be01f8
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 96aa21c8068b29d47887f3d9fb5be4b7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_hover.png
new file mode 100644
index 0000000..554b842
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_hover.png.meta
new file mode 100644
index 0000000..a8f1ca5
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_hover.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6869fc80122cb044baa3653a39fb5ef7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_normal.png
new file mode 100644
index 0000000..4c6126f
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_normal.png.meta
new file mode 100644
index 0000000..2d92afe
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/add_normal.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: a2a575f6955103f4790d548f79c02f87
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnLast.PNG b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnLast.PNG
new file mode 100644
index 0000000..30d6429
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnLast.PNG differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnLast.PNG.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnLast.PNG.meta
new file mode 100644
index 0000000..5f6391a
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnLast.PNG.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 0de97e3d44a95cb439c4c648661341c4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnNext.PNG b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnNext.PNG
new file mode 100644
index 0000000..d715a6b
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnNext.PNG differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnNext.PNG.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnNext.PNG.meta
new file mode 100644
index 0000000..985a01a
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btnNext.PNG.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: e064a3ffa125ceb46873323cc9e49357
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_hover.png
new file mode 100644
index 0000000..4c0c7f8
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_hover.png.meta
new file mode 100644
index 0000000..97bf2bf
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_hover.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: fc7a3113730e6294f9356e3313ec8c29
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_normal.png
new file mode 100644
index 0000000..60649cc
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_normal.png.meta
new file mode 100644
index 0000000..a05099c
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_normal.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 2edb4f8554e42ad4ab2c363984b1779a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_press.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_press.png
new file mode 100644
index 0000000..e408ba3
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_press.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_press.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_press.png.meta
new file mode 100644
index 0000000..2d3f3e5
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/btn_press.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: b240487e45d919548ba914d0a4ea1b86
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_40px.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_40px.png
new file mode 100644
index 0000000..5e28346
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_40px.png differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_40px.png.meta
similarity index 66%
rename from Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png.meta
rename to Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_40px.png.meta
index ca9af5d..5055cce 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png.meta
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_40px.png.meta
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: d56d19b3e6d0fc0419cda6972838d5ba
+guid: 597a55492a6ed33438050b52e612583b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,11 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -49,7 +50,7 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -63,7 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  swizzle: 50462976
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -75,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -87,30 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -123,34 +103,11 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: tvOS
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
@@ -159,6 +116,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -175,9 +133,8 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_hover.png
new file mode 100644
index 0000000..b4187a1
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_hover.png.meta
new file mode 100644
index 0000000..6237ea9
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_hover.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 47326838a1af98b4082c9df93928c5b6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 64
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_normal.png
new file mode 100644
index 0000000..41c71a5
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_normal.png differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayButton.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_normal.png.meta
similarity index 66%
rename from Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayButton.png.meta
rename to Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_normal.png.meta
index 240fd6c..b2bd278 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayButton.png.meta
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/cancel_normal.png.meta
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 9f501d46ce416b04ab9b2795a65e9dbc
+guid: ec15a14152d464c4bbc2bcdf4f35f482
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,11 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -49,7 +50,7 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
@@ -63,7 +64,8 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  swizzle: 50462976
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -75,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -87,30 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -123,34 +103,11 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: tvOS
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
@@ -159,6 +116,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -175,9 +133,8 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_disable.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_disable.png
new file mode 100644
index 0000000..3aa3a31
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_disable.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_disable.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_disable.png.meta
new file mode 100644
index 0000000..ed7bee7
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_disable.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: d13b702962326f94d8d59ee61a984bd6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_hover.png
new file mode 100644
index 0000000..193d21e
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_hover.png.meta
new file mode 100644
index 0000000..cf9bfaf
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/catb_hover.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 5e376897c70591a49a22c1a8c4f3210e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_hover.png
new file mode 100644
index 0000000..e103a71
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_hover.png.meta
new file mode 100644
index 0000000..907d241
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_hover.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: ffdf66726d6b91b4784592c083d7a57e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_normal.png
new file mode 100644
index 0000000..736e2c4
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_normal.png.meta
new file mode 100644
index 0000000..baa0375
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/check_normal.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 173522bfc7c3ccb4e96cee8dfe8334c9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/defaul_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/defaul_normal.png
new file mode 100644
index 0000000..ec97fb0
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/defaul_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/defaul_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/defaul_normal.png.meta
new file mode 100644
index 0000000..e9c8785
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/defaul_normal.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 560e29c633a848542887affce73e6278
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default.png
new file mode 100644
index 0000000..0129e43
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default.png.meta
new file mode 100644
index 0000000..8ed1ce3
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 471c3c90880bade4cb40904f210d48d0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_hover.png
new file mode 100644
index 0000000..ca7242d
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_hover.png.meta
new file mode 100644
index 0000000..004828a
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_hover.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: ef2b3ac24322f834f8decdc2131ed686
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_press.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_press.png
new file mode 100644
index 0000000..f020b07
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_press.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_press.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_press.png.meta
new file mode 100644
index 0000000..98689b9
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/default_press.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 88165366b8632b94897f99d1810f9a75
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/hp_icon.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/hp_icon.png
new file mode 100644
index 0000000..9560042
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/hp_icon.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/hp_icon.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/hp_icon.png.meta
new file mode 100644
index 0000000..a026e4c
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/hp_icon.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 7374504dca26ca2478d1f7fe41c9fb54
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_hover.png
new file mode 100644
index 0000000..46ec5df
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_hover.png.meta
new file mode 100644
index 0000000..5f3274b
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_hover.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 4403a4b028c0c44499e5a187ce5370a5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_normal.png
new file mode 100644
index 0000000..c593637
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_normal.png.meta
new file mode 100644
index 0000000..a65cb16
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_normal.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 3ed03072b758e9f4ea19c497fcb5e4ab
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_press.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_press.png
new file mode 100644
index 0000000..ea7cc68
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_press.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_press.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_press.png.meta
new file mode 100644
index 0000000..d2e6a63
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/item_press.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: d12ec83d6f2c70949bedc01f27291df1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_disable.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_disable.png
new file mode 100644
index 0000000..dd89449
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_disable.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_disable.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_disable.png.meta
new file mode 100644
index 0000000..902b552
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_disable.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 86d9e0dd543c90943ab91d77285f0bcf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_hover.png
new file mode 100644
index 0000000..6e78bc3
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_hover.png.meta
new file mode 100644
index 0000000..c75e230
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_hover.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 96eb1554f1ba145448ab3d90120b5404
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_normal.png
new file mode 100644
index 0000000..3c5f95c
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_normal.png.meta
new file mode 100644
index 0000000..e36e6d5
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_normal.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 5b5b949dd0e68db4aa5642846049a399
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_press.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_press.png
new file mode 100644
index 0000000..1192b0d
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_press.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_press.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_press.png.meta
new file mode 100644
index 0000000..c0712f8
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_press.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: bcb13d916e03fb449bd6c3230db66dca
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_select.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_select.png
new file mode 100644
index 0000000..e4ed475
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_select.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_select.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_select.png.meta
new file mode 100644
index 0000000..22c229e
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/list_select.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 1bfa534e0897dce4199d5feb00c844f5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_hover.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_hover.png
new file mode 100644
index 0000000..bb85e27
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_hover.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_hover.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_hover.png.meta
new file mode 100644
index 0000000..632268f
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_hover.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 71d00a043a399624cb5ab9db80513e3a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_normal.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_normal.png
new file mode 100644
index 0000000..ac02b82
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_normal.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_normal.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_normal.png.meta
new file mode 100644
index 0000000..1a48d84
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/ok_normal.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: ccbb6c0fbb7b136489c9329ce5d10fe7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_about.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_about.png
new file mode 100644
index 0000000..626c891
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_about.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_about.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_about.png.meta
new file mode 100644
index 0000000..705556c
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_about.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 4e0c9d5e06b4ba045890aa4510716632
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_appearance.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_appearance.png
new file mode 100644
index 0000000..541cf3f
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_appearance.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_appearance.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_appearance.png.meta
new file mode 100644
index 0000000..3d80e8c
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_appearance.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: bf4333b609508034f9aa56c1e7a52517
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_general.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_general.png
new file mode 100644
index 0000000..8dd8bb2
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_general.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_general.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_general.png.meta
new file mode 100644
index 0000000..fb32d48
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_general.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 6344418ab9ff2434685154eadf87e8dc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_performance.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_performance.png
new file mode 100644
index 0000000..84203eb
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_performance.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_performance.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_performance.png.meta
new file mode 100644
index 0000000..576297a
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_performance.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: a141b95fe758dca449f9ad5e133b54b5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_plugin.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_plugin.png
new file mode 100644
index 0000000..098c8d2
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_plugin.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_plugin.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_plugin.png.meta
new file mode 100644
index 0000000..21a473a
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_plugin.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: f2128539ea77d2e46aebeddbaf8daa99
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_sound.png b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_sound.png
new file mode 100644
index 0000000..49ba8d6
Binary files /dev/null and b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_sound.png differ
diff --git a/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_sound.png.meta b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_sound.png.meta
new file mode 100644
index 0000000..41e18aa
--- /dev/null
+++ b/Client/Assets/AssetRaw/UIRaw/Atlas/icon/panel_sound.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 68899d4f5d193974fb77cdc96746d377
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/Build/YooExtension.meta b/Client/Assets/Editor/Build/BuildWindow.meta
similarity index 100%
rename from Client/Assets/Editor/Build/YooExtension.meta
rename to Client/Assets/Editor/Build/BuildWindow.meta
diff --git a/Client/Assets/Editor/Build/BuildWindow/AdvancedBuildWindow.cs b/Client/Assets/Editor/Build/BuildWindow/AdvancedBuildWindow.cs
new file mode 100644
index 0000000..4b42631
--- /dev/null
+++ b/Client/Assets/Editor/Build/BuildWindow/AdvancedBuildWindow.cs
@@ -0,0 +1,380 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using AlicizaX.Resource.Runtime;
+using UnityEditor;
+using UnityEditor.Build.Reporting;
+using UnityEngine;
+using YooAsset;
+using YooAsset.Editor;
+
+public class AdvancedBuildWindow : EditorWindow
+{
+    [MenuItem("开发工具/打包工具")]
+    public static void ShowWindow()
+    {
+        GetWindow<AdvancedBuildWindow>("Build Window", true);
+    }
+
+    private int _selectedTab;
+    private readonly string[] _tabLabels = { "AB包构建", "整包构建" };
+
+    // AB包构建配置
+    private BuildTarget _abBuildTarget = BuildTarget.StandaloneWindows64;
+    private string _outputPath = "Builds/AB";
+    private string _packageVersion;
+    private bool _copyAfterBuild;
+    private string _copyDestination;
+    private ECompressOption _compressOption = ECompressOption.LZ4;
+    private EFileNameStyle _fileNameStyle = EFileNameStyle.BundleName_HashName;
+    private EBuildinFileCopyOption _copyOption = EBuildinFileCopyOption.ClearAndCopyByTags;
+    private string _copyParams = "Launch";
+    private bool _enableSharePack = true;
+    private string _selectedEncryption;
+    private string _selectedPackage;
+
+    // 整包构建配置
+    private BuildTarget _appBuildTarget = BuildTarget.StandaloneWindows64;
+    private string _appOutputPath = "Builds/App";
+    private List<SceneAsset> _scenes = new List<SceneAsset>();
+    private bool _developmentBuild;
+
+    private Vector2 _scrollPosition;
+    private List<string> _encryptionClasses;
+    private List<string> _buildPackageNames;
+
+    private void OnEnable()
+    {
+        LoadEncryptionClasses();
+        LoadBuildPackageNames();
+        GeneratePackageVersion();
+    }
+
+    private void GeneratePackageVersion()
+    {
+        int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+        _packageVersion = DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+    }
+
+    private void LoadEncryptionClasses()
+    {
+        _encryptionClasses = AppDomain.CurrentDomain.GetAssemblies()
+            .SelectMany(a => a.GetTypes())
+            .Where(t => typeof(IEncryptionServices).IsAssignableFrom(t) && !t.IsAbstract)
+            .Select(t => t.FullName)
+            .ToList();
+    }
+
+
+    private void LoadBuildPackageNames()
+    {
+        _buildPackageNames = new List<string>();
+        foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+        {
+            _buildPackageNames.Add(package.PackageName);
+        }
+    }
+
+
+    private void OnGUI()
+    {
+        _selectedTab = GUILayout.Toolbar(_selectedTab, _tabLabels);
+
+        _scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
+        {
+            switch (_selectedTab)
+            {
+                case 0:
+                    DrawABBuildTab();
+                    break;
+                case 1:
+                    DrawAppBuildTab();
+                    break;
+            }
+        }
+        EditorGUILayout.EndScrollView();
+    }
+
+    private void DrawABBuildTab()
+    {
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("AB包构建配置", EditorStyles.boldLabel);
+
+        // 基本配置
+        DrawBuildTarget(ref _abBuildTarget);
+        DrawPathSelection("输出路径:", ref _outputPath);
+        DrawPackageVersion();
+
+        // 高级配置
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("高级选项", EditorStyles.boldLabel);
+        _compressOption = (ECompressOption)EditorGUILayout.EnumPopup("压缩方式:", _compressOption);
+        _fileNameStyle = (EFileNameStyle)EditorGUILayout.EnumPopup("文件命名风格:", _fileNameStyle);
+        _copyOption = (EBuildinFileCopyOption)EditorGUILayout.EnumPopup("内置文件拷贝选项:", _copyOption);
+        _copyParams = EditorGUILayout.TextField("拷贝参数:", _copyParams);
+        _enableSharePack = EditorGUILayout.Toggle("启用共享打包:", _enableSharePack);
+        DrawEncryptionSelection();
+        DrawPackageSelection();
+
+        // 拷贝配置
+        EditorGUILayout.Space();
+        _copyAfterBuild = EditorGUILayout.BeginToggleGroup("构建后拷贝", _copyAfterBuild);
+        DrawPathSelection("拷贝目标:", ref _copyDestination);
+        EditorGUILayout.EndToggleGroup();
+
+        // 操作按钮
+        EditorGUILayout.Space();
+        if (GUILayout.Button("构建AB包", GUILayout.Height(30)))
+        {
+            BuildABPackage();
+        }
+
+        if (GUILayout.Button("构建热更程序集", GUILayout.Height(30)))
+        {
+            BuildDLLCommand.BuildAndCopyDlls();
+        }
+    }
+
+    private void DrawAppBuildTab()
+    {
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("整包构建配置", EditorStyles.boldLabel);
+
+        DrawBuildTarget(ref _appBuildTarget);
+        DrawPathSelection("输出路径:", ref _appOutputPath);
+        _developmentBuild = EditorGUILayout.Toggle("开发模式:", _developmentBuild);
+
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("包含场景:", EditorStyles.boldLabel);
+        DrawSceneList();
+
+        EditorGUILayout.Space();
+        if (GUILayout.Button("构建应用程序", GUILayout.Height(30)))
+        {
+            BuildApplication();
+        }
+    }
+
+    private void DrawBuildTarget(ref BuildTarget target)
+    {
+        target = (BuildTarget)EditorGUILayout.EnumPopup("目标平台:", target);
+    }
+
+    private void DrawPathSelection(string label, ref string path)
+    {
+        EditorGUILayout.BeginHorizontal();
+        {
+            path = EditorGUILayout.TextField(label, path);
+            if (GUILayout.Button("浏览...", GUILayout.Width(60)))
+            {
+                string newPath = EditorUtility.SaveFolderPanel("选择输出目录", path, "");
+                if (!string.IsNullOrEmpty(newPath))
+                {
+                    path = newPath;
+                }
+            }
+        }
+        EditorGUILayout.EndHorizontal();
+    }
+
+    private void DrawPackageVersion()
+    {
+        EditorGUILayout.BeginHorizontal();
+        {
+            _packageVersion = EditorGUILayout.TextField("版本号:", _packageVersion);
+            if (GUILayout.Button("生成新版本", GUILayout.Width(100)))
+            {
+                GeneratePackageVersion();
+            }
+        }
+        EditorGUILayout.EndHorizontal();
+    }
+
+    private void DrawEncryptionSelection()
+    {
+        if (_encryptionClasses == null || _encryptionClasses.Count == 0)
+        {
+            EditorGUILayout.HelpBox("未找到加密类实现", MessageType.Info);
+            return;
+        }
+
+        int selectedIndex = Mathf.Max(0, _encryptionClasses.IndexOf(_selectedEncryption));
+        selectedIndex = EditorGUILayout.Popup("加密方式:", selectedIndex, _encryptionClasses.ToArray());
+        _selectedEncryption = _encryptionClasses[selectedIndex];
+    }
+
+    private void DrawPackageSelection()
+    {
+        if (_buildPackageNames == null || _buildPackageNames.Count == 0)
+        {
+            EditorGUILayout.HelpBox("未找到包", MessageType.Info);
+            return;
+        }
+
+        int selectedIndex = Mathf.Max(0, _buildPackageNames.IndexOf(_selectedPackage));
+        selectedIndex = EditorGUILayout.Popup("Package:", selectedIndex, _buildPackageNames.ToArray());
+        _selectedPackage = _buildPackageNames[selectedIndex];
+    }
+
+    private void DrawSceneList()
+    {
+        for (int i = 0; i < _scenes.Count; i++)
+        {
+            _scenes[i] = (SceneAsset)EditorGUILayout.ObjectField($"场景 {i + 1}:", _scenes[i], typeof(SceneAsset), false);
+        }
+
+        EditorGUILayout.BeginHorizontal();
+        {
+            if (GUILayout.Button("添加场景"))
+            {
+                _scenes.Add(null);
+            }
+
+            if (GUILayout.Button("移除最后一个") && _scenes.Count > 0)
+            {
+                _scenes.RemoveAt(_scenes.Count - 1);
+            }
+        }
+        EditorGUILayout.EndHorizontal();
+    }
+
+    private void BuildABPackage()
+    {
+        try
+        {
+            var parameters = new ScriptableBuildParameters
+            {
+                BuildOutputRoot = _outputPath,
+                BuildTarget = _abBuildTarget,
+                PackageName = _selectedPackage,
+                BuildBundleType = (int)EBuildBundleType.AssetBundle,
+                BuildPipeline = EBuildPipeline.ScriptableBuildPipeline.ToString(),
+                BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(),
+                PackageVersion = _packageVersion,
+                CompressOption = _compressOption,
+                FileNameStyle = _fileNameStyle,
+                VerifyBuildingResult = true,
+                ClearBuildCacheFiles = false,
+                BuildinFileCopyOption = _copyOption,
+                BuildinFileCopyParams = _copyParams,
+                EnableSharePackRule = _enableSharePack,
+                EncryptionServices = CreateEncryptionInstance()
+            };
+
+            ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
+            var report = pipeline.Run(parameters, true);
+
+            if (report.Success)
+            {
+                BuildUpdateData(_packageVersion, _copyDestination);
+                if (_copyAfterBuild && !string.IsNullOrEmpty(_copyDestination))
+                {
+                    CopyFiles(report.OutputPackageDirectory, _copyDestination);
+                }
+
+                EditorUtility.DisplayDialog("构建成功", $"AB包构建完成！\n输出目录: {report.OutputPackageDirectory}", "确定");
+            }
+            else
+            {
+                EditorUtility.DisplayDialog("构建失败", $"错误信息: {report.ErrorInfo}", "确定");
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogException(e);
+        }
+    }
+
+    private void BuildUpdateData(string version, string outPath)
+    {
+        ResourcePatchData updateData = new ResourcePatchData()
+        {
+            Version = Application.version,
+            BundleUrl = $"http://127.0.0.1:8081/res/{version}/",
+            Notice = "Test Notice",
+        };
+        File.WriteAllText(Path.Combine(outPath, "UpdateData.json"), Newtonsoft.Json.JsonConvert.SerializeObject(updateData));
+    }
+
+    private void BuildApplication()
+    {
+        try
+        {
+            var options = new BuildPlayerOptions
+            {
+                scenes = _scenes.Where(s => s != null).Select(s => AssetDatabase.GetAssetPath(s)).ToArray(),
+                locationPathName = Path.Combine(_appOutputPath, GetExecutableName()),
+                target = _appBuildTarget,
+                options = _developmentBuild ? BuildOptions.Development : BuildOptions.None
+            };
+
+            var report = BuildPipeline.BuildPlayer(options);
+            HandleBuildReport(report);
+        }
+        catch (Exception e)
+        {
+            EditorUtility.DisplayDialog("错误", $"构建过程中发生异常: {e.Message}", "确定");
+        }
+    }
+
+    private IEncryptionServices CreateEncryptionInstance()
+    {
+        if (string.IsNullOrEmpty(_selectedEncryption)) return null;
+
+        var type = Type.GetType(_selectedEncryption);
+        if (type != null)
+        {
+            return (IEncryptionServices)Activator.CreateInstance(type);
+        }
+
+        return null;
+    }
+
+    private void CopyFiles(string source, string destination)
+    {
+        try
+        {
+            if (!Directory.Exists(destination))
+            {
+                Directory.CreateDirectory(destination);
+            }
+
+            foreach (string file in Directory.GetFiles(source))
+            {
+                File.Copy(file, Path.Combine(destination, Path.GetFileName(file)), true);
+            }
+
+            Debug.Log($"文件拷贝完成: {source} -> {destination}");
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"文件拷贝失败: {e.Message}");
+        }
+    }
+
+    private void HandleBuildReport(UnityEditor.Build.Reporting.BuildReport report)
+    {
+        if (report.summary.result == UnityEditor.Build.Reporting.BuildResult.Succeeded)
+        {
+            EditorUtility.DisplayDialog("构建成功",
+                $"应用程序构建完成！\n输出大小: {report.summary.totalSize / 1024 / 1024}MB", "确定");
+        }
+        else
+        {
+            EditorUtility.DisplayDialog("构建失败",
+                $"错误信息: {report.summary}", "确定");
+        }
+    }
+
+    private string GetExecutableName()
+    {
+        return _appBuildTarget switch
+        {
+            BuildTarget.StandaloneWindows64 => "Game.exe",
+            BuildTarget.StandaloneOSX => "Game.app",
+            BuildTarget.Android => "Game.apk",
+            _ => "Game"
+        };
+    }
+}
diff --git a/Client/Assets/Editor/Build/BuildWindow/AdvancedBuildWindow.cs.meta b/Client/Assets/Editor/Build/BuildWindow/AdvancedBuildWindow.cs.meta
new file mode 100644
index 0000000..4b37e97
--- /dev/null
+++ b/Client/Assets/Editor/Build/BuildWindow/AdvancedBuildWindow.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 299b9adaf99d4b81aa2822e5995a1b92
+timeCreated: 1738739276
\ No newline at end of file
diff --git a/Client/Assets/Editor/Build/BuildWindow/Encryption.cs b/Client/Assets/Editor/Build/BuildWindow/Encryption.cs
new file mode 100644
index 0000000..d8f0b25
--- /dev/null
+++ b/Client/Assets/Editor/Build/BuildWindow/Encryption.cs
@@ -0,0 +1,52 @@
+namespace BuildCli.YooExtension
+{
+    using System;
+    using System.IO;
+    using YooAsset;
+
+    /// <summary>
+    /// 文件偏移加密方式
+    /// </summary>
+    public class FileOffsetEncryption : IEncryptionServices
+    {
+        public EncryptResult Encrypt(EncryptFileInfo fileInfo)
+        {
+            int offset = 32;
+            byte[] fileData = File.ReadAllBytes(fileInfo.FileLoadPath);
+            var encryptedData = new byte[fileData.Length + offset];
+            Buffer.BlockCopy(fileData, 0, encryptedData, offset, fileData.Length);
+
+            EncryptResult result = new EncryptResult();
+            result.Encrypted = true;
+            result.EncryptedData = encryptedData;
+            return result;
+        }
+    }
+
+
+    /// <summary>
+    /// 文件流加密方式
+    /// </summary>
+    public class FileStreamEncryption : IEncryptionServices
+    {
+        public const byte KEY = 64;
+
+        public EncryptResult Encrypt(EncryptFileInfo fileInfo)
+        {
+            if (fileInfo.BundleName.Contains("DLL"))
+            {
+            }
+
+            var fileData = File.ReadAllBytes(fileInfo.FileLoadPath);
+            for (int i = 0; i < fileData.Length; i++)
+            {
+                fileData[i] ^= KEY;
+            }
+
+            EncryptResult result = new EncryptResult();
+            result.Encrypted = true;
+            result.EncryptedData = fileData;
+            return result;
+        }
+    }
+}
diff --git a/Client/Assets/Editor/Build/YooExtension/Encryption.cs.meta b/Client/Assets/Editor/Build/BuildWindow/Encryption.cs.meta
similarity index 100%
rename from Client/Assets/Editor/Build/YooExtension/Encryption.cs.meta
rename to Client/Assets/Editor/Build/BuildWindow/Encryption.cs.meta
diff --git a/Client/Assets/Editor/Build/ReleaseTools.cs b/Client/Assets/Editor/Build/ReleaseTools.cs
deleted file mode 100644
index 90704e5..0000000
--- a/Client/Assets/Editor/Build/ReleaseTools.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-using System;
-using System.IO;
-using AlicizaX.Resource.Runtime;
-using UnityEditor;
-using UnityEditor.Build.Reporting;
-using UnityEngine;
-using YooAsset;
-using YooAsset.Editor;
-using BuildResult = UnityEditor.Build.Reporting.BuildResult;
-
-namespace BuildCli
-{
-    /// <summary>
-    /// 打包工具类。
-    /// <remarks>通过CommandLineReader可以不前台开启Unity实现静默打包以及CLI工作流，详见CommandLineReader.cs example1</remarks>
-    /// </summary>
-    public static class ReleaseTools
-    {
-        // public static void BuildDll()
-        // {
-        //     string platform = CommandLineReader.GetCustomArgument("platform");
-        //     if (string.IsNullOrEmpty(platform))
-        //     {
-        //         Debug.LogError($"Build Asset Bundle Error！platform is null");
-        //         return;
-        //     }
-        //
-        //     BuildTarget target = GetBuildTarget(platform);
-        //
-        //     BuildDLLCommand.BuildAndCopyDlls(target);
-        // }
-
-        // public static void BuildAssetBundle()
-        // {
-        //     string outputRoot = CommandLineReader.GetCustomArgument("outputRoot");
-        //     if (string.IsNullOrEmpty(outputRoot))
-        //     {
-        //         Debug.LogError($"Build Asset Bundle Error！outputRoot is null");
-        //         return;
-        //     }
-        //
-        //     string packageVersion = CommandLineReader.GetCustomArgument("packageVersion");
-        //     if (string.IsNullOrEmpty(packageVersion))
-        //     {
-        //         Debug.LogError($"Build Asset Bundle Error！packageVersion is null");
-        //         return;
-        //     }
-        //
-        //     string platform = CommandLineReader.GetCustomArgument("platform");
-        //     if (string.IsNullOrEmpty(platform))
-        //     {
-        //         Debug.LogError($"Build Asset Bundle Error！platform is null");
-        //         return;
-        //     }
-        //
-        //     BuildTarget target = GetBuildTarget(platform);
-        //     BuildInternal(target, outputRoot);
-        //     Debug.LogWarning($"Start BuildPackage BuildTarget:{target} outputPath:{outputRoot}");
-        // }
-
-        // [MenuItem("AlicizaFramework/Quick Build/一键打包AssetBundle")]
-        public static void BuildCurrentPlatformAB()
-        {
-            BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
-            BuildInternal(target, Application.dataPath + "/../Builds/", packageVersion: GetBuildPackageVersion());
-            AssetDatabase.Refresh();
-        }
-
-        private static BuildTarget GetBuildTarget(string platform)
-        {
-            BuildTarget target = BuildTarget.NoTarget;
-            switch (platform)
-            {
-                case "Android":
-                    target = BuildTarget.Android;
-                    break;
-                case "IOS":
-                    target = BuildTarget.iOS;
-                    break;
-                case "Windows":
-                    target = BuildTarget.StandaloneWindows64;
-                    break;
-                case "MacOS":
-                    target = BuildTarget.StandaloneOSX;
-                    break;
-                case "Linux":
-                    target = BuildTarget.StandaloneLinux64;
-                    break;
-                case "WebGL":
-                    target = BuildTarget.WebGL;
-                    break;
-                case "Switch":
-                    target = BuildTarget.Switch;
-                    break;
-                case "PS4":
-                    target = BuildTarget.PS4;
-                    break;
-                case "PS5":
-                    target = BuildTarget.PS5;
-                    break;
-            }
-
-            return target;
-        }
-
-        private static void BuildInternal(BuildTarget buildTarget, string outputRoot, string packageVersion = "1.0",
-            EBuildPipeline buildPipeline = EBuildPipeline.ScriptableBuildPipeline)
-        {
-            Debug.Log($"开始构建 : {buildTarget}");
-
-            IBuildPipeline pipeline = null;
-            BuildParameters buildParameters = null;
-
-            if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-            {
-                // 构建参数
-                BuiltinBuildParameters builtinBuildParameters = new BuiltinBuildParameters();
-
-                // 执行构建
-                pipeline = new BuiltinBuildPipeline();
-                buildParameters = builtinBuildParameters;
-
-                builtinBuildParameters.CompressOption = ECompressOption.LZ4;
-            }
-            else
-            {
-                ScriptableBuildParameters scriptableBuildParameters = new ScriptableBuildParameters();
-
-                // 执行构建
-                pipeline = new ScriptableBuildPipeline();
-                buildParameters = scriptableBuildParameters;
-
-                scriptableBuildParameters.CompressOption = ECompressOption.LZ4;
-            }
-
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = buildPipeline.ToString();
-            buildParameters.BuildTarget = buildTarget;
-            buildParameters.BuildMode = EBuildMode.IncrementalBuild;
-            buildParameters.PackageName = "DefaultPackage";
-            buildParameters.PackageVersion = packageVersion;
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = EFileNameStyle.BundleName_HashName;
-            buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.ClearAndCopyAll;
-            buildParameters.BuildinFileCopyParams = string.Empty;
-            buildParameters.EncryptionServices = CreateEncryptionInstance("DefaultPackage", buildPipeline);
-            // 启用共享资源打包
-            buildParameters.EnableSharePackRule = true;
-
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-            {
-                Debug.Log($"构建成功 : {buildResult.OutputPackageDirectory}");
-            }
-            else
-            {
-                Debug.LogError($"构建失败 : {buildResult.ErrorInfo}");
-            }
-        }
-
-        [MenuItem("开发工具/Build/Build Test")]
-        public static void BuildAAA()
-        {
-            string outPath = System.IO.Path.Combine(Application.dataPath, "../../bundles/");
-            var bundlePath = Application.dataPath + "/../Bundles/Windows";
-            if (Directory.Exists(bundlePath))
-            {
-                Directory.Delete(bundlePath, true);
-            }
-
-            if (Directory.Exists(outPath + "bundles"))
-            {
-                Directory.Delete(outPath + "bundles", true);
-            }
-
-            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
-            string version = DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
-            BuildTest(outPath, version);
-            BuildUpdateData(version);
-        }
-
-        static void BuildUpdateData(string version)
-        {
-            string outPath = System.IO.Path.Combine(Application.dataPath, "../../bundles/");
-            ResourcePatchData updateData = new ResourcePatchData()
-            {
-                Version = Application.version,
-                BundleUrl = $"http://127.0.0.1:8081/res/{version}/",
-                Notice = "Test Notice",
-            };
-            File.WriteAllText(Path.Combine(outPath, "UpdateData.json"), Newtonsoft.Json.JsonConvert.SerializeObject(updateData));
-        }
-
-        public static void BuildTest(string outputRoot, string version)
-        {
-            Debug.Log($"开始构建 : {BuildTarget.StandaloneWindows64}");
-
-
-            IBuildPipeline pipeline = null;
-            BuildParameters buildParameters = null;
-
-            ScriptableBuildParameters scriptableBuildParameters = new ScriptableBuildParameters();
-
-            // 执行构建
-            pipeline = new ScriptableBuildPipeline();
-            buildParameters = scriptableBuildParameters;
-
-            scriptableBuildParameters.CompressOption = ECompressOption.LZ4;
-
-            buildParameters.BuildOutputRoot = Application.dataPath + "/../Bundles/Windows";
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = EBuildPipeline.ScriptableBuildPipeline.ToString();
-            buildParameters.BuildTarget = BuildTarget.StandaloneWindows64;
-            buildParameters.BuildMode = EBuildMode.IncrementalBuild;
-            buildParameters.PackageName = "DefaultPackage";
-            buildParameters.PackageVersion = version;
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = EFileNameStyle.BundleName_HashName;
-            buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.ClearAndCopyByTags;
-            buildParameters.BuildinFileCopyParams = "Launch";
-            buildParameters.EncryptionServices = CreateEncryptionInstance("DefaultPackage", EBuildPipeline.BuiltinBuildPipeline);
-            // 启用共享资源打包
-            buildParameters.EnableSharePackRule = true;
-
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-            {
-                var bundlePath = Application.dataPath + $"/../Bundles/Windows/StandaloneWindows64/DefaultPackage/{version}/";
-                var targetPath = System.IO.Path.Combine(Application.dataPath, $"../../bundles/res/{version}");
-                if (!Directory.Exists(targetPath))
-                {
-                    Directory.CreateDirectory(targetPath);
-                }
-
-                DeleteFilesInDirectory(targetPath);
-
-                CopyFiles(bundlePath, targetPath);
-                Debug.Log($"构建成功 : {buildResult.OutputPackageDirectory}");
-            }
-            else
-            {
-                Debug.LogError($"构建失败 : {buildResult.ErrorInfo}");
-            }
-        }
-
-
-        static void CopyFiles(string sourceDirectory, string destinationDirectory)
-        {
-            // 确保目标目录存在
-            if (!Directory.Exists(destinationDirectory))
-            {
-                Directory.CreateDirectory(destinationDirectory);
-            }
-
-            // 获取源目录下的所有文件
-            string[] files = Directory.GetFiles(sourceDirectory);
-
-            foreach (string filePath in files)
-            {
-                // 构建目标文件路径
-                string fileName = Path.GetFileName(filePath);
-                string destinationFilePath = Path.Combine(destinationDirectory, fileName);
-
-                // 拷贝文件
-                File.Copy(filePath, destinationFilePath, true); // 如果目标文件已存在，覆盖
-            }
-        }
-
-        static void DeleteFilesInDirectory(string directoryPath)
-        {
-            // 获取目录下的所有文件
-            string[] files = Directory.GetFiles(directoryPath);
-
-            foreach (string filePath in files)
-            {
-                // 删除文件
-                File.Delete(filePath);
-            }
-        }
-
-        /// <summary>
-        /// 创建加密类实例
-        /// </summary>
-        private static IEncryptionServices CreateEncryptionInstance(string packageName, EBuildPipeline buildPipeline)
-        {
-            var encryptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(packageName, buildPipeline);
-            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            Debug.Log("encryptionClassName:" + encryptionClassName);
-            foreach (var k in encryptionClassTypes)
-            {
-                Debug.Log(k.FullName);
-            }
-
-            var classType = encryptionClassTypes.Find(x => x.FullName != null && x.FullName.Equals(encryptionClassName));
-            if (classType != null)
-            {
-                Debug.Log($"Use Encryption {classType}");
-                return (IEncryptionServices)Activator.CreateInstance(classType);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        // [MenuItem("AlicizaFramework/Quick Build/一键打包Window", false, 90)]
-        public static void AutomationBuild()
-        {
-            BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
-            BuildDLLCommand.BuildAndCopyDlls(target);
-            AssetDatabase.Refresh();
-            BuildInternal(target, Application.dataPath + "/../Builds/Windows", packageVersion: GetBuildPackageVersion());
-            AssetDatabase.Refresh();
-            BuildImp(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64, $"{Application.dataPath}/../Builds/Windows/Release_Windows.exe");
-        }
-
-        // 构建版本相关
-        private static string GetBuildPackageVersion()
-        {
-            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
-            return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
-        }
-
-        // [MenuItem("AlicizaFramework/Quick Build/一键打包Android", false, 90)]
-        public static void AutomationBuildAndroid()
-        {
-            BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
-            BuildDLLCommand.BuildAndCopyDlls(target);
-            AssetDatabase.Refresh();
-            BuildInternal(target, outputRoot: Application.dataPath + "/../Bundles", packageVersion: GetBuildPackageVersion());
-            AssetDatabase.Refresh();
-            BuildImp(BuildTargetGroup.Android, BuildTarget.Android, $"{Application.dataPath}/../Build/Android/{GetBuildPackageVersion()}Android.apk");
-            // BuildImp(BuildTargetGroup.Android, BuildTarget.Android, $"{Application.dataPath}/../Build/Android/Android.apk");
-        }
-
-        // [MenuItem("AlicizaFramework/Quick Build/一键打包IOS", false, 90)]
-        public static void AutomationBuildIOS()
-        {
-            BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
-            BuildDLLCommand.BuildAndCopyDlls(target);
-            AssetDatabase.Refresh();
-            BuildInternal(target, outputRoot: Application.dataPath + "/../Bundles", packageVersion: GetBuildPackageVersion());
-            AssetDatabase.Refresh();
-            BuildImp(BuildTargetGroup.iOS, BuildTarget.iOS, $"{Application.dataPath}/../Build/IOS/XCode_Project");
-        }
-
-
-        public static void BuildImp(BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string locationPathName)
-        {
-            EditorUserBuildSettings.SwitchActiveBuildTarget(buildTargetGroup, BuildTarget.StandaloneWindows64);
-            AssetDatabase.Refresh();
-
-            BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions
-            {
-                scenes = new[] { "Assets/Scenes/main.unity" },
-                locationPathName = locationPathName,
-                targetGroup = buildTargetGroup,
-                target = buildTarget,
-                options = BuildOptions.None
-            };
-            var report = BuildPipeline.BuildPlayer(buildPlayerOptions);
-            BuildSummary summary = report.summary;
-            if (summary.result == BuildResult.Succeeded)
-            {
-                Debug.Log($"Build success: {summary.totalSize / 1024 / 1024} MB");
-            }
-            else
-            {
-                Debug.Log($"Build Failed" + summary.result);
-            }
-        }
-    }
-}
diff --git a/Client/Assets/Editor/Build/ReleaseTools.cs.meta b/Client/Assets/Editor/Build/ReleaseTools.cs.meta
deleted file mode 100644
index 230a14b..0000000
--- a/Client/Assets/Editor/Build/ReleaseTools.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: fcc39637170549088b4ab0517efe2df3
-timeCreated: 1737627980
\ No newline at end of file
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector.meta b/Client/Assets/Editor/Build/ShaderVariantCollector.meta
new file mode 100644
index 0000000..165a9a9
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dcb9955c15609744a9666bd76f6af3d9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionHelper.cs b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionHelper.cs
new file mode 100644
index 0000000..7345fbf
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionHelper.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEditor;
+using YooAsset.Editor;
+
+public static class ShaderVariantCollectionHelper
+{
+    public static void ClearCurrentShaderVariantCollection()
+    {
+        EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "ClearCurrentShaderVariantCollection");
+    }
+    public static void SaveCurrentShaderVariantCollection(string savePath)
+    {
+        EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "SaveCurrentShaderVariantCollection", savePath);
+    }
+    public static int GetCurrentShaderVariantCollectionShaderCount()
+    {
+        return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionShaderCount");
+    }
+    public static int GetCurrentShaderVariantCollectionVariantCount()
+    {
+        return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionVariantCount");
+    }
+
+    /// <summary>
+    /// 获取着色器的变种总数量
+    /// </summary>
+    public static string GetShaderVariantCount(string assetPath)
+    {
+        Shader shader = AssetDatabase.LoadAssetAtPath<Shader>(assetPath);
+        var variantCount = EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetVariantCount", shader, true);
+        return variantCount.ToString();
+    }
+}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/PlayModeToolbar.cs.meta b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta
similarity index 83%
rename from Client/Assets/Editor/PlayModePlus/PlayModeToolbar.cs.meta
rename to Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta
index 94edaae..301e681 100644
--- a/Client/Assets/Editor/PlayModePlus/PlayModeToolbar.cs.meta
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a078af8bc2041c468308232d58846b5
+guid: ab74d4ff4a2805147883de70a1559a0a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionManifest.cs b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionManifest.cs
new file mode 100644
index 0000000..7175ce2
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionManifest.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEditor;
+
+[Serializable]
+public class ShaderVariantCollectionManifest
+{
+    [Serializable]
+    public class ShaderVariantElement : IComparable<ShaderVariantElement>
+    {
+        public string SortValue { private set; get; }
+
+        /// <summary>
+        ///  Pass type to use in this variant.
+        /// </summary>
+        public PassType PassType;
+
+        /// <summary>
+        /// Array of shader keywords to use in this variant.
+        /// </summary>
+        public string[] Keywords;
+
+        public void MakeSortValue()
+        {
+            string combineKeyword = string.Empty;
+            for (int i = 0; i < Keywords.Length; i++)
+            {
+                if (i == 0)
+                    combineKeyword = Keywords[0];
+                else
+                    combineKeyword = $"{combineKeyword}+{Keywords[0]}";
+            }
+
+            SortValue = $"{PassType}+{combineKeyword}";
+        }
+        public int CompareTo(ShaderVariantElement other)
+        {
+            return SortValue.CompareTo(other.SortValue);
+        }
+    }
+
+    [Serializable]
+    public class ShaderVariantInfo : IComparable<ShaderVariantInfo>
+    {
+        public string SortValue { private set; get; }
+
+        /// <summary>
+        /// 着色器资源路径.
+        /// </summary>
+        public string AssetPath;
+
+        /// <summary>
+        /// 着色器名称
+        /// </summary>
+        public string ShaderName;
+
+        /// <summary>
+        /// 着色器变种总数
+        /// </summary>
+        public int ShaderVariantCount = 0;
+
+        /// <summary>
+        /// 着色器变种列表
+        /// </summary>
+        public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
+
+        public void MakeSortValue()
+        {
+            SortValue = AssetPath + "+" + ShaderName;
+        }
+        public int CompareTo(ShaderVariantInfo other)
+        {
+            return SortValue.CompareTo(other.SortValue);
+        }
+    }
+
+
+    /// <summary>
+    /// Number of shaders in this collection
+    /// </summary>
+    public int ShaderTotalCount;
+
+    /// <summary>
+    /// Number of total varians in this collection
+    /// </summary>
+    public int VariantTotalCount;
+
+    /// <summary>
+    /// Shader variants info list.
+    /// </summary>
+    public List<ShaderVariantInfo> ShaderVariantInfos = new List<ShaderVariantInfo>(1000);
+
+    /// <summary>
+    /// 添加着色器变种信息
+    /// </summary>
+    public void AddShaderVariant(string assetPath, string shaderName, PassType passType, string[] keywords)
+    {
+        // 排序Keyword列表
+        List<string> temper = new List<string>(keywords);
+        temper.Sort();
+
+        var info = GetOrCreateShaderVariantInfo(assetPath, shaderName);
+        ShaderVariantElement element = new ShaderVariantElement();
+        element.PassType = passType;
+        element.Keywords = temper.ToArray();
+        element.MakeSortValue();
+        info.ShaderVariantElements.Add(element);
+        info.ShaderVariantCount++;
+    }
+    private ShaderVariantInfo GetOrCreateShaderVariantInfo(string assetPath, string shaderName)
+    {
+        var selectList = ShaderVariantInfos.Where(t => t.ShaderName == shaderName && t.AssetPath == assetPath).ToList();
+        if (selectList.Count == 0)
+        {
+            ShaderVariantInfo newInfo = new ShaderVariantInfo();
+            newInfo.AssetPath = assetPath;
+            newInfo.ShaderName = shaderName;
+            newInfo.MakeSortValue();
+            ShaderVariantInfos.Add(newInfo);
+            return newInfo;
+        }
+
+        if (selectList.Count != 1)
+            throw new Exception("Should never get here !");
+
+        return selectList[0];
+    }
+
+
+    /// <summary>
+    /// 解析SVC文件并将数据写入到清单
+    /// </summary>
+    public static ShaderVariantCollectionManifest Extract(ShaderVariantCollection svc)
+    {
+        var manifest = new ShaderVariantCollectionManifest();
+        manifest.ShaderTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
+        manifest.VariantTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount();
+
+        using (var so = new SerializedObject(svc))
+        {
+            var shaderArray = so.FindProperty("m_Shaders.Array");
+            if (shaderArray != null && shaderArray.isArray)
+            {
+                for (int i = 0; i < shaderArray.arraySize; ++i)
+                {
+                    var shaderRef = shaderArray.FindPropertyRelative($"data[{i}].first");
+                    var shaderVariantsArray = shaderArray.FindPropertyRelative($"data[{i}].second.variants");
+                    if (shaderRef != null && shaderRef.propertyType == SerializedPropertyType.ObjectReference && shaderVariantsArray != null && shaderVariantsArray.isArray)
+                    {
+                        var shader = shaderRef.objectReferenceValue as Shader;
+                        if (shader == null)
+                        {
+                            throw new Exception("Invalid shader in ShaderVariantCollection file.");
+                        }
+
+                        string shaderAssetPath = AssetDatabase.GetAssetPath(shader);
+                        string shaderName = shader.name;
+
+                        // 添加变种信息
+                        for (int j = 0; j < shaderVariantsArray.arraySize; ++j)
+                        {
+                            var propKeywords = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].keywords");
+                            var propPassType = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].passType");
+                            if (propKeywords != null && propPassType != null && propKeywords.propertyType == SerializedPropertyType.String)
+                            {
+                                string[] keywords = propKeywords.stringValue.Split(' ');
+                                PassType pathType = (PassType)propPassType.intValue;
+                                manifest.AddShaderVariant(shaderAssetPath, shaderName, pathType, keywords);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // 重新排序
+        manifest.ShaderVariantInfos.Sort();
+        foreach (var shaderVariantInfo in manifest.ShaderVariantInfos)
+        {
+            shaderVariantInfo.ShaderVariantElements.Sort();
+        }
+
+        return manifest;
+    }
+}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/BuildManager.cs.meta b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta
similarity index 83%
rename from Client/Assets/Editor/PlayModePlus/BuildManager.cs.meta
rename to Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta
index fe64b6d..1ccf9c8 100644
--- a/Client/Assets/Editor/PlayModePlus/BuildManager.cs.meta
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3ad015755f8508d48ba8bca98199bf77
+guid: 97098b04691f5c046ac4829f1d72f425
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollector.cs b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollector.cs
new file mode 100644
index 0000000..059092e
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollector.cs
@@ -0,0 +1,251 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.IO;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using YooAsset.Editor;
+
+public static class ShaderVariantCollector
+{
+    private enum ESteps
+    {
+        None,
+        Prepare,
+        CollectAllMaterial,
+        CollectVariants,
+        CollectSleeping,
+        WaitingDone,
+    }
+
+    private const float WaitMilliseconds = 3000f;
+    private const float SleepMilliseconds = 3000f;
+    private static string _savePath;
+    private static string _packageName;
+    private static int _processMaxNum;
+    private static Action _completedCallback;
+
+    private static ESteps _steps = ESteps.None;
+    private static Stopwatch _elapsedTime;
+    private static List<string> _allMaterials;
+    private static List<GameObject> _allSpheres = new List<GameObject>(1000);
+
+
+    /// <summary>
+    /// 开始收集
+    /// </summary>
+    public static void Run(string savePath, string packageName, int processMaxNum, Action completedCallback)
+    {
+        if (_steps != ESteps.None)
+            return;
+
+        if (Path.HasExtension(savePath) == false)
+            savePath = $"{savePath}.shadervariants";
+        if (Path.GetExtension(savePath) != ".shadervariants")
+            throw new System.Exception("Shader variant file extension is invalid.");
+        if (string.IsNullOrEmpty(packageName))
+            throw new System.Exception("Package name is null or empty !");
+
+        // 注意：先删除再保存，否则ShaderVariantCollection内容将无法及时刷新
+        AssetDatabase.DeleteAsset(savePath);
+        EditorTools.CreateFileDirectory(savePath);
+        _savePath = savePath;
+        _packageName = packageName;
+        _processMaxNum = processMaxNum;
+        _completedCallback = completedCallback;
+
+        // 聚焦到游戏窗口
+        EditorTools.FocusUnityGameWindow();
+
+        // 创建临时测试场景
+        CreateTempScene();
+
+        _steps = ESteps.Prepare;
+        EditorApplication.update += EditorUpdate;
+    }
+
+    private static void EditorUpdate()
+    {
+        if (_steps == ESteps.None)
+            return;
+
+        if (_steps == ESteps.Prepare)
+        {
+            ShaderVariantCollectionHelper.ClearCurrentShaderVariantCollection();
+            _steps = ESteps.CollectAllMaterial;
+            return; //等待一帧
+        }
+
+        if (_steps == ESteps.CollectAllMaterial)
+        {
+            _allMaterials = GetAllMaterials();
+            _steps = ESteps.CollectVariants;
+            return; //等待一帧
+        }
+
+        if (_steps == ESteps.CollectVariants)
+        {
+            int count = Mathf.Min(_processMaxNum, _allMaterials.Count);
+            List<string> range = _allMaterials.GetRange(0, count);
+            _allMaterials.RemoveRange(0, count);
+            CollectVariants(range);
+
+            if (_allMaterials.Count > 0)
+            {
+                _elapsedTime = Stopwatch.StartNew();
+                _steps = ESteps.CollectSleeping;
+            }
+            else
+            {
+                _elapsedTime = Stopwatch.StartNew();
+                _steps = ESteps.WaitingDone;
+            }
+        }
+
+        if (_steps == ESteps.CollectSleeping)
+        {
+            if (_elapsedTime.ElapsedMilliseconds > SleepMilliseconds)
+            {
+                DestroyAllSpheres();
+                _elapsedTime.Stop();
+                _steps = ESteps.CollectVariants;
+            }
+        }
+
+        if (_steps == ESteps.WaitingDone)
+        {
+            // 注意：一定要延迟保存才会起效
+            if (_elapsedTime.ElapsedMilliseconds > WaitMilliseconds)
+            {
+                _elapsedTime.Stop();
+                _steps = ESteps.None;
+
+                // 保存结果并创建清单
+                ShaderVariantCollectionHelper.SaveCurrentShaderVariantCollection(_savePath);
+                CreateManifest();
+
+                UnityEngine.Debug.Log($"搜集SVC完毕！");
+                EditorApplication.update -= EditorUpdate;
+                _completedCallback?.Invoke();
+            }
+        }
+    }
+    private static void CreateTempScene()
+    {
+        EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects);
+    }
+    private static List<string> GetAllMaterials()
+    {
+        // 获取所有打包的资源
+        CollectResult collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(false, false,  _packageName);
+
+        // 搜集所有材质球
+        int progressValue = 0;
+        HashSet<string> result = new HashSet<string>();
+        foreach (var collectAssetInfo in collectResult.CollectAssets)
+        {
+            if (collectAssetInfo.AssetInfo.AssetType == typeof(UnityEngine.Material))
+            {
+                string assetPath = collectAssetInfo.AssetInfo.AssetPath;
+                if (result.Contains(assetPath) == false)
+                    result.Add(assetPath);
+            }
+            foreach(var dependAssetInfo in collectAssetInfo.DependAssets)
+            {
+                if (dependAssetInfo.AssetType == typeof(UnityEngine.Material))
+                {
+                    string assetPath = dependAssetInfo.AssetPath;
+                    if (result.Contains(assetPath) == false)
+                        result.Add(assetPath);
+                }
+            }
+            EditorTools.DisplayProgressBar("搜集所有材质球", ++progressValue, collectResult.CollectAssets.Count);
+        }
+        EditorTools.ClearProgressBar();
+
+        // 返回结果
+        return result.ToList();
+    }
+    private static void CollectVariants(List<string> materials)
+    {
+        Camera camera = Camera.main;
+        if (camera == null)
+            throw new System.Exception("Not found main camera.");
+
+        // 设置主相机
+        float aspect = camera.aspect;
+        int totalMaterials = materials.Count;
+        float height = Mathf.Sqrt(totalMaterials / aspect) + 1;
+        float width = Mathf.Sqrt(totalMaterials / aspect) * aspect + 1;
+        float halfHeight = Mathf.CeilToInt(height / 2f);
+        float halfWidth = Mathf.CeilToInt(width / 2f);
+        camera.orthographic = true;
+        camera.orthographicSize = halfHeight;
+        camera.transform.position = new Vector3(0f, 0f, -10f);
+
+        // 创建测试球体
+        int xMax = (int)(width - 1);
+        int x = 0, y = 0;
+        int progressValue = 0;
+        for (int i = 0; i < materials.Count; i++)
+        {
+            var material = materials[i];
+            var position = new Vector3(x - halfWidth + 1f, y - halfHeight + 1f, 0f);
+            var go = CreateSphere(material, position, i);
+            if (go != null)
+                _allSpheres.Add(go);
+            if (x == xMax)
+            {
+                x = 0;
+                y++;
+            }
+            else
+            {
+                x++;
+            }
+            EditorTools.DisplayProgressBar("照射所有材质球", ++progressValue, materials.Count);
+        }
+        EditorTools.ClearProgressBar();
+    }
+    private static GameObject CreateSphere(string assetPath, Vector3 position, int index)
+    {
+        var material = AssetDatabase.LoadAssetAtPath<Material>(assetPath);
+        var shader = material.shader;
+        if (shader == null)
+            return null;
+
+        var go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+        go.GetComponent<Renderer>().sharedMaterial = material;
+        go.transform.position = position;
+        go.name = $"Sphere_{index} | {material.name}";
+        return go;
+    }
+    private static void DestroyAllSpheres()
+    {
+        foreach (var go in _allSpheres)
+        {
+            GameObject.DestroyImmediate(go);
+        }
+        _allSpheres.Clear();
+
+        // 尝试释放编辑器加载的资源
+        EditorUtility.UnloadUnusedAssetsImmediate(true);
+    }
+    private static void CreateManifest()
+    {
+        AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+
+        ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(_savePath);
+        if (svc != null)
+        {
+            var wrapper = ShaderVariantCollectionManifest.Extract(svc);
+            string jsonData = JsonUtility.ToJson(wrapper, true);
+            string savePath = _savePath.Replace(".shadervariants", ".json");
+            File.WriteAllText(savePath, jsonData);
+        }
+
+        AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+    }
+}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbar.cs.meta b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollector.cs.meta
similarity index 83%
rename from Client/Assets/Editor/PlayModePlus/CustomUnityToolbar.cs.meta
rename to Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollector.cs.meta
index 1a23d8b..79df03e 100644
--- a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbar.cs.meta
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollector.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c6b91b4b79d447e419bcf0a0509b2a92
+guid: 21b4cc6bf4c0c064d8e2687024e24c86
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorSetting.cs b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorSetting.cs
new file mode 100644
index 0000000..62fecc0
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorSetting.cs
@@ -0,0 +1,29 @@
+using UnityEngine;
+using UnityEditor;
+
+public class ShaderVariantCollectorSetting : ScriptableObject
+{
+    private const string DefaultSavePath = "Assets/MyShaderVariants.shadervariants";
+
+    public static string GeFileSavePath(string packageName)
+    {
+        string key = $"{Application.productName}_{packageName}_GeFileSavePath";
+        return EditorPrefs.GetString(key, DefaultSavePath);
+    }
+    public static void SetFileSavePath(string packageName, string savePath)
+    {
+        string key = $"{Application.productName}_{packageName}_GeFileSavePath";
+        EditorPrefs.SetString(key, savePath);
+    }
+
+    public static int GeProcessCapacity(string packageName)
+    {
+        string key = $"{Application.productName}_{packageName}_GeProcessCapacity";
+        return EditorPrefs.GetInt(key, 1000);
+    }
+    public static void SetProcessCapacity(string packageName, int capacity)
+    {
+        string key = $"{Application.productName}_{packageName}_GeProcessCapacity";
+        EditorPrefs.SetInt(key, capacity);
+    }
+}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbarCallback.cs.meta b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta
similarity index 83%
rename from Client/Assets/Editor/PlayModePlus/CustomUnityToolbarCallback.cs.meta
rename to Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta
index 58314f8..b9566a8 100644
--- a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbarCallback.cs.meta
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b47cc5ca0cc1d7a48906f362e261b472
+guid: 44454e58a49818040a1aef5799e71b30
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.cs b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.cs
new file mode 100644
index 0000000..1120d61
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.cs
@@ -0,0 +1,150 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+using YooAsset.Editor;
+
+public class ShaderVariantCollectorWindow : EditorWindow
+{
+    [MenuItem("Tools/着色器变种收集器", false, 100)]
+    public static void OpenWindow()
+    {
+        ShaderVariantCollectorWindow window = GetWindow<ShaderVariantCollectorWindow>("着色器变种收集工具", true);
+        window.minSize = new Vector2(800, 600);
+    }
+
+    private Button _collectButton;
+    private TextField _collectOutputField;
+    private Label _currentShaderCountField;
+    private Label _currentVariantCountField;
+    private SliderInt _processCapacitySlider;
+    private PopupField<string> _packageField;
+
+    private List<string> _packageNames;
+    private string _currentPackageName;
+
+    public void CreateGUI()
+    {
+        try
+        {
+            VisualElement root = this.rootVisualElement;
+
+            // 加载布局文件
+            var visualAsset = UxmlLoader.LoadWindowUXML<ShaderVariantCollectorWindow>();
+            if (visualAsset == null)
+                return;
+
+            visualAsset.CloneTree(root);
+
+            // 包裹名称列表
+            _packageNames = GetBuildPackageNames();
+            _currentPackageName = _packageNames[0];
+
+            // 文件输出目录
+            _collectOutputField = root.Q<TextField>("CollectOutput");
+            _collectOutputField.SetValueWithoutNotify(ShaderVariantCollectorSetting.GeFileSavePath(_currentPackageName));
+            _collectOutputField.RegisterValueChangedCallback(evt =>
+            {
+                ShaderVariantCollectorSetting.SetFileSavePath(_currentPackageName, _collectOutputField.value);
+            });
+
+            // 收集的包裹
+            var packageContainer = root.Q("PackageContainer");
+            if (_packageNames.Count > 0)
+            {
+                int defaultIndex = GetDefaultPackageIndex(_currentPackageName);
+                _packageField = new PopupField<string>(_packageNames, defaultIndex);
+                _packageField.label = "Package";
+                _packageField.style.width = 350;
+                _packageField.RegisterValueChangedCallback(evt =>
+                {
+                    _currentPackageName = _packageField.value;
+                });
+                packageContainer.Add(_packageField);
+            }
+            else
+            {
+                _packageField = new PopupField<string>();
+                _packageField.label = "Package";
+                _packageField.style.width = 350;
+                packageContainer.Add(_packageField);
+            }
+
+            // 容器值
+            _processCapacitySlider = root.Q<SliderInt>("ProcessCapacity");
+            _processCapacitySlider.SetValueWithoutNotify(ShaderVariantCollectorSetting.GeProcessCapacity(_currentPackageName));
+#if !UNITY_2020_3_OR_NEWER
+            _processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})";
+            _processCapacitySlider.RegisterValueChangedCallback(evt =>
+            {
+                ShaderVariantCollectorSetting.SetProcessCapacity(_currentPackageName, _processCapacitySlider.value);
+                _processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})";
+            });
+#else
+            _processCapacitySlider.RegisterValueChangedCallback(evt =>
+            {
+                ShaderVariantCollectorSetting.SetProcessCapacity(_currentPackageName, _processCapacitySlider.value);
+            });
+#endif
+
+            _currentShaderCountField = root.Q<Label>("CurrentShaderCount");
+            _currentVariantCountField = root.Q<Label>("CurrentVariantCount");
+
+            // 变种收集按钮
+            _collectButton = root.Q<Button>("CollectButton");
+            _collectButton.clicked += CollectButton_clicked;
+        }
+        catch (Exception e)
+        {
+            Debug.LogError(e.ToString());
+        }
+    }
+    private void Update()
+    {
+        if (_currentShaderCountField != null)
+        {
+            int currentShaderCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
+            _currentShaderCountField.text = $"Current Shader Count : {currentShaderCount}";
+        }
+
+        if (_currentVariantCountField != null)
+        {
+            int currentVariantCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount();
+            _currentVariantCountField.text = $"Current Variant Count : {currentVariantCount}";
+        }
+    }
+
+    private void CollectButton_clicked()
+    {
+        string savePath = ShaderVariantCollectorSetting.GeFileSavePath(_currentPackageName);
+        int processCapacity = _processCapacitySlider.value;
+        ShaderVariantCollector.Run(savePath, _currentPackageName, processCapacity, null);
+    }
+
+    // 构建包裹相关
+    private int GetDefaultPackageIndex(string packageName)
+    {
+        for (int index = 0; index < _packageNames.Count; index++)
+        {
+            if (_packageNames[index] == packageName)
+            {
+                return index;
+            }
+        }
+        return 0;
+    }
+    private List<string> GetBuildPackageNames()
+    {
+        List<string> result = new List<string>();
+        foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+        {
+            result.Add(package.PackageName);
+        }
+        return result;
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta
new file mode 100644
index 0000000..6d9150f
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 70401cc80b9807e46bd8283e01b4302f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml
new file mode 100644
index 0000000..6d0ff8c
--- /dev/null
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml
@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;" />
+    <ui:VisualElement name="CollectContainer">
+        <ui:TextField picking-mode="Ignore" label="文件保存路径" name="CollectOutput" style="height: 22px;" />
+        <ui:VisualElement name="PackageContainer" style="height: 24px;" />
+        <ui:Label text="Current Shader Count" display-tooltip-when-elided="true" name="CurrentShaderCount" style="height: 20px; padding-left: 4px;" />
+        <ui:Label text="Current Variant Count" display-tooltip-when-elided="true" name="CurrentVariantCount" style="height: 20px; padding-left: 4px;" />
+        <ui:SliderInt picking-mode="Ignore" label="Capacity" value="9999" high-value="1000" name="ProcessCapacity" low-value="10" show-input-field="true" />
+        <ui:Button text="开始搜集" display-tooltip-when-elided="true" name="CollectButton" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar.uxml.meta b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta
similarity index 86%
rename from Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar.uxml.meta
rename to Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta
index 7d6e0aa..be7861d 100644
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar.uxml.meta
+++ b/Client/Assets/Editor/Build/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 272ada475cb34cb4eabd26fb225d13f5
+guid: 9bff4878063eaf04dab8713e1e662ac5
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}
diff --git a/Client/Assets/Editor/Build/YooExtension/Encryption.cs b/Client/Assets/Editor/Build/YooExtension/Encryption.cs
deleted file mode 100644
index 5fbacd9..0000000
--- a/Client/Assets/Editor/Build/YooExtension/Encryption.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace BuildCli.YooExtension
-{
-    using System;
-    using System.IO;
-    using YooAsset;
-
-    /// <summary>
-    /// 文件偏移加密方式
-    /// </summary>
-    public class FileOffsetEncryption : IEncryptionServices
-    {
-        public EncryptResult Encrypt(EncryptFileInfo fileInfo)
-        {
-            int offset = 32;
-            byte[] fileData = File.ReadAllBytes(fileInfo.FileLoadPath);
-            var encryptedData = new byte[fileData.Length + offset];
-            Buffer.BlockCopy(fileData, 0, encryptedData, offset, fileData.Length);
-
-            EncryptResult result = new EncryptResult();
-            result.Encrypted = true;
-            result.EncryptedData = encryptedData;
-            return result;
-        }
-    }
-
-    //
-    // /// <summary>
-    // /// 文件流加密方式
-    // /// </summary>
-    // public class FileStreamEncryption : IEncryptionServices
-    // {
-    //     public EncryptResult Encrypt(EncryptFileInfo fileInfo)
-    //     {
-    //         if (fileInfo.BundleName.Contains("DLL"))
-    //         {
-    //
-    //         }
-    //
-    //         var fileData = File.ReadAllBytes(fileInfo.FileLoadPath);
-    //         for (int i = 0; i < fileData.Length; i++)
-    //         {
-    //             fileData[i] ^= BundleStream.KEY;
-    //         }
-    //
-    //         EncryptResult result = new EncryptResult();
-    //         result.Encrypted = true;
-    //         result.EncryptedData = fileData;
-    //         return result;
-    //     }
-    // }
-}
diff --git a/Client/Assets/Editor/Build/YooExtension/GameIgnoreRule.cs b/Client/Assets/Editor/Build/YooExtension/GameIgnoreRule.cs
deleted file mode 100644
index 08054e1..0000000
--- a/Client/Assets/Editor/Build/YooExtension/GameIgnoreRule.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using UnityEditor;
-using YooAsset.Editor;
-
-namespace BuildCli.YooExtension
-{
-    public class GameIgnoreRule : IIgnoreRule
-    {
-        /// <summary>
-        /// 查询是否为忽略文件
-        /// </summary>
-        public bool IsIgnore(AssetInfo assetInfo)
-        {
-            if (assetInfo.AssetPath.StartsWith("Assets/") == false && assetInfo.AssetPath.StartsWith("Packages/") == false)
-            {
-                UnityEngine.Debug.LogError($"Invalid asset path : {assetInfo.AssetPath}");
-                return true;
-            }
-
-            // 忽略文件夹
-            if (AssetDatabase.IsValidFolder(assetInfo.AssetPath))
-                return true;
-
-            // 忽略编辑器图标资源
-            if (assetInfo.AssetPath.Contains("/Gizmos/"))
-                return true;
-            // 忽略编辑器专属资源
-            if (assetInfo.AssetPath.Contains("/Editor/") || assetInfo.AssetPath.Contains("/Editor Resources/"))
-                return true;
-
-
-            // 忽略编辑器下的类型资源
-            if (assetInfo.AssetType == typeof(LightingDataAsset))
-                return true;
-            if (assetInfo.AssetType == typeof(LightmapParameters))
-                return true;
-
-            // 忽略Unity引擎无法识别的文件
-            if (assetInfo.AssetType == typeof(UnityEditor.DefaultAsset))
-            {
-                UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetInfo.AssetPath}");
-                return true;
-            }
-
-            return DefaultIgnoreRule.IgnoreFileExtensions.Contains(assetInfo.FileExtension);
-        }
-    }
-}
diff --git a/Client/Assets/Editor/Build/YooExtension/GameIgnoreRule.cs.meta b/Client/Assets/Editor/Build/YooExtension/GameIgnoreRule.cs.meta
deleted file mode 100644
index 5fde24c..0000000
--- a/Client/Assets/Editor/Build/YooExtension/GameIgnoreRule.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 61fc20278e7f482cb871fb5c6259a70b
-timeCreated: 1737867291
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/BuildManager.cs b/Client/Assets/Editor/PlayModePlus/BuildManager.cs
deleted file mode 100644
index da76416..0000000
--- a/Client/Assets/Editor/PlayModePlus/BuildManager.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor;
-using UnityEditor.Presets;
-using UnityEngine;
-
-namespace BuildCli
-{
-    public class BuildManager
-    {
-        public Preset SelectedBuildPreset;
-        public Preset[] PlayerSettingsPresetsInProject;
-
-        public void OpenBuildWindow()
-        {
-#if UNITY_6000_0_OR_NEWER
-            EditorApplication.ExecuteMenuItem("File/Build Profiles");
-#else
-            var buildPlayerWindow = EditorWindow.GetWindow<BuildPlayerWindow>("Build Settings");
-            buildPlayerWindow.Show();
-#endif
-        }
-
-        public static void ApplyPreset(Preset preset)
-        {
-            var projectSettings = Resources.FindObjectsOfTypeAll<PlayerSettings>();
-
-            foreach (var settings in projectSettings)
-            {
-                preset.ApplyTo(settings);
-            }
-        }
-
-        public List<string> GenerateBuildSettingsList()
-        {
-            PlayerSettingsPresetsInProject = AssetDatabase.FindAssets("t:Preset")
-                .Select(AssetDatabase.GUIDToAssetPath)
-                .Where(path => path.Contains("PlayerSettings"))
-                .Select(AssetDatabase.LoadAssetAtPath<Preset>)
-                .ToArray();
-
-            var buildPresetsList = new List<string>(PlayerSettingsPresetsInProject.Select(preset => preset.name));
-
-            return buildPresetsList;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbar.cs b/Client/Assets/Editor/PlayModePlus/CustomUnityToolbar.cs
deleted file mode 100644
index 657e0f8..0000000
--- a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbar.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEditor;
-
-namespace BuildCli
-{
-    [InitializeOnLoad]
-    public static class CustomUnityToolbar
-    {
-        private static readonly List<Action> LeftToolbarGUI = new();
-        private static readonly List<Action> RightToolbarGUI = new();
-
-        static CustomUnityToolbar()
-        {
-            CustomUnityToolbarCallback.OnToolbarGUILeft = () => { DrawToolbar(LeftToolbarGUI); };
-            CustomUnityToolbarCallback.OnToolbarGUIRight = () => { DrawToolbar(RightToolbarGUI); };
-        }
-
-        private static void DrawToolbar(List<Action> toolbarActions)
-        {
-            EditorGUILayout.BeginHorizontal();
-            foreach (var action in toolbarActions) action();
-
-            EditorGUILayout.EndHorizontal();
-        }
-    }
-}
diff --git a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbarCallback.cs b/Client/Assets/Editor/PlayModePlus/CustomUnityToolbarCallback.cs
deleted file mode 100644
index c107df9..0000000
--- a/Client/Assets/Editor/PlayModePlus/CustomUnityToolbarCallback.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Reflection;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace BuildCli
-{
-    public static class CustomUnityToolbarCallback
-    {
-        private static readonly Type MToolbarType = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.Toolbar");
-
-        private static ScriptableObject _mCurrentToolbar;
-
-        private static Action _onToolbarGUI;
-        public static Action OnToolbarGUILeft;
-        public static Action OnToolbarGUIRight;
-
-        static CustomUnityToolbarCallback()
-        {
-            EditorApplication.delayCall -= OnUpdate;
-            EditorApplication.delayCall += OnUpdate;
-        }
-
-        private static void OnUpdate()
-        {
-            if (_mCurrentToolbar != null) return;
-            var toolbars = Resources.FindObjectsOfTypeAll(MToolbarType);
-            _mCurrentToolbar = toolbars.Length > 0 ? (ScriptableObject) toolbars[0] : null;
-
-            if (_mCurrentToolbar == null) return;
-            var root = _mCurrentToolbar.GetType()
-                .GetField("m_Root", BindingFlags.NonPublic | BindingFlags.Instance);
-            var mRoot = root?.GetValue(_mCurrentToolbar) as VisualElement;
-
-            if (mRoot == null) return;
-            var playButton = mRoot.Q("Play");
-            var extendedPlayModeToolbar = new PlayModeToolbar();
-            mRoot.Q("ToolbarZoneRightAlign").Add(extendedPlayModeToolbar);
-
-            RegisterCallback("ToolbarZoneLeftAlign", OnToolbarGUILeft);
-            RegisterCallback("ToolbarZoneRightAlign", OnToolbarGUIRight);
-        }
-
-        private static void RegisterCallback(string root, Action action)
-        {
-            var toolbarZone =
-                _mCurrentToolbar?.GetType().GetProperty(root)?.GetValue(_mCurrentToolbar) as VisualElement;
-
-            if (toolbarZone == null) return;
-            var container = new IMGUIContainer();
-            container.onGUIHandler = () => { action?.Invoke(); };
-            container.style.flexGrow = 1;
-            container.style.flexDirection = FlexDirection.Row;
-            toolbarZone.Add(container);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/LICENSE.md b/Client/Assets/Editor/PlayModePlus/LICENSE.md
deleted file mode 100644
index 33e6a71..0000000
--- a/Client/Assets/Editor/PlayModePlus/LICENSE.md
+++ /dev/null
@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Disillusion
-Copyright (c) 2023-2024 TippingGame tippinggame@163.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/Client/Assets/Editor/PlayModePlus/PlayModeManager.cs b/Client/Assets/Editor/PlayModePlus/PlayModeManager.cs
deleted file mode 100644
index 832acb6..0000000
--- a/Client/Assets/Editor/PlayModePlus/PlayModeManager.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor;
-using UnityEditor.SceneManagement;
-using UnityEngine;
-using YooAsset;
-
-namespace BuildCli
-{
-    public class PlayModeManager
-    {
-        private string[] _playmodeSettings;
-
-        private Dictionary<string, EPlayMode> _resourceModeSettings = new Dictionary<string, EPlayMode>
-        {
-            { "编辑器模式", EPlayMode.EditorSimulateMode },
-            { "单机模式", EPlayMode.OfflinePlayMode },
-            { "热更模式", EPlayMode.HostPlayMode },
-        };
-
-        private static string PrefsKey => Application.dataPath.GetHashCode() + "GamePlayMode";
-
-        public static void EditorStartScene() => EditorSceneManager.playModeStartScene = null;
-
-        public void PlayScene()
-        {
-            if (!EditorApplication.isPlaying)
-            {
-                EditorApplication.isPlaying = true;
-            }
-            else
-                EditorApplication.isPlaying = false;
-        }
-
-
-        public List<string> GenerateResourceModeList()
-        {
-            return _resourceModeSettings.Keys.ToList();
-        }
-
-
-        public void SetPlayMode(string value)
-        {
-            if (_resourceModeSettings.TryGetValue(value, out EPlayMode playMode))
-            {
-                EditorPrefs.SetInt(PrefsKey, (int)playMode);
-            }
-        }
-
-
-        public int GetSelectPlayMode()
-        {
-            var selectIndex = EditorPrefs.GetInt(PrefsKey, -1);
-            if (selectIndex == -1)
-            {
-                selectIndex = (int)EPlayMode.EditorSimulateMode;
-                EditorPrefs.SetInt(PrefsKey, selectIndex);
-            }
-            return selectIndex;
-        }
-
-        public string GetSelectPlayModeValue()
-        {
-            var selectIndex = EditorPrefs.GetInt(PrefsKey, -1);
-            if (selectIndex == -1)
-            {
-                selectIndex = (int)EPlayMode.EditorSimulateMode;
-                EditorPrefs.SetInt(PrefsKey, selectIndex);
-            }
-
-            EPlayMode mode = (EPlayMode)selectIndex;
-            return  mode.ToString();
-        }
-
-
-        public List<string> GeneratePlayModeSettingsList()
-        {
-            _playmodeSettings = new[]
-            {
-                "Default (Reload Domain, Reload Scene)", "Disable Reload Domain", "Disable Reload Scene", "Disable All"
-            };
-
-            var playModeSettingsList = new List<string>(_playmodeSettings);
-
-            return playModeSettingsList;
-        }
-    }
-}
diff --git a/Client/Assets/Editor/PlayModePlus/PlayModeManager.cs.meta b/Client/Assets/Editor/PlayModePlus/PlayModeManager.cs.meta
deleted file mode 100644
index 603160f..0000000
--- a/Client/Assets/Editor/PlayModePlus/PlayModeManager.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b51aeed2989245259b93bddc8922b086
-timeCreated: 1676311145
\ No newline at end of file
diff --git a/Client/Assets/Editor/PlayModePlus/PlayModePlus.uss b/Client/Assets/Editor/PlayModePlus/PlayModePlus.uss
deleted file mode 100644
index f67ef39..0000000
--- a/Client/Assets/Editor/PlayModePlus/PlayModePlus.uss
+++ /dev/null
@@ -1,133 +0,0 @@
-.plus-button {
-    background-color: rgb(56, 56, 56);
-    border-top-left-radius: 5px;
-    border-bottom-left-radius: 5px;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 11px;
-}
-
-.plus-button:hover {
-    background-color: rgb(75, 75, 75);
-    -unity-background-image-tint-color: rgb(255, 255, 255);
-    -unity-background-scale-mode: scale-to-fit;
-}
-
-.plus-button:active {
-    background-color: rgb(0, 0, 0);
-    -unity-background-image-tint-color: rgb(89, 158, 94);
-}
-
-.unity-base-field {
-    width: 31px;
-    height: 100%;
-    background-image: none;
-    background-color: rgba(0, 0, 0, 0);
-    -unity-background-scale-mode: scale-to-fit;
-    justify-content: center;
-    margin-left: 0px;
-    margin-right: 1px;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    border-top-width: 0px;
-}
-
-.unity-base-field:hover .unity-base-popup-field__input {
-    background-color: rgb(75, 75, 75);
-    -unity-background-image-tint-color: rgb(255, 255, 255);
-}
-
-.unity-base-field__input {
-    padding-bottom: 0px;
-    border-width: 0px;
-    border-top-width: 0px;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-    -unity-background-scale-mode: scale-to-fit;
-}
-
-.unity-base-popup-field__input {
-    border-radius: 0px;
-    -unity-background-scale-mode: scale-to-fit;
-    border-top-width: 0px;
-    min-width: 31px;
-    background-color: rgb(56, 56, 56);
-    background-image: none;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-}
-
-.scene-select-dropdown .unity-base-popup-field__input {
-    background-image: url('project://database/Packages/com.disillusion.play-mode-plus/Editor/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png?fileID=2800000&guid=d56d19b3e6d0fc0419cda6972838d5ba&type=3#CustomDropdownArrow');
-    -unity-background-scale-mode: scale-to-fit;
-    width: 14px;
-    height: 21px;
-    margin-left: 0px;
-    margin-right: 0px;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    justify-content: center;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-top-left-radius: 5px;
-    border-bottom-left-radius: 5px;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 11px;
-}
-
-.play-mode-settings-dropdown .unity-base-popup-field__input {
-    background-image: url('project://database/Packages/com.disillusion.play-mode-plus/Editor/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png?fileID=2800000&guid=b620a07f1fa7bf54b874f9661d2c6140&type=3#CustomSceneCogButton');
-    -unity-background-scale-mode: scale-to-fit;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 11px;
-    border-radius: 5px;
-}
-
-.build-settings-select-dropdown .unity-base-popup-field__input {
-    background-image: url('project://database/Packages/com.disillusion.play-mode-plus/Editor/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png?fileID=2800000&guid=d56d19b3e6d0fc0419cda6972838d5ba&type=3#CustomDropdownArrow');
-    -unity-background-scale-mode: scale-to-fit;
-    width: auto;
-    height: 21px;
-    justify-content: center;
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 11px;
-}
-
-.dropdown-override {
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 8px;
-    width: 6px;
-    margin-left: 9px;
-    margin-right: 12px;
-    padding: 0px;
-}
-
-.unity-base-popup-field__input:hover {
-    background-color: rgb(75, 75, 75);
-    -unity-background-image-tint-color: rgb(255, 255, 255);
-}
-
-.unity-base-popup-field__arrow {
-    display: none;
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 11px;
-}
-
-.unity-base-popup-field__text {
-    display: none;
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-color: rgba(56, 56, 56, 0);
-    border-width: 11px;
-}
diff --git a/Client/Assets/Editor/PlayModePlus/PlayModePlus.uss.meta b/Client/Assets/Editor/PlayModePlus/PlayModePlus.uss.meta
deleted file mode 100644
index 7945856..0000000
--- a/Client/Assets/Editor/PlayModePlus/PlayModePlus.uss.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 88ed63fd5c4857c43a3dbb9672116bb3
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
-  disableValidation: 0
diff --git a/Client/Assets/Editor/PlayModePlus/PlayModeToolbar.cs b/Client/Assets/Editor/PlayModePlus/PlayModeToolbar.cs
deleted file mode 100644
index db579f7..0000000
--- a/Client/Assets/Editor/PlayModePlus/PlayModeToolbar.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System.Linq;
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-using YooAsset;
-
-namespace BuildCli
-{
-    public class PlayModeToolbar : VisualElement
-    {
-        private readonly PlayModeManager _playModeManager = new();
-        private readonly BuildManager _buildManager = new();
-
-        private readonly Button _buildButton;
-        private readonly DropdownField _selectSceneDropdown;
-        private readonly DropdownField _selectPlayModeSettingsDropdown;
-        private readonly DropdownField _selectPlayerSettingsPresetsDropdown;
-
-        public PlayModeToolbar()
-        {
-#if UNITY_6000_0_OR_NEWER
-            var visualTree = Resources.Load<VisualTreeAsset>("com.disillusion.play-mode-plus/PlayModePlusToolbar6000");
-#else
-            var visualTree = Resources.Load<VisualTreeAsset>("com.disillusion.play-mode-plus/PlayModePlusToolbar");
-#endif
-            visualTree.CloneTree(this);
-
-            style.flexGrow = 1;
-
-            _buildButton = this.Q<Button>("build-button");
-            _buildButton.clicked -= OnBuildClicked;
-            _buildButton.clicked += OnBuildClicked;
-
-
-            #region Select Scene Dropdown
-
-            _selectSceneDropdown = this.Q<DropdownField>("select-scene-dropdown");
-            _selectSceneDropdown.RegisterCallback<FocusEvent>(evt =>
-                _selectSceneDropdown.choices = _playModeManager.GenerateResourceModeList());
-            _selectSceneDropdown.RegisterCallback<ChangeEvent<string>>(evt => { _playModeManager.SetPlayMode(evt.newValue); });
-
-            #endregion
-
-            #region Play Mode Settings Dropdown
-
-            _selectPlayModeSettingsDropdown = this.Q<DropdownField>("play-mode-settings-dropdown");
-            _selectPlayModeSettingsDropdown.RegisterCallback<FocusEvent>(evt =>
-                _selectSceneDropdown.choices = _playModeManager.GenerateResourceModeList());
-            _selectPlayModeSettingsDropdown.RegisterCallback<ChangeEvent<string>>(evt =>
-            {
-                var editorSettings = new SerializedObject(
-                    AssetDatabase.LoadAssetAtPath("ProjectSettings/EditorSettings.asset", typeof(Object)));
-                var enterPlayModeOptionsEnabled =
-                    editorSettings.FindProperty("m_EnterPlayModeOptionsEnabled");
-                var enterPlayModeOptions = editorSettings.FindProperty("m_EnterPlayModeOptions");
-
-                switch (_selectPlayModeSettingsDropdown.value)
-                {
-                    case "Default (Reload Domain, Reload Scene":
-                        enterPlayModeOptionsEnabled.boolValue = false;
-                        enterPlayModeOptions.intValue = (int)EnterPlayModeOptions.None;
-                        break;
-                    case "Disable Reload Domain":
-                        enterPlayModeOptionsEnabled.boolValue = true;
-                        enterPlayModeOptions.intValue = (int)EnterPlayModeOptions.DisableDomainReload;
-                        break;
-                    case "Disable Reload Scene":
-                        enterPlayModeOptionsEnabled.boolValue = true;
-                        enterPlayModeOptions.intValue = (int)EnterPlayModeOptions.DisableSceneReload;
-                        break;
-                    case "Disable All":
-                        enterPlayModeOptionsEnabled.boolValue = true;
-                        enterPlayModeOptions.intValue |= (int)EnterPlayModeOptions.DisableDomainReload;
-                        enterPlayModeOptions.intValue |= (int)EnterPlayModeOptions.DisableSceneReload;
-                        break;
-                    default:
-                        enterPlayModeOptionsEnabled.boolValue = false;
-                        enterPlayModeOptions.intValue = (int)EnterPlayModeOptions.None;
-                        break;
-                }
-
-                editorSettings.ApplyModifiedProperties();
-                EditorUtility.SetDirty(editorSettings.targetObject);
-                AssetDatabase.SaveAssets();
-            });
-
-            #endregion
-
-            #region Build Settings Dropdown
-
-            _selectPlayerSettingsPresetsDropdown = this.Q<DropdownField>("build-settings-dropdown");
-            _selectPlayerSettingsPresetsDropdown.RegisterCallback<FocusEvent>(evt =>
-                _selectPlayerSettingsPresetsDropdown.choices = _buildManager.GenerateBuildSettingsList());
-            _selectPlayerSettingsPresetsDropdown.RegisterCallback<ChangeEvent<string>>(evt =>
-            {
-                _buildManager.SelectedBuildPreset =
-                    _buildManager.PlayerSettingsPresetsInProject.FirstOrDefault(presets =>
-                        presets.name == evt.newValue);
-                BuildManager.ApplyPreset(_buildManager.SelectedBuildPreset);
-            });
-
-            #endregion
-
-            // Set the play mode scene for Default play button
-            PlayModeManager.EditorStartScene();
-
-            // Populate Dropdowns
-            _selectSceneDropdown.choices = _playModeManager.GenerateResourceModeList();
-            _selectPlayModeSettingsDropdown.choices = _playModeManager.GeneratePlayModeSettingsList();
-            _selectPlayerSettingsPresetsDropdown.choices = _buildManager.GenerateBuildSettingsList();
-
-            // Set Select Scene Dropdown value to Last Scene which was opened
-            _selectSceneDropdown.index = _playModeManager.GetSelectPlayMode();
-
-        }
-
-
-
-
-        private void OnBuildClicked() => _buildManager.OpenBuildWindow();
-    }
-}
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png
deleted file mode 100644
index 3a83eec..0000000
Binary files a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png and /dev/null differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png
deleted file mode 100644
index 3c40609..0000000
Binary files a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomDropdownArrow.png and /dev/null differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayButton.png b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayButton.png
deleted file mode 100644
index 324e426..0000000
Binary files a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayButton.png and /dev/null differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayStopButton.png b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayStopButton.png
deleted file mode 100644
index c47ad06..0000000
Binary files a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomPlayStopButton.png and /dev/null differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png
deleted file mode 100644
index 2618a06..0000000
Binary files a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png and /dev/null differ
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png.meta b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png.meta
deleted file mode 100644
index 1f40dd8..0000000
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomSceneCogButton.png.meta
+++ /dev/null
@@ -1,183 +0,0 @@
-fileFormatVersion: 2
-guid: b620a07f1fa7bf54b874f9661d2c6140
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 1
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: tvOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar.uxml b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar.uxml
deleted file mode 100644
index e4d60f9..0000000
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar.uxml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <Style src="project://database/Assets/Editor/PlayModePlus/PlayModePlus.uss?fileID=7433441132597879392&amp;guid=88ed63fd5c4857c43a3dbb9672116bb3&amp;type=3#PlayModePlus" />
-    <ui:VisualElement name="VisualElement" style="overflow: visible; flex-direction: row; align-items: center;">
-        <ui:DropdownField index="-1" name="select-scene-dropdown" tooltip="Select PlayMode Scene" class="scene-select-dropdown dropdown-override" style="top: 0; align-items: flex-start; -unity-slice-scale: 1px; background-position-y: center 0; background-position-x: center 0; justify-content: center; align-self: auto; align-content: flex-start; border-top-width: 0;" />
-        <ui:DropdownField index="-1" name="play-mode-settings-dropdown" tooltip="PlayMode Settings" class="play-mode-settings-dropdown" style="height: 22px; top: 0;" />
-        <ui:Button display-tooltip-when-elided="true" tooltip="Build" name="build-button" class="unity-toolbar-toogle plus-button" style="width: 31px; height: 21px; margin-left: 4px; margin-right: 1px; margin-top: 0; margin-bottom: 1px; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; background-image: url(&quot;project://database/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png?fileID=2800000&amp;guid=e663f57b9e7db7544b771960de59b03f&amp;type=3#CustomBuildButtonOutlined&quot;); -unity-background-scale-mode: scale-to-fit; top: 0;" />
-        <ui:DropdownField index="-1" name="build-settings-dropdown" tooltip="Select Build Settings Preset" class="build-settings-select-dropdown dropdown-override" style="top: 0; align-items: flex-start; justify-content: center; align-content: flex-start; align-self: auto; border-top-width: 0;" />
-    </ui:VisualElement>
-</ui:UXML>
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar6000.uxml b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar6000.uxml
deleted file mode 100644
index e92b146..0000000
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar6000.uxml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <Style src="project://database/Assets/Editor/PlayModePlus/PlayModePlus.uss?fileID=7433441132597879392&amp;guid=88ed63fd5c4857c43a3dbb9672116bb3&amp;type=3#PlayModePlus" />
-    <ui:VisualElement name="VisualElement" style="overflow: visible; flex-direction: row; align-items: center;">
-        <ui:DropdownField index="-1" name="select-scene-dropdown" tooltip="Select PlayMode Scene" class="scene-select-dropdown dropdown-override" style="top: 0; align-items: flex-start; -unity-slice-scale: 1px; background-position-y: center 0; background-position-x: center 0; justify-content: center; align-self: auto; align-content: flex-start;" />
-        <ui:DropdownField index="-1" name="play-mode-settings-dropdown" tooltip="PlayMode Settings" class="play-mode-settings-dropdown" style="height: 22px; top: 0;" />
-        <ui:Button display-tooltip-when-elided="true" tooltip="Build" name="build-button" class="unity-toolbar-toogle plus-button" style="width: 31px; height: 21px; margin-left: 4px; margin-right: 1px; margin-top: 0; margin-bottom: 1px; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; background-image: url(&quot;project://database/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/CustomBuildButtonOutlined.png?fileID=2800000&amp;guid=e663f57b9e7db7544b771960de59b03f&amp;type=3#CustomBuildButtonOutlined&quot;); -unity-background-scale-mode: scale-to-fit; top: 0;" />
-        <ui:DropdownField index="-1" name="build-settings-dropdown" tooltip="Select Build Settings Preset" class="build-settings-select-dropdown dropdown-override" style="top: 0; align-items: flex-start; justify-content: center; align-content: flex-start; align-self: auto;" />
-    </ui:VisualElement>
-</ui:UXML>
diff --git a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar6000.uxml.meta b/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar6000.uxml.meta
deleted file mode 100644
index c17ef1b..0000000
--- a/Client/Assets/Editor/PlayModePlus/Resources/com.disillusion.play-mode-plus/PlayModePlusToolbar6000.uxml.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 20cdb8c96ae40c34b90f6be123593c91
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Client/Assets/Editor/Postprocessor/Atlas.meta b/Client/Assets/Editor/Postprocessor/Atlas.meta
new file mode 100644
index 0000000..72dfcbe
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ad986817a2f94919a9063c0f45cbfd78
+timeCreated: 1738748198
\ No newline at end of file
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasConfiguration.cs b/Client/Assets/Editor/Postprocessor/Atlas/AtlasConfiguration.cs
new file mode 100644
index 0000000..9251051
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasConfiguration.cs
@@ -0,0 +1,24 @@
+// AtlasConfiguration.cs
+
+using UnityEditor;
+using UnityEngine;
+
+[FilePath("ProjectSettings/AtlasConfiguration.asset",FilePathAttribute.Location.ProjectFolder)]
+public class AtlasConfiguration : ScriptableSingleton<AtlasConfiguration>
+{
+    [Header("Directory Settings")]
+    public string atlasOutputPath = "Assets/Art/Atlases";
+    public string rawUIPath = "Assets/Art/UI/Raw";
+    public string uiAtlasPath = "Assets/Art/UI/Atlases";
+
+    [Header("Texture Settings")]
+    public TextureImporterFormat androidFormat = TextureImporterFormat.ASTC_6x6;
+    public TextureImporterFormat iosFormat = TextureImporterFormat.ASTC_5x5;
+    public TextureImporterFormat webglFormat = TextureImporterFormat.ASTC_6x6;
+    public int compressionQuality = 50;
+
+    [Header("Packing Settings")]
+    public int padding = 2;
+    public bool enableRotation = true;
+    public int blockOffset = 1;
+}
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasConfiguration.cs.meta b/Client/Assets/Editor/Postprocessor/Atlas/AtlasConfiguration.cs.meta
new file mode 100644
index 0000000..e327d2f
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasConfiguration.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3b1dfcbf9ece40758a159f4edb04e983
+timeCreated: 1738748213
\ No newline at end of file
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs b/Client/Assets/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs
new file mode 100644
index 0000000..c4bad0e
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs
@@ -0,0 +1,75 @@
+// AtlasEditorWindow.cs
+
+using UnityEditor;
+using UnityEngine;
+
+public class AtlasEditorWindow : EditorWindow
+{
+    private AtlasConfiguration config;
+    private Vector2 scrollPos;
+
+    [MenuItem("Tools/Atlas Manager")]
+    public static void ShowWindow()
+    {
+        GetWindow<AtlasEditorWindow>("Atlas Manager");
+    }
+
+    private void OnEnable()
+    {
+        LoadOrCreateConfig();
+    }
+
+    private void LoadOrCreateConfig()
+    {
+        config = AtlasConfiguration.instance;
+    }
+
+    private void OnGUI()
+    {
+        scrollPos = EditorGUILayout.BeginScrollView(scrollPos);
+
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("Atlas Configuration", EditorStyles.boldLabel);
+
+        if (config == null) return;
+
+        DrawConfigurationGUI();
+        EditorGUILayout.EndScrollView();
+    }
+
+    private void DrawConfigurationGUI()
+    {
+        EditorGUI.BeginChangeCheck();
+
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("Paths", EditorStyles.boldLabel);
+        config.atlasOutputPath = EditorGUILayout.TextField("Atlas Output", config.atlasOutputPath);
+        config.rawUIPath = EditorGUILayout.TextField("Raw UI Path", config.rawUIPath);
+        config.uiAtlasPath = EditorGUILayout.TextField("UI Atlas Path", config.uiAtlasPath);
+
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("Texture Settings", EditorStyles.boldLabel);
+        config.androidFormat = (TextureImporterFormat)EditorGUILayout.EnumPopup("Android Format", config.androidFormat);
+        config.iosFormat = (TextureImporterFormat)EditorGUILayout.EnumPopup("iOS Format", config.iosFormat);
+        config.webglFormat = (TextureImporterFormat)EditorGUILayout.EnumPopup("WebGL Format", config.webglFormat);
+        config.compressionQuality = EditorGUILayout.IntSlider("Compression Quality",
+            config.compressionQuality, 0, 100);
+
+        EditorGUILayout.Space();
+        EditorGUILayout.LabelField("Packing Settings", EditorStyles.boldLabel);
+        config.padding = EditorGUILayout.IntField("Padding", config.padding);
+        config.enableRotation = EditorGUILayout.Toggle("Enable Rotation", config.enableRotation);
+        config.blockOffset = EditorGUILayout.IntField("Block Offset", config.blockOffset);
+
+        if (EditorGUI.EndChangeCheck())
+        {
+            EditorUtility.SetDirty(config);
+        }
+
+        EditorGUILayout.Space();
+        if (GUILayout.Button("Force Rebuild All Atlases", GUILayout.Height(30)))
+        {
+            AtlasProcessor.ForceRebuildAtlases(config);
+        }
+    }
+}
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs.meta b/Client/Assets/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs.meta
new file mode 100644
index 0000000..1487f78
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 42f94205e1cf43a0b15a96e17838c8b3
+timeCreated: 1738748236
\ No newline at end of file
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasPostprocessor.cs b/Client/Assets/Editor/Postprocessor/Atlas/AtlasPostprocessor.cs
new file mode 100644
index 0000000..6971134
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasPostprocessor.cs
@@ -0,0 +1,37 @@
+// AtlasPostprocessor.cs
+using UnityEditor;
+using UnityEngine;
+
+public class AtlasPostprocessor : AssetPostprocessor
+{
+    private static AtlasConfiguration config;
+
+    private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets,
+        string[] movedAssets, string[] movedFromAssetPaths)
+    {
+        if (config == null)
+        {
+            config = AtlasConfiguration.instance;
+        }
+        if (config == null) return;
+
+        foreach (var path in importedAssets) HandleAsset(path);
+        foreach (var path in movedAssets) HandleAsset(path);
+        foreach (var path in deletedAssets) HandleDeletedAsset(path);
+        foreach (var path in movedFromAssetPaths) HandleDeletedAsset(path);
+    }
+
+    private static void HandleAsset(string path)
+    {
+        if (path.EndsWith(".png") || path.EndsWith(".jpg"))
+        {
+            AtlasProcessor.ProcessSingleSprite(path, config);
+        }
+    }
+
+    private static void HandleDeletedAsset(string path)
+    {
+        // Handle removed sprites from atlases
+        // Implementation depends on tracking system
+    }
+}
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasPostprocessor.cs.meta b/Client/Assets/Editor/Postprocessor/Atlas/AtlasPostprocessor.cs.meta
new file mode 100644
index 0000000..ecc3c6f
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasPostprocessor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1cf727bde4a5479b919d41cb8224d94b
+timeCreated: 1738748276
\ No newline at end of file
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasProcessor.cs b/Client/Assets/Editor/Postprocessor/Atlas/AtlasProcessor.cs
new file mode 100644
index 0000000..92e4599
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasProcessor.cs
@@ -0,0 +1,210 @@
+// AtlasProcessor.cs
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEditor.U2D;
+using UnityEngine;
+using UnityEngine.U2D;
+
+public static class AtlasProcessor
+{
+    private static readonly HashSet<string> DirtyAtlas = new HashSet<string>();
+    private static readonly Dictionary<string, HashSet<string>> AtlasContents =
+        new Dictionary<string, HashSet<string>>();
+
+    public static void ForceRebuildAtlases(AtlasConfiguration config)
+    {
+        InitializeAtlasData(config);
+        ProcessAllSprites(config);
+        PackAllAtlases(config);
+    }
+
+    private static void InitializeAtlasData(AtlasConfiguration config)
+    {
+        AtlasContents.Clear();
+        var atlasGuids = AssetDatabase.FindAssets("t:SpriteAtlas", new[] { config.atlasOutputPath });
+
+        foreach (var guid in atlasGuids)
+        {
+            var path = AssetDatabase.GUIDToAssetPath(guid);
+            var atlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(path);
+            if (atlas == null) continue;
+
+            var atlasName = Path.GetFileNameWithoutExtension(path);
+            var packed = atlas.GetPackables();
+            AtlasContents[atlasName] = new HashSet<string>();
+
+            foreach (var obj in packed)
+            {
+                var assetPath = AssetDatabase.GetAssetPath(obj);
+                if (!string.IsNullOrEmpty(assetPath))
+                {
+                    AtlasContents[atlasName].Add(assetPath);
+                }
+            }
+        }
+    }
+
+    private static void ProcessAllSprites(AtlasConfiguration config)
+    {
+        var allSprites = AssetDatabase.FindAssets("t:Sprite", new[] { config.rawUIPath });
+        foreach (var guid in allSprites)
+        {
+            var path = AssetDatabase.GUIDToAssetPath(guid);
+            ProcessSingleSprite(path, config);
+        }
+    }
+
+    public static void ProcessSingleSprite(string path, AtlasConfiguration config)
+    {
+        if (!path.StartsWith(config.rawUIPath)) return;
+
+        var importer = AssetImporter.GetAtPath(path) as TextureImporter;
+        if (importer == null) return;
+
+        ConfigureTextureImporter(importer, config);
+        AddToAtlas(path, config);
+    }
+
+    private static void ConfigureTextureImporter(TextureImporter importer, AtlasConfiguration config)
+    {
+        var changed = false;
+        var settings = new TextureImporterSettings();
+        importer.ReadTextureSettings(settings);
+
+        if (importer.textureType != TextureImporterType.Sprite)
+        {
+            importer.textureType = TextureImporterType.Sprite;
+            changed = true;
+        }
+
+        if (settings.spriteGenerateFallbackPhysicsShape)
+        {
+            settings.spriteGenerateFallbackPhysicsShape = false;
+            importer.SetTextureSettings(settings);
+            changed = true;
+        }
+
+        ApplyPlatformSettings(importer, "Android", config.androidFormat, config);
+        ApplyPlatformSettings(importer, "iPhone", config.iosFormat, config);
+        ApplyPlatformSettings(importer, "WebGL", config.webglFormat, config);
+
+        if (changed) importer.SaveAndReimport();
+    }
+
+    private static void ApplyPlatformSettings(TextureImporter importer, string platform,
+        TextureImporterFormat format, AtlasConfiguration config)
+    {
+        var settings = importer.GetPlatformTextureSettings(platform);
+        if (!settings.overridden || settings.format != format ||
+            settings.compressionQuality != config.compressionQuality)
+        {
+            settings.overridden = true;
+            settings.format = format;
+            settings.compressionQuality = config.compressionQuality;
+            importer.SetPlatformTextureSettings(settings);
+        }
+    }
+
+    private static void AddToAtlas(string spritePath, AtlasConfiguration config)
+    {
+        var atlasName = GetAtlasName(spritePath, config);
+        if (string.IsNullOrEmpty(atlasName)) return;
+
+        if (!AtlasContents.TryGetValue(atlasName, out var paths))
+        {
+            paths = new HashSet<string>();
+            AtlasContents[atlasName] = paths;
+        }
+
+        if (paths.Add(spritePath)) DirtyAtlas.Add(atlasName);
+    }
+
+    private static string GetAtlasName(string path, AtlasConfiguration config)
+    {
+        var relativePath = path.Replace(config.rawUIPath, "").TrimStart('/');
+        var directory = Path.GetDirectoryName(relativePath);
+        return directory?.Replace("/", "_");
+    }
+
+    private static void PackAllAtlases(AtlasConfiguration config)
+    {
+        foreach (var atlasName in DirtyAtlas)
+        {
+            CreateOrUpdateAtlas(atlasName, config);
+        }
+        DirtyAtlas.Clear();
+
+        SpriteAtlasUtility.PackAllAtlases(EditorUserBuildSettings.activeBuildTarget);
+        AssetDatabase.SaveAssets();
+    }
+
+    private static void CreateOrUpdateAtlas(string atlasName, AtlasConfiguration config)
+    {
+        if (!System.IO.Directory.Exists(config.atlasOutputPath))
+        {
+            Directory.CreateDirectory(config.atlasOutputPath);
+        }
+        var path = $"{config.atlasOutputPath}/{atlasName}.spriteatlas";
+        var atlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(path) ?? new SpriteAtlas();
+
+        ConfigureAtlasSettings(atlas, config);
+        AddSpritesToAtlas(atlas, AtlasContents[atlasName]);
+
+        if (!AssetDatabase.Contains(atlas))
+        {
+            AssetDatabase.CreateAsset(atlas, path);
+        }
+        else
+        {
+            EditorUtility.SetDirty(atlas);
+        }
+    }
+
+    private static void ConfigureAtlasSettings(SpriteAtlas atlas, AtlasConfiguration config)
+    {
+        // Packing Settings
+        var packingSettings = new SpriteAtlasPackingSettings
+        {
+            padding = config.padding,
+            enableRotation = config.enableRotation,
+            blockOffset = config.blockOffset
+        };
+        atlas.SetPackingSettings(packingSettings);
+
+        // Texture Settings
+        var textureSettings = new SpriteAtlasTextureSettings
+        {
+            generateMipMaps = false,
+            sRGB = true,
+            filterMode = FilterMode.Bilinear
+        };
+        atlas.SetTextureSettings(textureSettings);
+
+        // Platform Settings
+        SetPlatformFormat(atlas, "Android", config.androidFormat, config);
+        SetPlatformFormat(atlas, "iPhone", config.iosFormat, config);
+        SetPlatformFormat(atlas, "WebGL", config.webglFormat, config);
+    }
+
+    private static void SetPlatformFormat(SpriteAtlas atlas, string platform,
+        TextureImporterFormat format, AtlasConfiguration config)
+    {
+        var settings = atlas.GetPlatformSettings(platform);
+        settings.overridden = true;
+        settings.format = format;
+        settings.compressionQuality = config.compressionQuality;
+        atlas.SetPlatformSettings(settings);
+    }
+
+    private static void AddSpritesToAtlas(SpriteAtlas atlas, IEnumerable<string> spritePaths)
+    {
+        var packables = new List<Object>();
+        foreach (var path in spritePaths)
+        {
+            var obj = AssetDatabase.LoadAssetAtPath<Object>(path);
+            if (obj != null) packables.Add(obj);
+        }
+        atlas.Add(packables.ToArray());
+    }
+}
diff --git a/Client/Assets/Editor/Postprocessor/Atlas/AtlasProcessor.cs.meta b/Client/Assets/Editor/Postprocessor/Atlas/AtlasProcessor.cs.meta
new file mode 100644
index 0000000..696dd23
--- /dev/null
+++ b/Client/Assets/Editor/Postprocessor/Atlas/AtlasProcessor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 07f56f8c156246ddbc51eb82876f729e
+timeCreated: 1738748262
\ No newline at end of file
diff --git a/Client/Assets/Editor/Postprocessor/SpritePostprocessor.cs b/Client/Assets/Editor/Postprocessor/SpritePostprocessor.cs
index 2b252a1..0b290ee 100644
--- a/Client/Assets/Editor/Postprocessor/SpritePostprocessor.cs
+++ b/Client/Assets/Editor/Postprocessor/SpritePostprocessor.cs
@@ -1,549 +1,549 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using UnityEditor;
-using UnityEditor.U2D;
-using UnityEngine;
-using UnityEngine.U2D;
-using Object = UnityEngine.Object;
-
-namespace GameFramework.Editor
-{
-    /// <summary>
-    /// 图集导入管线。
-    /// </summary>
-    public class SpritePostprocessor : AssetPostprocessor
-    {
-        static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
-        {
-            foreach (var s in importedAssets)
-            {
-                EditorSpriteSaveInfo.OnImportSprite(s);
-            }
-
-            foreach (var s in deletedAssets)
-            {
-                EditorSpriteSaveInfo.OnDeleteSprite(s);
-            }
-
-            foreach (var s in movedFromAssetPaths)
-            {
-                EditorSpriteSaveInfo.OnDeleteSprite(s);
-            }
-
-            foreach (var s in movedAssets)
-            {
-                EditorSpriteSaveInfo.OnImportSprite(s);
-            }
-        }
-    }
-
-    public static class EditorSpriteSaveInfo
-    {
-        private const string NormalAtlasDir = "Assets/AssetArt/Atlas";
-        private const string UISpritePath = "Assets/AssetRaw/UIRaw";
-        private const string UIAtlasPath = "Assets/AssetRaw/UIRaw/Atlas";
-        private static readonly List<string> _dirtyAtlasList = new List<string>();
-        private static readonly Dictionary<string, List<string>> _allASprites = new Dictionary<string, List<string>>();
-
-        private static readonly Dictionary<string, string> _uiAtlasMap = new Dictionary<string, string>();
-        private static bool _isInit = false;
-        private static bool m_dirty = false;
-
-        public static void Init()
-        {
-            if (_isInit)
-            {
-                return;
-            }
-
-            EditorApplication.update += CheckDirty;
-
-            //读取所有图集信息
-            string[] findAssets = AssetDatabase.FindAssets("t:SpriteAtlas", new[] { NormalAtlasDir });
-            foreach (var findAsset in findAssets)
-            {
-                var path = AssetDatabase.GUIDToAssetPath(findAsset);
-                SpriteAtlas sa = AssetDatabase.LoadAssetAtPath(path, typeof(SpriteAtlas)) as SpriteAtlas;
-                if (sa == null)
-                {
-                    Debug.LogError($"加载图集数据{path}失败");
-                    continue;
-                }
-
-                string atlasName = Path.GetFileNameWithoutExtension(path);
-                var objects = sa.GetPackables();
-                foreach (var o in objects)
-                {
-                    if (!_allASprites.TryGetValue(atlasName, out var list))
-                    {
-                        list = new List<string>();
-                        _allASprites.Add(atlasName, list);
-                    }
-
-                    list.Add(AssetDatabase.GetAssetPath(o));
-                }
-            }
-
-            _isInit = true;
-        }
-
-        public static void CheckDirty()
-        {
-            if (m_dirty)
-            {
-                m_dirty = false;
-
-                AssetDatabase.Refresh();
-                float lastProgress = -1;
-                for (int i = 0; i < _dirtyAtlasList.Count; i++)
-                {
-                    string atlasName = _dirtyAtlasList[i];
-                    Debug.Log("更新图集 : " + atlasName);
-                    var curProgress = (float)i / _dirtyAtlasList.Count;
-                    if (curProgress > lastProgress + 0.01f)
-                    {
-                        lastProgress = curProgress;
-                        var progressText = $"当前进度：{i}/{_dirtyAtlasList.Count} {atlasName}";
-                        bool cancel = EditorUtility.DisplayCancelableProgressBar("刷新图集" + atlasName, progressText, curProgress);
-                        if (cancel)
-                        {
-                            break;
-                        }
-                    }
-
-                    bool isUI = atlasName.StartsWith("UIRaw");
-                    SaveAtlas(atlasName, isUI);
-                }
-
-                EditorUtility.ClearProgressBar();
-                AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
-                _dirtyAtlasList.Clear();
-            }
-        }
-
-        public static void OnImportSprite(string assetPath)
-        {
-            if (!assetPath.StartsWith(UISpritePath))
-            {
-                return;
-            }
-
-            TextureImporter ti = AssetImporter.GetAtPath(assetPath) as TextureImporter;
-
-            if (ti != null)
-            {
-                var modify = false;
-
-                if (assetPath.StartsWith(UISpritePath))
-                {
-                    if (ti.textureType != TextureImporterType.Sprite)
-                    {
-                        ti.textureType = TextureImporterType.Sprite;
-                        modify = true;
-                    }
-
-                    if (!string.IsNullOrEmpty(ti.spritePackingTag))
-                    {
-                        ti.spritePackingTag = string.Empty;
-                        modify = true;
-                    }
-
-                    var setting = new TextureImporterSettings();
-                    ti.ReadTextureSettings(setting);
-                    if (setting.spriteGenerateFallbackPhysicsShape)
-                    {
-                        setting.spriteGenerateFallbackPhysicsShape = false;
-                        ti.SetTextureSettings(setting);
-                        modify = true;
-                    }
-
-                    if (IsKeepRawImage(assetPath))
-                    {
-                        //调整android格式
-                        var andPlatformSettings = ti.GetPlatformTextureSettings("Android");
-                        if (!andPlatformSettings.overridden)
-                        {
-                            andPlatformSettings.overridden = true;
-                            modify = true;
-                        }
-
-                        if (andPlatformSettings.format != TextureImporterFormat.ASTC_6x6)
-                        {
-                            andPlatformSettings.format = TextureImporterFormat.ASTC_6x6;
-                            andPlatformSettings.compressionQuality = 50;
-                            ti.SetPlatformTextureSettings(andPlatformSettings);
-                            modify = true;
-                        }
-
-                        //调整ios格式
-                        var iosPlatformSettings = ti.GetPlatformTextureSettings("iPhone");
-                        if (!iosPlatformSettings.overridden)
-                        {
-                            iosPlatformSettings.overridden = true;
-                            modify = true;
-                        }
-
-                        if (iosPlatformSettings.format != TextureImporterFormat.ASTC_5x5)
-                        {
-                            iosPlatformSettings.format = TextureImporterFormat.ASTC_5x5;
-                            iosPlatformSettings.compressionQuality = 50;
-                            ti.SetPlatformTextureSettings(iosPlatformSettings);
-                            modify = true;
-                        }
-
-                        //调整WebGL格式
-                        var webglSettings = ti.GetPlatformTextureSettings("WebGL");
-                        if (!webglSettings.overridden)
-                        {
-                            webglSettings.overridden = true;
-                            modify = true;
-                        }
-
-                        if (webglSettings.format != TextureImporterFormat.ASTC_6x6)
-                        {
-                            webglSettings.format = TextureImporterFormat.ASTC_6x6;
-                            webglSettings.compressionQuality = 50;
-                            ti.SetPlatformTextureSettings(webglSettings);
-                            modify = true;
-                        }
-                    }
-                }
-
-                if (modify)
-                {
-                    ti.SaveAndReimport();
-                }
-
-                if (ti.textureType == TextureImporterType.Sprite)
-                {
-                    OnProcessSprite(assetPath);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 是否保持散图（不打图集）
-        /// </summary>
-        /// <param name="dirPath"></param>
-        /// <returns></returns>
-        public static bool IsKeepRawImage(string dirPath)
-        {
-            return dirPath.Contains("UIRaw/Raw/") || dirPath.Contains("UIRaw_Raw_");
-        }
-
-        public static string GetSpritePath(string assetPath)
-        {
-            string path = assetPath.Substring(0, assetPath.LastIndexOf(".", StringComparison.Ordinal));
-            path = path.Replace("Assets/AssetRaw/", "");
-            return path;
-        }
-
-        /// <summary>
-        /// 根据文件路径，返回图集名称
-        /// </summary>
-        /// <param name="fullName"></param>
-        /// <returns></returns>
-        public static string GetPackageTag(string fullName)
-        {
-            fullName = fullName.Replace("\\", "/");
-            int idx = fullName.LastIndexOf("UIRaw", StringComparison.Ordinal);
-            if (idx == -1)
-            {
-                return "";
-            }
-
-            if (IsKeepRawImage(fullName))
-            {
-                return "";
-            }
-
-            var atlasPath = fullName.Substring(idx);
-            string str = atlasPath;
-            str = str.Substring(0, str.LastIndexOf("/", StringComparison.Ordinal)).Replace("/", "_");
-
-            return str;
-        }
-
-        public static void OnProcessSprite(string assetPath)
-        {
-            if (!assetPath.StartsWith("Assets"))
-            {
-                return;
-            }
-
-            if (assetPath.StartsWith("Assets/UIRaw_Delete"))
-            {
-                return;
-            }
-
-            Init();
-
-            var spriteName = Path.GetFileNameWithoutExtension(assetPath);
-            var spritePath = GetSpritePath(assetPath);
-            if (!_uiAtlasMap.TryGetValue(spriteName, out string oldAssetPath) || spritePath == oldAssetPath)
-            {
-                _uiAtlasMap[spriteName] = spritePath;
-                m_dirty = true;
-            }
-            else
-            {
-                Debug.LogError($"有重名的图片：{spriteName}\n旧图集：{oldAssetPath}\n新图集：{spritePath} ");
-                _uiAtlasMap[spriteName] = spritePath;
-                m_dirty = true;
-            }
-
-            string atlasName = GetPackageTag(assetPath);
-            if (string.IsNullOrEmpty(atlasName))
-            {
-                bool keepRaw = IsKeepRawImage(assetPath);
-                if (!keepRaw)
-                {
-                    Debug.LogError($"empty packingTag of asset :{assetPath} !!!");
-                }
-
-                return;
-            }
-            else
-            {
-                List<string> ret;
-                if (!_allASprites.TryGetValue(atlasName, out ret))
-                {
-                    ret = new List<string>();
-                    _allASprites.Add(atlasName, ret);
-                }
-
-                if (!ret.Contains(assetPath))
-                {
-                    ret.Add(assetPath);
-                    m_dirty = true;
-                    if (!_dirtyAtlasList.Contains(atlasName))
-                    {
-                        _dirtyAtlasList.Add(atlasName);
-                    }
-                }
-            }
-        }
-
-        public static void OnDeleteSprite(string assetPath)
-        {
-            if (assetPath.StartsWith("Assets/UIRaw_Delete"))
-            {
-                return;
-            }
-
-            if (!assetPath.StartsWith(UISpritePath))
-            {
-                return;
-            }
-
-            Init();
-            string atlasName = GetPackageTag(assetPath);
-            if (!_allASprites.TryGetValue(atlasName, out var ret))
-            {
-                return;
-            }
-
-            //改成文件名的匹配
-            if (!ret.Exists(s => Path.GetFileName(s) == Path.GetFileName(assetPath)))
-            {
-                return;
-            }
-
-            if (assetPath.StartsWith(UISpritePath))
-            {
-                var spriteName = Path.GetFileNameWithoutExtension(assetPath);
-                if (_uiAtlasMap.ContainsKey(spriteName))
-                {
-                    _uiAtlasMap.Remove(spriteName);
-                    m_dirty = true;
-                }
-            }
-
-            ret.Remove(assetPath);
-            m_dirty = true;
-            if (!_dirtyAtlasList.Contains(atlasName))
-            {
-                _dirtyAtlasList.Add(atlasName);
-            }
-        }
-
-        #region 更新图集
-
-        public static void SaveAtlas(string atlasName, bool isUI)
-        {
-            List<Object> spriteList = new List<Object>();
-            if (_allASprites.TryGetValue(atlasName, out var list))
-            {
-                list.Sort(StringComparer.Ordinal);
-
-                foreach (var s in list)
-                {
-                    var sprite = AssetDatabase.LoadAssetAtPath<Sprite>(s);
-                    if (sprite != null)
-                    {
-                        spriteList.Add(sprite);
-                    }
-                }
-            }
-
-            var path = $"{NormalAtlasDir}/{atlasName}.spriteatlas";
-
-            if (spriteList.Count == 0)
-            {
-                if (File.Exists(path))
-                {
-                    AssetDatabase.DeleteAsset(path);
-                }
-
-                return;
-            }
-
-            var atlas = new SpriteAtlas();
-            // var atlas = new SpriteAtlasAsset();
-            var setting = new SpriteAtlasPackingSettings
-            {
-                blockOffset = 1,
-                padding = 2,
-                enableRotation = true
-            };
-
-            bool isOpaque = atlasName.Contains("Opaque");
-
-            var textureSetting = new SpriteAtlasTextureSettings
-            {
-                generateMipMaps = false,
-                sRGB = true,
-                filterMode = FilterMode.Bilinear
-            };
-            atlas.SetTextureSettings(textureSetting);
-
-            var iphonePlatformSetting = atlas.GetPlatformSettings("iPhone");
-            if (!iphonePlatformSetting.overridden)
-            {
-                iphonePlatformSetting.overridden = true;
-                iphonePlatformSetting.format = TextureImporterFormat.ASTC_5x5;
-                iphonePlatformSetting.compressionQuality = 100;
-                atlas.SetPlatformSettings(iphonePlatformSetting);
-            }
-
-            var androidPlatformSetting = atlas.GetPlatformSettings("Android");
-            if (!androidPlatformSetting.overridden)
-            {
-                androidPlatformSetting.overridden = true;
-                androidPlatformSetting.format = TextureImporterFormat.ASTC_6x6;
-                androidPlatformSetting.compressionQuality = 100;
-                atlas.SetPlatformSettings(androidPlatformSetting);
-            }
-
-            var webglSettings = atlas.GetPlatformSettings("WebGL");
-            if (!webglSettings.overridden)
-            {
-                webglSettings.overridden = true;
-                webglSettings.format = TextureImporterFormat.ASTC_6x6;
-                webglSettings.compressionQuality = 50;
-                atlas.SetPlatformSettings(webglSettings);
-            }
-
-            atlas.SetPackingSettings(setting);
-            atlas.Add(spriteList.ToArray());
-
-            AssetDatabase.CreateAsset(atlas, path);
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-        }
-
-        #endregion
-
-        #region 重新生成图集
-
-        private static readonly Dictionary<string, List<string>> m_tempAllASprites = new Dictionary<string, List<string>>();
-
-        [MenuItem("开发工具/Atlas/重新生成UI图集", false, 90)]
-        static void ForceGenAtlas()
-        {
-            Init();
-            List<string> needSaveAtlas = new List<string>();
-            m_tempAllASprites.Clear();
-            _allASprites.Clear();
-            var findAssets = AssetDatabase.FindAssets("t:sprite", new[] { UIAtlasPath });
-            foreach (var findAsset in findAssets)
-            {
-                var path = AssetDatabase.GUIDToAssetPath(findAsset);
-                var atlasName = GetPackageTag(path);
-                if (!m_tempAllASprites.TryGetValue(atlasName, out var spriteList))
-                {
-                    spriteList = new List<string>();
-                    m_tempAllASprites[atlasName] = spriteList;
-                }
-
-                if (!spriteList.Contains(path))
-                {
-                    spriteList.Add(path);
-                }
-            }
-
-            //有变化的才刷
-            var iter = m_tempAllASprites.GetEnumerator();
-            while (iter.MoveNext())
-            {
-                bool needSave = false;
-                var atlasName = iter.Current.Key;
-                var newSpritesList = iter.Current.Value;
-
-                if (_allASprites.TryGetValue(atlasName, out var existSprites))
-                {
-                    if (existSprites.Count != newSpritesList.Count)
-                    {
-                        needSave = true;
-                        existSprites.Clear();
-                        existSprites.AddRange(newSpritesList);
-                    }
-                    else
-                    {
-                        for (int i = 0; i < newSpritesList.Count; i++)
-                        {
-                            if (!existSprites.Contains(newSpritesList[i]))
-                            {
-                                needSave = true;
-                                break;
-                            }
-                        }
-
-                        if (needSave)
-                        {
-                            existSprites.Clear();
-                            existSprites.AddRange(newSpritesList);
-                        }
-                    }
-                }
-                else
-                {
-                    needSave = true;
-                    _allASprites.Add(atlasName, new List<string>(newSpritesList));
-                }
-
-                if (needSave && !needSaveAtlas.Contains(atlasName))
-                {
-                    needSaveAtlas.Add(atlasName);
-                }
-            }
-
-            iter.Dispose();
-            foreach (var atlas in needSaveAtlas)
-            {
-                Debug.LogFormat("Gen atlas:{0}", atlas);
-                SaveAtlas(atlas, true);
-            }
-
-            AssetDatabase.SaveAssets();
-            AssetDatabase.Refresh();
-
-            SpriteAtlasUtility.PackAllAtlases(EditorUserBuildSettings.activeBuildTarget);
-            Debug.Log("Gen end");
-        }
-
-        #endregion
-    }
-}
+// using System;
+// using System.Collections.Generic;
+// using System.IO;
+// using UnityEditor;
+// using UnityEditor.U2D;
+// using UnityEngine;
+// using UnityEngine.U2D;
+// using Object = UnityEngine.Object;
+//
+// namespace GameFramework.Editor
+// {
+//     /// <summary>
+//     /// 图集导入管线。
+//     /// </summary>
+//     public class SpritePostprocessor : AssetPostprocessor
+//     {
+//         static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+//         {
+//             foreach (var s in importedAssets)
+//             {
+//                 EditorSpriteSaveInfo.OnImportSprite(s);
+//             }
+//
+//             foreach (var s in deletedAssets)
+//             {
+//                 EditorSpriteSaveInfo.OnDeleteSprite(s);
+//             }
+//
+//             foreach (var s in movedFromAssetPaths)
+//             {
+//                 EditorSpriteSaveInfo.OnDeleteSprite(s);
+//             }
+//
+//             foreach (var s in movedAssets)
+//             {
+//                 EditorSpriteSaveInfo.OnImportSprite(s);
+//             }
+//         }
+//     }
+//
+//     public static class EditorSpriteSaveInfo
+//     {
+//         private const string NormalAtlasDir = "Assets/AssetArt/Atlas";
+//         private const string UISpritePath = "Assets/AssetRaw/UIRaw";
+//         private const string UIAtlasPath = "Assets/AssetRaw/UIRaw/Atlas";
+//         private static readonly List<string> _dirtyAtlasList = new List<string>();
+//         private static readonly Dictionary<string, List<string>> _allASprites = new Dictionary<string, List<string>>();
+//
+//         private static readonly Dictionary<string, string> _uiAtlasMap = new Dictionary<string, string>();
+//         private static bool _isInit = false;
+//         private static bool m_dirty = false;
+//
+//         public static void Init()
+//         {
+//             if (_isInit)
+//             {
+//                 return;
+//             }
+//
+//             EditorApplication.update += CheckDirty;
+//
+//             //读取所有图集信息
+//             string[] findAssets = AssetDatabase.FindAssets("t:SpriteAtlas", new[] { NormalAtlasDir });
+//             foreach (var findAsset in findAssets)
+//             {
+//                 var path = AssetDatabase.GUIDToAssetPath(findAsset);
+//                 SpriteAtlas sa = AssetDatabase.LoadAssetAtPath(path, typeof(SpriteAtlas)) as SpriteAtlas;
+//                 if (sa == null)
+//                 {
+//                     Debug.LogError($"加载图集数据{path}失败");
+//                     continue;
+//                 }
+//
+//                 string atlasName = Path.GetFileNameWithoutExtension(path);
+//                 var objects = sa.GetPackables();
+//                 foreach (var o in objects)
+//                 {
+//                     if (!_allASprites.TryGetValue(atlasName, out var list))
+//                     {
+//                         list = new List<string>();
+//                         _allASprites.Add(atlasName, list);
+//                     }
+//
+//                     list.Add(AssetDatabase.GetAssetPath(o));
+//                 }
+//             }
+//
+//             _isInit = true;
+//         }
+//
+//         public static void CheckDirty()
+//         {
+//             if (m_dirty)
+//             {
+//                 m_dirty = false;
+//
+//                 AssetDatabase.Refresh();
+//                 float lastProgress = -1;
+//                 for (int i = 0; i < _dirtyAtlasList.Count; i++)
+//                 {
+//                     string atlasName = _dirtyAtlasList[i];
+//                     Debug.Log("更新图集 : " + atlasName);
+//                     var curProgress = (float)i / _dirtyAtlasList.Count;
+//                     if (curProgress > lastProgress + 0.01f)
+//                     {
+//                         lastProgress = curProgress;
+//                         var progressText = $"当前进度：{i}/{_dirtyAtlasList.Count} {atlasName}";
+//                         bool cancel = EditorUtility.DisplayCancelableProgressBar("刷新图集" + atlasName, progressText, curProgress);
+//                         if (cancel)
+//                         {
+//                             break;
+//                         }
+//                     }
+//
+//                     bool isUI = atlasName.StartsWith("UIRaw");
+//                     SaveAtlas(atlasName, isUI);
+//                 }
+//
+//                 EditorUtility.ClearProgressBar();
+//                 AssetDatabase.SaveAssets();
+//                 AssetDatabase.Refresh();
+//                 _dirtyAtlasList.Clear();
+//             }
+//         }
+//
+//         public static void OnImportSprite(string assetPath)
+//         {
+//             if (!assetPath.StartsWith(UISpritePath))
+//             {
+//                 return;
+//             }
+//
+//             TextureImporter ti = AssetImporter.GetAtPath(assetPath) as TextureImporter;
+//
+//             if (ti != null)
+//             {
+//                 var modify = false;
+//
+//                 if (assetPath.StartsWith(UISpritePath))
+//                 {
+//                     if (ti.textureType != TextureImporterType.Sprite)
+//                     {
+//                         ti.textureType = TextureImporterType.Sprite;
+//                         modify = true;
+//                     }
+//
+//                     if (!string.IsNullOrEmpty(ti.spritePackingTag))
+//                     {
+//                         ti.spritePackingTag = string.Empty;
+//                         modify = true;
+//                     }
+//
+//                     var setting = new TextureImporterSettings();
+//                     ti.ReadTextureSettings(setting);
+//                     if (setting.spriteGenerateFallbackPhysicsShape)
+//                     {
+//                         setting.spriteGenerateFallbackPhysicsShape = false;
+//                         ti.SetTextureSettings(setting);
+//                         modify = true;
+//                     }
+//
+//                     if (IsKeepRawImage(assetPath))
+//                     {
+//                         //调整android格式
+//                         var andPlatformSettings = ti.GetPlatformTextureSettings("Android");
+//                         if (!andPlatformSettings.overridden)
+//                         {
+//                             andPlatformSettings.overridden = true;
+//                             modify = true;
+//                         }
+//
+//                         if (andPlatformSettings.format != TextureImporterFormat.ASTC_6x6)
+//                         {
+//                             andPlatformSettings.format = TextureImporterFormat.ASTC_6x6;
+//                             andPlatformSettings.compressionQuality = 50;
+//                             ti.SetPlatformTextureSettings(andPlatformSettings);
+//                             modify = true;
+//                         }
+//
+//                         //调整ios格式
+//                         var iosPlatformSettings = ti.GetPlatformTextureSettings("iPhone");
+//                         if (!iosPlatformSettings.overridden)
+//                         {
+//                             iosPlatformSettings.overridden = true;
+//                             modify = true;
+//                         }
+//
+//                         if (iosPlatformSettings.format != TextureImporterFormat.ASTC_5x5)
+//                         {
+//                             iosPlatformSettings.format = TextureImporterFormat.ASTC_5x5;
+//                             iosPlatformSettings.compressionQuality = 50;
+//                             ti.SetPlatformTextureSettings(iosPlatformSettings);
+//                             modify = true;
+//                         }
+//
+//                         //调整WebGL格式
+//                         var webglSettings = ti.GetPlatformTextureSettings("WebGL");
+//                         if (!webglSettings.overridden)
+//                         {
+//                             webglSettings.overridden = true;
+//                             modify = true;
+//                         }
+//
+//                         if (webglSettings.format != TextureImporterFormat.ASTC_6x6)
+//                         {
+//                             webglSettings.format = TextureImporterFormat.ASTC_6x6;
+//                             webglSettings.compressionQuality = 50;
+//                             ti.SetPlatformTextureSettings(webglSettings);
+//                             modify = true;
+//                         }
+//                     }
+//                 }
+//
+//                 if (modify)
+//                 {
+//                     ti.SaveAndReimport();
+//                 }
+//
+//                 if (ti.textureType == TextureImporterType.Sprite)
+//                 {
+//                     OnProcessSprite(assetPath);
+//                 }
+//             }
+//         }
+//
+//         /// <summary>
+//         /// 是否保持散图（不打图集）
+//         /// </summary>
+//         /// <param name="dirPath"></param>
+//         /// <returns></returns>
+//         public static bool IsKeepRawImage(string dirPath)
+//         {
+//             return dirPath.Contains("UIRaw/Raw/") || dirPath.Contains("UIRaw_Raw_");
+//         }
+//
+//         public static string GetSpritePath(string assetPath)
+//         {
+//             string path = assetPath.Substring(0, assetPath.LastIndexOf(".", StringComparison.Ordinal));
+//             path = path.Replace("Assets/AssetRaw/", "");
+//             return path;
+//         }
+//
+//         /// <summary>
+//         /// 根据文件路径，返回图集名称
+//         /// </summary>
+//         /// <param name="fullName"></param>
+//         /// <returns></returns>
+//         public static string GetPackageTag(string fullName)
+//         {
+//             fullName = fullName.Replace("\\", "/");
+//             int idx = fullName.LastIndexOf("UIRaw", StringComparison.Ordinal);
+//             if (idx == -1)
+//             {
+//                 return "";
+//             }
+//
+//             if (IsKeepRawImage(fullName))
+//             {
+//                 return "";
+//             }
+//
+//             var atlasPath = fullName.Substring(idx);
+//             string str = atlasPath;
+//             str = str.Substring(0, str.LastIndexOf("/", StringComparison.Ordinal)).Replace("/", "_");
+//
+//             return str;
+//         }
+//
+//         public static void OnProcessSprite(string assetPath)
+//         {
+//             if (!assetPath.StartsWith("Assets"))
+//             {
+//                 return;
+//             }
+//
+//             if (assetPath.StartsWith("Assets/UIRaw_Delete"))
+//             {
+//                 return;
+//             }
+//
+//             Init();
+//
+//             var spriteName = Path.GetFileNameWithoutExtension(assetPath);
+//             var spritePath = GetSpritePath(assetPath);
+//             if (!_uiAtlasMap.TryGetValue(spriteName, out string oldAssetPath) || spritePath == oldAssetPath)
+//             {
+//                 _uiAtlasMap[spriteName] = spritePath;
+//                 m_dirty = true;
+//             }
+//             else
+//             {
+//                 Debug.LogError($"有重名的图片：{spriteName}\n旧图集：{oldAssetPath}\n新图集：{spritePath} ");
+//                 _uiAtlasMap[spriteName] = spritePath;
+//                 m_dirty = true;
+//             }
+//
+//             string atlasName = GetPackageTag(assetPath);
+//             if (string.IsNullOrEmpty(atlasName))
+//             {
+//                 bool keepRaw = IsKeepRawImage(assetPath);
+//                 if (!keepRaw)
+//                 {
+//                     Debug.LogError($"empty packingTag of asset :{assetPath} !!!");
+//                 }
+//
+//                 return;
+//             }
+//             else
+//             {
+//                 List<string> ret;
+//                 if (!_allASprites.TryGetValue(atlasName, out ret))
+//                 {
+//                     ret = new List<string>();
+//                     _allASprites.Add(atlasName, ret);
+//                 }
+//
+//                 if (!ret.Contains(assetPath))
+//                 {
+//                     ret.Add(assetPath);
+//                     m_dirty = true;
+//                     if (!_dirtyAtlasList.Contains(atlasName))
+//                     {
+//                         _dirtyAtlasList.Add(atlasName);
+//                     }
+//                 }
+//             }
+//         }
+//
+//         public static void OnDeleteSprite(string assetPath)
+//         {
+//             if (assetPath.StartsWith("Assets/UIRaw_Delete"))
+//             {
+//                 return;
+//             }
+//
+//             if (!assetPath.StartsWith(UISpritePath))
+//             {
+//                 return;
+//             }
+//
+//             Init();
+//             string atlasName = GetPackageTag(assetPath);
+//             if (!_allASprites.TryGetValue(atlasName, out var ret))
+//             {
+//                 return;
+//             }
+//
+//             //改成文件名的匹配
+//             if (!ret.Exists(s => Path.GetFileName(s) == Path.GetFileName(assetPath)))
+//             {
+//                 return;
+//             }
+//
+//             if (assetPath.StartsWith(UISpritePath))
+//             {
+//                 var spriteName = Path.GetFileNameWithoutExtension(assetPath);
+//                 if (_uiAtlasMap.ContainsKey(spriteName))
+//                 {
+//                     _uiAtlasMap.Remove(spriteName);
+//                     m_dirty = true;
+//                 }
+//             }
+//
+//             ret.Remove(assetPath);
+//             m_dirty = true;
+//             if (!_dirtyAtlasList.Contains(atlasName))
+//             {
+//                 _dirtyAtlasList.Add(atlasName);
+//             }
+//         }
+//
+//         #region 更新图集
+//
+//         public static void SaveAtlas(string atlasName, bool isUI)
+//         {
+//             List<Object> spriteList = new List<Object>();
+//             if (_allASprites.TryGetValue(atlasName, out var list))
+//             {
+//                 list.Sort(StringComparer.Ordinal);
+//
+//                 foreach (var s in list)
+//                 {
+//                     var sprite = AssetDatabase.LoadAssetAtPath<Sprite>(s);
+//                     if (sprite != null)
+//                     {
+//                         spriteList.Add(sprite);
+//                     }
+//                 }
+//             }
+//
+//             var path = $"{NormalAtlasDir}/{atlasName}.spriteatlas";
+//
+//             if (spriteList.Count == 0)
+//             {
+//                 if (File.Exists(path))
+//                 {
+//                     AssetDatabase.DeleteAsset(path);
+//                 }
+//
+//                 return;
+//             }
+//
+//             var atlas = new SpriteAtlas();
+//             // var atlas = new SpriteAtlasAsset();
+//             var setting = new SpriteAtlasPackingSettings
+//             {
+//                 blockOffset = 1,
+//                 padding = 2,
+//                 enableRotation = true
+//             };
+//
+//             bool isOpaque = atlasName.Contains("Opaque");
+//
+//             var textureSetting = new SpriteAtlasTextureSettings
+//             {
+//                 generateMipMaps = false,
+//                 sRGB = true,
+//                 filterMode = FilterMode.Bilinear
+//             };
+//             atlas.SetTextureSettings(textureSetting);
+//
+//             var iphonePlatformSetting = atlas.GetPlatformSettings("iPhone");
+//             if (!iphonePlatformSetting.overridden)
+//             {
+//                 iphonePlatformSetting.overridden = true;
+//                 iphonePlatformSetting.format = TextureImporterFormat.ASTC_5x5;
+//                 iphonePlatformSetting.compressionQuality = 100;
+//                 atlas.SetPlatformSettings(iphonePlatformSetting);
+//             }
+//
+//             var androidPlatformSetting = atlas.GetPlatformSettings("Android");
+//             if (!androidPlatformSetting.overridden)
+//             {
+//                 androidPlatformSetting.overridden = true;
+//                 androidPlatformSetting.format = TextureImporterFormat.ASTC_6x6;
+//                 androidPlatformSetting.compressionQuality = 100;
+//                 atlas.SetPlatformSettings(androidPlatformSetting);
+//             }
+//
+//             var webglSettings = atlas.GetPlatformSettings("WebGL");
+//             if (!webglSettings.overridden)
+//             {
+//                 webglSettings.overridden = true;
+//                 webglSettings.format = TextureImporterFormat.ASTC_6x6;
+//                 webglSettings.compressionQuality = 50;
+//                 atlas.SetPlatformSettings(webglSettings);
+//             }
+//
+//             atlas.SetPackingSettings(setting);
+//             atlas.Add(spriteList.ToArray());
+//
+//             AssetDatabase.CreateAsset(atlas, path);
+//             AssetDatabase.SaveAssets();
+//             AssetDatabase.Refresh();
+//         }
+//
+//         #endregion
+//
+//         #region 重新生成图集
+//
+//         private static readonly Dictionary<string, List<string>> m_tempAllASprites = new Dictionary<string, List<string>>();
+//
+//         [MenuItem("开发工具/Atlas/重新生成UI图集", false, 90)]
+//         static void ForceGenAtlas()
+//         {
+//             Init();
+//             List<string> needSaveAtlas = new List<string>();
+//             m_tempAllASprites.Clear();
+//             _allASprites.Clear();
+//             var findAssets = AssetDatabase.FindAssets("t:sprite", new[] { UIAtlasPath });
+//             foreach (var findAsset in findAssets)
+//             {
+//                 var path = AssetDatabase.GUIDToAssetPath(findAsset);
+//                 var atlasName = GetPackageTag(path);
+//                 if (!m_tempAllASprites.TryGetValue(atlasName, out var spriteList))
+//                 {
+//                     spriteList = new List<string>();
+//                     m_tempAllASprites[atlasName] = spriteList;
+//                 }
+//
+//                 if (!spriteList.Contains(path))
+//                 {
+//                     spriteList.Add(path);
+//                 }
+//             }
+//
+//             //有变化的才刷
+//             var iter = m_tempAllASprites.GetEnumerator();
+//             while (iter.MoveNext())
+//             {
+//                 bool needSave = false;
+//                 var atlasName = iter.Current.Key;
+//                 var newSpritesList = iter.Current.Value;
+//
+//                 if (_allASprites.TryGetValue(atlasName, out var existSprites))
+//                 {
+//                     if (existSprites.Count != newSpritesList.Count)
+//                     {
+//                         needSave = true;
+//                         existSprites.Clear();
+//                         existSprites.AddRange(newSpritesList);
+//                     }
+//                     else
+//                     {
+//                         for (int i = 0; i < newSpritesList.Count; i++)
+//                         {
+//                             if (!existSprites.Contains(newSpritesList[i]))
+//                             {
+//                                 needSave = true;
+//                                 break;
+//                             }
+//                         }
+//
+//                         if (needSave)
+//                         {
+//                             existSprites.Clear();
+//                             existSprites.AddRange(newSpritesList);
+//                         }
+//                     }
+//                 }
+//                 else
+//                 {
+//                     needSave = true;
+//                     _allASprites.Add(atlasName, new List<string>(newSpritesList));
+//                 }
+//
+//                 if (needSave && !needSaveAtlas.Contains(atlasName))
+//                 {
+//                     needSaveAtlas.Add(atlasName);
+//                 }
+//             }
+//
+//             iter.Dispose();
+//             foreach (var atlas in needSaveAtlas)
+//             {
+//                 Debug.LogFormat("Gen atlas:{0}", atlas);
+//                 SaveAtlas(atlas, true);
+//             }
+//
+//             AssetDatabase.SaveAssets();
+//             AssetDatabase.Refresh();
+//
+//             SpriteAtlasUtility.PackAllAtlases(EditorUserBuildSettings.activeBuildTarget);
+//             Debug.Log("Gen end");
+//         }
+//
+//         #endregion
+//     }
+// }
diff --git a/Client/Assets/Editor/ToolbarExtender.meta b/Client/Assets/Editor/ToolbarExtender.meta
new file mode 100644
index 0000000..a487ecb
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4db3c15a409745319f4d015ad1598086
+timeCreated: 1738827394
\ No newline at end of file
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom.meta b/Client/Assets/Editor/ToolbarExtender/Custom.meta
new file mode 100644
index 0000000..a036a00
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 075130c21aee41b49b3977adc2bfa288
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom/EditorLanguageMode.cs b/Client/Assets/Editor/ToolbarExtender/Custom/EditorLanguageMode.cs
new file mode 100644
index 0000000..1e041cf
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom/EditorLanguageMode.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Linq;
+using AlicizaX.Localization.Runtime;
+using AlicizaX.Resource.Runtime;
+using AlicizaX.Runtime;
+using UnityEditor;
+using UnityEngine;
+using UnityToolbarExtender;
+
+namespace TEngine.Editor
+{
+    public static class ToolbarStyles
+    {
+        public static readonly GUIStyle ToolBarButtonGuiStyle;
+        private const string ButtonStyleName = "Tab middle";
+
+        static ToolbarStyles()
+        {
+            ToolBarButtonGuiStyle = new GUIStyle(ButtonStyleName)
+            {
+                padding = new RectOffset(2, 8, 2, 2),
+                alignment = TextAnchor.MiddleCenter,
+                fontStyle = FontStyle.Bold
+            };
+        }
+    }
+
+    [InitializeOnLoad]
+    public class EditorLanguageMode
+    {
+        static EditorLanguageMode()
+        {
+            ToolbarExtender.LeftToolbarGUI.Add(OnToolbarGUI);
+            _languageIndex = EditorPrefs.GetInt(LocalizationComponent.PrefsKey, 0);
+        }
+
+
+        static GUIStyle _buttonGuiStyle;
+
+        private static readonly string[] _languageNames =
+        {
+            "Unspecified",
+            "ChineseSimplified ",
+            "English",
+            "Japanese",
+        };
+
+        private static int _languageIndex = 0;
+        public static int LanguageIndex => _languageIndex;
+
+        static void OnToolbarGUI()
+        {
+            EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
+            {
+                GUILayout.Space(400);
+                GUILayout.FlexibleSpace();
+
+                // 资源模式
+                int selectedIndex = EditorGUILayout.Popup(_languageIndex, _languageNames, ToolbarStyles.ToolBarButtonGuiStyle);
+                if (selectedIndex != _languageIndex)
+                {
+                    Debug.Log($"更改编辑器语言 : {_languageNames[selectedIndex]}");
+                    _languageIndex = selectedIndex;
+                    EditorPrefs.SetInt(LocalizationComponent.PrefsKey, selectedIndex);
+                }
+            }
+            EditorGUI.EndDisabledGroup();
+        }
+    }
+}
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom/EditorLanguageMode.cs.meta b/Client/Assets/Editor/ToolbarExtender/Custom/EditorLanguageMode.cs.meta
new file mode 100644
index 0000000..5402d34
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom/EditorLanguageMode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2b8e468d73dc4b328de0533eb33f9ad3
+timeCreated: 1738828088
\ No newline at end of file
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom/EditorResourceMode.cs b/Client/Assets/Editor/ToolbarExtender/Custom/EditorResourceMode.cs
new file mode 100644
index 0000000..6c1227d
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom/EditorResourceMode.cs
@@ -0,0 +1,51 @@
+using AlicizaX.Resource.Runtime;
+using UnityEditor;
+using UnityEngine;
+using UnityToolbarExtender;
+
+namespace TEngine.Editor
+{
+    [InitializeOnLoad]
+    public class EditorResourceMode
+    {
+        static EditorResourceMode()
+        {
+            ToolbarExtender.RightToolbarGUI.Add(OnToolbarGUI);
+            _playModeIndex = EditorPrefs.GetInt(ResourceComponent.PrefsKey, 0);
+        }
+
+        private const string ButtonStyleName = "Tab middle";
+        static GUIStyle _buttonGuiStyle;
+
+        private static readonly string[] _resourceModeNames =
+        {
+            "编辑器模式 ",
+            "沙盒模式",
+            "真机模式",
+        };
+
+        private static int _playModeIndex = 0;
+        public static int PlayModeIndex => _playModeIndex;
+
+        static void OnToolbarGUI()
+        {
+            EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
+            {
+                // 资源模式
+                int selectedIndex = EditorGUILayout.Popup(_playModeIndex, _resourceModeNames, ToolbarStyles.ToolBarButtonGuiStyle);
+                // ReSharper disable once RedundantCheckBeforeAssignment
+                if (selectedIndex != _playModeIndex)
+                {
+                    Debug.Log($"更改编辑器资源运行模式 : {_resourceModeNames[selectedIndex]}");
+                    _playModeIndex = selectedIndex;
+                    EditorPrefs.SetInt(ResourceComponent.PrefsKey, selectedIndex);
+                }
+
+                GUILayout.FlexibleSpace();
+
+                GUILayout.Space(400);
+            }
+            EditorGUI.EndDisabledGroup();
+        }
+    }
+}
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom/EditorResourceMode.cs.meta b/Client/Assets/Editor/ToolbarExtender/Custom/EditorResourceMode.cs.meta
new file mode 100644
index 0000000..ce80e39
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom/EditorResourceMode.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ab26dd2998d84a08b35c0132e1814199
+timeCreated: 1683857308
\ No newline at end of file
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom/SceneSwitcher.cs b/Client/Assets/Editor/ToolbarExtender/Custom/SceneSwitcher.cs
new file mode 100644
index 0000000..af567c6
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom/SceneSwitcher.cs
@@ -0,0 +1,100 @@
+// using UnityEditor;
+// using UnityEditor.SceneManagement;
+// using UnityEngine;
+// using UnityToolbarExtender;
+//
+// namespace TEngine
+// {
+//     [InitializeOnLoad]
+//     public class SceneSwitchLeftButton
+//     {
+//         private static readonly string SceneMain = "main";
+//
+//         static SceneSwitchLeftButton()
+//         {
+//             ToolbarExtender.LeftToolbarGUI.Add(OnToolbarGUI);
+//         }
+//
+//         static readonly string ButtonStyleName = "Tab middle";
+//         static GUIStyle _buttonGuiStyle;
+//
+//         static void OnToolbarGUI()
+//         {
+//             _buttonGuiStyle ??= new GUIStyle(ButtonStyleName)
+//             {
+//                 padding = new RectOffset(2, 8, 2, 2),
+//                 alignment = TextAnchor.MiddleCenter,
+//                 fontStyle = FontStyle.Bold
+//             };
+//
+//             GUILayout.FlexibleSpace();
+//             if (GUILayout.Button(
+//                     new GUIContent("Launcher", EditorGUIUtility.FindTexture("PlayButton"), $"Start Scene Launcher"),
+//                     _buttonGuiStyle))
+//             {
+//                 SceneHelper.StartScene(SceneMain);
+//             }
+//         }
+//     }
+//
+//     static class SceneHelper
+//     {
+//         static string _sceneToOpen;
+//
+//         public static void StartScene(string sceneName)
+//         {
+//             if (EditorApplication.isPlaying)
+//             {
+//                 EditorApplication.isPlaying = false;
+//             }
+//
+//             _sceneToOpen = sceneName;
+//             EditorApplication.update += OnUpdate;
+//         }
+//
+//         static void OnUpdate()
+//         {
+//             if (_sceneToOpen == null ||
+//                 EditorApplication.isPlaying || EditorApplication.isPaused ||
+//                 EditorApplication.isCompiling || EditorApplication.isPlayingOrWillChangePlaymode)
+//             {
+//                 return;
+//             }
+//
+//             EditorApplication.update -= OnUpdate;
+//
+//             if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
+//             {
+//                 string[] guids = AssetDatabase.FindAssets("t:scene " + _sceneToOpen, null);
+//                 if (guids.Length == 0)
+//                 {
+//                     Debug.LogWarning("Couldn't find scene file");
+//                 }
+//                 else
+//                 {
+//                     string scenePath = null;
+//                     // 优先打开完全匹配_sceneToOpen的场景
+//                     for (var i = 0; i < guids.Length; i++)
+//                     {
+//                         scenePath = AssetDatabase.GUIDToAssetPath(guids[i]);
+//                         if (scenePath.EndsWith("/" + _sceneToOpen + ".unity"))
+//                         {
+//                             break;
+//                         }
+//                     }
+//
+//                     // 如果没有完全匹配的场景，默认显示找到的第一个场景
+//                     if (string.IsNullOrEmpty(scenePath))
+//                     {
+//                         scenePath = AssetDatabase.GUIDToAssetPath(guids[0]);
+//                     }
+//
+//                     EditorSceneManager.OpenScene(scenePath);
+//                     EditorApplication.isPlaying = true;
+//                 }
+//             }
+//
+//             _sceneToOpen = null;
+//         }
+//     }
+// }
diff --git a/Client/Assets/Editor/ToolbarExtender/Custom/SceneSwitcher.cs.meta b/Client/Assets/Editor/ToolbarExtender/Custom/SceneSwitcher.cs.meta
new file mode 100644
index 0000000..262437c
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/Custom/SceneSwitcher.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 45017e4df12424c4fb16db4708d239f0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/ToolbarExtender/ToolbarCallback.cs b/Client/Assets/Editor/ToolbarExtender/ToolbarCallback.cs
new file mode 100644
index 0000000..07eb09a
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/ToolbarCallback.cs
@@ -0,0 +1,111 @@
+using System;
+using UnityEngine;
+using UnityEditor;
+using System.Reflection;
+
+#if UNITY_2019_1_OR_NEWER
+using UnityEngine.UIElements;
+#else
+using UnityEngine.Experimental.UIElements;
+#endif
+
+namespace UnityToolbarExtender
+{
+	public static class ToolbarCallback
+	{
+		static Type m_toolbarType = typeof(Editor).Assembly.GetType("UnityEditor.Toolbar");
+		static Type m_guiViewType = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
+#if UNITY_2020_1_OR_NEWER
+		static Type m_iWindowBackendType = typeof(Editor).Assembly.GetType("UnityEditor.IWindowBackend");
+		static PropertyInfo m_windowBackend = m_guiViewType.GetProperty("windowBackend",
+			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+		static PropertyInfo m_viewVisualTree = m_iWindowBackendType.GetProperty("visualTree",
+			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+#else
+		static PropertyInfo m_viewVisualTree = m_guiViewType.GetProperty("visualTree",
+			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+#endif
+		static FieldInfo m_imguiContainerOnGui = typeof(IMGUIContainer).GetField("m_OnGUIHandler",
+			BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+		static ScriptableObject m_currentToolbar;
+
+		/// <summary>
+		/// Callback for toolbar OnGUI method.
+		/// </summary>
+		public static Action OnToolbarGUI;
+		public static Action OnToolbarGUILeft;
+		public static Action OnToolbarGUIRight;
+		
+		static ToolbarCallback()
+		{
+			EditorApplication.update -= OnUpdate;
+			EditorApplication.update += OnUpdate;
+		}
+
+		static void OnUpdate()
+		{
+			// Relying on the fact that toolbar is ScriptableObject and gets deleted when layout changes
+			if (m_currentToolbar == null)
+			{
+				// Find toolbar
+				var toolbars = Resources.FindObjectsOfTypeAll(m_toolbarType);
+				m_currentToolbar = toolbars.Length > 0 ? (ScriptableObject) toolbars[0] : null;
+				if (m_currentToolbar != null)
+				{ 
+#if UNITY_2021_1_OR_NEWER
+					var root = m_currentToolbar.GetType().GetField("m_Root", BindingFlags.NonPublic | BindingFlags.Instance);
+					var rawRoot = root.GetValue(m_currentToolbar);
+					var mRoot = rawRoot as VisualElement;
+					RegisterCallback("ToolbarZoneLeftAlign", OnToolbarGUILeft);
+					RegisterCallback("ToolbarZoneRightAlign", OnToolbarGUIRight);
+
+					void RegisterCallback(string root, Action cb) {
+						var toolbarZone = mRoot.Q(root);
+
+						var parent = new VisualElement()
+						{
+							style = {
+								flexGrow = 1,
+								flexDirection = FlexDirection.Row,
+							}
+						};
+						var container = new IMGUIContainer();
+						container.style.flexGrow = 1;
+						container.onGUIHandler += () => { 
+							cb?.Invoke();
+						}; 
+						parent.Add(container);
+						toolbarZone.Add(parent);
+					}
+#else
+#if UNITY_2020_1_OR_NEWER
+					var windowBackend = m_windowBackend.GetValue(m_currentToolbar);
+
+					// Get it's visual tree
+					var visualTree = (VisualElement) m_viewVisualTree.GetValue(windowBackend, null);
+#else
+					// Get it's visual tree
+					var visualTree = (VisualElement) m_viewVisualTree.GetValue(m_currentToolbar, null);
+#endif
+
+					// Get first child which 'happens' to be toolbar IMGUIContainer
+					var container = (IMGUIContainer) visualTree[0];
+
+					// (Re)attach handler
+					var handler = (Action) m_imguiContainerOnGui.GetValue(container);
+					handler -= OnGUI;
+					handler += OnGUI;
+					m_imguiContainerOnGui.SetValue(container, handler);
+					
+#endif
+				}
+			}
+		}
+
+		static void OnGUI()
+		{
+			var handler = OnToolbarGUI;
+			if (handler != null) handler();
+		}
+	}
+}
diff --git a/Client/Assets/Editor/ToolbarExtender/ToolbarCallback.cs.meta b/Client/Assets/Editor/ToolbarExtender/ToolbarCallback.cs.meta
new file mode 100644
index 0000000..ced3086
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/ToolbarCallback.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4314ecffdfd1d90488e39e9ae35d14a1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Editor/ToolbarExtender/ToolbarExtender.cs b/Client/Assets/Editor/ToolbarExtender/ToolbarExtender.cs
new file mode 100644
index 0000000..95a7972
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/ToolbarExtender.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace UnityToolbarExtender
+{
+	[InitializeOnLoad]
+	public static class ToolbarExtender
+	{
+		static int m_toolCount;
+		static GUIStyle m_commandStyle = null;
+
+		public static readonly List<Action> LeftToolbarGUI = new List<Action>();
+		public static readonly List<Action> RightToolbarGUI = new List<Action>();
+
+		static ToolbarExtender()
+		{
+			Type toolbarType = typeof(Editor).Assembly.GetType("UnityEditor.Toolbar");
+			
+#if UNITY_2019_1_OR_NEWER
+			string fieldName = "k_ToolCount";
+#else
+			string fieldName = "s_ShownToolIcons";
+#endif
+			
+			FieldInfo toolIcons = toolbarType.GetField(fieldName,
+				BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+			
+#if UNITY_2019_3_OR_NEWER
+			m_toolCount = toolIcons != null ? ((int) toolIcons.GetValue(null)) : 8;
+#elif UNITY_2019_1_OR_NEWER
+			m_toolCount = toolIcons != null ? ((int) toolIcons.GetValue(null)) : 7;
+#elif UNITY_2018_1_OR_NEWER
+			m_toolCount = toolIcons != null ? ((Array) toolIcons.GetValue(null)).Length : 6;
+#else
+			m_toolCount = toolIcons != null ? ((Array) toolIcons.GetValue(null)).Length : 5;
+#endif
+	
+			ToolbarCallback.OnToolbarGUI = OnGUI;
+			ToolbarCallback.OnToolbarGUILeft = GUILeft;
+			ToolbarCallback.OnToolbarGUIRight = GUIRight;
+		}
+
+#if UNITY_2019_3_OR_NEWER
+		public const float space = 8;
+#else
+		public const float space = 10;
+#endif
+		public const float largeSpace = 20;
+		public const float buttonWidth = 32;
+		public const float dropdownWidth = 80;
+#if UNITY_2019_1_OR_NEWER
+		public const float playPauseStopWidth = 140;
+#else
+		public const float playPauseStopWidth = 100;
+#endif
+
+		static void OnGUI()
+		{
+			// Create two containers, left and right
+			// Screen is whole toolbar
+
+			if (m_commandStyle == null)
+			{
+				m_commandStyle = new GUIStyle("CommandLeft");
+			}
+
+			var screenWidth = EditorGUIUtility.currentViewWidth;
+
+			// Following calculations match code reflected from Toolbar.OldOnGUI()
+			float playButtonsPosition = Mathf.RoundToInt ((screenWidth - playPauseStopWidth) / 2);
+
+			Rect leftRect = new Rect(0, 0, screenWidth, Screen.height);
+			leftRect.xMin += space; // Spacing left
+			leftRect.xMin += buttonWidth * m_toolCount; // Tool buttons
+#if UNITY_2019_3_OR_NEWER
+			leftRect.xMin += space; // Spacing between tools and pivot
+#else
+			leftRect.xMin += largeSpace; // Spacing between tools and pivot
+#endif
+			leftRect.xMin += 64 * 2; // Pivot buttons
+			leftRect.xMax = playButtonsPosition;
+
+			Rect rightRect = new Rect(0, 0, screenWidth, Screen.height);
+			rightRect.xMin = playButtonsPosition;
+			rightRect.xMin += m_commandStyle.fixedWidth * 3; // Play buttons
+			rightRect.xMax = screenWidth;
+			rightRect.xMax -= space; // Spacing right
+			rightRect.xMax -= dropdownWidth; // Layout
+			rightRect.xMax -= space; // Spacing between layout and layers
+			rightRect.xMax -= dropdownWidth; // Layers
+#if UNITY_2019_3_OR_NEWER
+			rightRect.xMax -= space; // Spacing between layers and account
+#else
+			rightRect.xMax -= largeSpace; // Spacing between layers and account
+#endif
+			rightRect.xMax -= dropdownWidth; // Account
+			rightRect.xMax -= space; // Spacing between account and cloud
+			rightRect.xMax -= buttonWidth; // Cloud
+			rightRect.xMax -= space; // Spacing between cloud and collab
+			rightRect.xMax -= 78; // Colab
+
+			// Add spacing around existing controls
+			leftRect.xMin += space;
+			leftRect.xMax -= space;
+			rightRect.xMin += space;
+			rightRect.xMax -= space;
+
+			// Add top and bottom margins
+#if UNITY_2019_3_OR_NEWER
+			leftRect.y = 4;
+			leftRect.height = 22;
+			rightRect.y = 4;
+			rightRect.height = 22;
+#else
+			leftRect.y = 5;
+			leftRect.height = 24;
+			rightRect.y = 5;
+			rightRect.height = 24;
+#endif
+
+			if (leftRect.width > 0)
+			{
+				GUILayout.BeginArea(leftRect);
+				GUILayout.BeginHorizontal();
+				foreach (var handler in LeftToolbarGUI)
+				{
+					handler();
+				}
+
+				GUILayout.EndHorizontal();
+				GUILayout.EndArea();
+			}
+
+			if (rightRect.width > 0)
+			{
+				GUILayout.BeginArea(rightRect);
+				GUILayout.BeginHorizontal();
+				foreach (var handler in RightToolbarGUI)
+				{
+					handler();
+				}
+
+				GUILayout.EndHorizontal();
+				GUILayout.EndArea();
+			}
+		}
+		
+		public static void GUILeft() {
+			GUILayout.BeginHorizontal();
+			foreach (var handler in LeftToolbarGUI)
+			{
+				handler();
+			}
+			GUILayout.EndHorizontal();
+		}
+		
+		public static void GUIRight() {
+			GUILayout.BeginHorizontal();
+			foreach (var handler in RightToolbarGUI)
+			{
+				handler();
+			}
+			GUILayout.EndHorizontal();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Client/Assets/Editor/ToolbarExtender/ToolbarExtender.cs.meta b/Client/Assets/Editor/ToolbarExtender/ToolbarExtender.cs.meta
new file mode 100644
index 0000000..8183f96
--- /dev/null
+++ b/Client/Assets/Editor/ToolbarExtender/ToolbarExtender.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7b71421f0295dfa4f9c32f3ace45690d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Assets/Main.unity b/Client/Assets/Main.unity
index 2559a1b..95154ac 100644
--- a/Client/Assets/Main.unity
+++ b/Client/Assets/Main.unity
@@ -119,6 +119,56 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &558029961
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 558029962}
+  - component: {fileID: 558029963}
+  m_Layer: 0
+  m_Name: Localization
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &558029962
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 558029961}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1062825540}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &558029963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 558029961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 577f4666bd05453d9b779ce3050b9ec2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  componentType: 
+--- !u!4 &1062825540 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+  m_PrefabInstance: {fileID: 7354943399308362261}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1378554099
 GameObject:
   m_ObjectHideFlags: 0
@@ -256,7 +306,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &9151303530987613966
+--- !u!1001 &7354943399308362261
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -264,58 +314,65 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 872693327694151783, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7543149531317296434, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+    - target: {fileID: 5472542677182214335, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
       propertyPath: m_Name
       value: Entry
       objectReference: {fileID: 0}
+    - target: {fileID: 7354290124713579766, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+      propertyPath: m_DecryptionServices
+      value: AlicizaX.Resource.Runtime.FileOffsetDecryption
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 425597497363353001, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 558029962}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8e4808bf30e54a8439a661bfa35ee982, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-  - {fileID: 9151303530987613966}
+  - {fileID: 7354943399308362261}
   - {fileID: 1378554103}
diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef b/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef
index ff03466..a8dc9bb 100644
--- a/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef
+++ b/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef
@@ -7,11 +7,11 @@
         "GUID:5c89d8180b6e1a145b027f32840f0a58",
         "GUID:75b6f2078d190f14dbda4a5b747d709c",
         "GUID:5553d74549d54e74cb548b3ab58a8483",
-        "GUID:8480a2920e549a94b8e2b42231467576",
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
         "GUID:be2f20a77f3232f44b9711ef43234aac",
         "GUID:fa962577ca32d0e429a1ff4b4d30f43c",
-        "GUID:425703724086804498a0f4888e7e2e6d"
+        "GUID:425703724086804498a0f4888e7e2e6d",
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs
index ef16ea1..f354392 100644
--- a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs
+++ b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs
@@ -43,7 +43,6 @@ namespace GameLogic
             var localization = GameApp.Config.GetConfig<TbLocalization>().Get(key);
             if (localization == null)
             {
-                Debug.Log(key + "--" + content);
                 return key;
             }
 
diff --git a/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureClearCache.cs b/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureClearCache.cs
index 2c903c4..4fb443a 100644
--- a/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureClearCache.cs
+++ b/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureClearCache.cs
@@ -16,7 +16,7 @@ namespace Unity.Startup.Procedure
             base.OnEnter(procedureOwner);
             Log.Info("开始清理包裹无用缓存!");
             owner = procedureOwner;
-            ClearUnusedBundleFilesOperation operation = GameApp.Resource.ClearUnusedCacheFilesAsync();
+            ClearCacheFilesOperation operation = GameApp.Resource.ClearUnusedCacheFilesAsync(EFileClearMode.ClearUnusedBundleFiles);
             operation.Completed += ClearCacheCompleted;
         }
 
diff --git a/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureCreateDownloader.cs b/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureCreateDownloader.cs
index 5291c5f..eddab2d 100644
--- a/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureCreateDownloader.cs
+++ b/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureCreateDownloader.cs
@@ -45,7 +45,7 @@ namespace Unity.Startup.Procedure
 
                 //这里进行确认 如果要下载在进行跳转到Download
 
-                GameApp.Event.Fire(this, AssetFoundUpdateFilesEventArgs.Create(downloader.GetPackageName(), totalDownloadCount, totalDownloadBytes));
+                GameApp.Event.Fire(this, AssetFoundUpdateFilesEventArgs.Create(downloader.PackageName, totalDownloadCount, totalDownloadBytes));
                 ChangeState<ProcedureDownloadWebFiles>(procedureOwner);
             }
         }
diff --git a/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureDownloadWebFiles.cs b/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureDownloadWebFiles.cs
index 04e362f..5eb65aa 100644
--- a/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureDownloadWebFiles.cs
+++ b/Client/Assets/Scripts/Startup/Framework/Procedure/PatchUpdater/ProcedureDownloadWebFiles.cs
@@ -26,14 +26,14 @@ namespace Unity.Startup.Procedure
 
 
             // 注册下载回调
-            void DownloaderOnDownloadErrorCallback(string packageName, string name, string error)
+            void DownloaderOnDownloadErrorCallback(DownloadErrorData data)
             {
-                GameApp.Event.Fire(this, AssetWebFileDownloadFailedEventArgs.Create(packageName, name, error));
+                GameApp.Event.Fire(this, AssetWebFileDownloadFailedEventArgs.Create(data.PackageName, data.FileName, data.ErrorInfo));
                 ChangeState<ProcedureCreateDownloader>(procedureOwner);
             }
 
-            downloader.OnDownloadErrorCallback = DownloaderOnDownloadErrorCallback;
-            downloader.OnDownloadProgressCallback = OnDownloadProgressCallback;
+            downloader.DownloadErrorCallback = DownloaderOnDownloadErrorCallback;
+            downloader.DownloadUpdateCallback = OnDownloadProgressCallback;
             downloader.BeginDownload();
             await downloader;
 
@@ -47,9 +47,9 @@ namespace Unity.Startup.Procedure
             ChangeState<ProcedurePatchDone>(procedureOwner);
         }
 
-        private void OnDownloadProgressCallback(string packageName, int totalDownloadCount, int currentDownloadCount, long totalDownloadBytes, long currentDownloadBytes)
+        private void OnDownloadProgressCallback(DownloadUpdateData data)
         {
-            GameApp.Event.Fire(this, AssetDownloadProgressUpdateEventArgs.Create(packageName, totalDownloadCount, currentDownloadCount, totalDownloadBytes, currentDownloadBytes));
+            GameApp.Event.Fire(this, AssetDownloadProgressUpdateEventArgs.Create(data.PackageName, data.TotalDownloadCount, data.CurrentDownloadCount, data.TotalDownloadBytes, data.CurrentDownloadBytes));
         }
     }
 }
diff --git a/Client/Assets/Scripts/Startup/Unity.Startup.asmdef b/Client/Assets/Scripts/Startup/Unity.Startup.asmdef
index c3db694..0e8d093 100644
--- a/Client/Assets/Scripts/Startup/Unity.Startup.asmdef
+++ b/Client/Assets/Scripts/Startup/Unity.Startup.asmdef
@@ -2,7 +2,6 @@
     "name": "Unity.Startup",
     "rootNamespace": "",
     "references": [
-        "YooAsset.Runtime",
         "UniTask.Runtime",
         "HybridCLR.Runtime",
         "AlicizaX.Entry.Runtime",
@@ -14,7 +13,8 @@
         "AlicizaX.Fsm.Runtime",
         "HybridCLRData",
         "AlicizaX.Setting.Runtime",
-        "AlicizaX.Audio.Runtime"
+        "AlicizaX.Audio.Runtime",
+        "YooAsset"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset b/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset
index 1809dd9..79339a2 100644
--- a/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset
+++ b/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: AssetBundleCollectorSetting
   m_EditorClassIdentifier: 
   ShowPackageView: 0
-  ShowEditorAlias: 1
+  ShowEditorAlias: 0
   UniqueBundleName: 0
   Packages:
   - PackageName: DefaultPackage
@@ -22,7 +22,7 @@ MonoBehaviour:
     LocationToLower: 0
     IncludeAssetGUID: 0
     AutoCollectShaders: 1
-    IgnoreRuleName: GameIgnoreRule
+    IgnoreRuleName: NormalIgnoreRule
     Groups:
     - GroupName: Entity
       GroupDesc: "\u89D2\u8272"
@@ -145,8 +145,8 @@ MonoBehaviour:
         CollectorGUID: 2a4bceb84ed685447ace957f497eb810
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackSeparately
-        FilterRuleName: CollectAll
+        PackRuleName: PackShader
+        FilterRuleName: CollectShader
         AssetTags: 
         UserData: 
     - GroupName: UI
@@ -188,3 +188,16 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
+    - GroupName: ShaderVariants
+      GroupDesc: ShaderVariants
+      AssetTags: ShaderVariants
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/AssetRaw/ShaderVariants
+        CollectorGUID: 9602ad9f8198a8e459205ec2de5414f3
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackShaderVariants
+        FilterRuleName: CollectShaderVariants
+        AssetTags: 
+        UserData: 
diff --git a/Client/Packages/com.alicizax.unity.audio/README.md b/Client/Packages/com.alicizax.unity.audio/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.audio/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.audio/Runtime/AlicizaX.Audio.Runtime.asmdef b/Client/Packages/com.alicizax.unity.audio/Runtime/AlicizaX.Audio.Runtime.asmdef
index ac13a5c..b6edb8d 100644
--- a/Client/Packages/com.alicizax.unity.audio/Runtime/AlicizaX.Audio.Runtime.asmdef
+++ b/Client/Packages/com.alicizax.unity.audio/Runtime/AlicizaX.Audio.Runtime.asmdef
@@ -3,9 +3,9 @@
     "rootNamespace": "AlicizaX.Audio.Runtime",
     "references": [
         "GUID:75b6f2078d190f14dbda4a5b747d709c",
-        "GUID:8480a2920e549a94b8e2b42231467576",
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
-        "GUID:be2f20a77f3232f44b9711ef43234aac"
+        "GUID:be2f20a77f3232f44b9711ef43234aac",
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Client/Packages/com.alicizax.unity.config/README.md b/Client/Packages/com.alicizax.unity.config/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.config/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.debugger/README.md b/Client/Packages/com.alicizax.unity.debugger/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.debugger/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.editor.extension/README.md b/Client/Packages/com.alicizax.unity.editor.extension/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.editor.extension/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.editor.extension/README.md.meta b/Client/Packages/com.alicizax.unity.editor.extension/README.md.meta
deleted file mode 100644
index c52e90b..0000000
--- a/Client/Packages/com.alicizax.unity.editor.extension/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c2498bda4674faa4b831b2af7850c745
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.entry/Resources.meta b/Client/Packages/com.alicizax.unity.entry/Asset.meta
similarity index 100%
rename from Client/Packages/com.alicizax.unity.entry/Resources.meta
rename to Client/Packages/com.alicizax.unity.entry/Asset.meta
diff --git a/Client/Packages/com.alicizax.unity.entry/Resources/Entry.prefab b/Client/Packages/com.alicizax.unity.entry/Asset/Entry.prefab
similarity index 77%
rename from Client/Packages/com.alicizax.unity.entry/Resources/Entry.prefab
rename to Client/Packages/com.alicizax.unity.entry/Asset/Entry.prefab
index 7499fc0..7364254 100644
--- a/Client/Packages/com.alicizax.unity.entry/Resources/Entry.prefab
+++ b/Client/Packages/com.alicizax.unity.entry/Asset/Entry.prefab
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1029461519516559577
+--- !u!1 &863045549519453050
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1230651960664234646}
-  - component: {fileID: 6342721852032357650}
+  - component: {fileID: 9160912643551877041}
+  - component: {fileID: 2004497887649975646}
   m_Layer: 0
   m_Name: UI
   m_TagString: Untagged
@@ -17,28 +17,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1230651960664234646
+--- !u!4 &9160912643551877041
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1029461519516559577}
+  m_GameObject: {fileID: 863045549519453050}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6342721852032357650
+--- !u!114 &2004497887649975646
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1029461519516559577}
+  m_GameObject: {fileID: 863045549519453050}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 028204b1d2277bd4782816ee91aeed81, type: 3}
@@ -46,7 +46,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   componentType: AlicizaX.UI.Runtime.UIManager
   uiRoot: {fileID: 4612363183729467837, guid: 9368ff38b2090b2468f8358242026e4b, type: 3}
---- !u!1 &2159861855500127327
+--- !u!1 &1516812642607394282
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -54,98 +54,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 705212810629798912}
-  - component: {fileID: 5475760805328191716}
-  m_Layer: 0
-  m_Name: Fsm
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &705212810629798912
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2159861855500127327}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 872693327694151783}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5475760805328191716
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2159861855500127327}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a69e41ab65d84e83a0468f1a2cc3926f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  componentType: AlicizaX.Fsm.Runtime.FsmManager
---- !u!1 &2410279006178986530
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7851428660121841770}
-  - component: {fileID: 3501419302350321191}
-  m_Layer: 0
-  m_Name: Config
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7851428660121841770
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2410279006178986530}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 872693327694151783}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3501419302350321191
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2410279006178986530}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: be92abf1b6aa472c9ff7ebd49bbab9bf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  componentType: AlicizaX.Config.Runtime.ConfigManager
---- !u!1 &4521665525621588778
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4133490023722193167}
-  - component: {fileID: 9015116929140832975}
+  - component: {fileID: 7231588671532407876}
+  - component: {fileID: 8897508624174186059}
   m_Layer: 0
   m_Name: Debugger
   m_TagString: Untagged
@@ -153,28 +63,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4133490023722193167
+--- !u!4 &7231588671532407876
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4521665525621588778}
+  m_GameObject: {fileID: 1516812642607394282}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &9015116929140832975
+--- !u!114 &8897508624174186059
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4521665525621588778}
+  m_GameObject: {fileID: 1516812642607394282}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f05eaceeebe870a4595e51f998ed518b, type: 3}
@@ -203,7 +113,7 @@ MonoBehaviour:
     m_FatalColor:
       serializedVersion: 2
       rgba: 4281545650
---- !u!1 &5353401510309640064
+--- !u!1 &1713037984681270060
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -211,8 +121,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7517449009630221084}
-  - component: {fileID: 2203660663293536855}
+  - component: {fileID: 1854293209487326123}
+  - component: {fileID: 4927968100452151227}
   m_Layer: 0
   m_Name: Timer
   m_TagString: Untagged
@@ -220,35 +130,35 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7517449009630221084
+--- !u!4 &1854293209487326123
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5353401510309640064}
+  m_GameObject: {fileID: 1713037984681270060}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2203660663293536855
+--- !u!114 &4927968100452151227
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5353401510309640064}
+  m_GameObject: {fileID: 1713037984681270060}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 6bbfa5f028024a70812e412b33c0a86a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   componentType: AlicizaX.Timer.Runtime.TimerManager
---- !u!1 &6052113869286802415
+--- !u!1 &2077363682113217780
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -256,44 +166,44 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2192733867988101149}
-  - component: {fileID: 6973877878501820022}
+  - component: {fileID: 1316740771005759728}
+  - component: {fileID: 234809841523679894}
   m_Layer: 0
-  m_Name: EventKit
+  m_Name: Object Pool
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2192733867988101149
+--- !u!4 &1316740771005759728
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6052113869286802415}
+  m_GameObject: {fileID: 2077363682113217780}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6973877878501820022
+--- !u!114 &234809841523679894
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6052113869286802415}
+  m_GameObject: {fileID: 2077363682113217780}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7eec9f691e06464cbfc45f619c7fee9d, type: 3}
+  m_Script: {fileID: 11500000, guid: 1e28a727443c86c40aeb42ff20e0a343, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  componentType: 
---- !u!1 &6178945319114926925
+  componentType: AlicizaX.ObjectPool.ObjectPoolManager
+--- !u!1 &2863938145508470796
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -301,51 +211,46 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6649144490139638750}
-  - component: {fileID: 3936455619947539997}
+  - component: {fileID: 2467323922827256759}
+  - component: {fileID: 6672875393309450783}
   m_Layer: 0
-  m_Name: Resources
+  m_Name: Setting
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6649144490139638750
+--- !u!4 &2467323922827256759
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6178945319114926925}
+  m_GameObject: {fileID: 2863938145508470796}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3936455619947539997
+--- !u!114 &6672875393309450783
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6178945319114926925}
+  m_GameObject: {fileID: 2863938145508470796}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 91e581bb79676824f8c04687f21ed727, type: 3}
+  m_Script: {fileID: 11500000, guid: dd5fa5f9376d4c2abee7a298edbfbd19, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  componentType: AlicizaX.Resource.Runtime.ResourceManager
-  m_GamePlayMode: 2
-  m_Milliseconds: 30
-  m_defaultPackageName: DefaultPackage
-  m_AssetAutoReleaseInterval: 60
-  m_AssetCapacity: 64
-  m_AssetExpireTime: 60
-  m_AssetPriority: 0
---- !u!1 &6391065049862922758
+  componentType: AlicizaX.Setting.Runtime.SettingManager
+  m_SettingHelperTypeName: AlicizaX.Setting.Runtime.DefaultSettingHelper
+  m_CustomSettingHelper: {fileID: 0}
+--- !u!1 &2946186047994278043
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -353,44 +258,44 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1193668558717459112}
-  - component: {fileID: 140658526511928389}
+  - component: {fileID: 8452422965548084857}
+  - component: {fileID: 4549063091385861712}
   m_Layer: 0
-  m_Name: Event
+  m_Name: Fsm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1193668558717459112
+--- !u!4 &8452422965548084857
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6391065049862922758}
+  m_GameObject: {fileID: 2946186047994278043}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &140658526511928389
+--- !u!114 &4549063091385861712
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6391065049862922758}
+  m_GameObject: {fileID: 2946186047994278043}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 48602115335c4223a70dc35cd6b29bbd, type: 3}
+  m_Script: {fileID: 11500000, guid: a69e41ab65d84e83a0468f1a2cc3926f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  componentType: AlicizaX.Event.Runtime.EventManager
---- !u!1 &6751893000096084138
+  componentType: AlicizaX.Fsm.Runtime.FsmManager
+--- !u!1 &3110504541604719603
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -398,55 +303,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2774005203675618589}
-  - component: {fileID: 5984924861227346584}
-  m_Layer: 0
-  m_Name: ResourcesExt
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2774005203675618589
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6751893000096084138}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 872693327694151783}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5984924861227346584
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6751893000096084138}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e3adf1e69b12944448c9fe6ae10983cb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  componentType: 
-  m_CheckCanReleaseInterval: 30
-  m_AutoReleaseInterval: 60
---- !u!1 &6802170524113624248
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5386509871369360704}
-  - component: {fileID: 703245217724295504}
+  - component: {fileID: 1221616422164529523}
+  - component: {fileID: 2335644458384035471}
   m_Layer: 0
   m_Name: Procedure
   m_TagString: Untagged
@@ -454,28 +312,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5386509871369360704
+--- !u!4 &1221616422164529523
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6802170524113624248}
+  m_GameObject: {fileID: 3110504541604719603}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &703245217724295504
+--- !u!114 &2335644458384035471
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6802170524113624248}
+  m_GameObject: {fileID: 3110504541604719603}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4d13b628448e4c71a78c4e51756cf98c, type: 3}
@@ -496,7 +354,7 @@ MonoBehaviour:
   - Unity.Startup.Procedure.ProcedureUpdateManifest
   - Unity.Startup.Procedure.ProcedureUpdateStaticVersion
   m_EntranceProcedureTypeName: Unity.Startup.Procedure.ProcedureLauncherState
---- !u!1 &6822805280285071754
+--- !u!1 &3646865557585103128
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -504,8 +362,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8709577274779249990}
-  - component: {fileID: 8234879878215679252}
+  - component: {fileID: 1933965801183527639}
+  - component: {fileID: 1956686654474545424}
   m_Layer: 0
   m_Name: Reference Pool
   m_TagString: Untagged
@@ -513,28 +371,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8709577274779249990
+--- !u!4 &1933965801183527639
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6822805280285071754}
+  m_GameObject: {fileID: 3646865557585103128}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8234879878215679252
+--- !u!114 &1956686654474545424
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6822805280285071754}
+  m_GameObject: {fileID: 3646865557585103128}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8ae4d40d7e878bc498492dc9c410d071, type: 3}
@@ -542,7 +400,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   componentType: 
   m_EnableStrictCheck: 0
---- !u!1 &7543149531317296434
+--- !u!1 &4838532054802213812
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -550,8 +408,98 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 872693327694151783}
-  - component: {fileID: 3321187484417907030}
+  - component: {fileID: 8504326711444028785}
+  - component: {fileID: 9038455970653831619}
+  m_Layer: 0
+  m_Name: Scene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8504326711444028785
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4838532054802213812}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 425597497363353001}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9038455970653831619
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4838532054802213812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8303f9994334265af3691a4b90f89d7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  componentType: AlicizaX.Scene.Runtime.GameSceneManager
+--- !u!1 &5379455891244748021
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4323824073023419020}
+  - component: {fileID: 59316958468602302}
+  m_Layer: 0
+  m_Name: Config
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4323824073023419020
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5379455891244748021}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 425597497363353001}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &59316958468602302
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5379455891244748021}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: be92abf1b6aa472c9ff7ebd49bbab9bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  componentType: AlicizaX.Config.Runtime.ConfigManager
+--- !u!1 &5472542677182214335
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 425597497363353001}
+  - component: {fileID: 7461712675371014626}
   m_Layer: 0
   m_Name: Entry
   m_TagString: Untagged
@@ -559,43 +507,43 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &872693327694151783
+--- !u!4 &425597497363353001
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7543149531317296434}
+  m_GameObject: {fileID: 5472542677182214335}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8709577274779249990}
-  - {fileID: 6745669473387912735}
-  - {fileID: 5386509871369360704}
-  - {fileID: 6599398538668055626}
-  - {fileID: 7517449009630221084}
-  - {fileID: 2192733867988101149}
-  - {fileID: 1193668558717459112}
-  - {fileID: 6649144490139638750}
-  - {fileID: 2774005203675618589}
-  - {fileID: 2263784588518876553}
-  - {fileID: 4133490023722193167}
-  - {fileID: 2100354558514495230}
-  - {fileID: 7851428660121841770}
-  - {fileID: 705212810629798912}
-  - {fileID: 1230651960664234646}
+  - {fileID: 1933965801183527639}
+  - {fileID: 1316740771005759728}
+  - {fileID: 1221616422164529523}
+  - {fileID: 2467323922827256759}
+  - {fileID: 1854293209487326123}
+  - {fileID: 1172762408459505014}
+  - {fileID: 5170167877536483258}
+  - {fileID: 424925309774805088}
+  - {fileID: 1226030177838128577}
+  - {fileID: 8504326711444028785}
+  - {fileID: 7231588671532407876}
+  - {fileID: 1640076400431107710}
+  - {fileID: 4323824073023419020}
+  - {fileID: 8452422965548084857}
+  - {fileID: 9160912643551877041}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3321187484417907030
+--- !u!114 &7461712675371014626
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7543149531317296434}
+  m_GameObject: {fileID: 5472542677182214335}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 252fa1bb9e36411fb4582d0656b987bf, type: 3}
@@ -606,7 +554,7 @@ MonoBehaviour:
   m_GameSpeed: 1
   m_RunInBackground: 1
   m_NeverSleep: 1
---- !u!1 &7735514978784737518
+--- !u!1 &6519989611955579811
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -614,8 +562,61 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2100354558514495230}
-  - component: {fileID: 8740987973648959375}
+  - component: {fileID: 424925309774805088}
+  - component: {fileID: 7354290124713579766}
+  m_Layer: 0
+  m_Name: Resources
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &424925309774805088
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6519989611955579811}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 425597497363353001}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7354290124713579766
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6519989611955579811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 91e581bb79676824f8c04687f21ed727, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  componentType: AlicizaX.Resource.Runtime.ResourceManager
+  m_GamePlayMode: 2
+  m_Milliseconds: 30
+  m_defaultPackageName: DefaultPackage
+  m_AssetAutoReleaseInterval: 60
+  m_AssetCapacity: 64
+  m_AssetExpireTime: 60
+  m_AssetPriority: 0
+  m_DecryptionServices: AlicizaX.Resource.Runtime.FileStreamDecryption
+--- !u!1 &6601518982324708866
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1640076400431107710}
+  - component: {fileID: 5037979285627885502}
   m_Layer: 0
   m_Name: Audio
   m_TagString: Untagged
@@ -623,28 +624,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2100354558514495230
+--- !u!4 &1640076400431107710
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7735514978784737518}
+  m_GameObject: {fileID: 6601518982324708866}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8740987973648959375
+--- !u!114 &5037979285627885502
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7735514978784737518}
+  m_GameObject: {fileID: 6601518982324708866}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 7d0b3cff83fd3874394b1b456bb54dab, type: 3}
@@ -652,7 +653,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   componentType: AlicizaX.Audio.Runtime.AudioManager
   m_AudioMixer: {fileID: 24100000, guid: 1af7a1b121ae17541a1967d430cef006, type: 2}
-  m_InstanceRoot: {fileID: 2100354558514495230}
+  m_InstanceRoot: {fileID: 1640076400431107710}
   m_AudioGroupConfigs:
   - m_Name: Music
     m_Mute: 0
@@ -686,7 +687,7 @@ MonoBehaviour:
     audioRolloffMode: 0
     minDistance: 1
     maxDistance: 500
---- !u!1 &8612237073929828197
+--- !u!1 &8241741088829230542
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -694,46 +695,46 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2263784588518876553}
-  - component: {fileID: 504723695797919324}
+  - component: {fileID: 1226030177838128577}
+  - component: {fileID: 557098897184722298}
   m_Layer: 0
-  m_Name: Scene
+  m_Name: ResourcesExt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2263784588518876553
+--- !u!4 &1226030177838128577
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8612237073929828197}
+  m_GameObject: {fileID: 8241741088829230542}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &504723695797919324
+--- !u!114 &557098897184722298
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8612237073929828197}
+  m_GameObject: {fileID: 8241741088829230542}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6ccaedadefd0fbf498241670caa387e8, type: 3}
+  m_Script: {fileID: 11500000, guid: e3adf1e69b12944448c9fe6ae10983cb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  componentType: AlicizaX.Scene.Runtime.GameSceneManager
-  m_EnableLoadSceneUpdateEvent: 1
-  m_EnableLoadSceneDependencyAssetEvent: 1
---- !u!1 &8705119867914337319
+  componentType: 
+  m_CheckCanReleaseInterval: 30
+  m_AutoReleaseInterval: 60
+--- !u!1 &8527903851783246430
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -741,44 +742,44 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6745669473387912735}
-  - component: {fileID: 6041821004877564393}
+  - component: {fileID: 5170167877536483258}
+  - component: {fileID: 454459017733802404}
   m_Layer: 0
-  m_Name: Object Pool
+  m_Name: Event
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6745669473387912735
+--- !u!4 &5170167877536483258
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8705119867914337319}
+  m_GameObject: {fileID: 8527903851783246430}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6041821004877564393
+--- !u!114 &454459017733802404
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8705119867914337319}
+  m_GameObject: {fileID: 8527903851783246430}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e28a727443c86c40aeb42ff20e0a343, type: 3}
+  m_Script: {fileID: 11500000, guid: 48602115335c4223a70dc35cd6b29bbd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  componentType: AlicizaX.ObjectPool.ObjectPoolManager
---- !u!1 &9199961599302139892
+  componentType: AlicizaX.Event.Runtime.EventManager
+--- !u!1 &8951643211898284125
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -786,42 +787,40 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6599398538668055626}
-  - component: {fileID: 7322265836626601571}
+  - component: {fileID: 1172762408459505014}
+  - component: {fileID: 4844195418752777003}
   m_Layer: 0
-  m_Name: Setting
+  m_Name: EventKit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6599398538668055626
+--- !u!4 &1172762408459505014
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9199961599302139892}
+  m_GameObject: {fileID: 8951643211898284125}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 872693327694151783}
+  m_Father: {fileID: 425597497363353001}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7322265836626601571
+--- !u!114 &4844195418752777003
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9199961599302139892}
+  m_GameObject: {fileID: 8951643211898284125}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dd5fa5f9376d4c2abee7a298edbfbd19, type: 3}
+  m_Script: {fileID: 11500000, guid: 7eec9f691e06464cbfc45f619c7fee9d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  componentType: AlicizaX.Setting.Runtime.SettingManager
-  m_SettingHelperTypeName: AlicizaX.Setting.Runtime.DefaultSettingHelper
-  m_CustomSettingHelper: {fileID: 0}
+  componentType: 
diff --git a/Client/Packages/com.alicizax.unity.entry/Resources/Entry.prefab.meta b/Client/Packages/com.alicizax.unity.entry/Asset/Entry.prefab.meta
similarity index 100%
rename from Client/Packages/com.alicizax.unity.entry/Resources/Entry.prefab.meta
rename to Client/Packages/com.alicizax.unity.entry/Asset/Entry.prefab.meta
diff --git a/Client/Packages/com.alicizax.unity.entry/README.md b/Client/Packages/com.alicizax.unity.entry/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.entry/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.entry/README.md.meta b/Client/Packages/com.alicizax.unity.entry/README.md.meta
deleted file mode 100644
index 4171d6c..0000000
--- a/Client/Packages/com.alicizax.unity.entry/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0706dfc66622ae14b9c902618db3b0f3
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.entry/Runtime/AlicizaX.Entry.Runtime.asmdef b/Client/Packages/com.alicizax.unity.entry/Runtime/AlicizaX.Entry.Runtime.asmdef
index e7fa858..4cc9e2b 100644
--- a/Client/Packages/com.alicizax.unity.entry/Runtime/AlicizaX.Entry.Runtime.asmdef
+++ b/Client/Packages/com.alicizax.unity.entry/Runtime/AlicizaX.Entry.Runtime.asmdef
@@ -13,7 +13,8 @@
         "GUID:000cc1eaf688c5246be5328cb0cf16c8",
         "GUID:0d00816689626d846bd06cd779413413",
         "GUID:198eb6af143bbc4488e2779d96697e06",
-        "GUID:fa962577ca32d0e429a1ff4b4d30f43c"
+        "GUID:fa962577ca32d0e429a1ff4b4d30f43c",
+        "GUID:a19b414bea3b97240a91aeab9a8eab36"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Client/Packages/com.alicizax.unity.entry/Runtime/GameApp.Localization.cs b/Client/Packages/com.alicizax.unity.entry/Runtime/GameApp.Localization.cs
index c2d8580..4d9e56a 100644
--- a/Client/Packages/com.alicizax.unity.entry/Runtime/GameApp.Localization.cs
+++ b/Client/Packages/com.alicizax.unity.entry/Runtime/GameApp.Localization.cs
@@ -1,6 +1,5 @@
-#if ENABLE_GAME_FRAME_X_LOCALIZATION
-using GameFrameX.Localization.Runtime;
-using GameFrameX.Runtime;
+using AlicizaX.Localization.Runtime;
+using AlicizaX.Runtime;
 
 public static partial class GameApp
 {
@@ -22,4 +21,3 @@ public static partial class GameApp
 
     private static LocalizationComponent _localization;
 }
-#endif
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.event/README.md b/Client/Packages/com.alicizax.unity.event/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.event/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.event/README.md.meta b/Client/Packages/com.alicizax.unity.event/README.md.meta
deleted file mode 100644
index 4ab314a..0000000
--- a/Client/Packages/com.alicizax.unity.event/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6afed25707938e744ac27c972a823830
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.eventkit/README.md b/Client/Packages/com.alicizax.unity.eventkit/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.eventkit/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.eventkit/README.md.meta b/Client/Packages/com.alicizax.unity.eventkit/README.md.meta
deleted file mode 100644
index fc70609..0000000
--- a/Client/Packages/com.alicizax.unity.eventkit/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f07eaeafcb5792e47ab17e2677715d04
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.fsm/README.md b/Client/Packages/com.alicizax.unity.fsm/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.fsm/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.fsm/README.md.meta b/Client/Packages/com.alicizax.unity.fsm/README.md.meta
deleted file mode 100644
index 6f9a169..0000000
--- a/Client/Packages/com.alicizax.unity.fsm/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 14ec79d700a0eb5468144adbf273e1c2
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.localization/README.md b/Client/Packages/com.alicizax.unity.localization/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.localization/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.localization/README.md.meta b/Client/Packages/com.alicizax.unity.localization/README.md.meta
deleted file mode 100644
index d6a4a00..0000000
--- a/Client/Packages/com.alicizax.unity.localization/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5bfc36893b083ef4fb5f7db964753bb4
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LanguageHelper.cs b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LanguageHelper.cs
index f8be0fc..905271c 100644
--- a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LanguageHelper.cs
+++ b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LanguageHelper.cs
@@ -14,52 +14,14 @@ namespace AlicizaX.Localization.Runtime
             {
                 switch (Application.systemLanguage)
                 {
-                    case UnityEngine.SystemLanguage.Afrikaans: return Language.Afrikaans;
-                    case UnityEngine.SystemLanguage.Arabic: return Language.Arabic;
-                    case UnityEngine.SystemLanguage.Basque: return Language.Basque;
-                    case UnityEngine.SystemLanguage.Belarusian: return Language.Belarusian;
-                    case UnityEngine.SystemLanguage.Bulgarian: return Language.Bulgarian;
-                    case UnityEngine.SystemLanguage.Catalan: return Language.Catalan;
                     case UnityEngine.SystemLanguage.Chinese: return Language.ChineseSimplified;
                     case UnityEngine.SystemLanguage.ChineseSimplified: return Language.ChineseSimplified;
-                    case UnityEngine.SystemLanguage.ChineseTraditional: return Language.ChineseTraditional;
-                    case UnityEngine.SystemLanguage.Czech: return Language.Czech;
-                    case UnityEngine.SystemLanguage.Danish: return Language.Danish;
-                    case UnityEngine.SystemLanguage.Dutch: return Language.Dutch;
+                    case UnityEngine.SystemLanguage.ChineseTraditional: return Language.ChineseSimplified;
                     case UnityEngine.SystemLanguage.English: return Language.English;
-                    case UnityEngine.SystemLanguage.Estonian: return Language.Estonian;
-                    case UnityEngine.SystemLanguage.Faroese: return Language.Faroese;
-                    case UnityEngine.SystemLanguage.Finnish: return Language.Finnish;
-                    case UnityEngine.SystemLanguage.French: return Language.French;
-                    case UnityEngine.SystemLanguage.German: return Language.German;
-                    case UnityEngine.SystemLanguage.Greek: return Language.Greek;
-                    case UnityEngine.SystemLanguage.Hebrew: return Language.Hebrew;
-                    case UnityEngine.SystemLanguage.Hungarian: return Language.Hungarian;
-                    case UnityEngine.SystemLanguage.Icelandic: return Language.Icelandic;
-                    case UnityEngine.SystemLanguage.Indonesian: return Language.Indonesian;
-                    case UnityEngine.SystemLanguage.Italian: return Language.Italian;
                     case UnityEngine.SystemLanguage.Japanese: return Language.Japanese;
-                    case UnityEngine.SystemLanguage.Korean: return Language.Korean;
-                    case UnityEngine.SystemLanguage.Latvian: return Language.Latvian;
-                    case UnityEngine.SystemLanguage.Lithuanian: return Language.Lithuanian;
-                    case UnityEngine.SystemLanguage.Norwegian: return Language.Norwegian;
-                    case UnityEngine.SystemLanguage.Polish: return Language.Polish;
-                    case UnityEngine.SystemLanguage.Portuguese: return Language.PortuguesePortugal;
-                    case UnityEngine.SystemLanguage.Romanian: return Language.Romanian;
-                    case UnityEngine.SystemLanguage.Russian: return Language.Russian;
-                    case UnityEngine.SystemLanguage.SerboCroatian: return Language.SerboCroatian;
-                    case UnityEngine.SystemLanguage.Slovak: return Language.Slovak;
-                    case UnityEngine.SystemLanguage.Slovenian: return Language.Slovenian;
-                    case UnityEngine.SystemLanguage.Spanish: return Language.Spanish;
-                    case UnityEngine.SystemLanguage.Swedish: return Language.Swedish;
-                    case UnityEngine.SystemLanguage.Thai: return Language.Thai;
-                    case UnityEngine.SystemLanguage.Turkish: return Language.Turkish;
-                    case UnityEngine.SystemLanguage.Ukrainian: return Language.Ukrainian;
-                    case UnityEngine.SystemLanguage.Unknown: return Language.Unspecified;
-                    case UnityEngine.SystemLanguage.Vietnamese: return Language.Vietnamese;
-                    default: return Language.Unspecified;
+                    default: return Language.English;
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/ILocalizationManager.cs b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/ILocalizationManager.cs
index 232dc56..31a4b64 100644
--- a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/ILocalizationManager.cs
+++ b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/ILocalizationManager.cs
@@ -7,12 +7,6 @@ namespace AlicizaX.Localization.Runtime
     /// </summary>
     public interface ILocalizationManager : IModule
     {
-        /// <summary>
-        /// 获取或设置本地化语言。
-        /// </summary>
-        Language Language { get; set; }
-
-
         /// <summary>
         /// 根据字典主键获取字典内容字符串。
         /// </summary>
@@ -421,4 +415,4 @@ namespace AlicizaX.Localization.Runtime
         /// <returns>字典值。</returns>
         string GetRawString(string key);
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/LocalizationManager.cs b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/LocalizationManager.cs
index a689f04..c7d13d5 100644
--- a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/LocalizationManager.cs
+++ b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/Localization/LocalizationManager.cs
@@ -16,35 +16,6 @@ namespace AlicizaX.Localization.Runtime
     [UnityEngine.Scripting.Preserve]
     public sealed partial class LocalizationManager : ILocalizationManager
     {
-        private Language _language;
-
-        /// <summary>
-        /// 初始化本地化管理器的新实例。
-        /// </summary>
-        public LocalizationManager()
-        {
-            _language = Language.Unspecified;
-        }
-
-
-        /// <summary>
-        /// 获取或设置本地化语言。
-        /// </summary>
-        public Language Language
-        {
-            get { return _language; }
-            set
-            {
-                if (value == Language.Unspecified)
-                {
-                    throw new GameFrameworkException("Language is invalid.");
-                }
-
-                _language = value;
-            }
-        }
-
-
         /// <summary>
         /// 根据字典主键获取字典内容字符串。
         /// </summary>
@@ -724,13 +695,11 @@ namespace AlicizaX.Localization.Runtime
 
         public string GetRawString(string key)
         {
-            
             return key;
         }
 
         void IModule.Dispose()
         {
-            
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LocalizationComponent.cs b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LocalizationComponent.cs
index 63a038c..63df04c 100644
--- a/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LocalizationComponent.cs
+++ b/Client/Packages/com.alicizax.unity.localization/Runtime/Localization/LocalizationComponent.cs
@@ -18,8 +18,7 @@ namespace AlicizaX.Localization.Runtime
         private EventComponent m_EventComponent = null;
         private SettingComponent m_SettingComponent = null;
 
-        [SerializeField] private Language m_EditorLanguage = Language.Unspecified;
-
+        private Language _language;
 
         /// <summary>
         /// 获取或设置本地化语言。
@@ -28,23 +27,27 @@ namespace AlicizaX.Localization.Runtime
         {
             get
             {
-                if (m_LocalizationManager.Language == Language.Unspecified)
+                if (_language == Language.Unspecified)
                 {
                     var value = m_SettingComponent.GetString(nameof(LocalizationComponent) + "." + nameof(Language));
                     if (value.IsNotNullOrWhiteSpace() && Enum.TryParse(value, true, out Language result))
                     {
-                        m_LocalizationManager.Language = result;
+                        _language = result;
+                    }
+                    else
+                    {
+                        _language = LanguageHelper.SystemLanguage;
                     }
                 }
 
-                return m_LocalizationManager.Language;
+                return _language;
             }
             private set
             {
-                if (m_LocalizationManager.Language != value)
+                if (_language != value)
                 {
-                    var oldLanguage = m_LocalizationManager.Language;
-                    m_LocalizationManager.Language = value;
+                    var oldLanguage = _language;
+                    _language = value;
                     m_SettingComponent.SetString(nameof(LocalizationComponent) + "." + nameof(Language), value.ToString());
                     m_SettingComponent.Save();
                     var localizationLanguageChangeEventArgs = LocalizationLanguageChangeEventArgs.Create(oldLanguage, value);
@@ -53,6 +56,7 @@ namespace AlicizaX.Localization.Runtime
             }
         }
 
+        public static string PrefsKey = Application.dataPath.GetHashCode() + "Language";
 
         protected override void Awake()
         {
@@ -63,19 +67,11 @@ namespace AlicizaX.Localization.Runtime
             if (m_LocalizationManager == null)
             {
                 Log.Fatal("Localization manager is invalid.");
-                return;
             }
         }
 
         private void Start()
         {
-            BaseComponent baseComponent = GameEntry.GetComponent<BaseComponent>();
-            if (baseComponent == null)
-            {
-                Log.Fatal("Base component is invalid.");
-                return;
-            }
-
             m_EventComponent = GameEntry.GetComponent<EventComponent>();
             if (m_EventComponent == null)
             {
@@ -93,18 +89,11 @@ namespace AlicizaX.Localization.Runtime
 
 
 #if UNITY_EDITOR
-            Language = m_EditorLanguage != Language.Unspecified ? m_EditorLanguage : LanguageHelper.SystemLanguage;
-#else
-            if (m_LocalizationManager.Language == Language.Unspecified)
-            {
-                Language = LanguageHelper.SystemLanguage;
-            }
+            int defaultLanguage = (int)Language;
+            Language = (Language)UnityEditor.EditorPrefs.GetInt(PrefsKey, defaultLanguage);
 #endif
         }
 
-        public void SwitchLanguage(Language language)
-        {
-        }
 
         /// <summary>
         /// 根据字典主键获取字典内容字符串。
@@ -580,4 +569,4 @@ namespace AlicizaX.Localization.Runtime
             return m_LocalizationManager.GetRawString(key);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Packages/com.alicizax.unity.procedure/README.md b/Client/Packages/com.alicizax.unity.procedure/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.procedure/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.procedure/README.md.meta b/Client/Packages/com.alicizax.unity.procedure/README.md.meta
deleted file mode 100644
index 94c2686..0000000
--- a/Client/Packages/com.alicizax.unity.procedure/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 312d735f7a239494eb8734a7e812b984
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources.meta b/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources.meta
deleted file mode 100644
index 0529e94..0000000
--- a/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 24bb4079d36a454da7f222095c53810d
-timeCreated: 1737360870
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources/ProcedureComponentConfig.asset b/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources/ProcedureComponentConfig.asset
deleted file mode 100644
index 1e4ab98..0000000
--- a/Client/Packages/com.alicizax.unity.procedure/Runtime/Resources/ProcedureComponentConfig.asset
+++ /dev/null
@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e62a407f8fa74e0caf95ac6d00c8c7aa, type: 3}
-  m_Name: ProcedureComponentConfig
-  m_EditorClassIdentifier: 
-  AvailableProcedureTypeNames: []
-  EntranceProcedureTypeName: 
diff --git a/Client/Packages/com.alicizax.unity.resource/Editor/AlicizaX.Resource.Editor.asmdef b/Client/Packages/com.alicizax.unity.resource/Editor/AlicizaX.Resource.Editor.asmdef
index ce2cbdd..23a1c6e 100644
--- a/Client/Packages/com.alicizax.unity.resource/Editor/AlicizaX.Resource.Editor.asmdef
+++ b/Client/Packages/com.alicizax.unity.resource/Editor/AlicizaX.Resource.Editor.asmdef
@@ -5,7 +5,8 @@
         "GUID:acfef7cabed3b0a42b25edb1cd4fa259",
         "GUID:75b6f2078d190f14dbda4a5b747d709c",
         "GUID:be2f20a77f3232f44b9711ef43234aac",
-        "GUID:4d1926c9df5b052469a1c63448b7609a"
+        "GUID:4d1926c9df5b052469a1c63448b7609a",
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Client/Packages/com.alicizax.unity.resource/Editor/Inspector/ResourceComponentInspector.cs b/Client/Packages/com.alicizax.unity.resource/Editor/Inspector/ResourceComponentInspector.cs
index 6038838..666f7fe 100644
--- a/Client/Packages/com.alicizax.unity.resource/Editor/Inspector/ResourceComponentInspector.cs
+++ b/Client/Packages/com.alicizax.unity.resource/Editor/Inspector/ResourceComponentInspector.cs
@@ -4,6 +4,7 @@ using AlicizaX.Editor;
 using AlicizaX.Resource.Runtime;
 using UnityEditor;
 using UnityEngine;
+using YooAsset;
 using YooAsset.Editor;
 
 namespace AlicizaX.Resource.Editor
@@ -21,10 +22,15 @@ namespace AlicizaX.Resource.Editor
         private SerializedProperty m_AssetCapacity;
         private SerializedProperty m_AssetExpireTime;
         private SerializedProperty m_AssetPriority;
+        private SerializedProperty m_DecryptionServices;
+
 
         private int m_PackageNameIndex = 0;
         private string[] m_PackageNames;
 
+        private List<string> m_DecryptionServicesTypeName = new();
+        private int m_DecryptionSelectIndex;
+
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
@@ -82,6 +88,13 @@ namespace AlicizaX.Resource.Editor
                 {
                     m_AssetPriority.intValue = assetPriority;
                 }
+
+                m_DecryptionSelectIndex = EditorGUILayout.Popup("解密服务", m_DecryptionSelectIndex, m_DecryptionServicesTypeName.ToArray());
+                string selectService = m_DecryptionServicesTypeName[m_DecryptionSelectIndex];
+                if (selectService != NoneOptionName && m_DecryptionServices.stringValue != selectService)
+                {
+                    m_DecryptionServices.stringValue = selectService;
+                }
             }
 
             if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
@@ -106,6 +119,7 @@ namespace AlicizaX.Resource.Editor
         protected override void RefreshTypeNames()
         {
             RefreshComponentTypeNames(typeof(IResourceManager));
+            RefreshDecryptionServices();
         }
 
         protected override void Enable()
@@ -118,6 +132,7 @@ namespace AlicizaX.Resource.Editor
             m_AssetCapacity = serializedObject.FindProperty("m_AssetCapacity");
             m_AssetExpireTime = serializedObject.FindProperty("m_AssetExpireTime");
             m_AssetPriority = serializedObject.FindProperty("m_AssetPriority");
+            m_DecryptionServices = serializedObject.FindProperty("m_DecryptionServices");
         }
 
         /// <summary>
@@ -134,5 +149,21 @@ namespace AlicizaX.Resource.Editor
 
             return result;
         }
+
+        private void RefreshDecryptionServices()
+        {
+            m_DecryptionServicesTypeName = new List<string>
+            {
+                NoneOptionName
+            };
+
+            m_DecryptionServicesTypeName.AddRange(AlicizaX.Runtime.Utility.Assembly.GetRuntimeTypeNames(typeof(IDecryptionServices)));
+
+            m_DecryptionSelectIndex = m_DecryptionServicesTypeName.IndexOf(m_DecryptionServices.stringValue);
+            if (m_DecryptionSelectIndex < 0)
+            {
+                m_DecryptionSelectIndex = 0;
+            }
+        }
     }
 }
diff --git a/Client/Packages/com.alicizax.unity.resource/README.md b/Client/Packages/com.alicizax.unity.resource/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.resource/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.resource/README.md.meta b/Client/Packages/com.alicizax.unity.resource/README.md.meta
deleted file mode 100644
index f29ef06..0000000
--- a/Client/Packages/com.alicizax.unity.resource/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f298f9feb2fdc6240a7f6ef533e0dbf6
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/AlicizaX.Resource.Runtime.asmdef b/Client/Packages/com.alicizax.unity.resource/Runtime/AlicizaX.Resource.Runtime.asmdef
index a89150e..93a339f 100644
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/AlicizaX.Resource.Runtime.asmdef
+++ b/Client/Packages/com.alicizax.unity.resource/Runtime/AlicizaX.Resource.Runtime.asmdef
@@ -4,8 +4,8 @@
     "references": [
         "GUID:75b6f2078d190f14dbda4a5b747d709c",
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
-        "GUID:8480a2920e549a94b8e2b42231467576",
-        "GUID:4041d17782e62754ba8777fe2dfb6b27"
+        "GUID:4041d17782e62754ba8777fe2dfb6b27",
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/BuildinFileManifest.cs b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/BuildinFileManifest.cs
deleted file mode 100644
index bb30e62..0000000
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/BuildinFileManifest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace AlicizaX.Resource.Runtime
-{
-    /// <summary>
-    /// 内置资源清单
-    /// </summary>
-    public class BuildinFileManifest : ScriptableObject
-    {
-        [Serializable]
-        public class Element
-        {
-            public string PackageName;
-            public string FileName;
-            public string FileCRC32;
-        }
-
-        public List<Element> BuildinFiles = new List<Element>();
-    }
-}
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/BuildinFileManifest.cs.meta b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/BuildinFileManifest.cs.meta
deleted file mode 100644
index be9b7c0..0000000
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/BuildinFileManifest.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8468930c21a0a1d4ab8a26ab17aa88dd
-timeCreated: 1706862932
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/IResourceManager.cs b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/IResourceManager.cs
index 3ef2494..af59905 100644
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/IResourceManager.cs
+++ b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/IResourceManager.cs
@@ -32,7 +32,7 @@ namespace AlicizaX.Resource.Runtime
         /// 初始化操作。
         /// </summary>
         /// <param name="packageName">资源包名称。</param>
-        UniTask<bool> InitPackageAsync(string packageName, string hostServerURL, string fallbackHostServerURL, bool isDefaultPackage = true);
+        UniTask<bool> InitPackageAsync(string packageName, string hostServerURL, string fallbackHostServerURL,string decryptionServicesName, bool isDefaultPackage = true);
 
         /// <summary>
         /// 默认资源包名称。
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceComponent.cs b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceComponent.cs
index 1f6fc09..fcaf6d9 100644
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceComponent.cs
+++ b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceComponent.cs
@@ -31,6 +31,8 @@ namespace AlicizaX.Resource.Runtime
 
         [SerializeField] private int m_AssetPriority = 0;
 
+        [SerializeField] private string m_DecryptionServices;
+
         /// <summary>
         /// 资源的运行模式
         /// </summary>
@@ -66,7 +68,7 @@ namespace AlicizaX.Resource.Runtime
             m_ResourceManager = SysModuleCenter.GetModule<IResourceManager>();
         }
 
-        private static string PrefsKey => Application.dataPath.GetHashCode() + "GamePlayMode";
+        public static string PrefsKey = Application.dataPath.GetHashCode() + "GamePlayMode";
 
         protected void Start()
         {
@@ -105,7 +107,7 @@ namespace AlicizaX.Resource.Runtime
                 packageName = m_defaultPackageName;
             }
 
-            return await m_ResourceManager.InitPackageAsync(packageName, host, fallbackHostServer, isDefaultPackage);
+            return await m_ResourceManager.InitPackageAsync(packageName, host, fallbackHostServer, m_DecryptionServices, isDefaultPackage);
         }
 
         #region 版本更新
@@ -164,12 +166,12 @@ namespace AlicizaX.Resource.Runtime
         /// 清理包裹未使用的缓存文件。
         /// </summary>
         /// <param name="customPackageName">指定资源包的名称。不传使用默认资源包</param>
-        public ClearUnusedBundleFilesOperation ClearUnusedCacheFilesAsync(string customPackageName = "")
+        public ClearCacheFilesOperation ClearUnusedCacheFilesAsync(EFileClearMode clearMode, string customPackageName = "")
         {
             var package = string.IsNullOrEmpty(customPackageName)
                 ? YooAssets.GetPackage(m_defaultPackageName)
                 : YooAssets.GetPackage(customPackageName);
-            return package.ClearUnusedBundleFilesAsync();
+            return package.ClearCacheFilesAsync(clearMode);
         }
 
         #endregion
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Initialization.cs b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Initialization.cs
index 55aef78..a5bda88 100644
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Initialization.cs
+++ b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Initialization.cs
@@ -1,4 +1,6 @@
-using YooAsset;
+using System;
+using UnityEngine;
+using YooAsset;
 
 namespace AlicizaX.Resource.Runtime
 {
@@ -8,8 +10,9 @@ namespace AlicizaX.Resource.Runtime
         /// 根据运行模式创建初始化操作数据
         /// </summary>
         /// <returns></returns>
-        private InitializationOperation CreateInitializationOperationHandler(ResourcePackage resourcePackage, string hostServerURL, string fallbackHostServerURL)
+        private InitializationOperation CreateInitializationOperationHandler(ResourcePackage resourcePackage, string hostServerURL, string fallbackHostServerURL, string decryptionServicesName)
         {
+            IDecryptionServices decryptionServices = CreateDecryptionServices(decryptionServicesName);
             switch (PlayMode)
             {
                 case EPlayMode.EditorSimulateMode:
@@ -20,12 +23,12 @@ namespace AlicizaX.Resource.Runtime
                 case EPlayMode.OfflinePlayMode:
                 {
                     // 单机运行模式
-                    return InitializeYooAssetOfflinePlayMode(resourcePackage);
+                    return InitializeYooAssetOfflinePlayMode(resourcePackage, decryptionServices);
                 }
                 case EPlayMode.HostPlayMode:
                 {
                     // 联机运行模式
-                    return InitializeYooAssetHostPlayMode(resourcePackage, hostServerURL, fallbackHostServerURL);
+                    return InitializeYooAssetHostPlayMode(resourcePackage, hostServerURL, fallbackHostServerURL, decryptionServices);
                 }
                 case EPlayMode.WebPlayMode:
                 {
@@ -39,20 +42,31 @@ namespace AlicizaX.Resource.Runtime
             }
         }
 
-        private InitializationOperation InitializeYooAssetEditorSimulateMode(ResourcePackage resourcePackage, string packageName)
+        private IDecryptionServices CreateDecryptionServices(string decryptionServicesName)
         {
-            var initParameters = new EditorSimulateModeParameters();
-            //注意：如果是原生文件系统选择EDefaultBuildPipeline.RawFileBuildPipeline
-            var buildPipeline = EDefaultBuildPipeline.BuiltinBuildPipeline;
-            var simulateBuildResult = EditorSimulateModeHelper.SimulateBuild(buildPipeline, DefaultPackageName);
-            var editorFileSystem = FileSystemParameters.CreateDefaultEditorFileSystemParameters(simulateBuildResult);
-            initParameters.EditorFileSystemParameters = editorFileSystem;
-            return resourcePackage.InitializeAsync(initParameters);
+            IDecryptionServices decryptionServices = null;
+            if (string.IsNullOrEmpty(decryptionServicesName))
+            {
+                var decryptionServicesType = AlicizaX.Runtime.Utility.Assembly.GetType(decryptionServicesName);
+                decryptionServices = (IDecryptionServices)Activator.CreateInstance(decryptionServicesType);
+            }
+
+            return decryptionServices;
         }
 
-        private InitializationOperation InitializeYooAssetOfflinePlayMode(ResourcePackage resourcePackage)
+        private InitializationOperation InitializeYooAssetEditorSimulateMode(ResourcePackage resourcePackage, string packageName)
         {
-            var buildinFileSystem = FileSystemParameters.CreateDefaultBuildinFileSystemParameters();
+            var buildResult = EditorSimulateModeHelper.SimulateBuild(packageName);
+            var packageRoot = buildResult.PackageRootDirectory;
+            var createParameters = new EditorSimulateModeParameters();
+            createParameters.EditorFileSystemParameters = FileSystemParameters.CreateDefaultEditorFileSystemParameters(packageRoot);
+            // createParameters.EditorFileSystemParameters.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES,new FileOffsetEncryption());
+            return resourcePackage.InitializeAsync(createParameters);
+        }
+
+        private InitializationOperation InitializeYooAssetOfflinePlayMode(ResourcePackage resourcePackage, IDecryptionServices decryptionServices = null)
+        {
+            var buildinFileSystem = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(decryptionServices);
             var initParameters = new OfflinePlayModeParameters();
             initParameters.BuildinFileSystemParameters = buildinFileSystem;
             return resourcePackage.InitializeAsync(initParameters);
@@ -89,17 +103,17 @@ namespace AlicizaX.Resource.Runtime
             webFileSystem = FileSystemParameters.CreateDefaultWebFileSystemParameters();
 #endif
 #else
-            webFileSystem = FileSystemParameters.CreateDefaultWebFileSystemParameters();
+            webFileSystem = FileSystemParameters.CreateDefaultWebServerFileSystemParameters();
 #endif
-            initParameters.WebFileSystemParameters = webFileSystem;
+            initParameters.WebServerFileSystemParameters = webFileSystem;
             return resourcePackage.InitializeAsync(initParameters);
         }
 
-        private InitializationOperation InitializeYooAssetHostPlayMode(ResourcePackage resourcePackage, string hostServerURL, string fallbackHostServerURL)
+        private InitializationOperation InitializeYooAssetHostPlayMode(ResourcePackage resourcePackage, string hostServerURL, string fallbackHostServerURL, IDecryptionServices decryptionServices = null)
         {
             IRemoteServices remoteServices = new RemoteServices(hostServerURL, fallbackHostServerURL);
             var cacheFileSystem = FileSystemParameters.CreateDefaultCacheFileSystemParameters(remoteServices);
-            var buildinFileSystem = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(new FileOffsetDecryption());
+            var buildinFileSystem = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(decryptionServices);
             var initParameters = new HostPlayModeParameters();
             initParameters.BuildinFileSystemParameters = buildinFileSystem;
             initParameters.CacheFileSystemParameters = cacheFileSystem;
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Services.cs b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Services.cs
index f9a2b59..e375db2 100644
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Services.cs
+++ b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.Services.cs
@@ -4,143 +4,134 @@ using YooAsset;
 
 namespace AlicizaX.Resource.Runtime
 {
-    internal partial class ResourceManager
+    /// <summary>
+    /// 远端资源地址查询服务类
+    /// </summary>
+    class RemoteServices : IRemoteServices
     {
-        /// <summary>
-        /// 远端资源地址查询服务类
-        /// </summary>
-        private class RemoteServices : IRemoteServices
+        private readonly string _defaultHostServer;
+        private readonly string _fallbackHostServer;
+
+        public RemoteServices(string defaultHostServer, string fallbackHostServer)
         {
-            private readonly string _defaultHostServer;
-            private readonly string _fallbackHostServer;
-
-            public RemoteServices(string defaultHostServer, string fallbackHostServer)
-            {
-                _defaultHostServer = defaultHostServer;
-                _fallbackHostServer = fallbackHostServer;
-            }
-
-            string IRemoteServices.GetRemoteMainURL(string fileName)
-            {
-                return $"{_defaultHostServer}/{fileName}";
-            }
-
-            string IRemoteServices.GetRemoteFallbackURL(string fileName)
-            {
-                return $"{_fallbackHostServer}/{fileName}";
-            }
+            _defaultHostServer = defaultHostServer;
+            _fallbackHostServer = fallbackHostServer;
         }
 
-        /// <summary>
-        /// 资源文件流加载解密类
-        /// </summary>
-        private class FileStreamDecryption : IDecryptionServices
+        string IRemoteServices.GetRemoteMainURL(string fileName)
         {
-            /// <summary>
-            /// 同步方式获取解密的资源包对象
-            /// 注意：加载流对象在资源包对象释放的时候会自动释放
-            /// </summary>
-            AssetBundle IDecryptionServices.LoadAssetBundle(DecryptFileInfo fileInfo, out Stream managedStream)
-            {
-                BundleStream bundleStream = new BundleStream(fileInfo.FileLoadPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-                managedStream = bundleStream;
-                return AssetBundle.LoadFromStream(bundleStream, fileInfo.FileLoadCRC, GetManagedReadBufferSize());
-            }
-
-            /// <summary>
-            /// 异步方式获取解密的资源包对象
-            /// 注意：加载流对象在资源包对象释放的时候会自动释放
-            /// </summary>
-            AssetBundleCreateRequest IDecryptionServices.LoadAssetBundleAsync(DecryptFileInfo fileInfo, out Stream managedStream)
-            {
-                BundleStream bundleStream = new BundleStream(fileInfo.FileLoadPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-                managedStream = bundleStream;
-                return AssetBundle.LoadFromStreamAsync(bundleStream, fileInfo.FileLoadCRC, GetManagedReadBufferSize());
-            }
-
-            public byte[] ReadFileData(DecryptFileInfo fileInfo)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            public string ReadFileText(DecryptFileInfo fileInfo)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            private static uint GetManagedReadBufferSize()
-            {
-                return 1024;
-            }
+            return $"{_defaultHostServer}/{fileName}";
         }
 
-        /// <summary>
-        /// 资源文件偏移加载解密类
-        /// </summary>
-        private class FileOffsetDecryption : IDecryptionServices
+        string IRemoteServices.GetRemoteFallbackURL(string fileName)
         {
-            /// <summary>
-            /// 同步方式获取解密的资源包对象
-            /// 注意：加载流对象在资源包对象释放的时候会自动释放
-            /// </summary>
-            AssetBundle IDecryptionServices.LoadAssetBundle(DecryptFileInfo fileInfo, out Stream managedStream)
-            {
-                managedStream = null;
-                return AssetBundle.LoadFromFile(fileInfo.FileLoadPath, fileInfo.FileLoadCRC, GetFileOffset());
-            }
+            return $"{_fallbackHostServer}/{fileName}";
+        }
+    }
 
-            /// <summary>
-            /// 异步方式获取解密的资源包对象
-            /// 注意：加载流对象在资源包对象释放的时候会自动释放
-            /// </summary>
-            AssetBundleCreateRequest IDecryptionServices.LoadAssetBundleAsync(DecryptFileInfo fileInfo, out Stream managedStream)
-            {
-                managedStream = null;
-                return AssetBundle.LoadFromFileAsync(fileInfo.FileLoadPath, fileInfo.FileLoadCRC, GetFileOffset());
-            }
-
-            public byte[] ReadFileData(DecryptFileInfo fileInfo)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            public string ReadFileText(DecryptFileInfo fileInfo)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            private static ulong GetFileOffset()
-            {
-                return 32;
-            }
+    /// <summary>
+    /// 资源文件流加载解密类
+    /// </summary>
+    class FileStreamDecryption : IDecryptionServices
+    {
+        DecryptResult IDecryptionServices.LoadAssetBundle(DecryptFileInfo fileInfo)
+        {
+            BundleStream bundleStream = new BundleStream(fileInfo.FileLoadPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+            DecryptResult decryptResult = new DecryptResult();
+            decryptResult.ManagedStream = bundleStream;
+            decryptResult.Result = AssetBundle.LoadFromStream(bundleStream, fileInfo.FileLoadCRC, GetManagedReadBufferSize());
+            return decryptResult;
         }
 
-
-        /// <summary>
-        /// 资源文件解密流
-        /// </summary>
-        public class BundleStream : FileStream
+        // AssetBundle解密方法
+        DecryptResult IDecryptionServices.LoadAssetBundleAsync(DecryptFileInfo fileInfo)
         {
-            public const byte KEY = 64;
+            BundleStream bundleStream = new BundleStream(fileInfo.FileLoadPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+            DecryptResult decryptResult = new DecryptResult();
+            decryptResult.ManagedStream = bundleStream;
+            decryptResult.CreateRequest = AssetBundle.LoadFromStreamAsync(bundleStream, fileInfo.FileLoadCRC, GetManagedReadBufferSize());
+            return decryptResult;
+        }
 
-            public BundleStream(string path, FileMode mode, FileAccess access, FileShare share) : base(path, mode, access, share)
+        public byte[] ReadFileData(DecryptFileInfo fileInfo)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public string ReadFileText(DecryptFileInfo fileInfo)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        private static uint GetManagedReadBufferSize()
+        {
+            return 1024;
+        }
+    }
+
+    /// <summary>
+    /// 资源文件偏移加载解密类
+    /// </summary>
+    class FileOffsetDecryption : IDecryptionServices
+    {
+        DecryptResult IDecryptionServices.LoadAssetBundle(DecryptFileInfo fileInfo)
+        {
+            DecryptResult decryptResult = new DecryptResult();
+            decryptResult.ManagedStream = null;
+            decryptResult.Result = AssetBundle.LoadFromFile(fileInfo.FileLoadPath, fileInfo.FileLoadCRC, GetFileOffset());
+            return decryptResult;
+        }
+
+        // AssetBundle解密方法
+        DecryptResult IDecryptionServices.LoadAssetBundleAsync(DecryptFileInfo fileInfo)
+        {
+            DecryptResult decryptResult = new DecryptResult();
+            decryptResult.ManagedStream = null;
+            decryptResult.CreateRequest = AssetBundle.LoadFromFileAsync(fileInfo.FileLoadPath, fileInfo.FileLoadCRC, GetFileOffset());
+            return decryptResult;
+        }
+
+        public byte[] ReadFileData(DecryptFileInfo fileInfo)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public string ReadFileText(DecryptFileInfo fileInfo)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        private static ulong GetFileOffset()
+        {
+            return 32;
+        }
+    }
+
+
+    /// <summary>
+    /// 资源文件解密流
+    /// </summary>
+    public class BundleStream : FileStream
+    {
+        public const byte KEY = 64;
+
+        public BundleStream(string path, FileMode mode, FileAccess access, FileShare share) : base(path, mode, access, share)
+        {
+        }
+
+        public BundleStream(string path, FileMode mode) : base(path, mode)
+        {
+        }
+
+        public override int Read(byte[] array, int offset, int count)
+        {
+            var index = base.Read(array, offset, count);
+            for (int i = 0; i < array.Length; i++)
             {
+                array[i] ^= KEY;
             }
 
-            public BundleStream(string path, FileMode mode) : base(path, mode)
-            {
-            }
-
-            public override int Read(byte[] array, int offset, int count)
-            {
-                var index = base.Read(array, offset, count);
-                for (int i = 0; i < array.Length; i++)
-                {
-                    array[i] ^= KEY;
-                }
-
-                return index;
-            }
+            return index;
         }
     }
 }
diff --git a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.cs b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.cs
index f2a7c4c..3c93239 100644
--- a/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.cs
+++ b/Client/Packages/com.alicizax.unity.resource/Runtime/Resource/ResourceManager.cs
@@ -170,7 +170,7 @@ namespace AlicizaX.Resource.Runtime
             }
         }
 
-        public UniTask<bool> InitPackageAsync(string packageName, string hostServerURL, string fallbackHostServerURL, bool isDefaultPackage = true)
+        public UniTask<bool> InitPackageAsync(string packageName, string hostServerURL, string fallbackHostServerURL,string decryptionServicesName, bool isDefaultPackage = true)
         {
             if (PackageMap.ContainsKey(packageName))
             {
@@ -197,7 +197,7 @@ namespace AlicizaX.Resource.Runtime
 
             PackageMap[packageName] = resourcePackage;
 
-            var initializationOperationHandler = CreateInitializationOperationHandler(resourcePackage, hostServerURL, fallbackHostServerURL);
+            var initializationOperationHandler = CreateInitializationOperationHandler(resourcePackage, hostServerURL, fallbackHostServerURL,decryptionServicesName);
             initializationOperationHandler.Completed += asyncOperationBase =>
             {
                 if (asyncOperationBase.Error == null && asyncOperationBase.Status == EOperationStatus.Succeed && asyncOperationBase.IsDone)
diff --git a/Client/Packages/com.alicizax.unity.scene/Editor/Inspector/SceneComponentInspector.cs b/Client/Packages/com.alicizax.unity.scene/Editor/Inspector/SceneComponentInspector.cs
index 095835d..e7d2d88 100644
--- a/Client/Packages/com.alicizax.unity.scene/Editor/Inspector/SceneComponentInspector.cs
+++ b/Client/Packages/com.alicizax.unity.scene/Editor/Inspector/SceneComponentInspector.cs
@@ -19,24 +19,22 @@ namespace AlicizaX.Scene.Editor
 
             SceneComponent t = (SceneComponent)target;
 
-            EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
-            {
-                EditorGUILayout.PropertyField(m_EnableLoadSceneUpdateEvent);
-                EditorGUILayout.PropertyField(m_EnableLoadSceneDependencyAssetEvent);
-            }
-            EditorGUI.EndDisabledGroup();
-
-            serializedObject.ApplyModifiedProperties();
-
-            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
-            {
-                EditorGUILayout.LabelField("Loaded Scene Asset Names", GetSceneNameString(t.GetLoadedSceneAssetNames()));
-                EditorGUILayout.LabelField("Loading Scene Asset Names", GetSceneNameString(t.GetLoadingSceneAssetNames()));
-                EditorGUILayout.LabelField("Unloading Scene Asset Names", GetSceneNameString(t.GetUnloadingSceneAssetNames()));
-                EditorGUILayout.ObjectField("Main Camera", t.MainCamera, typeof(Camera), true);
-
-                Repaint();
-            }
+            // EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
+            // {
+            //     EditorGUILayout.PropertyField(m_EnableLoadSceneUpdateEvent);
+            //     EditorGUILayout.PropertyField(m_EnableLoadSceneDependencyAssetEvent);
+            // }
+            // EditorGUI.EndDisabledGroup();
+            //
+            // serializedObject.ApplyModifiedProperties();
+            //
+            // if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
+            // {
+            //     EditorGUILayout.LabelField("Loaded Scene Asset Names", GetSceneNameString(t.GetLoadedSceneAssetNames()));
+            //     EditorGUILayout.LabelField("Loading Scene Asset Names", GetSceneNameString(t.GetLoadingSceneAssetNames()));
+            //     EditorGUILayout.LabelField("Unloading Scene Asset Names", GetSceneNameString(t.GetUnloadingSceneAssetNames()));
+            //     Repaint();
+            // }
         }
 
         protected override void Enable()
@@ -47,28 +45,28 @@ namespace AlicizaX.Scene.Editor
 
         protected override void RefreshTypeNames()
         {
-            RefreshComponentTypeNames(typeof(IGameSceneManager));
+            RefreshComponentTypeNames(typeof(ISceneManager));
         }
 
-        private string GetSceneNameString(string[] sceneAssetNames)
-        {
-            if (sceneAssetNames == null || sceneAssetNames.Length <= 0)
-            {
-                return "<Empty>";
-            }
-
-            string sceneNameString = string.Empty;
-            foreach (string sceneAssetName in sceneAssetNames)
-            {
-                if (!string.IsNullOrEmpty(sceneNameString))
-                {
-                    sceneNameString += ", ";
-                }
-
-                sceneNameString += SceneComponent.GetSceneName(sceneAssetName);
-            }
-
-            return sceneNameString;
-        }
+        // private string GetSceneNameString(string[] sceneAssetNames)
+        // {
+        //     if (sceneAssetNames == null || sceneAssetNames.Length <= 0)
+        //     {
+        //         return "<Empty>";
+        //     }
+        //
+        //     string sceneNameString = string.Empty;
+        //     foreach (string sceneAssetName in sceneAssetNames)
+        //     {
+        //         if (!string.IsNullOrEmpty(sceneNameString))
+        //         {
+        //             sceneNameString += ", ";
+        //         }
+        //
+        //         sceneNameString += SceneComponent.GetSceneName(sceneAssetName);
+        //     }
+        //
+        //     return sceneNameString;
+        // }
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Packages/com.alicizax.unity.scene/README.md b/Client/Packages/com.alicizax.unity.scene/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.scene/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.scene/README.md.meta b/Client/Packages/com.alicizax.unity.scene/README.md.meta
deleted file mode 100644
index 0c2cad0..0000000
--- a/Client/Packages/com.alicizax.unity.scene/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: dc82c45ef553ca944870b867f65f760e
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/AlicizaX.Scene.Runtime.asmdef b/Client/Packages/com.alicizax.unity.scene/Runtime/AlicizaX.Scene.Runtime.asmdef
index 642348a..6231a1a 100644
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/AlicizaX.Scene.Runtime.asmdef
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/AlicizaX.Scene.Runtime.asmdef
@@ -6,7 +6,7 @@
         "GUID:4041d17782e62754ba8777fe2dfb6b27",
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
         "GUID:be2f20a77f3232f44b9711ef43234aac",
-        "GUID:8480a2920e549a94b8e2b42231467576"
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/GameSceneManager.cs b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/GameSceneManager.cs
new file mode 100644
index 0000000..6dfaf00
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/GameSceneManager.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using AlicizaX.Resource.Runtime;
+using AlicizaX.Runtime;
+using AlicizaX.Scene.Runtime;
+using Cysharp.Threading.Tasks;
+using UnityEngine.SceneManagement;
+using YooAsset;
+
+namespace AlicizaX.Scene.Runtime
+{
+    /// <summary>
+    /// 场景管理器。
+    /// </summary>
+    internal class GameSceneManager : ISceneManager
+    {
+        private IResourceManager _resourceManager;
+        private string _currentMainSceneName = string.Empty;
+
+        private SceneHandle _currentMainScene;
+
+        private readonly Dictionary<string, SceneHandle> _subScenes = new Dictionary<string, SceneHandle>();
+
+        /// <summary>
+        /// 当前主场景名称。
+        /// </summary>
+        public string CurrentMainSceneName => _currentMainSceneName;
+
+        void IModule.Dispose()
+        {
+            var iter = _subScenes.Values.GetEnumerator();
+            while (iter.MoveNext())
+            {
+                SceneHandle subScene = iter.Current;
+                if (subScene != null)
+                {
+                    subScene.UnloadAsync();
+                }
+            }
+
+            iter.Dispose();
+            _subScenes.Clear();
+            _currentMainSceneName = string.Empty;
+        }
+
+        public void SetResourceManager(IResourceManager resourceManager)
+        {
+            _resourceManager = resourceManager;
+        }
+
+        /// <summary>
+        /// 加载场景。
+        /// </summary>
+        /// <param name="location">场景的定位地址</param>R
+        /// <param name="sceneMode">场景加载模式</param>
+        /// <param name="suspendLoad">加载完毕时是否主动挂起</param>
+        /// <param name="priority">优先级</param>
+        /// <param name="callBack">加载回调。</param>
+        /// <param name="gcCollect">加载主场景是否回收垃圾。</param>
+        /// <param name="progressCallBack">加载进度回调。</param>
+        public SceneHandle LoadScene(string location,
+            LoadSceneMode sceneMode = LoadSceneMode.Single,
+            bool suspendLoad = false,
+            int priority = 100,
+            Action<SceneHandle> callBack = null,
+            bool gcCollect = true,
+            Action<float> progressCallBack = null)
+        {
+            if (sceneMode == LoadSceneMode.Additive)
+            {
+                if (_subScenes.TryGetValue(location, out SceneHandle subScene))
+                {
+                    Log.Warning($"Could not load subScene while already loaded. Scene: {location}");
+                    return subScene;
+                }
+
+                subScene = YooAssets.LoadSceneAsync(location, sceneMode, LocalPhysicsMode.None, suspendLoad, (uint)priority);
+
+                if (callBack != null)
+                {
+                    subScene.Completed += callBack;
+                }
+
+                if (progressCallBack != null)
+                {
+                    InvokeProgress(subScene, progressCallBack).Forget();
+                }
+
+                _subScenes.Add(location, subScene);
+
+                return subScene;
+            }
+            else
+            {
+                if (_currentMainScene is { IsDone: false })
+                {
+                    Log.Warning($"Could not load MainScene while loading. CurrentMainScene: {_currentMainSceneName}.");
+                    return null;
+                }
+
+                _currentMainSceneName = location;
+
+                _currentMainScene = YooAssets.LoadSceneAsync(location, sceneMode, LocalPhysicsMode.None, suspendLoad, (uint)priority);
+
+                if (callBack != null)
+                {
+                    _currentMainScene.Completed += callBack;
+                }
+
+                if (progressCallBack != null)
+                {
+                    InvokeProgress(_currentMainScene, progressCallBack).Forget();
+                }
+
+                _resourceManager.ForceUnloadUnusedAssets(gcCollect);
+
+                return _currentMainScene;
+            }
+        }
+
+        private async UniTaskVoid InvokeProgress(SceneHandle SceneHandle, Action<float> progress)
+        {
+            if (SceneHandle == null)
+            {
+                return;
+            }
+
+            while (!SceneHandle.IsDone)
+            {
+                await UniTask.Yield();
+
+                progress?.Invoke(SceneHandle.Progress);
+            }
+        }
+
+        /// <summary>
+        /// 激活场景（当同时存在多个场景时用于切换激活场景）。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否操作成功。</returns>
+        public bool ActivateScene(string location)
+        {
+            if (_currentMainSceneName.Equals(location))
+            {
+                if (_currentMainScene != null)
+                {
+                    return _currentMainScene.ActivateScene();
+                }
+
+                return false;
+            }
+
+            _subScenes.TryGetValue(location, out SceneHandle subScene);
+            if (subScene != null)
+            {
+                return subScene.ActivateScene();
+            }
+
+            Log.Warning($"IsMainScene invalid location:{location}");
+            return false;
+        }
+
+        /// <summary>
+        /// 解除场景加载挂起操作。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否操作成功。</returns>
+        public bool UnSuspend(string location)
+        {
+            if (_currentMainSceneName.Equals(location))
+            {
+                if (_currentMainScene != null)
+                {
+                    return _currentMainScene.UnSuspend();
+                }
+
+                return false;
+            }
+
+            _subScenes.TryGetValue(location, out SceneHandle subScene);
+            if (subScene != null)
+            {
+                return subScene.UnSuspend();
+            }
+
+            Log.Warning($"IsMainScene invalid location:{location}");
+            return false;
+        }
+
+        /// <summary>
+        /// 异步卸载子场景。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>场景卸载异步操作类。</returns>
+        public UnloadSceneOperation UnloadAsync(string location)
+        {
+            _subScenes.TryGetValue(location, out SceneHandle subScene);
+            if (subScene != null)
+            {
+                if (subScene.SceneObject == default)
+                {
+                    Log.Error($"Could not unload Scene while not loaded. Scene: {location}");
+                    return null;
+                }
+
+                _subScenes.Remove(location);
+                return subScene.UnloadAsync();
+            }
+
+            Log.Warning($"UnloadAsync invalid location:{location}");
+            return null;
+        }
+
+        /// <summary>
+        /// 是否包含场景。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否包含场景。</returns>
+        public bool IsContainScene(string location)
+        {
+            if (_currentMainSceneName.Equals(location))
+            {
+                return true;
+            }
+
+            return _subScenes.TryGetValue(location, out var _);
+        }
+    }
+}
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/GameSceneManager.cs.meta b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/GameSceneManager.cs.meta
new file mode 100644
index 0000000..62c1fab
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/GameSceneManager.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: df58bc01666e4f05abdd6a6b8fc87e78
+timeCreated: 1738733705
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/ISceneModule.cs b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/ISceneModule.cs
new file mode 100644
index 0000000..9019deb
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/ISceneModule.cs
@@ -0,0 +1,64 @@
+using System;
+using AlicizaX.Resource.Runtime;
+using AlicizaX.Runtime;
+using UnityEngine.SceneManagement;
+using YooAsset;
+
+namespace AlicizaX.Scene.Runtime
+{
+    public interface ISceneManager:IModule
+    {
+
+        public void SetResourceManager(IResourceManager resourceManager);
+        /// <summary>
+        /// 当前主场景名称。
+        /// </summary>
+        public string CurrentMainSceneName { get; }
+
+        /// <summary>
+        /// 加载场景。
+        /// </summary>
+        /// <param name="location">场景的定位地址</param>
+        /// <param name="sceneMode">场景加载模式</param>
+        /// <param name="suspendLoad">加载完毕时是否主动挂起</param>
+        /// <param name="priority">优先级</param>
+        /// <param name="callBack">加载回调。</param>
+        /// <param name="gcCollect">加载主场景是否回收垃圾。</param>
+        /// <param name="progressCallBack">加载进度回调。</param>
+        public SceneHandle LoadScene(string location,
+            LoadSceneMode sceneMode = LoadSceneMode.Single,
+            bool suspendLoad = false,
+            int priority = 100,
+            Action<SceneHandle> callBack = null,
+            bool gcCollect = true,
+            Action<float> progressCallBack = null);
+
+        /// <summary>
+        /// 激活场景（当同时存在多个场景时用于切换激活场景）。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否操作成功。</returns>
+        public bool ActivateScene(string location);
+
+        /// <summary>
+        /// 解除场景加载挂起操作。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否操作成功。</returns>
+        public bool UnSuspend(string location);
+
+        /// <summary>
+        /// 异步卸载子场景。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>场景卸载异步操作类。</returns>
+        public UnloadSceneOperation UnloadAsync(string location);
+
+        /// <summary>
+        /// 是否包含场景。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否包含场景。</returns>
+        public bool IsContainScene(string location);
+    }
+}
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/ISceneModule.cs.meta b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/ISceneModule.cs.meta
new file mode 100644
index 0000000..6fa734c
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/ISceneModule.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 861177fef6ea4c02a3aae34fa55b7ab0
+timeCreated: 1738733678
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/GameSceneManager.cs b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/GameSceneManager.cs
deleted file mode 100644
index 172fdd4..0000000
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/GameSceneManager.cs
+++ /dev/null
@@ -1,489 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Cysharp.Threading.Tasks;
-using AlicizaX.Resource.Runtime;
-using AlicizaX.Runtime;
-using UnityEngine.SceneManagement;
-using YooAsset;
-
-namespace AlicizaX.Scene.Runtime
-{
-    /// <summary>
-    /// 场景管理器。
-    /// </summary>
-    [UnityEngine.Scripting.Preserve]
-    internal sealed class GameSceneManager :  IGameSceneManager
-    {
-        private sealed class SceneHandleData
-        {
-            public readonly SceneHandle SceneHandle;
-            public readonly object UserData;
-
-            public SceneHandleData(SceneHandle sceneHandle, object userData)
-            {
-                SceneHandle = sceneHandle;
-                UserData = userData;
-            }
-        }
-
-        private readonly Dictionary<string, SceneHandle> m_LoadedSceneAssetNames;
-        private readonly Dictionary<string, SceneHandleData> m_LoadingSceneAssetNames;
-        private readonly Dictionary<string, SceneHandle> m_UnloadingSceneAssetNames;
-        private IResourceManager m_resourceManager;
-        private EventHandler<LoadSceneSuccessEventArgs> m_LoadSceneSuccessEventHandler;
-        private EventHandler<LoadSceneFailureEventArgs> m_LoadSceneFailureEventHandler;
-        private EventHandler<LoadSceneUpdateEventArgs> m_LoadSceneUpdateEventHandler;
-        private EventHandler<UnloadSceneSuccessEventArgs> m_UnloadSceneSuccessEventHandler;
-        private EventHandler<UnloadSceneFailureEventArgs> m_UnloadSceneFailureEventHandler;
-
-        /// <summary>
-        /// 初始化场景管理器的新实例。
-        /// </summary>
-        public GameSceneManager()
-        {
-            m_LoadedSceneAssetNames = new Dictionary<string, SceneHandle>();
-            m_LoadingSceneAssetNames = new Dictionary<string, SceneHandleData>();
-            m_UnloadingSceneAssetNames = new Dictionary<string, SceneHandle>();
-            m_resourceManager = null;
-            m_LoadSceneSuccessEventHandler = null;
-            m_LoadSceneFailureEventHandler = null;
-            m_LoadSceneUpdateEventHandler = null;
-            m_UnloadSceneSuccessEventHandler = null;
-            m_UnloadSceneFailureEventHandler = null;
-        }
-        
-
-        /// <summary>
-        /// 加载场景成功事件。
-        /// </summary>
-        public event EventHandler<LoadSceneSuccessEventArgs> LoadSceneSuccess
-        {
-            add { m_LoadSceneSuccessEventHandler += value; }
-            remove { m_LoadSceneSuccessEventHandler -= value; }
-        }
-
-        /// <summary>
-        /// 加载场景失败事件。
-        /// </summary>
-        public event EventHandler<LoadSceneFailureEventArgs> LoadSceneFailure
-        {
-            add { m_LoadSceneFailureEventHandler += value; }
-            remove { m_LoadSceneFailureEventHandler -= value; }
-        }
-
-        /// <summary>
-        /// 加载场景更新事件。
-        /// </summary>
-        public event EventHandler<LoadSceneUpdateEventArgs> LoadSceneUpdate
-        {
-            add { m_LoadSceneUpdateEventHandler += value; }
-            remove { m_LoadSceneUpdateEventHandler -= value; }
-        }
-
-        /// <summary>
-        /// 卸载场景成功事件。
-        /// </summary>
-        public event EventHandler<UnloadSceneSuccessEventArgs> UnloadSceneSuccess
-        {
-            add { m_UnloadSceneSuccessEventHandler += value; }
-            remove { m_UnloadSceneSuccessEventHandler -= value; }
-        }
-
-        /// <summary>
-        /// 卸载场景失败事件。
-        /// </summary>
-        public event EventHandler<UnloadSceneFailureEventArgs> UnloadSceneFailure
-        {
-            add { m_UnloadSceneFailureEventHandler += value; }
-            remove { m_UnloadSceneFailureEventHandler -= value; }
-        }
-
-
-        /// <summary>
-        /// 关闭并清理场景管理器。
-        /// </summary>
-        void IModule.Dispose()
-        {
-            var loadedSceneAssetNames = m_LoadedSceneAssetNames.Keys.ToArray();
-            foreach (var loadedSceneAssetName in loadedSceneAssetNames)
-            {
-                if (SceneIsUnloading(loadedSceneAssetName))
-                {
-                    continue;
-                }
-
-                UnloadScene(loadedSceneAssetName);
-            }
-
-            m_LoadedSceneAssetNames.Clear();
-            m_LoadingSceneAssetNames.Clear();
-            m_UnloadingSceneAssetNames.Clear();
-        }
-
-        /// <summary>
-        /// 设置资源管理器。
-        /// </summary>
-        /// <param name="assetManager"></param>
-        public void SetResourceManager(IResourceManager resourceManager)
-        {
-            if (resourceManager == null)
-            {
-                throw new GameFrameworkException("Resource manager is invalid.");
-            }
-
-            m_resourceManager = resourceManager;
-        }
-
-        /// <summary>
-        /// 获取场景是否已加载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否已加载。</returns>
-        public bool SceneIsLoaded(string sceneAssetName)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                throw new GameFrameworkException("Scene asset name is invalid.");
-            }
-
-            return m_LoadedSceneAssetNames.ContainsKey(sceneAssetName);
-        }
-
-        /// <summary>
-        /// 获取已加载场景的资源名称。
-        /// </summary>
-        /// <returns>已加载场景的资源名称。</returns>
-        public string[] GetLoadedSceneAssetNames()
-        {
-            return m_LoadedSceneAssetNames.Keys.ToArray();
-        }
-
-        /// <summary>
-        /// 获取已加载场景的资源名称。
-        /// </summary>
-        /// <param name="results">已加载场景的资源名称。</param>
-        public void GetLoadedSceneAssetNames(List<string> results)
-        {
-            if (results == null)
-            {
-                throw new GameFrameworkException("Results is invalid.");
-            }
-
-            results.Clear();
-            results.AddRange(m_LoadedSceneAssetNames.Keys);
-        }
-
-        /// <summary>
-        /// 获取场景是否正在加载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否正在加载。</returns>
-        public bool SceneIsLoading(string sceneAssetName)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                throw new GameFrameworkException("Scene asset name is invalid.");
-            }
-
-            return m_LoadingSceneAssetNames.ContainsKey(sceneAssetName);
-        }
-
-        /// <summary>
-        /// 获取正在加载场景的资源名称。
-        /// </summary>
-        /// <returns>正在加载场景的资源名称。</returns>
-        public string[] GetLoadingSceneAssetNames()
-        {
-            return m_LoadingSceneAssetNames.Keys.ToArray();
-        }
-
-        /// <summary>
-        /// 获取正在加载场景的资源名称。
-        /// </summary>
-        /// <param name="results">正在加载场景的资源名称。</param>
-        public void GetLoadingSceneAssetNames(List<string> results)
-        {
-            if (results == null)
-            {
-                throw new GameFrameworkException("Results is invalid.");
-            }
-
-            results.Clear();
-            results.AddRange(m_LoadingSceneAssetNames.Keys);
-        }
-
-        /// <summary>
-        /// 获取场景是否正在卸载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否正在卸载。</returns>
-        public bool SceneIsUnloading(string sceneAssetName)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                throw new GameFrameworkException("Scene asset name is invalid.");
-            }
-
-            return m_UnloadingSceneAssetNames.ContainsKey(sceneAssetName);
-        }
-
-        /// <summary>
-        /// 获取正在卸载场景的资源名称。
-        /// </summary>
-        /// <returns>正在卸载场景的资源名称。</returns>
-        public string[] GetUnloadingSceneAssetNames()
-        {
-            return m_UnloadingSceneAssetNames.Keys.ToArray();
-        }
-
-        /// <summary>
-        /// 获取正在卸载场景的资源名称。
-        /// </summary>
-        /// <param name="results">正在卸载场景的资源名称。</param>
-        public void GetUnloadingSceneAssetNames(List<string> results)
-        {
-            if (results == null)
-            {
-                throw new GameFrameworkException("Results is invalid.");
-            }
-
-            results.Clear();
-            results.AddRange(m_UnloadingSceneAssetNames.Keys);
-        }
-
-        /// <summary>
-        /// 检查场景资源是否存在。
-        /// </summary>
-        /// <param name="sceneAssetName">要检查场景资源的名称。</param>
-        /// <returns>场景资源是否存在。</returns>
-        public bool HasScene(string sceneAssetName)
-        {
-            return m_resourceManager.LoadSceneAsync(sceneAssetName, LoadSceneMode.Single).Status != UniTaskStatus.Faulted;
-        }
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        public UniTask<SceneHandle> LoadScene(string sceneAssetName)
-        {
-            return LoadScene(sceneAssetName, LoadSceneMode.Single);
-        }
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="sceneMode">加载场景的方式。</param>
-        public UniTask<SceneHandle> LoadScene(string sceneAssetName, LoadSceneMode sceneMode)
-        {
-            return LoadScene(sceneAssetName, sceneMode, null);
-        }
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        public UniTask<SceneHandle> LoadScene(string sceneAssetName, object userData)
-        {
-            return LoadScene(sceneAssetName, LoadSceneMode.Single, userData);
-        }
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        /// <param name="sceneMode"></param>
-        public async UniTask<SceneHandle> LoadScene(string sceneAssetName, LoadSceneMode sceneMode, object userData)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                throw new GameFrameworkException("Scene asset name is invalid.");
-            }
-
-            if (m_resourceManager == null)
-            {
-                throw new GameFrameworkException("You must set resource manager first.");
-            }
-
-            if (SceneIsUnloading(sceneAssetName))
-            {
-                throw new GameFrameworkException(Utility.Text.Format("Scene asset '{0}' is being unloaded.", sceneAssetName));
-            }
-
-            if (SceneIsLoading(sceneAssetName))
-            {
-                throw new GameFrameworkException(Utility.Text.Format("Scene asset '{0}' is being loaded.", sceneAssetName));
-            }
-
-            if (SceneIsLoaded(sceneAssetName))
-            {
-                throw new GameFrameworkException(Utility.Text.Format("Scene asset '{0}' is already loaded.", sceneAssetName));
-            }
-
-            var sceneOperationHandle = await m_resourceManager.LoadSceneAsync(sceneAssetName, sceneMode, true);
-            m_LoadingSceneAssetNames.Add(sceneAssetName, new SceneHandleData(sceneOperationHandle, userData));
-            sceneOperationHandle.Update += OnLoadSceneUpdate;
-            sceneOperationHandle.Completed += OnLoadSceneCompleted;
-            return sceneOperationHandle;
-        }
-
-        private void OnLoadSceneUpdate(SceneHandle sceneHandle)
-        {
-            if (m_LoadingSceneAssetNames.TryGetValue(sceneHandle.GetAssetInfo().AssetPath, out var value))
-            {
-                LoadSceneUpdateCallback(sceneHandle.SceneName, sceneHandle.Progress, value.UserData);
-            }
-        }
-
-        private void OnLoadSceneCompleted(SceneHandle sceneOperationHandle)
-        {
-            m_LoadedSceneAssetNames.Add(sceneOperationHandle.GetAssetInfo().AssetPath, sceneOperationHandle);
-            if (m_LoadingSceneAssetNames.TryGetValue(sceneOperationHandle.GetAssetInfo().AssetPath, out var value))
-            {
-                m_LoadingSceneAssetNames.Remove(sceneOperationHandle.GetAssetInfo().AssetPath);
-            }
-
-            if (value != null)
-            {
-                if (sceneOperationHandle.IsSucceed)
-                {
-                    LoadSceneSuccessCallback(sceneOperationHandle.SceneName, sceneOperationHandle.Duration, value.UserData);
-                }
-                else
-                {
-                    LoadSceneFailureCallback(sceneOperationHandle.SceneName, sceneOperationHandle.Status, sceneOperationHandle.LastError, value.UserData);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 卸载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        public void UnloadScene(string sceneAssetName)
-        {
-            UnloadScene(sceneAssetName, null);
-        }
-
-        /// <summary>
-        /// 卸载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        public void UnloadScene(string sceneAssetName, object userData)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                throw new GameFrameworkException("Scene asset name is invalid.");
-            }
-
-            if (m_resourceManager == null)
-            {
-                throw new GameFrameworkException("You must set resource manager first.");
-            }
-
-            if (SceneIsUnloading(sceneAssetName))
-            {
-                throw new GameFrameworkException(Utility.Text.Format("Scene asset '{0}' is being unloaded.", sceneAssetName));
-            }
-
-            if (SceneIsLoading(sceneAssetName))
-            {
-                throw new GameFrameworkException(Utility.Text.Format("Scene asset '{0}' is being loaded.", sceneAssetName));
-            }
-
-            if (!SceneIsLoaded(sceneAssetName))
-            {
-                throw new GameFrameworkException(Utility.Text.Format("Scene asset '{0}' is not loaded yet.", sceneAssetName));
-            }
-
-            if (m_LoadedSceneAssetNames.TryGetValue(sceneAssetName, out var sceneOperationHandle))
-            {
-                var unloadSceneOperationHandle = sceneOperationHandle.UnloadAsync();
-                m_LoadedSceneAssetNames.Remove(sceneAssetName);
-                m_UnloadingSceneAssetNames.Add(sceneAssetName, sceneOperationHandle);
-
-                void OnUnloadSceneOperationHandleOnCompleted(AsyncOperationBase asyncOperationBase)
-                {
-                    if (asyncOperationBase.Error.IsNullOrEmpty())
-                    {
-                        UnloadSceneSuccessCallback(sceneAssetName, userData);
-                    }
-                    else
-                    {
-                        UnloadSceneFailureCallback(sceneAssetName, userData);
-                    }
-                }
-
-                unloadSceneOperationHandle.Completed += OnUnloadSceneOperationHandleOnCompleted;
-            }
-        }
-
-        private void LoadSceneSuccessCallback(string sceneAssetName, float duration, object userData)
-        {
-            m_LoadingSceneAssetNames.Remove(sceneAssetName);
-            // m_LoadedSceneAssetNames.Add(sceneAssetName);
-            if (m_LoadSceneSuccessEventHandler != null)
-            {
-                LoadSceneSuccessEventArgs loadSceneSuccessEventArgs = LoadSceneSuccessEventArgs.Create(sceneAssetName, duration, userData);
-                m_LoadSceneSuccessEventHandler(this, loadSceneSuccessEventArgs);
-                // ReferencePool.Release(loadSceneSuccessEventArgs);
-            }
-        }
-
-        private void LoadSceneFailureCallback(string sceneAssetName, EOperationStatus status, string errorMessage, object userData)
-        {
-            m_LoadingSceneAssetNames.Remove(sceneAssetName);
-            string appendErrorMessage = Utility.Text.Format("Load scene failure, scene asset name '{0}', status '{1}', error message '{2}'.", sceneAssetName, status, errorMessage);
-            if (m_LoadSceneFailureEventHandler != null)
-            {
-                LoadSceneFailureEventArgs loadSceneFailureEventArgs = LoadSceneFailureEventArgs.Create(sceneAssetName, status, appendErrorMessage, userData);
-                m_LoadSceneFailureEventHandler(this, loadSceneFailureEventArgs);
-                // ReferencePool.Release(loadSceneFailureEventArgs);
-                return;
-            }
-
-            throw new GameFrameworkException(appendErrorMessage);
-        }
-
-        private void LoadSceneUpdateCallback(string sceneAssetName, float progress, object userData)
-        {
-            if (m_LoadSceneUpdateEventHandler != null)
-            {
-                LoadSceneUpdateEventArgs loadSceneUpdateEventArgs = LoadSceneUpdateEventArgs.Create(sceneAssetName, progress, userData);
-                m_LoadSceneUpdateEventHandler(this, loadSceneUpdateEventArgs);
-                // ReferencePool.Release(loadSceneUpdateEventArgs);
-            }
-        }
-
-        private void UnloadSceneSuccessCallback(string sceneAssetName, object userData)
-        {
-            m_UnloadingSceneAssetNames.Remove(sceneAssetName);
-            m_LoadedSceneAssetNames.Remove(sceneAssetName);
-            if (m_UnloadSceneSuccessEventHandler != null)
-            {
-                UnloadSceneSuccessEventArgs unloadSceneSuccessEventArgs = UnloadSceneSuccessEventArgs.Create(sceneAssetName, userData);
-                m_UnloadSceneSuccessEventHandler(this, unloadSceneSuccessEventArgs);
-                // ReferencePool.Release(unloadSceneSuccessEventArgs);
-            }
-        }
-
-        private void UnloadSceneFailureCallback(string sceneAssetName, object userData)
-        {
-            m_UnloadingSceneAssetNames.Remove(sceneAssetName);
-            if (m_UnloadSceneFailureEventHandler != null)
-            {
-                UnloadSceneFailureEventArgs unloadSceneFailureEventArgs = UnloadSceneFailureEventArgs.Create(sceneAssetName, userData);
-                m_UnloadSceneFailureEventHandler(this, unloadSceneFailureEventArgs);
-                // ReferencePool.Release(unloadSceneFailureEventArgs);
-                return;
-            }
-
-            throw new GameFrameworkException(Utility.Text.Format("Unload scene failure, scene asset name '{0}'.", sceneAssetName));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/GameSceneManager.cs.meta b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/GameSceneManager.cs.meta
deleted file mode 100644
index 9297072..0000000
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/GameSceneManager.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6220e7b4d92a9374e8eb46752ce11b22
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/IGameSceneManager.cs b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/IGameSceneManager.cs
deleted file mode 100644
index a54e444..0000000
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/IGameSceneManager.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System;
-using System.Collections.Generic;
-using AlicizaX.Resource.Runtime;
-using Cysharp.Threading.Tasks;
-using AlicizaX.Runtime;
-using UnityEngine.SceneManagement;
-using YooAsset;
-
-namespace AlicizaX.Scene.Runtime
-{
-    /// <summary>
-    /// 场景管理器接口。
-    /// </summary>
-    public interface IGameSceneManager:IModule
-    {
-        /// <summary>
-        /// 加载场景成功事件。
-        /// </summary>
-        event EventHandler<LoadSceneSuccessEventArgs> LoadSceneSuccess;
-
-        /// <summary>
-        /// 加载场景失败事件。
-        /// </summary>
-        event EventHandler<LoadSceneFailureEventArgs> LoadSceneFailure;
-
-        /// <summary>
-        /// 加载场景更新事件。
-        /// </summary>
-        event EventHandler<LoadSceneUpdateEventArgs> LoadSceneUpdate;
-
-        /// <summary>
-        /// 卸载场景成功事件。
-        /// </summary>
-        event EventHandler<UnloadSceneSuccessEventArgs> UnloadSceneSuccess;
-
-        /// <summary>
-        /// 卸载场景失败事件。
-        /// </summary>
-        event EventHandler<UnloadSceneFailureEventArgs> UnloadSceneFailure;
-
-        /// <summary>
-        /// 设置资源管理器。
-        /// </summary>
-        /// <param name="resourceManager"></param>
-        void SetResourceManager(IResourceManager resourceManager);
-
-        /// <summary>
-        /// 获取场景是否已加载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否已加载。</returns>
-        bool SceneIsLoaded(string sceneAssetName);
-
-        /// <summary>
-        /// 获取已加载场景的资源名称。
-        /// </summary>
-        /// <returns>已加载场景的资源名称。</returns>
-        string[] GetLoadedSceneAssetNames();
-
-        /// <summary>
-        /// 获取已加载场景的资源名称。
-        /// </summary>
-        /// <param name="results">已加载场景的资源名称。</param>
-        void GetLoadedSceneAssetNames(List<string> results);
-
-        /// <summary>
-        /// 获取场景是否正在加载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否正在加载。</returns>
-        bool SceneIsLoading(string sceneAssetName);
-
-        /// <summary>
-        /// 获取正在加载场景的资源名称。
-        /// </summary>
-        /// <returns>正在加载场景的资源名称。</returns>
-        string[] GetLoadingSceneAssetNames();
-
-        /// <summary>
-        /// 获取正在加载场景的资源名称。
-        /// </summary>
-        /// <param name="results">正在加载场景的资源名称。</param>
-        void GetLoadingSceneAssetNames(List<string> results);
-
-        /// <summary>
-        /// 获取场景是否正在卸载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否正在卸载。</returns>
-        bool SceneIsUnloading(string sceneAssetName);
-
-        /// <summary>
-        /// 获取正在卸载场景的资源名称。
-        /// </summary>
-        /// <returns>正在卸载场景的资源名称。</returns>
-        string[] GetUnloadingSceneAssetNames();
-
-        /// <summary>
-        /// 获取正在卸载场景的资源名称。
-        /// </summary>
-        /// <param name="results">正在卸载场景的资源名称。</param>
-        void GetUnloadingSceneAssetNames(List<string> results);
-
-        /// <summary>
-        /// 检查场景资源是否存在。
-        /// </summary>
-        /// <param name="sceneAssetName">要检查场景资源的名称。</param>
-        /// <returns>场景资源是否存在。</returns>
-        bool HasScene(string sceneAssetName);
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        UniTask<SceneHandle> LoadScene(string sceneAssetName);
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        UniTask<SceneHandle> LoadScene(string sceneAssetName, object userData);
-
-        /// <summary>
-        /// 加载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="sceneMode"></param>
-        /// <param name="userData">用户自定义数据。</param>
-        UniTask<SceneHandle> LoadScene(string sceneAssetName, LoadSceneMode sceneMode, object userData);
-
-        /// <summary>
-        /// 卸载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        void UnloadScene(string sceneAssetName);
-
-        /// <summary>
-        /// 卸载场景。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        void UnloadScene(string sceneAssetName, object userData);
-    }
-}
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/IGameSceneManager.cs.meta b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/IGameSceneManager.cs.meta
deleted file mode 100644
index 71d3899..0000000
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/Scene/IGameSceneManager.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 264950f11e3b4db40b32adfd83525288
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs
index 10aa75b..5245357 100644
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs
@@ -1,8 +1,4 @@
-using AlicizaX.Event.Runtime;
-using System;
-using System.Collections.Generic;
-using AlicizaX.Resource.Runtime;
-using Cysharp.Threading.Tasks;
+using System;
 using AlicizaX.Runtime;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -11,432 +7,96 @@ using YooAsset;
 namespace AlicizaX.Scene.Runtime
 {
     /// <summary>
-    /// 场景组件。
+    /// 场景管理模块。
     /// </summary>
     [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Scene")]
     public sealed class SceneComponent : GameFrameworkComponent
     {
-        private const int DefaultPriority = 0;
+        private ISceneManager _sceneManager;
 
-        private IGameSceneManager _gameSceneManager = null;
-        private IResourceManager _resourceManager = null;
-        private EventComponent m_EventComponent = null;
-
-        private readonly SortedDictionary<string, int> m_SceneOrder = new SortedDictionary<string, int>(StringComparer.Ordinal);
-
-        private Camera m_MainCamera = null;
-        private UnityEngine.SceneManagement.Scene m_GameFrameworkScene = default(UnityEngine.SceneManagement.Scene);
-
-        [SerializeField] private bool m_EnableLoadSceneUpdateEvent = true;
-
-        [SerializeField] private bool m_EnableLoadSceneDependencyAssetEvent = true;
-
-        /// <summary>
-        /// 获取当前场景主摄像机。
-        /// </summary>
-        public Camera MainCamera
-        {
-            get { return m_MainCamera; }
-        }
-
-        /// <summary>
-        /// 游戏框架组件初始化。
-        /// </summary>
         protected override void Awake()
         {
             ImplementationComponentType = Utility.Assembly.GetType(componentType);
-            InterfaceComponentType = typeof(IGameSceneManager);
+            InterfaceComponentType = typeof(ISceneManager);
             base.Awake();
-            _gameSceneManager = SysModuleCenter.GetModule<IGameSceneManager>();
-            if (_gameSceneManager == null)
-            {
-                Log.Fatal("Scene manager is invalid.");
-                return;
-            }
-
-            _gameSceneManager.LoadSceneSuccess += OnLoadGameSceneSuccess;
-            _gameSceneManager.LoadSceneFailure += OnLoadGameSceneFailure;
-
-            if (m_EnableLoadSceneUpdateEvent)
-            {
-                _gameSceneManager.LoadSceneUpdate += OnLoadGameSceneUpdate;
-            }
-
-            if (m_EnableLoadSceneDependencyAssetEvent)
-            {
-                // _gameSceneManager.LoadSceneDependencyAsset += OnLoadGameSceneDependencyAsset;
-            }
-
-            _gameSceneManager.UnloadSceneSuccess += OnUnloadGameSceneSuccess;
-            _gameSceneManager.UnloadSceneFailure += OnUnloadGameSceneFailure;
-
-            m_GameFrameworkScene = UnityEngine.SceneManagement.SceneManager.GetSceneAt(0);
-            if (!m_GameFrameworkScene.IsValid())
-            {
-                Log.Fatal("Game Framework scene is invalid.");
-                return;
-            }
         }
 
-        private void Start()
-        {
-            BaseComponent baseComponent = GameEntry.GetComponent<BaseComponent>();
-            if (baseComponent == null)
-            {
-                Log.Fatal("Base component is invalid.");
-                return;
-            }
-
-            m_EventComponent = GameEntry.GetComponent<EventComponent>();
-            if (m_EventComponent == null)
-            {
-                Log.Fatal("Event component is invalid.");
-                return;
-            }
-
-            _resourceManager = SysModuleCenter.GetModule<IResourceManager>();
-            if (_resourceManager == null)
-            {
-                Log.Fatal("Asset Manager is invalid.");
-                return;
-            }
-
-            _gameSceneManager.SetResourceManager(_resourceManager);
-        }
 
         /// <summary>
-        /// 获取场景名称。
+        /// 当前主场景名称。
         /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景名称。</returns>
-        public static string GetSceneName(string sceneAssetName)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                Log.Error("Scene asset name is invalid.");
-                return null;
-            }
-
-            int sceneNamePosition = sceneAssetName.LastIndexOf('/');
-            if (sceneNamePosition + 1 >= sceneAssetName.Length)
-            {
-                Log.Error("Scene asset name '{0}' is invalid.", sceneAssetName);
-                return null;
-            }
-
-            string sceneName = sceneAssetName.Substring(sceneNamePosition + 1);
-            sceneNamePosition = sceneName.LastIndexOf(".unity");
-            if (sceneNamePosition > 0)
-            {
-                sceneName = sceneName.Substring(0, sceneNamePosition);
-            }
-
-            return sceneName;
-        }
-
-        /// <summary>
-        /// 获取场景是否已加载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否已加载。</returns>
-        public bool SceneIsLoaded(string sceneAssetName)
-        {
-            return _gameSceneManager.SceneIsLoaded(sceneAssetName);
-        }
-
-        /// <summary>
-        /// 获取已加载场景的资源名称。
-        /// </summary>
-        /// <returns>已加载场景的资源名称。</returns>
-        public string[] GetLoadedSceneAssetNames()
-        {
-            return _gameSceneManager.GetLoadedSceneAssetNames();
-        }
-
-        /// <summary>
-        /// 获取已加载场景的资源名称。
-        /// </summary>
-        /// <param name="results">已加载场景的资源名称。</param>
-        public void GetLoadedSceneAssetNames(List<string> results)
-        {
-            _gameSceneManager.GetLoadedSceneAssetNames(results);
-        }
-
-        /// <summary>
-        /// 获取场景是否正在加载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否正在加载。</returns>
-        public bool SceneIsLoading(string sceneAssetName)
-        {
-            return _gameSceneManager.SceneIsLoading(sceneAssetName);
-        }
-
-        /// <summary>
-        /// 获取正在加载场景的资源名称。
-        /// </summary>
-        /// <returns>正在加载场景的资源名称。</returns>
-        public string[] GetLoadingSceneAssetNames()
-        {
-            return _gameSceneManager.GetLoadingSceneAssetNames();
-        }
-
-        /// <summary>
-        /// 获取正在加载场景的资源名称。
-        /// </summary>
-        /// <param name="results">正在加载场景的资源名称。</param>
-        public void GetLoadingSceneAssetNames(List<string> results)
-        {
-            _gameSceneManager.GetLoadingSceneAssetNames(results);
-        }
-
-        /// <summary>
-        /// 获取场景是否正在卸载。
-        /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <returns>场景是否正在卸载。</returns>
-        public bool SceneIsUnloading(string sceneAssetName)
-        {
-            return _gameSceneManager.SceneIsUnloading(sceneAssetName);
-        }
-
-        /// <summary>
-        /// 获取正在卸载场景的资源名称。
-        /// </summary>
-        /// <returns>正在卸载场景的资源名称。</returns>
-        public string[] GetUnloadingSceneAssetNames()
-        {
-            return _gameSceneManager.GetUnloadingSceneAssetNames();
-        }
-
-        /// <summary>
-        /// 获取正在卸载场景的资源名称。
-        /// </summary>
-        /// <param name="results">正在卸载场景的资源名称。</param>
-        public void GetUnloadingSceneAssetNames(List<string> results)
-        {
-            _gameSceneManager.GetUnloadingSceneAssetNames(results);
-        }
-
-        /// <summary>
-        /// 检查场景资源是否存在。
-        /// </summary>
-        /// <param name="sceneAssetName">要检查场景资源的名称。</param>
-        /// <returns>场景资源是否存在。</returns>
-        public bool HasScene(string sceneAssetName)
-        {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                Log.Error("Scene asset name is invalid.");
-                return false;
-            }
-
-            if (!sceneAssetName.StartsWith("Assets/", StringComparison.Ordinal) ||
-                !sceneAssetName.EndsWith(".unity", StringComparison.Ordinal))
-            {
-                Log.Error("Scene asset name '{0}' is invalid.", sceneAssetName);
-                return false;
-            }
-
-            return _gameSceneManager.HasScene(sceneAssetName);
-        }
+        public string CurrentMainSceneName => _sceneManager.CurrentMainSceneName;
 
         /// <summary>
         /// 加载场景。
         /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        public UniTask<SceneHandle> LoadScene(string sceneAssetName)
+        /// <param name="location">场景的定位地址</param>
+        /// <param name="sceneMode">场景加载模式</param>
+        /// <param name="suspendLoad">加载完毕时是否主动挂起</param>
+        /// <param name="priority">优先级</param>
+        /// <param name="callBack">加载回调。</param>
+        /// <param name="gcCollect">加载主场景是否回收垃圾。</param>
+        /// <param name="progressCallBack">加载进度回调。</param>
+        public SceneHandle LoadScene(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100,
+            Action<SceneHandle> callBack = null, bool gcCollect = true, Action<float> progressCallBack = null)
         {
-            return LoadScene(sceneAssetName, LoadSceneMode.Additive, null);
+            return _sceneManager.LoadScene(location, sceneMode, suspendLoad, priority, callBack, gcCollect, progressCallBack);
         }
 
         /// <summary>
-        /// 加载场景。
+        /// 加载子场景。
         /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="sceneMode">加载场景资源的优先级。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        public UniTask<SceneHandle> LoadScene(string sceneAssetName, LoadSceneMode sceneMode, object userData = null)
+        /// <param name="location">场景的定位地址</param>
+        /// <param name="suspendLoad">加载完毕时是否主动挂起</param>
+        /// <param name="priority">优先级</param>
+        /// <param name="callBack">加载回调。</param>
+        /// <param name="gcCollect">加载主场景是否回收垃圾。</param>
+        /// <param name="progressCallBack">加载进度回调。</param>
+        public SceneHandle LoadSubScene(string location, bool suspendLoad = false, int priority = 100,
+            Action<SceneHandle> callBack = null, bool gcCollect = true, Action<float> progressCallBack = null)
         {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                Log.Error("Scene asset name is invalid.");
-                throw new ArgumentNullException(nameof(sceneAssetName));
-            }
-
-            if (!sceneAssetName.StartsWith("Assets/", StringComparison.Ordinal) ||
-                !sceneAssetName.EndsWith(".unity", StringComparison.Ordinal))
-            {
-                Log.Error("Scene asset name '{0}' is invalid.", sceneAssetName);
-                throw new ArgumentException(nameof(sceneAssetName));
-            }
-
-            return _gameSceneManager.LoadScene(sceneAssetName, sceneMode, userData);
+            return _sceneManager.LoadScene(location, LoadSceneMode.Additive, suspendLoad, priority, callBack, gcCollect, progressCallBack);
         }
 
         /// <summary>
-        /// 卸载场景。
+        /// 激活场景（当同时存在多个场景时用于切换激活场景）。
         /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="userData">用户自定义数据。</param>
-        public void UnloadScene(string sceneAssetName, object userData = null)
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否操作成功。</returns>
+        public bool ActivateScene(string location)
         {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                Log.Error("Scene asset name is invalid.");
-                return;
-            }
-
-            if (!sceneAssetName.StartsWith("Assets/", StringComparison.Ordinal) ||
-                !sceneAssetName.EndsWith(".unity", StringComparison.Ordinal))
-            {
-                Log.Error("Scene asset name '{0}' is invalid.", sceneAssetName);
-                return;
-            }
-
-            _gameSceneManager.UnloadScene(sceneAssetName, userData);
-            m_SceneOrder.Remove(sceneAssetName);
+            return _sceneManager.ActivateScene(location);
         }
 
         /// <summary>
-        /// 设置场景顺序。
+        /// 解除场景加载挂起操作。
         /// </summary>
-        /// <param name="sceneAssetName">场景资源名称。</param>
-        /// <param name="sceneOrder">要设置的场景顺序。</param>
-        public void SetSceneOrder(string sceneAssetName, int sceneOrder)
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否操作成功。</returns>
+        public bool UnSuspend(string location)
         {
-            if (string.IsNullOrEmpty(sceneAssetName))
-            {
-                Log.Error("Scene asset name is invalid.");
-                return;
-            }
-
-            if (!sceneAssetName.StartsWith("Assets/", StringComparison.Ordinal) ||
-                !sceneAssetName.EndsWith(".unity", StringComparison.Ordinal))
-            {
-                Log.Error("Scene asset name '{0}' is invalid.", sceneAssetName);
-                return;
-            }
-
-            if (SceneIsLoading(sceneAssetName))
-            {
-                m_SceneOrder[sceneAssetName] = sceneOrder;
-                return;
-            }
-
-            if (SceneIsLoaded(sceneAssetName))
-            {
-                m_SceneOrder[sceneAssetName] = sceneOrder;
-                RefreshSceneOrder();
-                return;
-            }
-
-            Log.Error("Scene '{0}' is not loaded or loading.", sceneAssetName);
+            return _sceneManager.UnSuspend(location);
         }
 
         /// <summary>
-        /// 刷新当前场景主摄像机。
+        /// 异步卸载子场景。
         /// </summary>
-        public void RefreshMainCamera()
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>场景卸载异步操作类。</returns>
+        public UnloadSceneOperation UnloadAsync(string location)
         {
-            m_MainCamera = Camera.main;
+            return _sceneManager.UnloadAsync(location);
         }
 
-        private void RefreshSceneOrder()
+        /// <summary>
+        /// 是否包含场景。
+        /// </summary>
+        /// <param name="location">场景资源定位地址。</param>
+        /// <returns>是否包含场景。</returns>
+        public bool IsContainScene(string location)
         {
-            if (m_SceneOrder.Count > 0)
-            {
-                string maxSceneName = null;
-                int maxSceneOrder = 0;
-                foreach (var sceneOrder in m_SceneOrder)
-                {
-                    if (SceneIsLoading(sceneOrder.Key))
-                    {
-                        continue;
-                    }
-
-                    if (maxSceneName == null)
-                    {
-                        maxSceneName = sceneOrder.Key;
-                        maxSceneOrder = sceneOrder.Value;
-                        continue;
-                    }
-
-                    if (sceneOrder.Value > maxSceneOrder)
-                    {
-                        maxSceneName = sceneOrder.Key;
-                        maxSceneOrder = sceneOrder.Value;
-                    }
-                }
-
-                if (maxSceneName == null)
-                {
-                    SetActiveScene(m_GameFrameworkScene);
-                    return;
-                }
-
-                var scene = UnityEngine.SceneManagement.SceneManager.GetSceneByName(GetSceneName(maxSceneName));
-                if (!scene.IsValid())
-                {
-                    Log.Error("Active scene '{0}' is invalid.", maxSceneName);
-                    return;
-                }
-
-                SetActiveScene(scene);
-            }
-            else
-            {
-                SetActiveScene(m_GameFrameworkScene);
-            }
-        }
-
-        private void SetActiveScene(UnityEngine.SceneManagement.Scene activeScene)
-        {
-            var lastActiveScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene();
-            if (lastActiveScene != activeScene)
-            {
-                UnityEngine.SceneManagement.SceneManager.SetActiveScene(activeScene);
-                m_EventComponent.Fire(this, ActiveSceneChangedEventArgs.Create(lastActiveScene, activeScene));
-            }
-
-            RefreshMainCamera();
-        }
-
-        private void OnLoadGameSceneSuccess(object sender, LoadSceneSuccessEventArgs eventArgs)
-        {
-            if (!m_SceneOrder.ContainsKey(eventArgs.SceneAssetName))
-            {
-                m_SceneOrder.Add(eventArgs.SceneAssetName, 0);
-            }
-
-            m_EventComponent.Fire(this, eventArgs);
-            RefreshSceneOrder();
-        }
-
-        private void OnLoadGameSceneFailure(object sender, LoadSceneFailureEventArgs eventArgs)
-        {
-            Log.Warning("Load scene failure, scene asset name '{0}', error message '{1}'.", eventArgs.SceneAssetName,
-                eventArgs.ErrorMessage);
-            m_EventComponent.Fire(this, eventArgs);
-        }
-
-        private void OnLoadGameSceneUpdate(object sender, LoadSceneUpdateEventArgs eventArgs)
-        {
-            m_EventComponent.Fire(this, eventArgs);
-        }
-
-        private void OnUnloadGameSceneSuccess(object sender, UnloadSceneSuccessEventArgs eventArgs)
-        {
-            m_EventComponent.Fire(this, eventArgs);
-            m_SceneOrder.Remove(eventArgs.SceneAssetName);
-            RefreshSceneOrder();
-        }
-
-        private void OnUnloadGameSceneFailure(object sender, UnloadSceneFailureEventArgs eventArgs)
-        {
-            Log.Warning("Unload scene failure, scene asset name '{0}'.", eventArgs.SceneAssetName);
-            m_EventComponent.Fire(this, eventArgs);
+            return _sceneManager.IsContainScene(location);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs.meta b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs.meta
index 2a52c96..099da2d 100644
--- a/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs.meta
+++ b/Client/Packages/com.alicizax.unity.scene/Runtime/Scene/SceneComponent.cs.meta
@@ -1,11 +1,3 @@
-fileFormatVersion: 2
-guid: 6ccaedadefd0fbf498241670caa387e8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: a8303f9994334265af3691a4b90f89d7
+timeCreated: 1738733838
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.setting/README.md b/Client/Packages/com.alicizax.unity.setting/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.setting/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.setting/README.md.meta b/Client/Packages/com.alicizax.unity.setting/README.md.meta
deleted file mode 100644
index 8f736e9..0000000
--- a/Client/Packages/com.alicizax.unity.setting/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d04fd4ed3ec82d9438d3d57609134d22
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.timer/README.md b/Client/Packages/com.alicizax.unity.timer/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.timer/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.timer/README.md.meta b/Client/Packages/com.alicizax.unity.timer/README.md.meta
deleted file mode 100644
index 9d9bd3d..0000000
--- a/Client/Packages/com.alicizax.unity.timer/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d40dc759ca8ecbe4c95545491d447ee6
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/AlicizaX.UI.Extension.Editor.asmdef b/Client/Packages/com.alicizax.unity.ui.extension/Editor/AlicizaX.UI.Extension.Editor.asmdef
new file mode 100644
index 0000000..cc40850
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/AlicizaX.UI.Extension.Editor.asmdef
@@ -0,0 +1,21 @@
+{
+    "name": "AlicizaX.UI.Extension.Editor",
+    "rootNamespace": "AlicizaX.UI.Extension.Editor",
+    "references": [
+        "GUID:6546d7765b4165b40850b3667f981c26",
+        "GUID:760f1778adc613f49a4394fb41ff0bbc",
+        "GUID:75b6f2078d190f14dbda4a5b747d709c",
+        "GUID:a19b414bea3b97240a91aeab9a8eab36"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.config/README.md.meta b/Client/Packages/com.alicizax.unity.ui.extension/Editor/AlicizaX.UI.Extension.Editor.asmdef.meta
similarity index 59%
rename from Client/Packages/com.alicizax.unity.config/README.md.meta
rename to Client/Packages/com.alicizax.unity.ui.extension/Editor/AlicizaX.UI.Extension.Editor.asmdef.meta
index 4011872..0df5a0e 100644
--- a/Client/Packages/com.alicizax.unity.config/README.md.meta
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/AlicizaX.UI.Extension.Editor.asmdef.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 56948d102772d2a49880d860edbbd14f
-TextScriptImporter:
+guid: 313320016f75fd24e9885858267ed35c
+AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension.meta b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension.meta
new file mode 100644
index 0000000..fd09a37
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3a2c1fc8ad7d457abaf67dae3d5005de
+timeCreated: 1738832149
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey.meta b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey.meta
new file mode 100644
index 0000000..6e981ab
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 618191a0ed5f4928a1686d6954d7cd1a
+timeCreated: 1738834271
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey/LocalizeStaticKey.cs b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey/LocalizeStaticKey.cs
new file mode 100644
index 0000000..74367fd
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey/LocalizeStaticKey.cs
@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using AlicizaX.Localization.Runtime;
+using AlicizaX.Runtime;
+using Newtonsoft.Json;
+using UnityEditor;
+using UnityEngine;
+
+namespace AlicizaX.UI.Extension.Editor
+{
+    internal class LocalizeItem
+    {
+        public string key;
+        public string ChineseSimplified;
+        public string English;
+        public string Japanese;
+    }
+
+    internal static class LocalizeStaticKey
+    {
+        static readonly string LocalizeStaticConfigPath = "Assets/AssetArt/Configs/json/tables_tblocalization.json";
+
+        private static bool IsLoaded = false;
+
+        private static List<LocalizeItem> LocalizeItems;
+        private static Dictionary<string, Dictionary<Language, string>> LocalizeDic;
+
+
+        /// <summary>
+        /// 获取所有静态Keys
+        /// </summary>
+        /// <returns></returns>
+        public static string[] GetAllStaticKeys()
+        {
+            LoadStaticKey();
+            List<string> keys = LocalizeItems.Select(v => v.key).ToList();
+            keys.Insert(0, "None");
+            return keys.ToArray();
+        }
+
+        public static string GetText(string key)
+        {
+            LoadStaticKey();
+            Language languageType = (Language)EditorPrefs.GetInt(LocalizationComponent.PrefsKey);
+            string value = key;
+
+            if (LocalizeDic.TryGetValue(key, out Dictionary<Language, string> dic))
+            {
+                dic.TryGetValue(languageType, out value);
+            }
+
+            return value;
+        }
+
+        [MenuItem("开发工具/Force Reload多语言静态Key")]
+        public static void ForceReload()
+        {
+            IsLoaded = false;
+            LoadStaticKey();
+        }
+
+        static void LoadStaticKey()
+        {
+            if (IsLoaded) return;
+            if (!File.Exists(LocalizeStaticConfigPath))
+            {
+                Debug.LogError("静态多语言文本文件不存在！");
+                return;
+            }
+
+            TextAsset textAsset =
+                UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(LocalizeStaticConfigPath);
+
+            LocalizeItems = JsonConvert.DeserializeObject<System.Collections.Generic.List<LocalizeItem>>(textAsset.text);
+
+            LocalizeDic = new Dictionary<string, Dictionary<Language, string>>();
+            foreach (var v in LocalizeItems)
+            {
+                Dictionary<Language, string> valueDic = new Dictionary<Language, string>();
+                valueDic.Add(Language.ChineseSimplified, v.ChineseSimplified);
+                valueDic.Add(Language.English, v.English);
+                valueDic.Add(Language.Japanese, v.Japanese);
+                LocalizeDic.Add(v.key, valueDic);
+            }
+
+            IsLoaded = true;
+        }
+    }
+}
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey/LocalizeStaticKey.cs.meta b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey/LocalizeStaticKey.cs.meta
new file mode 100644
index 0000000..53e7bd0
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/StaticKey/LocalizeStaticKey.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d65abc05d0b640199d1f55346b3c4f1b
+timeCreated: 1738834272
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text.meta b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text.meta
new file mode 100644
index 0000000..31f7d3b
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ae5a45a9c60593458ff7937ccef2268
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text/UXTextMeshProEditor.cs b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text/UXTextMeshProEditor.cs
new file mode 100644
index 0000000..959010e
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text/UXTextMeshProEditor.cs
@@ -0,0 +1,71 @@
+using AlicizaX.UI.Extension.Editor;
+using UnityEditor;
+
+namespace UnityEngine.UI
+{
+    [CustomEditor(typeof(UXTextMeshPro), true)]
+    [CanEditMultipleObjects]
+    public class UXTextMeshProEditor : TMPro.EditorUtilities.TMP_EditorPanelUI
+    {
+        private SerializedProperty text;
+        private SerializedProperty localizationID;
+
+        protected override void OnEnable()
+        {
+            text = serializedObject.FindProperty("m_text");
+            localizationID = serializedObject.FindProperty("m_localizationID");
+            base.OnEnable();
+        }
+
+        protected override void OnDisable()
+        {
+            base.OnDisable();
+        }
+
+
+        public override void OnInspectorGUI()
+        {
+            serializedObject.Update();
+            bool isPlay = Application.isPlaying;
+
+            EditorGUI.BeginDisabledGroup(isPlay);
+            string[] keys = LocalizeStaticKey.GetAllStaticKeys();
+
+            int index = -1;
+            for (int i = 0; i < keys.Length; i++)
+            {
+                if (localizationID.stringValue == keys[i])
+                {
+                    index = i;
+                    break;
+                }
+            }
+
+            if (index == -1)
+            {
+                EditorGUILayout.HelpBox("对应的多语言Key找不到！请重新配置", MessageType.Warning);
+            }
+
+            int selectedIndex = EditorGUILayout.Popup("Key", index, keys);
+            if (selectedIndex != index)
+            {
+                localizationID.stringValue = keys[selectedIndex];
+            }
+
+
+            EditorGUI.EndDisabledGroup();
+
+            EditorGUI.BeginDisabledGroup(true);
+            EditorGUILayout.PropertyField(localizationID, new GUIContent("key"));
+            if (!string.IsNullOrEmpty(localizationID.stringValue) && localizationID.stringValue != "None")
+            {
+                text.stringValue = LocalizeStaticKey.GetText(localizationID.stringValue);
+            }
+
+            EditorGUI.EndDisabledGroup();
+
+            serializedObject.ApplyModifiedProperties();
+            base.OnInspectorGUI();
+        }
+    }
+}
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text/UXTextMeshProEditor.cs.meta b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text/UXTextMeshProEditor.cs.meta
new file mode 100644
index 0000000..2d8854a
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Editor/UIExtension/Text/UXTextMeshProEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 45cc6be3b51ee2045b0c57c17e665f4c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/README.md b/Client/Packages/com.alicizax.unity.ui.extension/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.ui.extension/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/README.md.meta b/Client/Packages/com.alicizax.unity.ui.extension/README.md.meta
deleted file mode 100644
index ab65352..0000000
--- a/Client/Packages/com.alicizax.unity.ui.extension/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a426de2703687d84fbac3726155af70a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/AlicizaX.UI.Extension.asmdef b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/AlicizaX.UI.Extension.asmdef
new file mode 100644
index 0000000..8c7a53b
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/AlicizaX.UI.Extension.asmdef
@@ -0,0 +1,19 @@
+{
+    "name": "AlicizaX.UI.Extension",
+    "rootNamespace": "AlicizaX.UI.Extension",
+    "references": [
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:5553d74549d54e74cb548b3ab58a8483",
+        "GUID:a19b414bea3b97240a91aeab9a8eab36",
+        "GUID:75b6f2078d190f14dbda4a5b747d709c"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.debugger/README.md.meta b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/AlicizaX.UI.Extension.asmdef.meta
similarity index 59%
rename from Client/Packages/com.alicizax.unity.debugger/README.md.meta
rename to Client/Packages/com.alicizax.unity.ui.extension/Runtime/AlicizaX.UI.Extension.asmdef.meta
index 864870c..0dbdb90 100644
--- a/Client/Packages/com.alicizax.unity.debugger/README.md.meta
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/AlicizaX.UI.Extension.asmdef.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 0b4d5a300ce537c489ee35b588eae727
-TextScriptImporter:
+guid: 760f1778adc613f49a4394fb41ff0bbc
+AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension.meta b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension.meta
new file mode 100644
index 0000000..d42009b
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c1cc52c3a64c4e83b7663f7d98b524fa
+timeCreated: 1738832143
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text.meta b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text.meta
new file mode 100644
index 0000000..a321f59
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7596661cc0d376d48948e0c163857788
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text/UXTextMeshPro.cs b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text/UXTextMeshPro.cs
new file mode 100644
index 0000000..5adc27f
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text/UXTextMeshPro.cs
@@ -0,0 +1,25 @@
+using System;
+using TMPro;
+
+namespace UnityEngine.UI
+{
+    public class UXTextMeshPro : TextMeshProUGUI
+    {
+        [SerializeField] private string m_localizationID = "";
+
+        protected override void Start()
+        {
+            base.Start();
+            if (!Application.isPlaying) return;
+            ChangeLanguage();
+        }
+
+        protected void ChangeLanguage()
+        {
+            if (!string.IsNullOrEmpty(m_localizationID) && !"None".Equals(m_localizationID))
+            {
+                text = GameApp.Localization.GetString(m_localizationID);
+            }
+        }
+    }
+}
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text/UXTextMeshPro.cs.meta b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text/UXTextMeshPro.cs.meta
new file mode 100644
index 0000000..121427c
--- /dev/null
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/UGUIExtension/Text/UXTextMeshPro.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bd17b8b605f2ba540bac156b5cf5ac77
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/link.xml b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/link.xml
index 3f55174..4b6aaeb 100644
--- a/Client/Packages/com.alicizax.unity.ui.extension/Runtime/link.xml
+++ b/Client/Packages/com.alicizax.unity.ui.extension/Runtime/link.xml
@@ -1,3 +1,3 @@
 <linker>
-	<assembly fullname="AlicizaX.Config.Runtime" preserve="all" />
-</linker>
\ No newline at end of file
+	<assembly fullname="AlicizaX.UI.Extension" preserve="all" />
+</linker>
diff --git a/Client/Packages/com.alicizax.unity.ui/README.md b/Client/Packages/com.alicizax.unity.ui/README.md
deleted file mode 100644
index ac0c4db..0000000
--- a/Client/Packages/com.alicizax.unity.ui/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## HOMEPAGE
-
-GameFrameX 的 Asset 资源组件
-
-**Asset 资源组件 (Asset Component)** - 提供资源相关的接口。
-
-# 使用文档(文档编写于GPT4)
-
-## 注意事项
-
-# 使用方式(任选其一)
-
-1. 直接在 `manifest.json` 的文件中的 `dependencies` 节点下添加以下内容
-   ```json
-      {"com.gameframex.unity.asset": "https://github.com/AlianBlank/com.gameframex.unity.asset.git"}
-    ```
-2. 在Unity 的`Packages Manager` 中使用`Git URL` 的方式添加库,地址为：https://github.com/AlianBlank/com.gameframex.unity.asset.git
-
-3. 直接下载仓库放置到Unity 项目的`Packages` 目录下。会自动加载识别
\ No newline at end of file
diff --git a/Client/Packages/com.alicizax.unity.ui/README.md.meta b/Client/Packages/com.alicizax.unity.ui/README.md.meta
deleted file mode 100644
index e0d7d40..0000000
--- a/Client/Packages/com.alicizax.unity.ui/README.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1166e1ad68541974c9751fe9fdae3548
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Packages/com.alicizax.unity/Runtime/Constant/Language.cs b/Client/Packages/com.alicizax.unity/Runtime/Constant/Language.cs
index 3956657..703b648 100644
--- a/Client/Packages/com.alicizax.unity/Runtime/Constant/Language.cs
+++ b/Client/Packages/com.alicizax.unity/Runtime/Constant/Language.cs
@@ -1,270 +1,25 @@
-//------------------------------------------------------------
-// Game Framework
-// Copyright © 2013-2021 Jiang Yin. All rights reserved.
-// Homepage: https://gameframework.cn/
-// Feedback: mailto:ellan@gameframework.cn
-//------------------------------------------------------------
-
-namespace AlicizaX.Runtime
+namespace AlicizaX.Runtime
 {
     /// <summary>
     /// 本地化语言。
     /// </summary>
     public enum Language : byte
     {
-        /// <summary>
-        /// 未指定。
-        /// </summary>
-        Unspecified = 0,
-
-        /// <summary>
-        /// 南非荷兰语。
-        /// </summary>
-        Afrikaans,
-
-        /// <summary>
-        /// 阿尔巴尼亚语。
-        /// </summary>
-        Albanian,
-
-        /// <summary>
-        /// 阿拉伯语。
-        /// </summary>
-        Arabic,
-
-        /// <summary>
-        /// 巴斯克语。
-        /// </summary>
-        Basque,
-
-        /// <summary>
-        /// 白俄罗斯语。
-        /// </summary>
-        Belarusian,
-
-        /// <summary>
-        /// 保加利亚语。
-        /// </summary>
-        Bulgarian,
-
-        /// <summary>
-        /// 加泰罗尼亚语。
-        /// </summary>
-        Catalan,
+        Unspecified,
 
         /// <summary>
         /// 简体中文。
         /// </summary>
         ChineseSimplified,
 
-        /// <summary>
-        /// 繁体中文。
-        /// </summary>
-        ChineseTraditional,
-
-        /// <summary>
-        /// 克罗地亚语。
-        /// </summary>
-        Croatian,
-
-        /// <summary>
-        /// 捷克语。
-        /// </summary>
-        Czech,
-
-        /// <summary>
-        /// 丹麦语。
-        /// </summary>
-        Danish,
-
-        /// <summary>
-        /// 荷兰语。
-        /// </summary>
-        Dutch,
-
         /// <summary>
         /// 英语。
         /// </summary>
         English,
 
-        /// <summary>
-        /// 爱沙尼亚语。
-        /// </summary>
-        Estonian,
-
-        /// <summary>
-        /// 法罗语。
-        /// </summary>
-        Faroese,
-
-        /// <summary>
-        /// 芬兰语。
-        /// </summary>
-        Finnish,
-
-        /// <summary>
-        /// 法语。
-        /// </summary>
-        French,
-
-        /// <summary>
-        /// 格鲁吉亚语。
-        /// </summary>
-        Georgian,
-
-        /// <summary>
-        /// 德语。
-        /// </summary>
-        German,
-
-        /// <summary>
-        /// 希腊语。
-        /// </summary>
-        Greek,
-
-        /// <summary>
-        /// 希伯来语。
-        /// </summary>
-        Hebrew,
-
-        /// <summary>
-        /// 匈牙利语。
-        /// </summary>
-        Hungarian,
-
-        /// <summary>
-        /// 冰岛语。
-        /// </summary>
-        Icelandic,
-
-        /// <summary>
-        /// 印尼语。
-        /// </summary>
-        Indonesian,
-
-        /// <summary>
-        /// 意大利语。
-        /// </summary>
-        Italian,
-
         /// <summary>
         /// 日语。
         /// </summary>
         Japanese,
-
-        /// <summary>
-        /// 韩语。
-        /// </summary>
-        Korean,
-
-        /// <summary>
-        /// 拉脱维亚语。
-        /// </summary>
-        Latvian,
-
-        /// <summary>
-        /// 立陶宛语。
-        /// </summary>
-        Lithuanian,
-
-        /// <summary>
-        /// 马其顿语。
-        /// </summary>
-        Macedonian,
-
-        /// <summary>
-        /// 马拉雅拉姆语。
-        /// </summary>
-        Malayalam,
-
-        /// <summary>
-        /// 挪威语。
-        /// </summary>
-        Norwegian,
-
-        /// <summary>
-        /// 波斯语。
-        /// </summary>
-        Persian,
-
-        /// <summary>
-        /// 波兰语。
-        /// </summary>
-        Polish,
-
-        /// <summary>
-        /// 巴西葡萄牙语。
-        /// </summary>
-        PortugueseBrazil,
-
-        /// <summary>
-        /// 葡萄牙语。
-        /// </summary>
-        PortuguesePortugal,
-
-        /// <summary>
-        /// 罗马尼亚语。
-        /// </summary>
-        Romanian,
-
-        /// <summary>
-        /// 俄语。
-        /// </summary>
-        Russian,
-
-        /// <summary>
-        /// 塞尔维亚克罗地亚语。
-        /// </summary>
-        SerboCroatian,
-
-        /// <summary>
-        /// 塞尔维亚西里尔语。
-        /// </summary>
-        SerbianCyrillic,
-
-        /// <summary>
-        /// 塞尔维亚拉丁语。
-        /// </summary>
-        SerbianLatin,
-
-        /// <summary>
-        /// 斯洛伐克语。
-        /// </summary>
-        Slovak,
-
-        /// <summary>
-        /// 斯洛文尼亚语。
-        /// </summary>
-        Slovenian,
-
-        /// <summary>
-        /// 西班牙语。
-        /// </summary>
-        Spanish,
-
-        /// <summary>
-        /// 瑞典语。
-        /// </summary>
-        Swedish,
-
-        /// <summary>
-        /// 泰语。
-        /// </summary>
-        Thai,
-
-        /// <summary>
-        /// 土耳其语。
-        /// </summary>
-        Turkish,
-
-        /// <summary>
-        /// 乌克兰语。
-        /// </summary>
-        Ukrainian,
-
-        /// <summary>
-        /// 越南语。
-        /// </summary>
-        Vietnamese
     }
 }
diff --git a/Client/Packages/manifest.json b/Client/Packages/manifest.json
index 15d2f77..b4416b9 100644
--- a/Client/Packages/manifest.json
+++ b/Client/Packages/manifest.json
@@ -2,9 +2,9 @@
   "dependencies": {
     "com.alicizax.kyrylokuzyk.primetween": "http://101.34.252.46:3000/AlicizaX/com.alicizax.kyrylokuzyk.primetween.git",
     "com.alicizax.unity.cysharp.zstring": "http://101.34.252.46:3000/AlicizaX/com.alicizax.unity.cysharp.zstring.git",
+    "com.alicizax.unity.tuyoogame.yooasset": "http://101.34.252.46:3000/AlicizaX/com.alicizax.unity.tuyoogame.yooasset.git",
     "com.code-philosophy.hybridclr": "https://github.com/focus-creative-games/hybridclr_unity.git",
     "com.gameframex.unity.cysharp.unitask": "https://gitlink.org.cn/gameframex/com.gameframex.unity.cysharp.unitask.git",
-    "com.gameframex.unity.tuyoogame.yooasset": "https://gitlink.org.cn/gameframex/com.gameframex.unity.tuyoogame.yooasset.git",
     "com.unity.ai.navigation": "2.0.4",
     "com.unity.collab-proxy": "2.6.0",
     "com.unity.ide.rider": "3.0.31",
@@ -13,6 +13,7 @@
     "com.unity.multiplayer.center": "1.0.0",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.render-pipelines.universal": "17.0.3",
+    "com.unity.scriptablebuildpipeline": "2.1.4",
     "com.unity.test-framework": "1.4.5",
     "com.unity.timeline": "1.8.7",
     "com.unity.ugui": "2.0.0",
diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json
index b62f0cd..c903a7c 100644
--- a/Client/Packages/packages-lock.json
+++ b/Client/Packages/packages-lock.json
@@ -110,6 +110,18 @@
       "source": "embedded",
       "dependencies": {}
     },
+    "com.alicizax.unity.tuyoogame.yooasset": {
+      "version": "http://101.34.252.46:3000/AlicizaX/com.alicizax.unity.tuyoogame.yooasset.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.unity.scriptablebuildpipeline": "1.21.25",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
+      },
+      "hash": "c97e96015b075f64199110b48ae3f4c3fe17f4dd"
+    },
     "com.alicizax.unity.ui": {
       "version": "file:com.alicizax.unity.ui",
       "depth": 0,
@@ -136,18 +148,6 @@
       "dependencies": {},
       "hash": "bd5130fd441848fd0ef76f33ab5d1ed28507866f"
     },
-    "com.gameframex.unity.tuyoogame.yooasset": {
-      "version": "https://gitlink.org.cn/gameframex/com.gameframex.unity.tuyoogame.yooasset.git",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {
-        "com.unity.scriptablebuildpipeline": "2.1.3",
-        "com.unity.modules.assetbundle": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
-      },
-      "hash": "9bd6ed7484fdfecb747c2ba2ba81e2a7a5c18ff3"
-    },
     "com.unity.ai.navigation": {
       "version": "2.0.4",
       "depth": 0,
@@ -294,7 +294,7 @@
     },
     "com.unity.scriptablebuildpipeline": {
       "version": "2.1.4",
-      "depth": 1,
+      "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
diff --git a/Client/ProjectSettings/BuildSettings.json b/Client/ProjectSettings/BuildSettings.json
new file mode 100644
index 0000000..fcc1e4e
--- /dev/null
+++ b/Client/ProjectSettings/BuildSettings.json
@@ -0,0 +1 @@
+{"TargetPlatform":5,"BuildPipeline":2,"Compression":2,"EnableSharePack":true,"VersionFormat":"yyyy-MM-dd-HHmm","OutputPath":"Builds/AssetBundles","CopyToCDN":false,"CDNPath":"CDN/Latest","BuildPlayer":false,"ExecutablePath":"Builds/Game.exe"}
\ No newline at end of file
diff --git a/Client/ProjectSettings/EditorSettings.asset b/Client/ProjectSettings/EditorSettings.asset
index 0de8f7a..169222e 100644
--- a/Client/ProjectSettings/EditorSettings.asset
+++ b/Client/ProjectSettings/EditorSettings.asset
@@ -9,7 +9,7 @@ EditorSettings:
   m_DefaultBehaviorMode: 0
   m_PrefabRegularEnvironment: {fileID: 0}
   m_PrefabUIEnvironment: {fileID: 0}
-  m_SpritePackerMode: 0
+  m_SpritePackerMode: 5
   m_SpritePackerCacheSize: 10
   m_SpritePackerPaddingPower: 1
   m_Bc7TextureCompressor: 0
diff --git a/Client/ProjectSettings/HybridCLRSettings.asset b/Client/ProjectSettings/HybridCLRSettings.asset
index b886db1..eea59cc 100644
--- a/Client/ProjectSettings/HybridCLRSettings.asset
+++ b/Client/ProjectSettings/HybridCLRSettings.asset
@@ -31,7 +31,7 @@ MonoBehaviour:
   - System.dll
   - System.Core.dll
   - UnityEngine.CoreModule.dll
-  - YooAsset.Runtime.dll
+  - YooAsset.dll
   - UniTask.Runtime.dll
   - ZString.dll
   outputLinkFile: HybridCLRData/Generated/link.xml
diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset
index 46d063f..857b6b5 100644
--- a/Client/UserSettings/EditorUserSettings.asset
+++ b/Client/UserSettings/EditorUserSettings.asset
@@ -6,7 +6,7 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     GraphicsSettingsInspector_UserSettings:
-      value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b16460acb72ba5a52a362c3c0ee63201181433fe3e101bf3250b06144ca74c24f1190708e016c213c61a52f91c12cac80fd8edd298e1e4d1fde2cacddeacbcc1fee7eef0e3b6faa69af9ceaeaaec81a6d2c2c8c8c4b2e5dfd5ccd3f8cf
+      value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b96560acb72ba5a52a362c3c0ee63201181433fe3e101bf3250b06144ca74c24f1190708e016c213c61a52f91c12cac80fd8edd298e1e4d1fde2cacddeacbcc1fee7eef0e3b6faa69af9ceaeaaec81a6d2c2c8c8c4b2e5dfd5ccd3f8cf
       flags: 0
     RecentlyUsedSceneGuid-0:
       value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d
diff --git a/Client/UserSettings/Layouts/default-6000.dwlt b/Client/UserSettings/Layouts/default-6000.dwlt
index 3ece104..0d21e63 100644
--- a/Client/UserSettings/Layouts/default-6000.dwlt
+++ b/Client/UserSettings/Layouts/default-6000.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 997
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Console
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -121,7 +121,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 131
+  controlID: 185
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -140,7 +140,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 344
+    width: 424
     height: 941
   m_MinSize: {x: 51, y: 76}
   m_MaxSize: {x: 4001, y: 4026}
@@ -168,14 +168,14 @@ MonoBehaviour:
   - {fileID: 9}
   m_Position:
     serializedVersion: 2
-    x: 344
+    x: 424
     y: 0
-    width: 225
+    width: 191
     height: 941
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 61
+  controlID: 108
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -194,8 +194,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 225
-    height: 380
+    width: 191
+    height: 343
   m_MinSize: {x: 202, y: 226}
   m_MaxSize: {x: 4002, y: 4026}
   m_ActualView: {fileID: 15}
@@ -219,9 +219,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 380
-    width: 225
-    height: 561
+    y: 343
+    width: 191
+    height: 598
   m_MinSize: {x: 102, y: 126}
   m_MaxSize: {x: 4002, y: 4026}
   m_ActualView: {fileID: 16}
@@ -244,9 +244,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 569
+    x: 615
     y: 0
-    width: 286
+    width: 446
     height: 941
   m_MinSize: {x: 232, y: 276}
   m_MaxSize: {x: 10002, y: 10026}
@@ -270,9 +270,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 855
+    x: 1061
     y: 0
-    width: 1065
+    width: 859
     height: 941
   m_MinSize: {x: 276, y: 76}
   m_MaxSize: {x: 4001, y: 4026}
@@ -304,7 +304,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 24
-    width: 343
+    width: 423
     height: 915
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -347,7 +347,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
-    m_HSlider: 1
+    m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
@@ -359,23 +359,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 343
+      width: 423
       height: 894
-    m_Scale: {x: 0.3293854, y: 0.32938543}
-    m_Translation: {x: 179.63007, y: 447}
+    m_Scale: {x: 0.2203125, y: 0.2203125}
+    m_Translation: {x: 211.5, y: 447}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -545.3492
-      y: -1357.0728
-      width: 1041.3334
-      height: 2714.1455
+      x: -960
+      y: -2028.9362
+      width: 1920
+      height: 4057.8723
     m_MinimalGUI: 1
-  m_defaultScale: 0.17864583
-  m_LastWindowPixelSize: {x: 343, y: 915}
+  m_defaultScale: 0.2203125
+  m_LastWindowPixelSize: {x: 423, y: 915}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000
@@ -1154,8 +1154,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1
     y: 24
-    width: 223
-    height: 354
+    width: 189
+    height: 317
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1172,7 +1172,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: f8fafffff4ffffffd0ba0000
+      m_ExpandedIDs: 2adeffffa4eaffffa0ebffff04f1fffff8faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1219,9 +1219,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 1
-    y: 404
-    width: 223
-    height: 535
+    y: 367
+    width: 189
+    height: 572
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1254,9 +1254,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "Project\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 570
+    x: 616
     y: 24
-    width: 284
+    width: 444
     height: 915
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1278,9 +1278,8 @@ MonoBehaviour:
     m_SceneHandles: 
     m_ShowAllHits: 0
     m_SkipHidden: 0
-    m_SearchArea: 1
-    m_Folders:
-    - Assets/Resources/yoo/DefaultPackage
+    m_SearchArea: 0
+    m_Folders: []
     m_Globs: []
     m_ProductIds: 
     m_AnyWithAssetOrigin: 0
@@ -1298,7 +1297,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: e48c0000
     m_LastClickedID: 36068
-    m_ExpandedIDs: 0000000074bb000076bb000078bb00007abb00007cbb00007ebb000080bb000082bb000084bb000086bb000088bb00008abb00008cbb00008ebb000090bb000092bb000094bb000096bb000098bb00009abb00009cbb00009ebb0000a0bb0000a2bb0000a4bb0000a6bb0000a8bb0000aabb0000acbb0000aebb0000b0bb0000b2bb0000b4bb0000b6bb0000b8bb0000babb0000bcbb0000bebb0000c0bb0000c2bb0000c4bb0000c6bb0000c8bb0000cabb0000ccbb0000cebb0000d0bb0000d2bb0000d4bb0000d6bb0000d8bb0000dabb0000dcbb0000debb0000e0bb0000e2bb0000e4bb0000e6bb0000e8bb0000eabb0000ecbb0000eebb0000f0bb0000f2bb0000f4bb0000f6bb0000f8bb0000fabb0000fcbb0000febb000000bc000002bc000004bc000006bc000008bc00000abc00000cbc00000ebc000010bc000012bc000014bc000016bc000018bc00001abc00001cbc00001ebc000020bc000022bc000024bc000026bc000028bc00002abc00002cbc00002ebc000030bc000032bc000034bc000036bc000038bc00003abc00003cbc00003ebc000040bc000042bc000044bc000046bc000048bc00004abc00004cbc00004ebc000050bc000052bc0000
+    m_ExpandedIDs: 0000000008bc00000abc00000cbc00000ebc000010bc000012bc000014bc000016bc000018bc00001abc00001cbc00001ebc000020bc000022bc000024bc000026bc000028bc00002abc00002cbc00002ebc000030bc000032bc000034bc000036bc000038bc00003abc00003cbc00003ebc000040bc000042bc000044bc000046bc000048bc00004abc00004cbc00004ebc000050bc000052bc000054bc000056bc000058bc00005abc00005cbc00005ebc000060bc000062bc000064bc000066bc000068bc00006abc00006cbc00006ebc000070bc000072bc000074bc000076bc000078bc00007abc00007cbc00007ebc000080bc000082bc000084bc000086bc000088bc00008abc00008cbc00008ebc000090bc000092bc000094bc000096bc000098bc00009abc00009cbc00009ebc0000a0bc0000a2bc0000a4bc0000a6bc0000a8bc0000aabc0000acbc0000aebc0000b0bc0000b2bc0000b4bc0000b6bc0000b8bc0000babc0000bcbc0000bebc0000c0bc0000c2bc0000c4bc0000c6bc0000c8bc0000cabc0000ccbc0000cebc0000d0bc0000d2bc0000d4bc0000d6bc0000d8bc0000dabc0000dcbc0000debc0000e0bc0000e2bc0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1327,7 +1326,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000074bb000076bb000078bb00007abb00007cbb00007ebb000080bb000082bb000084bb000086bb000088bb00008abb00008cbb00008ebb000090bb000092bb000094bb000096bb000098bb00009abb00009cbb00009ebb0000a0bb0000a2bb0000a4bb0000a6bb0000a8bb0000aabb0000acbb0000aebb0000b0bb0000b2bb0000b4bb0000b6bb0000b8bb0000babb0000bcbb0000bebb0000c0bb0000c2bb0000c4bb0000c6bb0000c8bb0000cabb0000ccbb0000cebb0000d0bb0000d2bb0000d4bb0000d6bb0000d8bb0000dabb0000dcbb0000debb0000e0bb0000e2bb0000e4bb0000e6bb0000e8bb0000eabb0000ecbb0000eebb0000f0bb0000f2bb0000f4bb0000f6bb0000f8bb0000fabb0000fcbb0000febb000000bc000002bc000004bc000006bc000008bc00000abc00000cbc00000ebc000010bc000012bc000014bc000016bc000018bc00001abc00001cbc00001ebc000020bc000022bc000024bc000026bc000028bc00002abc00002cbc00002ebc000030bc000032bc000034bc000036bc000038bc00003abc00003cbc00003ebc000040bc000042bc000044bc000046bc000048bc00004abc00004cbc00004ebc000050bc000052bc0000
+    m_ExpandedIDs: 0000000008bc00000abc00000cbc00000ebc000010bc000012bc000014bc000016bc000018bc00001abc00001cbc00001ebc000020bc000022bc000024bc000026bc000028bc00002abc00002cbc00002ebc000030bc000032bc000034bc000036bc000038bc00003abc00003cbc00003ebc000040bc000042bc000044bc000046bc000048bc00004abc00004cbc00004ebc000050bc000052bc000054bc000056bc000058bc00005abc00005cbc00005ebc000060bc000062bc000064bc000066bc000068bc00006abc00006cbc00006ebc000070bc000072bc000074bc000076bc000078bc00007abc00007cbc00007ebc000080bc000082bc000084bc000086bc000088bc00008abc00008cbc00008ebc000090bc000092bc000094bc000096bc000098bc00009abc00009cbc00009ebc0000a0bc0000a2bc0000a4bc0000a6bc0000a8bc0000aabc0000acbc0000aebc0000b0bc0000b2bc0000b4bc0000b6bc0000b8bc0000babc0000bcbc0000bebc0000c0bc0000c2bc0000c4bc0000c6bc0000c8bc0000cabc0000ccbc0000cebc0000d0bc0000d2bc0000d4bc0000d6bc0000d8bc0000dabc0000dcbc0000debc0000e0bc0000e2bc0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1406,9 +1405,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "Inspector\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 856
+    x: 1062
     y: 24
-    width: 1064
+    width: 858
     height: 915
   m_SerializedDataModeController:
     m_DataMode: 0
diff --git a/Client/UserSettings/Search.settings b/Client/UserSettings/Search.settings
index 289538e..1f45d70 100644
--- a/Client/UserSettings/Search.settings
+++ b/Client/UserSettings/Search.settings
@@ -9,6 +9,10 @@ onBoardingDoNotAskAgain = true
 showPackageIndexes = false
 showStatusBar = false
 scopes = {
+	"picker_window_position_offset.075BCD15" = "883;137;320;550"
+	"picker_visibility_flags.075BCD15" = "264"
+	"picker_item_size.075BCD15" = "96"
+	"picker_inspector.075BCD15" = "0"
 }
 providers = {
 	asset = {
@@ -65,6 +69,10 @@ providers = {
 objectSelectors = {
 }
 recentSearches = [
+	"type: audiotyo"
+	"type: aliciza"
+	"type: a"
+	"type: language"
 ]
 searchItemFavorites = [
 ]
diff --git a/Config/gen-client-bin - 副本.bat b/Config/gen-client-bin - 副本.bat
new file mode 100644
index 0000000..bc4f3ae
--- /dev/null
+++ b/Config/gen-client-bin - 副本.bat	
@@ -0,0 +1,4 @@
+dotnet.exe ./Tools/Luban.dll --target client --dataTarget bin --codeTarget cs-bin --xargs outputDataDir=../Client/Assets/AssetRaw/Configs/bytes/  --xargs outputCodeDir=../Client/Assets/Scripts/Hotfix/GameProto/Config/Generate --xargs tableImporter.name=gameframex -x l10n.provider=gameframex -x l10n.textFile.keyFieldName=key  -x l10n.textFile.path=./Excels/Localization/    -x l10n.textFile.languageFieldName=ChineseSimplified ^
+  -x l10n.convertTextKeyToValue=1  --conf ./Luban.conf
+
+pause
\ No newline at end of file
diff --git a/Config/gen-client-localizationkey.bat b/Config/gen-client-localizationkey.bat
new file mode 100644
index 0000000..7a77de8
--- /dev/null
+++ b/Config/gen-client-localizationkey.bat
@@ -0,0 +1,3 @@
+dotnet.exe ./Tools/Luban.dll --target client --dataTarget json --outputTable Tables.TbLocalization --xargs outputDataDir=../Client/Assets/AssetArt/Configs/json/  --xargs tableImporter.name=gameframex -x l10n.provider=gameframex -x l10n.textFile.keyFieldName=key  -x l10n.textFile.path=./Excels/Localization/    --conf ./Luban.conf
+
+pause
\ No newline at end of file