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-10-09 16:45:46 +08:00
parent 4a8c66dcaf
commit 6769b7f31c
29 changed files with 563 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+2 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: a263e71fce79f2f4cb5b5f1fa6b7291a
m_currentHash:
serializedVersion: 2
Hash: 3b2ddf0423273ab9d68b887ff1cc1809
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
@@ -47,6 +47,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: fcc697a6587205543acfb2a32347c100, type: 2}
- {fileID: 11400000, guid: c0b3b611be2f4f24f9d72d2676e58d51, type: 2}
- {fileID: 11400000, guid: b4f01f1670cc33f4587db7361d183233, type: 2}
- {fileID: 11400000, guid: 95f7c3baf2c413d4a838cc0e4c2be95d, type: 2}
- {fileID: 11400000, guid: 427f94f67624e374895487c87f881a7f, type: 2}
- {fileID: 11400000, guid: ca4eb1ed7a9a8bc4bbcc5d865fd723a4, type: 2}
- {fileID: 11400000, guid: 59a1dc2550990aa4091c8db201571a43, type: 2}
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
-13
View File
@@ -31,12 +31,6 @@ MonoBehaviour:
- PTCBZS
- ZSYX
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 26f68c48bf8dba74dba3fe7f38ae6e60
m_Address: XJMHCreateFish.asset
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3ff18466016e86542b372582f348d0d6
m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab
m_ReadOnly: 0
@@ -112,13 +106,6 @@ MonoBehaviour:
- Audio
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c0665105ad467074a9d951a074b6c71b
m_Address: Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Enemy_4000.prefab
m_ReadOnly: 0
m_SerializedLabels:
- FishPrefab
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c37a24b1b9382e04c86ecae674a7e071
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_Bg.ogg
m_ReadOnly: 0
Assets/AddressableAssetsData/AssetGroups/Fish_HHWK.asset
-14
View File
@@ -1102,13 +1102,6 @@ MonoBehaviour:
- FishPrefab
- HHWK
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 835b61b6f33236b408b6039f602c21b7
m_Address: Assets/Art/HHWK/TuJianTexture/fish_4003 Variant.png
m_ReadOnly: 0
m_SerializedLabels:
- HHWK
- TuJian
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 85458b3de14925148ba1726e3377bf46
m_Address: Assets/Art/HHWK/res/texture/dynamic/Game177_fish1.png
m_ReadOnly: 0
@@ -1536,13 +1529,6 @@ MonoBehaviour:
- FishPrefab
- HHWK
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c17a739a966f73c429b83f6563bdb7e9
m_Address: Assets/Art/HHWK/res/texture/dynamic/Game177_baigujing.png
m_ReadOnly: 0
m_SerializedLabels:
- HHWK
- TuJian
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c1ac974aa51666c46b76467475fbb0d8
m_Address: Assets/game_download/games/game177/prefab/fish/Game177_tangseng_hei.prefab
m_ReadOnly: 0
Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset
+13 -18
View File
@@ -261,6 +261,12 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 26f68c48bf8dba74dba3fe7f38ae6e60
m_Address: XJMHCreateFish.asset
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 28a2d5b95a5e93e4aa8f48b0275a1731
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_Prop_IronFist_Show.ogg
m_ReadOnly: 0
@@ -429,12 +435,6 @@ MonoBehaviour:
- TuJian
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3b6ce020d078b524ab9f8ea29d7fe431
m_Address: Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_zd.png
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3c361fb6838b59a40b183bc1dbf9ae2a
m_Address: Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2.prefab
m_ReadOnly: 0
@@ -1138,12 +1138,6 @@ MonoBehaviour:
- TuJian
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: adf779a3413c62744b56021a0ad5c93d
m_Address: Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_ss.png
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aea38e560a41ff44ba0a68d3b3194052
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_TextDragon.ogg
m_ReadOnly: 0
@@ -1172,12 +1166,6 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b40ddb35d439d4546ab220424de7e930
m_Address: Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_sd.png
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b494aa76324a7c84ba8d1b26c9b3d231
m_Address: Assets/Art/XJMH/pw/pw_sprite/handbook/PW_Enemy_32.png
m_ReadOnly: 0
@@ -1248,6 +1236,13 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c0665105ad467074a9d951a074b6c71b
m_Address: Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Enemy_4000.prefab
m_ReadOnly: 0
m_SerializedLabels:
- FishPrefab
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c1976ecaa1fb7904d8ec7f258bc54698
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_StarShip_On_Hit.ogg
m_ReadOnly: 0
Assets/AddressableAssetsData/AssetGroups/GameUIRes.asset
+38
View File
@@ -23,6 +23,27 @@ MonoBehaviour:
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2acc76ba796a4d34a90ee21aa07ef2f6
m_Address: Assets/Art/XJMH/pw/pw_prefab/game/effect/PW_Effect_Boss_Appear.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3b6ce020d078b524ab9f8ea29d7fe431
m_Address: Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_zd.png
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4a2156dc91c438048ae799db55c7113d
m_Address: Assets/Art/XJMH/pw/pw_prefab/item/PW_HelpItem2.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 53ed3608912462847bc3c8795cdbdb50
m_Address: Assets/Art/XJMH/pw/pw_prefab/item/PW_SetLockItem.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7fc72821c53ff6a40b70a711c3d091c6
m_Address: Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
m_ReadOnly: 0
@@ -41,12 +62,24 @@ MonoBehaviour:
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: adf779a3413c62744b56021a0ad5c93d
m_Address: Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_ss.png
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b1a477a312fd1fb4ca04ccd87deec78b
m_Address: Assets/MyGame/aa/UI/Game/HHWK/Sub/TuJian.prefab
m_ReadOnly: 0
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b40ddb35d439d4546ab220424de7e930
m_Address: Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_sd.png
m_ReadOnly: 0
m_SerializedLabels:
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b7049b34ef7178248b09689838182b4d
m_Address: Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
m_ReadOnly: 0
@@ -59,6 +92,11 @@ MonoBehaviour:
m_SerializedLabels:
- Default
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e88bdd8c0b60c9c4e9ce513cd644b5c0
m_Address: Assets/Art/XJMH/pw/pw_prefab/item/PW_HelpItem1.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ee76d1620c700034ea6e509cc403623c
m_Address: Assets/MyGame/aa/UI/Game/GameMainPanel_Default.prefab
m_ReadOnly: 0
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_FLZY_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_HHWK_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/Fish_XJMH_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/GameUIRes_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/HomeUIRes_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/LoginUIRes_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_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: SharedRes_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 95f7c3baf2c413d4a838cc0e4c2be95d, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 2
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: 1
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/SharedRes_BundledAssetGroupSchema.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ac3ebe07c38bb50498d3dfdcff3f1563
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_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: SharedRes_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 95f7c3baf2c413d4a838cc0e4c2be95d, type: 2}
m_StaticContent: 0
Assets/AddressableAssetsData/AssetGroups/Schemas/SharedRes_ContentUpdateGroupSchema.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7059ad0cafb4eb84db5a21c3374f83ed
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/AssetGroups/Schemas/TurretChiBangZhanShenRes_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/Schemas/ZGXQ_BundledAssetGroupSchema.asset
+1 -1
View File
@@ -37,7 +37,7 @@ MonoBehaviour:
m_Id: 2dc81615c3947e64493d7c6552a3f24d
m_LoadPath:
m_Id: 6bd5fad857b09dd439c8b71f4ae1a9d8
m_BundleMode: 0
m_BundleMode: 1
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
Assets/AddressableAssetsData/AssetGroups/SharedRes.asset
+39
View File
@@ -0,0 +1,39 @@
%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: SharedRes
m_EditorClassIdentifier:
m_GroupName: SharedRes
m_Data:
m_SerializedData: []
m_GUID: 3eace2dea0dcd9b49950feed9a07408b
m_SerializeEntries:
- m_GUID: 835b61b6f33236b408b6039f602c21b7
m_Address: Assets/Art/HHWK/TuJianTexture/fish_4003 Variant.png
m_ReadOnly: 0
m_SerializedLabels:
- HHWK
- TuJian
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c17a739a966f73c429b83f6563bdb7e9
m_Address: Assets/Art/HHWK/res/texture/dynamic/Game177_baigujing.png
m_ReadOnly: 0
m_SerializedLabels:
- HHWK
- TuJian
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: ac3ebe07c38bb50498d3dfdcff3f1563, type: 2}
- {fileID: 11400000, guid: 7059ad0cafb4eb84db5a21c3374f83ed, type: 2}
Assets/AddressableAssetsData/AssetGroups/SharedRes.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 95f7c3baf2c413d4a838cc0e4c2be95d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/Art/HHWK/prefab/fish/Game177_dianman.prefab
+34 -1
View File
@@ -28151,7 +28151,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4574304967836189
Transform:
m_ObjectHideFlags: 0
@@ -28228,16 +28228,30 @@ MonoBehaviour:
m_EditorClassIdentifier:
beilv: 0
guid:
lastMoveLineId:
monsterData:
die_Score: 0
isDie: 0
fishTypeConfig:
fishNumber:
fishName:
fishBrief:
fishType: 0
fishScore: 0
killWeight: 0
pathList:
fishImage:
fishMultipleDesc:
moveLine:
bezierCurveData:
name:
start: {x: 0, y: 0}
controlPoints: []
end: {x: 0, y: 0}
moveTime: 0
moveSpeed: 0
cachedCamera: {fileID: 0}
cachedUirootRect: {fileID: 0}
skeleton: {fileID: 0}
isSpine: 1
fishTypeID: 13025
@@ -28252,9 +28266,28 @@ MonoBehaviour:
forwordXYZ: X
fishenum: 1
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: []
needLockEvent: 0
createVideoClip: {fileID: 0}
rotationPY: 60
useMirrorCompensate: 1
useRollSignFlip: 0
useRouteFlipX: 1
baseMmove: 0
isRotate: 1
isNot1: 0
ischild0: 0
depthOffset: 0
is2DFish: 0
sortOrder2D: 0
drawMoveLine: 0
drawLineSegments: 60
drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &1709867586078768
GameObject:
m_ObjectHideFlags: 0
Assets/Art/HHWK/prefab/fish/Game177_fish13.prefab
+36 -1
View File
@@ -1003,7 +1003,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4472185465350827
Transform:
m_ObjectHideFlags: 0
@@ -1077,17 +1077,32 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5e5dca86a57fe2144a34f1f2ddb93962, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
lastMoveLineId:
monsterData:
die_Score: 0
isDie: 0
fishTypeConfig:
fishNumber:
fishName:
fishBrief:
fishType: 0
fishScore: 0
killWeight: 0
pathList:
fishImage:
fishMultipleDesc:
moveLine:
bezierCurveData:
name:
start: {x: 0, y: 0}
controlPoints: []
end: {x: 0, y: 0}
moveTime: 0
moveSpeed: 0
cachedCamera: {fileID: 0}
cachedUirootRect: {fileID: 0}
skeleton: {fileID: 0}
isSpine: 1
fishTypeID: 13014
@@ -1095,14 +1110,34 @@ MonoBehaviour:
HP: 5
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 0}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ: X
fishenum: 1
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: []
needLockEvent: 0
createVideoClip: {fileID: 0}
rotationPY: 60
useMirrorCompensate: 1
useRollSignFlip: 0
useRouteFlipX: 1
baseMmove: 0
isRotate: 1
isNot1: 0
ischild0: 0
depthOffset: 0
is2DFish: 0
sortOrder2D: 0
drawMoveLine: 0
drawLineSegments: 60
drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &1709867586078768
GameObject:
m_ObjectHideFlags: 0
Assets/Art/HHWK/prefab/fish/Game177_zhuantouxie.prefab
+34 -1
View File
@@ -1211,7 +1211,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4344419225485095
Transform:
m_ObjectHideFlags: 0
@@ -1287,16 +1287,30 @@ MonoBehaviour:
m_EditorClassIdentifier:
beilv: 0
guid:
lastMoveLineId:
monsterData:
die_Score: 0
isDie: 0
fishTypeConfig:
fishNumber:
fishName:
fishBrief:
fishType: 0
fishScore: 0
killWeight: 0
pathList:
fishImage:
fishMultipleDesc:
moveLine:
bezierCurveData:
name:
start: {x: 0, y: 0}
controlPoints: []
end: {x: 0, y: 0}
moveTime: 0
moveSpeed: 0
cachedCamera: {fileID: 0}
cachedUirootRect: {fileID: 0}
skeleton: {fileID: 0}
isSpine: 1
fishTypeID: 13024
@@ -1311,9 +1325,28 @@ MonoBehaviour:
forwordXYZ: X
fishenum: 1
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: []
needLockEvent: 0
createVideoClip: {fileID: 0}
rotationPY: 60
useMirrorCompensate: 1
useRollSignFlip: 0
useRouteFlipX: 1
baseMmove: 0
isRotate: 1
isNot1: 0
ischild0: 0
depthOffset: 0
is2DFish: 0
sortOrder2D: 0
drawMoveLine: 0
drawLineSegments: 60
drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &1709867586078768
GameObject:
m_ObjectHideFlags: 0
Assets/Editor/AAFixDependencyMigration.cs
+179
View File
@@ -0,0 +1,179 @@
using System.Text;
using UnityEditor;
using UnityEditor.AddressableAssets;
using UnityEditor.AddressableAssets.Settings;
using UnityEditor.AddressableAssets.Settings.GroupSchemas;
using UnityEngine;
/// <summary>
/// AA 依赖链修复迁移工具（一次性）。
///
/// 【背景】Addressables 加载 bundle 时会递归加载其依赖 bundle，而构建报告显示存在
/// 跨玩法依赖链，导致"未登录就加载鱼包 / 进 A 玩法拉 B 玩法鱼包"：
/// defaultlocalgroup → fish_xjmh → fish_hhwk （启动链：默认音频一碰 D LG 全链拖入）
/// fish_flzy → fish_hhwk （进 FLZY 房拉 HHWK 鱼包）
/// gameuires → fish_xjmh （进任何房间拉 XJMH 鱼包）
///
/// 【修复内容】（对应 2026-10-08 16:41 构建报告分析出的确切依赖边）
/// 1. PW_Enemy_4000.prefab（XJMH Boss，误在 D LG）→ Fish_XJMH 组 断 D LG→fish_xjmh
/// 2. XJMHCreateFish.asset（XJMH 配置，误在 D LG）→ Fish_XJMH 组
/// 3. 新建 SharedRes 组：Game177_baigujing.png（HHWK 图鉴贴图被 XJMH 小丑扑克引用）、
/// fish_4003 Variant.png（HHWK 图鉴贴图被 FLZY 闪电引用）→ SharedRes
/// 断 fish_xjmh→fish_hhwk、fish_flzy→fish_hhwk（两边都只依赖小共享包）
/// 4. GameMainPanelXJMH 引用的 7 个 XJMH 资源（Boss出场特效/帮助Item/技能sprite）
/// → GameUIRes 组 断 gameuires→fish_xjmh
/// （若鱼包资产也引用它们，产生 fish_xjmh→gameuires 边——进房必载面板，无害）
///
/// 【使用】Unity 菜单 Tools → AA依赖修复 → 执行修复并重建Addressables，
/// 完成后用 AABundleMonitor 悬浮窗验证：启动仅 4 个包、进房只加当前玩法鱼包。
/// </summary>
public static class AAFixDependencyMigration
{
[MenuItem("Tools/AA依赖修复/执行修复并重建Addressables")]
public static void Run()
{
if (!EditorUtility.DisplayDialog("AA依赖修复",
"将执行以下迁移（断掉跨玩法 bundle 依赖链）：\n\n" +
"1. PW_Enemy_4000 / XJMHCreateFish → Fish_XJMH 组\n" +
"2. 新建 SharedRes 组，移入 2 张被跨玩法引用的贴图\n" +
"3. GameMainPanelXJMH 引用的 7 个资源 → GameUIRes 组\n\n" +
"迁移完成后可选择立即重建 Addressables。\n继续？",
"执行", "取消"))
return;
var settings = AddressableAssetSettingsDefaultObject.Settings;
if (settings == null)
{
Debug.LogError("[AA依赖修复] 找不到 AddressableAssetSettings");
return;
}
var log = new StringBuilder();
// ---------- ① D LG 里误放的 XJMH 资产 → Fish_XJMH（断 D LG→fish_xjmh 启动链） ----------
var fishXjmh = settings.FindGroup("Fish_XJMH");
if (fishXjmh == null) { Debug.LogError("[AA依赖修复] 找不到 Fish_XJMH 组"); return; }
MoveWithLabels(settings, fishXjmh,
"Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Enemy_4000.prefab",
new[] { "FishPrefab", "XJMH" }, log);
MoveWithLabels(settings, fishXjmh,
"Assets/MyGame/aa/UI/Game/XJMH/XJMHCreateFish.asset",
new[] { "XJMH" }, log);
// ---------- ② 新建 SharedRes 组，移入被跨玩法引用的贴图（断 xjmh/flzy→hhwk） ----------
var shared = settings.FindGroup("SharedRes");
if (shared == null)
{
shared = CreateGroupLike(settings, "SharedRes", "Fish_XJMH");
log.AppendLine("[组] 已创建 SharedRes（打包配置复制自 Fish_XJMH）");
}
// 保留原 TuJian/HHWK 标签：HHWK 玩法的图鉴 Sprite 交集加载(TuJian+HHWK)仍能命中，
// 只是从 SharedRes 包里取；XJMH/FLZY 对它们的引用改为依赖小共享包
MoveKeepLabels(settings, shared, "Assets/Art/HHWK/res/texture/dynamic/Game177_baigujing.png", log);
MoveKeepLabels(settings, shared, "Assets/Art/HHWK/TuJianTexture/fish_4003 Variant.png", log);
// ---------- ③ GameMainPanelXJMH 引用的资源 → GameUIRes（断 gameuires→fish_xjmh） ----------
var gameUi = settings.FindGroup("GameUIRes");
if (gameUi == null) { Debug.LogError("[AA依赖修复] 找不到 GameUIRes 组"); return; }
string[] guiTargets =
{
"Assets/Art/XJMH/pw/pw_prefab/game/effect/PW_Effect_Boss_Appear.prefab",
"Assets/Art/XJMH/pw/pw_prefab/item/PW_HelpItem1.prefab",
"Assets/Art/XJMH/pw/pw_prefab/item/PW_HelpItem2.prefab",
"Assets/Art/XJMH/pw/pw_prefab/item/PW_SetLockItem.prefab",
"Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_sd.png",
"Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_ss.png",
"Assets/Art/XJMH/pw/pw_sprite/common/zd_jn_zd.png",
};
foreach (var t in guiTargets)
MoveKeepLabels(settings, gameUi, t, log);
AssetDatabase.SaveAssets();
Debug.Log("[AA依赖修复] 迁移完成：\n" + log);
// ---------- ④ 重建 ----------
if (EditorUtility.DisplayDialog("AA依赖修复",
"迁移完成：\n" + log + "\n现在重建 Addressables？（约几分钟）",
"立即重建", "稍后手动重建"))
{
Debug.Log("[AA依赖修复] 开始重建 Addressables...");
AddressableAssetSettings.BuildPlayerContent(out var result);
if (result == null || !string.IsNullOrEmpty(result.Error))
{
Debug.LogError("[AA依赖修复] 构建失败: " + (result != null ? result.Error : "无返回结果"));
EditorUtility.DisplayDialog("AA依赖修复", "构建失败: " + (result != null ? result.Error : "无返回结果"), "确定");
}
else
{
Debug.Log("[AA依赖修复] 构建完成");
EditorUtility.DisplayDialog("AA依赖修复",
"构建完成！\n\n验证步骤：\n" +
"1. Play 启动到登录页 → 悬浮窗应只有 4 个包（builtinshaders/LoginUIRes/DefaultLocalGroup/Turret）\n" +
"2. 进任一玩法房间 → 只新增该玩法的鱼包 + gameuires", "确定");
}
}
}
/// <summary>移动资产到目标组并覆盖标签</summary>
private static void MoveWithLabels(AddressableAssetSettings settings, AddressableAssetGroup target,
string path, string[] labels, StringBuilder log)
{
string guid = AssetDatabase.AssetPathToGUID(path);
if (string.IsNullOrEmpty(guid))
{
log.AppendLine("[跳过] 找不到资产: " + path);
return;
}
var entry = settings.CreateOrMoveEntry(guid, target);
if (entry == null)
{
log.AppendLine("[跳过] 移动失败: " + path);
return;
}
entry.labels.Clear();
foreach (var l in labels)
entry.labels.Add(l);
log.AppendLine($"[移动] {path}\n → {target.name}（标签: {string.Join(",", labels)}）");
}
/// <summary>移动资产到目标组，保留原有标签</summary>
private static void MoveKeepLabels(AddressableAssetSettings settings, AddressableAssetGroup target,
string path, StringBuilder log)
{
string guid = AssetDatabase.AssetPathToGUID(path);
if (string.IsNullOrEmpty(guid))
{
log.AppendLine("[跳过] 找不到资产: " + path);
return;
}
var entry = settings.CreateOrMoveEntry(guid, target);
if (entry == null)
{
log.AppendLine("[跳过] 移动失败: " + path);
return;
}
log.AppendLine($"[移动] {path}\n → {target.name}（保留标签: {string.Join(",", entry.labels)}）");
}
/// <summary>按源组的打包配置（BundledAssetGroupSchema/ContentUpdateGroupSchema）创建新组。
/// AddSchema(schema) 内部会复制 schema 并正确挂到新组上，无需手动 CopySerialized。</summary>
private static AddressableAssetGroup CreateGroupLike(AddressableAssetSettings settings,
string newName, string srcGroupName)
{
var src = settings.FindGroup(srcGroupName);
var group = settings.CreateGroup(newName, false, false, false, null);
var srcBundled = src.GetSchema<BundledAssetGroupSchema>();
if (srcBundled != null)
group.AddSchema(srcBundled, false);
var srcContent = src.GetSchema<ContentUpdateGroupSchema>();
if (srcContent != null)
group.AddSchema(srcContent, false);
return group;
}
}
Assets/Editor/AAFixDependencyMigration.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 89e9a25fe5c7fe6408466344b43fd403
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b49a4bf1b5f551b4a9d2af95e265c8ed
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android/launcherTemplate.gradle
+68
View File
@@ -0,0 +1,68 @@
apply plugin: 'com.android.application'
dependencies {
implementation project(':unityLibrary')
}
android {
namespace "**NAMESPACE**"
ndkPath "**NDKPATH**"
compileSdkVersion **APIVERSION**
buildToolsVersion '**BUILDTOOLS**'
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
minSdkVersion **MINSDKVERSION**
targetSdkVersion **TARGETSDKVERSION**
applicationId '**APPLICATIONID**'
ndk {
abiFilters **ABIFILTERS**
}
versionCode **VERSIONCODE**
versionName '**VERSIONNAME**'
}
aaptOptions {
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
}**SIGN**
// ⭐ 修复 lintVitalAnalyzeRelease 构建失败：
// Release 构建时 AGP 会跑 lintVital 检查，其 ExtractAarTransform 在中文 Windows
// (系统编码 GBK) 下读取含中文的 manifest/资源时抛 MalformedInputException
// ("malformed input off : 75")。checkReleaseBuilds false 直接跳过 release 的
// lint 检查任务（Unity 游戏项目不需要 AGP 的 lint），abortOnError false 兜底。
lintOptions {
checkReleaseBuilds false
abortOnError false
}
buildTypes {
debug {
minifyEnabled **MINIFY_DEBUG**
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
jniDebuggable true
}
release {
minifyEnabled **MINIFY_RELEASE**
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
}
}**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS**
**BUILT_APK_LOCATION**
bundle {
language {
enableSplit = false
}
density {
enableSplit = false
}
abi {
enableSplit = true
}
}
}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**
Assets/Plugins/Android/launcherTemplate.gradle.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ba8a85b5f2e9c674c80059103c52b767
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: