Merge branch '4.3.4'

refs #13
niku · Feb 16, 2015 · 118bb47 · 118bb47
2 parents c9aa0bf + f00846e
commit 118bb47
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main-scene.js b/src/main-scene.js
@@ -54,7 +54,9 @@ var MainSceneLayer = cc.Layer.extend({
                 // 現在座標 + 移動量を新たな座標にする
                 var newPosition = cc.pAdd(position, delta);
 
-                this.player_.setPosition(newPosition);
+                var winSize = cc.director.getWinSize();
+
+                this.player_.setPosition(cc.pClamp(newPosition, cc.p(0, position.y), cc.p(winSize.width, position.y)));
             }.bind(this)
         }, this);
     }