diff --git a/Assets/AddressableAssetsData/AssetGroups/GameUIRes.asset b/Assets/AddressableAssetsData/AssetGroups/GameUIRes.asset
index c113e293b..96ca166ec 100644
--- a/Assets/AddressableAssetsData/AssetGroups/GameUIRes.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/GameUIRes.asset
@@ -97,11 +97,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: e91ce9a55756d2b48816ed646cebaa01
- m_Address: Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
diff --git a/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset b/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset
index 8bba45efb..a105fa2aa 100644
--- a/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/HomeUIRes.asset
@@ -17,81 +17,101 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 9c5deb37dc4f7554bad33e89eb9c647d
m_SerializeEntries:
- - m_GUID: 088522f6ab180d8428684f59101c27e6
- m_Address: Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 08d458f342e1e95458915d1720dd46fb
m_Address: Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 163483def0deb6e4d84097a08e1d9c06
- m_Address: Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 18b62048e4447b449bbc09db54c1cef8
- m_Address: Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1a0ff34367f8a86478f35a39df6bc090
m_Address: Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 25b14224e3c382d4b8c5a28cd38cbc9f
- m_Address: Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2ae29ff90f8f1ba42aafd95293932c59
m_Address: Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 335497b5bb57eba4595b1ae2c031b2d7
+ m_Address: Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3712c1898126eac448acd0c68c72be19
m_Address: Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 3bac2252792e5b94a955e6215be09800
+ m_Address: Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 47c83c32cd8a2e247a31ae49ef81858e
m_Address: Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 51e3c210c1ed092489040fd004e7f95c
+ m_Address: Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 53ade1c7d9fc9ce4bb99bdd665dfdb5c
m_Address: Assets/MyGame/aa/UI/Home/Sub/SafeBox.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 541b6e0e93c00dc48aeb9fcacd5d5ffc
+ m_Address: Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 615d0370ce52f5e4da8f89e9db658ea6
+ m_Address: Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62bda8aec1cfb1749aadcfe3ef48ee05
m_Address: Assets/MyGame/aa/UI/Home/Sub/MonthCardPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 68cd6b9da3e948543aed50a87dd19877
+ m_Address: Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 729b052bd9ff1f440a8ce5cbf98bee7c
+ m_Address: Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7632b2940005e1e4ea0f2e053bb1a9dc
m_Address: Assets/MyGame/aa/UI/Home/Sub/Hl_Act_RebateView Variant.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 88a8ea2b4497ccc4da556da155846856
- m_Address: Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas
+ - m_GUID: 76ffd083af8aba64a959137b434da95d
+ m_Address: Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 89ec95a1d19d8f44ab70893a47736162
- m_Address: Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas
+ - m_GUID: 82678de61a6c53e478fac60a17f487b9
+ m_Address: Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 887c429078017eb43b4051f461bbcb0a
+ m_Address: Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -107,16 +127,6 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 8ed41ceef1b32a94699730a9f40afcd0
- m_Address: Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 931a8e5456105454a8fef5a8fa68bbc0
- m_Address: Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9351da778e1c18c4f9243b73d7569c66
m_Address: Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
m_ReadOnly: 0
@@ -129,34 +139,29 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 996d5c43a6d22994b9403bdb25557c33
- m_Address: Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 9d455e455fe29e048afb5769487767eb
- m_Address: Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9f5ad7a1381056946a3a0eceb700adbc
m_Address: Assets/MyGame/aa/UI/Home/Sub/AnnouncementPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: ab7e2b42930562146aa2329780229a51
- m_Address: Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas
+ - m_GUID: b2e0d1772a1bac84f95042e605786fd3
+ m_Address: Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: b8e8bed78464a414f804ffd2235c156d
- m_Address: Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas
+ - m_GUID: b3acd0f789fc3014b8aefc41c08b4641
+ m_Address: Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: c464ce6895834c640a1c1287728650fd
- m_Address: Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas
+ - m_GUID: ba3e65b39c671aa4aa1a47144a03d475
+ m_Address: Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: bca57154ec9d42b4da8d24a842d34d1f
+ m_Address: Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -166,8 +171,8 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: c6e7e9003527a9a47b1b8ab5596df5db
- m_Address: Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas
+ - m_GUID: c4a8a0aff72ccd24ab85ccc3d122cfc7
+ m_Address: Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -177,13 +182,8 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: caab81c7c91cb9241aa36db93df9ce3d
- m_Address: Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: d0eb7647538a76044a6afd32bb30533a
- m_Address: Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas
+ - m_GUID: d860535796d63e94cbf755f709b14ebd
+ m_Address: Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -193,13 +193,8 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: d9f7b6cb7a5e09944bc0a576f3a0822e
- m_Address: Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels: []
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: e20704fd65513ed489090f1e9c15114f
- m_Address: Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas
+ - m_GUID: e11eb58143dab694795b82e132c2e3f3
+ m_Address: Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
@@ -209,6 +204,11 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: ed4e73e53df283f4a81a4fa52a1aa5d5
+ m_Address: Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f11b7edd13b4a7c4fbe9ec65d48a1c4d
m_Address: Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab
m_ReadOnly: 0
@@ -227,6 +227,11 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: fc7c116a291abba4981235b93ac1f8a2
+ m_Address: Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
diff --git a/Assets/AddressableAssetsData/AssetGroups/TurretChiBangZhanShenRes.asset b/Assets/AddressableAssetsData/AssetGroups/TurretChiBangZhanShenRes.asset
index 4f824cf0b..45e53ff22 100644
--- a/Assets/AddressableAssetsData/AssetGroups/TurretChiBangZhanShenRes.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/TurretChiBangZhanShenRes.asset
@@ -31,27 +31,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 03de765eedf0f1247887cf2e9a4daf35
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17005.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 0508b432151cafb488105a9c157dad8d
- m_Address: Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 0866d7cf8d02e054098a519554ef8a43
- m_Address: Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 10f1005c96f2cf44795a0b4c01c59b2f
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17033.prefab
m_ReadOnly: 0
@@ -59,6 +38,13 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 1292f697d07907747a8c024593d94d06
+ m_Address: Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - Default
+ - PTCBZS
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1298253843d855a43b6aee9eda2e493a
m_Address: Assets/MyGame/aa/Game/ZhanShen/SunWuKong/display_wargod_14902_0_dev.prefab
m_ReadOnly: 0
@@ -80,13 +66,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 171c124c1d6ab2941b0f8823fa60d526
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17033.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 172c414eb218e894fbe3a7b79020e949
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11027.prefab
m_ReadOnly: 0
@@ -122,13 +101,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 1ec5bcf9142fcc542a2963649b135804
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17040.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 21c3cfbe111f79f45af184f3c81e3979
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11009.prefab
m_ReadOnly: 0
@@ -150,13 +122,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 26d0bee55e9a6054f828b26b76f5c5ef
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17023.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 270cf29515c75574a8513c21289ca7d8
m_Address: Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab
m_ReadOnly: 0
@@ -164,13 +129,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 2a06ddc2b6df9454b9b5c8d39117a75b
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17015.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2a7d1166a44e9724c9eb5d8787b6c002
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17019.prefab
m_ReadOnly: 0
@@ -206,34 +164,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 32cdf55c95b4c134da0350097872df65
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17043.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 348d8e5f8160ffd47937310c7ead66bb
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17014.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 364821d288eed2f4d98173e9b0204eca
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17047.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 3d6a02b558c7d1649bc126514a9e65f8
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17004.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4272b3b7ff9df0248bb61549f8858612
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17017.prefab
m_ReadOnly: 0
@@ -248,20 +178,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 43503eff704b97d41ac25c28a3e88881
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17003.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 46867c8c51cf56640b5a0337c9777036
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17021.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 47af3cd36cbd6b44bbb0c77f1935ed95
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17002.prefab
m_ReadOnly: 0
@@ -290,20 +206,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 59ff990509b91d742a1c5942343c87c3
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17009.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 5b04fff8d2b56b34981172ccdce49f3b
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17020.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5f77689521c5f7e42bff3ec9a294569c
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11038.prefab
m_ReadOnly: 0
@@ -311,20 +213,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 621503d5230c4b24fa0b14210443337a
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17034.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 627cf4a5663098a40ba348946f68baaf
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17025.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 639ac6d7a379406469bf3a5f560f14c7
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11034.prefab
m_ReadOnly: 0
@@ -332,13 +220,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 63dadb73d8560bd4f928125809742234
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17013.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 646b01713265d4340af82ae6725364a9
m_Address: Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab
m_ReadOnly: 0
@@ -388,13 +269,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 72008a1238b2b5f48b76ec9f8bb16892
- m_Address: Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 776a79aad71ea1444980187fff29739c
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17040.prefab
m_ReadOnly: 0
@@ -416,20 +290,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 7c3f4b08bdbaf2540b7baf15c749dd8d
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17017.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 7c484709abee44345944dc68126b711c
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17018.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 80d4dec7fc3b19f4c82fc7ab89de6315
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17014.prefab
m_ReadOnly: 0
@@ -465,27 +325,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 863c088e99429f344869e04b240b23d3
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17001.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 86e712b881109e548be6fe63a7ad9fb1
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17044.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 880e680de116b4d4d8fac3a31f99f985
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17022.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8956a6732ec8b45408cf133d27c34c5d
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11018.prefab
m_ReadOnly: 0
@@ -507,20 +346,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 8b968e74f973daf4798f855ab146786b
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17010.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 8ea133904ecd05e47a71995fa7efcdc8
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17008.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8f98d8d48ebc63946aebf446cb9f76f2
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17001.prefab
m_ReadOnly: 0
@@ -542,15 +367,8 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 9274b7593e675454c9644377822df3c8
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17028.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 93cf1663d5965bf4d80cf672d0876bc1
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17026.png
+ - m_GUID: 929f6b85d843e6d4a97ad243b354700d
+ m_Address: Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels:
- Default
@@ -570,13 +388,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 959863a11fd21034bb40d77e59476fcb
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17031.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 970d3d535ffa1c9478288ccba90b9566
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17007.prefab
m_ReadOnly: 0
@@ -584,13 +395,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 996a29fe8f89d284e8b9614d842f3ed1
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17030.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9983bfb61a809e040bab41b01904823c
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11037.prefab
m_ReadOnly: 0
@@ -598,13 +402,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 9a9db9608a2c5c643bb11a5b81643a1e
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17002.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9e05ce7f2fc019f458c55476d32576ec
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11021.prefab
m_ReadOnly: 0
@@ -619,13 +416,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: a1a9b7ab7e8ed234fa3c71e80304d0ec
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17045.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a2059b81779d28d4f8b9cf37a18712c8
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17013.prefab
m_ReadOnly: 0
@@ -654,13 +444,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: a679ef26467ed774d8a9ba9eebfd4036
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17007.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a72d76a718684554181a558687fd113c
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11002.prefab
m_ReadOnly: 0
@@ -688,13 +471,6 @@ MonoBehaviour:
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: aad8eaf3562feb1408ae3b38e3376f4d
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17042.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ab887ccc6b3d08e4f9c2f853064cee9c
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11015.prefab
m_ReadOnly: 0
@@ -702,13 +478,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: ab9dc349303dacd40baedf099a9aa5de
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17037.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: acfbe018b7c73714e8db23f807683af5
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17011.prefab
m_ReadOnly: 0
@@ -730,20 +499,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: b0c2f3bd5eff64141adb44d30c7f1bf0
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17036.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: b0eb338d047310243b4dad1c593386f4
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17019.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b20667aeaed57bc4d83253c93233ef87
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11012.prefab
m_ReadOnly: 0
@@ -800,13 +555,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: bdf809b5cc15f2c43afbb82e6ce47649
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17039.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bf0823cce912f8d4ca50b58effac41cb
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11016.prefab
m_ReadOnly: 0
@@ -814,13 +562,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: c14bf38721dbb154190e83c4a764a1db
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17038.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c2f0865344a970d459ea7df4bebb12fb
m_Address: "Assets/MyGame/aa/Game/Turrets/\u70AE1.prefab"
m_ReadOnly: 0
@@ -835,13 +576,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: c53b74d40436cac4db8899d0959f5d35
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17029.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ca8e87a020a0a794da39ace6272f6dde
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11025.prefab
m_ReadOnly: 0
@@ -849,13 +583,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: ce9d6c8fffba38b4194b4e4694ec0870
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17041.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d19f7605580693d4981f4d346f283bbf
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11031.prefab
m_ReadOnly: 0
@@ -870,15 +597,15 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: d425b75515b1d7b4eb27df2445902c9d
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17025.prefab
+ - m_GUID: d26fe37a57476c64c89f86bb6ba172ae
+ m_Address: Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2
m_ReadOnly: 0
m_SerializedLabels:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: d67909e63b1fede43a61aeb16e1a80d9
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17032.png
+ - m_GUID: d425b75515b1d7b4eb27df2445902c9d
+ m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17025.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
@@ -898,13 +625,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: d9fbfa83d49f2e748aca525ca409e482
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17035.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: da88ddb6cf85ea349b3df063dae11b4d
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17044.prefab
m_ReadOnly: 0
@@ -926,13 +646,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: dd9459c351017174da2da6bef012e33d
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17027.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e000a0c844214454b89feeb6353b949a
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17003.prefab
m_ReadOnly: 0
@@ -954,13 +667,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: e0f7145448cd3ec42a5d0843cc075684
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17011.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e0fee6b34ef7d33419fdca2ffc86eafb
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11014.prefab
m_ReadOnly: 0
@@ -968,13 +674,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: e165363b79759074b9cdb3a253341704
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17024.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e4d4569cf411f9243a816ab202ff61c8
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11045.prefab
m_ReadOnly: 0
@@ -982,13 +681,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: e93f4ba58a94580478170c21710a5818
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17012.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: eda37f6d7b7346c41b0c9f9c2e958946
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11044.prefab
m_ReadOnly: 0
@@ -996,13 +688,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: ee5817ea14648ae42be707fe28b60b5c
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17006.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ef798a84e2163954ea19aeb85f69408c
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17023.prefab
m_ReadOnly: 0
@@ -1010,13 +695,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: f3c68cecf1b289b46a99a3687cd02fed
- m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17016.png
- m_ReadOnly: 0
- m_SerializedLabels:
- - Default
- - PTCBZS
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f89888da362a04a41b59becdb8b80d04
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11042.prefab
m_ReadOnly: 0
diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
index 129d6939e..f8a6a8b33 100644
Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ
diff --git a/Assets/Editor/SpineSettings.asset b/Assets/Editor/SpineSettings.asset
index c6a867f18..cff8f87a8 100644
--- a/Assets/Editor/SpineSettings.asset
+++ b/Assets/Editor/SpineSettings.asset
@@ -9,7 +9,7 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b29e98153ec2fbd44b8f7da1b41194e8, type: 3}
+ m_Script: {fileID: 0}
m_Name: SpineSettings
m_EditorClassIdentifier:
defaultScale: 0.01
@@ -19,13 +19,13 @@ MonoBehaviour:
defaultInstantiateLoop: 1
showHierarchyIcons: 1
setTextureImporterSettings: 1
- textureSettingsReference: Assets/Spine/Editor/spine-unity/Editor/ImporterPresets/PMATexturePreset.preset
+ textureSettingsReference:
blendModeMaterialMultiply: {fileID: 0}
blendModeMaterialScreen: {fileID: 0}
blendModeMaterialAdditive: {fileID: 0}
- atlasTxtImportWarning: 0
- textureImporterWarning: 0
- componentMaterialWarning: 0
+ atlasTxtImportWarning: 1
+ textureImporterWarning: 1
+ componentMaterialWarning: 1
autoReloadSceneSkeletons: 1
handleScale: 1
mecanimEventIncludeFolderName: 1
diff --git a/Assets/Editor/TurretAtlasBleedingFix.cs b/Assets/Editor/TurretAtlasBleedingFix.cs
new file mode 100644
index 000000000..653c2a476
--- /dev/null
+++ b/Assets/Editor/TurretAtlasBleedingFix.cs
@@ -0,0 +1,63 @@
+using UnityEditor;
+using UnityEditor.U2D;
+using UnityEngine;
+
+///
+/// 一键修复炮台/翅膀/战神三个图集的边缘渗色（设置存在 .meta 的 SpriteAtlasImporter 里）：
+/// 1) Padding 4 → 8（隔开相邻 sprite，大于 ASTC 压缩块尺寸，根治相邻像素渗色）
+/// 2) 平台压缩 ASTC 6x6 → 4x4（质量档提高，减少压缩糊边/杂边）
+/// 3) 尺寸上限 1024 → 2048（避免整体缩小带来的模糊）
+/// 改动后必须：重建 Addressables 内容 → 重出包。
+///
+public static class TurretAtlasBleedingFix
+{
+ private static readonly string[] Atlases =
+ {
+ "Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2",
+ "Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2",
+ "Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2",
+ };
+
+ [MenuItem("Tools/图集工具/修复炮台三图集边缘渗色")]
+ public static void Fix()
+ {
+ foreach (var path in Atlases)
+ {
+ var importer = AssetImporter.GetAtPath(path) as SpriteAtlasImporter;
+ if (importer == null)
+ {
+ Debug.LogWarning($"[图集修复] 跳过（不是 SpriteAtlasImporter）: {path}");
+ continue;
+ }
+
+ // 1) Padding 4 → 8
+ var packing = importer.packingSettings;
+ packing.padding = 8;
+ importer.packingSettings = packing;
+
+ // 2) 平台压缩与尺寸：ASTC 4x4 + 上限 2048
+ var android = importer.GetPlatformSettings("Android");
+ if (android != null)
+ {
+ android.overridden = true;
+ android.format = TextureImporterFormat.ASTC_4x4;
+ android.maxTextureSize = 2048;
+ importer.SetPlatformSettings(android);
+ }
+ var iphone = importer.GetPlatformSettings("iPhone");
+ if (iphone != null)
+ {
+ iphone.overridden = true;
+ iphone.format = TextureImporterFormat.ASTC_4x4;
+ iphone.maxTextureSize = 2048;
+ importer.SetPlatformSettings(iphone);
+ }
+
+ importer.SaveAndReimport();
+ Debug.Log($"[图集修复] {System.IO.Path.GetFileName(path)} → padding=8, ASTC 4x4, 上限2048");
+ }
+
+ AssetDatabase.Refresh();
+ Debug.Log("[图集修复] 完成 —— 请重建 Addressables 内容后重出包");
+ }
+}
\ No newline at end of file
diff --git a/Assets/Editor/TurretAtlasBleedingFix.cs.meta b/Assets/Editor/TurretAtlasBleedingFix.cs.meta
new file mode 100644
index 000000000..f967ae226
--- /dev/null
+++ b/Assets/Editor/TurretAtlasBleedingFix.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2b39dc75916801143b04a2619782ab66
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index 48752abfe..bb552fcd0 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -579,7 +579,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -587,11 +587,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.x
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 0.78070176
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMin.y
@@ -599,51 +599,51 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.x
- value: 165.4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 720.3
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.x
- value: 165.4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 885.7
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_Pivot.x
@@ -727,147 +727,147 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.x
- value: 165.4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 1216.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.x
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.x
- value: -28
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.x
- value: 165.4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 248.09999
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.x
- value: 165.4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 1051.1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_SizeDelta.x
- value: 306.8
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 484.19998
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_SizeDelta.x
- value: 165.4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_SizeDelta.y
- value: 36
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 82.7
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -18
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 958269219681220773, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 3}
diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs
index 321b071e4..80797e00f 100644
--- a/Assets/MyGame/Scripts/Turret/SitPosData.cs
+++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs
@@ -1427,6 +1427,10 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
currentTurret = null;
}
+ // ⭐ 换炮台：释放上一个炮台的按需引用（引用归零才真正卸包；同编号不释放）
+ if (currentTurretNumber > 0 && currentTurretNumber != turretNumber)
+ TurretResourcesData.ReleaseTurretPrefab(currentTurretNumber);
+
currentTurretNumber = turretNumber;
// ⭐ 散包按需加载：缓存没有时异步取（PT{编号} 标签），完成后实例化
@@ -1435,12 +1439,14 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
/// 炮台加载序号（防加载期间再次切换的竞态）
private int _turretLoadSeq = 0;
+ /// 当前按需加载的翅膀编号（换翅膀/卸下时释放引用）
+ private int _currentWingNumber = 0;
/// 炮台异步按需加载协程：AcquireTurretPrefabAsync 完成后实例化（原同步逻辑后半段）
private IEnumerator LoadTurretRoutine(int turretNumber, int seq)
{
- GameObject prefab = TurretResourcesData.GetTurretPrefab(turretNumber);
- if (prefab == null)
+ // ⭐ 每次都走 Acquire（缓存命中立即返回并正确 +1 引用，多座位共用同一炮台不会互相误卸）
+ GameObject prefab = null;
{
var task = TurretResourcesData.AcquireTurretPrefabAsync(turretNumber);
while (!task.IsCompleted) yield return null;
@@ -1608,10 +1614,21 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
// turretNumber<=0 = 卸下（与战神同一约定）：只清理不加载，不打警告
if (turretNumber <= 0)
{
+ // ⭐ 卸下翅膀：释放按需引用
+ if (_currentWingNumber > 0)
+ {
+ TurretResourcesData.ReleaseTurretPrefab(_currentWingNumber);
+ _currentWingNumber = 0;
+ }
ClearWing();
return;
}
+ // ⭐ 换翅膀：释放上一个的按需引用（引用归零才真正卸包）
+ if (_currentWingNumber > 0 && _currentWingNumber != turretNumber)
+ TurretResourcesData.ReleaseTurretPrefab(_currentWingNumber);
+ _currentWingNumber = turretNumber;
+
// 先清理已有翅膀
ClearWing();
@@ -1622,8 +1639,8 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
/// 翅膀异步按需加载协程（模式同炮台：seq 防竞态）
private IEnumerator LoadWingRoutine(int turretNumber, int seq)
{
- GameObject prefab = TurretResourcesData.GetTurretPrefab(turretNumber);
- if (prefab == null)
+ // ⭐ 每次都走 Acquire（缓存命中立即返回并正确 +1 引用）
+ GameObject prefab = null;
{
var task = TurretResourcesData.AcquireTurretPrefabAsync(turretNumber);
while (!task.IsCompleted) yield return null;
diff --git a/Assets/MyGame/Scripts/fishResources/TurretResources.cs b/Assets/MyGame/Scripts/fishResources/TurretResources.cs
index 0a1787103..04a16e422 100644
--- a/Assets/MyGame/Scripts/fishResources/TurretResources.cs
+++ b/Assets/MyGame/Scripts/fishResources/TurretResources.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceLocations;
using UnityEngine.U2D;
using static UnityEngine.AddressableAssets.Addressables;
@@ -59,9 +60,9 @@ public class TurretResourcesData
/// 战神 prefab 缓存：(编号, 用途) → prefab
private static readonly Dictionary<(int id, ZhanShenUsage usage), GameObject> _zsPrefabCache
= new Dictionary<(int, ZhanShenUsage), GameObject>();
- /// 战神加载句柄：(编号, 用途) → handle（卸载用；LoadAssetsAsync 返回 IList 句柄）
- private static readonly Dictionary<(int id, ZhanShenUsage usage), AsyncOperationHandle>> _zsHandles
- = new Dictionary<(int, ZhanShenUsage), AsyncOperationHandle>>();
+ /// 战神加载句柄：(编号, 用途) → 单资产 handle（卸引用归零时释放，只卸这一项）
+ private static readonly Dictionary<(int id, ZhanShenUsage usage), AsyncOperationHandle> _zsHandles
+ = new Dictionary<(int, ZhanShenUsage), AsyncOperationHandle>();
/// 战神引用计数：(编号, 用途) → 使用中的座位/预览数（归零才真正卸载，防止多座位共用误卸）
private static readonly Dictionary<(int id, ZhanShenUsage usage), int> _zsRefCount
= new Dictionary<(int, ZhanShenUsage), int>();
@@ -80,23 +81,98 @@ public class TurretResourcesData
_zsRefCount[key] = _zsRefCount.TryGetValue(key, out int c) ? c + 1 : 1;
if (_zsPrefabCache.TryGetValue(key, out var cached)) return cached;
- var keys = new List { "ZS" + turretNumber, usage == ZhanShenUsage.GamePlay ? zhanShenGameSubLabel : defaultSubLabel };
- var handle = Addressables.LoadAssetsAsync(keys, null, MergeMode.Intersection);
- await handle.Task;
- if (handle.Status == AsyncOperationStatus.Succeeded && handle.Result != null && handle.Result.Count > 0)
+ // ⭐ 真·按需：位置表定位（只取元数据）→ LoadAssetAsync 只打开该战神自己那一个包
+ string pathName = GetPathName(turretNumber);
+ if (pathName != null)
{
- // 展示/游戏内同名靠标签区分，交集结果取第一个
- _zsPrefabCache[key] = handle.Result[0];
- _zsHandles[key] = handle;
- return handle.Result[0];
+ var map = await (usage == ZhanShenUsage.GamePlay ? GetZsGameLocMapAsync() : GetTurretLocMapAsync());
+ if (map.TryGetValue(pathName, out var loc))
+ {
+ var h = Addressables.LoadAssetAsync(loc);
+ await h.Task;
+ if (h.Status == AsyncOperationStatus.Succeeded && h.Result != null)
+ {
+ // 竞态1：加载期间引用已被释放（已切走）→ 归还句柄，不缓存
+ if (!_zsRefCount.ContainsKey(key))
+ {
+ if (h.IsValid()) Addressables.Release(h);
+ return null;
+ }
+ // 竞态2：加载期间别人已装入同一个 → 归还多余句柄，复用已有的
+ if (_zsPrefabCache.TryGetValue(key, out var raced))
+ {
+ if (h.IsValid()) Addressables.Release(h);
+ return raced;
+ }
+ _zsPrefabCache[key] = h.Result;
+ _zsHandles[key] = h;
+ return h.Result;
+ }
+ if (h.IsValid()) Addressables.Release(h);
+ }
}
- // 加载失败（标签未配置等）：归还引用计数，不缓存句柄
- if (handle.IsValid()) Addressables.Release(handle);
+
+ // 未找到：归还引用计数，不缓存
+ Debug.LogWarning($"[TurretResourcesData] 战神按需加载失败: id={turretNumber} name={pathName ?? "无"} usage={usage}（检查位置表）");
_zsRefCount[key] = c; // 还原为进入时的值
if (_zsRefCount[key] <= 0) _zsRefCount.Remove(key);
return null;
}
+ // ==================== 位置表（真·按需加载，绝不全量） ====================
+ // LoadResourceLocationsAsync 只取"资源位置"元数据：不加载资产、不解压任何包，一次构表缓存；
+ // 之后每个炮台/翅膀/战神 按编号 → 名字 → 位置 → LoadAssetAsync(location)，
+ // 只打开它自己那一个包（组是 PackSeparately，每个 prefab 独立小包）。切换/离房时随引用归零释放。
+ private static Task> _ptLocMapTask; // PTCBZS+Default（炮台/翅膀/战神展示）
+ private static Task> _zsGameLocMapTask; // PTCBZS+ZSYX（战神游戏内）
+ private static Dictionary _idToPathName;
+
+ /// 编号 → 资源名（如 11001 → paotai11001；13002 → display_wargod_14902_0_dev）
+ private static string GetPathName(int id)
+ {
+ if (_idToPathName == null)
+ {
+ _idToPathName = new Dictionary();
+ if (turretPrefabPathDic != null)
+ foreach (var kv in turretPrefabPathDic)
+ _idToPathName[kv.Value] = kv.Key;
+ }
+ return _idToPathName.TryGetValue(id, out var n) ? n : null;
+ }
+
+ private static Task> GetTurretLocMapAsync()
+ => _ptLocMapTask ??= BuildLocMapAsync(new List { turret_AALabel, defaultSubLabel });
+
+ private static Task> GetZsGameLocMapAsync()
+ => _zsGameLocMapTask ??= BuildLocMapAsync(new List { turret_AALabel, zhanShenGameSubLabel });
+
+ /// 按标签交集构建"资源名 → 位置"表（仅元数据，不动资产）
+ private static async Task> BuildLocMapAsync(List labels)
+ {
+ var map = new Dictionary();
+ try
+ {
+ var h = Addressables.LoadResourceLocationsAsync(labels, MergeMode.Intersection, typeof(GameObject));
+ await h.Task;
+ if (h.Status == AsyncOperationStatus.Succeeded && h.Result != null)
+ {
+ foreach (var loc in h.Result)
+ {
+ var name = System.IO.Path.GetFileNameWithoutExtension(loc.PrimaryKey);
+ if (!string.IsNullOrEmpty(name) && !map.ContainsKey(name))
+ map[name] = loc;
+ }
+ }
+ if (h.IsValid()) Addressables.Release(h);
+ }
+ catch (Exception e)
+ {
+ Debug.LogWarning($"[TurretResourcesData] 位置表构建失败: {e.Message}");
+ }
+ Debug.Log($"[TurretResourcesData] 位置表构建完成: {map.Count} 项（仅元数据，未加载资源）");
+ return map;
+ }
+
///
/// ⭐ 按需获取炮台/翅膀 prefab（异步 + 引用计数，标签 PT{编号}，如 PT11001）。
/// 散包模式下启动不再全量加载 prefab，座位装炮台/大厅预览时按需取。
@@ -107,15 +183,38 @@ public class TurretResourcesData
_ptRefCount[turretNumber] = _ptRefCount.TryGetValue(turretNumber, out int c) ? c + 1 : 1;
if (_ptPrefabCache.TryGetValue(turretNumber, out var cached)) return cached;
- var handle = Addressables.LoadAssetsAsync(new List { "PT" + turretNumber }, null, MergeMode.Intersection);
- await handle.Task;
- if (handle.Status == AsyncOperationStatus.Succeeded && handle.Result != null && handle.Result.Count > 0)
+ // ⭐ 真·按需：位置表定位（只取元数据）→ LoadAssetAsync 只打开这一个 prefab 的小包
+ string pathName = GetPathName(turretNumber);
+ if (pathName != null)
{
- _ptPrefabCache[turretNumber] = handle.Result[0];
- _ptHandles[turretNumber] = handle;
- return handle.Result[0];
+ var map = await GetTurretLocMapAsync();
+ if (map.TryGetValue(pathName, out var loc))
+ {
+ var h = Addressables.LoadAssetAsync(loc);
+ await h.Task;
+ if (h.Status == AsyncOperationStatus.Succeeded && h.Result != null)
+ {
+ // 竞态1：加载期间引用已被释放（已切走）→ 归还句柄，不缓存
+ if (!_ptRefCount.ContainsKey(turretNumber))
+ {
+ if (h.IsValid()) Addressables.Release(h);
+ return null;
+ }
+ // 竞态2：加载期间别人已装入同一个 → 归还多余句柄，复用已有的
+ if (_ptPrefabCache.TryGetValue(turretNumber, out var raced))
+ {
+ if (h.IsValid()) Addressables.Release(h);
+ return raced;
+ }
+ _ptPrefabCache[turretNumber] = h.Result;
+ _ptHandles[turretNumber] = h;
+ return h.Result;
+ }
+ if (h.IsValid()) Addressables.Release(h);
+ }
}
- if (handle.IsValid()) Addressables.Release(handle);
+
+ Debug.LogWarning($"[TurretResourcesData] 炮台/翅膀按需加载失败: id={turretNumber} name={pathName ?? "无"}（检查 PTCBZS+Default 标签与位置表）");
_ptRefCount[turretNumber] = c;
if (_ptRefCount[turretNumber] <= 0) _ptRefCount.Remove(turretNumber);
return null;
@@ -133,9 +232,9 @@ public class TurretResourcesData
_ptPrefabCache.Remove(turretNumber);
}
- /// 按需缓存：炮台/翅膀 prefab（PT{编号} 标签）
+ /// 按需缓存：炮台/翅膀 prefab（位置表按需加载）
private static readonly Dictionary _ptPrefabCache = new Dictionary();
- private static readonly Dictionary>> _ptHandles = new Dictionary>>();
+ private static readonly Dictionary> _ptHandles = new Dictionary>();
private static readonly Dictionary _ptRefCount = new Dictionary();
///
@@ -305,51 +404,83 @@ public class TurretResourcesData
// 启动只加载列表小图 Sprite（若 Sprite 与 prefab 同包仍会拉起散包，
// 应把列表小图合入图集 —— 见 SpriteAtlasBuilderWindow 工具）。
- // ---- 加载炮台 Sprite（列表图标，全量保留）----
- var spriteHandle = Addressables.LoadAssetsAsync(labels, data =>
+ // ---- 加载炮台/翅膀/战神图标（图集方式）----
+ // ⭐ 图标已合入图集（PaoTaiSprite/chibangSprite/ZhanShenSprite，均在 AA 组内）。
+ // 按图集资产地址加载 → GetSprites 逐张按名填表；sprite 名 = 原文件名(paotai11001/chibang17005…)。
+ // 用地址加载（不用标签查询）：不会把同组同标签的 prefab 一并拖进内存。
+ string[] atlasAddresses =
{
- if (turretSpritePathDic.TryGetValue(data.name, out int id))
- {
- turretSpriteDic[id] = data;
- }
- }, MergeMode.Intersection);
-
- await spriteHandle.Task;
- // 不释放！保留 Handle 以保持资源存活
- _loadedHandles.Add(spriteHandle);
-
- // ⭐ 图集兜底：列表小图已合入 SpriteAtlas 且 sprite 从组里移除（标签查不到）时，
- // 按图集标签 "TurretAtlas" 加载图集，用 GetSprite(名) 填表。
- // （图集方式下 sprite 仍在图集里保留原名 = prefabTurretResourcesPath）
- if (turretSpriteDic.Count == 0)
+ "Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2",
+ "Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2",
+ "Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2",
+ };
+ var buf = new Sprite[1024];
+ foreach (var addr in atlasAddresses)
{
try
{
- var atlasHandle = Addressables.LoadAssetsAsync("TurretAtlas", null);
+ var atlasHandle = Addressables.LoadAssetAsync(addr);
await atlasHandle.Task;
- if (atlasHandle.Status == AsyncOperationStatus.Succeeded
- && atlasHandle.Result != null && atlasHandle.Result.Count > 0)
+ if (atlasHandle.Status == AsyncOperationStatus.Succeeded && atlasHandle.Result != null)
{
- var atlas = atlasHandle.Result[0];
- foreach (var kv in turretSpritePathDic)
- {
- var sp = atlas.GetSprite(kv.Key);
- if (sp != null)
- turretSpriteDic[kv.Value] = sp;
- }
_loadedHandles.Add(atlasHandle);
- Debug.Log($"[TurretResourcesData] 图集方式加载 Sprite 完成，共 {turretSpriteDic.Count} 个（来自 {atlas.name}）");
+ var atlasObj = atlasHandle.Result;
+ int n = atlasObj.GetSprites(buf);
+ int hit = 0;
+ for (int i = 0; i < n; i++)
+ {
+ var sp = buf[i];
+ if (sp == null) continue;
+ // 规范化名字：去掉同级后缀（如 " (Atlas)"），兼容 V2 打包改名
+ string key = System.Text.RegularExpressions.Regex.Replace(sp.name, @"\s*\(.*\)\s*$", "").Trim();
+ if (turretSpritePathDic.TryGetValue(key, out int id))
+ {
+ turretSpriteDic[id] = sp;
+ hit++;
+ }
+ // 只保留精确匹配：前缀匹配可能把 sprite 串到别的编号上（串图），已移除
+ }
+ Debug.Log($"[TurretResourcesData] 图集 {System.IO.Path.GetFileName(addr)}: 打包 {n} 张, 命中 {hit} 张");
+ }
+ else
+ {
+ Debug.LogWarning($"[TurretResourcesData] 图集加载失败 {addr}: status={atlasHandle.Status}, err={atlasHandle.OperationException?.Message}");
}
}
catch (Exception e)
{
- Debug.LogWarning($"[TurretResourcesData] 图集兜底加载失败（未找到 TurretAtlas 标签的图集？）: {e.Message}");
+ Debug.LogWarning($"[TurretResourcesData] 图集加载跳过 {addr}: {e.Message}");
}
}
- else
+ // ⭐ 编辑器兜底：SpriteAtlas 只在"打包时"才真正 Packed，编辑器 Play 下 GetSprites 返回空
+ // （所以编辑器里图集加载 0 张不是配置错）。编辑器直接用 AssetDatabase 按名字找 sprite，
+ // 仅编辑器编译（#if UNITY_EDITOR），真机走上面的图集路径。
+#if UNITY_EDITOR
+ if (turretSpriteDic.Count == 0)
{
- Debug.Log($"[TurretResourcesData] 炮台 Sprite 加载完成，共 {turretSpriteDic.Count} 个（prefab 已改按需加载）");
+ var byName = new Dictionary();
+ foreach (var guid in UnityEditor.AssetDatabase.FindAssets("t:Sprite"))
+ {
+ var path = UnityEditor.AssetDatabase.GUIDToAssetPath(guid);
+ var baseName = System.IO.Path.GetFileNameWithoutExtension(path);
+ if (!byName.ContainsKey(baseName)) byName[baseName] = path;
+ }
+ foreach (var kv in turretSpritePathDic)
+ {
+ if (turretSpriteDic.ContainsKey(kv.Value)) continue;
+ if (byName.TryGetValue(kv.Key, out var path))
+ {
+ var sp = UnityEditor.AssetDatabase.LoadAssetAtPath(path);
+ if (sp != null) turretSpriteDic[kv.Value] = sp;
+ }
+ }
+ Debug.Log($"[TurretResourcesData] 编辑器兜底加载图标(AssetDatabase): {turretSpriteDic.Count} 张");
}
+#endif
+
+ Debug.Log($"[TurretResourcesData] 图标加载完成: {turretSpriteDic.Count} 张（配置需要 {turretSpritePathDic.Count} 个）");
+ if (turretSpriteDic.Count == 0)
+ Debug.LogError("[TurretResourcesData] 图标一张都没加载到：编辑器请检查 sprite 名字与 tbturretresources 是否对得上；真机请确认三个图集 Inspector 的 Include in Build 已勾选");
}
///
@@ -408,6 +539,9 @@ public class TurretResourcesData
return dic != null && dic.TryGetValue(turretNumber, out var fullLoad) ? fullLoad : null;
}
+ /// 图标字典数量（诊断用）
+ public static int SpriteIconCount => turretSpriteDic != null ? turretSpriteDic.Count : 0;
+
/// 根据 ID 获取炮台 Sprite。
public static Sprite GetTurretSprite(int turretNumber)
{
diff --git a/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas
deleted file mode 100644
index c56755345..000000000
--- a/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas
+++ /dev/null
@@ -1,76 +0,0 @@
-%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: AnnouncementPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 512
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 512
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
- packables:
- - {fileID: 21300000, guid: 7556bd3d3ac032340a38fe47e6c7190c, type: 3}
- - {fileID: 21300000, guid: 52e84d312244a6249947e2aac2c1d524, type: 3}
- - {fileID: 21300000, guid: 02e1c92d0e18eac4bb47516edca65ebe, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 21300000, guid: ae15ffe74c8ae4e49840d49e49f26adf, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: AnnouncementPanel
- m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas.meta
deleted file mode 100644
index 238adb907..000000000
--- a/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ab7e2b42930562146aa2329780229a51
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2 b/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2
new file mode 100644
index 000000000..090c2ae17
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2
@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
+ packables:
+ - {fileID: 21300000, guid: 7556bd3d3ac032340a38fe47e6c7190c, type: 3}
+ - {fileID: 21300000, guid: 52e84d312244a6249947e2aac2c1d524, type: 3}
+ - {fileID: 21300000, guid: 02e1c92d0e18eac4bb47516edca65ebe, type: 3}
+ - {fileID: 21300000, guid: ae15ffe74c8ae4e49840d49e49f26adf, type: 3}
+ m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..cbbd64899
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: e11eb58143dab694795b82e132c2e3f3
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 512
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 512
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas.meta
deleted file mode 100644
index 87fa814c5..000000000
--- a/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d9f7b6cb7a5e09944bc0a576f3a0822e
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas b/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2
similarity index 66%
rename from Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2
index e3c5e7216..43904b4bb 100644
--- a/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: BackPack
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 8a095ebb93c64e24bad8eab9877cd6af, type: 3}
- {fileID: 21300000, guid: b195257f6ee34ec4989c7f60fbc9d58b, type: 3}
@@ -65,7 +18,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 7843db90bf174f648a10de356bce5ce6, type: 3}
- {fileID: 21300000, guid: 40cf62ef07420f848aa4642a4b270a44, type: 3}
- {fileID: 21300000, guid: 3efa65001f1525149882895837c99091, type: 3}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: b83127f63610264438d4c68b8db3b8ef, type: 3}
- {fileID: 21300000, guid: 9db23b38e63493449a9b82e39a6ab6eb, type: 3}
- {fileID: 21300000, guid: 006aec921d5657547b4cf5c386ab1172, type: 3}
@@ -102,13 +54,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 32ab8ae0058c99f4586ff579861420d0, type: 3}
- {fileID: 21300000, guid: cccac98275f19814fb8a4af18f21ac84, type: 3}
- {fileID: 21300000, guid: 167752498b4812441b74deaabfe99f2c, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: BackPack
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2.meta
new file mode 100644
index 000000000..3544fb3d8
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 615d0370ce52f5e4da8f89e9db658ea6
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas.meta
deleted file mode 100644
index 8f208cab2..000000000
--- a/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ed41ceef1b32a94699730a9f40afcd0
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2
similarity index 50%
rename from Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2
index 69aaaadff..1a7633566 100644
--- a/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: EmailPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: c3dd93bc62aecbf4cac13565451aa325, type: 3}
- {fileID: 21300000, guid: 91fb840b6f2b9d84f973715a45eecaba, type: 3}
@@ -68,8 +21,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: b4d9efb042d45ef47b760f879131437f, type: 3}
- {fileID: 21300000, guid: a242656fbea71304aa675a1c14f331bf, type: 3}
- {fileID: 21300000, guid: 8d9011599e59440458c896b86b3c8d82, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: aff05b203cf64584999076d5b6e0c3c8, type: 3}
- {fileID: 21300000, guid: cf0cb3d5b36ef1e49b8d112c3c9f0cf2, type: 3}
- {fileID: 21300000, guid: 2d2cb8301c8b97844bf832fbc2ce5f45, type: 3}
@@ -77,20 +28,10 @@ SpriteAtlas:
- {fileID: 21300000, guid: 16dc7622ac484a54389a51eb59fef1b5, type: 3}
- {fileID: 21300000, guid: fe59c991db353b847889dd2bdcc159b8, type: 3}
- {fileID: 21300000, guid: 3fde46f3e7ee9874cbaafbf404ccf442, type: 3}
- - {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 00d757be6e39c5549a0d810b628ebeee, type: 3}
- {fileID: 21300000, guid: 162e3e49d5f8d6547aa59674ab14902c, type: 3}
- {fileID: 21300000, guid: 33807cab94b870b40a63c684485f25f7, type: 3}
- {fileID: 21300000, guid: cf0fa2be7c5ff1b49b4e0a6cdd696273, type: 3}
- {fileID: 21300000, guid: 7c1346b9d5862554a8c06dd016b8cad6, type: 3}
- {fileID: 21300000, guid: 025720fe726409a4d93fccf80cc8e778, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: EmailPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..4396ec43a
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 68cd6b9da3e948543aed50a87dd19877
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas.meta
deleted file mode 100644
index 6d9326ec1..000000000
--- a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e91ce9a55756d2b48816ed646cebaa01
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2
similarity index 82%
rename from Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2
index 6e68c0704..89a770c15 100644
--- a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: GameMainPanel_FLZY
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: -1986444538, guid: e4884ef5d8eecb044a36f3c68f0987fe, type: 3}
- {fileID: -1283488398, guid: e4884ef5d8eecb044a36f3c68f0987fe, type: 3}
@@ -67,7 +20,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 8292e311b6f082c44b3f1ff9147d5fb3, type: 3}
- {fileID: 922454153, guid: e4884ef5d8eecb044a36f3c68f0987fe, type: 3}
- {fileID: 1010707729, guid: e4884ef5d8eecb044a36f3c68f0987fe, type: 3}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 53f8dcff92e8130428cc7b219c5293f3, type: 3}
- {fileID: -2055167785, guid: 11acd4c88fd6fd14ea03352d1dff0ca3, type: 3}
- {fileID: 21300000, guid: f761ed9049d0f1c4eac2b394b5ef587e, type: 3}
@@ -160,7 +112,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 6a174bffcb424e84e98afac2f40a4374, type: 3}
- {fileID: 21300000, guid: 0e34e5e6415274d4aa785c6a5fcb8f07, type: 3}
- {fileID: 21300000, guid: 722aef05e92a69546ba7ac844aff3657, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 070997230449c4e4d80341fe41a6b6bc, type: 3}
- {fileID: 21300000, guid: c8aad566c8a344b47984115c76a692c8, type: 3}
- {fileID: 21300000, guid: 9412ebb2ae0fb6e4e88ead9cdf1d3b94, type: 3}
@@ -171,13 +122,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 8df00905cfe2fdf46ac3cc533936bbec, type: 3}
- {fileID: 21300000, guid: 993c055ed2062b44f989b314873ef95a, type: 3}
- {fileID: 21300000, guid: 16da846f90f3a7e4d9328e5c37f56662, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: GameMainPanel_FLZY
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta
new file mode 100644
index 000000000..ea20561ff
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 729b052bd9ff1f440a8ce5cbf98bee7c
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ 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
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas b/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas
deleted file mode 100644
index 88ba37cdf..000000000
--- a/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas
+++ /dev/null
@@ -1,87 +0,0 @@
-%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: Hl_Act_RebateView Variant
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
- packables:
- - {fileID: 21300000, guid: 68e14ac86fade5d4ba23dbf590d19aba, type: 2}
- - {fileID: 21300000, guid: 5248c4defd6eae945b872f0b7a8b3048, type: 2}
- - {fileID: 21300000, guid: 78caa86919436474a846e69a31fd735e, type: 2}
- - {fileID: 21300000, guid: d5497dc793ea0224890d4069be66440e, type: 2}
- - {fileID: 21300000, guid: 1459beeb978fe08458826901d7f07136, type: 2}
- - {fileID: 21300000, guid: 194af578b26250a4f88c4c77ca56f9bc, type: 2}
- - {fileID: 21300000, guid: 957d99ff4327fbc44b5af37d0e4e378f, type: 2}
- - {fileID: 21300000, guid: a6da48ce070e7f847a45cb70b7fcca3f, type: 2}
- - {fileID: 21300000, guid: 9c1d9831eb3583140b1605f406290bf3, type: 2}
- - {fileID: 21300000, guid: f8f3465cc74eb6a428916ece3a791690, type: 2}
- - {fileID: 21300000, guid: 4424d706df0f80b4dacf0fe05f211b30, type: 2}
- - {fileID: 21300000, guid: 8b299b3a8ac615546afd7844ead24560, type: 2}
- - {fileID: 21300000, guid: 282422505bde9f748a4fb4f3d11bd0a9, type: 2}
- - {fileID: 21300000, guid: 49d360106fe57714b99efcb65d5949e2, type: 2}
- - {fileID: 21300000, guid: dd3504da52e971d4cb7dbf8535df9b51, type: 2}
- - {fileID: 21300000, guid: 7c815c3a94701eb4db57eda5096f714f, type: 2}
- - {fileID: 21300000, guid: 431a6689f1263b2479e94923116c613d, type: 2}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: Hl_Act_RebateView Variant
- m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas.meta
deleted file mode 100644
index 98e3155c4..000000000
--- a/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e20704fd65513ed489090f1e9c15114f
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2 b/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2
new file mode 100644
index 000000000..7fbd36dcf
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2
@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
+ packables:
+ - {fileID: 21300000, guid: 68e14ac86fade5d4ba23dbf590d19aba, type: 2}
+ - {fileID: 21300000, guid: 5248c4defd6eae945b872f0b7a8b3048, type: 2}
+ - {fileID: 21300000, guid: 78caa86919436474a846e69a31fd735e, type: 2}
+ - {fileID: 21300000, guid: d5497dc793ea0224890d4069be66440e, type: 2}
+ - {fileID: 21300000, guid: 1459beeb978fe08458826901d7f07136, type: 2}
+ - {fileID: 21300000, guid: 194af578b26250a4f88c4c77ca56f9bc, type: 2}
+ - {fileID: 21300000, guid: 957d99ff4327fbc44b5af37d0e4e378f, type: 2}
+ - {fileID: 21300000, guid: a6da48ce070e7f847a45cb70b7fcca3f, type: 2}
+ - {fileID: 21300000, guid: 9c1d9831eb3583140b1605f406290bf3, type: 2}
+ - {fileID: 21300000, guid: f8f3465cc74eb6a428916ece3a791690, type: 2}
+ - {fileID: 21300000, guid: 4424d706df0f80b4dacf0fe05f211b30, type: 2}
+ - {fileID: 21300000, guid: 8b299b3a8ac615546afd7844ead24560, type: 2}
+ - {fileID: 21300000, guid: 282422505bde9f748a4fb4f3d11bd0a9, type: 2}
+ - {fileID: 21300000, guid: 49d360106fe57714b99efcb65d5949e2, type: 2}
+ - {fileID: 21300000, guid: dd3504da52e971d4cb7dbf8535df9b51, type: 2}
+ - {fileID: 21300000, guid: 7c815c3a94701eb4db57eda5096f714f, type: 2}
+ - {fileID: 21300000, guid: 431a6689f1263b2479e94923116c613d, type: 2}
+ m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2.meta
new file mode 100644
index 000000000..81f3adaf9
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 76ffd083af8aba64a959137b434da95d
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas.meta
deleted file mode 100644
index 3d3a4aa26..000000000
--- a/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 088522f6ab180d8428684f59101c27e6
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2
similarity index 57%
rename from Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2
index c6e08ec21..94249ee94 100644
--- a/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: JJJPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 9fc2182878f373e438872e9bab149919, type: 3}
- {fileID: 21300000, guid: 24016d3539889e9458e0fb4342c10296, type: 3}
@@ -73,8 +26,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: cab4ae96ae1d0d643a8913fd6841c5dd, type: 3}
- {fileID: 21300000, guid: 5e89c162cf271cb4cb471f8c6a4b8015, type: 3}
- {fileID: 21300000, guid: e4023c50d4202424d91cfbb5a5196eca, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 10f9faf990e34ad46957f5737d524270, type: 3}
- {fileID: 21300000, guid: af6a2f0794670c5438c36dedc2626261, type: 3}
- {fileID: 21300000, guid: 2b3592a07f7312944a25da8a1c4dd6d5, type: 3}
@@ -90,13 +41,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 0856e9bf17f8a1649ba3daf9d55767da, type: 3}
- {fileID: 21300000, guid: 0fbfd12cbfad4a4449f70d0eb49b6069, type: 3}
- {fileID: 21300000, guid: 12f7ca709378d77409720f7ebe1b69f0, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: JJJPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..92200ad88
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: b3acd0f789fc3014b8aefc41c08b4641
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas b/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas
deleted file mode 100644
index 392e2e032..000000000
--- a/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas
+++ /dev/null
@@ -1,95 +0,0 @@
-%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: MYSelectSit
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
- packables:
- - {fileID: 21300000, guid: e211842a97b89d64a8abad044dc9ae9a, type: 3}
- - {fileID: 21300000, guid: 15bdee2b09a78c54c84c3699d61a7b39, type: 3}
- - {fileID: 21300000, guid: ba4261a119d16cd4fb90bfcd855dc00b, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 21300000, guid: 5bc02f7eca2c63c40a9b88c9418e325f, type: 3}
- - {fileID: 21300000, guid: efe4bcedcb551c2448d3e502385c4769, type: 3}
- - {fileID: 21300000, guid: 84452c3f988d3af469aef6c2faf29eb5, type: 3}
- - {fileID: 21300000, guid: 7aa875deb78f11949b55741d708a349a, type: 3}
- - {fileID: 21300000, guid: 16c1c4966865b684086e0de8c3eab5aa, type: 3}
- - {fileID: 21300000, guid: 1c65c7dd0092cb74ca86ccad69292be8, type: 3}
- - {fileID: 21300000, guid: cbe5587e3b2bf5b43afcd3e270261a4d, type: 3}
- - {fileID: 21300000, guid: 1f1bd8a59ed629d4d860ba28121e481b, type: 3}
- - {fileID: 21300000, guid: a8db9522a14eaa049820584e27bbcd63, type: 3}
- - {fileID: 21300000, guid: b7e014bdc1602fb4abd5f0cb06f705a5, type: 3}
- - {fileID: 21300000, guid: 14b2c6fdb99ff4944a15e4e73eed2f2a, type: 3}
- - {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 21300000, guid: 04501a9b247c5584ebd1ae0b1715852a, type: 3}
- - {fileID: 21300000, guid: 9fc85cf16e7163141b338c5c491d1386, type: 3}
- - {fileID: 21300000, guid: eb6a9093c8e8ffa4a9448a134ce24f8e, type: 3}
- - {fileID: 21300000, guid: 80eb9e6948a60ca4e8e7f90f5fa094ed, type: 3}
- - {fileID: 21300000, guid: 286d05448b5da25429f69c0abdfed078, type: 3}
- - {fileID: 21300000, guid: 4fc43192ce369124abf40734818ac60e, type: 3}
- - {fileID: 21300000, guid: e16be2c5c21d90c4eb0060ddd3f03da7, type: 3}
- - {fileID: 21300000, guid: c93c1d407f341f944914189ed74cf803, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: MYSelectSit
- m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas.meta
deleted file mode 100644
index 0d784e633..000000000
--- a/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d0eb7647538a76044a6afd32bb30533a
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2 b/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2
new file mode 100644
index 000000000..e175e9ccc
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2
@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
+ packables:
+ - {fileID: 21300000, guid: e211842a97b89d64a8abad044dc9ae9a, type: 3}
+ - {fileID: 21300000, guid: 15bdee2b09a78c54c84c3699d61a7b39, type: 3}
+ - {fileID: 21300000, guid: ba4261a119d16cd4fb90bfcd855dc00b, type: 3}
+ - {fileID: 21300000, guid: 5bc02f7eca2c63c40a9b88c9418e325f, type: 3}
+ - {fileID: 21300000, guid: efe4bcedcb551c2448d3e502385c4769, type: 3}
+ - {fileID: 21300000, guid: 84452c3f988d3af469aef6c2faf29eb5, type: 3}
+ - {fileID: 21300000, guid: 7aa875deb78f11949b55741d708a349a, type: 3}
+ - {fileID: 21300000, guid: 16c1c4966865b684086e0de8c3eab5aa, type: 3}
+ - {fileID: 21300000, guid: 1c65c7dd0092cb74ca86ccad69292be8, type: 3}
+ - {fileID: 21300000, guid: cbe5587e3b2bf5b43afcd3e270261a4d, type: 3}
+ - {fileID: 21300000, guid: 1f1bd8a59ed629d4d860ba28121e481b, type: 3}
+ - {fileID: 21300000, guid: a8db9522a14eaa049820584e27bbcd63, type: 3}
+ - {fileID: 21300000, guid: b7e014bdc1602fb4abd5f0cb06f705a5, type: 3}
+ - {fileID: 21300000, guid: 14b2c6fdb99ff4944a15e4e73eed2f2a, type: 3}
+ - {fileID: 21300000, guid: 04501a9b247c5584ebd1ae0b1715852a, type: 3}
+ - {fileID: 21300000, guid: 9fc85cf16e7163141b338c5c491d1386, type: 3}
+ - {fileID: 21300000, guid: eb6a9093c8e8ffa4a9448a134ce24f8e, type: 3}
+ - {fileID: 21300000, guid: 80eb9e6948a60ca4e8e7f90f5fa094ed, type: 3}
+ - {fileID: 21300000, guid: 286d05448b5da25429f69c0abdfed078, type: 3}
+ - {fileID: 21300000, guid: 4fc43192ce369124abf40734818ac60e, type: 3}
+ - {fileID: 21300000, guid: e16be2c5c21d90c4eb0060ddd3f03da7, type: 3}
+ - {fileID: 21300000, guid: c93c1d407f341f944914189ed74cf803, type: 3}
+ m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2.meta
new file mode 100644
index 000000000..d33367b01
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: ed4e73e53df283f4a81a4fa52a1aa5d5
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas.meta
deleted file mode 100644
index a4b9125f0..000000000
--- a/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 25b14224e3c382d4b8c5a28cd38cbc9f
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas b/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2
similarity index 74%
rename from Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2
index e879367e0..bd670b6bf 100644
--- a/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: MainPanelAtlas
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: ffd936755a4b3754ca64ccb8a4039a23, type: 3}
- {fileID: 21300000, guid: 4e748c7439f54944b8ec58c6e0fc9c67, type: 3}
@@ -119,13 +72,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: f53ba0b289a9d1b4c954b43ec3dc1b4f, type: 3}
- {fileID: 21300000, guid: 6f64d15ebfb301546b50ad911656a2b2, type: 3}
- {fileID: 21300000, guid: 0197bfd5ac31f1244afb10fa558db0f1, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: MainPanelAtlas
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2.meta
new file mode 100644
index 000000000..d69bc15c0
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: b2e0d1772a1bac84f95042e605786fd3
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ 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
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas.meta
deleted file mode 100644
index d662a468f..000000000
--- a/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0508b432151cafb488105a9c157dad8d
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas b/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2
similarity index 67%
rename from Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2
index 43b6635e5..042c16f09 100644
--- a/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: PaoTaiSprite
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 2800000, guid: 5bc7ee217f99ebd459216f2c08311bbc, type: 3}
- {fileID: 2800000, guid: f0a59ae3f69ff7b4994056c890bce8e2, type: 3}
@@ -103,13 +56,4 @@ SpriteAtlas:
- {fileID: 2800000, guid: ae29fff35afc8ab4bb5afbe82d009920, type: 3}
- {fileID: 2800000, guid: 756d775cf03c4fb4f8d7cb3654fc79e7, type: 3}
- {fileID: 2800000, guid: e82167568bd20264a8d958000f831d5b, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: PaoTaiSprite
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2.meta
new file mode 100644
index 000000000..9bd93f1f8
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2.meta
@@ -0,0 +1,69 @@
+fileFormatVersion: 2
+guid: 1292f697d07907747a8c024593d94d06
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 48
+ 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: 48
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - 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
+ packingSettings:
+ serializedVersion: 2
+ padding: 8
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas.meta
deleted file mode 100644
index 38964ea70..000000000
--- a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b8e8bed78464a414f804ffd2235c156d
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2
similarity index 52%
rename from Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2
index d2a41566a..fe0016086 100644
--- a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: RankPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: edabddf4c8baeff4198ed6e0a39a59ae, type: 3}
- {fileID: 21300000, guid: 5a9d1b9018ef27e41b5f0d3f498782da, type: 3}
@@ -69,8 +22,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: f39042d3104e8b94d84d025511ef3283, type: 3}
- {fileID: 21300000, guid: 9eaa85f694c6f43438c8fe26df884b57, type: 3}
- {fileID: 21300000, guid: ed61310b0790a1d4780805b51f908221, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 39ade4e3584f0ba498168c240f1f3bd0, type: 3}
- {fileID: 21300000, guid: 484b7c0400a8f9b43bc9f1289c7f308c, type: 3}
- {fileID: 21300000, guid: 05fcecd850012c94db9dfe3425cbf790, type: 3}
@@ -84,13 +35,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 98bc39d827c67bc4b9d0c77f71ae618e, type: 3}
- {fileID: 21300000, guid: 8fc56eb7655c72d47aa4292f20f234d3, type: 3}
- {fileID: 21300000, guid: 0b2afd9e854d0474faff38a5edf1ae44, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: RankPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..a7996b05e
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: c4a8a0aff72ccd24ab85ccc3d122cfc7
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas.meta
deleted file mode 100644
index abb30d4b0..000000000
--- a/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 931a8e5456105454a8fef5a8fa68bbc0
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas b/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2
similarity index 70%
rename from Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2
index 64e1f77bb..26a3a7e8e 100644
--- a/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: SafeBox
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: c276f53f63282f846bf69d544eb9cab1, type: 3}
- {fileID: 21300000, guid: cd5d0d9f318198b41a0b6ef03c616860, type: 3}
@@ -96,8 +49,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 18ccaa67a898c164d83efd676f56faba, type: 3}
- {fileID: 21300000, guid: 1556fb7f5d385a445a91d68bb3be061c, type: 3}
- {fileID: 21300000, guid: 051bed7921b9a7f43965652e16f0a112, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: c7404168171abc94abb8e6baaa8e3b3d, type: 3}
- {fileID: 21300000, guid: 42f556d8a2e66ee4bb26142e777e27d2, type: 3}
- {fileID: 21300000, guid: 832ba3837adc37644b981bcfab7fd06a, type: 3}
@@ -116,13 +67,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 1b227cf2209a60341a09fcc068d3bf2e, type: 3}
- {fileID: 21300000, guid: b91f130211ae3b64994cda2b5ceb0ecc, type: 3}
- {fileID: 21300000, guid: f040affd7dbc0e74dadb3a2e98e5ddec, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: SafeBox
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2.meta
new file mode 100644
index 000000000..b1d1520cb
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 335497b5bb57eba4595b1ae2c031b2d7
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas.meta
deleted file mode 100644
index 7cd563a85..000000000
--- a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 996d5c43a6d22994b9403bdb25557c33
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2
similarity index 68%
rename from Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2
index 372f6feda..c294a7adf 100644
--- a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: SelectRoomPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 8410d5d332b2dda40882701055fba90a, type: 3}
- {fileID: 21300000, guid: 5fe971151aa32f540b25bfd995896afe, type: 3}
@@ -80,7 +33,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 6e045a3820e5b5349ad532f32d1fdfb0, type: 3}
- {fileID: 21300000, guid: e18a14c3bb174eb4b8e55cf48d32e3a0, type: 3}
- {fileID: 21300000, guid: 6b3195f69eabbf445bc3bf6ed8752fe0, type: 3}
- - {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 72b625933f6cd1f48a2fd5310fc1d01f, type: 3}
- {fileID: 21300000, guid: 07e53ec5e9d657744b6d459f20f72f11, type: 3}
- {fileID: 21300000, guid: 72bc676119b4afd4eb4207c5d6634666, type: 3}
@@ -89,8 +41,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: e211842a97b89d64a8abad044dc9ae9a, type: 3}
- {fileID: 21300000, guid: 15bdee2b09a78c54c84c3699d61a7b39, type: 3}
- {fileID: 21300000, guid: ba4261a119d16cd4fb90bfcd855dc00b, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 5bc02f7eca2c63c40a9b88c9418e325f, type: 3}
- {fileID: 21300000, guid: efe4bcedcb551c2448d3e502385c4769, type: 3}
- {fileID: 21300000, guid: 84452c3f988d3af469aef6c2faf29eb5, type: 3}
@@ -102,7 +52,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: a8db9522a14eaa049820584e27bbcd63, type: 3}
- {fileID: 21300000, guid: b7e014bdc1602fb4abd5f0cb06f705a5, type: 3}
- {fileID: 21300000, guid: 14b2c6fdb99ff4944a15e4e73eed2f2a, type: 3}
- - {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 04501a9b247c5584ebd1ae0b1715852a, type: 3}
- {fileID: 21300000, guid: 9fc85cf16e7163141b338c5c491d1386, type: 3}
- {fileID: 21300000, guid: eb6a9093c8e8ffa4a9448a134ce24f8e, type: 3}
@@ -116,13 +65,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 993c055ed2062b44f989b314873ef95a, type: 3}
- {fileID: 21300000, guid: f4b84c67a5ea7d043b89e336900d2cd3, type: 3}
- {fileID: 21300000, guid: 16da846f90f3a7e4d9328e5c37f56662, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: SelectRoomPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..7a0aff755
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: bca57154ec9d42b4da8d24a842d34d1f
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ 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
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas.meta
deleted file mode 100644
index 93847e43c..000000000
--- a/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 18b62048e4447b449bbc09db54c1cef8
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2
similarity index 62%
rename from Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2
index 816338eb7..f7e9b8bff 100644
--- a/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: ServicePanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 9b736cb50ba1f734092a1bf2bf8ad1ad, type: 3}
- {fileID: 21300000, guid: e48b32576620c22478c7dac88250a311, type: 3}
@@ -71,8 +24,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 2907b8f3607f7db4180148cda18d28e2, type: 3}
- {fileID: 21300000, guid: 1e55f5c48e14d7148bd2f4486eaf5cc9, type: 3}
- {fileID: 21300000, guid: fc6286bac5522ed45835c9f5a38ce75a, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: f20938bc9fd3a84438d84ce646ee4e6c, type: 3}
- {fileID: 21300000, guid: be3da82404235264b9b4996bd2c16380, type: 3}
- {fileID: 21300000, guid: 97040e4db6d22cf49a1922b5d5be8f64, type: 3}
@@ -97,13 +48,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 033e648ce1be0e34a822bf5822b003df, type: 3}
- {fileID: 21300000, guid: b42e5ae3c7632694ea234466aeb3d6af, type: 3}
- {fileID: 21300000, guid: bed2db24f9c597745a3f8f743a263336, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: ServicePanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2.meta
new file mode 100644
index 000000000..647aa392c
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 82678de61a6c53e478fac60a17f487b9
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas.meta
deleted file mode 100644
index 27e70e1d3..000000000
--- a/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: caab81c7c91cb9241aa36db93df9ce3d
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2
similarity index 62%
rename from Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2
index 459e83b28..f747cbb43 100644
--- a/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: SettingPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: a83759abeb384bb40845afc467fb254a, type: 3}
- {fileID: 21300000, guid: fcb7f1b62a4d25045a4791b6c68c93f0, type: 3}
@@ -92,13 +45,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 884427a03d5125f4ea6033ca161d98df, type: 3}
- {fileID: 21300000, guid: cb92612423531444f81db07f374b993f, type: 3}
- {fileID: 21300000, guid: de6e3c364ee59474e91c0d50488f0044, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: SettingPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..e3985f7ab
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: d860535796d63e94cbf755f709b14ebd
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas.meta
deleted file mode 100644
index d5a659339..000000000
--- a/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 163483def0deb6e4d84097a08e1d9c06
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2
similarity index 63%
rename from Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2
index 9a4140a4b..d603dcd17 100644
--- a/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: ShopPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 8bb387c810b0d174bb70b1ed7b4cf0a1, type: 3}
- {fileID: 21300000, guid: 75549aab205637c42acbcbb66e2e7dcc, type: 3}
@@ -92,20 +45,9 @@ SpriteAtlas:
- {fileID: 21300000, guid: c44b6bb1300aa5446a4bc801ecc8d699, type: 3}
- {fileID: 21300000, guid: 8b919f7dd7efa4d45803f536562f9f34, type: 3}
- {fileID: 21300000, guid: c7d90f77868267e43bc5aee140119d8c, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 6857f0549cd0c014aaed64d0d007079a, type: 3}
- {fileID: 21300000, guid: d8ed9f5bcb119164bba6f337459455cf, type: 3}
- {fileID: 21300000, guid: a61a001163c962f4aa1655872a3b84be, type: 3}
- {fileID: 21300000, guid: fd4fc35a53acd2d449063fe6d4b2c7f5, type: 3}
- {fileID: 21300000, guid: 0ac87076815c2b64089fb452fe4c14a9, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: ShopPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..6b611fb47
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: fc7c116a291abba4981235b93ac1f8a2
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas.meta
deleted file mode 100644
index 94cc36f41..000000000
--- a/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 88a8ea2b4497ccc4da556da155846856
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2
similarity index 64%
rename from Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2
index 4b90b8bc2..94eb23d1c 100644
--- a/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: TurretPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 1471f0a0cf72dd444a5dfde4db5f6ff3, type: 3}
- {fileID: 21300000, guid: df4357fbdb1734e4b9e12320d738f59e, type: 3}
@@ -76,16 +29,12 @@ SpriteAtlas:
- {fileID: 21300000, guid: bf1b00a084692d940858551b022901e4, type: 3}
- {fileID: 21300000, guid: a52487c0501db6b4b8e684ded0e25eff, type: 3}
- {fileID: 21300000, guid: 863c088e99429f344869e04b240b23d3, type: 3}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 4dbb2a4794a5e994fad631022fd082be, type: 3}
- {fileID: 21300000, guid: 91a53c37f42af4a4fb2768075daddc2a, type: 3}
- {fileID: 21300000, guid: ab764b136b3bdc34fbe79e151b02625e, type: 3}
- {fileID: 21300000, guid: bf29f523458563e4ca7885a9f66b9e0b, type: 3}
- {fileID: 21300000, guid: 62a9cd565ba6d1f43bdcb888f638bfcb, type: 3}
- {fileID: 1880440764, guid: 18dd84a8159dce34398994ca1162f3d6, type: 3}
- - {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 3af3e44433242e649a193259c5d9992e, type: 3}
- {fileID: 21300000, guid: 62ce08dbfb10bf3479ab8e046ddd36be, type: 3}
- {fileID: 21300000, guid: baaed3f4b7d218e4582d7e78a49e5b6f, type: 3}
@@ -106,13 +55,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: d38d7d91446f40a42bf496a07a470673, type: 3}
- {fileID: 21300000, guid: 85aad3df97c7a014a9168cf60068c617, type: 3}
- {fileID: 21300000, guid: a34e53e643074de46bdefd39bd12b703, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: TurretPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..cfaa1ac53
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 887c429078017eb43b4051f461bbcb0a
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas b/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas
deleted file mode 100644
index ffa231341..000000000
--- a/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas
+++ /dev/null
@@ -1,78 +0,0 @@
-%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: UISignView
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 512
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 512
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
- packables:
- - {fileID: 21300000, guid: 14493e694583d0b48a8dd1c2ace902ab, type: 2}
- - {fileID: 21300000, guid: db812770d2c4be04dba63b6b81ac190f, type: 2}
- - {fileID: 21300000, guid: 05b197c38462f054c91c5264a0cd246a, type: 2}
- - {fileID: 21300000, guid: 54e23990e603dc148aa5f63278150706, type: 2}
- - {fileID: 21300000, guid: ca2b54bd6bca2db4b85d5d577abbcc7a, type: 2}
- - {fileID: 21300000, guid: 513bc6e0f87ece949aaaea06edcc9b2d, type: 2}
- - {fileID: 21300000, guid: 5427ec59b4b857345b28b20433abc867, type: 2}
- - {fileID: 21300000, guid: a32b3c9d215a7714b87df595461c4761, type: 2}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: UISignView
- m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas.meta
deleted file mode 100644
index 5b151fa96..000000000
--- a/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c6e7e9003527a9a47b1b8ab5596df5db
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2 b/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2
new file mode 100644
index 000000000..3a3aaa4cb
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
+ packables:
+ - {fileID: 21300000, guid: 14493e694583d0b48a8dd1c2ace902ab, type: 2}
+ - {fileID: 21300000, guid: db812770d2c4be04dba63b6b81ac190f, type: 2}
+ - {fileID: 21300000, guid: 05b197c38462f054c91c5264a0cd246a, type: 2}
+ - {fileID: 21300000, guid: 54e23990e603dc148aa5f63278150706, type: 2}
+ - {fileID: 21300000, guid: ca2b54bd6bca2db4b85d5d577abbcc7a, type: 2}
+ - {fileID: 21300000, guid: 513bc6e0f87ece949aaaea06edcc9b2d, type: 2}
+ - {fileID: 21300000, guid: 5427ec59b4b857345b28b20433abc867, type: 2}
+ - {fileID: 21300000, guid: a32b3c9d215a7714b87df595461c4761, type: 2}
+ m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2.meta
new file mode 100644
index 000000000..36fcfae0e
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 51e3c210c1ed092489040fd004e7f95c
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 512
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 512
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas.meta
deleted file mode 100644
index 3f5c44c69..000000000
--- a/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 89ec95a1d19d8f44ab70893a47736162
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas b/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2
similarity index 73%
rename from Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2
index facfbebeb..2f4e1f7d7 100644
--- a/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: UserInfo
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 4667b3ed369902f46a997b2e5479ecac, type: 3}
- {fileID: 21300000, guid: 82a1fcd2a18e96f4a92b428d26e534d6, type: 3}
@@ -72,7 +25,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 1151dfe4c3af394429e79b65397f7dff, type: 3}
- {fileID: 21300000, guid: b236d11c01bc02445957ee3ec4ea9e62, type: 3}
- {fileID: 21300000, guid: b626f7d583407ef4dbe1e699257a59e1, type: 3}
- - {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 98812c133d22ae44d9d95b5cea958ceb, type: 3}
- {fileID: 21300000, guid: 0f832abd606184344a931a581214e7e4, type: 3}
- {fileID: 21300000, guid: 105262ef2a345fb4f9859583f1b0cb41, type: 3}
@@ -96,7 +48,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 694e7d1b7d1b89d4b9583ae0aa2163d7, type: 3}
- {fileID: 21300000, guid: 079e1d68f856d7a4cb37abf2243cc23a, type: 3}
- {fileID: 21300000, guid: eabbcc787b9769d45b53f439904e87c6, type: 3}
- - {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: c86a6d0953510a340a5821f03f1e23cc, type: 3}
- {fileID: 21300000, guid: 9bbd492aa16b2d841b769da7edfe7e47, type: 3}
- {fileID: 21300000, guid: 0f61d3f6fdb6f904d87e458fd01f7430, type: 3}
@@ -106,8 +57,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: 72a4c61e89cccb744b87a7f8ef41a213, type: 3}
- {fileID: 21300000, guid: 1dedf83728a23664789de0b96f03013b, type: 3}
- {fileID: 21300000, guid: 3da2f60a9f4fd9e4b9170f2a8d884bf6, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: e32e6202b66d8bf46bee8efac00974ea, type: 3}
- {fileID: 21300000, guid: 321c3de7a6c3f1547a67ccee72a881f6, type: 3}
- {fileID: 21300000, guid: a52487c0501db6b4b8e684ded0e25eff, type: 3}
@@ -133,13 +82,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 42cbfa8ec8cabc342a4f3361bcaac825, type: 3}
- {fileID: 21300000, guid: ea127920800796849bbda4b33c6daa7b, type: 3}
- {fileID: 21300000, guid: 0ae5d63e028e99445bcad567537c8bdc, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: UserInfo
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2.meta
new file mode 100644
index 000000000..97d4d5ab1
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: ba3e65b39c671aa4aa1a47144a03d475
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas.meta
deleted file mode 100644
index e3af9768e..000000000
--- a/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c464ce6895834c640a1c1287728650fd
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas b/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2
similarity index 55%
rename from Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2
index 725115d46..8a5fe3043 100644
--- a/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: VIPPanel
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 21300000, guid: 2a27bc3b805ae1a41a0294bab4b5aaa6, type: 3}
- {fileID: 21300000, guid: c18a6e6cd416885438b4b74ba48ed10d, type: 3}
@@ -68,8 +21,6 @@ SpriteAtlas:
- {fileID: 21300000, guid: ce10a0a678caab24b8a590621da8caeb, type: 3}
- {fileID: 21300000, guid: 213059d191ecb3f4caa7802c4c488b30, type: 3}
- {fileID: 21300000, guid: 81c3ea2ac99b7d34b8ce9c957a335d48, type: 3}
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: fe61fa04e49c2f54c89278f107c837e2, type: 3}
- {fileID: 21300000, guid: 847edd5648fb4e447ab52ca97f5e88ba, type: 3}
- {fileID: 21300000, guid: fec912bbc7e922c4c919801a9c64c35d, type: 3}
@@ -87,13 +38,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: eb1e2b2a3c506f241a8a9fbc98b578a5, type: 3}
- {fileID: 21300000, guid: 4bafda7b23580704da04c522462cd9dd, type: 3}
- {fileID: 21300000, guid: 106d182cd5fa11d4d84703d3d5f87d5f, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: VIPPanel
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2.meta
new file mode 100644
index 000000000..25f06f5f7
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 3bac2252792e5b94a955e6215be09800
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 1024
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas.meta
deleted file mode 100644
index 55d3d3d6b..000000000
--- a/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d455e455fe29e048afb5769487767eb
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas b/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2
similarity index 83%
rename from Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2
index 006b198b2..51d383dcf 100644
--- a/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2
@@ -1,65 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: ZhanLing
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- - {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 21300000, guid: 1dbdd7e9bee72d3448e814da828ad2cd, type: 3}
- {fileID: 21300000, guid: ae15ffe74c8ae4e49840d49e49f26adf, type: 3}
- {fileID: 21300000, guid: 0062b65f5cb45f64daa054951c4f6ee0, type: 3}
@@ -179,13 +130,4 @@ SpriteAtlas:
- {fileID: 21300000, guid: 214a14fcbf5b86347b1c14e05792b360, type: 3}
- {fileID: 21300000, guid: 7f05305892bcfdd42b0a525251cbcef7, type: 3}
- {fileID: 21300000, guid: c9102e7817f7bf54fb16024e2fad2d7e, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: ZhanLing
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2.meta
new file mode 100644
index 000000000..a14d51f9d
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 541b6e0e93c00dc48aeb9fcacd5d5ffc
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 50
+ 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
+ packingSettings:
+ serializedVersion: 2
+ padding: 4
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas b/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas
deleted file mode 100644
index 912b0bc9a..000000000
--- a/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas
+++ /dev/null
@@ -1,76 +0,0 @@
-%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: ZhanShenSprite
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
- packables:
- - {fileID: 2800000, guid: 7567a70f6ccea3b45b705973b24c0832, type: 3}
- - {fileID: 2800000, guid: 71c9749eb6ba3fc47bb2edca35a9a31b, type: 3}
- - {fileID: 2800000, guid: 16ab7a0b63cd4634da7050e12dc6b53e, type: 3}
- - {fileID: 2800000, guid: 11856430d23b062489300a32ed378b37, type: 3}
- - {fileID: 2800000, guid: e3465109cd9a7dc4ab52c0c25127c927, type: 3}
- - {fileID: 2800000, guid: f0277d5948835d94bae3af07480375d6, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: ZhanLing 1
- m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas.meta
deleted file mode 100644
index d454cb771..000000000
--- a/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 72008a1238b2b5f48b76ec9f8bb16892
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2 b/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2
new file mode 100644
index 000000000..8d708e948
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
+ packables:
+ - {fileID: 2800000, guid: 7567a70f6ccea3b45b705973b24c0832, type: 3}
+ - {fileID: 2800000, guid: 71c9749eb6ba3fc47bb2edca35a9a31b, type: 3}
+ - {fileID: 2800000, guid: 16ab7a0b63cd4634da7050e12dc6b53e, type: 3}
+ - {fileID: 2800000, guid: 11856430d23b062489300a32ed378b37, type: 3}
+ - {fileID: 2800000, guid: e3465109cd9a7dc4ab52c0c25127c927, type: 3}
+ - {fileID: 2800000, guid: f0277d5948835d94bae3af07480375d6, type: 3}
+ m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2.meta
new file mode 100644
index 000000000..e3835d0c0
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 929f6b85d843e6d4a97ad243b354700d
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 48
+ 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: 48
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 8
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas.meta b/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas.meta
deleted file mode 100644
index ac316315b..000000000
--- a/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0866d7cf8d02e054098a519554ef8a43
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas b/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2
similarity index 68%
rename from Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas
rename to Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2
index d3313c8b8..8e9ebda5f 100644
--- a/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas
+++ b/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2
@@ -1,62 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!687078895 &4343727234628468602
-SpriteAtlas:
+--- !u!612988286 &1
+SpriteAtlasAsset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: chibangSprite
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: Android
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- m_BuildTarget: iPhone
- m_MaxTextureSize: 1024
- m_ResizeAlgorithm: 0
- m_TextureFormat: 50
- m_TextureCompression: 1
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 1
- m_IgnorePlatformSupport: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 0
- packingSettings:
- serializedVersion: 2
- padding: 4
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 1
- enableTightPacking: 1
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
packables:
- {fileID: 2800000, guid: 863c088e99429f344869e04b240b23d3, type: 3}
- {fileID: 2800000, guid: 9a9db9608a2c5c643bb11a5b81643a1e, type: 3}
@@ -104,13 +57,4 @@ SpriteAtlas:
- {fileID: 2800000, guid: 86e712b881109e548be6fe63a7ad9fb1, type: 3}
- {fileID: 2800000, guid: a1a9b7ab7e8ed234fa3c71e80304d0ec, type: 3}
- {fileID: 2800000, guid: 364821d288eed2f4d98173e9b0204eca, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- packedSpriteRenderDataKeys: []
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites: []
- m_PackedSpriteNamesToIndex: []
- m_RenderDataMap: {}
- m_Tag: chibangSprite
m_IsVariant: 0
diff --git a/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2.meta
new file mode 100644
index 000000000..3b84c02da
--- /dev/null
+++ b/Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2.meta
@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: d26fe37a57476c64c89f86bb6ba172ae
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 48
+ 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: 48
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ packingSettings:
+ serializedVersion: 2
+ padding: 8
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 1
+ enableTightPacking: 1
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs
index de6103ac1..c96f68af9 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs
@@ -394,6 +394,8 @@ public class UIHome_BY_ItemListPanels : SubUIBase
if (iconSprite != null)
toggleDisplay.SetSprite(iconSprite);
+ else
+ Debug.LogWarning($"[图标诊断] 炮台/翅膀 #{resData.turretNumber} 图标为空（图标字典 {TurretResourcesData.SpriteIconCount} 张）");
bool isOwned = IsItemOwned(resData.turretNumber);
bool isEquipped = IsItemEquipped(resData.turretNumber);
@@ -621,6 +623,8 @@ public class UIHome_BY_ItemListPanels : SubUIBase
if (iconSprite != null)
toggleDisplay.SetSprite(iconSprite);
+ else
+ Debug.LogWarning($"[图标诊断] 战神 #{resData.turretNumber} 图标为空（图标字典 {TurretResourcesData.SpriteIconCount} 张）");
bool isOwned = IsItemOwned(resData.turretNumber);
bool isEquipped = IsItemEquipped(resData.turretNumber);
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas b/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas
deleted file mode 100644
index 416d7416d..000000000
--- a/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas
+++ /dev/null
@@ -1,97 +0,0 @@
-%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: IngameDebugConsoleSpriteAtlas
- m_EditorData:
- serializedVersion: 2
- textureSettings:
- serializedVersion: 2
- anisoLevel: 1
- compressionQuality: 50
- maxTextureSize: 2048
- textureCompression: 0
- filterMode: 1
- generateMipMaps: 0
- readable: 0
- crunchedCompression: 0
- sRGB: 1
- platformSettings:
- - serializedVersion: 3
- m_BuildTarget: DefaultTexturePlatform
- m_MaxTextureSize: 2048
- m_ResizeAlgorithm: 0
- m_TextureFormat: -1
- m_TextureCompression: 0
- m_CompressionQuality: 50
- m_CrunchedCompression: 0
- m_AllowsAlphaSplitting: 0
- m_Overridden: 0
- m_AndroidETC2FallbackOverride: 0
- m_ForceMaximumCompressionQuality_BC6H_BC7: 1
- packingSettings:
- serializedVersion: 2
- padding: 8
- blockOffset: 1
- allowAlphaSplitting: 0
- enableRotation: 0
- enableTightPacking: 0
- enableAlphaDilation: 0
- secondaryTextureSettings: {}
- variantMultiplier: 1
- packables:
- - {fileID: 2800000, guid: 7a9e374666ad6cc47807bb001844f3d8, type: 3}
- - {fileID: 2800000, guid: d1546f8db185caf4dafcfa58efa3ba2c, type: 3}
- - {fileID: 2800000, guid: 66305a19e3614694f868c75a982e6b68, type: 3}
- - {fileID: 2800000, guid: b3905a73a6672d9449647aaf036e23fc, type: 3}
- - {fileID: 2800000, guid: 5a97d5afa6254804f81b7ba956296996, type: 3}
- - {fileID: 2800000, guid: 7f0db3cf23c93fc4eac01cb3a52388ee, type: 3}
- - {fileID: 2800000, guid: a9fd8f6b461461f4a92eafc60921ee78, type: 3}
- - {fileID: 2800000, guid: 066c0b04be98cd348abb79add91d42bf, type: 3}
- - {fileID: 2800000, guid: b902f763d0e47364dae25207b7e47800, type: 3}
- - {fileID: 2800000, guid: 05c7216c78d4dd34ebe2bac9c1e274d7, type: 3}
- - {fileID: 2800000, guid: e04e6c970b950d946a782ea08e5f971d, type: 3}
- - {fileID: 2800000, guid: 066d3840badf4d24dba1d42b4c59b888, type: 3}
- - {fileID: 2800000, guid: 98e8e1cf8dc7dbf469617c2e40c8a944, type: 3}
- - {fileID: 2800000, guid: b3f0d976f6d6802479d6465d11b3aa68, type: 3}
- bindAsDefault: 1
- isAtlasV2: 0
- cachedData: {fileID: 0}
- m_MasterAtlas: {fileID: 0}
- m_PackedSprites:
- - {fileID: 21300000, guid: 066d3840badf4d24dba1d42b4c59b888, type: 3}
- - {fileID: 21300000, guid: b902f763d0e47364dae25207b7e47800, type: 3}
- - {fileID: 21300000, guid: b3905a73a6672d9449647aaf036e23fc, type: 3}
- - {fileID: 21300000, guid: 066c0b04be98cd348abb79add91d42bf, type: 3}
- - {fileID: 21300000, guid: 7a9e374666ad6cc47807bb001844f3d8, type: 3}
- - {fileID: 21300000, guid: b3f0d976f6d6802479d6465d11b3aa68, type: 3}
- - {fileID: 21300000, guid: e04e6c970b950d946a782ea08e5f971d, type: 3}
- - {fileID: 21300000, guid: 66305a19e3614694f868c75a982e6b68, type: 3}
- - {fileID: 21300000, guid: a9fd8f6b461461f4a92eafc60921ee78, type: 3}
- - {fileID: 21300000, guid: 05c7216c78d4dd34ebe2bac9c1e274d7, type: 3}
- - {fileID: 21300000, guid: d1546f8db185caf4dafcfa58efa3ba2c, type: 3}
- - {fileID: 21300000, guid: 5a97d5afa6254804f81b7ba956296996, type: 3}
- - {fileID: 21300000, guid: 98e8e1cf8dc7dbf469617c2e40c8a944, type: 3}
- - {fileID: 21300000, guid: 7f0db3cf23c93fc4eac01cb3a52388ee, type: 3}
- m_PackedSpriteNamesToIndex:
- - SlicedBackground
- - IconSnapToBottomBg
- - IconHide
- - IconSnapToBottom
- - IconClear
- - SlicedBackground3
- - SearchIcon
- - IconError
- - IconResizeVertialOnly
- - IconWarning
- - IconCollapse
- - IconInfo
- - SlicedBackground2
- - IconResizeAllDirections
- m_RenderDataMap: {}
- m_Tag: IngameDebugConsoleSpriteAtlas
- m_IsVariant: 0
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas.meta b/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas.meta
deleted file mode 100644
index 71ee72330..000000000
--- a/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d829dcfc225f56440a2b10d9ac318aea
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 4343727234628468602
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2 b/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2
new file mode 100644
index 000000000..18abdff12
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 2
+ m_MasterAtlas: {fileID: 0}
+ m_ImporterData:
+ packables:
+ - {fileID: 2800000, guid: 7a9e374666ad6cc47807bb001844f3d8, type: 3}
+ - {fileID: 2800000, guid: d1546f8db185caf4dafcfa58efa3ba2c, type: 3}
+ - {fileID: 2800000, guid: 66305a19e3614694f868c75a982e6b68, type: 3}
+ - {fileID: 2800000, guid: b3905a73a6672d9449647aaf036e23fc, type: 3}
+ - {fileID: 2800000, guid: 5a97d5afa6254804f81b7ba956296996, type: 3}
+ - {fileID: 2800000, guid: 7f0db3cf23c93fc4eac01cb3a52388ee, type: 3}
+ - {fileID: 2800000, guid: a9fd8f6b461461f4a92eafc60921ee78, type: 3}
+ - {fileID: 2800000, guid: 066c0b04be98cd348abb79add91d42bf, type: 3}
+ - {fileID: 2800000, guid: b902f763d0e47364dae25207b7e47800, type: 3}
+ - {fileID: 2800000, guid: 05c7216c78d4dd34ebe2bac9c1e274d7, type: 3}
+ - {fileID: 2800000, guid: e04e6c970b950d946a782ea08e5f971d, type: 3}
+ - {fileID: 2800000, guid: 066d3840badf4d24dba1d42b4c59b888, type: 3}
+ - {fileID: 2800000, guid: 98e8e1cf8dc7dbf469617c2e40c8a944, type: 3}
+ - {fileID: 2800000, guid: b3f0d976f6d6802479d6465d11b3aa68, type: 3}
+ m_IsVariant: 0
diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2.meta b/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2.meta
new file mode 100644
index 000000000..b169a6939
--- /dev/null
+++ b/Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2.meta
@@ -0,0 +1,43 @@
+fileFormatVersion: 2
+guid: a5551033fd300d24f851115f0641f287
+SpriteAtlasImporter:
+ externalObjects: {}
+ textureSettings:
+ serializedVersion: 2
+ anisoLevel: 1
+ compressionQuality: 50
+ maxTextureSize: 2048
+ textureCompression: 0
+ filterMode: 1
+ generateMipMaps: 0
+ readable: 0
+ crunchedCompression: 0
+ sRGB: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ packingSettings:
+ serializedVersion: 2
+ padding: 8
+ blockOffset: 1
+ allowAlphaSplitting: 0
+ enableRotation: 0
+ enableTightPacking: 0
+ enableAlphaDilation: 0
+ secondaryTextureSettings: {}
+ variantMultiplier: 1
+ bindAsDefault: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UIResources/Home/背包/BY_beibao_001 (5).png.meta b/Assets/UIResources/Home/背包/BY_beibao_001 (5).png.meta
index fedd12623..87ba2ab85 100644
--- a/Assets/UIResources/Home/背包/BY_beibao_001 (5).png.meta
+++ b/Assets/UIResources/Home/背包/BY_beibao_001 (5).png.meta
@@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
+ maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
@@ -106,6 +106,32 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ 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: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []