Merge pull request cocos#1255 from pandamicro/v1.3

Fix JSB android acceleration x, y reversed issue
tf9141 · Nov 1, 2016 · 77b7496 · 77b7496
2 parents ccb2dcf + 627425a
commit 77b7496
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cocos2d/core/event-manager/CCSystemEvent.js b/cocos2d/core/event-manager/CCSystemEvent.js
@@ -111,12 +111,12 @@ var SystemEvent = cc.Class({
                 callback: function (accelEvent, event) {
                     event.type = EventType.DEVICEMOTION;
                     // fix android acc values are opposite
-                    if (cc.sys.os === cc.sys.OS_ANDROID &&
+                    if (!CC_JSB && cc.sys.os === cc.sys.OS_ANDROID &&
                         cc.sys.browserType !== cc.sys.BROWSER_TYPE_MOBILE_QQ) {
                         event.acc = cc.p(-accelEvent.x, -accelEvent.y);
                     }
                     else {
-                        event.acc = accelEvent;
+                        event.acc = cc.p(accelEvent.x, accelEvent.y);
                     }
                     cc.systemEvent.dispatchEvent(event);
                 }