|
@@ -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;
|