jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add: mouse icon

Browse Source
This commit is contained in:
Jisang Park
2019-08-05 18:21:09 +09:00
parent efb728ab5e
commit 6aa82dc03d
6 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/image/icon/keyboard.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 660 B

After

Width:  |  Height:  |  Size: 1.3 KiB

resources/image/icon/mouse.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

resources/image/icon/ui.sketch
BIN
View File
Binary file not shown.
src/game/lib/flat_button/app_group_tab.js
+7 -7
View File
@@ -39,7 +39,7 @@ AppGroupTab.prototype.createTab = function(index) {
// setting.setFont("Nanum Pen Script"); // setting.setFont("Nanum Pen Script");
setting.setFont("Nanum Gothic"); setting.setFont("Nanum Gothic");
setting.setMainFontSize(16); setting.setMainFontSize(16);
setting.setShortcutFontSize(14); setting.setShortcutFontSize(16);
setting.setButtonColor( setting.setButtonColor(
AppGroupTab.BUTTON_COLOR_OUT_HEX, AppGroupTab.BUTTON_COLOR_OUT_HEX,
AppGroupTab.BUTTON_COLOR_OVER_HEX, AppGroupTab.BUTTON_COLOR_OVER_HEX,
@@ -54,9 +54,9 @@ AppGroupTab.prototype.createTab = function(index) {
); );
setting.setActiveLineColor( setting.setActiveLineColor(
MainColor.DARK_CHOCO_HEX, MainColor.DARK_CHOCO_HEX,
MainColor.DARK_CHOCO_HEX, MainColor.CHOCO_HEX,
MainColor.DARK_CHOCO_HEX, MainColor.LIGHT_CHOCO_HEX,
MainColor.DARK_CHOCO_HEX MainColor.WHITE_HEX // MainColor.DARK_CHOCO_HEX
); );
setting.setTextColor( setting.setTextColor(
AppGroupTab.TEXT_COLOR_OUT_STRING, AppGroupTab.TEXT_COLOR_OUT_STRING,
@@ -91,12 +91,12 @@ AppGroupTab.BUTTON_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX;
AppGroupTab.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; AppGroupTab.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX;
AppGroupTab.BUTTON_COLOR_DISABLED_HEX = MainColor.BLACK_HEX; AppGroupTab.BUTTON_COLOR_DISABLED_HEX = MainColor.BLACK_HEX;
AppGroupTab.ICON_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; AppGroupTab.ICON_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; // MainColor.WHITE_HEX; // MainColor.DARK_CHOCO_HEX;
AppGroupTab.ICON_COLOR_OVER_HEX = MainColor.CHOCO_HEX; AppGroupTab.ICON_COLOR_OVER_HEX = MainColor.CHOCO_HEX;
AppGroupTab.ICON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; AppGroupTab.ICON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX;
AppGroupTab.ICON_COLOR_DISABLED_HEX = MainColor.DARK_CHOCO_HEX; AppGroupTab.ICON_COLOR_DISABLED_HEX = MainColor.DARK_CHOCO_HEX;
AppGroupTab.TEXT_COLOR_OUT_STRING = MainColor.DARK_CHOCO_STRING; AppGroupTab.TEXT_COLOR_OUT_STRING = MainColor.BLACK_STRING; // MainColor.DARK_CHOCO_STRING;
AppGroupTab.TEXT_COLOR_OVER_STRING = MainColor.CHOCO_STRING; AppGroupTab.TEXT_COLOR_OVER_STRING = MainColor.CHOCO_STRING;
AppGroupTab.TEXT_COLOR_DOWN_STRING = MainColor.LIGHT_CHOCO_STRING; AppGroupTab.TEXT_COLOR_DOWN_STRING = MainColor.CHOCO_STRING;
AppGroupTab.TEXT_COLOR_DISABLED_STRING = MainColor.DARK_CHOCO_STRING; AppGroupTab.TEXT_COLOR_DISABLED_STRING = MainColor.DARK_CHOCO_STRING;
src/game/lib/flat_button/basic_tab.js
+10 -10
View File
@@ -30,6 +30,7 @@ BasicTab.prototype.createButton = function(setting, clickEvent) {
this.buttonSprite.addChild(this.mainText); this.buttonSprite.addChild(this.mainText);
this.shortcutText = this.makeShortcutText(); this.shortcutText = this.makeShortcutText();
// this.shortcutText.fontWeight = "bold";
this.buttonSprite.addChild(this.shortcutText); this.buttonSprite.addChild(this.shortcutText);
this.applyLoadedFont(); this.applyLoadedFont();
@@ -77,7 +78,7 @@ BasicTab.prototype.makeActiveLineSprite = function() {
var texture = null; var texture = null;
texture = new Phaser.Graphics() texture = new Phaser.Graphics()
// .beginFill(0xffffff) // .beginFill(0xffffff)
.beginFill(MainColor.LIGHT_CHOCO_HEX) .beginFill(MainColor.WHITE_HEX)
.drawRoundedRect(0, 0, lineWidth, lineHeight, 1) .drawRoundedRect(0, 0, lineWidth, lineHeight, 1)
.endFill() .endFill()
.generateTexture(); .generateTexture();
@@ -105,9 +106,7 @@ BasicTab.prototype.addIcon = function(spriteName) {
this.iconSprite.x = this.buttonSprite.width / 2; this.iconSprite.x = this.buttonSprite.width / 2;
this.iconSprite.y = this.buttonSprite.height / 2; this.iconSprite.y = this.buttonSprite.height / 2;
this.iconSprite.anchor.setTo(0.5, 0.5); this.iconSprite.anchor.setTo(0.5, 0.5);
// this.setIconSize(40); this.setIconSize(50);
this.setIconWidth(42);
this.setIconHeight(25);
this.buttonSprite.addChild(this.iconSprite); this.buttonSprite.addChild(this.iconSprite);
this.mainText.text = ""; this.mainText.text = "";
@@ -223,7 +222,7 @@ BasicTab.prototype.alignContents = function() {
var offsetRatio = 7; var offsetRatio = 7;
var offsetMainText = mainTextHeight / offsetRatio; var offsetMainText = mainTextHeight / offsetRatio;
var offsetShortcutText = shortcutTextHeight / offsetRatio; var offsetShortcutText = shortcutTextHeight / offsetRatio;
var gap = (iconSpriteHeight > 0 ? 0 : gap = BasicTab.SHORTCUT_TEXT_FONTSIZE / 4); var gap = (iconSpriteHeight > 0 ? 0 : BasicTab.SHORTCUT_TEXT_FONTSIZE / 2);
if(shortcutTextHeight === 0) { if(shortcutTextHeight === 0) {
if(mainTextHeight > 0) if(mainTextHeight > 0)
@@ -238,7 +237,8 @@ BasicTab.prototype.alignContents = function() {
this.iconSprite.y = this.buttonSprite.height / 2 - shortcutTextHeightHalf; this.iconSprite.y = this.buttonSprite.height / 2 - shortcutTextHeightHalf;
} }
this.shortcutText.y = this.buttonSprite.height / 2 + mainContentHeightHalf + offsetShortcutText + gap; // this.shortcutText.y = this.buttonSprite.height / 2 + mainContentHeightHalf + offsetShortcutText + gap;
this.shortcutText.y = this.buttonSprite.height / 2 + mainContentHeightHalf + offsetShortcutText - 8;
} }
@@ -278,7 +278,7 @@ BasicTab.prototype.mouseOut = function() {
if(this.shortcutText !== undefined) if(this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.out; this.shortcutText.fill = this.setting.textColors.out;
// this.activeLineSprite.tint = this.setting.activeLineColors.out; this.activeLineSprite.tint = this.setting.activeLineColors.out;
} }
BasicTab.prototype.mouseOver = function() { BasicTab.prototype.mouseOver = function() {
@@ -291,7 +291,7 @@ BasicTab.prototype.mouseOver = function() {
if(this.shortcutText !== undefined) if(this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.over; this.shortcutText.fill = this.setting.textColors.over;
// this.activeLineSprite.tint = this.setting.activeLineColors.over; this.activeLineSprite.tint = this.setting.activeLineColors.over;
} }
BasicTab.prototype.mouseDown = function() { BasicTab.prototype.mouseDown = function() {
@@ -304,7 +304,7 @@ BasicTab.prototype.mouseDown = function() {
if(this.shortcutText !== undefined) if(this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.down; this.shortcutText.fill = this.setting.textColors.down;
// this.activeLineSprite.tint = this.setting.activeLineColors.down; this.activeLineSprite.tint = this.setting.activeLineColors.down;
} }
BasicTab.prototype.buttonDisabled = function() { BasicTab.prototype.buttonDisabled = function() {
@@ -317,7 +317,7 @@ BasicTab.prototype.buttonDisabled = function() {
if(typeof this.shortcutText !== undefined) if(typeof this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.disabled; this.shortcutText.fill = this.setting.textColors.disabled;
// this.activeLineSprite.tint = this.setting.activeLineColors.disabled; this.activeLineSprite.tint = this.setting.activeLineColors.disabled;
} }
src/game/main_menu/main_menu.js
+3 -1
View File
@@ -9,6 +9,8 @@ MainMenu.prototype.preload = function() {
game.load.image('home', '../../../resources/image/icon/home.png'); game.load.image('home', '../../../resources/image/icon/home.png');
game.load.image('keyboard', '../../../resources/image/icon/keyboard.png'); game.load.image('keyboard', '../../../resources/image/icon/keyboard.png');
game.load.image('mouse', '../../../resources/image/icon/mouse.png');
game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js');
} }
@@ -212,7 +214,7 @@ MainMenu.prototype.makeAppGroupButtons = function() {
this.appGroupTabLayout.add(typingPlayGroupTab); this.appGroupTabLayout.add(typingPlayGroupTab);
var mousePlayGroupTab = new AppGroupTab( (function() { console.log("mouse exam"); }).bind(this) ); var mousePlayGroupTab = new AppGroupTab( (function() { console.log("mouse exam"); }).bind(this) );
mousePlayGroupTab.reserveIcon("home"); mousePlayGroupTab.reserveIcon("mouse");
mousePlayGroupTab.reserveShortcutText("놀이"); mousePlayGroupTab.reserveShortcutText("놀이");
this.appGroupTabLayout.add(mousePlayGroupTab); this.appGroupTabLayout.add(mousePlayGroupTab);