From c39586ad1eb7d4e3bc5486a124f36861655ffd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sat, 10 Oct 2026 14:47:01 +0800 Subject: [PATCH] 1 --- ... Local Group_BundledAssetGroupSchema.asset | 2 +- ...DefaultUIRes_BundledAssetGroupSchema.asset | 2 +- .../Fish_FLZY_BundledAssetGroupSchema.asset | 2 +- .../Fish_HHWK_BundledAssetGroupSchema.asset | 2 +- .../Fish_XJMH_BundledAssetGroupSchema.asset | 2 +- .../GameUIRes_BundledAssetGroupSchema.asset | 2 +- .../HomeUIRes_BundledAssetGroupSchema.asset | 2 +- .../LoginUIRes_BundledAssetGroupSchema.asset | 2 +- .../SharedRes_BundledAssetGroupSchema.asset | 2 +- ...gZhanShenRes_BundledAssetGroupSchema.asset | 2 +- .../ZGXQ_BundledAssetGroupSchema.asset | 2 +- .../Windows/addressables_content_state.bin | Bin 269599 -> 269599 bytes Assets/MyGame/Scenes/UIScene.unity | 111 ++++++++---------- .../GameMainPanel_FLZY.spriteatlasv2.meta | 2 +- .../UI/Atlases/RankPanel.spriteatlasv2.meta | 2 +- .../SelectRoomPanel.spriteatlasv2.meta | 2 +- .../UI/DefaultPanel/LoadPanel/LoadingPanel.cs | 11 +- .../aa/UI/Game/GameMainPanel_FishBase.cs | 19 +++ .../aa/UI/Game/XJMH/GameMainPanelXJMH.prefab | 24 ++-- 19 files changed, 104 insertions(+), 89 deletions(-) diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset index 0de006b6d..131aec3cf 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: ec57fb26f5bb61544b2831e9485b32fe, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/DefaultUIRes_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/DefaultUIRes_BundledAssetGroupSchema.asset index 81e4a994e..295f9bcfa 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/DefaultUIRes_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/DefaultUIRes_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: b4f01f1670cc33f4587db7361d183233, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_FLZY_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_FLZY_BundledAssetGroupSchema.asset index faa69fdae..fd00114d8 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_FLZY_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_FLZY_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: 39ca999e15083df459f52c7743a44f50, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_HHWK_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_HHWK_BundledAssetGroupSchema.asset index cd3b338ac..594af103a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_HHWK_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_HHWK_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: 427f94f67624e374895487c87f881a7f, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_XJMH_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_XJMH_BundledAssetGroupSchema.asset index 9bdc68958..1579cacdc 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_XJMH_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_XJMH_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: ca4eb1ed7a9a8bc4bbcc5d865fd723a4, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/GameUIRes_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/GameUIRes_BundledAssetGroupSchema.asset index 43bb44c36..f1efcbd1c 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/GameUIRes_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/GameUIRes_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: fcc697a6587205543acfb2a32347c100, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/HomeUIRes_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/HomeUIRes_BundledAssetGroupSchema.asset index 648212d5a..4f9385056 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/HomeUIRes_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/HomeUIRes_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: 9971f2f92adebd44faa29cc332720d65, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/LoginUIRes_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/LoginUIRes_BundledAssetGroupSchema.asset index 38d9cf4ee..32f96aff3 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/LoginUIRes_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/LoginUIRes_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: 59a1dc2550990aa4091c8db201571a43, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_BundledAssetGroupSchema.asset index 99c577b2f..912584928 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: 95f7c3baf2c413d4a838cc0e4c2be95d, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/TurretChiBangZhanShenRes_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/TurretChiBangZhanShenRes_BundledAssetGroupSchema.asset index d87d63781..2b985968e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/TurretChiBangZhanShenRes_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/TurretChiBangZhanShenRes_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: c0b3b611be2f4f24f9d72d2676e58d51, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/ZGXQ_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/ZGXQ_BundledAssetGroupSchema.asset index 238d7a90c..3fbe5af95 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/ZGXQ_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/ZGXQ_BundledAssetGroupSchema.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Group: {fileID: 11400000, guid: aa56712de737c4b4ea481409576c9b09, type: 2} m_InternalBundleIdMode: 1 - m_Compression: 2 + m_Compression: 1 m_IncludeAddressInCatalog: 1 m_IncludeGUIDInCatalog: 1 m_IncludeLabelsInCatalog: 1 diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index 25fb8cb8939928f6048f20cf803bbf9832248bc0..72bc4be39540da1e176076b44a2be39905deb9e6 100644 GIT binary patch delta 11493 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 W2rEG`;*L9JQTQBK+r_oydH)|XQ^Ohn delta 11546 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 diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 39c441ed2..87c0c4136 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -579,19 +579,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: -0.000022888184 objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.78070176 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: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 720.3 objectReference: {fileID: 0} - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 885.7 objectReference: {fileID: 0} - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 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: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1216.5 objectReference: {fileID: 0} - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 objectReference: {fileID: 0} - target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22485076, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 248.09999 objectReference: {fileID: 0} - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1051.1 objectReference: {fileID: 0} - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 306.8 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 484.19998 objectReference: {fileID: 0} - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 165.4 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 82.7 objectReference: {fileID: 0} - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18 objectReference: {fileID: 0} - target: {fileID: 958269219681220773, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} @@ -3855,7 +3855,6 @@ GameObject: - component: {fileID: 2075409202} - component: {fileID: 2075409203} - component: {fileID: 2075409204} - - component: {fileID: 2075409205} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -4343,18 +4342,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioMixer: {fileID: 24100000, guid: ca43f9a7549657a49a2978e97c7a621a, type: 2} ---- !u!114 &2075409205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075409194} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd70cad3c45605a4f824c9eaf1eb081d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &3569938244496052059 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta index 1153b3038..3e067dc3d 100644 --- a/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta +++ b/Assets/MyGame/aa/UI/Atlases/GameMainPanel_FLZY.spriteatlasv2.meta @@ -42,7 +42,7 @@ SpriteAtlasImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: serializedVersion: 2 - padding: 4 + padding: 8 blockOffset: 1 allowAlphaSplitting: 0 enableRotation: 0 diff --git a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta index 84d0c8cde..4301d66e6 100644 --- a/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta +++ b/Assets/MyGame/aa/UI/Atlases/RankPanel.spriteatlasv2.meta @@ -42,7 +42,7 @@ SpriteAtlasImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: serializedVersion: 2 - padding: 4 + padding: 8 blockOffset: 1 allowAlphaSplitting: 0 enableRotation: 0 diff --git a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta index 230262333..c36731597 100644 --- a/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta +++ b/Assets/MyGame/aa/UI/Atlases/SelectRoomPanel.spriteatlasv2.meta @@ -42,7 +42,7 @@ SpriteAtlasImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: serializedVersion: 2 - padding: 4 + padding: 8 blockOffset: 1 allowAlphaSplitting: 0 enableRotation: 0 diff --git a/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadingPanel.cs b/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadingPanel.cs index 53128770b..257a513d8 100644 --- a/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadingPanel.cs +++ b/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadingPanel.cs @@ -21,9 +21,18 @@ public class LoadingPanel : MonoBehaviour StartCoroutine(PreloadHomeMainRoutine()); } - /// 预载大厅主面板：等 UIManager 就绪后发起（视频这段时间足够 HomeUIRes 加载完） + /// 先让视频起播，播放过程中再预载大厅主面板（避免大包解压和视频启动抢主线程） private IEnumerator PreloadHomeMainRoutine() { + // 1) 等视频真正开始播放（最多等 5 秒兜底，防止视频未播时死等） + float waited = 0f; + while (player != null && !player.isPlaying && waited < 5f) + { + waited += Time.deltaTime; + yield return null; + } + yield return new WaitForSeconds(0.5f); // 让视频先渲染几帧，起播更顺 + // 2) 播放过程中加载：等 UIManager 就绪后发起预载 while (UIManager.Instance == null) yield return null; yield return null; // 等 UIManager 初始化完成（地址表装载） diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index ddc994cc3..41e47a18f 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -1412,6 +1412,16 @@ public class GameMainPanel_FishBase : GameMainPanel_Base BulletPool.Instance.ClearAll(); EffectPool.Instance.ClearAll(); _resourcesUnloaded = true; + + // ⭐ 真正回收内存：Addressables 释放包用的是 AssetBundle.Unload(false) 语义 —— + // 只是断开引用，已加载的贴图/材质/网格/音频要等 UnloadUnusedAssets 才真正销毁。 + // iOS 上不调用就会出现"AA 包卸载了但占用内存不降"，连续进第二个游戏内存叠加 → jetsam 闪退。 + // 用 Task 等待（不依赖本面板协程，OnHide 隐藏后也能跑完）。 + await Task.Delay(50); // 等两帧左右让 Destroy 的延迟销毁生效 + var unloadOp = Resources.UnloadUnusedAssets(); + while (!unloadOp.isDone) await Task.Yield(); + System.GC.Collect(); + Debug.Log($"[内存] 离房回收完成 | 已分配 {UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong() / 1048576}MB"); } /// 资源是否已卸载（避免 OnHide 重复卸载） @@ -1548,6 +1558,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base SetUnloadProgress(0.6f); await MonsterMoveLine.UnLoadBezier(); + // ⭐ 真正回收内存：AA 包卸载只是断开引用（Unload(false) 语义），贴图/材质/网格/音频 + // 要等 UnloadUnusedAssets 才真正销毁 —— iOS 上不做这步 = 占用不降， + // 连进第二个游戏内存叠加超限 → jetsam 闪退 + await Task.Delay(50); + var leaveUnloadOp = Resources.UnloadUnusedAssets(); + while (!leaveUnloadOp.isDone) await Task.Yield(); + System.GC.Collect(); + Debug.Log($"[内存] 离房回收完成 | 已分配 {UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong() / 1048576}MB"); + // ⭐ 预载回大厅的主面板 prefab：鱼包已卸载腾出内存，加载大厅包不会叠峰值； // 后面等待 socket 的时间足够它加载完，finally 里 ShowAsync(HomeMainPanel) 命中缓存秒开。 // （进房时 ReleaseHomeUI 已释放大厅资源，散包后回大厅各子面板首次打开按需单独加载） diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index b7464cab4..e84f9b899 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -5830,7 +5830,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 10} + m_AnchoredPosition: {x: 0, y: 16.9} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2150519324841269184 @@ -6244,7 +6244,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -78, y: -14} + m_AnchoredPosition: {x: -84.4, y: -14} m_SizeDelta: {x: 33, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1543908191733251521 @@ -7574,7 +7574,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 10} + m_AnchoredPosition: {x: 0, y: 16.7} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9020050173228002626 @@ -8717,7 +8717,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -78, y: -14} + m_AnchoredPosition: {x: -83.5, y: -14} m_SizeDelta: {x: 33, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2372120819595984433 @@ -17102,7 +17102,7 @@ PrefabInstance: - target: {fileID: 224510575461394643, guid: d2f8fbd9109e67448b98f8bc0f5c2e7c, type: 3} propertyPath: m_AnchoredPosition.x - value: 12.400003 + value: 1.800003 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -17713,7 +17713,7 @@ PrefabInstance: - target: {fileID: 224257241236513202, guid: 45613d68bc30eb1428a454bb23ecf900, type: 3} propertyPath: m_AnchoredPosition.x - value: 14.200032 + value: 1.8 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -18539,7 +18539,7 @@ PrefabInstance: - target: {fileID: 224510575461394643, guid: d2f8fbd9109e67448b98f8bc0f5c2e7c, type: 3} propertyPath: m_AnchoredPosition.x - value: 14.200032 + value: 1.8000288 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -19310,7 +19310,7 @@ PrefabInstance: - target: {fileID: 224729652120947055, guid: 574a35f9ac1d30a4baae69fe573af86a, type: 3} propertyPath: m_AnchoredPosition.x - value: 12.4 + value: 1.8 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -20837,7 +20837,7 @@ PrefabInstance: - target: {fileID: 224342906523527382, guid: 3f4820e8b7d63b44f983ebd7dca20d71, type: 3} propertyPath: m_AnchoredPosition.x - value: 12.400003 + value: 1.800003 objectReference: {fileID: 0} - target: {fileID: 224970498482941826, guid: 3f4820e8b7d63b44f983ebd7dca20d71, type: 3} @@ -21809,7 +21809,7 @@ PrefabInstance: - target: {fileID: 224257241236513202, guid: 45613d68bc30eb1428a454bb23ecf900, type: 3} propertyPath: m_AnchoredPosition.x - value: 12.400003 + value: -0.1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -22113,7 +22113,7 @@ PrefabInstance: - target: {fileID: 224729652120947055, guid: 574a35f9ac1d30a4baae69fe573af86a, type: 3} propertyPath: m_AnchoredPosition.x - value: 14.2 + value: 1.7999964 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -23066,7 +23066,7 @@ PrefabInstance: - target: {fileID: 224342906523527382, guid: 3f4820e8b7d63b44f983ebd7dca20d71, type: 3} propertyPath: m_AnchoredPosition.x - value: 14.200032 + value: 1.8000288 objectReference: {fileID: 0} - target: {fileID: 224970498482941826, guid: 3f4820e8b7d63b44f983ebd7dca20d71, type: 3}