From 3977611fedb5cf40a429e3ae69a9fba7ca5dc39f Mon Sep 17 00:00:00 2001
From: nagoling <>
Date: Sat, 10 May 2014 05:06:41 +0900
Subject: [PATCH] =?utf8?q?=E5=AE=9F=E3=82=86=E3=81=A3=E3=81=8F=E3=82=8A?=
 =?utf8?q?=E3=81=AB=E5=90=91=E3=81=8D=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
 =?utf8?q?=E6=AC=A1=E5=9B=9E=E3=81=AF=E5=B7=A6=E5=90=91=E3=81=8D=E3=81=AE?=
 =?utf8?q?=E3=81=A8=E3=81=8D=E3=81=AE=E5=BA=A7=E6=A8=99=E3=81=82=E3=82=8F?=
 =?utf8?q?=E3=81=9B=E3=82=92=E8=A1=8C=E3=81=86=E3=80=82TODO=E8=A6=81?=
 =?utf8?q?=E7=A2=BA=E8=AA=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 main.js | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 18 deletions(-)

diff --git a/main.js b/main.js
index 6923f06..04b6f62 100644
--- a/main.js
+++ b/main.js
@@ -698,7 +698,7 @@ window.onload = function(){
 					if(false){
 						this.yukkuri.vx = xpos;
 						this.yukkuri.vy = ypos;
-						this.yukkuri.direction = EDirection.RIGHT;
+						this.yukkuri.setDirection(EDirection.RIGHT);
 					}
 					else if(rand(8) === 0){
 						this.yukkuri.vx = 0;
@@ -707,17 +707,17 @@ window.onload = function(){
 					else if(rand(8) == 1){
 						this.yukkuri.vx = xpos;
 						this.yukkuri.vy = -ypos;
-						this.yukkuri.direction = EDirection.RIGHT;
+						this.yukkuri.setDirection(EDirection.RIGHT);
 					}
 					else if(rand(8) == 2){
 						this.yukkuri.vx = xpos;
 						this.yukkuri.vy = 0;
-						this.yukkuri.direction = EDirection.RIGHT;
+						this.yukkuri.setDirection(EDirection.RIGHT);
 					}
 					else if(rand(8) == 3){
 						this.yukkuri.vx = xpos;
 						this.yukkuri.vy = ypos;
-						this.yukkuri.direction = EDirection.RIGHT;
+						this.yukkuri.setDirection(EDirection.RIGHT);
 					}
 					else if(rand(8) == 4){
 						this.yukkuri.vx = 0;
@@ -726,17 +726,17 @@ window.onload = function(){
 					else if(rand(8) == 5){
 						this.yukkuri.vx = -xpos;
 						this.yukkuri.vy = ypos;
-						this.yukkuri.direction = EDirection.LEFT;
+						this.yukkuri.setDirection(EDirection.LEFT);
 					}
 					else if(rand(8) == 6){
 						this.yukkuri.vx = -xpos;
 						this.yukkuri.vy = 0;
-						this.yukkuri.direction = EDirection.LEFT;
+						this.yukkuri.setDirection(EDirection.LEFT);
 					}
 					else if(rand(8) == 7){
 						this.yukkuri.vx = -xpos;
 						this.yukkuri.vy = -ypos;
-						this.yukkuri.direction = EDirection.LEFT;
+						this.yukkuri.setDirection(EDirection.LEFT);
 					}
 					if (this.yukkuri.vx || this.yukkuri.vy) {
 						var map = ctl.backgroundMap;
@@ -1242,7 +1242,7 @@ window.onload = function(){
 				var distance = (Math.abs(yukkuri.vx) + Math.abs(yukkuri.vy)) / 2;
 				var frame = distance + distance/5 + 1;
 				frame += plusFrameScale(frame, this.yukkuri.getMyScale());
-				yukkuri.direction = yukkuri.vx > 0 ? EDirection.RIGHT : EDirection.LEFT;
+				yukkuri.setAutoDirection();
 				yukkuri.reverse();
 				mangMsg.output(yukkuri, EMsg.TARGETING_EAT);
 
@@ -1286,7 +1286,7 @@ window.onload = function(){
 				var distance = (Math.abs(yukkuri.vx) + Math.abs(yukkuri.vy)) / 2;
 				var frame = distance + distance/5 + 1;
 				frame += plusFrameScale(frame, this.yukkuri.getMyScale());
-				yukkuri.direction = yukkuri.vx > 0 ? EDirection.RIGHT : EDirection.LEFT;
+				yukkuri.setAutoDirection();
 				yukkuri.reverse();
 				mangMsg.output(yukkuri, EMsg.MOVE_TO_HUNTING);
 
@@ -1404,7 +1404,8 @@ window.onload = function(){
 				var distance = (Math.abs(yukkuri.vx) + Math.abs(yukkuri.vy)) / 2;
 				var frame = distance + distance/2 + 1 ;
 				frame += plusFrameScale(frame, this.yukkuri.getMyScale());
-				yukkuri.direction = yukkuri.vx > 0 ? EDirection.RIGHT : EDirection.LEFT;
+				yukkuri.setAutoDirection();
+
 				yukkuri.reverse();
 				mangMsg.output(this.yukkuri, EMsg.MOVE_GOTO_HOME)
 
@@ -1553,7 +1554,7 @@ window.onload = function(){
 			var frame = distance + distance/2 + 1;
 			frame += plusFrameScale(frame, this.yukkuri.getMyScale());
 
-			yukkuri.direction = yukkuri.vx > 0 ? EDirection.RIGHT : EDirection.LEFT;
+			yukkuri.setAutoDirection();
 
 			yukkuri.moveBy(yukkuri.vx, yukkuri.vy, frame, {
 				"onactiontick": this.onactiontick(this),
@@ -1669,7 +1670,7 @@ window.onload = function(){
 			var frame = distance + distance/5 + 1;
 			frame += plusFrameScale(frame, this.yukkuri.getMyScale());
 
-			yukkuri.direction = yukkuri.vx > 0 ? EDirection.RIGHT : EDirection.LEFT;
+			yukkuri.setAutoDirection();
 			yukkuri.reverse();
 			yukkuri.moveBy(yukkuri.vx, yukkuri.vy, frame, {
 				"onactionend": this.onactionend(this)
@@ -2019,7 +2020,7 @@ window.onload = function(){
 			this.vx = 0;
 			this.vy = 0;
 			this.image = game.assets[EResPath.YUKKURI_BASE];
-			this.direction = EDirection.RIGHT;
+			this.setDirection(EDirection.RIGHT);
 			this.addEventListener('enterframe', this.runEnterframe);
 			this.bodyStatus ={};
 			this.bodyStatus[EBody.NORMAL] = EResPath.YUKKURI_BASE;
@@ -2080,7 +2081,19 @@ window.onload = function(){
 				if(this instanceof Player){
 					this.formSprite.setFixBudgeRight(5);
 				}
+
 				this.formSprite.setFixKukiRight();
+				var len = this.kukis.length;
+				for(var i=0;i<len;i++){
+					var kuki = this.kukis[i];
+					var miYukkuris = kuki.getMiYukkuris();
+					if(!miYukkuris)continue;
+					var miyukkuriLength = miYukkuris.length;
+					for(var j=0;j<miyukkuriLength;j++){
+						// miYukkuris[j].scaleX = 1;
+						// miYukkuris[j].scale(-1, 1);
+					}
+				}
 				// this.formSprite.formScaleY(this.myScale);
 
 				// this.imgBody.scaleX = 1;
@@ -2092,6 +2105,18 @@ window.onload = function(){
 					this.formSprite.setFixKukiLeft();
 				}
 				this.formSprite.setFixKukiLeft();
+				var len = this.kukis.length;
+				for(var i=0;i<len;i++){
+					var kuki = this.kukis[i];
+					var miYukkuris = kuki.getMiYukkuris();
+					if(!miYukkuris)continue;
+					var miyukkuriLength = miYukkuris.length;
+					for(var j=0;j<miyukkuriLength;j++){
+						// miYukkuris[j].scaleX = -1;
+						// miYukkuris[j].scale(-1, 1);
+					}
+				}
+
 				// this.formSprite.formScaleY(this.myScale);
 				// this.imgBody.scaleX = -1;
 			}
@@ -2228,7 +2253,8 @@ window.onload = function(){
 					var yukkuriLength = yukkuris.length;
 					for(var j=0;j<yukkuriLength;j++){
 						var yukkuri = yukkuris[j];
-						yukkuri.setX(x);
+						//TODO ここに方向によってXの値の加算減算をつける
+						yukkuri.setX(x - 20);
 						yukkuri.setY(y);
 					}
 				}
@@ -2418,11 +2444,13 @@ window.onload = function(){
 		},
 		syncDirection:function(senderYukkuri){
 			if(this.getX() > senderYukkuri.getX()){
-				this.direction = EDirection.LEFT;
-				senderYukkuri.direction = EDirection.RIGHT;
+				// this.direction = EDirection.LEFT;
+				// senderYukkuri.direction = EDirection.RIGHT;
+				this.setDirection(EDirection.LEFT);
+				senderYukkuri.setDirection(EDirection.RIGHT);
 			}else{
-				this.direction = EDirection.RIGHT;
-				senderYukkuri.direction = EDirection.LEFT;
+				this.setDirection(EDirection.RIGHT);
+				senderYukkuri.setDirection(EDirection.LEFT);
 			}
 		},
 		isCommunication: function(yukkuri){
@@ -2553,6 +2581,23 @@ window.onload = function(){
 			kuki.addMiYukkuri(miYukkuri);
 
 		},
+		setAutoDirection:function(){
+			this.direction = this.vx > 0 ? EDirection.RIGHT : EDirection.LEFT;
+		},
+		setDirection: function(direction){
+			this.direction = direction;
+			if(this.kukis){
+				var kukiLength = this.kukis.length
+				for(var i=0;i<kukiLength;i++){
+					var kuki = this.kukis[i];
+					var miYukkuris = kuki.getMiYukkuris();
+					var miyukkuriLength = miYukkuris.length;
+					for(var j=0;j<miyukkuriLength;j++){
+						miYukkuris[j].direction = direction;
+					}
+				}
+			}
+		},
 		destruct: function(){
 
 		}
@@ -2570,6 +2615,8 @@ window.onload = function(){
 			this.addX = param.addX;
 			this.addY = param.addY;
 			this.scaleValue = 1;
+			this.scaleX = 1;
+			this.scaleY = 1;
 			backgroundMap.addChild(this);
 			this.anim = {};
 			this.anim.cnt = 0;
@@ -2593,7 +2640,11 @@ window.onload = function(){
 			this.imgGroup.y = this.oldY;
 			// this.oldY = this.imgGroup.y;
 			this.imgGroup.y -= y;
+		},
+		scaleX: function(x){
+			this.scaleX = x;
 		}
+
 	}); 
 	var MiMarisa = enchant.Class.create(MiYukkuri,{
 		initialize: function(parentYukkuri, addX, addY){
-- 
2.11.0