Merge remote-tracking branch 'origin/image'

93a6c09a · 18손재민 · 7d9e81e0 · e78d9e9d · 93a6c09a · 93a6c09a
Commit 93a6c09a authored Aug 19, 2019 by 18손재민
12 changed files
--- a/assets/image/UI/main/combine.png
+++ b/assets/image/UI/main/combine.png
--- a/assets/image/UI/main/friend.png
+++ b/assets/image/UI/main/friend.png
--- a/assets/image/UI/main/friendlyPlay.png
+++ b/assets/image/UI/main/friendlyPlay.png
--- a/assets/image/UI/main/help.png
+++ b/assets/image/UI/main/help.png
--- a/assets/image/UI/main/hopaeManage.png
+++ b/assets/image/UI/main/hopaeManage.png
--- a/assets/image/UI/main/inventory.png
+++ b/assets/image/UI/main/inventory.png
--- a/assets/image/UI/main/mainBG_example.png
+++ b/assets/image/UI/main/mainBG_example.png
--- a/assets/image/UI/main/mainBackground.png
+++ b/assets/image/UI/main/mainBackground.png
--- a/assets/image/UI/main/option.png
+++ b/assets/image/UI/main/option.png
--- a/assets/image/UI/main/rankPlay.png
+++ b/assets/image/UI/main/rankPlay.png
--- a/assets/image/UI/main/shop.png
+++ b/assets/image/UI/main/shop.png
--- a/assets/image/background/testBG.png
+++ b/assets/image/background/testBG.png