diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index da6977a26..47f26472a 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -68,6 +68,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ebfdd7936b9f13340acc2ccd55ee5b1f, type: 3} - {fileID: 21300000, guid: b78c059420cc8364daadb27686bc1242, type: 3} - {fileID: 21300000, guid: d03a08a450d45584cb6dfb67dd6df6ba, type: 3} + - {fileID: 21300000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3} - {fileID: 21300000, guid: 306205473d3cf1f4a9d821c3e2971092, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 1fb00d985f6c0514798f2eb8fde2b62e, type: 3} @@ -89,6 +90,7 @@ SpriteAtlas: - vine_1 - yellow_1_1 - snow_2 + - battle_board_1 - battle_btn_setting - red_1 - blue_1_1 diff --git a/Assets/arts/textures/background/battle/bg_2.png b/Assets/arts/textures/background/battle/bg_2.png index a1c292042..a1d38dd20 100644 Binary files a/Assets/arts/textures/background/battle/bg_2.png and b/Assets/arts/textures/background/battle/bg_2.png differ diff --git a/Assets/arts/textures/background/battle/bg_2.png.meta b/Assets/arts/textures/background/battle/bg_2.png.meta index f356b1a20..3d8051470 100644 --- a/Assets/arts/textures/background/battle/bg_2.png.meta +++ b/Assets/arts/textures/background/battle/bg_2.png.meta @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/ui/battle/battle_board_1.png b/Assets/arts/textures/ui/battle/battle_board_1.png new file mode 100644 index 000000000..2d6167470 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_board_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_board_1.png.meta b/Assets/arts/textures/ui/battle/battle_board_1.png.meta new file mode 100644 index 000000000..246b25b04 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_board_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: fe047417c1765ae408c718cdde9c74a8 +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: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 218f73032..466d340a2 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -233,6 +233,8 @@ GameObject: m_Component: - component: {fileID: 8218123047022309772} - component: {fileID: 9169016088919175857} + - component: {fileID: 5571968080124832430} + - component: {fileID: 2367446845432208974} m_Layer: 0 m_Name: board_node m_TagString: Untagged @@ -258,7 +260,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -6} - m_SizeDelta: {x: 679, y: 679} + m_SizeDelta: {x: 702, y: 702} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9169016088919175857 MonoBehaviour: @@ -274,6 +276,41 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: 0, y: 0, z: 0, w: 0} m_Softness: {x: 0, y: 0} +--- !u!222 &5571968080124832430 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606870700976508775} + m_CullTransparentMesh: 1 +--- !u!114 &2367446845432208974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606870700976508775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 629b982e5340cf24bad1d8701330d3c8, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &623460652206907296 GameObject: m_ObjectHideFlags: 0 @@ -535,6 +572,42 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 900} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2908987935824165984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4292633816534545540} + m_Layer: 0 + m_Name: board_cache_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4292633816534545540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908987935824165984} + 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: 8723116159258155002} + m_Father: {fileID: 8367488913663849825} + 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: 0, y: -6} + m_SizeDelta: {x: 702, y: 702} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3525614029680116551 GameObject: m_ObjectHideFlags: 0 @@ -961,7 +1034,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 679, y: 679} + m_SizeDelta: {x: 702, y: 702} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9211055567761717053 CanvasRenderer: @@ -1036,6 +1109,7 @@ RectTransform: - {fileID: 654892824183363579} - {fileID: 4434589560579663982} - {fileID: 8218123047022309772} + - {fileID: 4292633816534545540} m_Father: {fileID: 4165930251451731960} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1072,13 +1146,88 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 629b982e5340cf24bad1d8701330d3c8, type: 3} + m_Texture: {fileID: 2800000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3} m_UVRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 +--- !u!1 &8512114194521404538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8723116159258155002} + - component: {fileID: 8720282602456543341} + - component: {fileID: 2318773020303478462} + m_Layer: 0 + m_Name: skill_box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8723116159258155002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8512114194521404538} + 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: 4292633816534545540} + 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: 656} + m_SizeDelta: {x: 84, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8720282602456543341 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8512114194521404538} + m_CullTransparentMesh: 1 +--- !u!114 &2318773020303478462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8512114194521404538} + 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: 13b1668a707250d4cac750f73ca8f3c3, 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 &8889665677046596496 GameObject: m_ObjectHideFlags: 0 @@ -1228,6 +1377,14 @@ MonoBehaviour: hashName: 2544443688 objectType: 0 gameObject: {fileID: 7688802235252301942} + - name: battle_ui.bg_2.board_cache_node + hashName: 1890162139 + objectType: 0 + gameObject: {fileID: 2908987935824165984} + - name: battle_ui.bg_2.board_cache_node.skill_box + hashName: 1224637066 + objectType: 0 + gameObject: {fileID: 8512114194521404538} --- !u!1 &9186964964330120711 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/battle/cell/grid_cell.prefab b/Assets/prefabs/ui/battle/cell/grid_cell.prefab index 32f342ec1..ca0ad14ba 100644 --- a/Assets/prefabs/ui/battle/cell/grid_cell.prefab +++ b/Assets/prefabs/ui/battle/cell/grid_cell.prefab @@ -110,7 +110,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4495721600529669427 CanvasRenderer: @@ -473,7 +473,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7812673054034839215 CanvasRenderer: @@ -548,7 +548,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2796302420299780421 CanvasRenderer: @@ -624,7 +624,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &28783238052411172 CanvasRenderer: @@ -700,7 +700,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8866022764212735008 CanvasRenderer: @@ -802,7 +802,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3183744554188501349 CanvasRenderer: @@ -920,7 +920,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &200150018011086864 CanvasRenderer: @@ -996,7 +996,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 97, y: 97} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7258035868469557576 CanvasRenderer: