Mercurial > hg > Members > e085711
diff webGL/dandy/resources/collision.js @ 11:680b5b0cd1e4
upload
| author | NOBUYASU Oshiro |
|---|---|
| date | Mon, 12 Jul 2010 08:01:12 +0900 |
| parents | 4343c1feedb5 |
| children | 61febc94fa62 |
line wrap: on
line diff
--- a/webGL/dandy/resources/collision.js Sat Jul 10 16:38:23 2010 +0900 +++ b/webGL/dandy/resources/collision.js Mon Jul 12 08:01:12 2010 +0900 @@ -21,12 +21,16 @@ //自機やられ if ((ex < jiki.x + jiki.w /2 ) && (ex + w > jiki.x + jiki.w /2) - && ( ey < jiki.y + jiki.h / 2) && (ey + h > jiki.y + jiki.h / 2)) + && ( ey < jiki.y + jiki.h / 2) && (ey + h > jiki.y + jiki.h / 2) + && (jiki.muteki <= 0)) { - + Bom(jiki.x,jiki.y); + jiki.bf = false; + jiki.zanki--; jiki.muteki = 120; + // jiki.muteki = 0; /* infg.stg = 0; @@ -49,7 +53,7 @@ // infg.stg += 4; if (p.vit <= 0) { // infg.stg += 4; - // Bom(p.x, p.y); + Bom(p.x, p.y); // enemycount += (p.score * ((infg.stg / 128) + infg_level + 1)); p.state = delete_chara; p.collision= noaction; @@ -66,7 +70,7 @@ // infg.stg++; if (p.vit <= 0) { // infg.stg += 4; - // Bom(p.x, p.y); + Bom(p.x, p.y); // enemycount += (p.score * ((infg.stg / 128) + infg_lvel + 1)); p.state = delete_chara; p.collision = noaction;