diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index b8dfed3ec..0fc21c3ea 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -62,6 +62,7 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3} + - {fileID: 21300000, guid: fab2da6010f11704a98a2f788ba73a34, type: 3} - {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3} - {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} - {fileID: 21300000, guid: a5649cd0bacb4934bbe6a22dca87cf40, type: 3} @@ -193,6 +194,7 @@ SpriteAtlas: - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3} m_PackedSpriteNamesToIndex: - common_board_24 + - common_title_12 - common_title_2 - common_title_1 - common_board_19 diff --git a/Assets/arts/spines/ui/ui_shop_goldpig.meta b/Assets/arts/spines/ui/ui_shop_goldpig.meta new file mode 100644 index 000000000..5bd286dc8 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3528ca04f8332104e82cccf8aed7d478 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.atlas.txt b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.atlas.txt new file mode 100644 index 000000000..dc3100e4d --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.atlas.txt @@ -0,0 +1,71 @@ +ui_shop_goldpig.png +size:1024,1024 +filter:Linear,Linear +chuizi +bounds:808,808,168,211 +guang1 +bounds:2,220,373,421 +offsets:4,1,381,434 +guang2 +bounds:2,643,524,376 +offsets:5,1,534,387 +hengfu +bounds:528,351,668,125 +rotate:90 +shuaguang +bounds:655,754,151,265 +offsets:8,9,168,283 +xx +bounds:377,354,54,54 +offsets:1,1,56,56 +xx2 +bounds:377,354,54,54 +offsets:1,1,56,56 +xx3 +bounds:335,185,33,33 +offsets:1,1,35,35 +zhu_bizi +bounds:377,410,80,67 +offsets:1,1,82,69 +zhu_er +bounds:258,12,53,46 +offsets:1,1,55,48 +zhu_shenti +bounds:377,479,162,136 +offsets:1,1,164,138 +rotate:90 +zhu_tou +bounds:655,566,186,159 +rotate:90 +zhu_tui1 +bounds:655,352,48,71 +rotate:90 +zhu_tui2 +bounds:258,60,56,72 +zhu_tui3 +bounds:808,754,52,62 +rotate:90 +zhu_wei +bounds:459,404,67,73 +zhu_yan +bounds:787,537,12,27 +offsets:1,1,14,29 +zhu_yan2 +bounds:787,537,12,27 +offsets:1,1,14,29 +zhu_zui +bounds:978,920,99,41 +offsets:1,1,101,43 +rotate:90 +zs1 +bounds:258,134,75,84 +offsets:1,1,77,86 +zs2 +bounds:2,7,254,211 +offsets:1,1,257,213 +zs3 +bounds:655,402,130,162 +offsets:1,1,132,164 +zs4 +bounds:816,703,43,49 +offsets:1,1,45,51 diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.atlas.txt.meta b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.atlas.txt.meta new file mode 100644 index 000000000..cc3c48590 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2e2d9a4af2d58984a938fc7077cd7f86 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.png b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.png new file mode 100644 index 000000000..5c9c9eace Binary files /dev/null and b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.png differ diff --git a/Assets/arts/textures/background/shop/shop_dec_pig.png.meta b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.png.meta similarity index 97% rename from Assets/arts/textures/background/shop/shop_dec_pig.png.meta rename to Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.png.meta index dc76a2acf..d2e3d909e 100644 --- a/Assets/arts/textures/background/shop/shop_dec_pig.png.meta +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c331fa47dbb4484ea6364131f0f4168 +guid: 0e06f633694249b4bb44b8359d895f3d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -38,7 +38,7 @@ TextureImporter: wrapU: 1 wrapV: 1 wrapW: 1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.skel.bytes b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.skel.bytes new file mode 100644 index 000000000..5d71214fe Binary files /dev/null and b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.skel.bytes.meta b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.skel.bytes.meta new file mode 100644 index 000000000..3c6580efd --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a00f8b79a14b56d4389d688bfb8edf02 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_atlas.asset b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_atlas.asset new file mode 100644 index 000000000..b3bb2dff9 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_atlas.asset @@ -0,0 +1,17 @@ +%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_shop_goldpig_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 2e2d9a4af2d58984a938fc7077cd7f86, type: 3} + materials: + - {fileID: 2100000, guid: 24aadffba4549464bb4ab7c4af480416, type: 2} diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_atlas.asset.meta b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_atlas.asset.meta new file mode 100644 index 000000000..817052488 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dba627aa20593014b8d13544c57ed279 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_material.mat b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_material.mat new file mode 100644 index 000000000..b31ec50b9 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_material.mat @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ui_shop_goldpig_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _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: 0e06f633694249b4bb44b8359d895f3d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_material.mat.meta b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_material.mat.meta new file mode 100644 index 000000000..343db8323 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 24aadffba4549464bb4ab7c4af480416 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_skeletondata.asset b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_skeletondata.asset new file mode 100644 index 000000000..82d73cd24 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_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_shop_goldpig_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: dba627aa20593014b8d13544c57ed279, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: a00f8b79a14b56d4389d688bfb8edf02, 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_shop_goldpig/ui_shop_goldpig_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_skeletondata.asset.meta new file mode 100644 index 000000000..0b47fb0d9 --- /dev/null +++ b/Assets/arts/spines/ui/ui_shop_goldpig/ui_shop_goldpig_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fa04b0d6d4dce1429a4bda9379b43a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/background/shop/shop_dec_pig.png b/Assets/arts/textures/background/shop/shop_dec_pig.png deleted file mode 100644 index ee4963f92..000000000 Binary files a/Assets/arts/textures/background/shop/shop_dec_pig.png and /dev/null differ diff --git a/Assets/arts/textures/ui/common/common_dec_11.png b/Assets/arts/textures/ui/common/common_dec_11.png index 67524b11a..1cf00aab3 100644 Binary files a/Assets/arts/textures/ui/common/common_dec_11.png and b/Assets/arts/textures/ui/common/common_dec_11.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_11.png.meta b/Assets/arts/textures/ui/common/common_dec_11.png.meta index 62122c952..5a67513e4 100644 --- a/Assets/arts/textures/ui/common/common_dec_11.png.meta +++ b/Assets/arts/textures/ui/common/common_dec_11.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 86, y: 30, z: 16, w: 30} + spriteBorder: {x: 105, y: 50, z: 30, w: 30} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_title_12.png b/Assets/arts/textures/ui/common/common_title_12.png new file mode 100644 index 000000000..6c83a65c3 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_title_12.png differ diff --git a/Assets/arts/textures/ui/common/common_title_12.png.meta b/Assets/arts/textures/ui/common/common_title_12.png.meta new file mode 100644 index 000000000..939527e92 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_title_12.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: fab2da6010f11704a98a2f788ba73a34 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 107, y: 0, z: 106, 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 + platformSettings: + - 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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.bytes b/Assets/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.bytes index 90382f40d..149bf82b4 100644 Binary files a/Assets/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.bytes and b/Assets/lua/app/ui/activity/gold_pig/gold_pig_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab b/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab index 27d67c3f8..fc170f793 100644 --- a/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab +++ b/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.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: 22, y: 6} + m_AnchoredPosition: {x: 22, y: 8} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &776166092967764793 @@ -68,7 +68,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -164,11 +164,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - 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} - m_AnchoredPosition: {x: 0, y: 341} + m_AnchoredPosition: {x: 0, y: 118} m_SizeDelta: {x: 460, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5212263991265094726 @@ -302,7 +302,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: 4} + m_AnchoredPosition: {x: 0, y: 7} m_SizeDelta: {x: 240, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2279939956883705150 @@ -535,7 +535,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -582,11 +582,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 7 + m_RootOrder: 6 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: -230, y: -235} + m_AnchoredPosition: {x: -230, y: -99} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &646248177875437049 @@ -716,12 +716,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 4 + m_RootOrder: 9 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: -68} - m_SizeDelta: {x: 484, y: 52} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 540, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &580417369765133243 CanvasRenderer: @@ -778,12 +778,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -852,12 +852,12 @@ RectTransform: - {fileID: 4911002561298852193} - {fileID: 6715898273367776980} m_Father: {fileID: 3140350814354066444} - m_RootOrder: 10 + m_RootOrder: 11 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: -220, y: -179} - m_SizeDelta: {x: 136, y: 72} + m_AnchoredPosition: {x: -220, y: -43} + m_SizeDelta: {x: 153, y: 84} m_Pivot: {x: 0.43, y: 0} --- !u!222 &2889172014075971914 CanvasRenderer: @@ -927,11 +927,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 8 + m_RootOrder: 7 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: 209, y: -191} + m_AnchoredPosition: {x: 209, y: -55} m_SizeDelta: {x: 111, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5040687359729820617 @@ -1003,12 +1003,12 @@ RectTransform: m_Children: - {fileID: 9096499736599352893} m_Father: {fileID: 3140350814354066444} - m_RootOrder: 5 + m_RootOrder: 10 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: 233, y: 221} - m_SizeDelta: {x: 104, y: 104} + m_AnchoredPosition: {x: 282, y: 368} + m_SizeDelta: {x: 111, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3400920283584064177 CanvasRenderer: @@ -1038,7 +1038,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fe5b08f53cb938347a1b8f8ef51ab90b, type: 3} + m_Sprite: {fileID: 21300000, guid: 2adbb45609e3d404783ef15c42d8143a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1073,13 +1073,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4571664858533152568} - m_LocalRotation: {x: 0, y: 0, z: 0.10452846, w: 0.9945219} + m_LocalRotation: {x: -0, y: -0, z: 0.06482779, w: -0.9978965} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4449545361869093168} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 12} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.434} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -1115,15 +1115,15 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, 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: 4281003513 + m_fontColor: {r: 0.9764706, g: 0.92941177, b: 0.16470589, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1140,8 +1140,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 20 @@ -1212,11 +1212,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 3 + m_RootOrder: 4 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: -200} + m_AnchoredPosition: {x: 0, y: -64} m_SizeDelta: {x: 442, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1107549118053820462 @@ -1249,7 +1249,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: c4514947f60678c4e90c498ef095db61, type: 3} m_FillDirection: 0 - m_Value: 1 + m_Value: 0.492 m_FillCenter: 1 --- !u!1 &5997397792976241942 GameObject: @@ -1399,6 +1399,10 @@ MonoBehaviour: hashName: 1070271056 objectType: 0 gameObject: {fileID: 8487565826264641661} + - name: gold_pig_ui.bg.ui_spine_obj + hashName: 2022109167 + objectType: 6 + gameObject: {fileID: 8540402842655247512} --- !u!1 &7581812293180977997 GameObject: m_ObjectHideFlags: 0 @@ -1429,11 +1433,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - 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: -200} + m_AnchoredPosition: {x: 0, y: -64} m_SizeDelta: {x: 448, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1326832859551983087 @@ -1464,7 +1468,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5140a3a33b636314fb3d07bdc4c9c0f3, type: 3} + m_Sprite: {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1503,16 +1507,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 9194338978761819168} - {fileID: 3902035273960343117} - {fileID: 7917035791951846889} - {fileID: 6300094028493358839} - {fileID: 6220021527225507076} - - {fileID: 7991578681664447776} - - {fileID: 4449545361869093168} - {fileID: 5600648877871943410} - {fileID: 9055204376538028362} - {fileID: 2656133578342188984} - {fileID: 3729518461766810999} + - {fileID: 7991578681664447776} + - {fileID: 4449545361869093168} - {fileID: 6981815084688757777} - {fileID: 8592345094490497983} m_Father: {fileID: 8461932745927490369} @@ -1521,7 +1526,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 30} - m_SizeDelta: {x: 636, y: 763} + m_SizeDelta: {x: 614, y: 771} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6493899564754199146 CanvasRenderer: @@ -1588,11 +1593,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 9 + m_RootOrder: 8 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: 209, y: -235} + m_AnchoredPosition: {x: 209, y: -99} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4795522845892342506 @@ -1692,6 +1697,102 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8540402842655247512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9194338978761819168} + - component: {fileID: 8444615934318171564} + - component: {fileID: 5248030290144870465} + m_Layer: 5 + m_Name: ui_spine_obj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9194338978761819168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8540402842655247512} + 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_Children: [] + m_Father: {fileID: 3140350814354066444} + m_RootOrder: 0 + 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: 308} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8444615934318171564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8540402842655247512} + m_CullTransparentMesh: 1 +--- !u!114 &5248030290144870465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8540402842655247512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} + 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: [] + skeletonDataAsset: {fileID: 11400000, guid: 1fa04b0d6d4dce1429a4bda9379b43a7, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + disableMeshAssignmentOnOverride: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!1 &8819899838563510139 GameObject: m_ObjectHideFlags: 0 @@ -1722,12 +1823,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 6 + m_RootOrder: 5 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: -230, y: -203.6} - m_SizeDelta: {x: 78, y: 52} + m_AnchoredPosition: {x: -230, y: -64} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6032147898725362239 CanvasRenderer: @@ -1757,7 +1858,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 543b45c81e6589943bbf1369774e78c6, type: 3} + m_Sprite: {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1798,13 +1899,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3140350814354066444} - m_RootOrder: 11 + m_RootOrder: 12 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: -471} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -22} m_SizeDelta: {x: 92, y: 98} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &6903565189370660487 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1888,11 +1989,11 @@ RectTransform: m_Children: - {fileID: 7405965144087615270} m_Father: {fileID: 3140350814354066444} - m_RootOrder: 1 + 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: -294} + m_AnchoredPosition: {x: 0, y: -280} m_SizeDelta: {x: 252, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2533262990885528826 @@ -1923,7 +2024,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + m_Sprite: {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1