From: hikarupsp <hikarupsp@users.sourceforge.jp>
Date: Fri, 6 Sep 2013 20:35:34 +0000 (+0900)
Subject: 死んだ時の回復処理のバグ修正
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0fd3101af0dab9f3eb5fc9a910630d9f574d86fa;p=h58pcdgame%2FGameScriptCoreLibrary.git

死んだ時の回復処理のバグ修正
---

diff --git a/www/auth.php b/www/auth.php
index 4230f37..818270f 100644
--- a/www/auth.php
+++ b/www/auth.php
@@ -1,4 +1,7 @@
 <?php
+//FOR DEBUG
+mysqli_report(MYSQLI_REPORT_ERROR);
+
 require("header.php");
 //将来的にURLのname属性は、sqlに渡すため、エスケープして安全を確保しなければいけない。
 //->すでにやった
@@ -117,7 +120,6 @@ if(isset($_GET['action'])){
 								//ユーザー名がリストにある=予想通り
 								$stmt->bind_result($id);
 								$stmt->fetch();
-								//responseNewUser($db, $id);
 								responseExistUser($db, $id, getUserStage($db, $id));
 							}
 						} else{
diff --git a/www/corelib/classes/ThrownItemClass.js b/www/corelib/classes/ThrownItemClass.js
index 3ea519f..d06418f 100644
--- a/www/corelib/classes/ThrownItemClass.js
+++ b/www/corelib/classes/ThrownItemClass.js
@@ -13,7 +13,7 @@ var ThrownItemClass = function(stage, args)
 	
 	//FreeItemClass‚̐ݒè
 	this.times = 1;
-	this.isPhantom = true;
+	this.isPhantom = false;
 	
 	// MovableStageObject‚Ì‚½‚ß‚ÌŽÀ‘•
 	MovableStageObjectClass.apply(this, [stage, []]);
@@ -22,8 +22,6 @@ var ThrownItemClass = function(stage, args)
 	itemCatched : function(obj){
 		var item = new SelectWidgetItemClass(false, this.image);
 		
-		// ...
-		
 	},
 	tick : function(){
 		MovableStageObjectClass.prototype.tick.apply(this);
diff --git a/www/corelib/core.js b/www/corelib/core.js
index 4bb252a..2cfcb33 100644
--- a/www/corelib/core.js
+++ b/www/corelib/core.js
@@ -174,9 +174,8 @@ GameManager.prototype = {
 				this.runningStage.userControlledCharacter.HP = this.runningStage.userControlledCharacter.max_HP;
 				this.addWidget(new MessageWidgetClass(this, ["死んでしまった……\n", null, function(w){
 					w.manager.UIManager.clearInput();
-					w.manager.runningStage.userControlledCharacter.HP = w.manager.runningStage.userControlledCharacter.max_HP;
 					if(w.manager.runningStageName){
-						w.manager.loadStageFromNetwork(this.returningStage);
+						w.manager.loadStageFromNetwork(w.manager.returningStage);
 					} else{
 						//ローカルモード時は動作を停止させるだけ
 						w.manager.stopStage();