소스 검색

平台判断

kaka 5 년 전
부모
커밋
863aa5886d

+ 12 - 0
assets/script/game/module/hotUpdate.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "738afd6f-7553-45b4-98ca-f4480a5f41f1",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 19 - 12
assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -37,20 +37,22 @@ export default class MoreGameNormalItem extends cc.Component {
      * @param data item数据
      */
     public async setItemData(bData) {
-        this.data = bData.item_data;
-        if (cc.sys.os != cc.sys.OS_WINDOWS) {
-            cc.loader.load(this.data.icon, (err, res) => {
-                if (err) {
-                    console.log('err:', err);
-                    return;
-                }
-                if (cc.isValid(this.iconNode)) {
-                    let tex: cc.Texture2D = res as cc.Texture2D;
-                    this.iconNode.spriteFrame = new cc.SpriteFrame(tex);
-                }
-            })
+        if (!CC_JSB) {
+            return;
         }
 
+        this.data = bData.item_data;
+        cc.loader.load(this.data.icon, (err, res) => {
+            if (err) {
+                console.log('err:', err);
+                return;
+            }
+            if (cc.isValid(this.iconNode)) {
+                let tex: cc.Texture2D = res as cc.Texture2D;
+                this.iconNode.spriteFrame = new cc.SpriteFrame(tex);
+            }
+        })
+
         this.labName.string = this.data.title
         this.labDes.string = this.data.introduction
         this.spRed.active = false
@@ -88,6 +90,11 @@ export default class MoreGameNormalItem extends cc.Component {
     cool = false
     creatorDownLoadTask() {
         mk.audio.playEffect('button');
+        
+        if (!CC_JSB) {
+            return;
+        }
+
         if (this.cool) {
             return
         }

+ 41 - 26
assets/script/game/module/moreGame/MoreGamePicItem.ts

@@ -30,41 +30,51 @@ export default class MoreGamePicItem extends cc.Component {
     init(data) {
         this.data = data
 
-        //pc不加载,加载会报错
-        if (cc.sys.os != cc.sys.OS_WINDOWS) {
-            cc.loader.load(data.banner2, (err, res) => {
-                if (err) {
-                    console.log('err:', err);
-                    return;
-                }
-                if (this.banner) {
-                    let tex: cc.Texture2D = res as cc.Texture2D;
-                    this.banner.spriteFrame = new cc.SpriteFrame(tex);
-                }
-            })
+        if (!CC_JSB) {
+            return;
         }
 
+        cc.loader.load(data.banner2, (err, res) => {
+            if (err) {
+                console.log('err:', err);
+                return;
+            }
+            if (this.banner) {
+                let tex: cc.Texture2D = res as cc.Texture2D;
+                this.banner.spriteFrame = new cc.SpriteFrame(tex);
+            }
+        })
+
         this.spPro.node.active = false
         this.btnStart.active = false
         this.labPro.string = ''
         //打开
-        if (JsbSystem.ifCanStartGame(data.packageName, false)) {
-            this.spRed.active = false
-            this.btnStart.active = true
-        } else {
-            if (JsbSystem.isFileExist(data.nebulaAppId + ".apk")) {
-                //安装
+        if (data.appType == 1) {
+            if (JsbSystem.ifCanStartGame(data.packageName, false)) {
                 this.spRed.active = false
                 this.btnStart.active = true
             } else {
-                //下载
-                this.spRed.active = true
+                if (JsbSystem.isFileExist(data.nebulaAppId + ".apk")) {
+                    //安装
+                    this.spRed.active = false
+                    this.btnStart.active = true
+                } else {
+                    //下载
+                    this.spRed.active = true
+                }
             }
         }
+        else if (data.appType == 2) {
+            this.spRed.active = false
+            this.btnStart.active = true
+        }
     }
 
     creatorDownLoadTask() {
-        // UiM.Instance.moreGameNode.getComponent(MoreGameNode).hasClick = true
+        if (!CC_JSB) {
+            return;
+        }
+
         if (this.cool) {
             return
         }
@@ -74,11 +84,16 @@ export default class MoreGamePicItem extends cc.Component {
             this.cool = false
         }, 3)
 
-        let result = gData.moreGame.createNewTask(this.data)
-        if (result != null) {
-            this.schedule(() => {
-                this.showDownloadProgress()
-            }, 0.5)
+        if (this.data.appType == 1) {
+            let result = gData.moreGame.createNewTask(this.data)
+            if (result != null) {
+                this.schedule(() => {
+                    this.showDownloadProgress()
+                }, 0.5)
+            }
+        }
+        else if (this.data.appType == 2) {
+            cc.sys.openURL(this.data.recommendLink);
         }
     }
 

+ 23 - 14
assets/script/game/module/moreGame/MoreGamePopNode.ts

@@ -4,7 +4,6 @@
  */
 
 import JsbSystem from "../../../mk/system/JsbSystem";
-import { RewardType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -35,19 +34,20 @@ export default class MoreGamePopNode extends cc.Component {
     }
 
     init() {
+        if (!CC_JSB) {
+            return;
+        }
+
         this.data = gData.moreGame.getRandomNormal();
         if (this.data) {
-            //pc不加载,加载会报错
-            if (cc.sys.os != cc.sys.OS_WINDOWS) {
-                cc.loader.load(this.data.icon, (err, res) => {
-                    if (err) {
-                        console.log('err:', err);
-                        return;
-                    }
-                    let tex: cc.Texture2D = res as cc.Texture2D;
-                    this.icon.spriteFrame = new cc.SpriteFrame(tex);
-                })
-            }
+            cc.loader.load(this.data.icon, (err, res) => {
+                if (err) {
+                    console.log('err:', err);
+                    return;
+                }
+                let tex: cc.Texture2D = res as cc.Texture2D;
+                this.icon.spriteFrame = new cc.SpriteFrame(tex);
+            })
 
             this.labName.string = this.data.title
         }
@@ -57,14 +57,23 @@ export default class MoreGamePopNode extends cc.Component {
     creatorDownLoadTask() {
         mk.audio.playEffect('button');
 
+        if (!CC_JSB) {
+            return;
+        }
+
         if (this.cool) {
             return
         }
 
         this.cool = true
 
-        if (cc.sys.isNative && !JsbSystem.ifCanStartGame(this.data.packageName, true)) {
-            gData.moreGame.createNewTask(this.data)
+        if (this.data.appType == 1) {
+            if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
+                gData.moreGame.createNewTask(this.data)
+            }
+        }
+        else if (this.data.appType == 2) {
+            cc.sys.openURL(this.data.recommendLink);
         }
 
         gData.moreGame.popNodeGetRedBag();