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-06 15:53:32 +08:00
parent 1f7b9d837f
commit b7a6e80801
53 changed files with 3029 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/Art/XJMH/pw/pw_atals/battery/huangjinpaotai/huangjinanniu.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/huangjinpaotai/huangjinpaotai.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/huangjinpaotai/zdj_huangjin+.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/huangjinpaotai/zdj_huangjin-.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lanptpaotai/lanptpaotai_3.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lanptpaotai/putongpaotai2.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lanptpaotai/zd_putong+.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lanptpaotai/zd_putong-.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lvptpaotai/lvptpaotai_3.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lvptpaotai/putongpaotai1.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lvptpaotai/zd_putong1+.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/lvptpaotai/zd_putong1-.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/vippaotai01/vippaotai.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/vippaotai01/vippaotai01_3.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/vippaotai01/zd_vip+.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/vippaotai01/zd_vip-.png.meta
+23 -23
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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/zd_ghpt.png.meta
+24 -24
View File
@@ -7,8 +7,8 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
linearTexture: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/zd_tfdr.png.meta
+24 -24
View File
@@ -7,8 +7,8 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
linearTexture: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_atals/battery/zd_wdwz.png.meta
+24 -24
View File
@@ -7,8 +7,8 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
linearTexture: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 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,20 +85,7 @@ TextureImporter:
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: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -111,7 +98,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -124,7 +111,20 @@ 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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -149,5 +149,5 @@ TextureImporter:
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName: pw_atlas
assetBundleName:
assetBundleVariant:
Assets/Art/XJMH/pw/pw_prefab/item/PW_HelpItem1.prefab
+1 -1
View File
@@ -582,7 +582,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1000
Assets/Art/XJMH/pw/pw_prefab/item/PW_SetLockItem.prefab
+1 -1
View File
@@ -152,7 +152,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1000
Assets/MyGame/Scenes/UIScene.unity
+1 -1
View File
@@ -4281,7 +4281,7 @@ MonoBehaviour:
spawnList: []
isCreateFish: 0
isFrozen: 0
debugSpawnFishNumber: 12034
debugSpawnFishNumber: 11029
isleft: 0
debugSpawnAllLines: 0
fishList_All: []
Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+1 -1
View File
@@ -1277,7 +1277,7 @@ public class MonsterContral : MonoBehaviour
// 受击 & 死亡
// ================================================================
/// <summary>触发受击闪烁（0.2s 后自动关闭）。子类可 override 实现受击阶段逻辑（如爆裂金鲨首炮切战损）。</summary>
/// <summary>触发受击闪烁（0.2s 后自动关闭）。子类可 override 追加受击表现（如爆裂金鲨首炮切战损，属本地近似）。</summary>
public virtual void OnHurt()
{
if (hurt != null)
Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
+4 -2
View File
@@ -207,12 +207,14 @@ namespace Assets.MyGame.Scripts.Net
break;
case "ExitRoomSuccess":
{
// 4.4 退出成功（自己）：清空本地房间状态 → 回大厅重拉列表（0 = 重新加入大厅通知组）
// 4.4 退出成功（自己）：清空本地房间状态 → 面板还开着（被踢/其他路径）才回大厅刷列表
var va = JsonConvert.DeserializeObject<WebSocketResponseBase<string>>(msg).arguments[0];
if (GameManager.Instance.user.id == va)
{
if (roomMainPanel != null) roomMainPanel.ClearRoomLocalState();
WebSocketSendList.GetRoomListChineseChess(0);
// 面板已关闭（返回大厅退出）时不刷列表，否则 GetRoomList 响应会把已关的面板重新拉起
if (roomMainPanel != null && roomMainPanel.gameObject.activeInHierarchy)
WebSocketSendList.GetRoomListChineseChess(0);
}
else
{
Assets/MyGame/aa/Game/FLZY/BOSS/BWX/1614.prefab
+2 -1
View File
@@ -155,7 +155,7 @@ PrefabInstance:
- target: {fileID: 235769973576240634, guid: 18de46de860592b41811159997387914,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 235769973576240634, guid: 18de46de860592b41811159997387914,
type: 3}
@@ -645,6 +645,7 @@ MonoBehaviour:
forwordXYZ: Z
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/BaoJiangNotSelfHandler.cs
+31
View File
@@ -49,6 +49,15 @@ public static class BaoJiangNotSelfHandler
/// <summary>机器人爆奖模拟延迟上限（秒）</summary>
public const float BotSendDelayMax = 10f;
/// <summary>
/// not-self 爆奖安全超时（秒）：
/// 进入"爆奖中"状态后会取消 BJEndUI 的自动销毁并等 baoJiangEnd。
/// 万一这条帧同步一直不来（击杀者爆奖中途掉线/退房、机器人击杀但本地不是房主、击杀者客户端卡住），
/// 那块"爆奖中"面板就会**永久挂在座位上不消失** → 超时后按最终状态强制收尾（加分 + 播关闭动画）。
/// 取值要大于机器人代发上限(BotSendDelayMax=10s)且大于一次完整爆奖耗时，30s 足够宽裕。
/// </summary>
public const float SafetyTimeoutSeconds = 30f;
/// <summary>
/// 其他玩家爆奖进入"爆奖中"状态。
/// 不克隆 effect_DieAward 预制体，只读取其上的 BJEndUI 引用并实例化到座位。
@@ -118,6 +127,11 @@ public static class BaoJiangNotSelfHandler
Debug.Log($"[BaoJiangNotSelfHandler] not-self 爆奖进入在途状态：key={key} gold={gold} beishu={beishu} isBot={isBot}");
// ⭐ 安全超时兜底：baoJiangEnd 一直不来时强制收尾，避免"爆奖中"面板永久残留在座位上
// （放在机器人代发之前注册，两者互不干扰：正常收到 baoJiangEnd 后 pending 被移除，超时协程自动空转结束）
if (GameManager.Instance != null)
GameManager.Instance.StartCoroutine(SafetyTimeoutRoutine(key, killerUserId, fishId, beishu, gold));
// 机器人杀 Boss 特殊处理：机器人不会主动发 baoJiangEnd，由房主客户端延迟 5~10 秒代发帧同步
// 服务端广播给所有玩家 → 各客户端走 OnBaoJiangEnd 完成最终加分（保证多人游戏一致性）
if (isBot && IsLocalRoomOwner())
@@ -128,6 +142,23 @@ public static class BaoJiangNotSelfHandler
return true;
}
/// <summary>
/// 安全超时协程：超时后若该 pending 还在（说明 baoJiangEnd 丢了），
/// 直接按"最终状态"走一遍 OnBaoJiangEnd（播关闭动画 + 加分 + 清除标记），保证 UI 不会永久残留。
/// </summary>
private static IEnumerator SafetyTimeoutRoutine(string key, string userId, string fishId, int beishu, long gold)
{
yield return new WaitForSeconds(SafetyTimeoutSeconds);
if (!_pending.ContainsKey(key)) yield break; // 已正常收尾
Debug.LogWarning($"[BaoJiangNotSelfHandler] not-self 爆奖安全超时({SafetyTimeoutSeconds}s)仍未收到 baoJiangEnd，" +
$"按最终状态强制收尾：key={key} beishu={beishu} gold={gold}");
// 复用正常收尾逻辑：入参 score 与正常流程一致（正常流程传的也是 killFish.gold）
OnBaoJiangEnd(userId, fishId, beishu, gold);
}
/// <summary>
/// 收到帧同步 baoJiangEnd 时调用：
/// 显示最终 BJEndUI（开 tMP_beishu / 关 img_BaoJiangZhong）→ 加分 → 清除 IsBaoJiangingActive。
Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab
+2 -1
View File
@@ -393,7 +393,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1894159486133772, guid: bf0e0c56b3551b84ab0b2bab19b162c1, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1894159486133772, guid: bf0e0c56b3551b84ab0b2bab19b162c1, type: 3}
propertyPath: m_TagString
@@ -596,6 +596,7 @@ MonoBehaviour:
forwordXYZ: Z
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab
+2 -1
View File
@@ -465,7 +465,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1536313179576152, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1536313179576152, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3}
propertyPath: m_TagString
@@ -975,6 +975,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022.prefab
+2 -1
View File
@@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6829091818195909040
Transform:
m_ObjectHideFlags: 0
@@ -116,6 +116,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab
+2 -1
View File
@@ -425,7 +425,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1697762167430256, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1697762167430256, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3}
propertyPath: m_TagString
@@ -2178,6 +2178,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/JL/fish_136.prefab
+2 -1
View File
@@ -930,7 +930,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1361653457580592, guid: 055ba0a273a3d0c48a43f4fb3f92dc4d, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1361653457580592, guid: 055ba0a273a3d0c48a43f4fb3f92dc4d, type: 3}
propertyPath: m_TagString
@@ -7359,6 +7359,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/192.prefab
+2 -1
View File
@@ -1977,7 +1977,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1886336111548141, guid: ea90a670ee15ab0499ecc238704cc08f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1886336111548141, guid: ea90a670ee15ab0499ecc238704cc08f, type: 3}
propertyPath: m_TagString
@@ -2348,6 +2348,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab
+2 -1
View File
@@ -7084,7 +7084,7 @@ PrefabInstance:
- target: {fileID: 6178830404958369844, guid: 4c90120c907d1d44e82867f7e8d196e2,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6178830404958369844, guid: 4c90120c907d1d44e82867f7e8d196e2,
type: 3}
@@ -11295,6 +11295,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/PTS/182.prefab
+2 -1
View File
@@ -3273,7 +3273,7 @@ PrefabInstance:
- target: {fileID: 4506234079491000509, guid: 0ff1202ae6b4da546ae701e8e33930de,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4655149692089285225, guid: 0ff1202ae6b4da546ae701e8e33930de,
type: 3}
@@ -3378,6 +3378,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList:
Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab
+2 -1
View File
@@ -1188,7 +1188,7 @@ PrefabInstance:
- target: {fileID: 3388978822492800134, guid: f11065bf68488f64e9d9b8acc8c4caff,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3388978822492800134, guid: f11065bf68488f64e9d9b8acc8c4caff,
type: 3}
@@ -1611,6 +1611,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/SYEY/1615.prefab
+2 -1
View File
@@ -158,7 +158,7 @@ PrefabInstance:
- target: {fileID: 1092841926087640516, guid: 15beeda2ce626134eb1be15b3aaac6a1,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1092841926087640516, guid: 15beeda2ce626134eb1be15b3aaac6a1,
type: 3}
@@ -950,6 +950,7 @@ MonoBehaviour:
forwordXYZ: Z
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171.prefab
+2 -1
View File
@@ -219,7 +219,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1340477147762327, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1340477147762327, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3}
propertyPath: m_TagString
@@ -606,6 +606,7 @@ MonoBehaviour:
forwordXYZ: Z
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 1
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005.prefab
+2 -1
View File
@@ -1293,7 +1293,7 @@ PrefabInstance:
- target: {fileID: 4919981281746337587, guid: 24f1136b5772c7a428221f9ea1e47092,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4926413553594997501, guid: 24f1136b5772c7a428221f9ea1e47092,
type: 3}
@@ -1943,6 +1943,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/BOSS/YGSM/1613.prefab
+2 -1
View File
@@ -2254,7 +2254,7 @@ PrefabInstance:
- target: {fileID: 5489869124748142982, guid: d4f4d3a3290340b4eab091293cdbe822,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5489869124748142982, guid: d4f4d3a3290340b4eab091293cdbe822,
type: 3}
@@ -2525,6 +2525,7 @@ MonoBehaviour:
forwordXYZ:
fishenum: 0
moveTime: 0
yzGroupTimeOffset: 0
isyz: 0
yzID:
colliderList: []
Assets/MyGame/aa/Game/FLZY/MoveLine/风雷之渊BOSS路线图.txt
+2 -2
View File
@@ -23,8 +23,8 @@
霸王蟹1;-566.5132,823.2145;-577.1353,610.77203;-580.676,454.98093;-566.5132,267.32343;-562.9725,185.88715;-516.9433,93.82875;-456.75128,8.8517685;-357.61145,-83.20663;-269.09378,-146.93936;-152.25043,-192.96857;-42.48849,-214.2128;84.97698,-238.99776;212.44246,-246.07918;354.07074,-249.61989;499.23978,-256.7013;665.653,-256.7013;800.1999,-267.32343;952.4503,-267.32343;1115.3229,-267.32343;1288.8175,-256.7013;1391.498,-253.16058
霸王蟹2;718.7636,886.94727;725.84503,692.2083;711.6822,511.63223;683.35657,370.00394;626.70526,277.94556;570.0539,161.10219;534.64685,69.0438;499.23978,-23.014599;446.12915,-97.36945;357.61145,-161.10219;251.39023,-207.1314;113.30264,-224.83493;-24.784952,-231.91634;-177.03537,-238.99776;-297.41943,-242.53847;-467.37338,-231.91634;-580.676,-214.2128;-708.1415,-178.80573;-782.49634,-136.31725;-888.7176,-86.74734;-973.6946,-30.096014;-1055.1309,40.718136;-1150.73,100.910164;-1228.6255,139.85794;-1302.9803,182.34644
霸王蟹3;10.622123,872.7844;-10.622123,709.91187;-7.081415,589.52783;-10.622123,522.25433;-10.622123,430.19595;-21.244246,345.219;-92.058395,292.10837;-169.95396,260.242;-247.84953,238.99776;-332.8265,196.50926;-424.88492,122.15441;-453.21057,37.17743;-470.9141,-54.880966;-428.4256,-107.99158;-375.315,-168.18361;-262.01236,-228.37564;-162.87254,-267.32343;-84.97698,-281.48624;21.244246,-288.56766;116.843346,-288.56766;184.11679,-274.40485;279.71588,-260.242;354.07074,-235.45705;439.04773,-200.04997;499.23978,-139.85794;541.7283,-69.0438;598.3796,8.8517685;626.70526,93.82875;701.0601,168.18361;778.9556,207.1314;945.3689,238.99776;1179.0557,238.99776;1331.306,224.83493;1419.8237,221.29422
远古龙龟1;-1300.4116,-209.1907;-1165.981,-206.44722;-1058.985,-209.1907;-949.24567,-203.70374;-883.40204,-209.1907;-769.5474,-207.81895;-718.79297,-210.56244;-626.8862,-210.56244;-570.6448,-209.1907;-471.87933,-216.04941;-388.20306,-214.67767;-323.73117,-213.30592;-230.4527,-211.93419;-164.60907,-210.56244;-76.817566,-207.81895;1.3717422,-209.1907;65.84363,-207.81895;134.43074,-207.81895;209.87657,-211.93419;268.86148,-209.1907;356.65298,-211.93419;429.35535,-209.1907;478.73807,-207.81895;526.749,-206.44722;607.6818,-207.81895;650.2058,-206.44722;710.5625,-206.44722;747.59955,-206.44722;792.86707,-203.70374;849.10846,-205.07547;890.26074,-200.96025;953.3609,-199.5885;1015.0893,-199.5885;1067.2155,-194.10153;1135.8026,-196.84502;1231.8246,-196.84502;1301.7834,-199.5885;1382.7162,-191.35805
远古龙龟2;1382.7162,-250.34297;1266.1182,-247.59949;1152.2635,-250.34297;1056.2416,-248.97122;993.1414,-248.97122;865.5694,-244.856;783.26483,-244.856;707.81903,-244.856;609.0536,-243.48425;484.22504,-243.48425;356.65298,-240.74077;267.48975,-242.11252;176.95476,-237.99728;42.52401,-236.62555;-41.152267,-240.74077;-137.17422,-242.11252;-249.65709,-243.48425;-411.52267,-236.62555;-511.65988,-232.51031;-604.93835,-231.13858;-669.4102,-231.13858;-735.25385,-227.02335;-796.98224,-220.16464;-862.82587,-221.53638;-921.8108,-221.53638;-994.5131,-217.42116;-1074.0742,-224.27986;-1160.494,-220.16464;-1244.1703,-221.53638;-1308.6421,-225.65161
远古龙龟1;-1294.6133,-14.059095;-1106.9557,-24.68122;-954.70526,-24.68122;-809.53625,-35.303345;-728.1,-31.762636;-632.50085,-28.221926;-526.27966,-28.221926;-397.78928,-34.301712;-286.95578,-32.484764;-134.33261,-30.667826;-25.31607,-39.75254;85.517426,-39.75254;161.82901,-43.38642;269.02863,-43.38642;421.6518,-47.02031;557.9225,-48.83725;656.0374,-52.471138;741.43365,-50.654198;843.18243,-50.654198;966.73456,-48.83725;1108.456,-50.654186;1213.8386,-56.105015;1328.3062,-43.386417;1420.9702,-45.20336
远古龙龟2;1400.2012,-10.377876;1203.2275,-10.377876;1063.4086,-20.846764;917.80725,-26.141357;769.55865,-26.141357;676.9033,-26.141357;520.7128,-28.78865;353.93317,-39.37784;189.80084,-44.67244;81.26169,-49.96704;-82.87068,-52.614365;-204.6463,-60.556244;-379.36786,-52.614365;-472.02322,-52.614365;-622.919,-49.967102;-752.63654,-47.319824;-882.354,-55.26169;-1051.781,-57.908997;-1184.1458,-57.908997;-1311.2161,-57.908997
电鳗1;-1267.6608,128.9517;-1154.0084,128.9517;-1057.8411,120.20921;-967.2417,129.5413;-885.81573,132.00876;-787.1176,136.94366;-710.6265,139.41112;-592.1888,149.28093;-495.95813,144.34602;-412.0647,144.34602;-315.83405,144.34602;-224.53827,151.74838;-111.03543,159.15074;7.4023438,161.6182;135.7099,159.15074;259.08258,164.08565;365.1831,169.02055;493.49066,169.02055;624.2657,176.42291;735.3011,178.89037;853.7389,178.89037;979.579,178.89037;1102.9515,178.89037;1216.4543,183.82527;1339.827,181.35782
电鳗2;1331.189,78.90975;1240.0044,73.02687;1134.1125,75.968315;1048.8107,75.968315;954.68463,70.085434;848.7927,75.968315;704.6621,75.968315;610.536,73.02687;510.52704,64.20255;372.2793,61.26111;222.26581,67.14399;78.13521,67.14399;-39.522446,67.14399;-127.76567,67.14399;-266.01337,58.319668;-380.72955,52.436787;-510.15295,61.26111;-618.98627,58.319668;-718.99536,67.14398;-830.77014,61.2611;-951.36914,55.37822;-1039.6124,52.436783;-1157.27,52.436783;-1263.1619,55.37822
电鳗3;-998.43225,823.0943;-998.43225,740.73395;-977.84216,658.3736;-948.42773,561.3061;-889.5989,467.17996;-821.9458,387.76105;-736.644,299.51782;-651.34216,243.63045;-574.86475,187.74307;-480.73862,131.85568;-397.4302,74.979355;-306.82233,26.360497;-211.79459,-8.998671;-127.81656,-37.727997;-37.20868,-70.87721;71.0788,-112.86623;177.15625,-152.6453;287.6537,-194.63431;393.7312,-212.31389;497.59872,-226.27673;612.1142,-240.34006;722.6116,-258.42145;831.1,-270.4757;945.6154,-284.539;1074.1942,-310.6566;1168.6193,-330.747;1277.1077,-356.8646;1389.614,-389.0093
Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinShaEvent.cs
+1 -1
View File
@@ -63,7 +63,7 @@ public class BaoLieJinShaEvent : BJRedPacketEvent
/// <summary>
/// Boss 缩小完成后调用，触发爆炸。
/// 由 BaoLieJinSha_BOSS.MoveRotateShrink 协程末尾调用。
/// 由 BaoLieJinSha_BOSS.DeadMoveRoutine 协程末尾（死亡移动到位后）调用。
/// </summary>
public void TriggerExplosion()
{
Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinSha_BOSS.cs
+265 -75
View File
@@ -6,13 +6,15 @@ using System.Collections;
using UnityEngine;
/// <summary>
/// 爆裂金鲨 Boss。
/// 爆裂金鲨 Boss（lua：pw_enemy/PW_ExplosionShark.txt）。
///
/// 特殊机制：
/// 1. 首炮受击切换战损动画（支持 Spine/Animation/Animator 三种方式，Inspector 选一种）
/// 2. 死亡时鱼往 (0,0) 移动并旋转并缩小（三者同时进行）
/// 3. 到达 (0,0) 后由 BaoLieJinShaEvent 播放爆炸特效并范围杀鱼
/// 4. OnEnable 重置大小/旋转/动画/受击标志（避免对象池复用残留）
/// ⚠️ 本地近似：原版是服务端下发 stage 驱动（stand01→02→03，stage 相同才死），
/// 本项目服务端 RoomKillNotice.param 只有整数倍数（实测 233），没有 stage → 只能本地近似
/// 2. 死亡时飞向 (0,0,当前z) 【线性 Lerp】并缩到 0.3、转到 -200°（对齐 lua DeadMoveToAim/DeadMoveUpdate）
/// 3. 到达后播 Shark_Dead（仅 isSelf）→ 回收 Boss，并激活爆奖预制体触发爆炸（杀鱼+加分）
/// 4. OnEnable 重置大小/旋转/动画/受击标志 + fireEffect 开 + 3 个碰撞体开（避免对象池复用残留）
/// </summary>
public class BaoLieJinSha_BOSS : MonsterControl_BossBase
{
@@ -36,10 +38,12 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
[Tooltip("Animator 组件")]
public Animator animatorComp;
// ⭐ Spine 资源 PW_Spine_Plane_BLJS 里只有 stand01 / stand02 / stand03 三个动画
// （对齐 lua Shark:ChangeStage 的 stand01→stand02→stand03），默认值就是它们
[Header("动画名 - Spine / Animation")]
public string normalAnimName = "stand2"; // 第一种：正常游动动画名
public string damageAnimName = "damage"; // 第二种：战损动画名
public string dyingAnimName = "dying"; // 第三种：临死前动画名
public string normalAnimName = "stand01"; // 第一种：正常游动动画名
public string damageAnimName = "stand02"; // 第二种：战损动画名
public string dyingAnimName = "stand03"; // 第三种：临死前动画名
[Header("动画名 - Animator 触发器")]
[Tooltip("Animator 正常状态触发器名（首次 OnEnable 时触发）")]
@@ -49,13 +53,41 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
[Tooltip("Animator 临死前触发器名（死亡时触发，在移动旋转缩小前播放）")]
public string animatorDyingTrigger = "Dying";
[Header("死亡动画")]
[Tooltip("鱼移动到目标位置的总时长（移动+旋转+缩小同时进行）")]
public float dieAnimDuration = 2f;
[Tooltip("死亡目标位置（世界坐标）")]
[Header("死亡移动（对齐 lua Shark:DeadMoveToAim / DeadMoveUpdate）")]
[Tooltip("死亡飞向的目标点（世界 x/y）；原版是 (0,0) 即屏幕中心")]
public Vector3 dieTargetPosition = Vector3.zero;
[Tooltip("旋转圈数")]
public float rotateRounds = 2f;
[Tooltip("是否保留当前 z 深度（lua: Vector3(0,0,self.pos.z)）")]
public bool deadMoveKeepCurrentZ = true;
[Tooltip("moveT 每秒增量（lua: moveSpeed 0.1 × roadSpeed 5 = 0.5/s，全程约 2 秒）")]
public float deadMoveSpeedPerSecond = 0.5f;
[Tooltip("到位时的缩放（lua: Mathf.Lerp(1, 0.3, moveT)）")]
public float deadMoveEndScale = 0.3f;
[Tooltip("到位时的 Z 轴角度（lua: Mathf.Lerp(0, -200, moveT)）")]
public float deadMoveEndAngle = -200f;
[Tooltip("兜底超时：超过该秒数仍未到位就强制收尾，防 moveT 配太小卡死")]
public float deadMoveTimeout = 8f;
// ==================== 受击/临死表现 ====================
// ⚠️ 说明：原版这两段动画由服务端下发的 stage 驱动（站立01→02→03，只有 stage 相同才死）。
// 本项目服务端给金鲨下发的 RoomKillNotice.param 只是整数倍数（实测 233），
// 没有 stage / isKill / animId，鱼是「一次打死」的 → 这里只能用本地近似表现。
[Header("受击/临死表现（本地近似，原版由服务端 stage 驱动）")]
[Tooltip("首炮受击切战损动画（stand02）")]
public bool switchToDamageOnFirstHit = true;
[Tooltip("死亡时切临死动画（stand03）")]
public bool playDyingAnimOnDeath = true;
// ==================== 本体节点（对齐 lua Shark:Init） ====================
// lua：fireEffect = Body/Effect（出生开、死亡关）
// collider1/2/3 = Body/1、2、3（出生全开、死亡 ActiveCollider(false)）
[Header("本体节点（留空则运行时按名字自动查找）")]
[Tooltip("尾迹/喷火特效（lua fireEffect = Body/Effect）")]
public GameObject fireEffect;
[Tooltip("3 个受击碰撞体（lua collider1/2/3 = Body/1、2、3）")]
public Transform[] hitColliders = new Transform[3];
private const string BodyNodeName = "Body";
private const string FireEffectNodeName = "Effect";
/// <summary>是否已切换到战损动画</summary>
private bool _hasSwitchedToDamage = false;
@@ -70,22 +102,28 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
transform.localScale = Vector3.one;
transform.rotation = Quaternion.identity;
transform.DOKill();
StopAllCoroutines(); // 防残留 MoveRotateShrink 等协程
StopAllCoroutines(); // 防残留死亡移动协程
PlayNormalAnim();
// ⭐ 对齐 lua Shark:OnCreate：fireEffect 开、3 个碰撞体全开（回池后可能被上次死亡关掉）
ResolveBodyNodes();
SetFireEffectActive(true);
SetCollidersActive(true);
// 切回 move 状态（DieFish 里切到了 idle）
if (isInitialized)
ChangeState(CharacterStateType.move);
// 音效：爆裂金鲨出场 + 语音（PW_Shark_Show / PW_TextShark）
// 音效：爆裂金鲨出场 + 语音（PW_Shark_Show / PW_TextShark）—— 对齐 lua OnCreate 的 Shark_Show
AudioManager.Instance.PlayerFXByName("PW_Shark_Show");
AudioManager.Instance.PlayerFXByName("PW_TextShark");
}
/// <summary>受击：基类闪烁 + 首次受击切战损动画</summary>
/// <summary>受击：基类闪烁 + 首次受击切战损动画（本地近似，见 switchToDamageOnFirstHit 注释）</summary>
public override void OnHurt()
{
base.OnHurt(); // 0.2s 闪烁
if (!_hasSwitchedToDamage)
if (switchToDamageOnFirstHit && !_hasSwitchedToDamage)
{
_hasSwitchedToDamage = true;
PlayDamageAnim();
@@ -95,105 +133,244 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
public override void DieFish(RoomKillNotice obj = null)
{
base.DieFish(obj);
// 音效：爆裂金鲨死亡（PW_Shark_Dead）
AudioManager.Instance.PlayerFXByName("PW_Shark_Dead");
base.DieFish(obj); // 项目标准：震屏(Explosion2D) + 鱼表死亡音效
// 注意：不在此处调 Id_DieFish_NotFX，否则鱼会立即回池禁用，导致移动/旋转/缩小协程被中断。
// 鱼的回收放在 MoveRotateShrink 协程结束后，由 OnDisable → YanChiDie 流程处理。
// ⭐ 对齐 lua Shark:OnExplosion 的 isDead 分支：
// changeEffect 重播 → ActiveCollider(false) → fireEffect:SetActive(false) → DeadMoveToAim
// ⚠️ 本项目变体 PW_Enemy_1000 把 ChangeEffect 整组 override 成 m_IsActive=0，重播也没东西，故不处理
SetCollidersActive(false);
SetFireEffectActive(false);
// 注意：不在此处调 Id_DieFish_NotFX，否则鱼会立即回池禁用，死亡移动协程被中断。
// 鱼的回收放在 DeadMoveRoutine 到位后（= lua 的 DestroyEnemy），由 OnDisable → YanChiDie 流程处理。
_killNotice = obj;
// 切换到第三种状态：临死前动画
PlayDyingAnim();
Debug.Log("[BaoLieJinSha] 死亡，切换临死前动画");
// 临死前动画（stand03）
if (playDyingAnimOnDeath)
{
PlayDyingAnim();
Debug.Log("[BaoLieJinSha] 死亡，切换临死前动画");
}
// 鱼往 (0,0) 移动并旋转并缩小
StartCoroutine(MoveRotateShrink());
// ⭐ 死亡音效不在这里播：lua 是「死亡移动到位后 + isSelf 才播」，见 DeadMoveRoutine
// 爆奖预制体创建后先隐藏，缩小完成后激活并触发爆炸
// 鱼飞向 (0,0,当前z) 并缩小旋转（原版 DeadMoveToAim）
StartCoroutine(DeadMoveRoutine());
// 爆奖预制体创建后先隐藏，死亡移动完成后激活并触发爆炸
action_effect_DieAward = (o) =>
{
if (o == null) return;
// 创建时立即隐藏
o.SetActive(false);
// 记录引用，缩小完成后激活
// 记录引用，死亡移动完成后激活
_pendingEffectObj = o;
};
}
/// <summary>待激活的爆奖预制体（缩小完成后激活）</summary>
/// <summary>待激活的爆奖预制体（死亡移动完成后激活）</summary>
private GameObject _pendingEffectObj;
/// <summary>死亡击杀数据（用于初始化爆奖事件）</summary>
private RoomKillNotice _killNotice;
/// <summary>鱼往 (0,0) 移动 + 旋转 + 缩小（三者同时进行），完成后激活爆奖并触发爆炸</summary>
private IEnumerator MoveRotateShrink()
// ============================================================
// 死亡移动（对齐 lua Shark:DeadMoveToAim / Shark:DeadMoveUpdate）
// lua：roadSpeed = 5；每帧 moveT += dt * moveSpeed(0.1) * roadSpeed(5)
// pos = Lerp(basePos, aimPos, moveT) ← 纯线性
// scale = Lerp(1, 0.3, moveT)
// euler.z = Lerp(0, -200, moveT)
// moveT >= 1 → 回调（Shark_Dead → DestroyEnemy）
// ============================================================
/// <summary>
/// 死亡移动：飞向目标点（默认屏幕中心、保留当前 z）+ 缩到 0.3 + 转到 -200°，全线性。
/// 到位后：播 Shark_Dead（isSelf）→ 回收 Boss → 激活爆奖预制体并触发爆炸。
/// </summary>
private IEnumerator DeadMoveRoutine()
{
// 切换到 idle 状态，停止路径移动
isMove = false;
ChangeState(CharacterStateType.idle);
Vector3 startPos = transform.position;
Vector3 startScale = transform.localScale;
Debug.Log($"[BaoLieJinSha] MoveRotateShrink 启动: 起点={startPos} 目标={dieTargetPosition} 时长={dieAnimDuration} 圈数={rotateRounds}");
Vector3 basePos = transform.position; // lua: deadMoveBasePos
Vector3 aimPos = dieTargetPosition; // lua: deadMoveAimPos
if (deadMoveKeepCurrentZ) aimPos.z = basePos.z; // lua: Vector3(0, 0, self.pos.z)
// 三个 Tween 同时启动，总时长相同
transform.DOMove(dieTargetPosition, dieAnimDuration).SetEase(Ease.InOutQuad);
transform.DORotate(new Vector3(0, 0, 360f * rotateRounds), dieAnimDuration, RotateMode.FastBeyond360)
.SetEase(Ease.InOutQuad);
transform.DOScale(Vector3.zero, dieAnimDuration).SetEase(Ease.InQuad);
float speed = Mathf.Max(0.01f, deadMoveSpeedPerSecond);
float moveT = 0f;
float elapsed = 0f;
Debug.Log($"[BaoLieJinSha] 死亡移动开始: 起点={basePos} 目标={aimPos} 速度={speed}/s" +
$"（缩到 {deadMoveEndScale}、转到 {deadMoveEndAngle}°）");
yield return new WaitForSeconds(dieAnimDuration);
while (moveT < 1f)
{
float dt = Time.deltaTime;
elapsed += dt;
moveT = Mathf.Clamp01(moveT + dt * speed); // lua: moveT += dt * moveSpeed * roadSpeed
Debug.Log($"[BaoLieJinSha] 移动完成: 最终位置={transform.position} 最终缩放={transform.localScale}");
transform.position = Vector3.Lerp(basePos, aimPos, moveT);
float s = Mathf.Lerp(1f, deadMoveEndScale, moveT);
transform.localScale = new Vector3(s, s, s);
transform.localEulerAngles = new Vector3(0f, 0f, Mathf.Lerp(0f, deadMoveEndAngle, moveT));
// 鱼到达 (0,0) 并缩小完成，从字典移除并回池
if (elapsed >= deadMoveTimeout)
{
Debug.LogWarning($"[BaoLieJinSha] 死亡移动超时({deadMoveTimeout}s)强制收尾 moveT={moveT:F3}");
break;
}
yield return null;
}
// 收尾对齐终点值（防最后一帧差一点点）
transform.position = aimPos;
transform.localScale = new Vector3(deadMoveEndScale, deadMoveEndScale, deadMoveEndScale);
transform.localEulerAngles = new Vector3(0f, 0f, deadMoveEndAngle);
Debug.Log($"[BaoLieJinSha] 死亡移动完成: 最终位置={transform.position} 最终缩放={transform.localScale}");
// ===== 到位回调（对齐 lua callBack）=====
// lua：震屏 → UseNormalEffect(earn>0) → Shark_Dead(isSelf) → DestroyEnemy
// 震屏已由 base.DieFish 按项目标准播；UseNormalEffect 由爆奖预制体的爆炸表现承担
if (IsSelfKill(_killNotice))
{
AudioManager.Instance.PlayerFXByName("PW_Shark_Dead");
}
else
{
Debug.Log("[BaoLieJinSha] 非本人击杀，不播死亡音效（对齐 lua isSelf 判定）");
}
// 从字典移除并回池（= lua DestroyEnemy(self.id)）
CreateFishManager.Instance.Id_DieFish_NotFX(guid);
Debug.Log("[BaoLieJinSha] 鱼已回收");
// 缩小完成后激活爆奖预制体
if (_pendingEffectObj != null)
// 死亡移动完成后激活爆奖预制体
ActivatePendingAward(aimPos);
}
/// <summary>激活爆奖预制体（爆炸特效容器）并触发爆炸：杀鱼 + 拆红包 + 加分</summary>
private void ActivatePendingAward(Vector3 center)
{
if (_pendingEffectObj == null) return;
// 爆奖预制体本身就是爆炸特效，移到鱼飞到的中心位置
_pendingEffectObj.transform.position = center;
_pendingEffectObj.SetActive(true);
Debug.Log($"[BaoLieJinSha] 激活爆奖预制体 位置={center}");
var evt = _pendingEffectObj.GetComponent<BaoLieJinShaEvent>();
if (evt != null)
{
// 爆奖预制体本身就是爆炸特效，移到鱼移动到的中心位置 (0,0)
_pendingEffectObj.transform.position = dieTargetPosition;
_pendingEffectObj.SetActive(true);
Debug.Log($"[BaoLieJinSha] 激活爆奖预制体 位置={dieTargetPosition}");
evt.explosionCenter = center;
// 触发爆炸（杀鱼+加分）
var evt = _pendingEffectObj.GetComponent<BaoLieJinShaEvent>();
if (evt != null)
// ⭐ 初始化 BaoLieJinShaEvent：设置 posID/paoBei/fishScore/beishu/JiaFen 等
// 否则 paoBei=0 导致爆炸算分全为 0、JiaFen 为空导致不加分。
// Init 不启动协程，由下面的 TriggerExplosion 触发爆炸流程。
if (_killNotice != null)
{
evt.explosionCenter = dieTargetPosition;
// ⭐ 初始化 BaoLieJinShaEvent：设置 posID/paoBei/fishScore/beishu/JiaFen 等
// 否则 paoBei=0 导致爆炸算分全为 0、JiaFen 为空导致不加分。
// Init 不启动协程，由下面的 TriggerExplosion 触发爆炸流程。
if (_killNotice != null)
foreach (var item in CreateFishManager.Instance.currGameType.list_Sits)
{
foreach (var item in CreateFishManager.Instance.currGameType.list_Sits)
if (item.user == _killNotice.userId)
{
if (item.user == _killNotice.userId)
{
evt.Init(
_killNotice.gold, // goldCount（最终回加金币）
item.posID, // posID（击杀者座位）
_killNotice.skillsGold, // paobei（炮倍）
_killNotice.fishScore, // fishScore（底分）
_killNotice.beishu, // beishu（总倍数，最终 BJEndUI 显示）
JiaFen, // action<int>（加分回调）
() => { evt.obj = _killNotice.param; } // 服务端爆奖参数
);
break;
}
evt.Init(
_killNotice.gold, // goldCount（最终回加金币）
item.posID, // posID（击杀者座位）
_killNotice.skillsGold, // paobei（炮倍）
_killNotice.fishScore, // fishScore（底分）
_killNotice.beishu, // beishu（总倍数，最终 BJEndUI 显示）
JiaFen, // action<int>（加分回调）
() => { evt.obj = _killNotice.param; } // 服务端爆奖参数
);
break;
}
}
evt.TriggerExplosion();
}
_pendingEffectObj = null;
evt.TriggerExplosion();
}
_pendingEffectObj = null;
}
/// <summary>是否本地玩家击杀（lua isSelf，决定死亡音效要不要播）</summary>
private bool IsSelfKill(RoomKillNotice obj)
{
if (isLocalCoin) return true; // Ws_DieFish 在调 DieFish 之前按击杀座位设置
if (obj == null || GameManager.Instance == null || GameManager.Instance.user == null) return false;
return obj.userId == GameManager.Instance.user.id;
}
// ============================================================
// 本体节点：fireEffect / collider1~3（对齐 lua Shark:Init + ActiveCollider）
// 预制体路径：Body/Effect 与 Body/1、Body/2、Body/3
// ============================================================
/// <summary>解析 Body 下的 fireEffect 与 3 个碰撞体（Inspector 没拖时按名字查）</summary>
private void ResolveBodyNodes()
{
Transform body = transform.Find(BodyNodeName);
if (body == null) body = FindDeepChildLocal(transform, BodyNodeName);
if (body == null)
{
Debug.LogWarning($"[BaoLieJinSha] 找不到 {BodyNodeName} 节点，fireEffect/碰撞体开关跳过");
return;
}
if (fireEffect == null)
{
Transform t = body.Find(FireEffectNodeName);
if (t == null) t = FindDeepChildLocal(body, FireEffectNodeName);
if (t != null) fireEffect = t.gameObject;
else Debug.LogWarning($"[BaoLieJinSha] 找不到 {BodyNodeName}/{FireEffectNodeName}（fireEffect）");
}
// 保证数组长度 3，并保留 Inspector 里已拖的引用
if (hitColliders == null || hitColliders.Length != 3)
{
var arr = new Transform[3];
if (hitColliders != null)
for (int i = 0; i < hitColliders.Length && i < 3; i++) arr[i] = hitColliders[i];
hitColliders = arr;
}
for (int i = 0; i < 3; i++)
{
if (hitColliders[i] != null) continue;
Transform t = body.Find((i + 1).ToString());
if (t != null) hitColliders[i] = t;
}
}
/// <summary>开关本体 3 个碰撞体（lua Shark:ActiveCollider）</summary>
private void SetCollidersActive(bool active)
{
if (hitColliders == null) return;
for (int i = 0; i < hitColliders.Length; i++)
{
if (hitColliders[i] != null)
hitColliders[i].gameObject.SetActive(active);
}
}
/// <summary>开关尾迹/喷火特效（lua fireEffect：出生开、死亡关）</summary>
private void SetFireEffectActive(bool active)
{
if (fireEffect != null)
fireEffect.SetActive(active);
}
/// <summary>递归查找子物体（忽略大小写，防改名/挪层级后找不到）</summary>
private static Transform FindDeepChildLocal(Transform root, string childName)
{
if (root == null) return null;
for (int i = 0; i < root.childCount; i++)
{
Transform c = root.GetChild(i);
if (string.Equals(c.name, childName, StringComparison.OrdinalIgnoreCase)) return c;
Transform r = FindDeepChildLocal(c, childName);
if (r != null) return r;
}
return null;
}
// ============================================================
@@ -249,10 +426,23 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
}
}
/// <summary>
/// 安全播放 Spine 动画：动画名不存在 / 非 Spine 时静默跳过。
/// ⚠️ Spine 的 SetAnimation(名字) 在动画不存在时会直接抛 ArgumentException，
/// 所以先 FindAnimation 校验（同 JiXieXie_BOSS.PlaySpineSafe 的写法）。
/// </summary>
private void PlaySkeleton(string animName, bool loop)
{
var skel = skeletonAnim != null ? skeletonAnim : skeleton;
if (skel == null || string.IsNullOrEmpty(animName)) return;
var data = skel.SkeletonDataAsset != null ? skel.SkeletonDataAsset.GetSkeletonData(false) : null;
if (data == null || data.FindAnimation(animName) == null)
{
Debug.LogWarning($"[BaoLieJinSha] Spine 里没有动画 \"{animName}\"，跳过（可用动画：stand01/stand02/stand03）");
return;
}
skel.AnimationState.SetAnimation(0, animName, loop);
}
Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/JiXieXie_BOSS.cs
+36 -26
View File
@@ -106,12 +106,11 @@ public class JiXieXie_BOSS : MonsterControl_BossBase
private const float TimerViewExitTime = 0.3f;
private const int AttackVisualMinSeconds = 5; // lua：倒计时 > 5 才播攻击动画/特效/音效
private GameObject _timerView; // 倒计时 UI 实例
private GameObject _timerView; // 倒计时 UI 实例（关闭时立刻置空，销毁交给滑出 tween + DOVirtual 兜底）
private RectTransform _timerGONode; // 参与滑入/滑出的节点（mGONode）
private TMPro.TextMeshProUGUI _timerText;
private int _timerSeconds; // 当前倒计时秒数（= 距离自动离场的剩余秒数）
private bool _timerActive; // 倒计时是否生效（决定攻击表现的 5 秒门限）
private bool _timerExiting; // 正在播滑出动画（此时不要立刻销毁，等回调）
private Tween _timerTickTween; // 每秒递减计时
private Tween _timerMoveTween; // 滑入/滑出动画
private Tween _attackSoundTween; // 攻击音效（动作结束前 1 秒播）
@@ -152,7 +151,6 @@ public class JiXieXie_BOSS : MonsterControl_BossBase
_bornEffectPlayed = false;
_timerSeconds = 0;
_timerActive = false;
_timerExiting = false;
// ⭐ 对象池复用：先解析三个本体特效子物体，再统一复位为隐藏（避免上次残留一直亮着）
ResolveBodyEffects();
@@ -337,8 +335,8 @@ public class JiXieXie_BOSS : MonsterControl_BossBase
ResetBodyEffects(); // ⭐ 回池时把三个本体特效连同计时一起复位，防复用残留
StopHitJitter(); // ⭐ 受击抖动协程 + Body 位置还原
// ⭐ 倒计时 UI：若没走 DieFish/AutoExit 的滑出（例如房间关闭被动回收）就立即销毁，防残留
if (_timerView != null && !_timerExiting) CloseTimerView(true);
// ⭐ 倒计时 UI：没走 DieFish/AutoExit 的滑出就直接销毁（房间关闭/被动回收也保证不残留）
if (_timerView != null) CloseTimerView(true);
KillTween(ref _attackSoundTween);
base.OnDisable();
@@ -642,7 +640,6 @@ public class JiXieXie_BOSS : MonsterControl_BossBase
_timerSeconds = Mathf.CeilToInt(bossLifeTime);
_timerActive = true;
_timerExiting = false;
SetTimerText(_timerSeconds);
ScheduleTimerTick();
PlayTimerEnter(); // lua EnterAction
@@ -650,42 +647,55 @@ public class JiXieXie_BOSS : MonsterControl_BossBase
Debug.Log($"[JiXieXie] 退场倒计时开始：{_timerSeconds}s（剩余 ≤{AttackVisualMinSeconds}s 时不再攻击）");
}
/// <summary>关闭倒计时 UI（lua ExitAction：向右滑出）；instant=true 时立即销毁</summary>
/// <summary>
/// 关闭倒计时 UI（lua ExitAction：向右滑出）。
///
/// ⭐ 这里是"倒计时整块一定会消失"的唯一保证点，改成了"必定销毁"：
/// 旧写法把销毁挂在滑出 tween 的 OnComplete 上，而且"已在滑出中就直接 return"，
/// 只要那根 tween 在 0.3s 内被中途 Kill（滑出期间 Boss 被复用、再次 OpenTimerView、
/// 或任何 KillTween(ref _timerMoveTween)），OnComplete 就永不执行 →
/// 倒计时整块永久残留在屏幕上（鱼死了也不消失）。
/// 现在：立刻摘掉字段引用 + 用不挂在任何对象上的 DOVirtual 兜底计时，到点无条件销毁。
/// 顺带修掉"旧 tween 的 OnComplete 误销毁新视图"的隐患（引用改成本地捕获，不再读字段）。
/// </summary>
private void CloseTimerView(bool instant)
{
KillTween(ref _timerTickTween);
KillTween(ref _attackSoundTween);
_timerActive = false;
if (_timerView == null)
var view = _timerView;
if (view == null)
{
_timerGONode = null;
_timerText = null;
return;
}
if (instant || _timerGONode == null)
var node = _timerGONode;
// ⭐ 先摘掉所有字段引用：之后不管是复用、回池还是再次开倒计时，都不会再操作这块 UI
_timerView = null;
_timerGONode = null;
_timerText = null;
KillTween(ref _timerMoveTween);
if (instant || node == null)
{
KillTween(ref _timerMoveTween);
Destroy(_timerView);
_timerView = null; _timerGONode = null; _timerText = null;
_timerExiting = false;
Destroy(view);
return;
}
if (_timerExiting) return; // 已在滑出中
_timerExiting = true;
KillTween(ref _timerMoveTween);
_timerMoveTween = _timerGONode
.DOAnchorPos(_timerGONode.anchoredPosition + new Vector2(TimerViewExitDeltaX, TimerViewExitDeltaY), TimerViewExitTime)
.SetEase(Ease.InBack)
.OnComplete(() =>
{
_timerMoveTween = null;
if (_timerView != null) Destroy(_timerView);
_timerView = null; _timerGONode = null; _timerText = null;
_timerExiting = false;
});
// 滑出动画（lua ExitAction：localMoveBy(250, 50, 0.3, EInBack)）
_timerMoveTween = node
.DOAnchorPos(node.anchoredPosition + new Vector2(TimerViewExitDeltaX, TimerViewExitDeltaY), TimerViewExitTime)
.SetEase(Ease.InBack);
// ⭐ 兜底销毁：DOVirtual 不挂在任何对象上，Boss 被禁用/回收/销毁都不影响它，到点无条件销毁
var viewToDestroy = view;
DOVirtual.DelayedCall(TimerViewExitTime + 0.1f, () =>
{
if (viewToDestroy != null) Destroy(viewToDestroy);
});
}
/// <summary>滑入动画（lua EnterAction：先归位 (0,50)，再 localMoveBy(-250, 50, 0.5, EOutBack)）</summary>
Assets/MyGame/aa/Game/XJMH/GameMoveLine/新星际迷航鱼阵.txt
+3 -3
View File
@@ -14,8 +14,8 @@
鱼阵14;280.31644,565.74054;278.4989,522.11926;274.86377,485.76822;274.86377,440.3294;278.2854,385.7688;279.31238,350.85095;279.31238,313.8791;279.31238,282.0422;279.31238,245.07036;279.31238,207.0715;278.0053,169.14143;278.0053,139.91626;279.44263,110.212;279.92172,82.903244;294.77386,57.510887;312.50058,38.346848;335.97653,27.327522;361.3689,25.411118;388.19855,25.411118;413.5909,27.806625;439.94147,32.11853;464.85474,46.012463;478.26956,69.48841;484.49786,102.54639;485.93518,133.68796;485.93518,161.95493;485.93518,189.74278;486.41428,218.00975;485.45605,247.23492;484.97696,274.06458;484.01874,303.76886;485.45605,331.0776;485.54602,358.37903;485.54602,394.8239;480.0508,418.95428;478.4297,469.41025;483.88232,523.9368;483.88232,571.19324
鱼阵15;1005.8704,-35.372574;978.73755,-34.52467;951.60474,-36.220474;925.31976,-37.91628;881.2289,-37.91628;845.617,-40.459984;824.4195,-38.76418;803.9944,-37.42885;789.3941,-38.184036;757.6762,-37.42885;773.0317,-37.93231;738.293,-37.17712;719.1616,-37.17712;700.5337,-37.17712;683.91956,-37.17712;664.1906,-36.42115;644.3211,-37.61811;628.7606,-37.37872;610.8062,-37.139328;586.9379,-37.95098;565.55255,-37.49597;543.7121,-38.40599;519.14166,-37.040966;495.02625,-36.585957;469.09076,-39.771015;448.30966,-44.278168;427.562,-61.11117;415.81805,-79.51004;409.9395,-98.012085;407.20944,-118.942474;409.02948,-146.24298;419.03967,-166.26334;430.86987,-184.00867;453.6203,-197.20392;477.73575,-204.02904;502.7612,-207.2141;525.9666,-201.754;552.048,-188.72885;568.881,-169.54704;577.88464,-149.97379;580.23346,-132.35785;579.842,-111.61019;577.88464,-92.03693;564.9663,-70.11487;554.3967,-57.587982;537.9552,-46.62696;520.7307,-38.014725;502.33185,-36.840324;484.7159,-37.23179;461.61948,-41.146446;444.39502,-47.801353;433.82544,-56.805054;416.99243,-75.20392;407.05777,-111.15677;408.0689,-134.41275;407.05777,-175.36351;408.0689,-196.59723;409.08002,-219.85321;409.58563,-236.53683;408.57452,-257.26498;408.57452,-280.0154;408.06894,-302.26025;407.0578,-328.04407;407.0578,-347.25555;407.0578,-367.47815;406.05292,-387.85052;405.35944,-403.10764;405.1,-421.18533;404.47867,-446.0389;401.99332,-473.3778;401.37198,-504.44473
鱼阵155;398.26526,-501.9593;401.9933,-479.5911;402.61462,-451.63086;403.23596,-423.6706;405.35944,-403.10764;406.05292,-387.85052;407.0578,-367.47815;407.0578,-347.25555;407.0578,-328.04407;408.06894,-302.26025;408.57452,-280.0154;408.57452,-257.26498;409.58563,-236.53683;409.08002,-219.85321;408.0689,-196.59723;407.05777,-175.36351;408.0689,-134.41275;407.05777,-111.15677;416.99243,-75.20392;433.82544,-56.805054;444.39502,-47.801353;461.61948,-41.146446;484.7159,-37.23179;502.33185,-36.840324;520.7307,-38.014725;537.9552,-46.62696;554.3967,-57.587982;564.9663,-70.11487;577.88464,-92.03693;579.842,-111.61019;580.23346,-132.35785;577.88464,-149.97379;568.881,-169.54704;552.048,-188.72885;525.9666,-201.754;502.7612,-207.2141;477.73575,-204.02904;453.6203,-197.20392;430.86987,-184.00867;419.03967,-166.26334;409.02948,-146.24298;407.20944,-118.942474;409.9395,-98.012085;415.81805,-79.51004;427.562,-61.11117;448.30966,-44.278168;469.09076,-39.771015;495.02625,-36.585957;519.14166,-37.040966;543.7121,-38.40599;565.55255,-37.49597;586.9379,-37.95098;610.8062,-37.139328;628.7606,-37.37872;644.3211,-37.61811;664.1906,-36.42115;683.91956,-37.17712;700.5337,-37.17712;719.1616,-37.17712;738.293,-37.17712;773.0317,-37.93231;757.6762,-37.42885;789.3941,-38.184036;803.9944,-37.42885;1005.93445,-35.955177;966.79016,-35.955177;936.34454,-38.440536;898.4429,-38.440536;862.4052,-39.061874;822.0182,-38.440536
鱼阵16;-989.006,37.93033;-953.36816,37.93033;-908.4909,38.590286;-868.23334,35.950447;-842.49493,35.29049;-822.69617,35.950447;-803.9944,37.42885;-789.3941,38.184036;-757.6762,37.42885;-773.0317,37.93231;-738.293,37.17712;-719.1616,37.17712;-700.5337,37.17712;-683.91956,37.17712;-664.1906,36.42115;-644.3211,37.61811;-628.7606,37.37872;-610.8062,37.139328;-586.9379,37.95098;-565.55255,37.49597;-543.7121,38.40599;-519.14166,37.040966;-495.02625,36.585957;-469.09076,39.771015;-448.30966,44.278168;-427.562,61.11117;-415.81805,79.51004;-409.9395,98.012085;-407.20944,118.942474;-409.02948,146.24298;-419.03967,166.26334;-430.86987,184.00867;-453.6203,197.20392;-477.73575,204.02904;-502.7612,207.2141;-525.9666,201.754;-552.048,188.72885;-568.881,169.54704;-577.88464,149.97379;-580.23346,132.35785;-579.842,111.61019;-577.88464,92.03693;-564.9663,70.11487;-554.3967,57.587982;-537.9552,46.62696;-520.7307,38.014725;-502.33185,36.840324;-484.7159,37.23179;-461.61948,41.146446;-444.39502,47.801353;-433.82544,56.805054;-416.99243,75.20392;-407.05777,111.15677;-408.0689,134.41275;-407.05777,175.36351;-408.0689,196.59723;-409.08002,219.85321;-409.58563,236.53683;-408.57452,257.26498;-408.57452,280.0154;-408.06894,302.26025;-407.0578,328.04407;-407.0578,347.25555;-407.0578,367.47815;-406.05292,387.85052;-405.35944,403.10764;-405.60162,422.02682;-406.26157,449.74512;-405.60162,480.10327;-404.94165,513.10126;-408.24146,545.4393
鱼阵166;-405.3282,535.386;-405.3282,504.17667;-404.02777,469.71637;-405.3282,436.5565;-405.3282,408.59814;-406.05292,387.85052;-407.0578,367.47815;-407.0578,347.25555;-407.0578,328.04407;-408.06894,302.26025;-408.57452,280.0154;-408.57452,257.26498;-409.58563,236.53683;-409.08002,219.85321;-408.0689,196.59723;-407.05777,175.36351;-408.0689,134.41275;-407.05777,111.15677;-416.99243,75.20392;-433.82544,56.805054;-444.39502,47.801353;-461.61948,41.146446;-484.7159,37.23179;-502.33185,36.840324;-520.7307,38.014725;-537.9552,46.62696;-554.3967,57.587982;-564.9663,70.11487;-577.88464,92.03693;-579.842,111.61019;-580.23346,132.35785;-577.88464,149.97379;-568.881,169.54704;-552.048,188.72885;-525.9666,201.754;-502.7612,207.2141;-477.73575,204.02904;-453.6203,197.20392;-430.86987,184.00867;-419.03967,166.26334;-409.02948,146.24298;-407.20944,118.942474;-409.9395,98.012085;-415.81805,79.51004;-427.562,61.11117;-448.30966,44.278168;-469.09076,39.771015;-495.02625,36.585957;-519.14166,37.040966;-543.7121,38.40599;-565.55255,37.49597;-586.9379,37.95098;-610.8062,37.139328;-628.7606,37.37872;-644.3211,37.61811;-664.1906,36.42115;-683.91956,37.17712;-700.5337,37.17712;-719.1616,37.17712;-738.293,37.17712;-773.0317,37.93231;-757.6762,37.42885;-789.3941,38.184036;-803.9944,37.42885;-820.7516,37.241558;-849.4108,35.386734;-879.97,36.03693;-914.43024,36.687122;-960.594,34.73654;-990.5029,37.33732
鱼阵16;-989.006,37.93033;-953.36816,37.93033;-908.4909,38.590286;-868.23334,35.950447;-842.49493,35.29049;-822.69617,35.950447;-803.9944,37.42885;-788.765,37.774475;-773.4623,37.774475;-757.4478,37.774475;-738.293,37.17712;-719.1616,37.17712;-700.5337,37.17712;-683.91956,37.17712;-664.1906,36.42115;-644.3211,37.61811;-628.7606,37.37872;-610.8062,37.139328;-586.9379,37.95098;-565.55255,37.49597;-543.7121,38.40599;-519.14166,37.040966;-495.02625,36.585957;-469.09076,39.771015;-448.30966,44.278168;-427.562,61.11117;-415.81805,79.51004;-409.9395,98.012085;-407.20944,118.942474;-409.02948,146.24298;-419.03967,166.26334;-430.86987,184.00867;-453.6203,197.20392;-477.73575,204.02904;-502.7612,207.2141;-525.9666,201.754;-552.048,188.72885;-568.881,169.54704;-577.88464,149.97379;-580.23346,132.35785;-579.842,111.61019;-577.88464,92.03693;-564.9663,70.11487;-554.3967,57.587982;-537.9552,46.62696;-520.7307,38.014725;-502.33185,36.840324;-484.7159,37.23179;-461.61948,41.146446;-444.39502,47.801353;-433.82544,56.805054;-416.99243,75.20392;-407.05777,111.15677;-408.0689,134.41275;-407.05777,175.36351;-408.0689,196.59723;-409.08002,219.85321;-409.58563,236.53683;-408.57452,257.26498;-408.57452,280.0154;-408.06894,302.26025;-407.0578,328.04407;-407.0578,347.25555;-407.0578,367.47815;-406.05292,387.85052;-405.35944,403.10764;-405.60162,422.02682;-406.26157,449.74512;-405.60162,480.10327;-404.94165,513.10126;-408.24146,545.4393
鱼阵166;-405.3282,535.386;-405.3282,504.17667;-404.02777,469.71637;-405.3282,436.5565;-405.3282,408.59814;-406.05292,387.85052;-407.0578,367.47815;-407.0578,347.25555;-407.0578,328.04407;-408.06894,302.26025;-408.57452,280.0154;-408.57452,257.26498;-409.58563,236.53683;-409.08002,219.85321;-408.0689,196.59723;-407.05777,175.36351;-408.0689,134.41275;-407.05777,111.15677;-416.99243,75.20392;-433.82544,56.805054;-444.39502,47.801353;-461.61948,41.146446;-484.7159,37.23179;-502.33185,36.840324;-520.7307,38.014725;-537.9552,46.62696;-554.3967,57.587982;-564.9663,70.11487;-577.88464,92.03693;-579.842,111.61019;-580.23346,132.35785;-577.88464,149.97379;-568.881,169.54704;-552.048,188.72885;-525.9666,201.754;-502.7612,207.2141;-477.73575,204.02904;-453.6203,197.20392;-430.86987,184.00867;-419.03967,166.26334;-409.02948,146.24298;-407.20944,118.942474;-409.9395,98.012085;-415.81805,79.51004;-427.562,61.11117;-448.30966,44.278168;-469.09076,39.771015;-495.02625,36.585957;-519.14166,37.040966;-543.7121,38.40599;-565.55255,37.49597;-586.9379,37.95098;-610.8062,37.139328;-628.7606,37.37872;-644.3211,37.61811;-664.1906,36.42115;-683.91956,37.17712;-700.5337,37.17712;-719.1616,37.17712;-738.293,37.17712;-751.04205,36.350967;-764.56537,37.06272;-779.8681,37.06272;-799.0855,37.774475;-820.7516,37.241558;-849.4108,35.386734;-879.97,36.03693;-914.43024,36.687122;-960.594,34.73654;-990.5029,37.33732
鱼阵17;643.92285,560.1147;522.9208,394.90024;667.1925,185.47351;471.72757,-19.299294;629.9612,-291.55405;469.40067,-540.5392
鱼阵18;-1000.9641,-128.48486;-908.4238,-132.50835;-846.0597,-128.48486;-798.59485,-130.52393;-763.16394,-127.30294;-710.06415,-128.99052;-666.5343,-127.30294;-618.2194,-127.30294;-553.7997,-127.30294;-505.4848,-130.52393;-447.1065,-141.01144;-391.50974,-147.02191;-344.92865,-168.05852;-295.34238,-208.62912;-235.23776,-228.16312;-187.15408,-195.10559;-146.58347,-147.02191;-104.510254,-115.466995;-60.934357,-86.9173;-12.85067,-68.88592;32.227783,-46.346687;80.735275,-27.45227;125.82913,-4.905342;177.36496,4.7576256;245.00574,7.978615;290.0996,14.420593;328.75146,14.420593;379.33188,22.773605;428.91818,31.789291;483.35895,43.4095;534.8948,49.85148;573.1692,55.83113;618.6405,56.293457;664.82874,37.79976;690.37317,-7.278702;692.72327,-59.662163;667.834,-104.94868;621.8615,-133.74492;579.98865,-146.62888;540.1117,-157.5402;486.57996,-172.39679;431.9234,-178.57681;367.40332,-185.28075;305.70374,-184.58728;245.00574,-198.1647;186.99713,-217.6448;134.40561,-216.1422;83.95627,-211.04866;38.862415,-217.49065;-6.2314377,-214.26965;-57.767273,-227.15361;-89.97716,-243.25856;-138.292,-269.0265;-202.7118,-281.91043;-280.01556,-294.79437;-337.99335,-285.1314;-387.00183,-271.73895;-437.84406,-285.1314;-479.71692,-314.1203;-518.3688,-355.99316;-557.0206,-401.08704;-579.56757,-442.9599;-592.5797,-504.6813;-600.6267,-565.0337
鱼阵19;1020.84033,129.0186;958.4762,133.04208;894.10034,133.04208;841.795,127.00685;798.59485,130.52393;763.16394,127.30294;710.06415,128.99052;666.5343,127.30294;618.2194,127.30294;553.7997,127.30294;505.4848,130.52393;447.1065,141.01144;391.50974,147.02191;344.92865,168.05852;295.34238,208.62912;235.23776,228.16312;187.15408,195.10559;146.58347,147.02191;104.510254,115.466995;60.934357,86.9173;12.85067,68.88592;-32.227783,46.346687;-80.735275,27.45227;-125.82913,4.905342;-177.36496,-4.7576256;-245.00574,-7.978615;-290.0996,-14.420593;-328.75146,-14.420593;-379.33188,-22.773605;-428.91818,-31.789291;-483.35895,-43.4095;-534.8948,-49.85148;-573.1692,-55.83113;-618.6405,-56.293457;-664.82874,-37.79976;-690.37317,7.278702;-692.72327,59.662163;-667.834,104.94868;-621.8615,133.74492;-579.98865,146.62888;-540.1117,157.5402;-486.57996,172.39679;-431.9234,178.57681;-367.40332,185.28075;-305.70374,184.58728;-245.00574,198.1647;-186.99713,217.6448;-134.40561,216.1422;-83.95627,211.04866;-38.862415,217.49065;6.2314377,214.26965;57.767273,227.15361;89.97716,243.25856;138.292,269.0265;202.7118,281.91043;280.01556,294.79437;337.99335,285.1314;387.00183,271.73895;437.84406,285.1314;479.71692,314.1203;518.3688,355.99316;557.0206,401.08704;579.56757,442.9599;604.409,509.23853;612.456,579.64966
@@ -24,6 +24,6 @@
鱼阵22;537.2172,590.4077;192.014,176.49893;188.189,-137.15216;531.4418,-535.8163
鱼阵23;1033.9109,165.90794;944.3905,157.24467;875.0845,160.13243;775.4109,161.8459;706.51416,164.44577;642.8172,165.74571;584.32,165.74571;520.62305,167.04565;459.5259,165.74571;391.92914,168.3456;316.5327,168.3456;242.43623,173.54535;178.73926,176.14522;91.6434,180.04503;11.047241,178.7451;-63.049255,178.7451;-143.64542,177.44516;-225.54152,178.7451;-312.6374,176.14522;-394.5335,172.2454;-484.22925,176.14522;-566.12537,170.94547;-649.3214,169.64554;-737.71716,156.64615;-843.0122,124.1477;-895.00977,94.249115;-919.70856,40.95165;-927.5082,-24.045263;-932.7079,-92.941986;-878.11053,-147.5394;-833.9126,-186.53754;-772.81555,-225.53568;-692.21936,-237.23514;-612.9231,-245.03476;-551.82605,-246.33469;-481.62936,-242.43488;-390.6337,-241.13495;-307.43762,-234.63525;-221.64172,-228.13556;-146.2453,-224.23575;-65.64914,-219.03601;16.246979,-209.93643;95.54315,-209.93643;174.83939,-208.6365;256.73547,-208.6365;342.5314,-208.6365;428.32733,-207.33655;515.4232,-203.43674;599.91907,-207.33655;671.4157,-204.73668;739.01245,-206.03662;788.41016,-204.73668;835.2079,-203.43674;915.51306,-212.38782;996.3701,-221.05109;1065.6761,-226.82657
鱼阵24;-1013.5066,-541.5918;-309.89633,-78.92087;376.35898,-67.71669;1103.217,-171.95926
鱼阵25;95.3909,587.52;11.646057,509.55066;-63.435547,448.90784;-144.63486,391.6542;-239.87027,330.03128;-315.4984,262.80627;-391.12656,198.38231;-385.52448,100.34584;-307.0953,52.728123;-197.85464,19.115614;-55.001503,13.513529;71.045395,13.513529;155.07666,7.9114456;253.11314,-3.2927237;334.34335,-34.104187;404.36942,-70.51773;468.7934,-137.74275;499.60486,-202.16672;496.8038,-269.39175;524.8142,-317.00946;536.01843,-339.4178;575.23303,-387.03552;552.82465,-361.82614;603.2434,-429.05115;641.1764,-518.48975;684.4927,-602.2346
鱼阵25;95.3909,587.52;11.646057,509.55066;-63.435547,448.90784;-144.63486,391.6542;-239.87027,330.03128;-315.4984,262.80627;-391.12656,198.38231;-385.52448,100.34584;-307.0953,52.728123;-197.85464,19.115614;-55.001503,13.513529;71.045395,13.513529;155.07666,7.9114456;253.11314,-3.2927237;334.34335,-34.104187;404.36942,-70.51773;468.7934,-137.74275;499.60486,-202.16672;496.8038,-269.39175;486.52008,-327.7929;479.2223,-388.6079;459.76147,-439.6925;430.57028,-490.7771;412.32578,-538.2128
鱼阵26;26.084824,552.86694;14.533798,165.90794;17.421555,-209.50006;23.197067,-579.13257
鱼阵27;-1022.1698,226.55077;-944.2005,229.43852;-873.25183,233.74107;-831.0366,232.75934;-786.858,233.74107;-738.5819,234.75534;-680.9752,235.56671;-628.2367,234.75534;-578.74365,232.32126;-524.3824,233.94397;-485.437,235.56671;-456.228,269.6439;-421.33945,285.87112;-375.09183,292.36203;-329.65558,276.1348;-303.692,254.22803;-280.1625,225.019;-269.61478,184.4509;-271.23752,135.7692;-290.7102,93.578384;-327.2215,68.42617;-375.09183,57.0671;-431.88715,57.0671;-468.39844,83.030685;-498.41882,122.78741;-509.7779,186.07364;-491.11658,225.83035;-454.6053,268.83252;-421.33945,285.05978;-396.99866,288.3052;-362.92145,289.11658;-321.542,271.2666;-293.14435,242.05759;-275.29437,207.16904;-271.23758,159.29869;-276.9171,123.59877;-237.16039,136.58055;-199.02638,135.7692;-158.45828,136.58055;-120.324295,135.7692;-72.555756,133.90736;-15.317894,135.88109;27.11707,137.8548;68.56517,136.86795;118.89502,123.05191;148.5008,74.695786;152.44824,45.09;145.54022,-7.213562;114.94757,-41.753654;75.47319,-64.45142;30.077648,-59.517128;-13.344177,-38.793068;-45.910545,-1.2924042;-54.792282,43.11628;-38.01567,88.511826;-7.4230194,116.14389;33.038227,130.9468;72.51261,133.90736;114.94757,123.05191;139.61906,89.49868;152.44824,38.18198;163.3037,-54.582832;221.5284,-52.60911;261.07642,-53.428543;305.06854,-53.428543;349.75897,-53.428543;393.7511,-54.12683;436.97607,-46.116867;471.61792,-40.092194;522.82764,-37.83294;562.7411,-54.400795;589.8522,-73.98098;605.66693,-92.055;614.7039,-127.44995;613.9508,-161.33875;604.16077,-188.44977;588.34595,-213.30154;565.00037,-233.63483;540.9017,-251.70883;511.5314,-253.215;479.14877,-251.70883;450.5316,-243.42491;424.9267,-228.36322;400.07495,-208.02995;384.2602,-177.90659;382.00092,-144.77089;388.7787,-113.14136;406.8527,-79.25256;428.69214,-58.919296;443.7538,-43.857613;488.93887,-36.326775;514.5437,-37.83294;558.2226,-50.63537;591.35834,-74.73406;610.9385,-94.314255;607.92615,-113.89444;628.25946,-155.31407;629.0125,-192.96828;629.7656,-231.37556;630.5187,-272.0421;632.02484,-306.68396;631.2718,-342.07892;632.02484,-362.4122;632.5131,-420.30606;635.4009,-489.6122;638.28864,-558.91833
Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs
+2 -13
View File
@@ -439,19 +439,8 @@ public class ChineseChessMainPanel : GameMainPanel_Base
base.Awake();
btn_FanHuiDaTing.onClick.AddListener(() =>
{
if (roomData != null)
{
// 4.4 在房间中：必须主动调用退出房间，不能只断开连接
WebSocketSendList.ExitRoomChineseChess(roomData.roomId, MyChessUserId);
ClearRoomLocalState(); // 立即清 gameId/棋盘/双方/准备/结算状态
subUIManager.CloseAll(); // 关结算等子面板
WebSocketSendList.GetRoomListChineseChess(0); // 回大厅重拉列表（响应自动刷新选房界面，0=重新加入大厅通知组）
}
else
{
// 4.4 已在选房界面：关闭象棋面板（OnHide 兜底再退一次房）
UIManager.Instance.Close(UIPanel.MainGamePanelZGXQ);
}
// 4.4 返回大厅 = 退出整个象棋界面；在房间中由 OnHide 兜底主动调 ExitRoom 退房（不能只断开连接）
UIManager.Instance.Close(UIPanel.MainGamePanelZGXQ);
});
btn_GuiZe.onClick.AddListener(() =>
{
Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
+8 -1
View File
@@ -62,6 +62,11 @@ public class UIChineseChessDistrict : SubUIBase
if (args != null)
{
// 4.4 全量覆盖：先清空旧列表，再用服务端返回的列表重建（防止多次刷新叠加/分区错乱）
for (int c = panel_RoomItemParent.childCount - 1; c >= 0; c--)
Destroy(panel_RoomItemParent.GetChild(c).gameObject);
itemListDic.Clear();
int i = 0;
var v = JsonConvert.DeserializeObject<WebSocketResponseBase<List<ChessGameRoom>>>(args.ToString());
var basePanel = (ChineseChessMainPanel)uIManager.parentUIBase;
@@ -190,10 +195,12 @@ public class UIChineseChessDistrict : SubUIBase
public void UpdataRoom(ChessGameRoom item)
{
if (item == null || string.IsNullOrEmpty(item.roomId)) return;
string roomID = item.roomId;
ChineseChessMainPanel.dic_RoomData[roomID] = item;
var tran = itemListDic[roomID];
// 不在当前列表（其他分区/列表已清空）→ 只更新缓存，不动 UI
if (!itemListDic.TryGetValue(roomID, out var tran)) return;
// 子节点索引与 Show 保持一致：0=Slider, 1=人数文本, 2=房间号
var slider = tran.transform.GetChild(0).GetComponent<Slider>();
// 人数 = 真实玩家 + 机器人
Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
+50
View File
@@ -5103,6 +5103,16 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6708146167536542185, guid: 78d0ab279487b3d449ab990658edac74,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6708146167536542185, guid: 78d0ab279487b3d449ab990658edac74,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6805473407844982555, guid: 78d0ab279487b3d449ab990658edac74,
type: 3}
propertyPath: m_SortingLayer
@@ -5663,6 +5673,16 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3397302884702173062, guid: 509192cd5f627cf409a54e9be694a24d,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3397302884702173062, guid: 509192cd5f627cf409a54e9be694a24d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3494573310348252002, guid: 509192cd5f627cf409a54e9be694a24d,
type: 3}
propertyPath: m_SortingLayer
@@ -6379,6 +6399,36 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 111
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -355
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+28 -1
View File
@@ -187,6 +187,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
//[Header("我在这")]
public GameObject mySitAnim;
[Tooltip("我在这动画偏移 - 左侧座位（世界坐标，直接加到座位位置上；默认0=保持原地）")]
public Vector3 mySitAnimOffsetLeft;
[Tooltip("我在这动画偏移 - 右侧座位（世界坐标，直接加到座位位置上；默认0=保持原地）")]
public Vector3 mySitAnimOffsetRight;
public Dictionary<string, Toggle> dic_Skill_Toggle = new Dictionary<string, Toggle>();//开关型技能
[Header("Skillbottom")]
// toggle_SkillAuto（自动攻击）已移植到 SitPosData.toggle_AutoAttack：读取 currSitData.IsAutoAttackOn，关闭时座位自己切 Idle + OnAutoAttackOff 广播
@@ -393,7 +397,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
currSitData.lockFX.transform.GetChild(1).gameObject.SetActive(true);
if (mySitAnim != null && currSitData.turretParent != null)
{
mySitAnim.transform.position = currSitData.turretParent.position;
// ⭐ 座位位置 + 左右座位各自的偏移：把"我在这"圆圈摆到座位上面
// （左右座位镜像后需要的偏移不一样，分左/右两套配置，面板上调）
Vector3 sitAnimOffset = IsLeftSeat(currSitData) ? mySitAnimOffsetLeft : mySitAnimOffsetRight;
mySitAnim.transform.position = currSitData.turretParent.position + sitAnimOffset;
// ⭐ 进入游戏圆圈：6 秒后自动消失（点击屏幕立即消失的逻辑在 HandleInput）
StartCoroutine(HideMySitAnimAfter(6f));
}
@@ -2400,6 +2407,26 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
/// <summary>
/// 判断座位在屏幕哪一侧（"我在这"偏移用：左右座位镜像后需要的偏移不同）。
/// 本地玩家经 SeatMirror 处理后永远显示在下方座位，所以只有 0(左)/1(右) 两种情况；
/// 有对手座位时按世界 X 比较，单人时按座号兜底。
/// </summary>
private bool IsLeftSeat(SitPosData sit)
{
if (sit == null) return true;
float x = sit.transform.position.x;
for (int i = 0; i < list_Sits.Count; i++)
{
var other = list_Sits[i];
if (other == null || other == sit) continue;
if (other.user == null || !other.gameObject.activeSelf) continue;
return x <= other.transform.position.x;
}
return sit.posID == 0;
}
/// <summary>进入游戏圆圈 mySitAnim：延时自动消失（6 秒没点屏幕也消失；点击屏幕立即消失在 HandleInput）</summary>
private IEnumerator HideMySitAnimAfter(float delay)
{
Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
+25
View File
@@ -7961,11 +7961,36 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 111
objectReference: {fileID: 0}
- target: {fileID: 8620165089078253246, guid: e5efa9f179bbfdb4ba8e73fe85eb109a,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -355
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/UI/Game/Sub/HHWKTuJianPanel.cs
+55 -8
View File
@@ -27,6 +27,7 @@ public class HHWKTuJianPanel : SubUIBase
{
base.Awake();
var addedFishNumbers = new HashSet<string>();
var fishList = new List<RoomFishDetailConfig>();
var v = CreateFishManager.Instance.spawnList;
foreach (var item in v)
{
@@ -34,25 +35,75 @@ public class HHWKTuJianPanel : SubUIBase
{
// 鱼阵条目：fishNumber 存的是鱼阵编号，解析出阵内实际生成的鱼再加入图鉴
if (CreateFishManager.Instance.FishArrayDatas.TryGetValue(item.fishNumber, out var yz))
AddFishItem(yz.fishNumber, addedFishNumbers);
CollectFish(yz.fishNumber, addedFishNumbers, fishList);
}
else
{
AddFishItem(item.fishNumber, addedFishNumbers, item);
CollectFish(item.fishNumber, addedFishNumbers, fishList, item);
}
}
// 按分类（普通鱼/黄金鱼/特殊鱼/Boss鱼/特殊Boss）分桶
var categoryLists = new Dictionary<FishTypeEnum, List<RoomFishDetailConfig>>();
foreach (var item in fishList)
{
var typeEnum = (FishTypeEnum)GameManager.Instance.dic_fishTypeConfigs[item.fishNumber].fishType;
if (!categoryLists.TryGetValue(typeEnum, out var list))
categoryLists[typeEnum] = list = new List<RoomFishDetailConfig>();
list.Add(item);
}
// 每个分类内部各自按显示倍数从低到高排序后创建，分类之间互不影响
foreach (var list in categoryLists.Values)
{
list.Sort((a, b) => GetDisplayMult(a.fishNumber).CompareTo(GetDisplayMult(b.fishNumber)));
foreach (var item in list)
AddFishItem(item);
}
// 加载完毕后滚动到最上方
if (scrollRect != null)
scrollRect.normalizedPosition = new Vector2(0, 1);
}
private void AddFishItem(string fishNumber, HashSet<string> addedFishNumbers, RoomFishDetailConfig detail = null)
/// <summary>收集要进图鉴的鱼（按编号去重，缺鱼种配置的跳过）</summary>
private void CollectFish(string fishNumber, HashSet<string> addedFishNumbers, List<RoomFishDetailConfig> fishList, RoomFishDetailConfig detail = null)
{
if (string.IsNullOrEmpty(fishNumber) || !addedFishNumbers.Add(fishNumber))
return;
if (!GameManager.Instance.dic_fishTypeConfigs.TryGetValue(fishNumber, out var cfg))
if (!GameManager.Instance.dic_fishTypeConfigs.ContainsKey(fishNumber))
return;
fishList.Add(detail ?? new RoomFishDetailConfig { fishNumber = fishNumber });
}
/// <summary>取图鉴条目显示的倍数值：优先解析 fishMultipleDesc 中的数字（如"最高500倍"→500），否则用 fishScore</summary>
private long GetDisplayMult(string fishNumber)
{
var cfg = GameManager.Instance.dic_fishTypeConfigs[fishNumber];
if (!string.IsNullOrEmpty(cfg.fishMultipleDesc))
{
long val = 0;
bool hasDigit = false;
foreach (char c in cfg.fishMultipleDesc)
{
if (c >= '0' && c <= '9')
{
val = val * 10 + (c - '0');
hasDigit = true;
}
else if (hasDigit)
break;
}
if (hasDigit) return val;
}
return cfg.fishScore;
}
private void AddFishItem(RoomFishDetailConfig detail)
{
if (!GameManager.Instance.dic_fishTypeConfigs.TryGetValue(detail.fishNumber, out var cfg))
return;
TuJianItem prefabToUse;
@@ -92,11 +143,7 @@ public class HHWKTuJianPanel : SubUIBase
}
if (prefabToUse != null && parentToUse != null)
{
if (detail == null)
detail = new RoomFishDetailConfig { fishNumber = fishNumber };
Instantiate(prefabToUse.gameObject, parentToUse).GetComponent<TuJianItem>().InItItem(detail, isGuDingBeiShu);
}
}
protected override void OnShow(object args = null)
{
Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
+1909 -33
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/UI/Home/Sub/ShopPanel.prefab
+138 -1
View File
@@ -3939,6 +3939,142 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4847856953582507028
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8837842920913824696}
- component: {fileID: 3646059769256090553}
- component: {fileID: 7601035535802835171}
m_Layer: 0
m_Name: "\u6BCF\u65E5\u91CD\u7F6E\u9650\u989D15000\uFF0C\u7406\u6027\u6D88\u8D39\u6587\u660E\u6E38\u620F
(1)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8837842920913824696
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4847856953582507028}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6734523311967546328}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 12}
m_SizeDelta: {x: 410, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3646059769256090553
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4847856953582507028}
m_CullTransparentMesh: 1
--- !u!114 &7601035535802835171
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4847856953582507028}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u6BCF\u65E5\u91CD\u7F6E\u9650\u989D7000\uFF0C\u7406\u6027\u6D88\u8D39\u6587\u660E\u6E38\u620F"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 21.59
m_fontSizeBase: 21.59
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4867073183075741780
GameObject:
m_ObjectHideFlags: 0
@@ -5911,6 +6047,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8837842920913824696}
- {fileID: 5366522766061172447}
- {fileID: 5065640579865570114}
- {fileID: 7007813269518818326}
@@ -5950,7 +6087,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6696433636029030240}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: