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-03 17:50:59 +08:00
parent fa6214375d
commit 59d9a01e5f
27 changed files with 2644 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset
+14
View File
@@ -1546,6 +1546,20 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e7d0264baa6137747b87aff98413772a
m_Address: Assets/Art/XJMH/pw/pw_sprite/handbook/tsfj_njs.png
m_ReadOnly: 0
m_SerializedLabels:
- TuJian
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e781d8249397b5e4f92c6f554ba81945
m_Address: Assets/Art/XJMH/pw/pw_sprite/handbook/tsfj_nfl.png
m_ReadOnly: 0
m_SerializedLabels:
- TuJian
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e7dfdabfd9b5ece4290cd4b696ece133
m_Address: Assets/MyGame/aa/Game/XJMH/Sound/PW_Settle_BaoFu1.ogg
m_ReadOnly: 0
Assets/Art/XJMH/pw/pw_atals/battery/lvptpaotai/putongpaotai1.png.meta
+35 -9
View File
@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -30,7 +30,7 @@ TextureImporter:
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 4
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
@@ -39,14 +39,14 @@ TextureImporter:
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
@@ -65,14 +65,14 @@ TextureImporter:
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -85,7 +85,33 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -98,7 +124,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -123,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/userinfo/hz_gx_6.png.meta
+35 -9
View File
@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -30,7 +30,7 @@ TextureImporter:
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 4
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
@@ -39,14 +39,14 @@ TextureImporter:
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
@@ -65,14 +65,14 @@ TextureImporter:
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -85,7 +85,33 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -98,7 +124,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -123,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_effect/materials/FJ_glow_18.mat
+7 -15
View File
@@ -2,38 +2,30 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FJ_glow_18
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- FOG_DISABLED
- _ALPHACHANNEL_R
m_ShaderKeywords: FOG_DISABLED _ALPHACHANNEL_R
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
_MainTex:
m_Texture: {fileID: 2800000, guid: 5fda6ecf23068bc4592ea7643e71a741, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 14
- _DisableFog: 1
- _InvFade: 1
_ColorMask: 14
_DisableFog: 1
_InvFade: 1
m_Colors:
- _TintColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.5}
m_BuildTextureStacks: []
_TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Assets/Art/XJMH/pw/pw_effect/materials/FJ_glow_19.mat
+7 -14
View File
@@ -2,37 +2,30 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FJ_glow_19
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- FOG_DISABLED
m_ShaderKeywords: FOG_DISABLED
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
_MainTex:
m_Texture: {fileID: 2800000, guid: da5a9dfbfd832964d85f034e6a8e12f9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 14
- _DisableFog: 1
- _InvFade: 1
_ColorMask: 14
_DisableFog: 1
_InvFade: 1
m_Colors:
- _TintColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.5}
m_BuildTextureStacks: []
_TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Assets/Art/XJMH/pw/pw_effect/materials/FJ_glow_28.mat
+5 -11
View File
@@ -2,34 +2,28 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FJ_glow_28
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
_MainTex:
m_Texture: {fileID: 2800000, guid: 75d309cbf202b3e42ab4bb54bda25380, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _InvFade: 1
_InvFade: 1
m_Colors:
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
_TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Assets/Art/XJMH/pw/pw_effect/materials/FJ_lizi_04.mat
+5 -11
View File
@@ -2,34 +2,28 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FJ_lizi_04
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
_MainTex:
m_Texture: {fileID: 2800000, guid: 140d786bd923df749aa9dfca293d4e46, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _InvFade: 1
_InvFade: 1
m_Colors:
- _TintColor: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 0.5}
m_BuildTextureStacks: []
_TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_1.prefab
+27 -27
View File
@@ -578,7 +578,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1502787830614766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fe8f3fc59dc06ea6b45a1bbee64682, type: 3}
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
@@ -603,7 +603,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1502787830614766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b6b0933debec03db3ed40115224c1a8, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -678,7 +678,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1487353646419994}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -707,7 +707,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1487353646419994}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -777,7 +777,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1936684868509242}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -810,7 +810,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1936684868509242}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.1529412, g: 0.3137255, b: 0.1960784, a: 1}
@@ -9760,10 +9760,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1114394025079541}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -9832,7 +9832,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1623584695762664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9861,7 +9861,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1623584695762664}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -9931,7 +9931,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1098690424230093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9960,7 +9960,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1098690424230093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10060,7 +10060,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1330693099937645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10111,7 +10111,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1330693099937645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10159,7 +10159,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1497226401066754}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10210,7 +10210,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1497226401066754}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10308,10 +10308,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1941752568427444}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -14883,7 +14883,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1705127197946736}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14939,7 +14939,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1491441211426522}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14972,7 +14972,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1491441211426522}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.2666667, g: 0.2431373, b: 0.2352941, a: 1}
@@ -15014,7 +15014,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1051786330138776}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15101,7 +15101,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1905317733162052}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15157,7 +15157,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1045776791918394}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15213,7 +15213,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1515817542015711}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15288,7 +15288,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1628300092575202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15317,7 +15317,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1628300092575202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_2.prefab
+27 -27
View File
@@ -578,7 +578,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1115159662918892}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fe8f3fc59dc06ea6b45a1bbee64682, type: 3}
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
@@ -603,7 +603,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1115159662918892}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b6b0933debec03db3ed40115224c1a8, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -678,7 +678,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1864883433340322}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -707,7 +707,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1864883433340322}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -777,7 +777,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1828828106924334}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -810,7 +810,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1828828106924334}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.1137255, g: 0.3137255, b: 0.4039216, a: 1}
@@ -9760,10 +9760,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1414067264556072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -9832,7 +9832,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1690803995956780}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9861,7 +9861,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1690803995956780}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -9931,7 +9931,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1238716686921825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9960,7 +9960,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1238716686921825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10060,7 +10060,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1842670854220053}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10111,7 +10111,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1842670854220053}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10159,7 +10159,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1620377154631918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10210,7 +10210,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1620377154631918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10308,10 +10308,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1862582816144257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -14883,7 +14883,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1504128039883037}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14939,7 +14939,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1581031850514540}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14972,7 +14972,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1581031850514540}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.2666667, g: 0.2431373, b: 0.2352941, a: 1}
@@ -15014,7 +15014,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1459479766321648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15101,7 +15101,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1077135769358813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15157,7 +15157,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1034233297494949}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15213,7 +15213,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1690241070846958}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15288,7 +15288,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1270389615568336}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15317,7 +15317,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1270389615568336}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_3.prefab
+27 -27
View File
@@ -578,7 +578,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1724132355677389}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fe8f3fc59dc06ea6b45a1bbee64682, type: 3}
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
@@ -603,7 +603,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1724132355677389}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b6b0933debec03db3ed40115224c1a8, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -678,7 +678,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1136530162905059}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -707,7 +707,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1136530162905059}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -777,7 +777,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1506720878806274}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -810,7 +810,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1506720878806274}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.4, g: 0.2039216, b: 0.1137255, a: 1}
@@ -9760,10 +9760,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1128075317453381}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -9832,7 +9832,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1323434655067039}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9861,7 +9861,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1323434655067039}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -9931,7 +9931,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1704192300745228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9960,7 +9960,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1704192300745228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10060,7 +10060,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1029060963670283}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10111,7 +10111,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1029060963670283}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10159,7 +10159,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1033284933426165}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10210,7 +10210,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1033284933426165}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10308,10 +10308,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1454450011347419}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -14883,7 +14883,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1120113681496619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14939,7 +14939,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1730636145100810}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14972,7 +14972,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1730636145100810}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.2666667, g: 0.2431373, b: 0.2352941, a: 1}
@@ -15014,7 +15014,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1555955381078531}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15101,7 +15101,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1314358839730690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15157,7 +15157,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1286090814033940}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15213,7 +15213,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1101809263485985}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15288,7 +15288,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1838088200440562}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15317,7 +15317,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1838088200440562}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_4.prefab
+27 -27
View File
@@ -578,7 +578,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1490185297348758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fe8f3fc59dc06ea6b45a1bbee64682, type: 3}
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
@@ -603,7 +603,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1490185297348758}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b6b0933debec03db3ed40115224c1a8, type: 3}
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -678,7 +678,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1152774541543745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -707,7 +707,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1152774541543745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -777,7 +777,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1006358754823862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -810,7 +810,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1006358754823862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.4, g: 0.2039216, b: 0.1137255, a: 1}
@@ -9760,10 +9760,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1471610875003719}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -9832,7 +9832,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1129695800455169}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9861,7 +9861,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1129695800455169}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -9931,7 +9931,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1466856939302812}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -9960,7 +9960,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1466856939302812}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10060,7 +10060,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1396719879827444}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10111,7 +10111,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1396719879827444}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10159,7 +10159,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1174013118893263}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
@@ -10210,7 +10210,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1174013118893263}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -10308,10 +10308,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1478550119126802}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff326197253ae4cec0b46632391386ec, type: 3}
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3e1b334aed74eec479ebcfb0007a77ea, type: 2}
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
@@ -14883,7 +14883,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1832592753735591}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14939,7 +14939,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1688533742052918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -14972,7 +14972,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1688533742052918}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 598ca59b26b303be9752bcc87e36626e, type: 3}
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.2666667, g: 0.2431373, b: 0.2352941, a: 1}
@@ -15014,7 +15014,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1295903152860468}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04f84fc2003509a5e7e068ec1271cc40, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15101,7 +15101,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1515748201962841}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15157,7 +15157,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1513938755257582}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15213,7 +15213,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1310369865220066}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15288,7 +15288,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1806631500832474}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5a44414476512e00c3e7a2569a919, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -15317,7 +15317,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1806631500832474}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18d0a90695249463551c00f45766e642, type: 3}
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_hjpt/PW_Spine_Battery_HJPT2.png.meta
+30 -61
View File
@@ -1,9 +1,11 @@
fileFormatVersion: 2
guid: 18ef8988a7dbff540ba27460bd573b33
timeCreated: 1766415474
licenseType: Free
TextureImporter:
serializedVersion: 11
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -20,12 +22,9 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -43,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
@@ -52,92 +51,62 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
platformSettings:
- serializedVersion: 4
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
spriteID:
internalID: 0
vertices: []
indices:
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
spritePackingTag:
output:
textureImportInstructions:
compressedFormat: 0
uncompressedFormat: 0
desiredFormat: 0
usageMode: 0
colorSpace: 0
androidETC2FallbackFormat: 0
width: 0
height: 0
compressionQuality: 0
androidETC2FallbackDownscale: 0
sourceTextureInformation:
width: 0
height: 0
doesTextureContainAlpha: 0
sourceWasHDR: 0
importInspectorWarnings:
pSDRemoveMatte: 0
userData:
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: pw_prefab
assetBundleVariant:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_hjpt/PW_Spine_Battery_HJPT2_Material.mat
-1
View File
@@ -43,4 +43,3 @@ Material:
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_lan/PW_Spine_Battery_Lan2.png.meta
+30 -61
View File
@@ -1,9 +1,11 @@
fileFormatVersion: 2
guid: 47d99833466e32e4d9d3fcb4bb2fef24
timeCreated: 1766415474
licenseType: Free
TextureImporter:
serializedVersion: 11
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -20,12 +22,9 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -43,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
@@ -52,92 +51,62 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
platformSettings:
- serializedVersion: 4
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
spriteID:
internalID: 0
vertices: []
indices:
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
spritePackingTag:
output:
textureImportInstructions:
compressedFormat: 0
uncompressedFormat: 0
desiredFormat: 0
usageMode: 0
colorSpace: 0
androidETC2FallbackFormat: 0
width: 0
height: 0
compressionQuality: 0
androidETC2FallbackDownscale: 0
sourceTextureInformation:
width: 0
height: 0
doesTextureContainAlpha: 0
sourceWasHDR: 0
importInspectorWarnings:
pSDRemoveMatte: 0
userData:
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: pw_prefab
assetBundleVariant:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_lan/PW_Spine_Battery_Lan2_Material.mat
-1
View File
@@ -43,4 +43,3 @@ Material:
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_lv/PW_Spine_Battery_Lv2.png.meta
+30 -61
View File
@@ -1,9 +1,11 @@
fileFormatVersion: 2
guid: 17432739e3f886f4b9f06ff7e7c74fd2
timeCreated: 1766415473
licenseType: Free
TextureImporter:
serializedVersion: 11
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -20,12 +22,9 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -43,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
@@ -52,92 +51,62 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
platformSettings:
- serializedVersion: 4
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
spriteID:
internalID: 0
vertices: []
indices:
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
spritePackingTag:
output:
textureImportInstructions:
compressedFormat: 0
uncompressedFormat: 0
desiredFormat: 0
usageMode: 0
colorSpace: 0
androidETC2FallbackFormat: 0
width: 0
height: 0
compressionQuality: 0
androidETC2FallbackDownscale: 0
sourceTextureInformation:
width: 0
height: 0
doesTextureContainAlpha: 0
sourceWasHDR: 0
importInspectorWarnings:
pSDRemoveMatte: 0
userData:
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: pw_prefab
assetBundleVariant:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_lv/PW_Spine_Battery_Lv2_Material.mat
-1
View File
@@ -43,4 +43,3 @@ Material:
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_vip/PW_Spine_Battery_Vip2.png.meta
+30 -61
View File
@@ -1,9 +1,11 @@
fileFormatVersion: 2
guid: 63851ffcd6a031c4e82efae234e9fcee
timeCreated: 1766415474
licenseType: Free
TextureImporter:
serializedVersion: 11
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -20,12 +22,9 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -43,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
@@ -52,92 +51,62 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
platformSettings:
- serializedVersion: 4
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
spriteID:
internalID: 0
vertices: []
indices:
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
spritePackingTag:
output:
textureImportInstructions:
compressedFormat: 0
uncompressedFormat: 0
desiredFormat: 0
usageMode: 0
colorSpace: 0
androidETC2FallbackFormat: 0
width: 0
height: 0
compressionQuality: 0
androidETC2FallbackDownscale: 0
sourceTextureInformation:
width: 0
height: 0
doesTextureContainAlpha: 0
sourceWasHDR: 0
importInspectorWarnings:
pSDRemoveMatte: 0
userData:
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: pw_prefab
assetBundleVariant:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_spine/pw_spine_battery/pw_spine_battery_vip/PW_Spine_Battery_Vip2_Material.mat
-1
View File
@@ -43,4 +43,3 @@ Material:
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs
+83 -17
View File
@@ -4,6 +4,7 @@ using DG.Tweening;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using TMPro;
using UnityEngine;
using UnityEngine.AddressableAssets;
@@ -157,26 +158,15 @@ public class MonsterControl_BossBase : MonsterContral
_isPlayingCreateVideo = true;
}
// Boss 进场播报
// Boss 进场播报（XJMH）
// 新版：按 lua 的 PW_Effect_Boss_Appear 播报（屏幕左侧滑入 + 播报图 + mul + "xxx入场"）
// 兜底：面板上的 boardCast_Boss 不是播报版式时，退回旧的简易播报（"xxx来了"）
if (GameManager.Instance.gameData.currGameType == GameType.XJMH)
{
var handle = Addressables.LoadAssetAsync<Sprite>($"Assets/Art/XJMH/pw/pw_sprite/handbook/{bossName}.png");
await handle.Task;
// ⭐ async void Init 防污染:await 期间 Boss 可能被回收(对象池复用)或销毁(退出房间)。
// 检查顺序很重要:先 this == null(被 Destroy),再 activeInHierarchy(被回收),最后令牌
// Unity 重写 == 运算符:被 Destroy 的 MonoBehaviour 比较 == null 返回 true
if (this == null || token != _initToken || !gameObject.activeInHierarchy)
if (!TryPlayBossAppearTip())
{
if (this != null)
Debug.Log($"[MonsterControl_BossBase] Init await 完成,但令牌已变或 Boss 已回收/销毁,跳过: {bossName} token={token} curr={_initToken} active={gameObject.activeInHierarchy}");
return;
}
if (CreateFishManager.Instance != null && CreateFishManager.Instance.currGameType != null
&& CreateFishManager.Instance.currGameType.subUIManager != null)
{
CreateFishManager.Instance.currGameType.subUIManager.ShowBoardBoss(handle.Result, bossName);
// 旧播报要异步等图鉴图；await 期间可能被回收/销毁 → 返回 false 表示 Init 必须中止
if (!await LegacyBossBoardCast(token)) return;
}
}
@@ -214,6 +204,82 @@ public class MonsterControl_BossBase : MonsterContral
child.localPosition = localPos;
}
// ==================== Boss 进场播报（XJMH） ====================
/// <summary>
/// XJMH Boss 出场播报（对齐 lua pw_enemy/*.txt 的 CreateAppearTip）。
///
/// lua 逻辑：
/// 1. Boss OnCreate → CreateAppearTip() → EffectMgr.CreateEffect("EnemyAppearEffect",
/// "PW_Effect_Boss_Appear", {prefab = 怪物type, isBoss = true})
/// 2. 播报内容取 PW_Config.Enemy[type].appearTip：
/// image → 播报图（handbook/tsfj_*.png）、mul → "Boss"/"大Boss"/"特殊奖励"、name → "xxx入场"
/// 3. 动画：MotionNode (-822,100) →(-568,100) 0.2s EOutSine → 显示粒子 → 停 2.5s → 滑出 → 销毁
/// 4. 各 Boss 再补自己的出场语音（TextScorpion / TextShark / TextDragon ...，
/// C# 侧已由各自的 *_BOSS.cs OnEnable 播；102/112/113/114/115 走 AppearTip）
///
/// 播报预制体取面板上的 boardCast_Boss（GameMainPanelXJMH.prefab 拖的是
/// Art/XJMH/pw/pw_prefab/game/effect/PW_Effect_Boss_Appear.prefab，Inspector 可随时替换/清空）。
/// 具体播报/配置表见 BossAppearTipXJMH.cs。
/// </summary>
/// <returns>true=新版播报已接管（含"该 Boss 没配播报/上一条还在播"的跳过）；
/// false=面板上的预制体不是播报版式，调用方走旧播报兜底</returns>
private bool TryPlayBossAppearTip()
{
var gameType = CreateFishManager.Instance != null ? CreateFishManager.Instance.currGameType : null;
if (gameType == null || gameType.subUIManager == null) return false;
var prefab = gameType.subUIManager.boardCast_Boss;
if (prefab == null)
{
Debug.LogWarning("[MonsterControl_BossBase] 面板 boardCast_Boss 未配置，Boss 出场播报不显示");
return false;
}
// 父节点用子面板层（随 UI 卸载自动清理）；fishTypeID 是项目鱼表编号，bossName 是中文名，
// 两者一起交给播报组件做配置匹配（见 BossAppearTipXJMH.TryGetData）
var parent = gameType.subPanelParent != null ? gameType.subPanelParent : gameType.subUIManager.parent;
return BossAppearTipXJMH.TryPlay(prefab, parent, fishTypeID, bossName);
}
/// <summary>
/// 旧的简易播报兜底（面板上的 boardCast_Boss 不是 PW_Effect_Boss_Appear 版式时才会走到）：
/// 按 bossName 加载图鉴图 + "xxx来了"，只做淡出。
/// </summary>
/// <returns>false 表示 await 期间 Boss 已被回收/销毁，Init 必须中止</returns>
private async Task<bool> LegacyBossBoardCast(int token)
{
Sprite sprite = null;
try
{
var handle = Addressables.LoadAssetAsync<Sprite>($"Assets/Art/XJMH/pw/pw_sprite/handbook/{bossName}.png");
await handle.Task;
sprite = handle.Status == AsyncOperationStatus.Succeeded ? handle.Result : null;
}
catch (Exception e)
{
Debug.LogWarning($"[MonsterControl_BossBase] 旧播报图加载失败({bossName})：{e.Message}");
}
// ⭐ async void Init 防污染:await 期间 Boss 可能被回收(对象池复用)或销毁(退出房间)。
// 检查顺序很重要:先 this == null(被 Destroy),再 activeInHierarchy(被回收),最后令牌
// Unity 重写 == 运算符:被 Destroy 的 MonoBehaviour 比较 == null 返回 true
if (this == null || token != _initToken || !gameObject.activeInHierarchy)
{
if (this != null)
Debug.Log($"[MonsterControl_BossBase] Init await 完成,但令牌已变或 Boss 已回收/销毁,跳过: {bossName} token={token} curr={_initToken} active={gameObject.activeInHierarchy}");
return false;
}
if (CreateFishManager.Instance != null && CreateFishManager.Instance.currGameType != null
&& CreateFishManager.Instance.currGameType.subUIManager != null)
{
CreateFishManager.Instance.currGameType.subUIManager.ShowBoardBoss(sprite, bossName);
}
return true;
}
/// <summary>
/// 创建视频播放结束回调:隐藏视频控件 + 重置播放状态
/// (用 loopPointReached 事件,比 OnMoveUpdata 检测更可靠,
Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+1 -1
View File
@@ -1969,7 +1969,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
{
long oldGold = sitData.goldNum; // 记录加金币前的值
sitData.goldNum += goldToAdd; // 使用副本，不再依赖 killFish 对象
sitData.tMP_GoldNum.text = sitData.goldNum.ToString();
sitData.SetGoldNumText(sitData.goldNum);
currGameType?.ShowGoldColumn(sitData, goldToAdd); // 座位金币柱（XJMH 覆写，其它房间空实现）
AudioManager.Instance.PlayerFX(audioID);
// ⭐ 记录金币流水：已加钱（杀鱼获得，本地已执行）
Assets/MyGame/Scripts/Net/WebSocketReponseList.cs
+1 -2
View File
@@ -332,8 +332,7 @@ namespace Assets.MyGame.Scripts.Net
GameManager.LogGoldFlowReceiveCost("SyncPlayerGold", $"推送金币={gold} 修正前金币={oldGold} 差值={diff} 座位={panel.currSitData.posID}");
panel.currSitData.goldNum = gold;
if (panel.currSitData.tMP_GoldNum != null)
panel.currSitData.tMP_GoldNum.text = gold.ToString();
panel.currSitData.SetGoldNumText(gold);
// ⭐ 记录金币流水：已执行修正（本地已写入）
if (diff > 0)
Assets/MyGame/Scripts/Turret/SitPosData.cs
+50 -4
View File
@@ -82,9 +82,18 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
[Header("金币")]
public long goldNum;
public long consumeGoldNum;
[Tooltip("金币数显示（TMP）。与 goldNum_UGUI 二选一：预制体用哪种组件就拖哪个")]
public TextMeshProUGUI tMP_GoldNum;
[Tooltip("金币数显示（旧版 UGUI Text）。与 tMP_GoldNum 二选一")]
public Text goldNum_UGUI;
[Tooltip("钻石数显示（TMP）。与 diamondNum_UGUI 二选一：预制体用哪种组件就拖哪个")]
public TextMeshProUGUI tMP_DiamondNum;
[Tooltip("钻石数显示（旧版 UGUI Text）。与 tMP_DiamondNum 二选一")]
public Text diamondNum_UGUI;
[Tooltip("炮倍消耗显示（TMP）。与 turretConsumeNum_UGUI 二选一：预制体用哪种组件就拖哪个")]
public TextMeshProUGUI tMP_TurretConsumeNum;
[Tooltip("炮倍消耗显示（旧版 UGUI Text）。与 tMP_TurretConsumeNum 二选一")]
public Text turretConsumeNum_UGUI;
[Header("翅膀")]
[Tooltip("翅膀实例化的父节点")]
@@ -272,9 +281,14 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
if (turretControlMode != TurretControlMode.XJMH)
EnsureJGFXParents();
// XJMH 模式：隐藏钻石显示（只显示金币）
if (turretControlMode == TurretControlMode.XJMH && tMP_DiamondNum != null)
tMP_DiamondNum.gameObject.SetActive(false);
// XJMH 模式：隐藏钻石显示（只显示金币；TMP 与旧版 UGUI Text 哪个拖了藏哪个）
if (turretControlMode == TurretControlMode.XJMH)
{
if (tMP_DiamondNum != null)
tMP_DiamondNum.gameObject.SetActive(false);
if (diamondNum_UGUI != null)
diamondNum_UGUI.gameObject.SetActive(false);
}
// XJMH 模式：炮台是座位自带子对象，不需要从资源加载，只做初始化
// （整理炮台列表 + 激活默认炮台 = 列表索引 0）
@@ -1797,6 +1811,38 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
: Vector2.zero;
}
// ==================== 金币/钻石/炮倍显示（TMP 与旧版 UGUI Text 双支持） ====================
/// <summary>刷新金币显示：优先 TMP，回退旧版 UGUI Text（两个字段在预制体上二选一拖）</summary>
public void SetGoldNumText(long gold)
{
string text = gold.ToString();
if (tMP_GoldNum != null)
tMP_GoldNum.text = text;
else if (goldNum_UGUI != null)
goldNum_UGUI.text = text;
}
/// <summary>刷新钻石显示：优先 TMP，回退旧版 UGUI Text（两个字段在预制体上二选一拖）</summary>
public void SetDiamondNumText(long diamond)
{
string text = diamond.ToString();
if (tMP_DiamondNum != null)
tMP_DiamondNum.text = text;
else if (diamondNum_UGUI != null)
diamondNum_UGUI.text = text;
}
/// <summary>刷新炮倍消耗显示：优先 TMP，回退旧版 UGUI Text（两个字段在预制体上二选一拖）</summary>
public void SetTurretConsumeNumText(long consume)
{
string text = consume.ToString();
if (tMP_TurretConsumeNum != null)
tMP_TurretConsumeNum.text = text;
else if (turretConsumeNum_UGUI != null)
turretConsumeNum_UGUI.text = text;
}
// ==================== 金币消耗 ====================
public bool ConsumeGold(int mul = 1, long fireConsumeGold = 0)
@@ -1808,7 +1854,7 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
if (temp < 0) return false;
long oldGold = goldNum;
goldNum = temp;
tMP_GoldNum.text = goldNum.ToString();
SetGoldNumText(goldNum);
// ⭐ 记录金币流水：已扣钱（开火消耗，本地已执行）
GameManager.LogGoldFlowAppliedCost("Fire", $"开火消耗 原有金币={oldGold} 消耗金币=-{useConsume} 剩余金币={goldNum} 座位={posID} 房间={GameManager.Instance.gameData?.currRoomData?.roomId}");
return true;
Assets/MyGame/aa/Game/XJMH/Boss/BossAppearTipXJMH.cs
+496
View File
@@ -0,0 +1,496 @@
using System;
using System.Collections.Generic;
using DG.Tweening;
using TMPro;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
using UnityEngine.UI;
/// <summary>
/// XJMH Boss 出场播报（把 lua 的 EnemyAppearEffect:BossAppear 搬到 C#）。
///
/// ── 原版流程（lua）──
/// Boss OnCreate（= C# 的 MonsterControl_BossBase.Init）→ CreateAppearTip()：
/// GC.EffectMgr.CreateEffect("EnemyAppearEffect", "PW_Effect_Boss_Appear",
/// {prefab = self.enemyId, isBoss = true});
/// 各 Boss 再自己补出场语音（TextScorpion / TextShark / TextDragon ...），
/// 而 102/112/113/114/115 这几个没有专属类，走基类 Enemy:CreateAppearTip → 播 AppearTip。
/// 播报本体（pw_effect/PW_Effect.txt → EnemyAppearEffect:BossAppear）：
/// Image.sprite = config.appearTip.image ← 专属播报图（handbook/tsfj_*.png）
/// Mul.text = config.appearTip.mul ← "Boss" / "大Boss" / "特殊奖励" / "最高奖励xxxx倍"
/// Name.text = config.appearTip.name ← "xxx入场"
/// MotionNode: (-822,100) →(-568,100) 0.2s EOutSine → 显示粒子 Effect
/// → 停 2.5s → 回 (-822,100) 0.2s EInSine → 销毁
///
/// ── 本项目三个坑（都在这段逻辑里处理掉）──
/// 1. 预制体 PW_Effect_Boss_Appear 的 Mul / Name 在原工程挂的是自定义 Text 组件，该脚本没导入本
/// 项目（历史提交 f93ed7bbc 已把这两个组件删掉）→ 这里运行时补 TextMeshProUGUI。
/// ⚠️ IL2CPP 铁律：运行时 AddComponent 的文本必须显式设 font，否则不显示。
/// 2. 预制体根节点自带 (-822,100) 的 anchoredPosition，而 lua 只动 MotionNode →
/// 生成后必须先把根节点归零，否则位移叠加会跑到屏幕外看不见。
/// 3. 播报图按「专属播报图 → 图鉴图」的顺序尝试加载：部分 Boss 美术还没出专属播报图。
/// 4. 整条播报是纯展示层，所有 Graphic 都要 raycastTarget=false，否则会挡住打鱼点击。
/// </summary>
public class BossAppearTipXJMH : MonoBehaviour
{
// ==================== 预制体节点名（Art/XJMH/pw/pw_prefab/game/effect/PW_Effect_Boss_Appear.prefab）====================
private const string NodeMotion = "MotionNode"; // 参与滑入/滑出的节点
private const string NodeImage = "Image"; // 播报图
private const string NodeFrame = "Frame"; // 底框（lua 不动，保留预制体自带）
private const string NodeName = "Name"; // "xxx入场"
private const string NodeMul = "Mul"; // "Boss"/"大Boss"/"特殊奖励"
private const string NodeEffect = "Effect"; // 粒子（滑入结束才显示）
// ==================== 动画参数（lua EnemyAppearEffect:BossAppear 原值，画布按 1136x640 设计）====================
// lua: motionNode.localPosition = (-822,100) → localMoveTo(-568,100,0.2,EOutSine)
// → delay 2.5 → localMoveTo(-822,100,0.2,EInSine) → 销毁
// 注意：-568 正好是 1136 宽画布的左边缘（-1136/2），也就是"播报贴屏幕左边、滑出后完全移出屏幕"。
private const float LuaCanvasWidth = 1136f;
private const float LuaStartX = -822f;
private const float LuaEndX = -568f;
private const float LuaY = 100f;
private const float TipSlideInTime = 0.2f;
private const float TipHoldTime = 2.5f; // 停留
private const float TipSlideOutTime = 0.2f;
/// <summary>true=按实际画布宽度等比换算（终点贴左边缘，和 lua 的相对位置一致）；
/// false=直接用 lua 原值。位置不对时可用 TipStartXOverride / TipEndXOverride 手调。</summary>
public static bool AdaptToCanvasWidth = true;
/// <summary>手动覆盖起点 X（AdaptToCanvasWidth=false 时才用）</summary>
public static float TipStartXOverride = LuaStartX;
/// <summary>手动覆盖终点 X（AdaptToCanvasWidth=false 时才用）</summary>
public static float TipEndXOverride = LuaEndX;
// ==================== 文字样式（取自被删掉的原始自定义 Text 组件）====================
private static readonly Color TipTextColor = new Color(1f, 0.7764706f, 0f, 1f); // 金色
private const float TipMulFontSize = 23f;
private const float TipNameFontSize = 27f;
// ==================== 播报图目录 ====================
private const string HandbookDir = "Assets/Art/XJMH/pw/pw_sprite/handbook/";
// ==================== 运行状态 ====================
private RectTransform _motion;
private Image _image;
private TextMeshProUGUI _nameText;
private TextMeshProUGUI _mulText;
private Transform _effect;
private Sequence _seq;
private AsyncOperationHandle<Sprite> _spriteHandle;
private bool _hasSpriteHandle;
/// <summary>当前是否有播报在播（同一时刻只留一条，避免 Boss 连刷时叠图）</summary>
public static bool IsPlaying { get; private set; }
// ================================================================
// 配置表（对齐 lua pw_config/PW_Config.txt → PW_Config.Enemy[].appearTip）
// ================================================================
/// <summary>单个 Boss 的播报配置</summary>
[Serializable]
public class AppearTipData
{
/// <summary>项目鱼表编号（tbfishresources.json 的 fishNumber，= C# MonsterContral.fishTypeID）。
/// 0 表示只按 bossName 匹配（该 Boss 还没进鱼表）</summary>
public int fishTypeId;
/// <summary>中文名（= 预制体 MonsterControl_BossBase.bossName，也等于 lua PW_Config.Enemy[].name）</summary>
public string bossName;
/// <summary>lua type（PW_Config.Enemy[].type），仅注释用</summary>
public int luaType;
/// <summary>Mul 文本</summary>
public string mul;
/// <summary>Name 文本</summary>
public string title;
/// <summary>播报图地址，按顺序尝试（专用播报图 → 图鉴图兜底）</summary>
public string[] imageAddresses;
/// <summary>出场语音（可空：Boss 自己在 OnEnable 已经播过的不重复播）</summary>
public string soundName;
}
private static readonly AppearTipData[] Tips =
{
// ── 真 Boss：lua 有专属类，出场语音由各自的 *_BOSS.cs OnEnable 负责（这里不重复播）──
new AppearTipData
{
fishTypeId = 12026, bossName = "爆裂金鲨", luaType = 1000, mul = "Boss", title = "爆裂金鲨入场",
imageAddresses = new[] { HandbookDir + "tsfj_njs.png", HandbookDir + "爆裂金鲨.png" },
},
new AppearTipData
{
fishTypeId = 12028, bossName = "机械蝎", luaType = 3000, mul = "大Boss", title = "机械蝎入场",
// ⚠️ 专属播报图 tsfj_xiez.png 项目里还没有 → 自动回退图鉴图 机械蝎.png
imageAddresses = new[] { HandbookDir + "tsfj_xiez.png", HandbookDir + "机械蝎.png" },
},
new AppearTipData
{
fishTypeId = 12029, bossName = "星际巡航", luaType = 4000, mul = "大Boss", title = "星际巡航入场",
imageAddresses = new[] { HandbookDir + "星际巡航.png", HandbookDir + "tsfj_xjxh.png" },
},
new AppearTipData
{
fishTypeId = 12030, bossName = "破坏球", luaType = 5000, mul = "Boss", title = "破坏球入场",
imageAddresses = new[] { HandbookDir + "破坏球.png", HandbookDir + "tsfj_phq.png" },
},
new AppearTipData
{
fishTypeId = 12031, bossName = "幸运轮", luaType = 6000, mul = "Boss", title = "幸运轮",
// 幸运轮.png 本身就是专属播报图（与 tsfj_xyl.png 同一张）
imageAddresses = new[] { HandbookDir + "幸运轮.png", HandbookDir + "tsfj_xyl.png" },
},
// ── 特殊玩法 / 免费道具：lua 无专属类 → 走基类，出场音是 AppearTip ──
new AppearTipData
{
fishTypeId = 12034, bossName = "烈焰风暴", luaType = 115, mul = "特殊奖励", title = "烈焰风暴入场",
imageAddresses = new[] { HandbookDir + "烈焰风暴.png" }, soundName = "PW_AppearTip",
},
new AppearTipData
{
fishTypeId = 12022, bossName = "幸运飞碟", luaType = 114, mul = "最高奖励1500倍", title = "幸运飞碟入场",
imageAddresses = new[] { HandbookDir + "幸运飞碟.png" }, soundName = "PW_AppearTip",
},
new AppearTipData
{
fishTypeId = 12023, bossName = "小丑扑克", luaType = 113, mul = "最高奖励1600倍", title = "小丑扑克入场",
imageAddresses = new[] { HandbookDir + "小丑扑克.png" }, soundName = "PW_AppearTip",
},
new AppearTipData
{
fishTypeId = 12024, bossName = "黑洞飞船", luaType = 112, mul = "特殊奖励", title = "黑洞飞船入场",
imageAddresses = new[] { HandbookDir + "黑洞飞船.png" }, soundName = "PW_AppearTip",
},
new AppearTipData
{
fishTypeId = 12025, bossName = "弹药箱", luaType = 102, mul = "特殊奖励", title = "弹药箱入场",
imageAddresses = new[] { HandbookDir + "弹药箱.png" }, soundName = "PW_AppearTip",
},
// ── 还没进鱼表 / 项目里没有 Boss 预制体，仅按中文名兜底（保留配置，接上即生效）──
new AppearTipData
{
fishTypeId = 0, bossName = "女王龙", luaType = 2000, mul = "大Boss", title = "女王龙入场",
imageAddresses = new[] { HandbookDir + "tsfj_nfl.png", HandbookDir + "女王龙.png" },
},
};
private static Dictionary<int, AppearTipData> _byFishId;
private static Dictionary<string, AppearTipData> _byNameOnly;
private static void EnsureIndex()
{
if (_byFishId != null) return;
_byFishId = new Dictionary<int, AppearTipData>();
// _byNameOnly 只收 fishTypeId<=0 的纯名字行：避免某个预制体的 bossName 被误填
// （例如 7001 存钱罐的 bossName 被填成"小丑扑克"）时，在按名字兜底这条路上
// 命中 12023（小丑扑克）的行 —— 有编号的行只走编号匹配。
_byNameOnly = new Dictionary<string, AppearTipData>();
foreach (var t in Tips)
{
if (t.fishTypeId > 0)
{
if (!_byFishId.ContainsKey(t.fishTypeId)) _byFishId.Add(t.fishTypeId, t);
}
else if (!string.IsNullOrEmpty(t.bossName))
{
if (!_byNameOnly.ContainsKey(t.bossName)) _byNameOnly.Add(t.bossName, t);
}
}
}
/// <summary>查配置：先按项目鱼表编号精确命中，再按中文名兜底</summary>
public static bool TryGetData(int fishTypeId, string bossName, out AppearTipData data)
{
EnsureIndex();
if (fishTypeId > 0 && _byFishId.TryGetValue(fishTypeId, out data)) return true;
if (!string.IsNullOrEmpty(bossName) && _byNameOnly.TryGetValue(bossName, out data)) return true;
data = null;
return false;
}
/// <summary>该 Boss 是否有出场播报配置（供调用方决定要不要退回旧播报）</summary>
public static bool HasData(int fishTypeId, string bossName) => TryGetData(fishTypeId, bossName, out _);
// ================================================================
// 对外入口
// ================================================================
/// <summary>
/// 播放一次出场播报。
/// </summary>
/// <param name="prefab">播报预制体（PW_Effect_Boss_Appear，取自面板的 boardCast_Boss 字段）</param>
/// <param name="parent">UI 父节点（子面板层，随 UI 卸载自动清理）</param>
/// <param name="fishTypeId">C# MonsterContral.fishTypeID（项目鱼表编号）</param>
/// <param name="bossName">Boss 中文名（MonsterControl_BossBase.bossName）</param>
/// <param name="font">文本字体（可空 → TMP_Settings.defaultFontAsset = SourceHanSans SDF）</param>
/// <returns>
/// true = 本系统已接管（无论实际有没有播：没配播报的 Boss、或上一条还在播都会返回 true，
/// 这样调用方就不会再退回旧播报导致两条叠着显示）；
/// false = 面板上的预制体不是播报版式（缺 MotionNode），调用方可以退回旧播报。
/// </returns>
public static bool TryPlay(GameObject prefab, Transform parent, int fishTypeId, string bossName,
TMP_FontAsset font = null)
{
if (prefab == null || parent == null || !Application.isPlaying) return false;
// 版式判定：播报预制体必须有 MotionNode；否则说明面板上挂的还是旧播报预制体
if (prefab.transform.Find(NodeMotion) == null)
{
Debug.LogWarning($"[BossAppearTip] 预制体 {prefab.name} 里没有 {NodeMotion} 节点，" +
"不是 PW_Effect_Boss_Appear 版式，本次不播（可用旧播报兜底）");
return false;
}
if (!TryGetData(fishTypeId, bossName, out var data))
{
// 没配播报的 Boss（如存钱罐 7001 / 机甲雷霆 Z_4030、或 bossName 填错的预制体）
// 直接不出场播报，绝不退回旧播报——否则会拿 bossName 去乱套图鉴图
Debug.Log($"[BossAppearTip] 未配置出场播报，跳过：fishTypeId={fishTypeId} bossName={bossName}");
return true;
}
if (IsPlaying)
{
Debug.Log($"[BossAppearTip] 上一条出场播报还没播完，本次跳过：{bossName}");
return true;
}
var go = Instantiate(prefab, parent);
go.name = "BossAppearTip_" + (string.IsNullOrEmpty(bossName) ? fishTypeId.ToString() : bossName);
var tip = go.GetComponent<BossAppearTipXJMH>();
if (tip == null) tip = go.AddComponent<BossAppearTipXJMH>();
tip.Play(data, font);
return true;
}
// ================================================================
// 播放流程
// ================================================================
/// <summary>本次播放使用的字体（Play 传入，可空 → 用 TMP 默认字体）</summary>
private TMP_FontAsset _tipFont;
private void Play(AppearTipData data, TMP_FontAsset font)
{
IsPlaying = true;
_tipFont = font; // 供 ResolveNodes → EnsureTmpText 使用
// ⭐ 坑2：根节点预制体自带 (-822,100)，lua 只动 MotionNode → 先把根归零
var rootRt = transform as RectTransform;
if (rootRt != null) rootRt.anchoredPosition = Vector2.zero;
ResolveNodes();
// ---- 文本（坑1：运行时补 TMP）----
if (_mulText != null && !string.IsNullOrEmpty(data.mul)) _mulText.text = data.mul;
if (_nameText != null && !string.IsNullOrEmpty(data.title)) _nameText.text = data.title;
// ---- 播报图（坑3：按顺序尝试，第一个加载到就用）----
LoadSprite(data.imageAddresses);
// ---- 粒子：滑入结束才显示（lua: frameEffect:SetActive(false) → 滑入结束 SetActive(true)）----
if (_effect != null) _effect.gameObject.SetActive(false);
// ---- 动画（lua EnemyAppearEffect:BossAppear）----
if (_motion == null)
{
Debug.LogWarning($"[BossAppearTip] 找不到 {NodeMotion}，播报直接销毁");
DestroyTip(0f);
return;
}
_seq?.Kill();
_seq = DOTween.Sequence();
ComputeLayout(out float startX, out float endX);
_motion.anchoredPosition = new Vector2(startX, LuaY);
_seq.Append(_motion.DOAnchorPos(new Vector2(endX, LuaY), TipSlideInTime).SetEase(Ease.OutSine));
_seq.AppendCallback(() => { if (_effect != null) _effect.gameObject.SetActive(true); });
_seq.AppendInterval(TipHoldTime);
_seq.Append(_motion.DOAnchorPos(new Vector2(startX, LuaY), TipSlideOutTime).SetEase(Ease.InSine));
_seq.OnComplete(() => DestroyTip(0f));
// ---- 出场语音 ----
if (!string.IsNullOrEmpty(data.soundName))
AudioManager.Instance.PlayerFXByName(data.soundName);
Debug.Log($"[BossAppearTip] 播报 {data.title}（{data.mul}）fishTypeId={data.fishTypeId} " +
$"起点/终点=({startX:F0},{LuaY:F0})→({endX:F0},{LuaY:F0})");
}
/// <summary>
/// 算滑入起止 X。
/// lua 的 -822/-568 是按 1136x640 画布设计的，-568 正好是画布左边缘；
/// 本项目画布更宽（UIScene 参考分辨率 1624x750），直接照搬播报会飘在屏幕中间偏左，
/// 所以默认按「画布宽度 / 1136」等比换算，保证终点始终贴屏幕左边缘。
/// </summary>
private void ComputeLayout(out float startX, out float endX)
{
if (!AdaptToCanvasWidth)
{
startX = TipStartXOverride;
endX = TipEndXOverride;
return;
}
float canvasWidth = LuaCanvasWidth;
// 从父节点往上找根 Canvas（播报自己的根节点上挂了 Canvas，不能从自己往上找）
if (transform.parent != null)
{
var canvas = transform.parent.GetComponentInParent<Canvas>();
var root = canvas != null ? canvas.rootCanvas : null;
var rootRt = root != null ? root.transform as RectTransform : null;
if (rootRt != null && rootRt.rect.width > 1f) canvasWidth = rootRt.rect.width;
}
float scale = canvasWidth / LuaCanvasWidth;
endX = -canvasWidth * 0.5f;
startX = endX - (LuaEndX - LuaStartX) * scale; // 滑入距离 254 等比换算
}
/// <summary>取节点引用；Mul / Name 运行时补 TextMeshProUGUI（原自定义 Text 组件未导入本项目）</summary>
private void ResolveNodes()
{
Transform motion = transform.Find(NodeMotion);
if (motion != null)
{
// MotionNode 的 anchor 是 (0.5,0.5)，anchoredPosition 即 lua 里的 localPosition
_motion = motion as RectTransform;
var imageTf = motion.Find(NodeImage);
if (imageTf != null)
{
_image = imageTf.GetComponent<Image>();
if (_image != null)
{
_image.raycastTarget = false; // 坑4：不挡打鱼点击
_image.preserveAspect = true; // 各 Boss 播报图比例不同，避免拉伸变形
// 预制体自带的示例图是"女王龙"的播报图，先关掉，等目标图加载好再显示，
// 否则别的 Boss 出场会闪一下女王龙。
_image.enabled = false;
}
}
// Frame（底框）：lua 不动它（用预制体自带），只关掉射线检测
var frameTf = motion.Find(NodeFrame);
var frameImg = frameTf != null ? frameTf.GetComponent<Image>() : null;
if (frameImg != null) frameImg.raycastTarget = false;
_effect = motion.Find(NodeEffect);
_nameText = EnsureTmpText(motion, NodeName, TipNameFontSize);
_mulText = EnsureTmpText(motion, NodeMul, TipMulFontSize);
}
else
{
Debug.LogError($"[BossAppearTip] 预制体里找不到 {NodeMotion} 节点");
}
}
/// <summary>
/// 给节点补 TMP 文本（已有就复用）。
/// ⚠️ Mul 节点上挂了一个 Canvas（原工程为粒子/文字排序用），保留不动，TMP 直接加在该节点上。
/// </summary>
private TextMeshProUGUI EnsureTmpText(Transform parent, string nodeName, float fontSize)
{
Transform tf = parent.Find(nodeName);
if (tf == null)
{
Debug.LogWarning($"[BossAppearTip] 预制体里找不到 {nodeName} 节点，文本不显示");
return null;
}
var tmp = tf.GetComponent<TextMeshProUGUI>();
if (tmp == null)
{
// 兜底：万一节点上有残留的 UGUI Text，先关掉避免叠字
var legacy = tf.GetComponent<Text>();
if (legacy != null) legacy.enabled = false;
tmp = tf.gameObject.AddComponent<TextMeshProUGUI>();
}
// ⭐ 铁律：运行时 AddComponent 的文本必须显式设字体，否则不显示
tmp.font = _tipFont != null ? _tipFont : TMP_Settings.defaultFontAsset;
tmp.fontSize = fontSize;
tmp.fontStyle = FontStyles.Bold; // 原组件 m_FontStyle=2
tmp.alignment = TextAlignmentOptions.Center; // 原组件 m_Alignment=4
tmp.color = TipTextColor;
tmp.raycastTarget = false;
return tmp;
}
/// <summary>按顺序尝试加载播报图（Addressables 地址），第一个成功就用</summary>
private async void LoadSprite(string[] addresses)
{
if (_image == null || addresses == null || addresses.Length == 0) return;
for (int i = 0; i < addresses.Length; i++)
{
string address = addresses[i];
if (string.IsNullOrEmpty(address)) continue;
// 地址没注册时 LoadAssetAsync 可能直接抛 InvalidKeyException，所以整段兜起来
AsyncOperationHandle<Sprite> handle = default;
Sprite sprite = null;
try
{
handle = Addressables.LoadAssetAsync<Sprite>(address);
sprite = await handle.Task;
}
catch (Exception e)
{
Debug.LogWarning($"[BossAppearTip] 播报图加载失败，试下一张：{address} → {e.Message}");
if (handle.IsValid()) Addressables.Release(handle);
continue;
}
if (this == null || _image == null)
{
if (handle.IsValid()) Addressables.Release(handle);
return;
}
if (handle.Status == AsyncOperationStatus.Succeeded && sprite != null)
{
_image.sprite = sprite;
_image.enabled = true; // 图到位才显示（避免闪预制体自带的示例图）
_spriteHandle = handle;
_hasSpriteHandle = true;
return;
}
if (handle.IsValid()) Addressables.Release(handle);
Debug.LogWarning($"[BossAppearTip] 播报图不存在，试下一张：{address}");
}
Debug.LogWarning($"[BossAppearTip] 播报图全部加载失败：{string.Join(" / ", addresses)}");
}
private void DestroyTip(float delay)
{
if (delay > 0f) DOVirtual.DelayedCall(delay, () => { if (this != null) Destroy(gameObject); });
else Destroy(gameObject);
}
private void OnDestroy()
{
IsPlaying = false;
_seq?.Kill();
_seq = null;
if (_hasSpriteHandle && _spriteHandle.IsValid()) Addressables.Release(_spriteHandle);
_hasSpriteHandle = false;
_motion = null; _image = null;
_nameText = null; _mulText = null; _effect = null;
}
}
Assets/MyGame/aa/Game/XJMH/Boss/BossAppearTipXJMH.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 47d446c5932ecf6438ee7f6620d2affb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+15 -14
View File
@@ -467,8 +467,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (currSitData != null && user?.assets != null && !WebSocketManager.Instance.isGame)
{
currSitData.goldNum = user.assets.gold;
if (currSitData.tMP_GoldNum != null)
currSitData.tMP_GoldNum.text = user.assets.gold.ToString();
currSitData.SetGoldNumText(user.assets.gold);
}
}
@@ -634,6 +633,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public override void Awake()
{
base.Awake();
// ⭐ 把面板上拖的 boss 播报预制体交给 SubUIManager：
// 以前这里没赋值 → subUIManager.boardCast_Boss 一直是 null，Boss 出场播报根本不显示。
// 现在 XJMH 用它播 lua 的 PW_Effect_Boss_Appear（见 BossAppearTipXJMH.cs）
if (subUIManager != null)
subUIManager.boardCast_Boss = boardCast_Boss;
GameManager.Instance.OnUserDataChanged += RefreshGGKCount;
baseAttackTime = attackTime;
btn_ChangeTurret.onClick.AddListener(() =>
@@ -2215,8 +2219,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
Action<int> jiaFen = (audioID) =>
{
targetSit.goldNum += gold;
if (targetSit.tMP_GoldNum != null)
targetSit.tMP_GoldNum.text = targetSit.goldNum.ToString();
targetSit.SetGoldNumText(targetSit.goldNum);
ShowGoldColumn(targetSit, gold); // 鱼雷结算：使用者座位金币柱
AudioManager.Instance.PlayerFX(audioID);
};
@@ -4587,7 +4590,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
var data = FrameDataParser.Parse<FrameData_ChangeCannonMultiple>(sync.frameData);
var sit = list_Sits[dispPos];
sit.consumeGoldNum = data.cannonMultiple;
sit.tMP_TurretConsumeNum.text = data.cannonMultiple.ToString();
sit.SetTurretConsumeNumText(data.cannonMultiple);
}
/// <summary>
@@ -4602,8 +4605,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
sit.consumeGoldNum = multiple;
sit.SyncIndexByConsume(multiple);
if (sit.tMP_TurretConsumeNum != null)
sit.tMP_TurretConsumeNum.text = multiple.ToString();
sit.SetTurretConsumeNumText(multiple);
}
/// <summary>
@@ -4888,11 +4890,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (sit.isBot)
InitBotRuntimeState(sit, goldNum);
sit.tMP_GoldNum.text = goldNum.ToString();
// XJMH 模式不显示钻石，tMP_DiamondNum 已隐藏
if (sit.turretControlMode != TurretControlMode.XJMH && sit.tMP_DiamondNum != null)
sit.tMP_DiamondNum.text = diamondNum.ToString();
sit.tMP_TurretConsumeNum.text = consumeGold.ToString();
sit.SetGoldNumText(goldNum);
// XJMH 模式不显示钻石（tMP_DiamondNum/diamondNum_UGUI 已在 Awake 隐藏）
if (sit.turretControlMode != TurretControlMode.XJMH)
sit.SetDiamondNumText(diamondNum);
sit.SetTurretConsumeNumText(consumeGold);
sit.ShowPlayer();
@@ -5260,8 +5262,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// （BotConfig.initialLevelIndex / 升降档 ±step / 金币比例判断均不变），
// 应用到列表时做镜像映射：0=最小档=列表末尾，count-1=最大档=列表头部
sit.consumeGoldNum = paoBeiList[paoBeiList.Count - 1 - targetIndex];
if (sit.tMP_TurretConsumeNum != null)
sit.tMP_TurretConsumeNum.text = sit.consumeGoldNum.ToString();
sit.SetTurretConsumeNumText(sit.consumeGoldNum);
// ⭐ 同步 indexConsume,保持档位索引与 consumeGoldNum 一致
sit.SyncIndexByConsume(sit.consumeGoldNum);
Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
+1651 -16
View File
File diff suppressed because it is too large Load Diff