11

把所有Scene加入到Addressable中
加载其他场景的问题，levelName为key去获取scene；
2025-03-10 20:18:32 +08:00 · 2025-03-10 20:17:56 +08:00 · 2025-03-10 14:06:29 +08:00 · 2025-03-09 15:08:08 +08:00 · 2025-03-09 12:36:37 +08:00 · 2025-03-08 16:11:57 +08:00
28 changed files with 1155 additions and 566 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@ -15,7 +15,7 @@ MonoBehaviour:
  m_DefaultGroup: a2c3e28415aafd8428af88db5c968beb
  m_currentHash:
    serializedVersion: 2
-    Hash: b19afed5d18a6d629a72586c3ad8e290
+    Hash: 00000000000000000000000000000000
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_BundleLocalCatalog: 0
@ -72,7 +72,6 @@ MonoBehaviour:
  - {fileID: 11400000, guid: e7ee81832cbcbb842938892856c2e2be, type: 2}
  - {fileID: 11400000, guid: 023a7e77b3681114b9c69578d186d385, type: 2}
  - {fileID: 11400000, guid: 3a503a3952ed91c4fb889804c8a9f612, type: 2}
-  - {fileID: 11400000, guid: 27920d2b4e2677a44aacb62c3353b8b8, type: 2}
  - {fileID: 11400000, guid: 47866218d613c2e409db0973297f2d1c, type: 2}
  - {fileID: 11400000, guid: 267cd74b05b6e5040a493047baabe772, type: 2}
  - {fileID: 11400000, guid: 8d901d4ba9df8cb4ab616f4ca5af6803, type: 2}
@ -84,6 +83,9 @@ MonoBehaviour:
  - {fileID: 11400000, guid: eb76dce8b5d9a244a8a6047cc68d5656, type: 2}
  - {fileID: 11400000, guid: 21d46c698eac6c14da854ef8bbd80bd0, type: 2}
  - {fileID: 11400000, guid: 0a2645334db305347935fcc449627ba9, type: 2}
+  - {fileID: 11400000, guid: b223b945d56ac9f4e9a31a24b76bcddd, type: 2}
+  - {fileID: 11400000, guid: f2ef8af74d87cf247a7ab0e531b3b592, type: 2}
+  - {fileID: 11400000, guid: 4dc851f15ca21c043b4cb28c1c03192b, type: 2}
  m_BuildSettings:
    m_CompileScriptsInVirtualMode: 0
    m_CleanupStreamingAssetsAfterBuilds: 1
--- a/Assets/AddressableAssetsData/AssetGroups/IconsShopIconClubLimited.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/IconsShopIconClubLimited.asset
@ -10,108 +10,13 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
-  m_Name: IconsShopIcon
+  m_Name: IconsShopIconClubLimited
  m_EditorClassIdentifier: 
-  m_GroupName: IconsShopIcon
+  m_GroupName: IconsShopIconClubLimited
  m_Data:
    m_SerializedData: []
-  m_GUID: 492d0dc9ed6914c419c2adc3ef7c34fa
+  m_GUID: 901bd1e3f17c48647bccaa525065771b
  m_SerializeEntries:
-  - m_GUID: b3d3c863a1fc1644fbbfdf8ddba2d0e1
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_128.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 7fb8e0fdfd49dbc4ba63241831f43b32
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_30.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ae82d46af7d5d5541add8a16801fcdb5
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_328.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 0dc0df8a76a9c7548b5366acd1ea5adf
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_6.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e1c6d3b1a0a0e644eac88ddf10cf6984
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_648.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f418fade0c2bf5f40b1a0ec956dbf291
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_98.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 3f2cb1e0cf50a9042a60b3d70eaae02a
-    m_Address: Assets/Content/Icons/ShopIcons/ic_club_item_001.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 417b7964c139814448ef0cdbac842580
-    m_Address: Assets/Content/Icons/ShopIcons/ic_reshop_banner.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 40e72a612e82e3d46a4f4bef802ebdcf
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_01.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e6c7a5b700f91a04b80a5abc01b20e9a
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_02.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2ba63d62595164749ba830f2a91d1124
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_03.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e6b80596c317a4a49a1b8199ab31aad4
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_04.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 49f14dcd482f44a4794396285d0bb817
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_05.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 113229047a1a7d84fa03c87e13fa216c
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_06.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: b147aedbcc0cd834c874cf2bb791f55e
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_07.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 85a320e83af6be740bb447ed5d6e752b
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_08.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ded44109cace86a4db72e847e2f70392
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_09.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 8a2ded9c7efc8b64d8b0e33188595cf2
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_10.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 68b866e62a0224a4eb42909b2b167ae8
-    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_11.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: a9bf5799cd9cd9f41aa7e060dd21579c
    m_Address: Assets/Content/Icons/ShopIcons/img_club_limited_Banner03.png
    m_ReadOnly: 0
