Merge tag 'v100200' into pandora48

# Conflicts: # nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas # nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab # nekoyume/Assets/_Scripts/UI/Widget/Popup/SweepPopup.cs
osamadeep · May 17, 2022 · d3708ec · d3708ec
1 parent e6d56da
commit d3708ec
Show file tree

Hide file tree

Showing 15 changed files with 11,050 additions and 132 deletions.
diff --git a/nekoyume/Assets/Resources/Audio/Music/Prefabs/bgm_title.prefab b/nekoyume/Assets/Resources/Audio/Music/Prefabs/bgm_title.prefab
@@ -42,7 +42,7 @@ AudioSource:
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 243079531108902290, guid: f84234ca553c443c69f5457997eda065,
     type: 2}
-  m_audioClip: {fileID: 8300000, guid: e04b8085da210fb4f87e6b45f17d817a, type: 3}
+  m_audioClip: {fileID: 8300000, guid: 77f42b9f8e71f0940b2c42df7ee4d909, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 1
   m_Pitch: 1

diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas
@@ -47,7 +47,7 @@ SpriteAtlas:
     - {fileID: 102900000, guid: f4ec4f8b49db5487fae145d395ec1611, type: 3}
     - {fileID: 102900000, guid: 9c67e02a967534297bd452ad80ca3261, type: 3}
     - {fileID: 102900000, guid: 77aad0043bc7d4ee3a9fda3a23e966a8, type: 3}
-    totalSpriteSurfaceArea: 984770
+    totalSpriteSurfaceArea: 984320
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}

diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas
@@ -47,14 +47,15 @@ SpriteAtlas:
     - {fileID: 102900000, guid: f4ec4f8b49db5487fae145d395ec1611, type: 3}
     - {fileID: 102900000, guid: 85f7dc4e2285f4e8eaa1d5143ed311b2, type: 3}
     - {fileID: 102900000, guid: 77aad0043bc7d4ee3a9fda3a23e966a8, type: 3}
-    totalSpriteSurfaceArea: 1175519
+    totalSpriteSurfaceArea: 1235006
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 3105b40004acc48c9b6bbf2b89eec4dc, type: 3}
   - {fileID: 21300000, guid: 8e64e0103e5594fc7b955114b32c965e, type: 3}
+  - {fileID: 21300000, guid: 398945401678847ad8cf64c4a99fca22, type: 3}
   - {fileID: 21300000, guid: d99ebc40a11a5cf4498339e13778cbdd, type: 3}
   - {fileID: 21300000, guid: 5575f570c11ee684595adeb4eb642a72, type: 3}
   - {fileID: 21300000, guid: 63ed4180709ad48a88fd25907c640dda, type: 3}
@@ -95,10 +96,12 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 1dd52c625e931c8419bd680c998ec26b, type: 3}
   - {fileID: 21300000, guid: c4a70f7223f4542f8a7a694c4752a18e, type: 3}
   - {fileID: 21300000, guid: 3483b1826aa594389a7d7299dcab8151, type: 3}
+  - {fileID: 21300000, guid: 85c0d68258ca635469a2cc53753800d0, type: 3}
   - {fileID: 21300000, guid: 70890d82a92414f288c13ccdb57760de, type: 3}
   - {fileID: 21300000, guid: cee37092b244a4405ae707ea1ba04755, type: 3}
   - {fileID: 21300000, guid: a9e238a253e87d14c96bd7c73c25b4c1, type: 3}
   - {fileID: 21300000, guid: d59b12e267341a64b939e99d11a3a406, type: 3}
+  - {fileID: 21300000, guid: 4d2d06f2f7c3441f4833cf96b0b49221, type: 3}
   - {fileID: 21300000, guid: 53c309f2f4a404affb48c959c984a2e1, type: 3}
   - {fileID: 21300000, guid: b9cf89f233508489b93e0d3fb5370f3f, type: 3}
   - {fileID: 21300000, guid: ef634b0333a254832a8532b39b690da4, type: 3}
@@ -115,6 +118,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: ef5c36c332c2a9549975f5b1544f4061, type: 3}
   - {fileID: 21300000, guid: 736422d3b90bf4e9aa2af40f1b0bc61c, type: 3}
   - {fileID: 21300000, guid: 3c862104712b7424f9c34bb219e7ac60, type: 3}
