From 6cd48f238deb08bb64ed71178f625814808989a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Thu, 3 May 2018 16:20:29 +0900 Subject: [PATCH] Fix: move round_rect_button.js to src/lib/js --- .../game/lib/js}/round_rect_button.js | 5 ++--- study/{RoundRectButton => Phaser3}/phaser3-logo.png | Bin .../{RoundRectButton => Phaser3}/phaser_sample.html | 0 .../phaser_sample_main.js | 0 study/{RoundRectButton => Phaser3}/red.png | Bin study/{RoundRectButton => Phaser3}/space3.png | Bin study/RoundRectButton/round_rect_button.html | 4 ++-- 7 files changed, 4 insertions(+), 5 deletions(-) rename {study/RoundRectButton => src/game/lib/js}/round_rect_button.js (96%) rename study/{RoundRectButton => Phaser3}/phaser3-logo.png (100%) rename study/{RoundRectButton => Phaser3}/phaser_sample.html (100%) rename study/{RoundRectButton => Phaser3}/phaser_sample_main.js (100%) rename study/{RoundRectButton => Phaser3}/red.png (100%) rename study/{RoundRectButton => Phaser3}/space3.png (100%) diff --git a/study/RoundRectButton/round_rect_button.js b/src/game/lib/js/round_rect_button.js similarity index 96% rename from study/RoundRectButton/round_rect_button.js rename to src/game/lib/js/round_rect_button.js index 8b25099..67067ba 100644 --- a/study/RoundRectButton/round_rect_button.js +++ b/src/game/lib/js/round_rect_button.js @@ -39,6 +39,7 @@ RoundRectButtonSetting.DEFAULT_TEXT_FONT = { }; RoundRectButtonSetting.DEFAULT_LINE_SPACING = -10; // pixels +RoundRectButtonSetting.WHITE = 0xffffff; @@ -83,7 +84,7 @@ class RoundRectButton { makeSprite() { let btnTexture = new Phaser.Graphics() - .beginFill(RoundRectButton.white) + .beginFill(RoundRectButtonSetting.WHITE) .drawRoundedRect(0, 0, this.setting.width, this.setting.height, this.setting.roundAmount) .endFill() .generateTexture(); @@ -146,5 +147,3 @@ class RoundRectButton { } } -RoundRectButton.defaultRoundAmount = 10; -RoundRectButton.white = 0xffffff; diff --git a/study/RoundRectButton/phaser3-logo.png b/study/Phaser3/phaser3-logo.png similarity index 100% rename from study/RoundRectButton/phaser3-logo.png rename to study/Phaser3/phaser3-logo.png diff --git a/study/RoundRectButton/phaser_sample.html b/study/Phaser3/phaser_sample.html similarity index 100% rename from study/RoundRectButton/phaser_sample.html rename to study/Phaser3/phaser_sample.html diff --git a/study/RoundRectButton/phaser_sample_main.js b/study/Phaser3/phaser_sample_main.js similarity index 100% rename from study/RoundRectButton/phaser_sample_main.js rename to study/Phaser3/phaser_sample_main.js diff --git a/study/RoundRectButton/red.png b/study/Phaser3/red.png similarity index 100% rename from study/RoundRectButton/red.png rename to study/Phaser3/red.png diff --git a/study/RoundRectButton/space3.png b/study/Phaser3/space3.png similarity index 100% rename from study/RoundRectButton/space3.png rename to study/Phaser3/space3.png diff --git a/study/RoundRectButton/round_rect_button.html b/study/RoundRectButton/round_rect_button.html index 1dbfdfb..304d7e2 100644 --- a/study/RoundRectButton/round_rect_button.html +++ b/study/RoundRectButton/round_rect_button.html @@ -19,13 +19,13 @@ --> - + - +