@ -702,284 +607,9 @@ MonoBehaviour:
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: b851d6c8707f47b4b96c1fbf6848f5b1
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox1.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 593b357d092079342a360c6f00a04b02
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox2.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: c2e8b9baf8353f14ea7cf604db7b88ae
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox3.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5528769981c0d774aa3d20a1d957a8a9
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox4.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: b93ac98dd0146fb4aabad28c06de71eb
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox5.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 1c7960ae46cde794b818cea29f9a13e6
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox6.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f3777f02071cba34593c0b32b30708c5
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox7.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 1eea0dddb76702041b2f043d7a38f9c2
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox8.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f26fc9ca2b36be140bb815ef59a43878
-    m_Address: Assets/Content/Icons/ShopIcons/market_daybox9.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: cbe09378bf970c74588a977652256ba5
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox01.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5a6420915f773374db6a5d0b8ab684df
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox02.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f56b6b0a83918144fa31ad4c4786e10a
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox03.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 7d1f5fd518029fb459e2f3833eae807f
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox04.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5bba9da8d2e1b8140811cd2a7cc43b55
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox05.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: a0e88650dec09b8419bc771793f6a443
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox06.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e5d0f56f4dffbae41bec281bb209f7eb
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox07.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ae14651b467c1c341b63ecb604d7c172
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox08.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 8f4c5bbc03ce200498799cdec27bf9dd
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox09.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: c3cffd0a79865064ba5d0b802a01871a
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox10.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 0e68742f3aa25e248bf9a83558a38bd2
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox11.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f5ecc678d77419d4c970175dad5c69ed
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox12.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 4c9431a7d6e8a7442b35cf3624cc1aa7
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox13.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 47ec2a9682388844fa6d74082d4fe99c
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox14.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 81e91359267375e4eb00e86382a17b4e
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox15.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 7bb9deb6e1149ad4aa1fe8a2b9b55f50
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox16.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ea527142cc854724fa6a57b6d322b700
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox17.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 161246874a9a4da49831f41a77ae5991
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox18.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f08b2dce8ae60614a8536fe0bb8b62f4
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox19.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 4304504f43f0d934e8d3f55b1dee9e8a
-    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox20.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ab910d172d92fbc48aa16a72906855c9
-    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox1.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 55bad8e5449c73b4ab56947255a4b20e
-    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox2.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2e79a9d0ebf6bdf4385c68ad50080efa
-    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox3.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 895b9a62e5b4a6444b4c456cedfb27c4
-    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox4.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: a008caad9c1c510478fc77e82a235a02
-    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox5.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 92c142db0663acc498a76be1c821f0e2
-    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox6.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 0d2e8be3082a8464aa209ac08da8c0ea
-    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox1.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 9f2e906c606559e46ab5c026e671b785
-    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox2.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 63e4d93375d30264b8770fd3f0700fc6
-    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox3.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 63c8e30bd42951440a4e918424b822f7
-    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox4.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 24cdb892aabd4c144acd9c9f6ef72a88
-    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox5.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 834a5d0be7934c44f9e4980246655492
-    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox6.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 392e1e9252c6c794588f4cb8c4a55800
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_128.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f3fb5dba3a77a4242a5d2454ce8bce42
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_1280.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 8140e07e3dcc8454b881f8387d1e2320
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_30.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: dcbcfb72ea0b5ee4388878016372052c
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_300.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: db93c4c9c656d8b4780b6dd01cc67971
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_328.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e20e732be4d4298499f8300d48f11eaf
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_3280.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f0389003e146ec54eaab108c166274bc
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_6.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 45e9cfdb7165f404e8a216d8a7c3a1b1
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_60.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2b6a0949f620d23429e8a346e771f37b
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_648.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5efa7345bcf47db4bb2be569ad911d81
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_6480.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 80a8d317c1ec24740a08b558b2461bc6
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_98.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 598d82b31bee6b54888e36d0fa9fd7f4
-    m_Address: Assets/Content/Icons/ShopIcons/num_club_980.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 45a1375329c20b34782fce0379eb2b72
-    m_Address: Assets/Content/Icons/ShopIcons/txt_club_first.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 188dee1f27be6494897baba8c8f6d9e3
-    m_Address: Assets/Content/Icons/ShopIcons/txt_club_free_extra_cn.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
  m_ReadOnly: 0
  m_Settings: {fileID: 11400000, guid: 8b54c61ef06dca34e89fcf16d0b8c4b3, type: 2}
  m_SchemaSet:
    m_Schemas:
-    - {fileID: 11400000, guid: e3ab4379a9c7b6643abb1b0a27e7ecc1, type: 2}
-    - {fileID: 11400000, guid: fc835a421daf70e498d1aca09027dca4, type: 2}
+    - {fileID: 11400000, guid: 437cc307f283a0a4fa61cd85f7358b95, type: 2}
+    - {fileID: 11400000, guid: bbed8e7ac9ce0f94bb407e1c80b6b899, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIcon_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIcon_ContentUpdateGroupSchema.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fc835a421daf70e498d1aca09027dca4
+guid: f2ef8af74d87cf247a7ab0e531b3b592
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/AddressableAssetsData/AssetGroups/IconsShopIconMarket.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/IconsShopIconMarket.asset
@ -0,0 +1,230 @@
+%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: IconsShopIconMarket
+  m_EditorClassIdentifier: 
+  m_GroupName: IconsShopIconMarket
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 0fbdb405d333e024280df0b3fb1190f9
+  m_SerializeEntries:
+  - m_GUID: b851d6c8707f47b4b96c1fbf6848f5b1
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox1.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 593b357d092079342a360c6f00a04b02
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox2.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c2e8b9baf8353f14ea7cf604db7b88ae
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox3.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 5528769981c0d774aa3d20a1d957a8a9
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox4.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b93ac98dd0146fb4aabad28c06de71eb
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox5.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 1c7960ae46cde794b818cea29f9a13e6
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox6.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f3777f02071cba34593c0b32b30708c5
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox7.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 1eea0dddb76702041b2f043d7a38f9c2
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox8.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f26fc9ca2b36be140bb815ef59a43878
+    m_Address: Assets/Content/Icons/ShopIcons/market_daybox9.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: cbe09378bf970c74588a977652256ba5
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox01.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 5a6420915f773374db6a5d0b8ab684df
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox02.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f56b6b0a83918144fa31ad4c4786e10a
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox03.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 7d1f5fd518029fb459e2f3833eae807f
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox04.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 5bba9da8d2e1b8140811cd2a7cc43b55
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox05.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a0e88650dec09b8419bc771793f6a443
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox06.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e5d0f56f4dffbae41bec281bb209f7eb
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox07.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ae14651b467c1c341b63ecb604d7c172
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox08.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8f4c5bbc03ce200498799cdec27bf9dd
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox09.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c3cffd0a79865064ba5d0b802a01871a
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox10.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 0e68742f3aa25e248bf9a83558a38bd2
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox11.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f5ecc678d77419d4c970175dad5c69ed
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox12.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 4c9431a7d6e8a7442b35cf3624cc1aa7
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox13.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 47ec2a9682388844fa6d74082d4fe99c
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox14.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 81e91359267375e4eb00e86382a17b4e
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox15.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 7bb9deb6e1149ad4aa1fe8a2b9b55f50
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox16.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ea527142cc854724fa6a57b6d322b700
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox17.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 161246874a9a4da49831f41a77ae5991
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox18.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f08b2dce8ae60614a8536fe0bb8b62f4
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox19.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 4304504f43f0d934e8d3f55b1dee9e8a
+    m_Address: Assets/Content/Icons/ShopIcons/market_giftbox20.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ab910d172d92fbc48aa16a72906855c9
+    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox1.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 55bad8e5449c73b4ab56947255a4b20e
+    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox2.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2e79a9d0ebf6bdf4385c68ad50080efa
+    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox3.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 895b9a62e5b4a6444b4c456cedfb27c4
+    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox4.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a008caad9c1c510478fc77e82a235a02
+    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox5.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 92c142db0663acc498a76be1c821f0e2
+    m_Address: Assets/Content/Icons/ShopIcons/market_monthbox6.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 0d2e8be3082a8464aa209ac08da8c0ea
+    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox1.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 9f2e906c606559e46ab5c026e671b785
+    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox2.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 63e4d93375d30264b8770fd3f0700fc6
+    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox3.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 63c8e30bd42951440a4e918424b822f7
+    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox4.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 24cdb892aabd4c144acd9c9f6ef72a88
+    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox5.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 834a5d0be7934c44f9e4980246655492
+    m_Address: Assets/Content/Icons/ShopIcons/market_weekbox6.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 8b54c61ef06dca34e89fcf16d0b8c4b3, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 93f44a72cfc82ac4da9b2d4c386f4c05, type: 2}
+    - {fileID: 11400000, guid: 7d9905c3b66052442baa029826347488, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/IconsShopIconMarket.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/IconsShopIconMarket.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 27920d2b4e2677a44aacb62c3353b8b8
+guid: 4dc851f15ca21c043b4cb28c1c03192b
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/AddressableAssetsData/AssetGroups/IconsShopIconShop.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/IconsShopIconShop.asset
@ -0,0 +1,190 @@
+%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: IconsShopIconShop
+  m_EditorClassIdentifier: 
+  m_GroupName: IconsShopIconShop
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 25db19ad13b334044a75ed53e74de697
+  m_SerializeEntries:
+  - m_GUID: b3d3c863a1fc1644fbbfdf8ddba2d0e1
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_128.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 7fb8e0fdfd49dbc4ba63241831f43b32
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_30.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ae82d46af7d5d5541add8a16801fcdb5
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_328.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 0dc0df8a76a9c7548b5366acd1ea5adf
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_6.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e1c6d3b1a0a0e644eac88ddf10cf6984
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_648.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f418fade0c2bf5f40b1a0ec956dbf291
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_gold_98.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 3f2cb1e0cf50a9042a60b3d70eaae02a
+    m_Address: Assets/Content/Icons/ShopIcons/ic_club_item_001.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 417b7964c139814448ef0cdbac842580
+    m_Address: Assets/Content/Icons/ShopIcons/ic_reshop_banner.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 40e72a612e82e3d46a4f4bef802ebdcf
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_01.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e6c7a5b700f91a04b80a5abc01b20e9a
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_02.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2ba63d62595164749ba830f2a91d1124
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_03.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e6b80596c317a4a49a1b8199ab31aad4
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_04.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 49f14dcd482f44a4794396285d0bb817
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_05.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 113229047a1a7d84fa03c87e13fa216c
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_06.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b147aedbcc0cd834c874cf2bb791f55e
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_07.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 85a320e83af6be740bb447ed5d6e752b
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_08.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ded44109cace86a4db72e847e2f70392
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_09.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8a2ded9c7efc8b64d8b0e33188595cf2
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_10.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 68b866e62a0224a4eb42909b2b167ae8
+    m_Address: Assets/Content/Icons/ShopIcons/ic_shop_11.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 392e1e9252c6c794588f4cb8c4a55800
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_128.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f3fb5dba3a77a4242a5d2454ce8bce42
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_1280.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8140e07e3dcc8454b881f8387d1e2320
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_30.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: dcbcfb72ea0b5ee4388878016372052c
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_300.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: db93c4c9c656d8b4780b6dd01cc67971
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_328.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e20e732be4d4298499f8300d48f11eaf
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_3280.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f0389003e146ec54eaab108c166274bc
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_6.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 45e9cfdb7165f404e8a216d8a7c3a1b1
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_60.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2b6a0949f620d23429e8a346e771f37b
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_648.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 5efa7345bcf47db4bb2be569ad911d81
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_6480.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 80a8d317c1ec24740a08b558b2461bc6
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_98.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 598d82b31bee6b54888e36d0fa9fd7f4
+    m_Address: Assets/Content/Icons/ShopIcons/num_club_980.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 45a1375329c20b34782fce0379eb2b72
+    m_Address: Assets/Content/Icons/ShopIcons/txt_club_first.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 188dee1f27be6494897baba8c8f6d9e3
+    m_Address: Assets/Content/Icons/ShopIcons/txt_club_free_extra_cn.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 0
+  m_Settings: {fileID: 11400000, guid: 8b54c61ef06dca34e89fcf16d0b8c4b3, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 03fa4f989107ec54baa22116a2b5cbe2, type: 2}
+    - {fileID: 11400000, guid: 47d6a24b0e8e9614c93e9aa0e653f777, type: 2}
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIcon_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIcon_BundledAssetGroupSchema.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e3ab4379a9c7b6643abb1b0a27e7ecc1
+guid: b223b945d56ac9f4e9a31a24b76bcddd
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/AddressableAssetsData/AssetGroups/ScenePath.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/ScenePath.asset
@ -18,17 +18,367 @@ MonoBehaviour:
  m_GUID: e9d0de0b0bb21ef4b8a5aa0765a892fb
  m_SerializeEntries:
  - m_GUID: 67f0e37297f014242a897f5fec726797
-    m_Address: Assets/Scenes/Scene_CreateRole/Scene_CreateRole.unity
+    m_Address: Scene_CreateRole.unity
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: ee18448ba444ad747afd63ef185d78c5
-    m_Address: Assets/Scenes/Scene_prontera_sd/Scene_prontera_sd.unity
+    m_Address: Scene_prontera_sd.unity
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: d93742904e26a0441bd8d62fc4904a9f
-    m_Address: Assets/Scenes/Scene_testpvp/scenes_test_pvp.unity
+    m_Address: scenes_test_pvp.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 0cf506a482bd5a84daeeacc4345f517e
+    m_Address: scene_maze_01.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2bea969f529f7614d8411048f29430dd
+    m_Address: Scene_JFDX.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: d821623cc015be7438cd3cdcaf4ff1cd
+    m_Address: scene_climbingtower.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 59591164b138c26448b23818563a8109
+    m_Address: Scene_SRCL.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: fcfda78df7218dc419245afde2fcf6a9
+    m_Address: Scene_SKLSM.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 4025d4a9eab3f9547b197e30fe829a1f
+    m_Address: Scene_jinzita.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2561797f854d3eb4abc1a39f22c6ca91
+    m_Address: Scene_tanyangzhuhai.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f64dced9eac4b5e498adb06249f3c8e6
+    m_Address: Scene_Newbie.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 1cf60d9aa8d0c014f8dcd92348646d4a
+    m_Address: Scene_dixiakuangdao.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: bfaaf3bdc1c1c5c43a7e560503e3560c
+    m_Address: Scene_FYSL.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: bf9dea7831ccefc44816a2770d4a77ae
+    m_Address: Scene_FYMG.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 57f802972abb1d14494c71ed7c189ef6
+    m_Address: Scene_GCQST.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 527c8fc37dda3794eb8b8d3d16a1a1d1
+    m_Address: Scene_WorldBoss.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 6075c5f89dc6459478345018272e0cf4
+    m_Address: Scene_wamugaodi.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 6f36d5529b5501647a648e1b1544563b
+    m_Address: Scene_GuildBoss.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 99c9720ab356a0642a771bea13969a05
+    m_Address: Scene_jianshilindi.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 9eff4ebaa39b0da4a94204dfc0f3c7e6
+    m_Address: Scene_chenhuipendi.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2e1b0e5279223fc428bbbe879981a39c
+    m_Address: Scene_shamozhidu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 3a574da81ab23304c87c71d02c084cd0
+    m_Address: scene_yanjiusuo.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 3136dd23a327c5f4c98f7589a16b62a0
+    m_Address: Scene_laidisiqiuling.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 26a80f9b4dd93f94da0e523209c619bc
+    m_Address: Scene_huoshendong.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 0db657fa7f708c54680bbd4cb9141676
+    m_Address: Scene_jiaotupingyuan.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: efff220d5b6e8944682689c44409b03e
+    m_Address: Scene_huoyanzhaoze.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f2f8b34492820a845b893be304839c33
+    m_Address: Scene_xuyingxiagu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a6db569c73a5eb343a988de6a305952a
+    m_Address: Scene_shendian.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 7098c41a0f81acd46bc73155bd4df657
+    m_Address: Scene_fengxiangshangu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: fa8ee7e240658d849b938feb9fac47ba
+    m_Address: Scene_xinghuoyingdi.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 1d41719fd16f54140be8f3956cfc6791
+    m_Address: Scene_jujinkuangdong.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 49fbcf0e782a65d49aa7e1f1dc87a552
+    m_Address: Scene_yanxironglu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 89897e5033d531c439f09b06bf2bc56e
+    m_Address: Scene_kaisadumu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 4b961c86a95492a43885df87475d3f6d
+    m_Address: Scene_siludemodan.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 60ae371aeaeeffd4b980b41a67e52e3d
+    m_Address: Scene_gushan.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 55110d99ef34da943871e8ea48de5594
+    m_Address: Scene_genitahaide.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f7664c08b50378a4fab8f5d16a3df0f0
+    m_Address: Scene_deleikehaixia.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c14b49897bad81d4381b1fcb004f217c
+    m_Address: Scene_miyinhegu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e8ff7b59f37103640a673bcdcc2579b7
+    m_Address: Scene_miwushanmai.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 358254f4d24e2a6438f46a397eab4dfe
+    m_Address: Scene_leimingxiawan.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e0a2085c067b46b4c881c3f5da0bc729
+    m_Address: Scene_lueyinggu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b021acef12559a148a83dd4f0c5cad74
+    m_Address: Scene_wenbala.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 39f134162f7e6224187dd04df95c3065
+    m_Address: Scene_fuguangta.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c2dbe0041ea426f49bcff516323ac976
+    m_Address: scene_bujiezhiquan.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f978efb5a1827b040b9bb4fc27c89d4b
+    m_Address: Scene_HYCX.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b1b66b1c80557374393859f44eaed91a
+    m_Address: Scene_miwushenlin.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 10ce5aaf0a906604bbecd2a3ed5436f7
+    m_Address: Scene_nibolonggen.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: fc313429911aa4342b8978a9a1face19
+    m_Address: Scene_shuanghuoweimu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: eb94679610a8dd04eb674c04603b9d8f
+    m_Address: Scene_xiendaer.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 7333a9510c88f0b42ac10394d69a6b09
+    m_Address: Scene_zuigu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 64277c81de4a81d4b903aabd10ad43db
+    m_Address: Scene_ailiude.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: d6c56aa22d84a1f4eaa9ebba91c94cf6
+    m_Address: Scene_duate.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 881e96ae4f324d64c86ecd6560b1982d
+    m_Address: Scene_jiandao.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c5af7b23d4aa5ee4d8fc5b48b1cd059e
+    m_Address: Scene_yongguang.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 6d12d2c70384f114391d655cbbd4777c
+    m_Address: Scene_huihunzao.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 589f82427463ba44d91615d34afd29ab
+    m_Address: Scene_genipa.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 135916e35c3e6ee428b071fdcd0703f1
+    m_Address: Scene_hailazhimen.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: edfd60d65aafcb44eba57fca46998061
+    m_Address: Scene_zhanlinlu.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 2c85cab622552c94ca899474660baddf
+    m_Address: Scene_huoyanzhaoze_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f4f38908690013d4bad847afdc1ab0b8
+    m_Address: Scene_jianshilindi_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f9bee67aa1a91de41b62b6908fcb6559
+    m_Address: Scene_huoshendong_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 8d6eefbd86604544baef6fa61ee6d4b4
+    m_Address: Scene_chenhuipendi_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 78412e218e45f734a84121c53e166aca
+    m_Address: Scene_dixiakuangdao_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 44bf9594e3d8b5f4dab9a623df858707
+    m_Address: Scene_laidisiqiuling_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: a02081ac05db2cc42b121e273c17eb61
+    m_Address: Scene_xuyingxiagu_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: ba672cfb356b1d04f9a6ed421ac311e6
+    m_Address: Scene_jiaotupingyuan_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: e00b6e5d3d58edd4fbe122ab8196a283
+    m_Address: Scene_wamugaodi_x.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 27a236c9ac16cb54396583131804b43c
+    m_Address: Scene_fuguangta01.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: dfb49eea68e014d45a822a52be6f5437
+    m_Address: Scene_toptower.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 681613daf149c9046b6ee00ec074bfdf
+    m_Address: Scene_JFDX_y.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 81684d2db16cb4448b7038918922a276
+    m_Address: Scene_prontera_sd_y.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 6a7fd1814dce83d4e8496426e70a828b
+    m_Address: scene_maze_01_y.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 9fe76c4b27719ca44bad9940b019fac6
+    m_Address: Scene_SKLSM_y.unity
    m_ReadOnly: 0
    m_SerializedLabels: []
    FlaggedDuringContentUpdateRestriction: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_BundledAssetGroupSchema.asset
@ -0,0 +1,45 @@
+%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: IconsShopIconClubLimited_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: f2ef8af74d87cf247a7ab0e531b3b592, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 309e321e4354b5d45a04154c3ac699dc
+  m_LoadPath:
+    m_Id: 908e2dd043316ef429ea068e0a688905
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_BundledAssetGroupSchema.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 437cc307f283a0a4fa61cd85f7358b95
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_ContentUpdateGroupSchema.asset
@ -0,0 +1,16 @@
+%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: IconsShopIconClubLimited_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: f2ef8af74d87cf247a7ab0e531b3b592, type: 2}
+  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconClubLimited_ContentUpdateGroupSchema.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bbed8e7ac9ce0f94bb407e1c80b6b899
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_BundledAssetGroupSchema.asset
@ -0,0 +1,45 @@
+%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: IconsShopIconMarket_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 4dc851f15ca21c043b4cb28c1c03192b, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_UseUWRForLocalBundles: 0
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 309e321e4354b5d45a04154c3ac699dc
+  m_LoadPath:
+    m_Id: 908e2dd043316ef429ea068e0a688905
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 0
+  m_AssetLoadMode: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_BundledAssetGroupSchema.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93f44a72cfc82ac4da9b2d4c386f4c05
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_ContentUpdateGroupSchema.asset
@ -0,0 +1,16 @@
+%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: IconsShopIconMarket_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 4dc851f15ca21c043b4cb28c1c03192b, type: 2}
+  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconMarket_ContentUpdateGroupSchema.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7d9905c3b66052442baa029826347488
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_BundledAssetGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_BundledAssetGroupSchema.asset
@ -10,9 +10,9 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
-  m_Name: Packed Assets_BundledAssetGroupSchema
+  m_Name: IconsShopIconShop_BundledAssetGroupSchema
  m_EditorClassIdentifier: 
