wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-07-25 21:04:58 +08:00
parent 7f0b9e4e1a
commit 0c58becf41
28 changed files with 502 additions and 6293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+3 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: a263e71fce79f2f4cb5b5f1fa6b7291a
m_currentHash:
serializedVersion: 2
Hash: 2c18bfd5fc0794b3449f30246c6ffef9
Hash: b88434f0b008f53956432ffabe051912
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
@@ -46,6 +46,7 @@ MonoBehaviour:
m_GroupAssets:
- {fileID: 11400000, guid: 427f94f67624e374895487c87f881a7f, type: 2}
- {fileID: 11400000, guid: ca4eb1ed7a9a8bc4bbcc5d865fd723a4, type: 2}
- {fileID: 11400000, guid: 9971f2f92adebd44faa29cc332720d65, type: 2}
- {fileID: 11400000, guid: ec57fb26f5bb61544b2831e9485b32fe, type: 2}
- {fileID: 11400000, guid: 39ca999e15083df459f52c7743a44f50, type: 2}
- {fileID: 11400000, guid: aa56712de737c4b4ea481409576c9b09, type: 2}
@@ -131,6 +132,7 @@ MonoBehaviour:
- Resources
- ZGXQ
- PTCBZS
- MainUI
m_SchemaTemplates: []
m_GroupTemplateObjects:
- {fileID: 11400000, guid: f8bdd136efb211442bda19725e55eefa, type: 2}
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
-131
View File
@@ -59,12 +59,6 @@ MonoBehaviour:
- FLZY
- FishPrefab
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 08d458f342e1e95458915d1720dd46fb
m_Address: Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 098d43abfc1006e44acbd9822deb09bb
m_Address: paotai11018
m_ReadOnly: 0
@@ -154,12 +148,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1a0ff34367f8a86478f35a39df6bc090
m_Address: Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1c8204fa07b7dd64da88865ca17ac98a
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17035.prefab
m_ReadOnly: 0
@@ -236,12 +224,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2747065c60c27ae40baf688575ba2606
m_Address: Assets/MyGame/aa/UI/Login/SubPanel/RegisterPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2890b76ba375ba948a73f1058220edaa
m_Address: paotai11006
m_ReadOnly: 0
@@ -263,12 +245,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2ae29ff90f8f1ba42aafd95293932c59
m_Address: Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2e827ee22b517b142a02160de430ac67
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17024.prefab
m_ReadOnly: 0
@@ -311,12 +287,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 33618332775bcb9418a7fa185cb02373
m_Address: Assets/MyGame/aa/UI/Login/LoginPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 348d8e5f8160ffd47937310c7ead66bb
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17014.png
m_ReadOnly: 0
@@ -331,12 +301,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3712c1898126eac448acd0c68c72be19
m_Address: Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3d6a02b558c7d1649bc126514a9e65f8
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17004.png
m_ReadOnly: 0
@@ -386,12 +350,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 47c83c32cd8a2e247a31ae49ef81858e
m_Address: Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4aa915c44b0753040bba8814b551b510
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17045.prefab
m_ReadOnly: 0
@@ -406,18 +364,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5077f3d4be776bc4289434d17cf8b8c8
m_Address: Assets/MyGame/aa/UI/Login/SubPanel/LoginEnterPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 53ade1c7d9fc9ce4bb99bdd665dfdb5c
m_Address: Assets/MyGame/aa/UI/Home/Sub/SafeBox.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 58d6c583854d4a94bb0aaf4cf305072b
m_Address: paotai11028
m_ReadOnly: 0
@@ -481,12 +427,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62bda8aec1cfb1749aadcfe3ef48ee05
m_Address: Assets/MyGame/aa/UI/Home/Sub/MonthCardPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 639ac6d7a379406469bf3a5f560f14c7
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11034.prefab
m_ReadOnly: 0
@@ -737,12 +677,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8da2f97ccd96f8044b1c634d075e27f7
m_Address: Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8dc0814926948af45ac390a6a1e36613
m_Address: paotai11030
m_ReadOnly: 0
@@ -819,12 +753,6 @@ MonoBehaviour:
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9351da778e1c18c4f9243b73d7569c66
m_Address: Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 93cf1663d5965bf4d80cf672d0876bc1
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17026.png
m_ReadOnly: 0
@@ -866,12 +794,6 @@ MonoBehaviour:
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 996a064fe66064f4bb15d7927689865d
m_Address: Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 996a29fe8f89d284e8b9614d842f3ed1
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17030.png
m_ReadOnly: 0
@@ -921,12 +843,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9f5ad7a1381056946a3a0eceb700adbc
m_Address: Assets/MyGame/aa/UI/Home/Sub/AnnouncementPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a1a9b7ab7e8ed234fa3c71e80304d0ec
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17045.png
m_ReadOnly: 0
@@ -1002,12 +918,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aab7adfb6126f094f8860d975314558b
m_Address: Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aad8eaf3562feb1408ae3b38e3376f4d
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang/chibang17042.png
m_ReadOnly: 0
@@ -1195,12 +1105,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c48b9e15c1940764a9da95551887a147
m_Address: Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c4e2c42c620e3e34ba25353b9e6391a5
m_Address: Assets/MyGame/aa/Game/Turrets/paotai11004.prefab
m_ReadOnly: 0
@@ -1222,12 +1126,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c9d33ae16c3d94045817f048b78914cc
m_Address: Assets/MyGame/aa/UI/Home/MainPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c9f25dea73210cc4eba14ea75fa09335
m_Address: Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab
m_ReadOnly: 0
@@ -1291,12 +1189,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d88c4bcc8f6b5e8478f797ea1d996f30
m_Address: Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d8e0a9c2b992bea4aaa41a1b6eef83dd
m_Address: Assets/MyGame/aa/Game/ChiBang/chibang17038.prefab
m_ReadOnly: 0
@@ -1430,12 +1322,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e5cb22e9d4f99a24bad351d92d9d29a9
m_Address: Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e82167568bd20264a8d958000f831d5b
m_Address: paotai11045
m_ReadOnly: 0
@@ -1450,12 +1336,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: eb55741a3660b8240be0f2f1c9d6aadb
m_Address: Assets/MyGame/aa/UI/Login/SubPanel/ReSetPassword.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ebbe9de6affbb0d41bddae70a32bf645
m_Address: Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab
m_ReadOnly: 0
@@ -1497,17 +1377,6 @@ MonoBehaviour:
- Default
- PTCBZS
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f11b7edd13b4a7c4fbe9ec65d48a1c4d
m_Address: Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f206f68250e35c54481406a83c165790
m_Address: Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f26a5b78050def843a39dd018a06768a
m_Address: paotai11038
m_ReadOnly: 0
Assets/AddressableAssetsData/AssetGroups/GameMainUI.asset
+25
View File
@@ -0,0 +1,25 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: GameMainUI
m_EditorClassIdentifier:
m_GroupName: Packed Assets
m_Data:
m_SerializedData: []
m_GUID: 8f38feab3e247db4c94a5cdab991097a
m_SerializeEntries: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: afd1b8d91fa2e8a4986a58af47463d07, type: 2}
- {fileID: 11400000, guid: f2f5861dc401bc1428aeacf5cdecf16a, type: 2}
Assets/MyGame/aa/UI/Home/Sub/ServicePanel 1.prefab.meta → Assets/AddressableAssetsData/AssetGroups/GameMainUI.asset.meta
+3 -2
View File
@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: f15b69585054c844cb4e2d501cc57375
PrefabImporter:
guid: d06f30424f059d14ebe685917098c3df
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/AssetGroups/MainUIRes.asset
+157
View File
@@ -0,0 +1,157 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: MainUIRes
m_EditorClassIdentifier:
m_GroupName: MainUIRes
m_Data:
m_SerializedData: []
m_GUID: 9c5deb37dc4f7554bad33e89eb9c647d
m_SerializeEntries:
- m_GUID: 08d458f342e1e95458915d1720dd46fb
m_Address: Assets/MyGame/aa/UI/Home/Sub/RankPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
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: 2747065c60c27ae40baf688575ba2606
m_Address: Assets/MyGame/aa/UI/Login/SubPanel/RegisterPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
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: 33618332775bcb9418a7fa185cb02373
m_Address: Assets/MyGame/aa/UI/Login/LoginPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
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: 47c83c32cd8a2e247a31ae49ef81858e
m_Address: Assets/MyGame/aa/UI/Home/Sub/VIPPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5077f3d4be776bc4289434d17cf8b8c8
m_Address: Assets/MyGame/aa/UI/Login/SubPanel/LoginEnterPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
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: 62bda8aec1cfb1749aadcfe3ef48ee05
m_Address: Assets/MyGame/aa/UI/Home/Sub/MonthCardPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8da2f97ccd96f8044b1c634d075e27f7
m_Address: Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9351da778e1c18c4f9243b73d7569c66
m_Address: Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 996a064fe66064f4bb15d7927689865d
m_Address: Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
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: aab7adfb6126f094f8860d975314558b
m_Address: Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c48b9e15c1940764a9da95551887a147
m_Address: Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c9d33ae16c3d94045817f048b78914cc
m_Address: Assets/MyGame/aa/UI/Home/MainPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d88c4bcc8f6b5e8478f797ea1d996f30
m_Address: Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e5cb22e9d4f99a24bad351d92d9d29a9
m_Address: Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: eb55741a3660b8240be0f2f1c9d6aadb
m_Address: Assets/MyGame/aa/UI/Login/SubPanel/ReSetPassword.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f11b7edd13b4a7c4fbe9ec65d48a1c4d
m_Address: Assets/MyGame/aa/UI/DefaultPanel/GGL.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f206f68250e35c54481406a83c165790
m_Address: Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
m_ReadOnly: 0
m_SerializedLabels:
- MainUI
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: afd1b8d91fa2e8a4986a58af47463d07, type: 2}
- {fileID: 11400000, guid: f2f5861dc401bc1428aeacf5cdecf16a, type: 2}
Assets/AddressableAssetsData/AssetGroups/MainUIRes.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9971f2f92adebd44faa29cc332720d65
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/AssetGroups/Schemas/MainUIRes_BundledAssetGroupSchema.asset
+45
View File
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: MainUIRes_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 9971f2f92adebd44faa29cc332720d65, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 0
m_AssetLoadMode: 0
Assets/AddressableAssetsData/AssetGroups/Schemas/MainUIRes_BundledAssetGroupSchema.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: afd1b8d91fa2e8a4986a58af47463d07
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/AssetGroups/Schemas/MainUIRes_ContentUpdateGroupSchema.asset
+16
View File
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: MainUIRes_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 9971f2f92adebd44faa29cc332720d65, type: 2}
m_StaticContent: 0
Assets/AddressableAssetsData/AssetGroups/Schemas/MainUIRes_ContentUpdateGroupSchema.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f2f5861dc401bc1428aeacf5cdecf16a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/Framework/Tool/UITool/UIManager.cs
+3 -1
View File
@@ -99,13 +99,15 @@ public class UIManager : MonoSingleton<UIManager>
public GameObject loadPanel;
public LoadingPanel ShowLoadPanel(VideoClip videoClip, Action action=null)
{
ShowAsync(UIPanel.LoginPanel);
GameObject load = Instantiate(loadPanel, uiRoot);
var loadScript = load.GetComponent<LoadingPanel>();
load.transform.GetChild(0).gameObject.SetActive(true);
loadScript.player.clip = videoClip;
loadScript.player.Play();
loadScript.actionEnd = action;
return loadScript;
return loadScript;
}
public LoadingPanel ShowLoadPanel(Sprite sprite, Action action = null)
{
Assets/MyGame/Scenes/UIScene.unity
+48 -49
View File
@@ -904,7 +904,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
@@ -912,11 +912,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
@@ -924,51 +924,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
@@ -1052,147 +1052,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}
@@ -6302,7 +6302,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_isTimeSynced: 0
_timeSinceLastSync: 0
--- !u!114 &2075409203
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs
+1 -1
View File
@@ -145,7 +145,7 @@ public class MonsterControl_BossBase : MonsterContral
if (tMP_CurrBossScore != null) return;
var prefab = CreateFishManager.Instance.dieFXPrefabAwardTmp;
if (prefab == null) return;
var parent = CreateFishManager.Instance.bjEffectRoot;
var parent = CreateFishManager.Instance.currGameType.subPanelParent;
if (parent == null) return;
var board = Instantiate(prefab, parent);
Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+45 -24
View File
@@ -90,9 +90,17 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
public Transform poolRoot;
/// <summary>
/// 爆奖特效统一父节点（Boss 分数版/加分弹出/BJEndUI/特殊爆奖等）。
/// EnterRoom 时创建挂在 UIManager.uiRoot 下，ExitRoom 时整节点销毁，
/// 避免爆奖残留特效在退出房间后仍挂在 subPanelParent.parent 上造成内存泄漏。
/// 非 UI 爆奖特效统一父节点。
/// 仅装载那些"原本挂在 UIManager.uiRoot 下（不会随房间退出自动销毁）"
/// 或"原本无父对象（世界空间特效）"的爆奖特效：
/// - BJEndUI 系列（BJEventBase/GSL/FLXJ 的 EndBJ）
/// - DieEffect_TSY / EffectZuanTouDie 的 baoJiangEffectPrefab
/// - HHWK_SDY_DieEvent 的 explosionPrefab
/// - HHWK_ZDX_DieEvent 的 bombPrefab / explosionPrefab
/// - Boss鱼/特殊Boss isToUI=false 分支的 currEffect_DieAward
/// UI 爆奖（挂在 subPanelParent/subPanelParent.parent 下的金币飞、分数版等）
/// 不挂这里，由 UIManager 卸载游戏主面板时自动清理。
/// EnterRoom 时创建挂在 UIManager.uiRoot 下，ExitRoom 时整节点销毁。
/// </summary>
public Transform bjEffectRoot;
@@ -1765,7 +1773,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
{
var award = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAward,
bjEffectRoot);
currGameType.subPanelParent.parent);
award.GetComponent<RectTransform>().anchoredPosition =
CoordinateTransformation.WorldPos_ToCanvas(
@@ -1804,7 +1812,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
// 3. 实例化金币特效（沿用你原来的 award 逻辑）
var award = Instantiate(
dieFXPrefabAward, // 或者用某个专门的"掉金币" prefab
bjEffectRoot);
currGameType.subPanelParent.parent);
var rect = award.GetComponent<RectTransform>();
rect.anchoredPosition = canvasPos;
@@ -1875,7 +1883,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
// 普通鱼：金币飞向炮台
var award = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAward,
bjEffectRoot);
currGameType.subPanelParent.parent);
try
{
award.GetComponent<RectTransform>().anchoredPosition =
@@ -1916,12 +1924,14 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
{
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
bjEffectRoot);
currGameType.subPanelParent.parent);
}
else
{
// isToUI=false：世界空间特效，无 UI 父对象 → 挂 bjEffectRoot 统一管理
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp);
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
bjEffectRoot);
}
bossCtrl.action_effect_DieAward?.Invoke(bossCtrl.currEffect_DieAward);
@@ -1933,7 +1943,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
// 普通鱼：金币飞向炮台
var award = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAward,
bjEffectRoot);
currGameType.subPanelParent.parent);
try
{
award.GetComponent<RectTransform>().anchoredPosition =
@@ -1970,7 +1980,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
CoordinateTransformation.WorldPos_ToCanvas(
monster.transform.position,
UIManager.Instance.uiRoot.GetComponent<Canvas>());
award.transform.SetParent(bjEffectRoot);
award.transform.SetParent(currGameType.subPanelParent.parent);
}
catch
{
@@ -2024,12 +2034,14 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
{
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
bjEffectRoot);
currGameType.subPanelParent.parent);
}
else
{
// isToUI=false：世界空间特效，无 UI 父对象 → 挂 bjEffectRoot 统一管理
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp);
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
bjEffectRoot);
}
bossCtrl.action_effect_DieAward?.Invoke(bossCtrl.currEffect_DieAward);
@@ -2095,6 +2107,10 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
/// </summary>
public void FreezeAllFish()
{
// ⭐ 守卫：已冻结时直接返回,避免重复调用覆盖已记录的状态
// (其他客户端会先后被 OnUsePropNotice 和 SyncGameData_FreezeFish 触发两次)
if (isFrozen) return;
isFrozen = true;
// ⭐ 两个字典必须同步清空，否则 frozenFishIsMoves 残留旧数据
// 会导致下次解冻时用旧值覆盖 isMove 但不恢复 currState
@@ -2134,19 +2150,24 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
MonsterContral m = kv.Value;
if (m == null || !m.gameObject.activeInHierarchy) continue;
// ⭐ 只恢复本次冰冻记录的鱼（frozenFishStates 有记录才恢复）
// 避免用 frozenFishIsMoves 的旧数据覆盖未冻结鱼的 isMove
if (!frozenFishStates.TryGetValue(m.guid, out var prevState))
continue;
// 恢复冰冻前的 isMove 和 currState
if (frozenFishIsMoves.TryGetValue(m.guid, out var prevIsMove))
m.isMove = prevIsMove;
else
m.isMove = true; // 兜底：没记录就恢复为可移动
m.SetFreezeEffect(false);
m.ChangeState(prevState);
if (frozenFishStates.TryGetValue(m.guid, out var prevState))
{
// 被本次冰冻冻结的鱼：恢复冰冻前的 isMove 和 currState
m.isMove = frozenFishIsMoves.TryGetValue(m.guid, out var prevIsMove)
? prevIsMove
: m.baseMmove;
m.ChangeState(prevState);
}
else
{
// ⭐ 不在冰冻记录里的鱼（冰冻期间新激活的，OnEnable 把 isMove 设成了 false）
// 用 baseMmove 恢复预制体默认状态，避免解冻后永远不动
m.isMove = m.baseMmove;
if (m.baseMmove)
m.ChangeState(CharacterStateType.move);
}
}
}
Assets/MyGame/Scripts/Manager/GameManager.cs
+16 -5
View File
@@ -4,6 +4,7 @@ using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
using CameraShake;
using Newtonsoft.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
@@ -326,17 +327,27 @@ public class GameManager : MonoSingleton<GameManager>
// Start is called before the first frame update
public Button btn_Skip;
public VideoClip startVideoClip;
IEnumerator yanchi(LoadingPanel loadingPanel)
{
yield return new WaitForSeconds(5);
btn_Skip.gameObject.SetActive(true);
yield return new WaitForSeconds(23f);
loadingPanel.LoadBar(100);
}
void Start()
{
btn_Skip.gameObject.SetActive(false);
var v = UIManager.Instance.ShowLoadPanel(startVideoClip);
UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, (a) =>
{
v.LoadBar(100);
}, 28);
//UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, (a) =>
//{
// v.LoadBar(100);
//}, 28);
StartCoroutine(yanchi(v));
btn_Skip.onClick.AddListener(() =>
{
UIManager.Instance.StopShowPanel();
UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, null, 0);
//UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, null, 0);
v.LoadBar(100);
});
}
Assets/MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs
+2 -2
View File
@@ -114,7 +114,7 @@ public class BJEventBase : MonoBehaviour
}
/// <summary>
/// 自动补充分数版：tMP_Score 为空 → 优先用 scorePanelPrefab → 否则用 Manager 的 dieFXPrefabAwardTmp
/// 父对象挂在 CreateFishManager.Instance.bjEffectRoot 下
/// 父对象挂在 CreateFishManager.Instance.currGameType.subPanelParent 下（随 UI 卸载自动清理）
/// </summary>
protected virtual void EnsureScoreBoard()
{
@@ -122,7 +122,7 @@ public class BJEventBase : MonoBehaviour
if (!useScorePanel) return;
if (CreateFishManager.Instance == null || CreateFishManager.Instance.currGameType == null) return;
var parent = CreateFishManager.Instance.bjEffectRoot;
var parent = CreateFishManager.Instance.currGameType.subPanelParent;
if (parent == null) return;
// 1. 优先用 Inspector 设置的预制体
Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadingPanel.cs
+1
View File
@@ -20,6 +20,7 @@ public class LoadingPanel : MonoBehaviour
{
if (count == 100)
{
GameManager.Instance.btn_Skip.gameObject.SetActive(false);
Destroy(gameObject, fadeTime);
if (player.gameObject.activeSelf)
{
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+73 -21
View File
@@ -183,6 +183,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
private Dictionary<int, string> botTargetGuid = new Dictionary<int, string>();
// bot 锁定同步节流:记录上次广播的锁定目标 guid(null 表示未锁定),只有目标变化才广播
private Dictionary<int, string> botLastSyncLockGuid = new Dictionary<int, string>();
// bot 炮台状态同步节流:记录上次广播的 TurretState,只有状态变化才广播
private Dictionary<int, TurretState> botLastSyncTurretState = new Dictionary<int, TurretState>();
// bot 状态计时：开火后持续 Attack 动画，空闲 0.3s 切回 Idle
private Dictionary<int, float> botIdleTimer = new Dictionary<int, float>();
// bot 最近的 FrameData_FireBullet（给其他客户端还原技能状态）
@@ -644,10 +646,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
HandleAutoFire(); // 自动开火真正发射
HandleLock();
UpdateLockFX();
HandleAutoLock(); // ⭐ 先切换锁定目标(切换后图标位置同帧更新)
UpdateLockFX(); // 锁定图标跟随目标
RefreshTripleLockIcons();
HandleAutoLock();
LoopLaser();
SettingClose();
DaoJiShi();
@@ -2116,7 +2118,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
switch (propNumber)
{
case "40004": // 暴走
case "40004": // 暴走 — 个人效果，只有使用者自己生效
// ⭐ 狂暴是个人增益(攻速翻倍+炮台动画),不是全房间效果。
// 服务器会把 UsePropNotice 广播给房间内所有人,必须判断 userId
// 否则别人用狂暴,本地也开了狂暴
if (userId != GameManager.Instance.user.id) break;
_localBaoZouCount--;
UpdateSkillPropsUI();
CreateFishManager.Instance.currGameType.isFrenzy = true;
@@ -2126,22 +2132,33 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
break;
case "40003": // 冰封
_localBingFengCount--;
UpdateSkillPropsUI();
currBingFengTime = bingFengDuration;
toggle_BingFeng.SetIsOnWithoutNotify(true);
if (bingFengEffect != null)
{
if (_bingFengInstance == null)
_bingFengInstance = Instantiate(bingFengEffect);
_bingFengInstance.SetActive(true);
// ⭐ 个人效果(数量/toggle/倒计时/广播):只有使用者自己执行
// 服务器把 UsePropNotice 广播给房间内所有人,不判断 userId 会导致
// 别人用冰封,本地数量也减了、toggle 也亮了、倒计时也走了
bool isLocalSender = userId == GameManager.Instance.user.id;
if (isLocalSender)
{
_localBingFengCount--;
UpdateSkillPropsUI();
currBingFengTime = bingFengDuration;
toggle_BingFeng.SetIsOnWithoutNotify(true);
// ⭐ 只有发起者广播,避免其他客户端重复广播
SyncFreeze(true);
}
// ⭐ 房间效果(冻结鱼/暂停动画/冰冻特效):所有客户端都执行
// FreezeAllFish/PauseAllFishAnimations 内部有 isFrozen 守卫,
// 重复调用安全(不会覆盖已记录的状态)
if (bingFengEffect != null)
{
if (_bingFengInstance == null)
_bingFengInstance = Instantiate(bingFengEffect);
_bingFengInstance.SetActive(true);
}
CreateFishManager.Instance.FreezeAllFish();
PauseAllFishAnimations();
break;
}
CreateFishManager.Instance.FreezeAllFish();
PauseAllFishAnimations();
// ⭐ 广播冰冻给其他客户端(包括人机房主代发的场景)
// 之前只走 UsePropNotice 本地冻结,没广播 → 多人房间其他人不冻结
SyncFreeze(true);
break;
}
}
@@ -2168,6 +2185,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
private void PauseAllFishAnimations()
{
// ⭐ 守卫：已暂停时直接返回,避免重复调用覆盖已记录的速度
// (其他客户端会先后被 OnUsePropNotice 和 SyncGameData_FreezeFish 触发两次,
// 第二次会记录 speed=0,解冻时恢复成 0 → 动画永远暂停)
if (_frozenAnimSpeeds.Count > 0) return;
var root = CreateFishManager.Instance.fishRoot;
if (root == null) return;
_frozenAnimSpeeds.Clear();
@@ -2390,10 +2412,12 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
botIdleTimer[sit.posID] = 0f;
botIdleTimer[sit.posID] += Time.deltaTime;
if (botIdleTimer[sit.posID] > 0.3f)
{
sit.ChangeState(TurretState.Idle);
botIdleTimer[sit.posID] = 0f;
}
{
sit.ChangeState(TurretState.Idle);
// ⭐ 广播炮台闲置状态给其他客户端(节流:状态变化才广播)
SyncBotTurretState(sit, TurretState.Idle);
botIdleTimer[sit.posID] = 0f;
}
}
}
@@ -2676,6 +2700,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// 清理记忆
botTargetGuid.Remove(sit.posID);
botLastSyncLockGuid.Remove(sit.posID);
botLastSyncTurretState.Remove(sit.posID);
botFireTimer.Remove(sit.posID);
botIdleTimer.Remove(sit.posID);
botSkills.Remove(sit.posID);
@@ -2713,6 +2738,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
private void BotFire(SitPosData sit, MonsterContral target, BotSkillRuntime skill, BotBehaviorMode mode, BotConfig cfg, BotBehaviorConfig behavior)
{
sit.ChangeState(TurretState.Attack);
// ⭐ 广播炮台攻击状态给其他客户端(节流:状态变化才广播)
SyncBotTurretState(sit, TurretState.Attack);
if (!botIdleTimer.ContainsKey(sit.posID))
botIdleTimer[sit.posID] = 0f;
botIdleTimer[sit.posID] = 0f;
@@ -3058,6 +3085,31 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
WebSocketSendList.SyncGameData(sgd);
}
/// <summary>
/// 机器人炮台状态广播(房主代发,复用 changeTurretState 帧类型)。
/// 用 bot 自己的 sitPos,接收端 SyncGameData_TurretState 会根据 sitPos
/// 调用 sit.ChangeState(state) 切换炮台动画。
/// 内置节流:只有状态变化才广播(避免空闲时每帧广播 Idle)。
/// 走 LV2 队列(0.5s flush 一次),对 bot 攻击动画可接受。
/// </summary>
private void SyncBotTurretState(SitPosData botSit, TurretState state)
{
if (botSit == null) return;
// ⭐ 节流:状态未变化不广播
if (botLastSyncTurretState.TryGetValue(botSit.posID, out var lastSynced) && lastSynced == state)
return;
botLastSyncTurretState[botSit.posID] = state;
SyncGameData sgd = new SyncGameData
{
sitPos = botSit.posID,
frameType = FrameDataType.changeTurretState,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_TurretState { state = state }
};
WebSocketSendList.SyncGameData(sgd);
}
/// <summary>人机开火同步（房主代发）</summary>
private void SyncFire_ForBot(SitPosData botSit, float angle, long gold,
bool isSanShe, bool isDouble, bool isLock, List<string> monsterIDs)
Assets/MyGame/aa/UI/Home/Sub/BackPack/item.prefab
+1 -1
View File
@@ -725,7 +725,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2dae17c3f3238644694b12e66eb98eb6, type: 2}
m_Sprite: {fileID: 21300000, guid: bb2d2828634ba0f44b3ec0999df799c1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab
+1 -1
View File
@@ -3652,7 +3652,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2a96573aa6360c649a6cf0bd081381e4, type: 3}
m_Sprite: {fileID: 21300000, guid: bb2d2828634ba0f44b3ec0999df799c1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/bgm_boss_296.ogg
BIN
View File
Binary file not shown.
Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/bgm_boss_296.ogg.meta
+23
View File
@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: f18c58b72bacd904086b0ff2f3c2cb9b
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab
+1
View File
@@ -14440,6 +14440,7 @@ MonoBehaviour:
btn_CloseTiShi: {fileID: 3816178143571972111}
btn_QuXiao: {fileID: 6454333256910143079}
btn_ChongZhi: {fileID: 440625705587057031}
audioClipHHWK: {fileID: 8300000, guid: f18c58b72bacd904086b0ff2f3c2cb9b, type: 3}
--- !u!222 &800961214862860709
CanvasRenderer:
m_ObjectHideFlags: 0
Assets/MyGame/aa/UI/Home/Sub/ServicePanel 1.prefab
-6041
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs
+11 -12
View File
@@ -237,16 +237,11 @@ public class UIHome_BY_BackPackPanel : SubUIBase
Destroy(pageParent.GetChild(j).gameObject);
propsObjHashCode_Dic.Clear();
bool isfirst = true;
Toggle firstToggle = null;
Toggle savedToggle = null;
foreach (BaseProductCount product in propsID_Dic.Values)
{
// 第一项或与保存的选中id匹配 → 设为选中详情
if (isfirst || product.number == savedPropID)
{
ShowPropDetail(product);
isfirst = false;
}
GameObject obj = Instantiate(prefabItem.gameObject, pageParent);
var tempItem = obj.GetComponent<BackPackPropItem>();
tempItem.Init(new BackPackPropItemData
@@ -256,17 +251,21 @@ public class UIHome_BY_BackPackPanel : SubUIBase
propEnum = (PropEnum)product.type
});
var toggle = obj.GetComponent<Toggle>();
propsObjHashCode_Dic[obj.GetHashCode()] = product;
string capturedNum = product.number;
if (firstToggle == null) firstToggle = toggle;
if (!string.IsNullOrEmpty(savedPropID) && product.number == savedPropID)
savedToggle = toggle;
obj.GetComponent<Toggle>().onValueChanged.AddListener((value) =>
{
if (value) ShowPropDetail(product);
});
}
// 默认选中第一项（isOn 触发 onValueChanged 自动显示详情）
if (pageParent.childCount > 0)
pageParent.GetChild(0).GetComponent<Toggle>().isOn = true;
// 优先选中刷新前的道具；若已用完则选中第一个
var target = savedToggle ?? firstToggle;
if (target != null) target.isOn = true;
}
private void ShowPropDetail(BaseProductCount product)
Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
+2
View File
@@ -170,6 +170,7 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
}
public AudioClip audioClipHHWK;
public override void Show(object args = null)
{
base.Show(args);
@@ -195,6 +196,7 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
break;
case GameType.HHWK:
AudioManager.Instance.ChangeBG(61001);
AudioManager.Instance.ChangeBG(audioClipHHWK);
break;
default:
break;
Assets/MyGame/aa/UI/Login/UILoginPanel.cs
+1 -1
View File
@@ -76,7 +76,7 @@ phoneLogin1.SetActive(false);
public override void Show(object args = null)
{
base.Show(args);
Destroy(GameManager.Instance.btn_Skip.gameObject);
if (loadingParent.activeSelf)
{