issue #3419 fix bug for TriggerTest.

cocos2d · Jan 7, 2014 · 34f7318 · 34f7318
1 parent 4f416e2
commit 34f7318
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/CocoStudioTest/SceneTest/SceneEditorTest.js b/tests/CocoStudioTest/SceneTest/SceneEditorTest.js
@@ -389,7 +389,7 @@ var TriggerTest = SceneEditorTestLayer.extend({
         this.addChild(node);
         ccs.ActionManager.getInstance().playActionByName("startMenu_1.json", "Animation1");
 
-        this.schedule(this.gameLogic, this);
+        this.schedule(this.gameLogic);
         this.setTouchEnabled(true);
         ccs.sendEvent(TRIGGEREVENT_ENTERSCENE);
 
@@ -419,7 +419,7 @@ var TriggerTest = SceneEditorTestLayer.extend({
     },
 
     gameLogic: function () {
-        this.sendEvent(TRIGGEREVENT_UPDATESCENE);
+        ccs.sendEvent(TRIGGEREVENT_UPDATESCENE);
     },
     title: function () {
         return "Trigger Test";

diff --git a/tests/CocoStudioTest/SceneTest/TriggerCode/Acts.js b/tests/CocoStudioTest/SceneTest/TriggerCode/Acts.js
@@ -519,7 +519,7 @@ var TriggerState = ccs.BaseTriggerAction.extend({
 
     done: function () {
         var obj = ccs.TriggerMng.getInstance().getTriggerObj(this._id);
-        if (!obj) {
+        if (obj) {
             if (this._state == 0) {
                 obj.setEnable(false);
             }