diff --git a/.vsconfig b/.vsconfig deleted file mode 100644 index aade28f6..00000000 --- a/.vsconfig +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "1.0", - "components": [ - "Microsoft.VisualStudio.Workload.ManagedGame" - ] -} diff --git a/Assets/Prefab/BarCAnvas.prefab b/Assets/Prefab/BarCAnvas.prefab index f714807f..85d9574c 100644 --- a/Assets/Prefab/BarCAnvas.prefab +++ b/Assets/Prefab/BarCAnvas.prefab @@ -62,7 +62,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 2 + m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 0.5, y: 0.2} diff --git a/Assets/Prefab/Items/Tower.prefab b/Assets/Prefab/Items/Tower.prefab index 5217e25c..276852fa 100644 --- a/Assets/Prefab/Items/Tower.prefab +++ b/Assets/Prefab/Items/Tower.prefab @@ -95,19 +95,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5db196e1099b97246bde07a348189567, type: 3} m_Name: m_EditorClassIdentifier: - _weapon: + weapon: name: Tower - icon: {fileID: 4774919592469818776} + icon: {fileID: 0} objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98, type: 3} VFXGameObject: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889, type: 3} - manaCost: 0 - damage: 10 + modifiedDamage: 0 + damage: 15 speed: 10 - disnatce: 10 - reloadTime: 3 - shots: 3 + disnatce: 6 + reloadTime: 6 + shots: 4 shotSound: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3} hitSound: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3} --- !u!136 &5879628246065515362 diff --git a/Assets/Prefab/PauseMenu.prefab b/Assets/Prefab/PauseMenu.prefab index 03403767..9d947b3e 100644 --- a/Assets/Prefab/PauseMenu.prefab +++ b/Assets/Prefab/PauseMenu.prefab @@ -155,8 +155,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -300, y: -1900} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: -300, y: -1680} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1469258782187354179 CanvasRenderer: @@ -407,10 +407,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1080, y: 1920} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Resources/1/Zone/FBX/Zone.fbx b/Assets/Resources/1/Zone/FBX/Zone.fbx index 1917b563..f1a761e5 100644 Binary files a/Assets/Resources/1/Zone/FBX/Zone.fbx and b/Assets/Resources/1/Zone/FBX/Zone.fbx differ diff --git a/Assets/Resources/1/Zone/Textures/TZone_Blue.png b/Assets/Resources/1/Zone/Textures/TZone_Blue.png index db30a921..33eb8d20 100644 Binary files a/Assets/Resources/1/Zone/Textures/TZone_Blue.png and b/Assets/Resources/1/Zone/Textures/TZone_Blue.png differ diff --git a/Assets/Resources/1/Zone/Textures/TZone_Green.png b/Assets/Resources/1/Zone/Textures/TZone_Green.png index fc32f7dc..a40bc664 100644 Binary files a/Assets/Resources/1/Zone/Textures/TZone_Green.png and b/Assets/Resources/1/Zone/Textures/TZone_Green.png differ diff --git a/Assets/Resources/1/Zone/Textures/TZone_Grey.png b/Assets/Resources/1/Zone/Textures/TZone_Grey.png index 12257137..b5301467 100644 Binary files a/Assets/Resources/1/Zone/Textures/TZone_Grey.png and b/Assets/Resources/1/Zone/Textures/TZone_Grey.png differ diff --git a/Assets/Resources/1/Zone/Textures/TZone_Red.png b/Assets/Resources/1/Zone/Textures/TZone_Red.png index bd899515..0dec0abc 100644 Binary files a/Assets/Resources/1/Zone/Textures/TZone_Red.png and b/Assets/Resources/1/Zone/Textures/TZone_Red.png differ diff --git a/Assets/Resources/1/Zone/Textures/TZone_Yellow.png b/Assets/Resources/1/Zone/Textures/TZone_Yellow.png index 353c4b69..000108e6 100644 Binary files a/Assets/Resources/1/Zone/Textures/TZone_Yellow.png and b/Assets/Resources/1/Zone/Textures/TZone_Yellow.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Attack.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Attack.png index 9d0e30ef..f30a3c16 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Attack.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Attack.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Captur.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Captur.png index 73564091..72b3fd83 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Captur.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Captur.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Lightning.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Lightning.png index f5eea87a..8a17d117 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Lightning.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Lightning.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Power.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Power.png index d2ae4e7a..45ad396a 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Power.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Power.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Replace.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Replace.png index f050c7ac..ea88f204 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Replace.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Replace.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Rocket.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Rocket.png index f7a7ed39..0602132f 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Rocket.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Attack/Rocket.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Crystal.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Crystal.png index 61ec74c7..915997a6 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Crystal.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Crystal.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Defense.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Defense.png index a08583aa..9428a758 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Defense.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Defense.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Energy_Bomb.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Energy_Bomb.png index 6d7169bf..f0ab1ed0 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Energy_Bomb.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Energy_Bomb.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Invisible.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Invisible.png index 135da9ba..b4930399 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Invisible.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Invisible.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Magnet.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Magnet.png index 86d87099..0b4251e0 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Magnet.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Magnet.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Shild.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Shild.png index ceefc491..728b24ea 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Shild.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Bonus_Protection/Shild.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Card.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Card.png index 024cfae6..3f6a5d80 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Card.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Card.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Cel.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Cel.png index bb8719ce..56e44811 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Cel.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Cel.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick.png index 3f794b6b..c378379c 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick_Hand.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick_Hand.png index 26b38571..4df20151 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick_Hand.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Defense_Joystick_Hand.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick.png index e341296b..62bf3562 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick_Hand.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick_Hand.png index f18ea9a4..b7ee8b61 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick_Hand.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Left_Joystick_Hand.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick.png index 5af00ecd..97d826e6 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick_Hand.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick_Hand.png index 452b58f6..8af99c6d 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick_Hand.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/Right_Joystick_Hand.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/common_dimed.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/common_dimed.png index a51c7757..b2beab00 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/common_dimed.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/common_dimed.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_blue.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_blue.png index 279e2649..950d6efb 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_blue.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_blue.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_exit.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_exit.png index cd0f1dbe..4a48b156 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_exit.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_exit.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_play.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_play.png index 07f2d8e3..4143f9a3 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_play.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_play.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_setting.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_setting.png index 8cd0754c..ced19fb3 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_setting.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_icon_setting.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_red.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_red.png index 02c9c33f..d23ab8c4 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_red.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/pause_btn_red.png differ diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/play_btn_pause.png b/Assets/Resources/1/_NewSprites/1. Game_Scene/play_btn_pause.png index 27105317..84108d1e 100644 Binary files a/Assets/Resources/1/_NewSprites/1. Game_Scene/play_btn_pause.png and b/Assets/Resources/1/_NewSprites/1. Game_Scene/play_btn_pause.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/common_bg_glow_1024.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/common_bg_glow_1024.png index c1f06b7e..43427e9f 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/common_bg_glow_1024.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/common_bg_glow_1024.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/ribbon_bg_orange.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/ribbon_bg_orange.png index 158b3645..b3258311 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/ribbon_bg_orange.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/ribbon_bg_orange.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_large_purple.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_large_purple.png index 1cc9c433..dd2f2357 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_large_purple.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_large_purple.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_purple.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_purple.png index 2adcf019..01c21b63 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_purple.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_purple.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_yellow.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_yellow.png index 5143bf8e..3a559e0b 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_yellow.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_frame_yellow.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_icon_gem.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_icon_gem.png index 84bd793b..45c22ba9 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_icon_gem.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_icon_gem.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_0.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_0.png index 75540987..e66664f3 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_0.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_0.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_1.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_1.png index ec736d97..0a9dfb04 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_1.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_1.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_2.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_2.png index 0df05626..935cbd01 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_2.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_2.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_3.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_3.png index 7f44cf50..9f10cfc1 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_3.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_3.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_4.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_4.png index 6084e419..c4c760c2 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_4.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gem_4.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gembox.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gembox.png index c55defa2..ed821478 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gembox.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gembox.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_0.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_0.png index 901fa5f5..4e573f0d 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_0.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_0.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_1.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_1.png index cc41df5e..1c0ea136 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_1.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_1.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_2.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_2.png index de08e351..b81ba7ea 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_2.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_2.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_3.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_3.png index 3c535cfa..8bf1bf8a 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_3.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_3.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_4.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_4.png index 0b287081..4908cb3b 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_4.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_img_gold_4.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_price_icon_gem.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_price_icon_gem.png index 96f56383..978a3999 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_price_icon_gem.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/1. Shop/shop_price_icon_gem.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/btn_icon_gold.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/btn_icon_gold.png index e9dc0a5e..28b0e12a 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/btn_icon_gold.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/btn_icon_gold.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/button_green.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/button_green.png index 3e82ec47..8cd1b607 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/button_green.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/button_green.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_bg.png index e5ef5999..3f10ded8 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_critical.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_critical.png index b523ba10..5d312686 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_critical.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_critical.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_hp.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_hp.png index 1229fe70..f579f2ef 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_hp.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_icon_hp.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_lv_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_lv_bg.png index 954576eb..966728e1 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_lv_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/equipment_detail_lv_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/popup_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/popup_bg.png index 7ed0c1a5..2bc0ef89 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/popup_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/Window/popup_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_blue.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_blue.png index aa400e11..d7b835a6 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_blue.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_blue.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_green.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_green.png index c10ef8a4..32c006dd 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_green.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_green.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_orange.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_orange.png index 3e626cf1..47af8c0a 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_orange.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_orange.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_purple.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_purple.png index a65f07b6..18925c1b 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_purple.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_list_frame_purple.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_bg.png index 97ff962f..2bdca777 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_icon_2.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_icon_2.png index d6a60705..befcd1f6 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_icon_2.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_role_icon_2.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_add_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_add_bg.png index 6e7c99d9..5fef892b 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_add_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_add_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_frame_focus.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_frame_focus.png index 68daedb7..6ea50e53 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_frame_focus.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_frame_focus.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_icon_add.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_icon_add.png index 4c658f76..fe19ba61 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_icon_add.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_icon_add.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_shadow_white.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_shadow_white.png index e898ac2f..dd309e70 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_shadow_white.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/character_select_shadow_white.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/common_bg_glow_512.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/common_bg_glow_512.png index f93c9178..5d3d2b97 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/common_bg_glow_512.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/2. Cards/common_bg_glow_512.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/button_yellow.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/button_yellow.png index 35826adc..c2792351 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/button_yellow.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/button_yellow.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_active_focus.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_active_focus.png index a0f7b9bb..f3d1b527 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_active_focus.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_active_focus.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_blue.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_blue.png index 0943f40d..97cd89ba 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_blue.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_blue.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_dim.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_dim.png index 993eb35b..30dae957 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_dim.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_dim.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_purple.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_purple.png index 3f83a23a..e97ed48e 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_purple.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_purple.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_yellow.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_yellow.png index f3a50700..5237d121 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_yellow.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_frame_yellow.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gem.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gem.png index 16a7a4f8..ddba5054 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gem.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gem.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold.png index 9907c50e..2f8bceda 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold_dim.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold_dim.png index f59ada87..9cdcd8f7 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold_dim.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_icon_gold_dim.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_path_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_path_bg.png index ef5a69ee..24f1b34d 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_path_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Selection_Level/stage_path_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/button_blue.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/button_blue.png index a9c1c284..c73c8476 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/button_blue.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/button_blue.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/check_green.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/check_green.png index 351cf6ed..379fbb4d 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/check_green.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/check_green.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_chn.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_chn.png index cf85f4c9..6da02b78 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_chn.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_chn.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_deu.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_deu.png index c90d5479..135f5de7 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_deu.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_deu.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_eng.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_eng.png index 21916a32..c5273551 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_eng.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_eng.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_esp.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_esp.png index 90e94ca2..f05bc8c8 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_esp.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_esp.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_fra.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_fra.png index 2a206a15..5e2597a4 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_fra.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_fra.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_gre.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_gre.png index bbb5bae9..227b21e3 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_gre.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_gre.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ina.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ina.png index c0c4d351..4bf67423 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ina.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ina.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ita.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ita.png index c29cd088..68fd9a64 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ita.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ita.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_jpn.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_jpn.png index 59c73fb0..34d3237e 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_jpn.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_jpn.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_kor.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_kor.png index d6e4d87d..a390c731 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_kor.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_kor.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pol.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pol.png index 1824d7ba..76d5fd5d 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pol.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pol.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pra.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pra.png index a9a3170a..3ef12633 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pra.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_pra.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_prt.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_prt.png index 2f1f272a..3759a2f0 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_prt.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_prt.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rou.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rou.png index 29c8ba7f..a3a2ae49 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rou.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rou.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rus.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rus.png index 576eb818..a189a71c 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rus.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_rus.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_swe.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_swe.png index 37ed4d37..1b5bb856 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_swe.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_swe.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tha.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tha.png index 8bf8de91..fc7649c1 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tha.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tha.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tur.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tur.png index b9500357..bcb3ea25 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tur.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_tur.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_twn.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_twn.png index e8c6288c..ba906a48 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_twn.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_twn.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ukr.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ukr.png index f0f95db5..6f16726f 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ukr.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/language_flag_ukr.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_bg_glow_white.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_bg_glow_white.png index bba27cba..bae40935 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_bg_glow_white.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_bg_glow_white.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_btn_close.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_btn_close.png index 13a66c1e..d149f59e 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_btn_close.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/popup_btn_close.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_bell.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_bell.png index 5c013620..127bf422 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_bell.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_bell.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_haptic.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_haptic.png index df0e2b32..ec0f26d7 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_haptic.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_haptic.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_off.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_off.png index f242deb9..45f3ffb2 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_off.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_off.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_on.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_on.png index da645627..a9310aee 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_on.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_music_on.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_off.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_off.png index 44ec1b04..3cd57270 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_off.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_off.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_on.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_on.png index e916b0b3..e057c715 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_on.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_icon_sound_on.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_line.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_line.png index b646619e..a6b79a9c 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_line.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_line.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gem.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gem.png index 233ea6f1..bfc81778 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gem.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gem.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gold.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gold.png index 66051135..63fd7580 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gold.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_gold.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_tip_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_tip_bg.png index 11a2c485..c43a0de7 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_tip_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/setting_reward_tip_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_control.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_control.png index f5544f25..71807435 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_control.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_control.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame 1.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame 1.png index 30ddf58e..d35b5193 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame 1.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame 1.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame.png index c0ea39e4..919b29a8 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/slider_frame.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/stage_theme_frame.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/stage_theme_frame.png index 6a98a09a..15d9b110 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/stage_theme_frame.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/stage_theme_frame.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off.png index 5f455ed0..d87cd499 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off_bg.png index b1adb17d..4f742f3f 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_off_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on.png index 148da176..1d0b4376 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on_bg.png index 6897cee4..6813cea9 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Setting/switch_on_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Sprite_Buttle.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Sprite_Buttle.png index df31bf25..06b6913e 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Sprite_Buttle.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/Sprite_Buttle.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/lobby_token_gold.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/lobby_token_gold.png index f41fee4e..43ba90b2 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/lobby_token_gold.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/lobby_token_gold.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/userinfo_lv_bar.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/userinfo_lv_bar.png index 4aec40aa..c3f1dbac 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/userinfo_lv_bar.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/3. Battle/userinfo_lv_bar.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Attack_Skill.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Attack_Skill.png index 76cf9187..bf316966 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Attack_Skill.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Attack_Skill.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Defense_Skill.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Defense_Skill.png index fe3cfc0e..987368b8 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Defense_Skill.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Defense_Skill.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Laser.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Laser.png index 71785ba3..fd1438d3 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Laser.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Laser.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/LightningBall.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/LightningBall.png index 179e7e94..52a3c32a 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/LightningBall.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/LightningBall.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Page_4.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Page_4.png index 4175e9fd..c141dc73 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Page_4.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Page_4.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Weapon_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Weapon_bg.png index 04bfadab..6c10ad36 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Weapon_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/Weapon_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_bg.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_bg.png index 13c081ba..de2da963 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_bg.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_bg.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_critical.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_critical.png index 1e629b41..6bcafbb3 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_critical.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_critical.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_damage.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_damage.png index 2f25f569..778f3643 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_damage.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_damage.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_defense.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_defense.png index 8ce629ed..3a4f5cc3 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_defense.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_defense.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_hp.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_hp.png index 6c572aae..8b3c9421 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_hp.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/ability_icon_hp.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/common_tab_focus.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/common_tab_focus.png index bc8d9c72..169ed768 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/common_tab_focus.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/common_tab_focus.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/equipment_frame_blue.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/equipment_frame_blue.png index fb7963d6..62af4231 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/equipment_frame_blue.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/equipment_frame_blue.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/focus.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/focus.png index 5e505661..d9d36404 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/focus.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/focus.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/time_icon.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/time_icon.png index fa73e454..463c3a75 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/time_icon.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/4. Equip/time_icon.png differ diff --git a/Assets/Resources/1/_NewSprites/2. Main_Menu/BG.png b/Assets/Resources/1/_NewSprites/2. Main_Menu/BG.png index e50e36cf..11c9c0bb 100644 Binary files a/Assets/Resources/1/_NewSprites/2. Main_Menu/BG.png and b/Assets/Resources/1/_NewSprites/2. Main_Menu/BG.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 120 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 120 SDF Atlas.png index ed993cf3..2b6f83a3 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 120 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 120 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 210 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 210 SDF Atlas.png index 3b33e2c7..cd367ebd 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 210 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 210 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 32 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 32 SDF Atlas.png index dec492fa..2373eb6a 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 32 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 32 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 40 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 40 SDF Atlas.png index efc4f2e6..58eac34f 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 40 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 40 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 50 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 50 SDF Atlas.png index 4dfaf056..86f2ce88 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 50 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 50 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 54 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 54 SDF Atlas.png index ba25b816..4f43156a 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 54 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 54 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 64 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 64 SDF Atlas.png index 9e404a97..ab0312cd 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 64 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 64 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 72 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 72 SDF Atlas.png index fce192de..1830048e 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 72 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline 72 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_120 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_120 SDF Atlas.png index 3643ada9..a6322a71 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_120 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_120 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_210 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_210 SDF Atlas.png index 6cc0f5a2..f78c0b77 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_210 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_210 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_32 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_32 SDF Atlas.png index df24d99c..44fbf9f2 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_32 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_32 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_40 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_40 SDF Atlas.png index 2012337e..e9b17235 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_40 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_40 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_50 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_50 SDF Atlas.png index cb3b0cd4..e56d677e 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_50 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_50 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_54 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_54 SDF Atlas.png index 23fabb7c..cac06bb3 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_54 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_54 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_64 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_64 SDF Atlas.png index 59669444..a51168ce 100644 Binary files a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_64 SDF Atlas.png and b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_64 SDF Atlas.png differ diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_72 SDF Atlas.png b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_72 SDF Atlas.png new file mode 100644 index 00000000..cd5797ec --- /dev/null +++ b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular Outline_Extended ASCII_72 SDF Atlas.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ded6e0b3d06e53400fd53001ec183ed4e77d76897473bbd8fe020aa0b6982763 +size 370440 diff --git a/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular.ttf b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular.ttf new file mode 100644 index 00000000..d9772245 --- /dev/null +++ b/Assets/Resources/1/_NewSprites/Fonts/LilitaOne-Regular.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:becb83a48af56a36b2501a6627b9ec340554e1a56180e35fa856c7a982243a20 +size 26832 diff --git a/Assets/Resources/Data/ItemData.asset b/Assets/Resources/Data/ItemData.asset index ce450559..79ad2d8d 100644 --- a/Assets/Resources/Data/ItemData.asset +++ b/Assets/Resources/Data/ItemData.asset @@ -27,7 +27,7 @@ MonoBehaviour: type: AttackBonus icon: {fileID: 21300000, guid: caf8bc0311dd2fc4ca1528a82a063754, type: 3} spawnablePrefab: {fileID: 0} - values: 030000000f000000 + values: 0300000064000000 spawnChance: 0.516 - prefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} diff --git a/Assets/Resources/Data/UnitsData.asset b/Assets/Resources/Data/UnitsData.asset index 50bb112b..4407a1d8 100644 --- a/Assets/Resources/Data/UnitsData.asset +++ b/Assets/Resources/Data/UnitsData.asset @@ -20,7 +20,7 @@ MonoBehaviour: unitPrefa: {fileID: 7527582019267571087, guid: f102085e8bc4cad4992d43b84dee1055, type: 3} color: 3 - manaRegen: 5 + manaRegen: 1 maxMana: 100 maxHP: 100 inventoryCapacity: 4 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index e18ed5de..76a20cfa 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -41300,81 +41300,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 590626635} m_CullTransparentMesh: 0 ---- !u!1 &593020806 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 593020807} - - component: {fileID: 593020809} - - component: {fileID: 593020808} - m_Layer: 5 - m_Name: Image_Hero - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &593020807 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 593020806} - 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: 744371851} - 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: 414.1407, y: 524.4957} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &593020808 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 593020806} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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: 3b3510c1053ff4f53a25096d82d82979, 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!222 &593020809 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 593020806} - m_CullTransparentMesh: 0 --- !u!1 &593671279 GameObject: m_ObjectHideFlags: 0 @@ -74937,7 +74862,6 @@ RectTransform: m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: - {fileID: 1125234477} - - {fileID: 593020807} m_Father: {fileID: 1342282033} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -74966,7 +74890,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8c4e2c116f2384eb187ccc7d0d12e0f9, type: 3} + m_Sprite: {fileID: 2211714010249429090, guid: 385812793066f854f91c9ddd93653747, + type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/Data/UIData.cs b/Assets/Scripts/Data/UIData.cs index f3d61ebc..1a0b33c3 100644 --- a/Assets/Scripts/Data/UIData.cs +++ b/Assets/Scripts/Data/UIData.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Chars; +using GameUI; using UnityEngine; namespace Data diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index bcefeaa5..72b3e897 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -1,68 +1,90 @@ using System; -using System.Collections; using System.Collections.Generic; using Items; using UnityEngine; using UnityEngine.UI; -public class PlayerInventoryView : MonoBehaviour +namespace GameUI { - [SerializeField] private GameObject item; - [SerializeField] private GameObject grid; - - public Action OnItemInvoked; - - private List