Merge branch 'image'

6deb90a8 · 18손재민 · d3d6f857 · 957a1751 · 6deb90a8 · 6deb90a8
Commit 6deb90a8 authored Aug 22, 2019 by 18손재민
14 changed files
--- a/assets/image/UI/dialog/result_background.png
+++ b/assets/image/UI/dialog/result_background.png
--- a/assets/image/UI/dialog/result_example.png
+++ b/assets/image/UI/dialog/result_example.png
--- a/assets/image/UI/dialog/result_stamp.png
+++ b/assets/image/UI/dialog/result_stamp.png
--- a/assets/image/UI/tutorial/tutorialImages.png
+++ b/assets/image/UI/tutorial/tutorialImages.png
--- a/assets/image/UI/tutorial/tutorialImages_ph.png
+++ b/assets/image/UI/tutorial/tutorialImages_ph.png
--- a/assets/image/character/sunbi/sunbi_burning_big.png
+++ b/assets/image/character/sunbi/sunbi_burning_big.png
--- a/assets/image/character/sunbi/sunbi_burning_small.png
+++ b/assets/image/character/sunbi/sunbi_burning_small.png
--- a/assets/image/character/sunbi/sunbi_die.png
+++ b/assets/image/character/sunbi/sunbi_die.png
--- a/assets/image/character/sunbi/sunbi_hit.png
+++ b/assets/image/character/sunbi/sunbi_hit.png
--- a/assets/image/character/sunbi/sunbi_sit.png
+++ b/assets/image/character/sunbi/sunbi_sit.png
--- a/assets/image/character/sunbi/sunbi_stand.png
+++ b/assets/image/character/sunbi/sunbi_stand.png
--- a/assets/image/character/sunbi/sunbi_throw.png
+++ b/assets/image/character/sunbi/sunbi_throw.png
--- a/assets/image/character/sunbi/sunbi_write.png
+++ b/assets/image/character/sunbi/sunbi_write.png
--- a/js/ResourceLoader.js
+++ b/js/ResourceLoader.js
@@ -70,7 +70,7 @@ ResourceLoader.loadImage = function(scene)
    scene.load.spritesheet('phase1', 'assets/image/etc/scroll/startPhase/startPhase.png', { frameWidth: 280, frameHeight: 920 });
    scene.load.spritesheet('phase2', 'assets/image/etc/scroll/bonPhase/bonPhase.png', { frameWidth: 280, frameHeight: 920 });
    scene.load.spritesheet('phase3', 'assets/image/etc/scroll/poongPhase/poongPhase.png', { frameWidth: 280, frameHeight: 920 });
-    scene.load.spritesheet('tutorialImage', 'assets/image/UI/tutorial/tutorialImages.png', { frameWidth: 1000, frameHeight: 800 });
+    scene.load.spritesheet('tutorialImage', 'assets/image/UI/tutorial/tutorialImages.png', { frameWidth: 1080, frameHeight: 615 });
 }

 ResourceLoader.loadAnimation = function(scene)