From fae19ebd8c8d401b44a85c1206bee769a1abb335 Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 18 May 2023 15:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/arts/atlas/icon/item.asset | 3 +- Assets/arts/atlas/ui/common.asset | 4 +- Assets/arts/atlas/ui/common.spriteatlas | 4 + .../textures/ui/common/common_btn_blue_1.png | Bin 0 -> 3078 bytes .../ui/common/common_btn_blue_1.png.meta | 132 ++ .../textures/ui/common/common_btn_blue_2.png | Bin 0 -> 1979 bytes .../ui/common/common_btn_blue_2.png.meta | 132 ++ .../prefabs/ui/idle/idle_quick_drop_ui.prefab | 1859 ++++++++--------- Assets/proto/protocol.bytes | 40 +- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- 11 files changed, 1198 insertions(+), 980 deletions(-) create mode 100644 Assets/arts/textures/ui/common/common_btn_blue_1.png create mode 100644 Assets/arts/textures/ui/common/common_btn_blue_1.png.meta create mode 100644 Assets/arts/textures/ui/common/common_btn_blue_2.png create mode 100644 Assets/arts/textures/ui/common/common_btn_blue_2.png.meta diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index 86160d260..94a56c28b 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: ca105ffa7d9ffc347a89f665c9e3c5e5, type: 3} + - {fileID: 21300000, guid: c4cb736ccf6b8be4d9846836cade4735, type: 3} - {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, type: 3} - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} @@ -27,4 +28,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3} - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3} - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3} - spriteNameList: 31000000320000003300000034000000350000003600000037000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 + spriteNameList: 3100000021060000320000003300000034000000350000003600000037000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 7a2a4c9b5..1ef19df58 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -39,6 +39,8 @@ MonoBehaviour: - {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} - {fileID: 21300000, guid: d9bf4f9aeccbaef4db450cefbf2c0f2d, type: 3} - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3} + - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} + - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3} - {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3} - {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} @@ -90,4 +92,4 @@ MonoBehaviour: - {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3} - {fileID: 21300000, guid: d19a454e30a654347bc427e316fa1cbf, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fed49916fee49916fef49916ff049916ff149916fc58e80a0c68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0a5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc922ecadc9a4a12138e0c7a11a50349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b47ffce428d252af848262af848272af848a07f7c4e3c864f1b7351fb6991c62c357451fb69f03a2d357551fb69a15c468db6ad7c4fb7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fc569b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fed49916fee49916fef49916ff049916ff149916fc58e80a0c68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0a3c7820ca4c7820ca5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc922ecadc9a4a12138e0c7a11a50349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b47ffce428d252af848262af848272af848a07f7c4e3c864f1b7351fb6991c62c357451fb69f03a2d357551fb69a15c468db6ad7c4fb7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fc569b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 5a48ece15..132013827 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -101,6 +101,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3} - {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3} + - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3} - {fileID: 21300000, guid: 37058029318370c46be63c3fbe4d1758, type: 3} - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} - {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} @@ -135,6 +136,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3} - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3} - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3} + - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3} - {fileID: 21300000, guid: 2e3a1fdfbb599ba4babe604659b6e1df, type: 3} - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3} @@ -179,6 +181,7 @@ SpriteAtlas: - common_toast_1 - common_board_5 - common_board_4 + - common_btn_blue_2 - common_board_15 - common_bg_2 - common_line_1 @@ -213,6 +216,7 @@ SpriteAtlas: - common_board_9 - common_board_14 - common_chest_1 + - common_btn_blue_1 - common_dec_5 - common_dec_7 - common_info diff --git a/Assets/arts/textures/ui/common/common_btn_blue_1.png b/Assets/arts/textures/ui/common/common_btn_blue_1.png new file mode 100644 index 0000000000000000000000000000000000000000..80dff8590a8a4efd549e4c7794b680c474fdca50 GIT binary patch literal 3078 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 N002ovPDHLkV1hPnwYUHP literal 0 HcmV?d00001 diff --git a/Assets/arts/textures/ui/common/common_btn_blue_2.png.meta b/Assets/arts/textures/ui/common/common_btn_blue_2.png.meta new file mode 100644 index 000000000..00f3b8aa9 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_blue_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 7f07ec09931338d42bf26e2d0eb26677 +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: 24, y: 32, z: 24, w: 22} + 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/prefabs/ui/idle/idle_quick_drop_ui.prefab b/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab index 721556fed..3ca1f1f9a 100644 --- a/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab +++ b/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &234490583451231652 +--- !u!1 &146714641612176775 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,477 +8,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4272177373635657012} - - component: {fileID: 4492040453047044437} - - component: {fileID: 8477110686087272156} - - component: {fileID: 5034513331686404095} + - component: {fileID: 7057068999597436031} + - component: {fileID: 3985254107149855829} + - component: {fileID: 8669498916679187189} + - component: {fileID: 2988865840327320347} m_Layer: 5 - m_Name: btn_1 + m_Name: mask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4272177373635657012 +--- !u!224 &7057068999597436031 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234490583451231652} - 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: - - {fileID: 2274893190641342506} - - {fileID: 7493287801473746146} - m_Father: {fileID: 6532261956592226185} - 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: -167, y: -199} - m_SizeDelta: {x: 186, y: 88} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4492040453047044437 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234490583451231652} - m_CullTransparentMesh: 1 ---- !u!114 &8477110686087272156 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234490583451231652} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: 8602111c232a7e64f84b69b7f22c3385, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5034513331686404095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234490583451231652} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 ---- !u!1 &358088181983065745 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2323329715757039530} - - component: {fileID: 7352547338992788919} - - component: {fileID: 4577696623980897638} - m_Layer: 5 - m_Name: desc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2323329715757039530 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358088181983065745} - 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: 6532261956592226185} - 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: 130} - m_SizeDelta: {x: 480, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7352547338992788919 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358088181983065745} - m_CullTransparentMesh: 1 ---- !u!114 &4577696623980897638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358088181983065745} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, 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: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4290855285 - m_fontColor: {r: 0.45882353, g: 0.25490198, b: 0.75686276, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 26 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &857090584806592687 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1265158015276040333} - - component: {fileID: 3023711140126040891} - - component: {fileID: 2198988405011061560} - m_Layer: 5 - m_Name: scrollrect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1265158015276040333 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 857090584806592687} + m_GameObject: {fileID: 146714641612176775} 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: - - {fileID: 3572184393387152662} - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -230} - m_SizeDelta: {x: 582, y: 130} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &3023711140126040891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 857090584806592687} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 7494851149881655862} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 3572184393387152662} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &2198988405011061560 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 857090584806592687} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e290255ba1add4ababd574322a0843c7, type: 3} - m_Name: - m_EditorClassIdentifier: - isDrag: 0 - contentTrans: {fileID: 7494851149881655862} - bfCell: {fileID: 6393184453277866703} - topRecoveryOffset: 0 - downRecoveryOffset: 0 - direction: 0 - reverse: 0 - cellWidth: 116 - cellHeight: 121 - perLineNum: 5 ---- !u!1 &1596325683595757405 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5364569548924282509} - - component: {fileID: 3226624710794139902} - - component: {fileID: 7130322774053509653} - m_Layer: 5 - m_Name: desc2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5364569548924282509 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596325683595757405} - 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: 6532261956592226185} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 491, y: -402} - m_SizeDelta: {x: 300, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3226624710794139902 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596325683595757405} - m_CullTransparentMesh: 1 ---- !u!114 &7130322774053509653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596325683595757405} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, 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: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 0.15686275, g: 0.6862745, b: 0.92941177, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 26 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 24 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2523565241794129175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3572184393387152662} - - component: {fileID: 2272684048550470954} - m_Layer: 5 - m_Name: viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3572184393387152662 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2523565241794129175} - 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: - - {fileID: 7494851149881655862} - m_Father: {fileID: 1265158015276040333} + m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -486,87 +38,35 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2272684048550470954 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2523565241794129175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} ---- !u!1 &2537902485699108045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2696687773230529617} - - component: {fileID: 1825441252258113974} - - component: {fileID: 8530957932168187491} - - component: {fileID: 7485147225369689389} - m_Layer: 5 - m_Name: close_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2696687773230529617 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2537902485699108045} - 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: 6532261956592226185} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -67} - m_SizeDelta: {x: 90, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1825441252258113974 +--- !u!222 &3985254107149855829 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2537902485699108045} + m_GameObject: {fileID: 146714641612176775} m_CullTransparentMesh: 1 ---- !u!114 &8530957932168187491 +--- !u!114 &8669498916679187189 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2537902485699108045} + m_GameObject: {fileID: 146714641612176775} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} 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: a86176f4d98080e4697042c30913c6c4, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -576,20 +76,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7485147225369689389 +--- !u!114 &2988865840327320347 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2537902485699108045} + m_GameObject: {fileID: 146714641612176775} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 ---- !u!1 &3122474430443786166 + IsShowClickAnimation: 0 +--- !u!1 &1446855166833589918 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -597,50 +97,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2377559274914520936} - - component: {fileID: 5506941320076466672} - - component: {fileID: 5219920368592612306} - m_Layer: 5 - m_Name: Image + - component: {fileID: 8794124783256451373} + - component: {fileID: 2184029916463194106} + - component: {fileID: 1674059803535739806} + m_Layer: 0 + m_Name: icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2377559274914520936 +--- !u!224 &8794124783256451373 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3122474430443786166} + m_GameObject: {fileID: 1446855166833589918} 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: 6532261956592226185} - m_RootOrder: 1 + m_Father: {fileID: 1892815414873948121} + 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: -10} - m_SizeDelta: {x: 582, y: 148} + m_AnchoredPosition: {x: -42, y: 4} + m_SizeDelta: {x: 70, y: 38} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5506941320076466672 +--- !u!222 &2184029916463194106 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3122474430443786166} + m_GameObject: {fileID: 1446855166833589918} m_CullTransparentMesh: 1 ---- !u!114 &5219920368592612306 +--- !u!114 &1674059803535739806 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3122474430443786166} + m_GameObject: {fileID: 1446855166833589918} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -654,7 +154,90 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0d8971bf74f69c44cbb36a78a7dbfa32, type: 3} + m_Sprite: {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, 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 &2292712712993478477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5824817785426559824} + - component: {fileID: 3471884083615379610} + - component: {fileID: 2186223771587733174} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5824817785426559824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2292712712993478477} + 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: + - {fileID: 4270264247505449661} + - {fileID: 6389960186548556780} + - {fileID: 7049029323044508209} + - {fileID: 4221149372679583734} + - {fileID: 4420284031895143845} + - {fileID: 740576556872871448} + - {fileID: 1892815414873948121} + - {fileID: 3280215764404414011} + m_Father: {fileID: 8461932745927490369} + 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: 0} + m_SizeDelta: {x: 604, y: 488} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3471884083615379610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2292712712993478477} + m_CullTransparentMesh: 1 +--- !u!114 &2186223771587733174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2292712712993478477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -664,7 +247,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3966263918186116083 +--- !u!1 &3064834496683700598 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -672,50 +255,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5194001439820000626} - - component: {fileID: 3472994104433889634} - - component: {fileID: 6003905842406302376} + - component: {fileID: 4221149372679583734} + - component: {fileID: 1105981278997628609} + - component: {fileID: 1202307721210426148} m_Layer: 5 - m_Name: title + m_Name: title_text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5194001439820000626 +--- !u!224 &4221149372679583734 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3966263918186116083} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3064834496683700598} + 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: 6532261956592226185} - m_RootOrder: 2 + m_Father: {fileID: 5824817785426559824} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -18} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 200, y: 40} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3472994104433889634 + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1105981278997628609 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3966263918186116083} + m_GameObject: {fileID: 3064834496683700598} m_CullTransparentMesh: 1 ---- !u!114 &6003905842406302376 +--- !u!114 &1202307721210426148 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3966263918186116083} + m_GameObject: {fileID: 3064834496683700598} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -732,7 +315,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 16b8153df0b631e4ca1bd2389b9d5cf7, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -798,7 +381,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4117970956418931131 +--- !u!1 &3147489033703456625 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -806,148 +389,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6532261956592226185} - - component: {fileID: 5192491331257177057} - - component: {fileID: 3615258311934471564} - - component: {fileID: 8155911871413128572} + - component: {fileID: 7049029323044508209} + - component: {fileID: 3535639259602342664} + - component: {fileID: 8275603132978429316} m_Layer: 5 - m_Name: bg + m_Name: title_img m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6532261956592226185 +--- !u!224 &7049029323044508209 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117970956418931131} + m_GameObject: {fileID: 3147489033703456625} 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: - - {fileID: 6011282703089866025} - - {fileID: 2377559274914520936} - - {fileID: 5194001439820000626} - - {fileID: 2323329715757039530} - - {fileID: 5364569548924282509} - - {fileID: 1265158015276040333} - - {fileID: 4272177373635657012} - - {fileID: 3864317918439737023} - - {fileID: 2696687773230529617} - m_Father: {fileID: 8461932745927490369} - 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: 0} - m_SizeDelta: {x: 648, y: 562} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5192491331257177057 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117970956418931131} - m_CullTransparentMesh: 1 ---- !u!114 &3615258311934471564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117970956418931131} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: bc4f02aae5564f0478733a11fd1b7491, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8155911871413128572 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4117970956418931131} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 0 ---- !u!1 &4750288248612412693 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6153740730052465676} - - component: {fileID: 3215693003586021067} - - component: {fileID: 3972259190996828012} - m_Layer: 5 - m_Name: img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6153740730052465676 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4750288248612412693} - 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: 3864317918439737023} - m_RootOrder: 1 + m_Father: {fileID: 5824817785426559824} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 38, y: 20} - m_SizeDelta: {x: 46, y: 53} - m_Pivot: {x: 0, y: 0} ---- !u!222 &3215693003586021067 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -27} + m_SizeDelta: {x: 658, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3535639259602342664 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4750288248612412693} + m_GameObject: {fileID: 3147489033703456625} m_CullTransparentMesh: 1 ---- !u!114 &3972259190996828012 +--- !u!114 &8275603132978429316 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4750288248612412693} + m_GameObject: {fileID: 3147489033703456625} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -961,8 +446,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09463a0cb7a8c9c46a9d496fa99ef369, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -971,7 +456,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5041742340889624564 +--- !u!1 &3245758664992430996 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -979,53 +464,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3864317918439737023} - - component: {fileID: 4657940789801679239} - - component: {fileID: 250207642722105000} - - component: {fileID: 7059673271425174119} + - component: {fileID: 4270264247505449661} + - component: {fileID: 2802023989789994762} + - component: {fileID: 3484648529482543308} m_Layer: 5 - m_Name: btn_2 + m_Name: image_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3864317918439737023 +--- !u!224 &4270264247505449661 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5041742340889624564} + m_GameObject: {fileID: 3245758664992430996} 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: - - {fileID: 7342530554980892161} - - {fileID: 6153740730052465676} - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 7 + m_Children: [] + m_Father: {fileID: 5824817785426559824} + 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: 167, y: -199} - m_SizeDelta: {x: 186, y: 88} + m_AnchoredPosition: {x: 0, y: -158} + m_SizeDelta: {x: 596, y: 166} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4657940789801679239 +--- !u!222 &2802023989789994762 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5041742340889624564} + m_GameObject: {fileID: 3245758664992430996} m_CullTransparentMesh: 1 ---- !u!114 &250207642722105000 +--- !u!114 &3484648529482543308 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5041742340889624564} + m_GameObject: {fileID: 3245758664992430996} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1033,14 +515,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f24a3cf1b4c80e644a25b659f5d81cab, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1049,20 +531,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7059673271425174119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5041742340889624564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 ---- !u!1 &5406121831246241048 +--- !u!1 &4755978734504538203 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1070,50 +539,170 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2274893190641342506} - - component: {fileID: 3055360742905845857} - - component: {fileID: 5968458065700735493} + - component: {fileID: 6389960186548556780} + - component: {fileID: 8057384570534877082} + - component: {fileID: 936239175235551249} m_Layer: 5 - m_Name: desc + m_Name: image_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2274893190641342506 +--- !u!224 &6389960186548556780 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5406121831246241048} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4755978734504538203} + 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: 4272177373635657012} - m_RootOrder: 0 + m_Father: {fileID: 5824817785426559824} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -14} - m_SizeDelta: {x: 96, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &3055360742905845857 + 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: 580, y: 464} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8057384570534877082 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5406121831246241048} + m_GameObject: {fileID: 4755978734504538203} m_CullTransparentMesh: 1 ---- !u!114 &5968458065700735493 +--- !u!114 &936239175235551249 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5406121831246241048} + m_GameObject: {fileID: 4755978734504538203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, 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: [] + m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4943219829477803572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4256897254837092278} + - component: {fileID: 5022664072359979128} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4256897254837092278 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4943219829477803572} + 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: + - {fileID: 432352143166637718} + m_Father: {fileID: 9199376469887762578} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5022664072359979128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4943219829477803572} + m_CullTransparentMesh: 1 +--- !u!1 &5449033386625448169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3829783116499395527} + - component: {fileID: 3226901859471752612} + - component: {fileID: 8575980913393313288} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3829783116499395527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449033386625448169} + 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: 3280215764404414011} + 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: 31, y: 4} + m_SizeDelta: {x: 100, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3226901859471752612 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449033386625448169} + m_CullTransparentMesh: 1 +--- !u!114 &8575980913393313288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449033386625448169} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1130,7 +719,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 3867a45abce498941a20e7bae19ceb9e, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1154,14 +743,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 32 + m_fontSize: 30 + m_fontSizeBase: 38 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 30 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1196,81 +785,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5408386021768755064 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7493287801473746146} - - component: {fileID: 6825705914558904005} - - component: {fileID: 8208621708745445496} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7493287801473746146 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5408386021768755064} - 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: 4272177373635657012} - 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: -36, y: 5.75} - m_SizeDelta: {x: 54, y: 43.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6825705914558904005 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5408386021768755064} - m_CullTransparentMesh: 1 ---- !u!114 &8208621708745445496 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5408386021768755064} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, 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: [] - m_Sprite: {fileID: 21300000, guid: d408c20e43b03af4fa60e31fdfdf40af, 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 @@ -1281,11 +795,10 @@ GameObject: m_Component: - component: {fileID: 8461932745927490369} - component: {fileID: 4700839527353464480} - - component: {fileID: 6498802617583437744} - component: {fileID: 2459416726653635175} - component: {fileID: 1652254950293225014} - - component: {fileID: 6736961410865634472} - component: {fileID: 1225774943438592279} + - component: {fileID: 5129431960356194785} m_Layer: 5 m_Name: idle_quick_drop_ui m_TagString: Untagged @@ -1304,7 +817,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6532261956592226185} + - {fileID: 7057068999597436031} + - {fileID: 5824817785426559824} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1321,19 +835,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5997397792976241942} m_CullTransparentMesh: 1 ---- !u!114 &6498802617583437744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5997397792976241942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 0 --- !u!223 &2459416726653635175 Canvas: m_ObjectHideFlags: 0 @@ -1372,36 +873,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &6736961410865634472 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5997397792976241942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} - 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: 0ca3fc29382b1a14695df72e71125f11, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!114 &1225774943438592279 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1415,51 +886,57 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: idle_quick_drop_ui.bg.title - hashName: 1119093014 + - name: idle_quick_drop_ui.mask + hashName: 1508761619 objectType: 0 - gameObject: {fileID: 3966263918186116083} - - name: idle_quick_drop_ui.bg.desc - hashName: 3914944531 + gameObject: {fileID: 146714641612176775} + - name: idle_quick_drop_ui.bg.title_text + hashName: 765475510 objectType: 0 - gameObject: {fileID: 358088181983065745} - - name: idle_quick_drop_ui.bg.desc2 - hashName: 1104196223 + gameObject: {fileID: 3064834496683700598} + - name: idle_quick_drop_ui.bg.desc_tx + hashName: 275695152 objectType: 0 - gameObject: {fileID: 1596325683595757405} - - name: idle_quick_drop_ui.bg.scrollrect - hashName: 2606021171 + gameObject: {fileID: 6635236524700315402} + - name: idle_quick_drop_ui.bg.scroll_rect + hashName: 3460086868 objectType: 0 - gameObject: {fileID: 857090584806592687} - - name: idle_quick_drop_ui.bg.btn_1 - hashName: 1102791116 + gameObject: {fileID: 7280337980836516919} + - name: idle_quick_drop_ui.bg.ad_btn + hashName: 4077906242 objectType: 0 - gameObject: {fileID: 234490583451231652} - - name: idle_quick_drop_ui.bg.btn_1.desc - hashName: 3841537395 + gameObject: {fileID: 8695121254157006591} + - name: idle_quick_drop_ui.bg.ad_btn.text + hashName: 2866286169 objectType: 0 - gameObject: {fileID: 5406121831246241048} - - name: idle_quick_drop_ui.bg.btn_1.Image - hashName: 3098828441 + gameObject: {fileID: 8500447877503011717} + - name: idle_quick_drop_ui.bg.gem_btn + hashName: 2932548778 objectType: 0 - gameObject: {fileID: 5408386021768755064} - - name: idle_quick_drop_ui.bg.btn_2 - hashName: 1102791117 + gameObject: {fileID: 6727118201269956718} + - name: idle_quick_drop_ui.bg.gem_btn.icon + hashName: 1801235261 objectType: 0 - gameObject: {fileID: 5041742340889624564} - - name: idle_quick_drop_ui.bg.btn_2.desc - hashName: 3870166546 + gameObject: {fileID: 6870945036737655746} + - name: idle_quick_drop_ui.bg.gem_btn.text + hashName: 1801565169 objectType: 0 - gameObject: {fileID: 7128201320863697614} - - name: idle_quick_drop_ui.bg.btn_2.img - hashName: 2341606434 - objectType: 0 - gameObject: {fileID: 4750288248612412693} - - name: idle_quick_drop_ui.bg.close_img - hashName: 985217210 - objectType: 0 - gameObject: {fileID: 2537902485699108045} ---- !u!1 &7128201320863697614 + gameObject: {fileID: 5449033386625448169} +--- !u!114 &5129431960356194785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e78a175da984a448199e5b51a3a5f437, type: 3} + m_Name: + m_EditorClassIdentifier: + EffectList: [] + NotchScreenNodeList: [] +--- !u!1 &6635236524700315402 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1467,50 +944,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7342530554980892161} - - component: {fileID: 3157551977903379461} - - component: {fileID: 2929881889639927148} + - component: {fileID: 4420284031895143845} + - component: {fileID: 3734455601043113754} + - component: {fileID: 3748843746617587342} m_Layer: 5 - m_Name: desc + m_Name: desc_tx m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7342530554980892161 +--- !u!224 &4420284031895143845 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7128201320863697614} + m_GameObject: {fileID: 6635236524700315402} 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: 3864317918439737023} - m_RootOrder: 0 + m_Father: {fileID: 5824817785426559824} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 88.7, y: -28} - m_SizeDelta: {x: 88.5566, y: 25} - m_Pivot: {x: 0, y: 1} ---- !u!222 &3157551977903379461 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 130} + m_SizeDelta: {x: 200, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3734455601043113754 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7128201320863697614} + m_GameObject: {fileID: 6635236524700315402} m_CullTransparentMesh: 1 ---- !u!114 &2929881889639927148 +--- !u!114 &3748843746617587342 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7128201320863697614} + m_GameObject: {fileID: 6635236524700315402} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1526,8 +1003,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: af4c49b192356a14293e96584e9ab732, type: 2} + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1551,14 +1028,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1593,7 +1070,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8789079923004503519 +--- !u!1 &6727118201269956718 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1601,50 +1078,141 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6011282703089866025} - - component: {fileID: 4862677141590162213} - - component: {fileID: 8131069496559122894} + - component: {fileID: 3280215764404414011} + - component: {fileID: 4476084347139963026} + - component: {fileID: 1703780975192584436} + - component: {fileID: 6217813988036189331} m_Layer: 5 - m_Name: title_img + m_Name: gem_btn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6011282703089866025 +--- !u!224 &3280215764404414011 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8789079923004503519} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6727118201269956718} + 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: 6532261956592226185} - m_RootOrder: 0 + m_Children: + - {fileID: 4697163360925500842} + - {fileID: 3829783116499395527} + m_Father: {fileID: 5824817785426559824} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 648, y: 76} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &4862677141590162213 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 128, y: -150} + m_SizeDelta: {x: 208, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4476084347139963026 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8789079923004503519} + m_GameObject: {fileID: 6727118201269956718} m_CullTransparentMesh: 1 ---- !u!114 &8131069496559122894 +--- !u!114 &1703780975192584436 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8789079923004503519} + m_GameObject: {fileID: 6727118201269956718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: 5758461464520334caa2a2487dca2fc6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6217813988036189331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6727118201269956718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!1 &6870945036737655746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4697163360925500842} + - component: {fileID: 2351110551745429602} + - component: {fileID: 3175012934027224527} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4697163360925500842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870945036737655746} + 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: 3280215764404414011} + 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: -42, y: 4} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2351110551745429602 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870945036737655746} + m_CullTransparentMesh: 1 +--- !u!114 &3175012934027224527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870945036737655746} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1658,7 +1226,309 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 079a4aa5fa5a6d742ae8dd3b66035e2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, 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 &7280337980836516919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 740576556872871448} + - component: {fileID: 5435679284725380852} + - component: {fileID: 4397762625734219544} + m_Layer: 5 + m_Name: scroll_rect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &740576556872871448 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280337980836516919} + 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: + - {fileID: 9199376469887762578} + m_Father: {fileID: 5824817785426559824} + 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: 0, y: 5} + m_SizeDelta: {x: 540, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5435679284725380852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280337980836516919} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 4256897254837092278} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 9199376469887762578} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4397762625734219544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7280337980836516919} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e290255ba1add4ababd574322a0843c7, type: 3} + m_Name: + m_EditorClassIdentifier: + isDrag: 0 + contentTrans: {fileID: 4256897254837092278} + bfCell: {fileID: 8384887845503554016} + topRecoveryOffset: 0 + downRecoveryOffset: 0 + direction: 0 + reverse: 0 + cellWidth: 110 + cellHeight: 110 + perLineNum: 5 +--- !u!1 &8500447877503011717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7393112978515928227} + - component: {fileID: 3222542881618568668} + - component: {fileID: 9083174916448368808} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7393112978515928227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8500447877503011717} + 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: 1892815414873948121} + 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: 38, y: 4} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3222542881618568668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8500447877503011717} + m_CullTransparentMesh: 1 +--- !u!114 &9083174916448368808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8500447877503011717} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, 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: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 27 + m_fontSizeBase: 27 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 30 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8695121254157006591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1892815414873948121} + - component: {fileID: 9137130774746693871} + - component: {fileID: 5793419690579226209} + - component: {fileID: 1226658834432695042} + m_Layer: 5 + m_Name: ad_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1892815414873948121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8695121254157006591} + 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: + - {fileID: 8794124783256451373} + - {fileID: 7393112978515928227} + m_Father: {fileID: 5824817785426559824} + 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: -128, y: -150} + m_SizeDelta: {x: 208, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9137130774746693871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8695121254157006591} + m_CullTransparentMesh: 1 +--- !u!114 &5793419690579226209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8695121254157006591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: 7f07ec09931338d42bf26e2d0eb26677, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1668,7 +1538,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9092468815217294144 +--- !u!114 &1226658834432695042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8695121254157006591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!1 &8787601287710620627 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1676,27 +1559,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7494851149881655862} + - component: {fileID: 9199376469887762578} + - component: {fileID: 6128747798203636215} + - component: {fileID: 891896223405169709} + - component: {fileID: 8996832536424822987} m_Layer: 5 - m_Name: content + m_Name: viewport m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7494851149881655862 +--- !u!224 &9199376469887762578 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9092468815217294144} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8787601287710620627} + 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: - - {fileID: 3469547051919653449} - m_Father: {fileID: 3572184393387152662} + - {fileID: 4256897254837092278} + m_Father: {fileID: 740576556872871448} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1704,17 +1590,64 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1405303710242753053 +--- !u!222 &6128747798203636215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787601287710620627} + m_CullTransparentMesh: 1 +--- !u!114 &891896223405169709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787601287710620627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8996832536424822987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8787601287710620627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1001 &2713118702985934530 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7494851149881655862} + m_TransformParent: {fileID: 4256897254837092278} m_Modifications: - - target: {fileID: 998706069933858657, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1745,19 +1678,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 178 + value: 120 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 188 + value: 120 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.56 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.56 + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1793,7 +1730,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1807,33 +1744,33 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4940665596048500704, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name value: reward_cell objectReference: {fileID: 0} - - target: {fileID: 8250791300864051285, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &3469547051919653449 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1405303710242753053} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5673054130193047447 stripped +--- !u!1 &8691094051543786312 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1405303710242753053} + m_PrefabInstance: {fileID: 2713118702985934530} m_PrefabAsset: {fileID: 0} ---- !u!114 &6393184453277866703 +--- !u!224 &432352143166637718 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 2713118702985934530} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8384887845503554016 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5673054130193047447} + m_GameObject: {fileID: 8691094051543786312} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index b1f4c1c72..803bac319 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ -| +} pb/proto/protocol.protocspb" Gift act_type (RactType @@ -128,7 +128,7 @@ chapter_id (R chapterId" chapter_id (R chapterId" costs ( 2 .cspb.RewardRcosts& -mystery_box_idx (R mysteryBoxIdx" +mystery_box_idx (R mysteryBoxIdx" ChapterSettlementReq win (Rwin @@ -142,9 +142,10 @@ kills_boss (R killsBoss# clear_6_combo (R clear6Combo" clear_8_combo (R clear8Combo$ clear_10_combo - (R clear10Combo - skills_cast (R -skillsCast" + (R clear10Combo + +skill_cast (R skillCast + skill_box (RskillBox" ChapterSettlementRsp( err_code (2 .cspb.ErrCodeRerrCode& rewards ( 2 .cspb.RewardRrewards @@ -215,18 +216,27 @@ chapter_id (R chapterId heroes ( 2.cspb.HeroPutOnRsp.HeroesEntryRheroes9 HeroesEntry key (Rkey -value (Rvalue:8" -Idle$ -gold_drop_time (R goldDropTime$ -item_drop_time (R itemDropTime +value (Rvalue:8"_ +Idle +claim_at (RclaimAt +ad_count (RadCount! + energy_count (R energyCount" + IdleInfoReq" + IdleInfoRsp( +err_code (2 .cspb.ErrCodeRerrCode +claim_at (RclaimAt ad_count (RadCount! - energy_count (R energyCount" - IdleRewardReq" + energy_count (R energyCount2 +items ( 2.cspb.IdleInfoRsp.ItemsEntryRitems8 + +ItemsEntry +key (Rkey +value (Rvalue:8" + IdleRewardReq"| IdleRewardRsp( -err_code (2 .cspb.ErrCodeRerrCode$ -gold_drop_time (R goldDropTime$ -item_drop_time (R itemDropTime& -rewards ( 2 .cspb.RewardRrewards" +err_code (2 .cspb.ErrCodeRerrCode +claim_at (RclaimAt& +rewards ( 2 .cspb.RewardRrewards" IdleQuickReq ad (Rad" IdleQuickRsp( diff --git a/Packages/manifest.json b/Packages/manifest.json index 58dfb699c..b3db96846 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.15.18", - "com.unity.device-simulator": "3.0.3-preview", + "com.unity.device-simulator": "3.1.0-preview", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.15", "com.unity.ide.vscode": "1.2.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5610cc94b..49fdbe43e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.device-simulator": { - "version": "3.0.3-preview", + "version": "3.1.0-preview", "depth": 0, "source": "registry", "dependencies": {},