diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 4ddfd5271..c4ddc5503 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -106,6 +106,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} - {fileID: 21300000, guid: 09f9c16e1cfc25c49a29ff0c74978b2e, type: 3} + - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3} - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3} - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3} - {fileID: 21300000, guid: 2e3a1fdfbb599ba4babe604659b6e1df, type: 3} @@ -155,6 +156,7 @@ SpriteAtlas: - common_btn_green_3 - common_dec_4 - common_board_6 + - common_board_9 - common_chest_1 - common_dec_5 - common_dec_7 diff --git a/Assets/arts/textures/background/tutorial.meta b/Assets/arts/textures/background/tutorial.meta deleted file mode 100644 index e2800aebc..000000000 --- a/Assets/arts/textures/background/tutorial.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1a983d93f609b7b448f1bf88f7fcebf8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/tutorial/tutorial_bg_1.png b/Assets/arts/textures/background/tutorial/tutorial_bg_1.png deleted file mode 100644 index 27d038e33..000000000 Binary files a/Assets/arts/textures/background/tutorial/tutorial_bg_1.png and /dev/null differ diff --git a/Assets/arts/textures/background/tutorial/tutorial_bg_1.png.meta b/Assets/arts/textures/background/tutorial/tutorial_bg_1.png.meta deleted file mode 100644 index 2191d1942..000000000 --- a/Assets/arts/textures/background/tutorial/tutorial_bg_1.png.meta +++ /dev/null @@ -1,120 +0,0 @@ -fileFormatVersion: 2 -guid: 1b779e77eec37754fae97a05870afb6c -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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/background/tutorial/tutorial_bg_1.png.ab - assetBundleVariant: diff --git a/Assets/arts/textures/background/tutorial/tutorial_npc_1.png b/Assets/arts/textures/background/tutorial/tutorial_npc_1.png deleted file mode 100644 index 7e612e08c..000000000 Binary files a/Assets/arts/textures/background/tutorial/tutorial_npc_1.png and /dev/null differ diff --git a/Assets/arts/textures/ui/common/common_board_9.png b/Assets/arts/textures/ui/common/common_board_9.png new file mode 100644 index 000000000..42c6335e8 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_9.png differ diff --git a/Assets/arts/textures/background/tutorial/tutorial_npc_1.png.meta b/Assets/arts/textures/ui/common/common_board_9.png.meta similarity index 81% rename from Assets/arts/textures/background/tutorial/tutorial_npc_1.png.meta rename to Assets/arts/textures/ui/common/common_board_9.png.meta index 21a3f6cca..6ee0dc514 100644 --- a/Assets/arts/textures/background/tutorial/tutorial_npc_1.png.meta +++ b/Assets/arts/textures/ui/common/common_board_9.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b926b54694578e468519fdda5b5e8bc +guid: 3285af8e91260c847a0fdb96770d5c96 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -35,24 +35,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 33, y: 33, z: 33, w: 33} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -99,13 +99,25 @@ TextureImporter: 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: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: @@ -116,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/background/tutorial/tutorial_npc_1.png.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/tutorial/tutorial_dec_1.png b/Assets/arts/textures/ui/tutorial/tutorial_dec_1.png index 5d7deea90..22d494fcf 100644 Binary files a/Assets/arts/textures/ui/tutorial/tutorial_dec_1.png and b/Assets/arts/textures/ui/tutorial/tutorial_dec_1.png differ diff --git a/Assets/lua/app/ui/tutorial/tutorial_ui.lua.bytes b/Assets/lua/app/ui/tutorial/tutorial_ui.lua.bytes index 200057bc9..600e847b5 100644 Binary files a/Assets/lua/app/ui/tutorial/tutorial_ui.lua.bytes and b/Assets/lua/app/ui/tutorial/tutorial_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/tutorial/tutorial_ui.prefab b/Assets/prefabs/ui/tutorial/tutorial_ui.prefab index f7fef2e10..82d115a8b 100644 --- a/Assets/prefabs/ui/tutorial/tutorial_ui.prefab +++ b/Assets/prefabs/ui/tutorial/tutorial_ui.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 2404827779736955029} - component: {fileID: 9041391000704417915} - - component: {fileID: 7771476647902259313} + - component: {fileID: 2565363612501612181} m_Layer: 5 m_Name: text_bg m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -5, y: 283.5} - m_SizeDelta: {x: 662, y: 199} + m_SizeDelta: {x: 356, y: 176} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9041391000704417915 CanvasRenderer: @@ -47,7 +47,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 667698678747417822} m_CullTransparentMesh: 1 ---- !u!114 &7771476647902259313 +--- !u!114 &2565363612501612181 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -56,24 +56,27 @@ MonoBehaviour: m_GameObject: {fileID: 667698678747417822} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + 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_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 1b779e77eec37754fae97a05870afb6c, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 + m_Sprite: {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, 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 &1917856714963718329 GameObject: m_ObjectHideFlags: 0 @@ -289,11 +292,11 @@ RectTransform: m_Father: {fileID: 2404827779736955029} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 59.57, y: 3} - m_SizeDelta: {x: 363, y: 59} - m_Pivot: {x: 0, y: 0.5} + 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: 300, y: 59} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8733503710418989609 CanvasRenderer: m_ObjectHideFlags: 0 @@ -356,7 +359,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -500,7 +503,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4245060617029246054 RectTransform: m_ObjectHideFlags: 0