Sfoglia il codice sorgente

添加判断pg很竖版的处理
添加发送fbAddToCart事件

lalalashen 4 mesi fa
parent
commit
aa3c5d3bff

+ 1 - 1
luckypot_sp/assets/Lobby/scripts/Base/Define/BaseDefine.js

@@ -129,7 +129,7 @@ cc.Class({
         SPREAD_SHARE_URL: "http://share.haoyou998.com/invitation/spread/",
 
         CheckInfoURL : "",
-        NewVersion : "V1.0.4.1",
+        NewVersion : "V1.0.4.4",
 
         tagDataDescribe: {
             data: function () {

+ 10 - 4
luckypot_sp/assets/Lobby/scripts/HNScenceManager.js

@@ -226,16 +226,22 @@ class HNScenceManager {
             }
             let runScene = cc.director.getScene().getChildByName("GameScence");
             if (pgurl) {
-                this.setPGDirect(this.LANDSCAPE)//这里根据启动pg游戏的时候传入  转向参数
+                let direct = this.LANDSCAPE;
+                if(BaseDefine.GAME_PLATFORM === BaseDefine.WEB_H5_PLATFORM){
+                    if(typeof( isMobileDevice) != "undefined"){
+                        if(!isMobileDevice()){
+                            direct = this.PORTRAIT;//PG游戏PC横着放
+                        }
+                    }
+                }    
+                this.setPGDirect(direct)//这里根据启动pg游戏的时候传入  转向参数
                 let pgContentP
                 if (this.pgContentP) {
                     pgContentP = this.pgContentP
                 }else{
                     pgContentP = this.pgContentP = new cc.Node("pgContentP")
                     runScene.addChild(pgContentP);
-                }
-
-                let direct = this.pgDirect
+                }            
                 if (direct == this.PORTRAIT) {//PG游戏竖着放
                     pgContentP.setContentSize(750,1334);
                     let scale = runScene.getContentSize().height/1334;

+ 17 - 2
luckypot_sp/assets/Lobby/scripts/homesence/LocalPay/LocalPayMex.js

@@ -1,5 +1,6 @@
 var UIHelper = require("UIHelper");
 var ProtocolLoginServer = require("ProtocolLoginServer");
+var BaseDefine = require("BaseDefine");
 cc.Class({
     extends: cc.Component,
 
@@ -33,7 +34,8 @@ cc.Class({
         console.log('eventType: ', eventType);
         if(eventType == 1){
             UIHelper.hideWaitNode();
-        }
+            this.sendAddToCartEvent();
+        }  
     },
 
     payResultByServer(data){
@@ -43,6 +45,19 @@ cc.Class({
     onClose(){
         this.payWebView.url = '';
         this.node.active = false;
-    }
+    },
+
+    sendAddToCartEvent(){
+        if(BaseDefine.GAME_PLATFORM == BaseDefine.WEB_H5_PLATFORM){
+            if(typeof( sendFbAddToCart) != "undefined"){
+                let fbAddToCart = this.getLocalStorageVaule("fbAddToCart");
+                if(!fbAddToCart){
+                    sendFbAddToCart();
+                    this.setLocalStorageVaule("fbAddToCart","already sent");
+                }
+            }
+          }
+    },
+
 
 });

+ 10 - 10
luckypot_sp/assets/Sence/loginscence.fire

@@ -222,7 +222,7 @@
       "array": [
         0,
         0,
-        534.3376741349987,
+        523.0658122388669,
         0,
         0,
         0,
@@ -2345,7 +2345,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "96CCp/e2pAarEaijbhmP+F"
+    "_id": "cbeOKEKQBG05PB5Y7bSGLy"
   },
   {
     "__type__": "cc.Label",
@@ -2379,7 +2379,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "a4yQnt3ZVMLLNl7qeMGa+G"
+    "_id": "a2N5lnSuFJdozah1iBkeHe"
   },
   {
     "__type__": "cc.RichText",
@@ -2532,7 +2532,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "15gSzxTNVGtZx1L+ZrYCTs"
+    "_id": "dcHGe30XhHipfAVpFrIdJZ"
   },
   {
     "__type__": "cc.Label",
@@ -2566,7 +2566,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "d21q5sJPdAx6Ht/Zrzmfix"
+    "_id": "8byoAvTzxIBawW/N8OsrL7"
   },
   {
     "__type__": "cc.RichText",
@@ -2800,7 +2800,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "7egBoXN3FHlp9WRW1aZ5pu"
+    "_id": "c7i2PBo6tCwpCoJI09wBY1"
   },
   {
     "__type__": "cc.Label",
@@ -2834,7 +2834,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "ac8jEmHT1ARJkv1Nkki4Pj"
+    "_id": "c3srxJvcRKAb0Ykt50XsPx"
   },
   {
     "__type__": "cc.RichText",
@@ -2987,7 +2987,7 @@
     "_groupIndex": 0,
     "groupIndex": 0,
     "showInEditor": false,
-    "_id": "7bPsXylqNFaqKOu7jAp9kK"
+    "_id": "94QIOQcWBNY7nHxGmzfa/o"
   },
   {
     "__type__": "cc.Label",
@@ -3021,7 +3021,7 @@
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
     "_N$cacheMode": 0,
-    "_id": "a8lM/zotpFBJlM2gnM3ACs"
+    "_id": "c6Oqtd6F5MXo3Uo8ZfWF1e"
   },
   {
     "__type__": "cc.RichText",
@@ -19805,7 +19805,7 @@
       "height": 750
     },
     "_fitWidth": false,
-    "_fitHeight": true,
+    "_fitHeight": false,
     "_id": "4fBATwfLNB1589qzKpN5BJ"
   },
   {