-  m_Group: {fileID: 11400000, guid: 27920d2b4e2677a44aacb62c3353b8b8, type: 2}
+  m_Group: {fileID: 11400000, guid: b223b945d56ac9f4e9a31a24b76bcddd, type: 2}
  m_InternalBundleIdMode: 1
  m_Compression: 1
  m_IncludeAddressInCatalog: 1
@ -37,7 +37,7 @@ MonoBehaviour:
    m_Id: 309e321e4354b5d45a04154c3ac699dc
  m_LoadPath:
    m_Id: 908e2dd043316ef429ea068e0a688905
-  m_BundleMode: 1
+  m_BundleMode: 0
  m_AssetBundleProviderType:
    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_BundledAssetGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_BundledAssetGroupSchema.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03fa4f989107ec54baa22116a2b5cbe2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_ContentUpdateGroupSchema.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_ContentUpdateGroupSchema.asset
@ -10,7 +10,7 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
-  m_Name: IconsShopIcon_ContentUpdateGroupSchema
+  m_Name: IconsShopIconShop_ContentUpdateGroupSchema
  m_EditorClassIdentifier: 
-  m_Group: {fileID: 11400000, guid: 27920d2b4e2677a44aacb62c3353b8b8, type: 2}
+  m_Group: {fileID: 11400000, guid: b223b945d56ac9f4e9a31a24b76bcddd, type: 2}
  m_StaticContent: 0
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_ContentUpdateGroupSchema.asset.meta
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/IconsShopIconShop_ContentUpdateGroupSchema.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 47d6a24b0e8e9614c93e9aa0e653f777
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Content/Icons/ShopIcons/img_club_limited_banner02.png.meta
+++ b/Assets/Content/Icons/ShopIcons/img_club_limited_banner02.png.meta
@ -3,7 +3,7 @@ guid: 03762ea89e4410741b173487ddea294e
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
-  serializedVersion: 11
+  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
@ -62,7 +63,9 @@ TextureImporter:
  compressionQualitySet: 0
  textureFormatSet: 0
  ignorePngGamma: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
