diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab index e966da9b9..da60aaa87 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab @@ -480,6 +480,22 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 4054452019300043, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4054452019300043, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} + propertyPath: m_LocalRotation.y + value: -0.81915206 + objectReference: {fileID: 0} + - target: {fileID: 4054452019300043, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} + propertyPath: m_LocalRotation.z + value: 0.57357645 + objectReference: {fileID: 0} + - target: {fileID: 4054452019300043, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 110 + objectReference: {fileID: 0} - target: {fileID: 4998404482102611, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} propertyPath: m_LocalScale.x value: 5 @@ -506,11 +522,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4998404482102611, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.8660254 objectReference: {fileID: 0} - target: {fileID: 4998404482102611, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 4998404482102611, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} propertyPath: m_LocalRotation.y @@ -522,7 +538,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4998404482102611, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -60 objectReference: {fileID: 0} - target: {fileID: 4998404482102611, guid: 31d14c4d2edf17b4c9c5a5abad4a474e, type: 3} propertyPath: m_LocalEulerAnglesHint.y diff --git a/Assets/UIResources/Game/HHWK/游戏内按钮.meta b/Assets/UIResources/Game/HHWK/游戏内按钮.meta index 7a4525062..6cd0c5fa9 100644 --- a/Assets/UIResources/Game/HHWK/游戏内按钮.meta +++ b/Assets/UIResources/Game/HHWK/游戏内按钮.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e61fbacb97da01a479607126d7c62176 +guid: e097c95c2a4a0ec4db05eb1dc0b5d410 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/UIResources/Home/大厅.meta b/Assets/UIResources/Home/大厅.meta index 00dd47fc5..9e18e5a19 100644 --- a/Assets/UIResources/Home/大厅.meta +++ b/Assets/UIResources/Home/大厅.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d5b0a6cee23bdf41a6f95e8cd3afa29 +guid: a2183bfbe00c04e4bb6da4de8115e24f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png b/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png new file mode 100644 index 000000000..ee46a8476 Binary files /dev/null and b/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png differ diff --git a/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png.meta b/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png.meta new file mode 100644 index 000000000..6933a75de --- /dev/null +++ b/Assets/UIResources/Home/炮台/XSHG_XS_duigou.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9cef5a03e6de060458fb10455af7594f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UIResources/Home/炮台/图层 16.png.meta b/Assets/UIResources/Home/炮台/图层 16.png.meta index 00b953a42..95895af43 100644 --- a/Assets/UIResources/Home/炮台/图层 16.png.meta +++ b/Assets/UIResources/Home/炮台/图层 16.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 30, y: 30, z: 32, w: 36} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -93,6 +93,19 @@ TextureImporter: 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 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,7 +113,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/UIResources/Home/选择场地.meta b/Assets/UIResources/Home/选择场地.meta index b90663b68..351b46edb 100644 --- a/Assets/UIResources/Home/选择场地.meta +++ b/Assets/UIResources/Home/选择场地.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7674c860e150dc747a3ad5d95d0290ff +guid: e2269f2844821184f942d3319e662460 folderAsset: yes DefaultImporter: externalObjects: {}