1

design/turntable.tmproject

-{
-    "version": 5,
-    "files": [
-        "./turntable/turntable_rulebtn.png",
-        "./turntable/turnable_icon2.png",
-        "./turntable/turnable_icon3.png",
-        "./turntable/turnable_icon1.png",
-        "./turntable/turntable_bg.png",
-        "./turntable/turntable_startbtn.png",
-        "./turntable/turntable_panel.png"
-    ],
-    "projectName": "turntable",
-    "options": {
-        "layoutMath": "3",
-        "sizeMode": "free",
-        "useExtension": 0,
-        "layoutGap": 1,
-        "extend": 0
-    }
-}
\ No newline at end of file

egret/libs/tw/manager/NetManager.ts

@@ -462,8 +462,9 @@ export class NetManager extends ABNetManager {
      * @param score 关卡
      * @param gameData json带分数和通关元素
      * @param submitToken token，来自getNgameStartStatus,,DataManager.ins.getData("getNgameStartStatus").data.submitToken
+     * @param relatedTaskType 苏宁-消消乐v3.1，关联任务类型：1：鲸喜任务；2：农场任务
      */
-    hc_submit(callback: Function, orderId: number, score: number, gameData: string, submitToken: string): void {
+    hc_submit(callback: Function, orderId: number, score: number, gameData: string, submitToken: string, relatedTaskType): void {
         const sign = this.createSgin(orderId, score, gameData, submitToken);
         var data = {
             activityId: DataManager.ins.customCfgData.actId,
@@ -473,7 +474,10 @@ export class NetManager extends ABNetManager {
             dynamicData: JSON.stringify([]),
             detect: window['detect'],
             deviceSessionId: window['_device_session_id'],
-            score: score,
+            score: score
+        };
+        if(relatedTaskType) {
+            data['relatedTaskType'] = relatedTaskType;
         }
         var sgin = this.encrypt(JSON.stringify(data));
         const net: INetData = {

egret/src/mainScene/MainScene.ts

@@ -67,6 +67,7 @@ import { FestivalTarget } from '../something/uis/FestivalTarget';
 import getRedBombAward, { getRedBombTimes } from '../getRedBombAward';
 import { FesRedBombShowAni } from '../something/anisCall/FesRedBombShowAni';
 import { RectsWaveAni } from '../something/anisCall/RectsWaveAni';
+import Utils from "../Utils";
 
 const aniClass = {
     "BoomAni": BoomAni,
@@ -2209,7 +2210,7 @@ export default class MainScene extends Scene {
     }
     /**
      * 特效元素消除时，波及，添加新的消除元素
-     * @param effectIndexs 
+     * @param effectIndexs
      */
     effectEliminate(effectIndexs: number[]) {
         if (effectIndexs.length && !this.hasPassed) this.effectContinuityTimes++;
@@ -2417,8 +2418,8 @@ export default class MainScene extends Scene {
     }
     /**
      * 创建分数得动画
-     * @param score 
-     * @param p 
+     * @param score
+     * @param p
      */
     pushScoreAni(score: number, p: number[]) {
         let scoreAni = Pool.takeOut(RecoverName.SCORE_ANI);
@@ -2524,7 +2525,7 @@ export default class MainScene extends Scene {
      * 从容器移除
      * 回收元素
      * 如果格子有冰等等
-     * @param index 
+     * @param index
      */
     recoverEle(index: number) {
         let ele = this.removeOperation(index);
@@ -2554,8 +2555,8 @@ export default class MainScene extends Scene {
 
     /**
      * 包括捞结果
-     * @param json 
-     * @param callback 
+     * @param json
+     * @param callback
      */
     submit(json: string) {
         try {
@@ -2563,6 +2564,7 @@ export default class MainScene extends Scene {
         } catch (error) {
             console.warn(error)
         }
+        let taskType = Utils.getRequestByKey('taskType');
         NetManager.ins.hc_submit((s, data) => {
             if (s) {
                 wait(200).then(() => {
@@ -2605,7 +2607,8 @@ export default class MainScene extends Scene {
             DataManager.ins.getData("hc_doJoin").data,
             this.chapter,
             json,
-            DataManager.ins.getData("getNgameStartStatus").data.submitToken)
+            DataManager.ins.getData("getNgameStartStatus").data.submitToken, taskType
+        )
     }
 
     /**
@@ -2620,8 +2623,8 @@ export default class MainScene extends Scene {
 
     /**
      * 为了能加入红包炸弹的弹框
-     * @param panel 
-     * @param data 
+     * @param panel
+     * @param data
      */
     returnPanels(panelName, data) {
         var panels = [], params = [];
@@ -2638,7 +2641,7 @@ export default class MainScene extends Scene {
 
     /**
      * 播放动画
-     * @param name 
+     * @param name
      */
     playAni(name: RecoverName, p: number[]) {
         let ani = Pool.takeOut(name);
@@ -2659,7 +2662,7 @@ export default class MainScene extends Scene {
 
     /**
      * 格子上的冰块破碎
-     * @param lat 
+     * @param lat
      */
     iceBroken(lat: Lattice) {
         if (lat && lat.ice) {
@@ -2753,7 +2756,7 @@ export default class MainScene extends Scene {
     }
     /**
      * 石头的移除，包括动效
-     * @param index 
+     * @param index
      */
     removeRock(index: number) {
         this.removeOperation(index);
@@ -2762,7 +2765,7 @@ export default class MainScene extends Scene {
     }
     /**
      * 果冻的移除，包括动效
-     * @param index 
+     * @param index
      */
     removeJelly(index: number) {
         this.jellyBrokenMark = true;
@@ -2815,7 +2818,7 @@ export default class MainScene extends Scene {
      * 从场景移除
      * 回收元素
      * 格子元素置空
-     * @param index 
+     * @param index
      */
     removeOperation(index: number): Element {
         //没有格子，或者没有元素，
@@ -2836,7 +2839,7 @@ export default class MainScene extends Scene {
     /**
      * 禁用与开启事件
      * 暂时只禁止道具及元素的
-     * @param b 
+     * @param b
      */
     enableMouseEvt(b: boolean) {
         // this.touchEnabled = b;