@ -74,46 +77,24 @@ TextureImporter:
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
+    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
-  - 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: 1
-  - 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: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Standalone
    maxTextureSize: 2048
    resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 12
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
+    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
-    buildTarget: Windows Store Apps
+    buildTarget: WebGL
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
@ -122,8 +103,35 @@ TextureImporter:
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
+    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@ -138,9 +146,8 @@ TextureImporter:
    weights: []
    secondaryTextures: []
    nameFileIdTable: {}
-  spritePackingTag: ShopIconsAtlas
+  mipmapLimitGroupName: 
  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Lua/Config/RuneShopLimitCfg.lua
+++ b/Assets/Lua/Config/RuneShopLimitCfg.lua
--- a/Assets/Lua/Managers/NetManager.lua
+++ b/Assets/Lua/Managers/NetManager.lua
@ -22,7 +22,7 @@ end

 --向服务器发送消息...
 function NetManager:SendMessage(id, data)
-    LogError("Send msgId : " .. id);
+    --LogError("Send msgId : " .. id);

 	local connectStatus = self:GetConnectStatus()
 	if not connectStatus then
--- a/Assets/Lua/Managers/UIFuncUnlockMgr.lua
+++ b/Assets/Lua/Managers/UIFuncUnlockMgr.lua
@ -233,7 +233,7 @@ function UIFuncUnlockMgr:NormalLock(wnd, data, target, result, key, guideState,
        local rectTrans = go:GetOrAddComponent(Enum.TypeInfo.RectTransform)
        rectTrans.sizeDelta = targetSize

-        go:GetOrAddComponent(Enum.TypeInfo.UIRaycastNoDraw)
+        --go:GetOrAddComponent(Enum.TypeInfo.UIRaycastNoDraw)
        go:GetOrAddComponent(Enum.TypeInfo.Button)
    end
    if lockBtn == nil and go ~= nil then
@ -251,7 +251,7 @@ function UIFuncUnlockMgr:NormalLock(wnd, data, target, result, key, guideState,
        local rectTrans = go:GetOrAddComponent(Enum.TypeInfo.RectTransform)
        rectTrans.sizeDelta = targetSize

-        go:GetOrAddComponent(Enum.TypeInfo.UIRaycastNoDraw)
+        --go:GetOrAddComponent(Enum.TypeInfo.UIRaycastNoDraw)
        go:GetOrAddComponent(Enum.TypeInfo.Button)
    end
    if lockBubble == nil and go ~= nil then
--- a/Assets/Src/Core/Resource/AssetsMgr.cs
+++ b/Assets/Src/Core/Resource/AssetsMgr.cs
@ -1044,7 +1044,8 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
        yield return ao;
        ao = null;
        */
-        var path = $"Assets/Scenes/{levelName}/{levelName}.unity";
+        //var path = $"Assets/Scenes/{levelName}/{levelName}.unity";
+        var path = $"{levelName}.unity";
        var loadHandle = Addressables.LoadSceneAsync(path, LoadSceneMode.Single);
        yield return loadHandle;
    }
@ -1306,10 +1307,11 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
                    }

                    //Sprite sp = UnityEditor.AssetDatabase.LoadAssetAtPath<Sprite>(path);
