diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index c53748396..a4f4a44d3 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UI/Image/Common/ad icon.png b/Assets/ResWork/UI/Image/Common/ad icon.png new file mode 100644 index 000000000..35671aa54 Binary files /dev/null and b/Assets/ResWork/UI/Image/Common/ad icon.png differ diff --git a/Assets/ResWork/UI/Image/PetMenu/icon_ad.png.meta b/Assets/ResWork/UI/Image/Common/ad icon.png.meta similarity index 98% rename from Assets/ResWork/UI/Image/PetMenu/icon_ad.png.meta rename to Assets/ResWork/UI/Image/Common/ad icon.png.meta index ae8b3c909..8060b58ac 100644 --- a/Assets/ResWork/UI/Image/PetMenu/icon_ad.png.meta +++ b/Assets/ResWork/UI/Image/Common/ad icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07ce5432024fc4d478384d36cd0beedf +guid: dacdfc4b85d265949bd2ef88b1460b29 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/ResWork/UI/Image/Pet/guage bar icon 1_pet.png b/Assets/ResWork/UI/Image/Pet/guage bar icon 1_pet.png new file mode 100644 index 000000000..54fec8d64 Binary files /dev/null and b/Assets/ResWork/UI/Image/Pet/guage bar icon 1_pet.png differ diff --git a/Assets/ResWork/UI/Image/Pet/guage bar icon 1_pet.png.meta b/Assets/ResWork/UI/Image/Pet/guage bar icon 1_pet.png.meta new file mode 100644 index 000000000..a581efc3f --- /dev/null +++ b/Assets/ResWork/UI/Image/Pet/guage bar icon 1_pet.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: fffa51a2c4251854080459dc7fed6026 +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: 1 + 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: Server + 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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + 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/ResWork/UI/Image/Pet/guage bar icon 2_pet.png b/Assets/ResWork/UI/Image/Pet/guage bar icon 2_pet.png new file mode 100644 index 000000000..ae2238414 Binary files /dev/null and b/Assets/ResWork/UI/Image/Pet/guage bar icon 2_pet.png differ diff --git a/Assets/ResWork/UI/Image/Pet/guage bar icon 2_pet.png.meta b/Assets/ResWork/UI/Image/Pet/guage bar icon 2_pet.png.meta new file mode 100644 index 000000000..b3a879749 --- /dev/null +++ b/Assets/ResWork/UI/Image/Pet/guage bar icon 2_pet.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 51715e5157b020344ad376df886720de +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: 1 + 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: Server + 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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + 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/ResWork/UI/Image/Pet/info icon_pet.png b/Assets/ResWork/UI/Image/Pet/info icon_pet.png new file mode 100644 index 000000000..c8ea19d85 Binary files /dev/null and b/Assets/ResWork/UI/Image/Pet/info icon_pet.png differ diff --git a/Assets/ResWork/UI/Image/Pet/info icon_pet.png.meta b/Assets/ResWork/UI/Image/Pet/info icon_pet.png.meta new file mode 100644 index 000000000..9edad2d08 --- /dev/null +++ b/Assets/ResWork/UI/Image/Pet/info icon_pet.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: ee511e84a66947848bc291138c19f6c6 +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: 1 + 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: Server + 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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + 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/ResWork/UI/Image/Pet/line_pet.png b/Assets/ResWork/UI/Image/Pet/line_pet.png new file mode 100644 index 000000000..e70260ed7 Binary files /dev/null and b/Assets/ResWork/UI/Image/Pet/line_pet.png differ diff --git a/Assets/ResWork/UI/Image/Pet/line_pet.png.meta b/Assets/ResWork/UI/Image/Pet/line_pet.png.meta new file mode 100644 index 000000000..e113d3c51 --- /dev/null +++ b/Assets/ResWork/UI/Image/Pet/line_pet.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 76734a4d329f91c429b835d4e4c630f1 +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: 1 + 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: 13, y: 0, z: 13, 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: Server + 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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Pet/lock icon_pet.png b/Assets/ResWork/UI/Image/Pet/lock icon_pet.png new file mode 100644 index 000000000..2c0108745 Binary files /dev/null and b/Assets/ResWork/UI/Image/Pet/lock icon_pet.png differ diff --git a/Assets/ResWork/UI/Image/Pet/lock icon_pet.png.meta b/Assets/ResWork/UI/Image/Pet/lock icon_pet.png.meta new file mode 100644 index 000000000..3bbe3ac04 --- /dev/null +++ b/Assets/ResWork/UI/Image/Pet/lock icon_pet.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0e8a0bcfa3926d64484802ce608e50e2 +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: 1 + 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: Server + 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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + 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/ResWork/UI/Image/PetMenu/icon_ad.png b/Assets/ResWork/UI/Image/PetMenu/icon_ad.png deleted file mode 100644 index 448f942a5..000000000 Binary files a/Assets/ResWork/UI/Image/PetMenu/icon_ad.png and /dev/null differ diff --git a/Assets/ResWork/UIPrefabs/Pet/PetPureStatCard.prefab b/Assets/ResWork/UIPrefabs/Pet/PetPureStatCard.prefab index f51fb9692..1c01dbbb4 100644 --- a/Assets/ResWork/UIPrefabs/Pet/PetPureStatCard.prefab +++ b/Assets/ResWork/UIPrefabs/Pet/PetPureStatCard.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -7.3, y: -0.2} + m_AnchoredPosition: {x: 17.4, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3333173324038630626 @@ -68,8 +68,7 @@ MonoBehaviour: m_text: 000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -93,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -169,7 +168,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 41.1, y: -0.2} + m_AnchoredPosition: {x: 13.4, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2190943722969743209 @@ -210,8 +209,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -304,8 +303,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 29.1, y: 0} - m_SizeDelta: {x: 42, y: 42} + m_AnchoredPosition: {x: 32.1, y: 1.1} + m_SizeDelta: {x: 29, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5291365916812570953 CanvasRenderer: @@ -328,14 +327,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8d831dc6cf786b441b3966e3b1c10064, type: 3} + m_Sprite: {fileID: 21300000, guid: c8842bd21d1e3ce4a96ca762583b65e7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -403,14 +402,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.53333336, g: 0.6, b: 0.61960787, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 22bd883877f36674ba51b8f732864fb0, type: 3} + m_Sprite: {fileID: 21300000, guid: 3ea8fcbbe0fc3f94cbe3190c9098a48a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -458,7 +457,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 75, y: -25} - m_SizeDelta: {x: 172.58, y: 45.31} + m_SizeDelta: {x: 220, y: 59.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &-4705820184756729567 MonoBehaviour: diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index cf3f8f695..260c0f657 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -2287,79 +2287,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &157756901197820590 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3812664029820168240} - - component: {fileID: 1755934351830897434} - - component: {fileID: 4881377734903615504} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3812664029820168240 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157756901197820590} - 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: - - {fileID: 4815075738420279778} - m_Father: {fileID: 6293606928921716849} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1755934351830897434 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157756901197820590} - m_CullTransparentMesh: 1 ---- !u!114 &4881377734903615504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157756901197820590} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: a31e6307ce76ca74fae4e162babfc2f8, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &172581590431189161 GameObject: m_ObjectHideFlags: 0 @@ -3749,10 +3676,10 @@ RectTransform: - {fileID: 1190262876196744635} m_Father: {fileID: 7338987881700654041} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 280, y: -80} - m_SizeDelta: {x: 160, y: 160} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 448.5, y: -63.99} + m_SizeDelta: {x: 143.18, y: 142.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7778778497801575352 CanvasRenderer: @@ -3782,8 +3709,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d00026b2aa0b3f545ba8967256b4e644, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7396,8 +7323,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 286.71, y: -277.03} - m_SizeDelta: {x: 754.12, y: 31.73} + m_AnchoredPosition: {x: 446, y: -250.2} + m_SizeDelta: {x: 930, y: 31.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6911681460856292501 MonoBehaviour: @@ -7446,7 +7373,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.409 + m_Value: 0.484 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -7934,6 +7861,182 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &644799125434747978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2903366506905588986} + - component: {fileID: 1078803783398642906} + - component: {fileID: 4451035965730007782} + - component: {fileID: 1770632608027508533} + - component: {fileID: 6515705296594336451} + - component: {fileID: 2079336376037525395} + m_Layer: 5 + m_Name: passiveskill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2903366506905588986 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644799125434747978} + 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: + - {fileID: 3947450610351546239} + m_Father: {fileID: 3034155288879483745} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 71.2, y: 249.9} + m_SizeDelta: {x: 128, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1078803783398642906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644799125434747978} + m_CullTransparentMesh: 1 +--- !u!114 &4451035965730007782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644799125434747978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1770632608027508533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644799125434747978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4451035965730007782} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8488842843007864132} + m_TargetAssemblyTypeName: PetUI_Left, Assembly-CSharp + m_MethodName: OnClick_Skill + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &6515705296594336451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644799125434747978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2079336376037525395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644799125434747978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SkillCard, Assembly-CSharp + m_MethodName: OnClick_Skill + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &647437166063394056 GameObject: m_ObjectHideFlags: 0 @@ -18317,10 +18420,10 @@ RectTransform: - {fileID: 7941100343014335329} m_Father: {fileID: 7338987881700654041} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -80} - m_SizeDelta: {x: 160, y: 160} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 259.78, y: -63.99} + m_SizeDelta: {x: 143.18, y: 142.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6059040928871676095 CanvasRenderer: @@ -18350,8 +18453,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d00026b2aa0b3f545ba8967256b4e644, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -20185,8 +20288,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -764.2, y: -256.8} - m_SizeDelta: {x: 150, y: 30} + m_AnchoredPosition: {x: -722, y: -309.2} + m_SizeDelta: {x: 150, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3048811281334281826 CanvasRenderer: @@ -20219,8 +20322,7 @@ MonoBehaviour: m_text: "\uD3AB \uC774\uB984" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -20244,8 +20346,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 55 - m_fontSizeBase: 55 + m_fontSize: 65 + m_fontSizeBase: 65 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -28822,9 +28924,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8937587596030746762} - - {fileID: 4000223975890623446} - - {fileID: 3362337323862110136} - - {fileID: 8995773579114640391} + - {fileID: 4564465858542139896} + - {fileID: 2903366506905588986} + - {fileID: 1103095528487228794} - {fileID: 1133978143001091094} - {fileID: 916803107372985417} - {fileID: 117746930768827005} @@ -28853,7 +28955,7 @@ MonoBehaviour: textMeshPro: {fileID: 7596536048090067934} icon: {fileID: 916803107372985417} RightOffset: 0.25 - RT_StartImg: {fileID: 8995773579114640391} + RT_StartImg: {fileID: 0} RT_Line: {fileID: 117746930768827005} --- !u!1 &1956754250953278002 GameObject: @@ -28952,10 +29054,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3034155288879483745} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 90.8, y: 244.70001} - m_SizeDelta: {x: 237, y: 3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -797.4, y: 181.4} + m_SizeDelta: {x: 242, y: 3} m_Pivot: {x: 0, y: 0} --- !u!222 &3949554507775274435 CanvasRenderer: @@ -28985,8 +29087,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef835a4c7a593e742945e1cb0a514c5e, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 76734a4d329f91c429b835d4e4c630f1, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -33852,6 +33954,182 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2237909057473531617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4564465858542139896} + - component: {fileID: 3286091406657419309} + - component: {fileID: 3426645182918122771} + - component: {fileID: 8833177954108918243} + - component: {fileID: 5812230344991777911} + - component: {fileID: 2107152892674865265} + m_Layer: 5 + m_Name: activeskill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4564465858542139896 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2237909057473531617} + 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: + - {fileID: 2566905576040304375} + m_Father: {fileID: 3034155288879483745} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -63.5, y: 249.9} + m_SizeDelta: {x: 128, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3286091406657419309 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2237909057473531617} + m_CullTransparentMesh: 1 +--- !u!114 &3426645182918122771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2237909057473531617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8833177954108918243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2237909057473531617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3426645182918122771} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8488842843007864132} + m_TargetAssemblyTypeName: PetUI_Left, Assembly-CSharp + m_MethodName: OnClick_Skill + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &5812230344991777911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2237909057473531617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2107152892674865265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2237909057473531617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: SkillCard, Assembly-CSharp + m_MethodName: OnClick_Skill + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2239483615453735253 GameObject: m_ObjectHideFlags: 0 @@ -34871,6 +35149,140 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2332839928392208113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1103095528487228794} + - component: {fileID: 3963451846258794403} + - component: {fileID: 933705317392777899} + m_Layer: 5 + m_Name: t_petlv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1103095528487228794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2332839928392208113} + 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: 3034155288879483745} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -719, y: -246.1} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3963451846258794403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2332839928392208113} + m_CullTransparentMesh: 1 +--- !u!114 &933705317392777899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2332839928392208113} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Lv.0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, 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: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -5 + 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 &2333349921420170752 GameObject: m_ObjectHideFlags: 0 @@ -35957,19 +36369,17 @@ MonoBehaviour: m_PetInfoDetailUI: {fileID: 8325082351807030924} arr_statcard: - {fileID: 1584836934342475797} - - {fileID: 4087982503651675050} - - {fileID: 2833356879989813675} - - {fileID: 7653634892147962167} - skillCards: - - {fileID: 8723087705893050645} - - {fileID: 6927784676940950907} + - {fileID: 9033078229305896555} + - {fileID: 7658502975429512759} images: - - {fileID: 4668114417361547240} + - {fileID: 9053999736770281535} + - {fileID: 773832131813002998} texts: - {fileID: 7596536048090067934} - {fileID: 1268175413322224835} - {fileID: 4231650231693638215} - {fileID: 8875133016581644590} + - {fileID: 933705317392777899} slider_gacha: {fileID: 6911681460856292501} gacha_moneyForms: - {fileID: 5942106110191347513} @@ -36144,82 +36554,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &2397681371982310726 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2848821907112351861} - - component: {fileID: 6496844348381991453} - - component: {fileID: 3879164181619241594} - m_Layer: 5 - m_Name: top_bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2848821907112351861 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2397681371982310726} - 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: - - {fileID: 7795005348070200653} - m_Father: {fileID: 6293606928921716849} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -54.530273} - m_SizeDelta: {x: 0, y: 109.04} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6496844348381991453 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2397681371982310726} - m_CullTransparentMesh: 1 ---- !u!114 &3879164181619241594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2397681371982310726} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: db4737f5035fe4e409bfda7ee770bb8d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2400629828754045404 GameObject: m_ObjectHideFlags: 0 @@ -42456,7 +42790,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -506, y: -148} + m_AnchoredPosition: {x: -329, y: -10} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2822874963185261753 @@ -44499,7 +44833,7 @@ RectTransform: m_Father: {fileID: 925291058961817483} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -45136,7 +45470,7 @@ RectTransform: m_Father: {fileID: 7421773287772129309} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.409, y: 1} + m_AnchorMax: {x: 0.484, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -8, y: -4} m_Pivot: {x: 0.5, y: 0.5} @@ -45161,14 +45495,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.7686275, b: 0.6039216, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 22bd883877f36674ba51b8f732864fb0, type: 3} + m_Sprite: {fileID: 21300000, guid: 410de795ee05ec649a61da73ae257c9b, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -47891,14 +48225,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7285932619382295824} - - {fileID: 5213413253530125999} - - {fileID: 6318751234163621038} - - {fileID: 1933594228790803506} + - {fileID: 988923970973999982} + - {fileID: 1921588124281865010} m_Father: {fileID: 8937587596030746762} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 93.2, y: -6.994995} + m_AnchoredPosition: {x: 270, y: -5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6975846818341762741 @@ -47919,7 +48252,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 28.64 + m_Spacing: 25 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -48211,6 +48544,70 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3201283836133767684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7262634596506280932} + - component: {fileID: 9179763953827112095} + m_Layer: 5 + m_Name: topmoney + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7262634596506280932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3201283836133767684} + 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: + - {fileID: 5152842507155115386} + - {fileID: 5654475576682357368} + m_Father: {fileID: 6616051071227709051} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -992, y: -50} + m_SizeDelta: {x: 1920, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &9179763953827112095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3201283836133767684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 17 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3214820505178495488 GameObject: m_ObjectHideFlags: 0 @@ -50378,155 +50775,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &3387064632393558609 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7795005348070200653} - - component: {fileID: 6660899515242378476} - - component: {fileID: 8457016016319605849} - - component: {fileID: 2777728475815074301} - m_Layer: 5 - m_Name: Local TMP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7795005348070200653 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387064632393558609} - 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: 2848821907112351861} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -683.9, y: 5.3} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6660899515242378476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387064632393558609} - m_CullTransparentMesh: 1 ---- !u!114 &8457016016319605849 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387064632393558609} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\uD3AB" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - 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: 55 - m_fontSizeBase: 55 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: -3 - 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!114 &2777728475815074301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3387064632393558609} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} - m_Name: - m_EditorClassIdentifier: - m_localtextKey: 222 --- !u!1 &3391391767957136100 GameObject: m_ObjectHideFlags: 0 @@ -52158,6 +52406,155 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &3473612391253536567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3126409169149429600} + - component: {fileID: 4255750486908092548} + - component: {fileID: 3093797747711337618} + - component: {fileID: 3406723180626421666} + m_Layer: 5 + m_Name: Local TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3126409169149429600 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473612391253536567} + 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: 4571686444125270876} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -734.4, y: 5.3} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4255750486908092548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473612391253536567} + m_CullTransparentMesh: 1 +--- !u!114 &3093797747711337618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473612391253536567} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC601\uC6C5 \uAD00\uB9AC" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 55 + m_fontSizeBase: 55 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -3 + 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!114 &3406723180626421666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3473612391253536567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 222 --- !u!1 &3479687770452989418 GameObject: m_ObjectHideFlags: 0 @@ -55477,9 +55874,9 @@ RectTransform: - {fileID: 8765261026461468677} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 34, y: -34} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6794977624464831537 @@ -55678,6 +56075,151 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &3776393083134417899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3156410525669854922} + - component: {fileID: 2614499291377660257} + - component: {fileID: 2093839743067893778} + - component: {fileID: 8541746322553802447} + - component: {fileID: 6788595529066151134} + m_Layer: 5 + m_Name: btn_x + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3156410525669854922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3776393083134417899} + 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: 1 + m_Children: [] + m_Father: {fileID: 6616051071227709051} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 47.700195, y: -48.100098} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2614499291377660257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3776393083134417899} + m_CullTransparentMesh: 1 +--- !u!114 &2093839743067893778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3776393083134417899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: -20, y: -20, z: -20, w: -20} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4c2f70e886cf3fe4d94ae7f052992e75, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8541746322553802447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3776393083134417899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2093839743067893778} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1130323512171822936} + m_TargetAssemblyTypeName: BotMenuBase, Assembly-CSharp + m_MethodName: OnClick_Back + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &6788595529066151134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3776393083134417899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3779786118356979877 GameObject: m_ObjectHideFlags: 0 @@ -56359,7 +56901,7 @@ RectTransform: m_Father: {fileID: 3850105965408971949} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -62178,9 +62720,9 @@ RectTransform: - {fileID: 6576628753252879149} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190, y: -34} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6285734242704375772 @@ -63912,7 +64454,7 @@ RectTransform: m_Father: {fileID: 1406900139135982907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.057, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -65245,7 +65787,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8460797171243959167 RectTransform: m_ObjectHideFlags: 0 @@ -67246,7 +67788,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5.7000732, y: -231.4} + m_AnchoredPosition: {x: 65.3, y: -214.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8576462296844339852 @@ -67280,15 +67822,14 @@ MonoBehaviour: m_text: Lv.00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 1d9621a89ab3ad942b315bea6982b45c, 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} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -68264,9 +68805,9 @@ RectTransform: - {fileID: 8001933736921823976} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -34} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4650173689224874701 @@ -74586,6 +75127,78 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5038624387159939972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7907952677038444509} + - component: {fileID: 7271018372145195596} + - component: {fileID: 262131178628015717} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7907952677038444509 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5038624387159939972} + 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: 6616051071227709051} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7271018372145195596 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5038624387159939972} + m_CullTransparentMesh: 1 +--- !u!114 &262131178628015717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5038624387159939972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: a31e6307ce76ca74fae4e162babfc2f8, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &5040239726474730018 GameObject: m_ObjectHideFlags: 0 @@ -74728,15 +75341,14 @@ MonoBehaviour: m_text: "\uB4F1\uAE09" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 1d9621a89ab3ad942b315bea6982b45c, 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} + rgba: 4284624941 + m_fontColor: {r: 0.1764706, g: 0.1882353, b: 0.38431373, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -78907,14 +79519,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.050980397, g: 0, b: 0.011764707, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 034a32b434c712c49b760096ea019e8e, type: 3} + m_Sprite: {fileID: 21300000, guid: 011264d785fbe964eb3bd160bbfcdb22, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -79958,8 +80570,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -813.02, y: -329.13} - m_SizeDelta: {x: 106.71, y: 45.98} + m_AnchoredPosition: {x: -727.05, y: -389.03998} + m_SizeDelta: {x: 139.89, y: 66.88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2657806396912673575 CanvasRenderer: @@ -79982,14 +80594,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882356, g: 0.5529412, b: 0.5764706, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} + m_Sprite: {fileID: 21300000, guid: e3ba9fba76c28b7418b0ed7d1f5e1741, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -83867,7 +84479,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 218644919282629287} - - {fileID: 6293606928921716849} + - {fileID: 6616051071227709051} - {fileID: 3022661304010702938} - {fileID: 890059663777587120} - {fileID: 78291557027970721} @@ -83896,12 +84508,88 @@ MonoBehaviour: m_Content: {fileID: 0} go_card: {fileID: 0} moneyForms: - - {fileID: 8205781828665930077} - - {fileID: 2758552516665373769} + - {fileID: 814931093797483311} + - {fileID: 195096117153471533} m_PetUI_Left: {fileID: 8488842843007864132} m_PetUI_Right: {fileID: 1425173094993105834} m_PetSkillDetailUI: {fileID: 3510826244820183976} m_PetInfoDetailUI: {fileID: 8325082351807030924} +--- !u!1 &5788784955454417587 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4571686444125270876} + - component: {fileID: 2417687186961925855} + - component: {fileID: 6054073709373665017} + m_Layer: 5 + m_Name: top_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4571686444125270876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788784955454417587} + 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: + - {fileID: 3126409169149429600} + m_Father: {fileID: 6616051071227709051} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50.930176} + m_SizeDelta: {x: 0, y: 101.87} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2417687186961925855 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788784955454417587} + m_CullTransparentMesh: 1 +--- !u!114 &6054073709373665017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788784955454417587} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 0e67e474f8785574597afcd2895765d9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5791003463875898080 GameObject: m_ObjectHideFlags: 0 @@ -84588,45 +85276,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &5809391704105405588 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6293606928921716849} - m_Layer: 5 - m_Name: Common - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6293606928921716849 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5809391704105405588} - 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: - - {fileID: 3812664029820168240} - - {fileID: 2848821907112351861} - - {fileID: 7949801797982932123} - - {fileID: 2871269138982780380} - m_Father: {fileID: 968397854553593359} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5824346171094209033 GameObject: m_ObjectHideFlags: 0 @@ -91057,6 +91706,45 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &6343377747118078174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6616051071227709051} + m_Layer: 5 + m_Name: Common + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6616051071227709051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6343377747118078174} + 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: + - {fileID: 7907952677038444509} + - {fileID: 4571686444125270876} + - {fileID: 3156410525669854922} + - {fileID: 7262634596506280932} + m_Father: {fileID: 968397854553593359} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6344561137658549643 GameObject: m_ObjectHideFlags: 0 @@ -94343,7 +95031,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c50835aae0907fa4a8ac61c4810aed3d, type: 3} + m_Sprite: {fileID: 21300000, guid: 11dae36ef790bc1409fa6686041d7f0b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -97416,6 +98104,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 147 +--- !u!1 &6838659681216336776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2566905576040304375} + - component: {fileID: 1709316752304325675} + - component: {fileID: 9053999736770281535} + m_Layer: 5 + m_Name: i_skill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2566905576040304375 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838659681216336776} + 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: 4564465858542139896} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1709316752304325675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838659681216336776} + m_CullTransparentMesh: 1 +--- !u!114 &9053999736770281535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838659681216336776} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4fe7c79a3ddd06843ac7b1aff3583459, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6840230163416838402 GameObject: m_ObjectHideFlags: 0 @@ -108056,81 +108819,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 181 ---- !u!1 &7544736692068467179 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8995773579114640391} - - component: {fileID: 6689579370789547286} - - component: {fileID: 7773921867951971703} - m_Layer: 5 - m_Name: nameicon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8995773579114640391 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7544736692068467179} - 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: 3034155288879483745} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -864, y: 283.5} - m_SizeDelta: {x: 9, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6689579370789547286 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7544736692068467179} - m_CullTransparentMesh: 1 ---- !u!114 &7773921867951971703 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7544736692068467179} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 716f3940d7a3c3b45acdbc1d7a2d38a9, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7552013991009338139 GameObject: m_ObjectHideFlags: 0 @@ -108508,7 +109196,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8541309915134075684 RectTransform: m_ObjectHideFlags: 0 @@ -112695,78 +113383,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &7896673808232497622 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4815075738420279778} - - component: {fileID: 3646898707604594297} - - component: {fileID: 3438354297390555903} - m_Layer: 5 - m_Name: New Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4815075738420279778 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896673808232497622} - 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: 3812664029820168240} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3646898707604594297 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896673808232497622} - m_CullTransparentMesh: 1 ---- !u!114 &3438354297390555903 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7896673808232497622} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 055c8fa935863d14ba0a7014510641a5, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &7905773578131909355 GameObject: m_ObjectHideFlags: 0 @@ -115788,81 +116404,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &8089634840987024829 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4354425053001666177} - - component: {fileID: 318849817736955741} - - component: {fileID: 467963820844257557} - m_Layer: 5 - m_Name: New Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4354425053001666177 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8089634840987024829} - 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: 916803107372985417} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 21, y: 22} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &318849817736955741 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8089634840987024829} - m_CullTransparentMesh: 1 ---- !u!114 &467963820844257557 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8089634840987024829} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c0de2b9bdc784f3468dcc907cd36ee24, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8094575164048861655 GameObject: m_ObjectHideFlags: 0 @@ -115900,10 +116441,10 @@ RectTransform: - {fileID: 5078925483849685378} m_Father: {fileID: 7338987881700654041} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 480, y: -80} - m_SizeDelta: {x: 160, y: 160} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 638.9, y: -63.99} + m_SizeDelta: {x: 143.18, y: 142.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2318872024629347921 CanvasRenderer: @@ -115933,8 +116474,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d00026b2aa0b3f545ba8967256b4e644, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -118933,15 +119474,14 @@ MonoBehaviour: m_text: 0000/0000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -120719,151 +121259,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 248 ---- !u!1 &8424274038365410426 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7949801797982932123} - - component: {fileID: 4006418783471622437} - - component: {fileID: 7968076407491640859} - - component: {fileID: 6454676609096837707} - - component: {fileID: 3837014456998880651} - m_Layer: 5 - m_Name: btn_x - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7949801797982932123 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8424274038365410426} - 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: 6293606928921716849} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 66.19922, y: -49.100586} - m_SizeDelta: {x: 41, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4006418783471622437 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8424274038365410426} - m_CullTransparentMesh: 1 ---- !u!114 &7968076407491640859 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8424274038365410426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: -20, y: -20, z: -20, w: -20} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f17e0d68299b3a24586345fdf99113a2, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6454676609096837707 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8424274038365410426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7968076407491640859} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1130323512171822936} - m_TargetAssemblyTypeName: BackKeyAdd, Assembly-CSharp - m_MethodName: OnClick_Back - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &3837014456998880651 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8424274038365410426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &8431072112474909310 GameObject: m_ObjectHideFlags: 0 @@ -123765,6 +124160,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8605594759754333722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3947450610351546239} + - component: {fileID: 8656568174881919379} + - component: {fileID: 773832131813002998} + m_Layer: 5 + m_Name: i_skill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3947450610351546239 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8605594759754333722} + 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: 2903366506905588986} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8656568174881919379 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8605594759754333722} + m_CullTransparentMesh: 1 +--- !u!114 &773832131813002998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8605594759754333722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4fe7c79a3ddd06843ac7b1aff3583459, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8607728099976174380 GameObject: m_ObjectHideFlags: 0 @@ -130109,14 +130579,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4354425053001666177} + m_Children: [] m_Father: {fileID: 3034155288879483745} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -651, y: -261.1} - m_SizeDelta: {x: 37, y: 38} + m_AnchoredPosition: {x: -575.7, y: -321} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &561736487633170397 MonoBehaviour: @@ -130161,7 +130630,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2a8291c4b3bd6804ea178aa2c117b91f, type: 3} + m_Sprite: {fileID: 21300000, guid: ee511e84a66947848bc291138c19f6c6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -133761,70 +134230,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9138760489301324957 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2871269138982780380} - - component: {fileID: 6817145848393892757} - m_Layer: 5 - m_Name: topmoney - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2871269138982780380 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9138760489301324957} - 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: - - {fileID: 4408301030421778184} - - {fileID: 7675819937233029660} - m_Father: {fileID: 6293606928921716849} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -254.5, y: -45.100586} - m_SizeDelta: {x: 1920, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6817145848393892757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9138760489301324957} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 17 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &9163467765945453706 GameObject: m_ObjectHideFlags: 0 @@ -135309,142 +135714,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 91607567844825772} m_PrefabAsset: {fileID: 0} ---- !u!1001 &92024189764081358 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2871269138982780380} - m_Modifications: - - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_Name - value: MoneyForm (1) - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_SizeDelta.x - value: 220 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_SizeDelta.y - value: 45.73 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 1078.5 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} ---- !u!114 &2758552516665373769 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - m_PrefabInstance: {fileID: 92024189764081358} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &7675819937233029660 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - m_PrefabInstance: {fileID: 92024189764081358} - m_PrefabAsset: {fileID: 0} --- !u!1001 &102841709923404502 PrefabInstance: m_ObjectHideFlags: 0 @@ -136688,153 +136957,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 434249821180193217} m_PrefabAsset: {fileID: 0} ---- !u!1001 &435440779194647179 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4057066872561781195} - m_Modifications: - - target: {fileID: 2527257251302510900, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: ea8a343209fa5724281a235bcc30b28e, - type: 3} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_SizeDelta.x - value: 172.58 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_SizeDelta.y - value: 45.31 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 287.51 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -22.655 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Name - value: PetStatCard (1) - objectReference: {fileID: 0} - - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 463e04087ef256845bbcdca666c3277d, type: 3} ---- !u!114 &4087982503651675050 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -4705820184756729567, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - m_PrefabInstance: {fileID: 435440779194647179} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cefb074fa2f50b44bb24fbafa35f1723, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &5213413253530125999 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - m_PrefabInstance: {fileID: 435440779194647179} - m_PrefabAsset: {fileID: 0} --- !u!1001 &439818535045348157 PrefabInstance: m_ObjectHideFlags: 0 @@ -137410,22 +137532,22 @@ PrefabInstance: - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.b - value: 0 + value: 0.38431373 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.g - value: 0 + value: 0.1882353 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.r - value: 0 + value: 0.1764706 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor32.rgba - value: 4278190080 + value: 4284624941 objectReference: {fileID: 0} - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -137520,7 +137642,7 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: -89.5 + value: -93.8 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -137540,13 +137662,13 @@ PrefabInstance: - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Type - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 83b32500244d6bd48aa2c4f161c33089, + objectReference: {fileID: 21300000, guid: 2a328e6a4c5557546bf78786dcd1d497, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -140481,147 +140603,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1756284194091830005} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1865486864556095626 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4057066872561781195} - m_Modifications: - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_SizeDelta.x - value: 172.58 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_SizeDelta.y - value: 45.31 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 488.73 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -22.655 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_Name - value: PetStatCard (2) - objectReference: {fileID: 0} - - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 463e04087ef256845bbcdca666c3277d, type: 3} ---- !u!114 &2833356879989813675 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -4705820184756729567, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - m_PrefabInstance: {fileID: 1865486864556095626} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cefb074fa2f50b44bb24fbafa35f1723, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &6318751234163621038 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - m_PrefabInstance: {fileID: 1865486864556095626} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1871179714943227145 PrefabInstance: m_ObjectHideFlags: 0 @@ -141280,7 +141261,7 @@ PrefabInstance: - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -144084,6 +144065,142 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2712386488474494584} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2718953200828120746 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7262634596506280932} + m_Modifications: + - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Name + value: MoneyForm (1) + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 220 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 45.73 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1810 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} +--- !u!114 &195096117153471533 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 2718953200828120746} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5654475576682357368 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 2718953200828120746} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2804298075145803785 PrefabInstance: m_ObjectHideFlags: 0 @@ -144820,12 +144937,12 @@ PrefabInstance: - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_SizeDelta.x - value: 172.58 + value: 220 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_SizeDelta.y - value: 45.31 + value: 59.3 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} @@ -144865,12 +144982,12 @@ PrefabInstance: - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_AnchoredPosition.x - value: 86.29 + value: 110 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.655 + value: -29.65 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} @@ -144915,6 +145032,142 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3120970021611850036} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3188971737786143144 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7262634596506280932} + m_Modifications: + - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Name + value: MoneyForm + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.x + value: 220 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_SizeDelta.y + value: 45.73 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1573 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} +--- !u!114 &814931093797483311 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 3188971737786143144} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5152842507155115386 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 3188971737786143144} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3214621196757338785 PrefabInstance: m_ObjectHideFlags: 0 @@ -151690,6 +151943,142 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &4893831367468640074 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4057066872561781195} + m_Modifications: + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_SizeDelta.x + value: 220 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_SizeDelta.y + value: 59.3 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 355 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -29.65 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + propertyPath: m_Name + value: PetStatCard (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 463e04087ef256845bbcdca666c3277d, type: 3} +--- !u!224 &988923970973999982 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + m_PrefabInstance: {fileID: 4893831367468640074} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9033078229305896555 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -4705820184756729567, guid: 463e04087ef256845bbcdca666c3277d, + type: 3} + m_PrefabInstance: {fileID: 4893831367468640074} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cefb074fa2f50b44bb24fbafa35f1723, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4901031767899293585 PrefabInstance: m_ObjectHideFlags: 0 @@ -154379,7 +154768,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2d3bea595a34c94981f5760375e7387, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &6090763471030712342 +--- !u!1001 &6123178710088140566 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -154420,12 +154809,12 @@ PrefabInstance: - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_SizeDelta.x - value: 172.58 + value: 220 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_SizeDelta.y - value: 45.31 + value: 59.3 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} @@ -154465,12 +154854,12 @@ PrefabInstance: - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_AnchoredPosition.x - value: 689.95 + value: 600 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.655 + value: -29.65 objectReference: {fileID: 0} - target: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} @@ -154490,29 +154879,24 @@ PrefabInstance: - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, type: 3} propertyPath: m_Name - value: PetStatCard (3) - objectReference: {fileID: 0} - - target: {fileID: 8689052607444876781, guid: 463e04087ef256845bbcdca666c3277d, - type: 3} - propertyPath: m_IsActive - value: 1 + value: PetStatCard (2) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 463e04087ef256845bbcdca666c3277d, type: 3} ---- !u!224 &1933594228790803506 stripped +--- !u!224 &1921588124281865010 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5643921482882466852, guid: 463e04087ef256845bbcdca666c3277d, type: 3} - m_PrefabInstance: {fileID: 6090763471030712342} + m_PrefabInstance: {fileID: 6123178710088140566} m_PrefabAsset: {fileID: 0} ---- !u!114 &7653634892147962167 stripped +--- !u!114 &7658502975429512759 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: -4705820184756729567, guid: 463e04087ef256845bbcdca666c3277d, type: 3} - m_PrefabInstance: {fileID: 6090763471030712342} + m_PrefabInstance: {fileID: 6123178710088140566} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -154938,142 +155322,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2d3bea595a34c94981f5760375e7387, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &6264081010418521050 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2871269138982780380} - m_Modifications: - - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_Name - value: MoneyForm - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_SizeDelta.x - value: 220 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_SizeDelta.y - value: 45.73 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 841.5 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} ---- !u!224 &4408301030421778184 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - m_PrefabInstance: {fileID: 6264081010418521050} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8205781828665930077 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, - type: 3} - m_PrefabInstance: {fileID: 6264081010418521050} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6275170748909793402 PrefabInstance: m_ObjectHideFlags: 0 @@ -155629,25 +155877,30 @@ PrefabInstance: propertyPath: m_Name value: MoneyForm (1) objectReference: {fileID: 0} + - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.b - value: 0 + value: 0.38431373 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.g - value: 0 + value: 0.1882353 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.r - value: 0 + value: 0.1764706 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor32.rgba - value: 4278190080 + value: 4284624941 objectReference: {fileID: 0} - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -155742,7 +155995,7 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: -89.5 + value: -93.8 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -155762,13 +156015,13 @@ PrefabInstance: - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Type - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 83b32500244d6bd48aa2c4f161c33089, + objectReference: {fileID: 21300000, guid: 2a328e6a4c5557546bf78786dcd1d497, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -157147,147 +157400,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2d3bea595a34c94981f5760375e7387, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &7001053023269144998 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3034155288879483745} - m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_Name - value: SkillCard - objectReference: {fileID: 0} - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 649 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -300 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} ---- !u!224 &4000223975890623446 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - m_PrefabInstance: {fileID: 7001053023269144998} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8723087705893050645 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - m_PrefabInstance: {fileID: 7001053023269144998} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4610c6b638e96ee419988982fc8f1663, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &7028082218736224988 PrefabInstance: m_ObjectHideFlags: 0 @@ -160547,7 +160659,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 07ce5432024fc4d478384d36cd0beedf, + objectReference: {fileID: 21300000, guid: dacdfc4b85d265949bd2ef88b1460b29, type: 3} - target: {fileID: 3590403063326329916, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -160562,22 +160674,22 @@ PrefabInstance: - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.b - value: 0 + value: 0.38431373 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.g - value: 0 + value: 0.1882353 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor.r - value: 0 + value: 0.1764706 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_fontColor32.rgba - value: 4278190080 + value: 4284624941 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -160587,12 +160699,12 @@ PrefabInstance: - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_SizeDelta.x - value: 33 + value: 40 objectReference: {fileID: 0} - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_SizeDelta.y - value: 24 + value: 40 objectReference: {fileID: 0} - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -160682,7 +160794,7 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: -89.5 + value: -93.8 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -160702,13 +160814,13 @@ PrefabInstance: - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Type - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9168172215786797966, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 83b32500244d6bd48aa2c4f161c33089, + objectReference: {fileID: 21300000, guid: 2a328e6a4c5557546bf78786dcd1d497, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -161333,147 +161445,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &8647599415395188168 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3034155288879483745} - m_Modifications: - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_Name - value: SkillCard (1) - objectReference: {fileID: 0} - - target: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 793 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -300 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3} ---- !u!224 &3362337323862110136 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6245114044720075376, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - m_PrefabInstance: {fileID: 8647599415395188168} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6927784676940950907 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1740112032792105139, guid: ba9d3a9dca146764c9eab1afcce6c695, - type: 3} - m_PrefabInstance: {fileID: 8647599415395188168} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4610c6b638e96ee419988982fc8f1663, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &8751400089481427621 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/Pet/PetPureStatCard.cs b/Assets/Script/UI/Pet/PetPureStatCard.cs index ea98a037f..dde8c51f5 100644 --- a/Assets/Script/UI/Pet/PetPureStatCard.cs +++ b/Assets/Script/UI/Pet/PetPureStatCard.cs @@ -11,12 +11,12 @@ public class PetPureStatCard : MonoBehaviour { if (isLv) { - i_icon.sprite = UIAtlasMgr.Ins.Get_Sprite("icon_lv"); + //i_icon.sprite = UIAtlasMgr.Ins.Get_Sprite("icon_lv"); texts[0].text = table_localtext.Ins.Get_Text(267); } else { - i_icon.sprite = UIAtlasMgr.Ins.Get_StatSprite(stat); + //i_icon.sprite = UIAtlasMgr.Ins.Get_StatSprite(stat); texts[0].text = MyText.Get_StatName(stat); } texts[1].text = v.ToString(); diff --git a/Assets/Script/UI/Pet/PetUI_Left.cs b/Assets/Script/UI/Pet/PetUI_Left.cs index cf99b5ca6..ee97f3c9a 100644 --- a/Assets/Script/UI/Pet/PetUI_Left.cs +++ b/Assets/Script/UI/Pet/PetUI_Left.cs @@ -8,9 +8,8 @@ public class PetUI_Left : UI3DModel { public PetInfoDetailUI m_PetInfoDetailUI; public PetPureStatCard[] arr_statcard; - public SkillCard[] skillCards; // 0 액티브 스킬, 1 패시브 스킬 - public Image[] images; // 0 등급 - public TextMeshProUGUI[] texts; // 0 펫 이름, 1 등급, 2 가챠 레벨, 3 가챠 진행상황 + public Image[] images; // 0 액티브 스킬, 1 패시브 스킬 + public TextMeshProUGUI[] texts; // 0 펫 이름, 1 등급, 2 가챠 레벨, 3 가챠 진행상황, 4 펫 레벨 public Slider slider_gacha; public MoneyForm[] gacha_moneyForms; // 0 광고(시간), 1 1회 뽑기, 2 10회 뽑기 @@ -18,12 +17,6 @@ public class PetUI_Left : UI3DModel PetListTableData m_Data; - private void Start() - { - for (int i = 0; i < skillCards.Length; i++) - skillCards[i].Set_CardType(eUICardType.UIPetSkill); - } - private void Update() { Set_GambleADTimeText(); @@ -31,7 +24,7 @@ public class PetUI_Left : UI3DModel public void Set(PetListTableData data) { - var sdata = ServerInfo.Ins.m_ServerData; + //var sdata = ServerInfo.Ins.m_ServerData; m_Data = data; Set_PurStat(); Set_3DModel(false, m_Data.s_PetPrefab, tf => @@ -40,12 +33,11 @@ public class PetUI_Left : UI3DModel tf.localPosition = Vector3.up * m_Data.f_UIOffSet_y; zSizeControler.Set(tf); }); - //images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(m_Data.n_PetGrade); texts[0].text = m_Data.Get_Name(); texts[1].text = MyText.Get_GradeName(m_Data.n_PetGrade); - var lv = sdata.Get_PetLv(m_Data.n_PetID); - skillCards[0].Set_PetSkill(m_Data.n_PetActiveSkill, data.n_PetID, lv); - skillCards[1].Set_PetSkill(m_Data.n_PetPassiveSkill, data.n_PetID, lv); + //var lv = sdata.Get_PetLv(m_Data.n_PetID); + images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_PetActiveSkill); + images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_PetPassiveSkill); Set_GambleUI(); } @@ -73,15 +65,16 @@ public class PetUI_Left : UI3DModel { var sdata = ServerInfo.Ins.m_ServerData; var lv = sdata.Get_PetLv(m_Data.n_PetID); - arr_statcard[0].Set(true, eStat.None, lv); - arr_statcard[1].Set(false, eStat.ATK, (int)m_Data.Get_PureStat(eStat.ATK, lv)); - arr_statcard[2].Set(false, eStat.HP, (int)m_Data.Get_PureStat(eStat.HP, lv)); + texts[4].text = $"Lv.{lv}"; + //arr_statcard[0].Set(true, eStat.None, lv); + arr_statcard[0].Set(false, eStat.ATK, (int)m_Data.Get_PureStat(eStat.ATK, lv)); + arr_statcard[1].Set(false, eStat.HP, (int)m_Data.Get_PureStat(eStat.HP, lv)); var def = m_Data.Get_PureStat(eStat.DEF, lv); if (def > 0) - arr_statcard[3].Set(false, eStat.DEF, (int)m_Data.Get_PureStat(eStat.DEF, lv)); + arr_statcard[2].Set(false, eStat.DEF, (int)m_Data.Get_PureStat(eStat.DEF, lv)); else - arr_statcard[3].Set(false, eStat.M_DEF, (int)m_Data.Get_PureStat(eStat.M_DEF, lv)); + arr_statcard[2].Set(false, eStat.M_DEF, (int)m_Data.Get_PureStat(eStat.M_DEF, lv)); } public void OnClick_PetDetail() @@ -89,6 +82,17 @@ public class PetUI_Left : UI3DModel m_PetInfoDetailUI.Set(m_Data); } + public void OnClick_Skill(int type) + { + var sdata = ServerInfo.Ins.m_ServerData; + var lv = sdata.Get_PetLv(m_Data.n_PetID); + if (type == 0) // 액티브 + NewGameUI.Ins.m_PetUI.m_PetSkillDetailUI.Set(m_Data.n_PetActiveSkill, m_Data.n_PetID, lv); + else + NewGameUI.Ins.m_PetUI.m_PetSkillDetailUI.Set(m_Data.n_PetPassiveSkill, m_Data.n_PetID, lv); + + } + ObscuredInt m_Amount, m_Price; public void OnClick_Gamble(int index) {