greg 4 vuotta sitten
vanhempi
commit
44c908e486

BIN
assets/res/ui/WXSExport.bin


+ 9 - 8
assets/script/game/modules/exports/ExportList.ts

@@ -26,8 +26,8 @@ export default class ExportList
      */
     constructor(list:fgui.GList,scrollDirection:number=0,itemRenderFunction:Function=null,itemClick:Function=null){
         this.list=list;
-        this.list.itemRenderer=this.ItemRender;
-        this.itemClick=itemClick;
+        this.list.itemRenderer=this.ItemRender.bind(this);
+        this.itemClick=itemClick
         this.itemRenderFunction=itemRenderFunction;
         this.scrollDirection=scrollDirection;
         this.list.on(fgui.Event.CLICK_ITEM,this.ItemClickHandler,this);
@@ -59,12 +59,13 @@ export default class ExportList
                 icon=ui.m_groupIcon;
             }
             obj.data=data;
-            cc.loader.load(data.icon,(...arg)=>{},(err:Error,texture:cc.Texture2D)=>{
-                if(icon.texture==null){
-                    icon.texture=new cc.SpriteFrame();
-                }
-                icon.texture.setTexture(texture);
-            })
+            icon.url=data.icon;
+            // cc.assetManager.loadRemote(data.icon,(err:Error,texture:cc.Texture2D)=>{
+            //     if(icon.texture==null){
+            //         icon.texture=new cc.SpriteFrame();
+            //     }
+            //     icon.texture.setTexture(texture);
+            // });
         }
     }
 

+ 19 - 14
assets/script/platforms/libs/liangliangSDK.ts

@@ -8,11 +8,13 @@ export  class LiangLiangSDK
 {
     static userID; 
     static token;
-    static _ok = false;
-    static _initOK = false;
-    static _loginOK = false;
-    static _listOK = false;
-    static _config ;
+    static _ok:boolean = false;
+    static _initOK:boolean = false;
+    static _loginOK:boolean = false;
+    static _listOK:boolean = false;
+    static _config;
+
+    static _isScene:boolean = false;
 
     private  static _checkOK()
     {
@@ -71,10 +73,13 @@ export  class LiangLiangSDK
                         if(option==null){
                             throw new Error("调用 wx.getLaunchOptionsSync 获取数据为空!");
                         }
-						let channelId = 0;
+                        let channelId = 0;
+                        if(option.scene && (option.scene == '1037' || option.scene == '1038')){
+                            LiangLiangSDK._isScene = true;
+                        }
 						if (option.query && JSON.stringify(option.query) != "{}") {
 							if (option.query.channel_id) {
-								channelId = Number(option.query.channel_id);
+                                channelId = Number(option.query.channel_id);
 							}
 						}
                         LiangLiangSDK.HttpRequest("https://www.wiseplanet.com.cn/user/login",{"gameId": gameID,"code":res.code,"channelId" : channelId},"POST",(result)=>
@@ -128,10 +133,8 @@ export  class LiangLiangSDK
     private static _LoadIconDataList(successcallback,failcallback):void{
         if(wx!=null)
         {
-            var url = "https://www.maoxingame.com/"+gameName+"/wx_server/xl_sdk_resources/xl_channel_app_config.json";
-            cc.loader.load(url, function (err, data) 
-            {
-    
+            var url = "https://www.maoxingame.com/"+gameName+"/xl_channel_app_config.json";
+            cc.assetManager.loadRemote(url,(err,data:cc.JsonAsset)=>{
                 if(err)
                 {
                     console.error(err)
@@ -141,11 +144,11 @@ export  class LiangLiangSDK
                 {
                     LiangLiangSDK._listOK = true;
                     LiangLiangSDK._checkOK();
-                    LiangLiangSDK._data = data;
+                    LiangLiangSDK._data = data.json;
                     successcallback();
                 }
                 console.log(data);
-            });    
+            })
         }
         else
         {
@@ -293,7 +296,6 @@ export  class LiangLiangSDK
             console.log("允许跳转")
             return true
         }
-        return false;
     }
 
     static CanWuChu():boolean
@@ -302,6 +304,9 @@ export  class LiangLiangSDK
         {
             return false;
         }
+        if(LiangLiangSDK._isScene){
+            return true;
+        }
         if(currentSDK != LiangLiangSDK._config.version)
         {
             return false;

+ 10 - 6
assets/script/platforms/weChat/WeChatPlatform.ts

@@ -37,10 +37,10 @@ export class WeChatPlatform extends BasePlatform {
     }
 
     login(success: Function, failure: Function): void {
-        this.__bannerLoop = new BannerLoop();
-        this.__bannerLoop.init(2, this.__bannerIDs, this.__bannerCreate.bind(this), this.__bannerDestory.bind(this));
-        //激励广告
-        this.__initRewardedVideoAd();
+        // this.__bannerLoop = new BannerLoop();
+        // this.__bannerLoop.init(2, this.__bannerIDs, this.__bannerCreate.bind(this), this.__bannerDestory.bind(this));
+        // //激励广告
+        // this.__initRewardedVideoAd();
         super.login(success,failure);
     }
 
@@ -144,11 +144,15 @@ export class WeChatPlatform extends BasePlatform {
     }
     showBanner(data: any): void {
         console.log("显示Banner");
-        this.__bannerLoop.showBanner();
+        if(this.__bannerLoop){
+            this.__bannerLoop.showBanner();
+        }
     }
     hideBanner(): void {
         console.log("隐藏Banner");
-        this.__bannerLoop.hideBanner();
+        if(this.__bannerLoop){
+            this.__bannerLoop.hideBanner();
+        }
     }
     showRewardedVideo(success?: Function, failure?: Function): void {
         console.log("显示激励广告");

+ 1 - 1
assets/script/ui/WXSExport/UI_Export002.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "bd3a3db3-3526-4684-a1c4-da64a27c7ffd",
+  "uuid": "b0b8d5c8-26f3-4565-8392-ba6b89b92a60",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

+ 4 - 0
settings/project.json

@@ -13,6 +13,10 @@
     ]
   ],
   "excluded-modules": [
+    "Spine Skeleton",
+    "TiledMap",
+    "VideoPlayer",
+    "3D Physics/cannon.js",
     "3D Physics/Builtin"
   ],
   "start-scene": "81c823be-4006-4bb5-969d-4f19390ec157",