Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework into master

assets/script/game/data/module/MoreGameData.ts

@@ -109,9 +109,10 @@ export class MoreGameData extends Data {
     /**
      * 下载
      * @param data 
+     * @param from 下载界面 1 插屏下载  2 信息流下载  3 互推banner下载  4 互推底部位下载
      * @returns 下载任务
      */
-    createNewTask(data): DownloadTaskClazz {
+    createNewTask(data, from = 0): DownloadTaskClazz {
         let name = data.nebulaAppId;
         let url = data.downloadUrl;
         let packageName = data.packageName;
@@ -119,6 +120,7 @@ export class MoreGameData extends Data {
         if (packageName != "") {
             let isExist = JsbSystem.ifCanStartGame(packageName, true)
             if (isExist) {
+                mk.data.sendXYEvent('hutuiEventLaunch_' + data.nebulaAppId, "互推启动" + data.title);
                 //判断在原生环境下存在就直接启动
                 return null
             }
@@ -153,6 +155,8 @@ export class MoreGameData extends Data {
         })
         downLoadTask.downloadTask = curTask
         MoreGameData.downLoadTaskMap[data.nebulaAppId] = downLoadTask
+        mk.data.sendXYEvent('hutuiEventDown_' + data.nebulaAppId, "互推下载" + data.title);
+        mk.data.sendXYEvent('hutuiEventFrom_' + from, "互推下载途径");
         return downLoadTask
     }
 

assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -110,7 +110,7 @@ export default class MoreGameNormalItem extends cc.Component {
         }, 3)
 
         if (this.data.appType == 1) {
-            let result = gData.moreGame.createNewTask(this.data)
+            let result = gData.moreGame.createNewTask(this.data, 4)
             if (result != null) {
                 this.schedule(() => {
                     this.showDownloadProgress()

assets/script/game/module/moreGame/MoreGamePicItem.ts

@@ -85,7 +85,7 @@ export default class MoreGamePicItem extends cc.Component {
         }, 3)
 
         if (this.data.appType == 1) {
-            let result = gData.moreGame.createNewTask(this.data)
+            let result = gData.moreGame.createNewTask(this.data, 3)
             if (result != null) {
                 this.schedule(() => {
                     this.showDownloadProgress()

assets/script/game/module/moreGame/MoreGamePopNode.ts

@@ -67,10 +67,10 @@ export default class MoreGamePopNode extends cc.Component {
         }
 
         this.cool = true
-        mk.data.sendDataEvent(DataEventId.hutuiFunction,"互推插屏下载");
+        mk.data.sendDataEvent(DataEventId.hutuiFunction, "互推插屏下载");
         if (this.data.appType == 1) {
             if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
-                gData.moreGame.createNewTask(this.data)
+                gData.moreGame.createNewTask(this.data, 1)
             }
         }
         else if (this.data.appType == 2) {