Mercurial > hg > Members > e085711

changeset 22:222c5c84325a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update enemy.js
author NOBUYASU Oshiro
date Mon, 18 Oct 2010 17:07:04 +0900
parents 6dd37a368a1f
children 1f234cbb53f1
files webGL/dandy/resources/enemy.js webGL/dandy/resources/enemy.js~
diffstat 2 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/webGL/dandy/resources/enemy.js	Wed Oct 06 23:47:02 2010 +0900
+++ b/webGL/dandy/resources/enemy.js	Mon Oct 18 17:07:04 2010 +0900
@@ -17,8 +17,8 @@
     p.charano = charano;
     p.tama = tf;
     p.vit = enemystate[charano].p;
-//    p.vit = 240;
-    p.score = enemystate[charano].sc;
+    p.vit = 240;
+    //    p.score = enemystate[charano].sc;
     //    p.s = 0;
     p.flag = true;
     p.state = chara_state;
@@ -32,17 +32,17 @@
 
 function loadEnemyImage(charano, p)
 {
-/*
+
     p.image = enemy[charano];
     p.texture = enemy[charano].texture;
     p.w = enemy[charano].w;
     p.h = enemy[charano].h;
-*/
+    /*
     p.image = enemystate[charano];
     p.texture = enemy[charanostate].texture;
     p.w = enemy[charanostate].w;
     p.h = enemy[charanostate].h;
-
+    */
 }
 
 
--- a/webGL/dandy/resources/enemy.js~	Wed Oct 06 23:47:02 2010 +0900
+++ b/webGL/dandy/resources/enemy.js~	Mon Oct 18 17:07:04 2010 +0900
@@ -10,15 +10,15 @@
     var p = new Character();
 
     p.collision = atari;
-    p.x = x * d_x; //旧 dandy 座標を合わせるため
+    p.x = x * d_x; //旧 dandy に座標を合わせるため
     p.y = y * d_y; //上に同じく
     p.vx = vx * d_x;
     p.vy = vy * d_y;
     p.charano = charano;
     p.tama = tf;
-    //    p.vit = enemystate[charano].p;
-    p.vit = 240;
-    //    p.score = enemystate[charano].sc;
+    p.vit = enemystate[charano].p;
+//    p.vit = 240;
+    p.score = enemystate[charano].sc;
     //    p.s = 0;
     p.flag = true;
     p.state = chara_state;
@@ -32,10 +32,17 @@
 
 function loadEnemyImage(charano, p)
 {
+/*
     p.image = enemy[charano];
     p.texture = enemy[charano].texture;
     p.w = enemy[charano].w;
     p.h = enemy[charano].h;
+*/
+    p.image = enemystate[charano];
+    p.texture = enemy[charanostate].texture;
+    p.w = enemy[charanostate].w;
+    p.h = enemy[charanostate].h;
+
 }