diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index 9e33ce422..d6b97a935 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -102,6 +102,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 992fea33b6dcd49eea68c4f018767315, type: 3} - {fileID: 21300000, guid: c5b2f243e6af18240b8f02297d60a98e, type: 3} - {fileID: 21300000, guid: de67ff43cf9c86c46be7127c2fb7cc84, type: 3} + - {fileID: 21300000, guid: f84ffb5354dfd484aa016bd3077eabe1, type: 3} - {fileID: 21300000, guid: afcf9e53b76eef44dba33da9caa87fc3, type: 3} - {fileID: 21300000, guid: beaaa8e349966d64292667db5f7b8c3a, type: 3} - {fileID: 21300000, guid: cf73870457f688f4ca0a68c8941d6ee3, type: 3} @@ -227,6 +228,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 608df94fc480746cd8504c97a9431730, type: 3} - {fileID: 21300000, guid: 6220406f89e60aa4e9f08a64fc5db514, type: 3} - {fileID: 21300000, guid: a1c0506fd7243474bbb74aac6d127d35, type: 3} + - {fileID: 21300000, guid: 0bec767f9e1c74ebb96272639b9262bf, type: 3} - {fileID: 21300000, guid: 37d5c87f4216bfa43acb52a09dcf3a24, type: 3} - {fileID: 21300000, guid: 84a8e79f7596403459578a2297a00864, type: 3} - {fileID: 21300000, guid: e8a869bf5b5b1a2469b54cc718b6642e, type: 3} @@ -276,6 +278,7 @@ SpriteAtlas: - battle_bg_lv - battle_obstacle_rocket_up - battle_star_2 + - battle_bg_15 - battle_pig - battle_hinder_33 - battle_obstacle_leaf @@ -401,6 +404,7 @@ SpriteAtlas: - battle_bg_9 - battle_obstacle_chest_2 - battle_bar_1 + - battle_combo - battle_hinder_19 - battle_hinder_6 - battle_skill_bg_1 diff --git a/Assets/arts/spines/ui/ui_task_chest_1.meta b/Assets/arts/spines/ui/ui_task_chest_1.meta new file mode 100644 index 000000000..5c91b8e27 --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0b7d8b36a0084f899f4e3798c31e0ec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt new file mode 100644 index 000000000..a7e1b94b6 --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt @@ -0,0 +1,10 @@ +ui_task_chest_1.png +size:256,256 +filter:Linear,Linear +1 +bounds:1,67,76,61 +2 +bounds:1,1,70,64 +xing +bounds:79,95,33,33 +offsets:1,1,35,35 diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt.meta b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt.meta new file mode 100644 index 000000000..8f2d28eaf --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2a49dd36b9894c088d1c9c6e4b13721 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.png b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.png new file mode 100644 index 000000000..d6eb03351 Binary files /dev/null and b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.png differ diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.png.meta b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.png.meta new file mode 100644 index 000000000..1fbf38899 --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: ad4cdc192d9df42ecbefe7e0564ea7b7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.skel.bytes b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.skel.bytes new file mode 100644 index 000000000..78496627d Binary files /dev/null and b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.skel.bytes.meta b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.skel.bytes.meta new file mode 100644 index 000000000..3df14ecfe --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9fb13ac0901cc450b96efd6517509d41 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset new file mode 100644 index 000000000..db15e73fd --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: ui_task_chest_1_atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: b2a49dd36b9894c088d1c9c6e4b13721, type: 3} + materials: + - {fileID: 2100000, guid: 7ccc19d04bffa4a58a3ef53478fee429, type: 2} diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset.meta b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset.meta new file mode 100644 index 000000000..8382797c0 --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ea8bea4179c5441d91c66d752ca0b8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat new file mode 100644 index 000000000..12f57be11 --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ui_task_chest_1_material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: ad4cdc192d9df42ecbefe7e0564ea7b7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat.meta b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat.meta new file mode 100644 index 000000000..f370bc14d --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ccc19d04bffa4a58a3ef53478fee429 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset new file mode 100644 index 000000000..75b7c6ca1 --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: ui_task_chest_1_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 1ea8bea4179c5441d91c66d752ca0b8a, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 9fb13ac0901cc450b96efd6517509d41, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset.meta new file mode 100644 index 000000000..cec8a32ef --- /dev/null +++ b/Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39eb458650cb7446e9cadfdaf579693c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/skill_boss.meta b/Assets/arts/textures/icon/skill_boss.meta new file mode 100644 index 000000000..e051e0841 --- /dev/null +++ b/Assets/arts/textures/icon/skill_boss.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a76336e772294235b57456e18a7b531 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/skill_boss/1.png b/Assets/arts/textures/icon/skill_boss/1.png new file mode 100644 index 000000000..345a597ee Binary files /dev/null and b/Assets/arts/textures/icon/skill_boss/1.png differ diff --git a/Assets/arts/textures/icon/skill_boss/1.png.meta b/Assets/arts/textures/icon/skill_boss/1.png.meta new file mode 100644 index 000000000..9f9f436a9 --- /dev/null +++ b/Assets/arts/textures/icon/skill_boss/1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: ad983d53f317f418eb2aa9999d3272ec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 1 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/skill_boss/2.png b/Assets/arts/textures/icon/skill_boss/2.png new file mode 100644 index 000000000..db8a4859b Binary files /dev/null and b/Assets/arts/textures/icon/skill_boss/2.png differ diff --git a/Assets/arts/textures/icon/skill_boss/2.png.meta b/Assets/arts/textures/icon/skill_boss/2.png.meta new file mode 100644 index 000000000..35d2bcc91 --- /dev/null +++ b/Assets/arts/textures/icon/skill_boss/2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e15a60296ccf247b59bd911971c1285c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 1 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_bg_15.png b/Assets/arts/textures/ui/battle/battle_bg_15.png new file mode 100644 index 000000000..2eb271791 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_bg_15.png differ diff --git a/Assets/arts/textures/ui/battle/battle_bg_15.png.meta b/Assets/arts/textures/ui/battle/battle_bg_15.png.meta new file mode 100644 index 000000000..1887253a2 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_bg_15.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: f84ffb5354dfd484aa016bd3077eabe1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 1 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_combo.png b/Assets/arts/textures/ui/battle/battle_combo.png new file mode 100644 index 000000000..3dc2c4258 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_combo.png differ diff --git a/Assets/arts/textures/ui/battle/battle_combo.png.meta b/Assets/arts/textures/ui/battle/battle_combo.png.meta new file mode 100644 index 000000000..2384e88f3 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_combo.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 0bec767f9e1c74ebb96272639b9262bf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 1 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/daily_challenge/cell/task_cell.lua.bytes b/Assets/lua/app/ui/daily_challenge/cell/task_cell.lua.bytes index 3c402bab4..a1769a55e 100644 Binary files a/Assets/lua/app/ui/daily_challenge/cell/task_cell.lua.bytes and b/Assets/lua/app/ui/daily_challenge/cell/task_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/task/task_main_ui.lua.bytes b/Assets/lua/app/ui/task/task_main_ui.lua.bytes index dfc2a4b14..fc4792473 100644 Binary files a/Assets/lua/app/ui/task/task_main_ui.lua.bytes and b/Assets/lua/app/ui/task/task_main_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 29056f414..be5f45908 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -7412,7 +7412,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: 0, y: -49} + m_AnchoredPosition: {x: 360, y: -49} m_SizeDelta: {x: 195, y: 44} m_Pivot: {x: 1, y: 0} --- !u!222 &5176947563727868919 @@ -8014,7 +8014,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: -40, y: -30} + m_AnchoredPosition: {x: 320, y: -30} m_SizeDelta: {x: 67, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6950051635262332678 @@ -13029,7 +13029,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 36e2163b4404615408f9bb0bead26217, type: 3} + m_Sprite: {fileID: 21300000, guid: f84ffb5354dfd484aa016bd3077eabe1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/daily_challenge/cell/task_cell.prefab b/Assets/prefabs/ui/daily_challenge/cell/task_cell.prefab index 35ed081c8..c20318229 100644 --- a/Assets/prefabs/ui/daily_challenge/cell/task_cell.prefab +++ b/Assets/prefabs/ui/daily_challenge/cell/task_cell.prefab @@ -71,6 +71,10 @@ MonoBehaviour: hashName: 3527463188 objectType: 1 gameObject: {fileID: 6968821570592258671} + - name: task_cell.bg + hashName: 1356112791 + objectType: 0 + gameObject: {fileID: 3390386509845376850} --- !u!1 &3390386509845376850 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/task/task_main_ui.prefab b/Assets/prefabs/ui/task/task_main_ui.prefab index 41e8c9f8c..758ac5daf 100644 --- a/Assets/prefabs/ui/task/task_main_ui.prefab +++ b/Assets/prefabs/ui/task/task_main_ui.prefab @@ -218,7 +218,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8720625751876801752} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -469,6 +469,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 330774047629394054} - {fileID: 3320400664234674551} m_Father: {fileID: 4086456811391204939} m_RootOrder: 4 @@ -506,7 +507,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -821,7 +822,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3859091050204277469} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -955,6 +956,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6065300848236816994} - {fileID: 8594512296791547240} m_Father: {fileID: 4086456811391204939} m_RootOrder: 3 @@ -992,7 +994,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1321,7 +1323,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6330506685419664811} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1680,6 +1682,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 208268587336666455} - {fileID: 1741850410754254510} m_Father: {fileID: 4086456811391204939} m_RootOrder: 6 @@ -1717,7 +1720,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2533,6 +2536,26 @@ MonoBehaviour: hashName: 3025503475 objectType: 0 gameObject: {fileID: 595635708515450891} + - name: task_main_ui.bg.daily.task_final_cell.box_1.ui_spine_obj + hashName: 3762738810 + objectType: 6 + gameObject: {fileID: 7457888694540135556} + - name: task_main_ui.bg.daily.task_final_cell.box_2.ui_spine_obj + hashName: 3257180185 + objectType: 6 + gameObject: {fileID: 4018580322612332128} + - name: task_main_ui.bg.daily.task_final_cell.box_3.ui_spine_obj + hashName: 2751621560 + objectType: 6 + gameObject: {fileID: 3680057813296630134} + - name: task_main_ui.bg.daily.task_final_cell.box_4.ui_spine_obj + hashName: 2246062935 + objectType: 6 + gameObject: {fileID: 3580383214052805553} + - name: task_main_ui.bg.daily.task_final_cell.box_5.ui_spine_obj + hashName: 1740504310 + objectType: 6 + gameObject: {fileID: 4216559493293560616} --- !u!114 &960821287463814128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2886,7 +2909,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2248112617392888925} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3360,7 +3383,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7584081989673203871} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3564,6 +3587,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 18517597498822544} - {fileID: 3994867642506360625} m_Father: {fileID: 4086456811391204939} m_RootOrder: 5 @@ -3601,7 +3625,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3717,6 +3741,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 709249019278317006} - {fileID: 5391253218091682866} m_Father: {fileID: 4086456811391204939} m_RootOrder: 7 @@ -3754,7 +3779,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3764,6 +3789,482 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &2387151824525475408 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8720625751876801752} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 39eb458650cb7446e9cadfdaf579693c, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &709249019278317006 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2387151824525475408} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4216559493293560616 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2387151824525475408} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2933768045067641870 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7584081989673203871} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 39eb458650cb7446e9cadfdaf579693c, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &18517597498822544 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2933768045067641870} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3680057813296630134 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2933768045067641870} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3032317809489602249 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3859091050204277469} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 39eb458650cb7446e9cadfdaf579693c, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &208268587336666455 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3032317809489602249} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3580383214052805553 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3032317809489602249} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3197620503799573272 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2248112617392888925} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 39eb458650cb7446e9cadfdaf579693c, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &330774047629394054 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3197620503799573272} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4018580322612332128 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3197620503799573272} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4627696177020812884 PrefabInstance: m_ObjectHideFlags: 0 @@ -3990,3 +4491,122 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2936564891880932045, guid: f96514d1663a84cdd9aaf34449e2a931, type: 3} m_PrefabInstance: {fileID: 6239167241675988648} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8996882717889200636 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6330506685419664811} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 39eb458650cb7446e9cadfdaf579693c, type: 2} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &6065300848236816994 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 8996882717889200636} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7457888694540135556 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 8996882717889200636} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/tips/desc_tips.prefab b/Assets/prefabs/ui/tips/desc_tips.prefab index c47ff050a..f0587ec6b 100644 --- a/Assets/prefabs/ui/tips/desc_tips.prefab +++ b/Assets/prefabs/ui/tips/desc_tips.prefab @@ -26,6 +26,7 @@ RectTransform: 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: 5170824783243581902} m_Father: {fileID: 3632126005436163848} @@ -68,6 +69,7 @@ RectTransform: 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: 8929359402390539833} m_Father: {fileID: 0} @@ -207,18 +209,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3995293362125788850} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5170824783243581902} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 35, y: 23} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 6.2} + m_SizeDelta: {x: 42, y: 26} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &569324968268049922 CanvasRenderer: m_ObjectHideFlags: 0 @@ -247,7 +250,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 330be4d1490173b4a8a049003427d8fb, type: 3} + m_Sprite: {fileID: 21300000, guid: ff122855b832135498d2983ecb71e37b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -285,6 +288,7 @@ RectTransform: 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: 3189738921288518417} - {fileID: 5882920884253492371} @@ -294,7 +298,7 @@ RectTransform: 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: 257, y: 68} + m_SizeDelta: {x: 346, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5707787804912239203 CanvasRenderer: @@ -324,7 +328,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -362,6 +366,7 @@ RectTransform: 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: 5170824783243581902} m_RootOrder: 1 diff --git a/Assets/prefabs/ui/tips/rewards_tips.prefab b/Assets/prefabs/ui/tips/rewards_tips.prefab index 53ce99eb6..ab5340ebd 100644 --- a/Assets/prefabs/ui/tips/rewards_tips.prefab +++ b/Assets/prefabs/ui/tips/rewards_tips.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 8461932745927490369} m_RootOrder: 0 @@ -102,6 +103,7 @@ RectTransform: 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: 1783650026181210100} - {fileID: 1352963236166380994} @@ -149,9 +151,11 @@ RectTransform: 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: 6081780833341448190} - {fileID: 5573229924703327939} + - {fileID: 1443991657371655759} - {fileID: 6463364178094103142} m_Father: {fileID: 5569313707796977217} m_RootOrder: 0 @@ -159,7 +163,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 63} - m_SizeDelta: {x: 242, y: 150} + m_SizeDelta: {x: 346, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3991149810103026197 CanvasRenderer: @@ -189,7 +193,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -227,9 +231,11 @@ RectTransform: 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: 3475338422305338575} - {fileID: 3302698426571504846} + - {fileID: 3797904215130719551} - {fileID: 8506753566685926045} m_Father: {fileID: 5569313707796977217} m_RootOrder: 1 @@ -237,7 +243,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 75} - m_SizeDelta: {x: 300, y: 177.1} + m_SizeDelta: {x: 346, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7376567826131227151 CanvasRenderer: @@ -267,7 +273,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -302,18 +308,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2408360508348594647} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1352963236166380994} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 35, y: 23} - m_Pivot: {x: 0.5, y: 1} + m_SizeDelta: {x: 42, y: 26} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &563715109830167051 CanvasRenderer: m_ObjectHideFlags: 0 @@ -342,7 +349,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b580961da7927cb45b605286d0a73c48, type: 3} + m_Sprite: {fileID: 21300000, guid: ff122855b832135498d2983ecb71e37b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -380,6 +387,7 @@ RectTransform: 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: 1783650026181210100} m_RootOrder: 1 @@ -486,6 +494,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4374949878561557890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1443991657371655759} + - component: {fileID: 1149531069303265483} + - component: {fileID: 63105944183846256} + m_Layer: 5 + m_Name: line_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1443991657371655759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4374949878561557890} + 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: 1783650026181210100} + m_RootOrder: 2 + 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: 8} + m_SizeDelta: {x: 300, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1149531069303265483 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4374949878561557890} + m_CullTransparentMesh: 1 +--- !u!114 &63105944183846256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4374949878561557890} + 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: 59664f7585dc89f4aa7d96b2f601d19b, 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 &5997397792976241942 GameObject: m_ObjectHideFlags: 0 @@ -518,6 +602,7 @@ RectTransform: 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: 8868225845244301915} - {fileID: 5569313707796977217} @@ -703,18 +788,19 @@ RectTransform: m_GameObject: {fileID: 6531591800418488744} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.4916923, y: 0.4916923, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1281868463153018497} - {fileID: 8970469402695251181} - {fileID: 8697205304515574201} m_Father: {fileID: 1783650026181210100} - m_RootOrder: 2 + m_RootOrder: 3 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: -26} - m_SizeDelta: {x: 448, y: 130} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 300, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7298633522131123418 MonoBehaviour: @@ -733,7 +819,7 @@ MonoBehaviour: top: 0 bottom: 0 childAlignment: 4 - spacing: 29 + spacing: 10 verticalOrHorizontal: 0 --- !u!1 &6651004402920351252 GameObject: @@ -763,14 +849,15 @@ RectTransform: 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: 1352963236166380994} m_RootOrder: 1 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: 35} - m_SizeDelta: {x: -20, y: -90} + m_AnchoredPosition: {x: 0, y: 40} + m_SizeDelta: {x: -20, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4655218116066473719 CanvasRenderer: @@ -869,6 +956,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7983811568576301216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3797904215130719551} + - component: {fileID: 9080004469518254237} + - component: {fileID: 1608021470523523657} + m_Layer: 5 + m_Name: line_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3797904215130719551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983811568576301216} + 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: 1352963236166380994} + m_RootOrder: 2 + 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: -20} + m_SizeDelta: {x: 300, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9080004469518254237 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983811568576301216} + m_CullTransparentMesh: 1 +--- !u!114 &1608021470523523657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983811568576301216} + 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: 59664f7585dc89f4aa7d96b2f601d19b, 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 &8050870887945789009 GameObject: m_ObjectHideFlags: 0 @@ -897,6 +1060,7 @@ RectTransform: 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: 1783650026181210100} m_RootOrder: 0 @@ -973,16 +1137,17 @@ RectTransform: 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: 3418143368399148178} - {fileID: 8930984911956618769} - {fileID: 4952275068775142670} m_Father: {fileID: 1352963236166380994} - m_RootOrder: 2 + m_RootOrder: 3 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: -47.5} + m_AnchoredPosition: {x: 0, y: -60} m_SizeDelta: {x: 288, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1537634711252562137 @@ -1000,7 +1165,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8757057133879344537} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1037,7 +1202,7 @@ MonoBehaviour: m_EditorClassIdentifier: left: 0 right: 0 - top: 2 + top: 4 bottom: 0 childAlignment: 1 spacing: 15 @@ -1083,19 +1248,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1145,6 +1314,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2868519055614979906, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Layer value: 5 @@ -1167,16 +1340,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &5905166122853691724 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 921344181185258694} - m_PrefabAsset: {fileID: 0} --- !u!224 &3418143368399148178 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 921344181185258694} m_PrefabAsset: {fileID: 0} +--- !u!1 &5905166122853691724 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 921344181185258694} + m_PrefabAsset: {fileID: 0} --- !u!114 &2720107300212505979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1230,11 +1403,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1284,6 +1469,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4101644123587406057, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Layer value: 5 @@ -1345,19 +1534,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1407,6 +1600,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2868519055614979906, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Layer value: 5 @@ -1434,11 +1631,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6365787064783232581} m_PrefabAsset: {fileID: 0} ---- !u!224 &8930984911956618769 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6365787064783232581} - m_PrefabAsset: {fileID: 0} --- !u!114 &5156670109745534137 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1451,6 +1643,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &8930984911956618769 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6365787064783232581} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6562946196223642093 PrefabInstance: m_ObjectHideFlags: 0 @@ -1492,11 +1689,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1546,6 +1755,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4101644123587406057, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Layer value: 5 @@ -1556,16 +1769,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &8697205304515574201 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6562946196223642093} - m_PrefabAsset: {fileID: 0} --- !u!1 &445394709404163175 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6562946196223642093} m_PrefabAsset: {fileID: 0} +--- !u!224 &8697205304515574201 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6562946196223642093} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6907229398698247353 PrefabInstance: m_ObjectHideFlags: 0 @@ -1607,11 +1820,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1661,6 +1886,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4101644123587406057, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Layer value: 5 @@ -1671,16 +1900,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &8970469402695251181 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6907229398698247353} - m_PrefabAsset: {fileID: 0} --- !u!1 &207570620768948531 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6907229398698247353} m_PrefabAsset: {fileID: 0} +--- !u!224 &8970469402695251181 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6907229398698247353} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7430069679986566490 PrefabInstance: m_ObjectHideFlags: 0 @@ -1722,19 +1951,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1784,6 +2017,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2868519055614979906, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Layer value: 5 @@ -1806,11 +2043,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &4952275068775142670 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 7430069679986566490} - m_PrefabAsset: {fileID: 0} --- !u!1 &4190302490719760592 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} @@ -1828,3 +2060,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &4952275068775142670 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7430069679986566490} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index f02e69f88..a4877e216 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -Ò† +Û‡ pb/proto/protocol.protocspb"' Act gifts ( 2 @@ -1523,15 +1523,19 @@ wish_count (R wishCount"E task_id (RtaskId param (Rparam progress (Rprogress -claimed (Rclaimed"™ +claimed (Rclaimed"¢ TaskDaily0 tasks ( 2.cspb.TaskDaily.TasksEntryRtasks -point (RpointD +point (RpointF + stage_claimed ( 2!.cspb.TaskDaily.StageClaimedEntryR stageClaimedD TasksEntry key (Rkey value ( 2 -.cspb.TaskRvalue:8" +.cspb.TaskRvalue:8? +StageClaimedEntry +key (Rkey +value (Rvalue:8" TaskDailyInfoReq"\ TaskDailyInfoRsp( err_code (2 .cspb.ErrCodeRerrCode