From 3dfe1393d7728f8c66971ccc7fa84ba80191ba3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sat, 10 Oct 2026 04:09:28 +0800 Subject: [PATCH] 1 --- .../AssetGroups/GameUIRes.asset | 5 - .../AssetGroups/HomeUIRes.asset | 137 +++---- .../TurretChiBangZhanShenRes.asset | 348 +----------------- .../Windows/addressables_content_state.bin | Bin 154499 -> 138557 bytes Assets/Editor/SpineSettings.asset | 10 +- Assets/Editor/TurretAtlasBleedingFix.cs | 63 ++++ Assets/Editor/TurretAtlasBleedingFix.cs.meta | 11 + Assets/MyGame/Scenes/UIScene.unity | 96 ++--- Assets/MyGame/Scripts/Turret/SitPosData.cs | 25 +- .../Scripts/fishResources/TurretResources.cs | 238 +++++++++--- .../UI/Atlases/AnnouncementPanel.spriteatlas | 76 ---- .../AnnouncementPanel.spriteatlas.meta | 8 - .../Atlases/AnnouncementPanel.spriteatlasv2 | 18 + .../AnnouncementPanel.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/BackPack.spriteatlas.meta | 8 - ...ack.spriteatlas => BackPack.spriteatlasv2} | 69 +--- .../aa/UI/Atlases/BackPack.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/EmailPanel.spriteatlas.meta | 8 - ...l.spriteatlas => EmailPanel.spriteatlasv2} | 71 +--- .../UI/Atlases/EmailPanel.spriteatlasv2.meta | 56 +++ .../GameMainPanel_FLZY.spriteatlas.meta | 8 - ...atlas => GameMainPanel_FLZY.spriteatlasv2} | 70 +--- .../GameMainPanel_FLZY.spriteatlasv2.meta | 56 +++ .../Hl_Act_RebateView Variant.spriteatlas | 87 ----- ...Hl_Act_RebateView Variant.spriteatlas.meta | 8 - .../Hl_Act_RebateView Variant.spriteatlasv2 | 31 ++ ..._Act_RebateView Variant.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/JJJPanel.spriteatlas.meta | 8 - ...nel.spriteatlas => JJJPanel.spriteatlasv2} | 70 +--- .../aa/UI/Atlases/JJJPanel.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/MYSelectSit.spriteatlas | 95 ----- .../UI/Atlases/MYSelectSit.spriteatlas.meta | 8 - .../aa/UI/Atlases/MYSelectSit.spriteatlasv2 | 36 ++ .../UI/Atlases/MYSelectSit.spriteatlasv2.meta | 56 +++ .../Atlases/MainPanelAtlas.spriteatlas.meta | 8 - ...riteatlas => MainPanelAtlas.spriteatlasv2} | 68 +--- .../Atlases/MainPanelAtlas.spriteatlasv2.meta | 56 +++ .../UI/Atlases/PaoTaiSprite.spriteatlas.meta | 8 - ...spriteatlas => PaoTaiSprite.spriteatlasv2} | 68 +--- .../Atlases/PaoTaiSprite.spriteatlasv2.meta | 69 ++++ .../aa/UI/Atlases/RankPanel.spriteatlas.meta | 8 - ...el.spriteatlas => RankPanel.spriteatlasv2} | 70 +--- .../UI/Atlases/RankPanel.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/SafeBox.spriteatlas.meta | 8 - ...eBox.spriteatlas => SafeBox.spriteatlasv2} | 70 +--- .../aa/UI/Atlases/SafeBox.spriteatlasv2.meta | 56 +++ .../Atlases/SelectRoomPanel.spriteatlas.meta | 8 - ...iteatlas => SelectRoomPanel.spriteatlasv2} | 72 +--- .../SelectRoomPanel.spriteatlasv2.meta | 56 +++ .../UI/Atlases/ServicePanel.spriteatlas.meta | 8 - ...spriteatlas => ServicePanel.spriteatlasv2} | 70 +--- .../Atlases/ServicePanel.spriteatlasv2.meta | 56 +++ .../UI/Atlases/SettingPanel.spriteatlas.meta | 8 - ...spriteatlas => SettingPanel.spriteatlasv2} | 68 +--- .../Atlases/SettingPanel.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/ShopPanel.spriteatlas.meta | 8 - ...el.spriteatlas => ShopPanel.spriteatlasv2} | 70 +--- .../UI/Atlases/ShopPanel.spriteatlasv2.meta | 56 +++ .../UI/Atlases/TurretPanel.spriteatlas.meta | 8 - ....spriteatlas => TurretPanel.spriteatlasv2} | 72 +--- .../UI/Atlases/TurretPanel.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/UISignView.spriteatlas | 78 ---- .../aa/UI/Atlases/UISignView.spriteatlas.meta | 8 - .../aa/UI/Atlases/UISignView.spriteatlasv2 | 22 ++ .../UI/Atlases/UISignView.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/UserInfo.spriteatlas.meta | 8 - ...nfo.spriteatlas => UserInfo.spriteatlasv2} | 72 +--- .../aa/UI/Atlases/UserInfo.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/VIPPanel.spriteatlas.meta | 8 - ...nel.spriteatlas => VIPPanel.spriteatlasv2} | 70 +--- .../aa/UI/Atlases/VIPPanel.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/ZhanLing.spriteatlas.meta | 8 - ...ing.spriteatlas => ZhanLing.spriteatlasv2} | 70 +--- .../aa/UI/Atlases/ZhanLing.spriteatlasv2.meta | 56 +++ .../aa/UI/Atlases/ZhanShenSprite.spriteatlas | 76 ---- .../Atlases/ZhanShenSprite.spriteatlas.meta | 8 - .../UI/Atlases/ZhanShenSprite.spriteatlasv2 | 20 + .../Atlases/ZhanShenSprite.spriteatlasv2.meta | 56 +++ .../UI/Atlases/chibangSprite.spriteatlas.meta | 8 - ...priteatlas => chibangSprite.spriteatlasv2} | 68 +--- .../Atlases/chibangSprite.spriteatlasv2.meta | 56 +++ .../UI/Home/Sub/UIHome_BY_ItemListPanels.cs | 4 + .../IngameDebugConsoleSpriteAtlas.spriteatlas | 97 ----- ...meDebugConsoleSpriteAtlas.spriteatlas.meta | 8 - ...ngameDebugConsoleSpriteAtlas.spriteatlasv2 | 28 ++ ...DebugConsoleSpriteAtlas.spriteatlasv2.meta | 43 +++ .../Home/背包/BY_beibao_001 (5).png.meta | 28 +- 87 files changed, 1994 insertions(+), 2295 deletions(-) create mode 100644 Assets/Editor/TurretAtlasBleedingFix.cs create mode 100644 Assets/Editor/TurretAtlasBleedingFix.cs.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas delete mode 100644 Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlas.meta create mode 100644 Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2 create mode 100644 Assets/MyGame/aa/UI/Atlases/AnnouncementPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{BackPack.spriteatlas => BackPack.spriteatlasv2} (66%) create mode 100644 Assets/MyGame/aa/UI/Atlases/BackPack.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{EmailPanel.spriteatlas => EmailPanel.spriteatlasv2} (50%) create mode 100644 Assets/MyGame/aa/UI/Atlases/EmailPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{GameMainPanel_FLZY.spriteatlas => GameMainPanel_FLZY.spriteatlasv2} (82%) create mode 100644 Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas delete mode 100644 Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlas.meta create mode 100644 Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2 create mode 100644 Assets/MyGame/aa/UI/Atlases/Hl_Act_RebateView Variant.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{JJJPanel.spriteatlas => JJJPanel.spriteatlasv2} (57%) create mode 100644 Assets/MyGame/aa/UI/Atlases/JJJPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas delete mode 100644 Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlas.meta create mode 100644 Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2 create mode 100644 Assets/MyGame/aa/UI/Atlases/MYSelectSit.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{MainPanelAtlas.spriteatlas => MainPanelAtlas.spriteatlasv2} (74%) create mode 100644 Assets/MyGame/aa/UI/Atlases/MainPanelAtlas.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{PaoTaiSprite.spriteatlas => PaoTaiSprite.spriteatlasv2} (67%) create mode 100644 Assets/MyGame/aa/UI/Atlases/PaoTaiSprite.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{RankPanel.spriteatlas => RankPanel.spriteatlasv2} (52%) create mode 100644 Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{SafeBox.spriteatlas => SafeBox.spriteatlasv2} (70%) create mode 100644 Assets/MyGame/aa/UI/Atlases/SafeBox.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{SelectRoomPanel.spriteatlas => SelectRoomPanel.spriteatlasv2} (68%) create mode 100644 Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{ServicePanel.spriteatlas => ServicePanel.spriteatlasv2} (62%) create mode 100644 Assets/MyGame/aa/UI/Atlases/ServicePanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{SettingPanel.spriteatlas => SettingPanel.spriteatlasv2} (62%) create mode 100644 Assets/MyGame/aa/UI/Atlases/SettingPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{ShopPanel.spriteatlas => ShopPanel.spriteatlasv2} (63%) create mode 100644 Assets/MyGame/aa/UI/Atlases/ShopPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{TurretPanel.spriteatlas => TurretPanel.spriteatlasv2} (64%) create mode 100644 Assets/MyGame/aa/UI/Atlases/TurretPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas delete mode 100644 Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlas.meta create mode 100644 Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2 create mode 100644 Assets/MyGame/aa/UI/Atlases/UISignView.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{UserInfo.spriteatlas => UserInfo.spriteatlasv2} (73%) create mode 100644 Assets/MyGame/aa/UI/Atlases/UserInfo.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{VIPPanel.spriteatlas => VIPPanel.spriteatlasv2} (55%) create mode 100644 Assets/MyGame/aa/UI/Atlases/VIPPanel.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{ZhanLing.spriteatlas => ZhanLing.spriteatlasv2} (83%) create mode 100644 Assets/MyGame/aa/UI/Atlases/ZhanLing.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas delete mode 100644 Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlas.meta create mode 100644 Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2 create mode 100644 Assets/MyGame/aa/UI/Atlases/ZhanShenSprite.spriteatlasv2.meta delete mode 100644 Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlas.meta rename Assets/MyGame/aa/UI/Atlases/{chibangSprite.spriteatlas => chibangSprite.spriteatlasv2} (68%) create mode 100644 Assets/MyGame/aa/UI/Atlases/chibangSprite.spriteatlasv2.meta delete mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas delete mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlas.meta create mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2 create mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/IngameDebugConsoleSpriteAtlas.spriteatlasv2.meta 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 129d6939ec442f5cfbcaf8f9fe814e01fe274a2e..f8a6a8b33e8fdd9c59af14afe9e27425afb36b6b 100644 GIT binary patch delta 44817 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

J%)h#TErdzm1au7 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�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 GhW`idu5MBQ 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: []