+  - {fileID: 21300000, guid: 4fa0fb14a5d06b1409966b7db81b585e, type: 3}
   - {fileID: 21300000, guid: 93733c147ae424e038adfc771bdf885f, type: 3}
   - {fileID: 21300000, guid: 3ffd8c14e9e6d4aab877248cbf0d5987, type: 3}
   - {fileID: 21300000, guid: 617e91245acdc47dbb4ec8b5ed043adb, type: 3}
@@ -138,6 +142,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: aa1fa6458568e40e7983241ea9d23893, type: 3}
   - {fileID: 21300000, guid: a7b49855052fb4f3b9c3babee2485d2c, type: 3}
   - {fileID: 21300000, guid: cbca65655fcdd4e0ca14ee0c7fc46cb2, type: 3}
+  - {fileID: 21300000, guid: d87ee57544b45b94d8844655668eee3a, type: 3}
   - {fileID: 21300000, guid: d309b675d7e184bee91db6933ab7f077, type: 3}
   - {fileID: 21300000, guid: b53dd685a2b6c46f28710d1b5e4e59c7, type: 3}
   - {fileID: 21300000, guid: 79d7d7853a4c41446acb200afd5dbfa5, type: 3}
@@ -154,6 +159,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 54636d66abae6fe4d8ac4e716ff9bc3a, type: 3}
   - {fileID: 21300000, guid: 39b6f57621a5c4783a0ab41f1b09f8b4, type: 3}
   - {fileID: 21300000, guid: d2e596a6e4f454d439b735a988b14318, type: 3}
+  - {fileID: 21300000, guid: 01d50aa6de16842469c70f236e4541e0, type: 3}
   - {fileID: 21300000, guid: fb2fb1b67c46f491bb19c272de545c18, type: 3}
   - {fileID: 21300000, guid: f8ebc527aa87e4f2da7520536ec17819, type: 3}
   - {fileID: 21300000, guid: 65711e27f1bc543e6b9c1ed7a729ed4f, type: 3}
@@ -172,6 +178,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 363d1fb713d3d7544bba7bd873af24d3, type: 3}
   - {fileID: 21300000, guid: 808104c7483594cdb8dcfbd83cf135d3, type: 3}
   - {fileID: 21300000, guid: 1cd1aec7ea4bb4cd580a77754dd8250d, type: 3}
+  - {fileID: 21300000, guid: fb391dd7decfec44ca6c270830d9d10f, type: 3}
   - {fileID: 21300000, guid: 0c2ed0f79d8d543699b1c942e15eb8ea, type: 3}
   - {fileID: 21300000, guid: c48e1ff7c8e3b4faa9c64fedd4677b03, type: 3}
   - {fileID: 21300000, guid: 52d66508027f740f0843704bd3996b6f, type: 3}
@@ -222,13 +229,15 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 0990d1aaad184424da9a5344e88e77e2, type: 3}
   - {fileID: 21300000, guid: 585ed4aadb6b1466eadc2d0703d76377, type: 3}
   - {fileID: 21300000, guid: cc08f1cae86154acebb5737994414f2f, type: 3}
+  - {fileID: 21300000, guid: d5e1b4da7bc57a14781b6768739dcc45, type: 3}
   - {fileID: 21300000, guid: 70409bdaddfa04bd3b7a0a2cb60d7b93, type: 3}
   - {fileID: 21300000, guid: e28a2eda03aa14186b003b0c57fb1ec8, type: 3}
   - {fileID: 21300000, guid: 568239eace6e94a52b9841fb10ac6974, type: 3}
   - {fileID: 21300000, guid: e6175eea41e27468b9e2b59b369f0c77, type: 3}
   - {fileID: 21300000, guid: 43bc28fa6e76aa6458e51c988b105fa5, type: 3}
   - {fileID: 21300000, guid: b043840b0ddca46278d3d7957249bea7, type: 3}
   - {fileID: 21300000, guid: 35eb611bce90a4aebb9fa21927f292b2, type: 3}
+  - {fileID: 21300000, guid: 139c121b497271a42b113f74f1f6d474, type: 3}
   - {fileID: 21300000, guid: 8acaca3b35c844ec8891beb27842c733, type: 3}
   - {fileID: 21300000, guid: 9e78384b0271b2047a97b43bce997cb3, type: 3}
   - {fileID: 21300000, guid: ba30455b041df4b29a44c5acdf38d5d6, type: 3}
@@ -237,7 +246,9 @@ SpriteAtlas:
   - {fileID: 21300000, guid: bf1c4b7b7cb1f4261b99562ecec2cc1e, type: 3}
   - {fileID: 21300000, guid: 9e9b008bd39ec4fdda2ba2614e002eda, type: 3}
   - {fileID: 21300000, guid: cf3941ab6508d4ee7b66668948a7358e, type: 3}