+                    var currAssetName = assetName[i];
                    Addressables.LoadAssetAsync<Sprite>(path).Completed += handle =>
                    {
+                        assetDict[currAssetName] = handle.Result;
                        loadCount++;
-                        assetDict[assetName[i]] = handle.Result;
                    };
                }
            }
@ -1378,13 +1380,14 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
                                path = string.Format("{0}", assetName[i]);
                            
                            Debug.Log($"TextAsset: Load, {path}");
+                            var currAssetName = assetName[i];
                            Addressables.LoadAssetAsync<TextAsset>(path).Completed += handle =>
                            {
                                Debug.Log($"TextAsset: Load Finish, {handle.Result.name}");
                                if (handle.Result != null)
                                {
                                    loadCount++;
-                                    assetDict[assetName[i]] = handle.Result;
+                                    assetDict[currAssetName] = handle.Result;
                                }
                                else
                                {
--- a/Assets/Src/Core/Scene/SceneMgr.cs
+++ b/Assets/Src/Core/Scene/SceneMgr.cs
@ -84,14 +84,15 @@ public class SceneMgr : Singleton<SceneMgr>
        mLoadingScenes.Add(mainSceneName);
        isLoadingScene = true;

-#if UNITY_EDITOR
-        if (!Constants.AssetbundleMode)
-            GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneLocalAssetData(mainSceneName));
-        else
-            GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneAssetbundle(mainSceneName));
-#else
-            GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneAssetbundle(mainSceneName));
-#endif
+        GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneAssetbundle(mainSceneName));
+// #if UNITY_EDITOR
+//         if (!Constants.AssetbundleMode)
+//             GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneLocalAssetData(mainSceneName));
+//         else
+//             GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneAssetbundle(mainSceneName));
+// #else
+//             GameMgr.Instance.StartCoroutine(AssetsMgr.Instance.LoadSceneAssetbundle(mainSceneName));
+// #endif
    }

    public void AsyncLoadAdditiveScene(string sceneName)
