Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCore...

diff --git a/www/auth.php b/www/auth.php
index 989a2b2..edcb499 100644 (file)
--- a/www/auth.php
+++ b/www/auth.php
@@ -75,7 +75,8 @@ if(isset($_GET['action']) && isset($_GET['name'])){
                                //すでにユーザー名がリストにある=続きからプレイ
                                $stmt->bind_result($id);
                                $stmt->fetch();
-                               responseExistUser($db, $id, getUserStage($db, $id));
+                               $stgName = getUserStage($db, $id);
+                               responseExistUser($db, $id, $stgName);
                        }
                } else{
                        //クエリ失敗

diff --git a/www/corelib/classes/FreeItemClass.js b/www/corelib/classes/FreeItemClass.js
index eed7ae9..1bba545 100644 (file)
--- a/www/corelib/classes/FreeItemClass.js
+++ b/www/corelib/classes/FreeItemClass.js
@@ -18,8 +18,6 @@ var FreeItemClass = function(stage, args){
        this.touchInterval = 0;
        this.lastTouchedTickCount = -9999;
        
-       this.
-       
 }.extend(ItemClass, {
        draw: function(x, y){
                this.ownerStage.mainContext.globalAlpha = this.opacity;

diff --git a/www/corelib/classes/GameStageClass.js b/www/corelib/classes/GameStageClass.js
index 007844e..5449ce5 100644 (file)
--- a/www/corelib/classes/GameStageClass.js
+++ b/www/corelib/classes/GameStageClass.js
@@ -58,7 +58,7 @@ GameStage.prototype = {
                        //\8e\9f\82É\8ae\8eíStageObject\82Ìtick\82ð\8eÀ\8ds
                        if(tickAllObjects)
                        {
-                               for(i = 0; i < this.stageObjectList[sp].length; i++){
+                               for(var i = 0; i < this.stageObjectList[sp].length; i++){
                                        
                                        this.stageObjectList[sp][i].tick();
                                        

diff --git a/www/stage/pcdsltest.js b/www/stage/pcdsltest.js
index d586ea6..4d720d4 100644 (file)
--- a/www/stage/pcdsltest.js
+++ b/www/stage/pcdsltest.js
@@ -66,16 +66,19 @@ with(stgObjects) {
 }
 
 //\96ñ\91©\8e\96
-var stage = new PCDSLStageClass(stgInfo, tbl, null);
+var stage = new PCDSLStageClass(stgInfo, tbl);
 
-
-var main = new MainCharacterClass(stage, [["kuma1.png","kuma2.png","kuma3.png", "kuma4.png", "kuma3.png", "kuma2.png"], ["kumaready.png"]]);
-main.size.x = 64;
-main.size.y=64;
-main.origin.x = 50;
-main.origin.y =0;
-stage.operatingCharacter = main;
-stage.addStageObject(main);
+stage.runStage = function(){
+       PCDSLStageClass.prototype.runStage.apply(this, []);
+       var main = new MainCharacterClass(stage, [["kuma1.png","kuma2.png","kuma3.png", "kuma4.png", "kuma3.png", "kuma2.png"], ["kumaready.png"]]);
+       main.size.x = 64;
+       main.size.y=64;
+       main.origin.x = 50;
+       main.origin.y =0;
+       main.ownerUID = stage.manager.userID;
+       stage.userControlledCharacter = main;
+       stage.addStageObject(main, true);
+},
 
 
 stage;