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

Fix: change animal record list

Browse Source
This commit is contained in:
Jisang Park
2019-08-19 20:15:32 +09:00
parent 7a4197689e
commit 6dd9a8aa5b
8 changed files with 42 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/lib/animal.js
+1
View File
@@ -165,6 +165,7 @@ Animal.ANIMATION_TYPE_DAMAGE = 1;
Animal.SPRITE_WIDTH = 100;
Animal.SPRITE_DAMAGE_WIDTH = 50;
Animal.SPRITE_HEIGHT = 100;
Animal.SPRITE_DAMAGE_HEIGHT = 50;
Animal.HIDE_POS_Y = 1000;
src/game/lib/animal_list.js
-114
View File
@@ -1,114 +0,0 @@
function AnimalList(posY) {
this.animals = [];
this.activeAnimalIndex = -1;
var animalCount = Animal.SPECIES_DATA.length;
var lineWidth = GAME_SCREEN_SIZE.x - AnimalList.MARGIN_X * 2;
// console.log("lineWidth : " + lineWidth);
var offsetAnimal = lineWidth / (animalCount - 1);
// console.log("animalCount : " + animalCount);
// console.log("offsetAnimal : " + offsetAnimal);
this.activeAnimalIndex = 0;
var bg = game.add.graphics();
bg.beginFill(AnimalList.COLOR_BG, 1);
bg.drawRect(0, posY - 30, GAME_SCREEN_SIZE.x, 80);
this.recordTextList = this.makeRecordTextList(posY);
for(var i = 0; i < animalCount; i++) {
this.animals[i] = new Animal(
Animal.TYPE_ICON,
i,
AnimalList.MARGIN_X + offsetAnimal * i,
posY
);
this.inactivate(i);
}
this.activate(this.activeAnimalIndex);
this.tweenAnimation(Animal.ANIMATION_TYPE_DAMAGE);
}
AnimalList.prototype.activate = function(index) {
this.inactivate(this.activeAnimalIndex);
this.activeAnimalIndex = index;
this.animals[this.activeAnimalIndex].setScale(2);
this.animals[index].setAlpha(1);
this.animate(this.activeAnimalIndex);
this.recordTextList[index].addColor(AnimalList.COLOR_SCORE_CLEARED_TEXT, 0);
}
AnimalList.prototype.inactivate = function(index) {
this.animals[index].stopAnimation();
this.animals[index].setScale(1);
this.animals[index].setAlpha(AnimalList.ALPHA_INACTIVE);
this.recordTextList[index].addColor(AnimalList.COLOR_SCORE_DEFAULT_TEXT, 0);
}
AnimalList.prototype.makeRecordTextList = function(posY) {
var animalCount = Animal.SPECIES_DATA.length;
var lineWidth = GAME_SCREEN_SIZE.x - AnimalList.MARGIN_X * 2;
// console.log("lineWidth : " + lineWidth);
var offsetAnimal = lineWidth / (animalCount - 1);
var titleTextStyle = { font: "16px Arial", fill: "#fff", align: "center"};
var typingCount = 0;
var animalData = null;
var recordTextList = new Array();
for(var i = 0; i < animalCount; i++) {
animalData = Animal.SPECIES_DATA[i];
if(isTypingPracticeApp())
typingCount = RecordUtil.getRecordValueWithUnit(animalData.practiceTypingCount, 1);
else
typingCount = RecordUtil.getRecordValueWithUnit(animalData.testTypingCount, 1);
var recordText = game.add.text(
AnimalList.MARGIN_X + offsetAnimal * i,
posY + AnimalList.RECORD_TEXT_OFFSET_Y,
typingCount, titleTextStyle
);
recordText.anchor.set(0.5);
recordText.addColor(AnimalList.COLOR_SCORE_DEFAULT_TEXT, 0);
recordText.stroke = "#333";
recordText.strokeThickness = 3;
recordText.setShadow(1, 1, 'rgba(0, 0, 0, 0.5)', 2);
recordTextList.push(recordText);
}
return recordTextList;
}
AnimalList.prototype.animate = function(index) {
var animalData = Animal.SPECIES_DATA[index];
this.animals[index].startAnimation(animalData);
}
AnimalList.prototype.stopAnimation = function() {
this.animals[this.activeAnimalIndex].stopAnimation();
}
AnimalList.prototype.tweenAnimation = function(animationType) {
this.animals[this.activeAnimalIndex].tweenAnimation(animationType);
}
AnimalList.MARGIN_X = 100;
AnimalList.ALPHA_INACTIVE = 0.1;
// AnimalList.ANIMAL_LIST_POS_Y = 90;
AnimalList.RECORD_TEXT_OFFSET_Y = 36;
AnimalList.ALPHA_INACTIVE = 0.3;
AnimalList.COLOR_BG = 0x545454; // "0x77aadd"; //0x99ccff;
AnimalList.COLOR_SCORE_DEFAULT_TEXT = "#999999"; // "#dddddd"; //"#bbddff";
AnimalList.COLOR_SCORE_CLEARED_TEXT = "#ffffff";
src/game/lib/animal_record_list.js
+27 -20
View File
@@ -4,26 +4,23 @@ function AnimalRecordList(type) {
this.posY = 0;
this.animals = [];
this.texts = new Array();
this.activeAnimalIndex = -1;
this.activeAnimalIndex = 0;
/*
var bgColor = AnimalRecordList.COLOR_BG;
var posY = AnimalRecordList.ANIMAL_LIST_POS_Y;
if(this.type === AnimalRecordList.TYPE_MENU) {
bgColor = MainColor.LIGHT_CHOCO_HEX;
posY = AnimalRecordList.ANIMAL_LIST_MENU_POS_Y;
}
*/
var bgColor = MainColor.LIGHT_CHOCO_HEX;
var posY = AnimalRecordList.ANIMAL_LIST_MENU_POS_Y;
this.posY = posY;
this.texts = new Array();
var bgColor = MainColor.LIGHT_CHOCO_HEX;
if(this.type === Animal.TYPE_MENU) {
bgColor = MainColor.LIGHT_CHOCO_HEX;
this.posY = AnimalRecordList.ANIMAL_LIST_MENU_POS_Y;
}
else {
bgColor = TypingExamination.STAGE_BACKGROUND_COLOR_HEX;
this.posY = AnimalRecordList.ANIMAL_LIST_EXAM_POS_Y;
}
game.add.graphics()
.beginFill(bgColor, 1)
.drawRect(0, posY, game.world.width, 80);
.drawRect(0, this.posY, game.world.width, 80);
// make animals and score texts
@@ -39,18 +36,27 @@ function AnimalRecordList(type) {
}
AnimalRecordList.prototype.makeAnimals = function(animalCount, lineWidth, offsetAnimal) {
var posY = 0;
if(this.type === Animal.TYPE_MENU)
posY = AnimalRecordList.ANIMAL_LIST_MENU_POS_Y + AnimalRecordList.ANIMAL_OFFSET_Y;
else
posY = AnimalRecordList.ANIMAL_LIST_EXAM_POS_Y + AnimalRecordList.ANIMAL_OFFSET_Y;
for(var i = 0; i < animalCount; i++) {
this.animals[i] = new Animal(
Animal.TYPE_ICON,
i,
AnimalRecordList.MARGIN_X + offsetAnimal * i,
AnimalRecordList.ANIMAL_LIST_MENU_POS_Y + AnimalRecordList.ANIMAL_OFFSET_Y
posY
);
// this.inactivate(i);
if(this.type === Animal.TYPE_EXAM)
this.inactivate(i);
}
// this.activate(this.activeAnimalIndex);
// this.tweenAnimation(Animal.ANIMATION_TYPE_DAMAGE);
if(this.type === Animal.TYPE_EXAM) {
this.activate(this.activeAnimalIndex);
this.tweenAnimation(Animal.ANIMATION_TYPE_DAMAGE);
}
}
AnimalRecordList.prototype.makeScoreTexts = function(animalCount, lineWidth, offsetAnimal) {
@@ -147,7 +153,7 @@ AnimalRecordList.prototype.applyLoadedFont = function() {
}
AnimalRecordList.POS_Y = 800;
AnimalRecordList.POS_Y = 780;
AnimalRecordList.HIDE_POS_Y = 1000;
AnimalRecordList.MARGIN_X = 100;
@@ -158,6 +164,7 @@ AnimalRecordList.ALPHA_INACTIVE = 0.3;
AnimalRecordList.ANIMAL_LIST_MENU_POS_Y = 690; // 70; //640;
AnimalRecordList.ANIMAL_LIST_EXAM_POS_Y = 638;
AnimalRecordList.ANIMAL_OFFSET_Y = 30;
AnimalRecordList.RECORD_TEXT_MENU_OFFSET_Y = 35;
AnimalRecordList.COLOR_SCORE_MENU_DEFAULT_TEXT = MainColor.OLD_LACE_STRING;