--- a/Assets/Src/GameLogic/Battle/FighterManager/BattlePrepareManager.cs
+++ b/Assets/Src/GameLogic/Battle/FighterManager/BattlePrepareManager.cs
@ -79,9 +79,15 @@ public class BattlePrepareManager : Singleton<BattlePrepareManager>
            return mEffectDataCache[id];
    }

+    void DisablePreLoad()
+    {
+        mPrecacheAssets.Clear();
+    }
 
    public void StartLoad()
    {
+        DisablePreLoad();
+        
        foreach (var p in mPrecacheAssets)
        {
            if(p.Value.Count > 0)
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -81,7 +81,7 @@ PlayerSettings:
  androidAutoRotationBehavior: 1
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
-  runInBackground: 0
+  runInBackground: 1
  captureSingleScreen: 0
  muteOtherAudioSources: 0
  Prepare IOS For Recording: 0
@ -178,7 +178,7 @@ PlayerSettings:
  AndroidTargetSdkVersion: 0
  AndroidPreferredInstallLocation: 1
  aotOptions: 
-  stripEngineCode: 0
+  stripEngineCode: 1
  iPhoneStrippingLevel: 0
  iPhoneScriptCallOptimization: 0
  ForceInternetPermission: 0
Author	SHA1	Message	Date
fatiao	14dd82ee0c	11	2025-03-10 20:18:32 +08:00
fatiao	b8f60c6ba8	把所有Scene加入到Addressable中	2025-03-10 20:17:56 +08:00
fatiao	235d9f79a2	加载其他场景的问题，levelName为key去获取scene；	2025-03-10 14:06:29 +08:00
fatiao	f793ce4c9e	礼包名字，大小写的Bug	2025-03-09 15:08:08 +08:00
fatiao	1bf43e95d0	去掉UIRaycastNoDraw组件，这个组件会造成： MissingComponentException: There is no 'CanvasRenderer' attached to the "btn" game object, but a script is trying to access it.	2025-03-09 12:36:37 +08:00
fatiao	4db90bfa24	去掉无用日志	2025-03-08 16:11:57 +08:00
fatiao	ffbdabb1f7	试着不缓存特效，减少加载时间	2025-03-08 10:24:44 +08:00