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 25fb8cb89..72bc4be39 100644
Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ
diff --git a/Assets/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}