From 2cffcebcb44c6acad2969f1edc63f05ac617a293 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 12 Apr 2023 21:03:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=9B=9E=E6=94=B6=E5=92=8C?= =?UTF-8?q?=E5=90=90=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/arts/atlas/ui/battle.spriteatlas | 2 + .../arts/textures/background/battle/bg_2.png | Bin 11794 -> 7917 bytes .../textures/background/battle/bg_2.png.meta | 2 +- .../textures/ui/battle/battle_board_1.png | Bin 0 -> 116 bytes .../ui/battle/battle_board_1.png.meta | 132 ++++++++++++++ Assets/prefabs/ui/battle/battle_ui.prefab | 163 +++++++++++++++++- .../prefabs/ui/battle/cell/grid_cell.prefab | 16 +- 7 files changed, 303 insertions(+), 12 deletions(-) create mode 100644 Assets/arts/textures/ui/battle/battle_board_1.png create mode 100644 Assets/arts/textures/ui/battle/battle_board_1.png.meta 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 a1c292042fd7935e28b55318dda28745f2150035..a1d38dd2074b1869776dc4ff1601e2129e7494a8 100644 GIT binary patch literal 7917 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 r8U#fH``$`IJImS(m(Lgd literal 11794 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 literal 0 HcmV?d00001 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: