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

diff --git a/www/corelib/classes/FireObjectClass.js b/www/corelib/classes/FireObjectClass.js
index 7223eb2..994700a 100644 (file)
--- a/www/corelib/classes/FireObjectClass.js
+++ b/www/corelib/classes/FireObjectClass.js
@@ -54,7 +54,7 @@ var FireObjectClass = function(stage, args){
        },
        objectAttacked : function(obj, obj_x, obj_y, direction)
        {
-               if(obj instanceof MainCharacterClass)
+               if(obj === this.ownerStage.userControlledCharacter)
                {
                        //メインキャラクターに衝突された
                        //ダメージの開始・終了処理

diff --git a/www/corelib/classes/PCDSLStageClass.js b/www/corelib/classes/PCDSLStageClass.js
index 1936aeb..a2f92c8 100644 (file)
--- a/www/corelib/classes/PCDSLStageClass.js
+++ b/www/corelib/classes/PCDSLStageClass.js
@@ -86,6 +86,7 @@ var PCDSLStageClass = function(stgInfo, tbl)
                HorizonalScrollStageClass.prototype.runStage.apply(this, []);
                this.manager.setBackgroundMusic(this.BGM);
                this.manager.addWidget(new UserStateWidgetClass(this.manager));
+               this.manager.addWidget(new PickedItemWidgetClass(this.manager));
        }
 });
 

diff --git a/www/corelib/core.js b/www/corelib/core.js
index af3d6bf..61c9fad 100644 (file)
--- a/www/corelib/core.js
+++ b/www/corelib/core.js
@@ -207,9 +207,6 @@ GameManager.prototype = {
                //runningStageに登録することで、イベントの通知が開始され、GameStageは実行状態に入る。
                this.runningStage = stage;
                
-               this.addWidget(new UserStateWidgetClass(this));
-               this.addWidget(new PickedItemWidgetClass(this));
-               
                if(this.stageStartedEvent)
                {
                        this.stageStartedEvent.apply(window, [stage]);

diff --git a/www/stage/select.js b/www/stage/select.js
index d271c10..b8f8f76 100644 (file)
--- a/www/stage/select.js
+++ b/www/stage/select.js
@@ -43,7 +43,7 @@ s = stage.getSelectWidgetItemFromStageName("街","city", true);
 stage.stageNameList.push(s);
 s = stage.getSelectWidgetItemFromStageName("洞窟","fukushima");
 stage.stageNameList.push(s);
-s = stage.getSelectWidgetItemFromStageName("森","koenma");
+s = stage.getSelectWidgetItemFromStageName("山","koenma");
 stage.stageNameList.push(s);
 s = stage.getSelectWidgetItemFromStageName("牧場","okubo");
 stage.stageNameList.push(s);