Merge pull request #6681 from planetarium/feature/issue-6658

정찰보상 온체인 처리
planetarium · Jan 9, 2025 · 76e2321 · 76e2321
2 parents 177b5d9 + 12049ed
commit 76e2321
Show file tree

Hide file tree

Showing 34 changed files with 266 additions and 1,146 deletions.
diff --git a/nekoyume/Assets/Resources/AddressableAssetsContainer.asset b/nekoyume/Assets/Resources/AddressableAssetsContainer.asset
@@ -126,3 +126,4 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 7d9d5820f221437094f1f72a78d12790, type: 3}
   - {fileID: 4900000, guid: 92bd59b6eadf47443ae612f44eb2a8d9, type: 3}
   - {fileID: 4900000, guid: 9ce4b6514480fcc47b5c05de6cbe7657, type: 3}
+  - {fileID: 4900000, guid: 92ae4e6336725f74a8475d848cd18510, type: 3}
diff --git a/nekoyume/Assets/Resources/ScriptableObject/UI_PatrolRewardData.asset b/nekoyume/Assets/Resources/ScriptableObject/UI_PatrolRewardData.asset
diff --git a/nekoyume/Assets/Resources/ScriptableObject/UI_PatrolRewardData.asset.meta b/nekoyume/Assets/Resources/ScriptableObject/UI_PatrolRewardData.asset.meta
diff --git a/nekoyume/Assets/Resources/SpriteAtlases/Background/MainMenu.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/Background/MainMenu.spriteatlas
@@ -187,7 +187,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 001e252a3c854354b941a4745381f383, type: 3}
   - {fileID: 21300000, guid: 9b87562abef3acb4caa1fd440c5b56e9, type: 3}
   - {fileID: 21300000, guid: b0f0d13a905e14ae2b9d05c821ebb219, type: 3}
-  - {fileID: 21300000, guid: 4906883aea275b14aaeef0c1fec4c339, type: 3}
   - {fileID: 21300000, guid: bc221f3aa2559334aa5f9ed7ca265c35, type: 3}
   - {fileID: 21300000, guid: 013bb45a1b22d9746b3e6d571cd65735, type: 3}
   - {fileID: 21300000, guid: 1402b85ae950dd64f911cea59c53d8f9, type: 3}
@@ -212,7 +211,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 366d0aeb2efb36d42a500592a8aebb20, type: 3}
   - {fileID: 21300000, guid: 6ca32ceba2e2078489c75609c4604799, type: 3}
   - {fileID: 21300000, guid: 6b91210c23919614c818c79210422a62, type: 3}
-  - {fileID: 21300000, guid: 6c1d261c785e47d45aa1930f4d5ff658, type: 3}
   - {fileID: 21300000, guid: 26b4c42c1577349f59de21b50e614bd3, type: 3}
   - {fileID: 21300000, guid: 0e66033c6157a22488196fa0c48dc551, type: 3}
   - {fileID: 21300000, guid: c9d24d3c97fef4406ba2153335608c65, type: 3}
@@ -223,7 +221,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 558359dc5133443d28fbec9eec6d4fe6, type: 3}
   - {fileID: 21300000, guid: 065d16ec339c24783a27694953b6c2da, type: 3}
   - {fileID: 21300000, guid: 208db90d9bffe8946a3b558fc0216939, type: 3}
-  - {fileID: 21300000, guid: d444b12d0440a264f97070116f8ba54e, type: 3}
   - {fileID: 21300000, guid: 70d1443db16d2ec49a61f893dd46888b, type: 3}
   - {fileID: 21300000, guid: 62f1404db9387224ab831ae46092ab38, type: 3}
   - {fileID: 21300000, guid: 6543e94d8c1874b72a2d3a5265dd548a, type: 3}
@@ -235,7 +232,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: db11b5cda8ec3b245bac2b7d3a6035b3, type: 3}
   - {fileID: 21300000, guid: 1af2d6cdc26dc4009877e1775ce923f0, type: 3}
   - {fileID: 21300000, guid: 189118edb1599534787fd2ed6563ff52, type: 3}
-  - {fileID: 21300000, guid: 3a4de4fd4b3809e4dbfb9a445f47a39d, type: 3}
   - {fileID: 21300000, guid: 0db7990e056098c49aa96802f8de723e, type: 3}
   - {fileID: 21300000, guid: a665b81e6c2bba148ab21c8cf7b4af63, type: 3}
   - {fileID: 21300000, guid: b227014e230f5514e940db305d2fab34, type: 3}
@@ -399,7 +395,6 @@ SpriteAtlas:
   - Main_Patrol_01
   - worldboss_02
   - Main_rock_03
-  - PatrolReward_00
   - bg_character_main_07
   - shop_02_01
   - bg_xmas_tree_02_light_03
@@ -424,7 +419,6 @@ SpriteAtlas:
   - UI_icon_Speech_08
   - shop_01
   - Staking_00
-  - PatrolReward_03
   - bg_valentine_bg_03_Eff
   - Main_leaf_05
   - Main_Cloud_04
@@ -435,7 +429,6 @@ SpriteAtlas:
   - Main_rock_02
   - Main_Leaf_09
   - Icon_Seasonpass_s_1
-  - PatrolReward_01
   - bg_character_main_08
   - worldboss_03_Chain_Front_4
   - Menu_Season_bg_02
@@ -447,7 +440,6 @@ SpriteAtlas:
   - bg_xmas_Island_01
   - Main_Leaf_08
   - Main_tower_08
-  - PatrolReward_02
   - Main_Staking
   - worldboss_01
   - worldboss_03_Chain_Back_5

diff --git a/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_00.png b/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_00.png
diff --git a/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_00.png.meta b/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_00.png.meta
diff --git a/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_01.png b/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_01.png
diff --git a/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_01.png.meta b/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_01.png.meta
diff --git a/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_02.png b/nekoyume/Assets/Sprites/Background/MainMenu/Object/PatrolReward_02.png