+  - {fileID: 21300000, guid: be3b65cbfef2f43169dcfe77b80cdffa, type: 3}
   - {fileID: 21300000, guid: eae315ebbb3f0b34db0e5cbf2ae66102, type: 3}
+  - {fileID: 21300000, guid: 470625fbeca6a0a4687b9f6f2111a634, type: 3}
   - {fileID: 21300000, guid: 3cc2abfb8152443ff90c1f2c5d90a417, type: 3}
   - {fileID: 21300000, guid: b202830c8a3394ca89b0ebb5931d1969, type: 3}
   - {fileID: 21300000, guid: cb638a1c9a3d04d888d6f5ba2f046f4b, type: 3}
@@ -319,11 +330,13 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 15052acf63e0441dfb12772fe4088003, type: 3}
   - {fileID: 21300000, guid: 50b47dcf505c34e4d86179b86adfd223, type: 3}
   - {fileID: 21300000, guid: 02433fcf8ea93034fb9055a7d5fcd06e, type: 3}
+  - {fileID: 21300000, guid: a18eb9df865d04b50b612032626d60b4, type: 3}
   - {fileID: 21300000, guid: 869bd3ff84d974503b5da91e86e6d30a, type: 3}
   - {fileID: 21300000, guid: 4ba9c7ff7111fda41801b14ccee7f82c, type: 3}
   m_PackedSpriteNamesToIndex:
   - UI_icon_Mainmenu_02
   - Shop_bg_12
+  - button_brown_plus_T2
   - UI_main_icon_coin
   - icon_notice_03_black
   - Shop_bg_24
@@ -364,10 +377,12 @@ SpriteAtlas:
   - icon_combination_01_black
   - UI_icon_Skilloption_Eff
   - button_Orange_03
+  - UI_bg_frame_07_02
   - Shop_bg_05
   - UI_bg_frame_06
   - UI_main_icon_quest_02
   - icon_profile
+  - UI_Popup_bg_02_Deco
   - UI_bg_frame_14
   - icon_combination_upgrade
   - button_filter
@@ -384,6 +399,7 @@ SpriteAtlas:
   - icon_combination_04_black
   - Item_Recipebg_Lock
   - Shop_bg_17
+  - UI_bg_frame_deco_03
   - UI_icon_exit
   - UI_bg_assist
   - button_tab_bg_Press
@@ -407,6 +423,7 @@ SpriteAtlas:
   - item_bg_Normal
   - UI_bg_frame_12
   - Item_bg_Grade_04
+  - UI_bg_frame_07_01
   - UI_main_icon_gold
   - UI_QuestType_bg_normal
   - icon_Inventory_04
@@ -423,6 +440,7 @@ SpriteAtlas:
   - UI_icon_lock_01
   - button_brown_plus
   - button_brown_01
+  - Common_Prrogressbar_thumbBg_2
   - Shop_bg_09
   - UI_scroll_bar
   - Shop_bg_11
@@ -441,6 +459,7 @@ SpriteAtlas:
   - UI_bg_chat_02
   - UI_page_normal
   - button_orange_close
+  - Common_Prrogressbar_Line_2
   - UI_Btn_bg_03
   - UI_main_icon_gold_big
   - UI_bar_01_red
@@ -491,13 +510,15 @@ SpriteAtlas:
   - UI_main_icon_inventory
   - filter_check
   - icon_costume_01_black
+  - Common_Prrogressbar_Line_1
   - Shop_bg_21
   - UI_icon_Mainmenu_08
   - UI_Common_Slot_Expired
   - UI_Gradiant_bg_02
   - UI_arrow_02
   - Shop_MinusBtn
   - Common_bg_5R
+  - Icon_GaugeController
   - UI_icon_repeat
   - UI_bar_02_pink
   - UI_icon_option_stat
@@ -506,7 +527,9 @@ SpriteAtlas:
   - Icon_Retrieve
   - UI_popup_list_bg
   - Item_Recipebg_02
+  - button_brown_minus_T2
   - UI_icon_item_star_02
+  - UI_bg_frame_deco_04
   - Common_TabBtn_Normal
   - icon_Inventory_02_black
   - UI_Popup_icon_09
@@ -588,6 +611,7 @@ SpriteAtlas:
   - item_frame
   - button_tab_bg_normal
   - icon_combination_05_black
+  - UI_bg_frame_13_Round8
   - Item_option_bg
   - UI_icon_lock_02
   m_RenderDataMap: {}