Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/src/SAMap.ts

+import { getlogItem } from "./Main"
+
 export default {
     '1': ['bingoMapIndex', 'bingoBox'],
     '2': ['bingoMapIndex', 'bingoLife'],
@@ -10,8 +12,8 @@ export default {
     '77': ['bingoMapIndex', 'bingoRedBattle'],
     '57': ['bingoMapIndex', 'bingoRedPacket'],
     '74': ['bingoMapIndex', 'bingoRedBoom'],
-    '888001': ['bingoMapIndex', 'bingoLottery'],
-    '888006': ['bingoMapIndex', 'bingoGetRed'],
+    '43': ['bingoMapIndex', 'bingoLottery'],
+    '49': ['bingoMapIndex', 'bingoGetRed'],
 
     '3': ['bingoDialog', 'bingoLifeBuy'],
     '4': ['bingoDialog', 'bingoLifeAsk'],
@@ -52,13 +54,19 @@ export default {
     '54': ['bingoDialog', 'bingoGetRedAd'],
     '55': ['bingoDialog', 'bingoBackReward'],
     '56': ['bingoDialog', 'bingoBackAd'],
+    '58': ['bingoDialog', 'bingoRedpackStart'],
     '59': ['bingoDialog', 'bingoRedpackCont'],
     '68': ['bingoDialog', 'bingoShopInvest'],
     '70': ['bingoDialog', 'bingoShopInvest10'],
     '71': ['bingoDialog', 'bingoShopInvest500'],
     '72': ['bingoDialog', 'bingoShopInvest1000'],
     '73': ['bingoDialog', 'bingoShopCoinCfm'],
-    '7': ['bingoDialog', 'bingoBoom'],
-    '10': ['bingoDialog', 'bingoHammer'],
-    '13': ['bingoDialog', 'bingoStep'],
-}
+    '16': ['bingoDialog', 'bingoSucShare'],
+
+
+    '7': ['bingoGameIndex', 'bingoBoom'],
\ No newline at end of file
+    '10': ['bingoGameIndex', 'bingoHammer'],
+    '13': ['bingoGameIndex', 'bingoStep'],
+}
+
+// getlogItem(40)
\ No newline at end of file

egret/src/mapScene/icon/ScratchIcon.ts

@@ -71,8 +71,8 @@ export default class ScratchIcon extends IconBase {
      */
     protected onTouchBtn(e: egret.TouchEvent) {
         super.onTouchBtn(e);
-        NetManager.ins.clickLog(getlogItem(888006));
-        NetManager.ins.showLog(getlogItem(49));
+        
+        NetManager.ins.clickLog(getlogItem(49));
         NetManager.ins.scratchGetTaskInfo((success, res) => {
             if(!success) {
                 return;

egret/src/mapScene/icon/TurntableIcon.ts

@@ -59,7 +59,7 @@ export default class TurntableIcon extends IconBase {
         loadSvga(getResPath() + 'resource/assets/svgas/turntable.svga').then(async (mv: any) => {
             // await wait(100);
             PanelCtrl.instance.show('turnTable', {mv:mv});
-            NetManager.ins.clickLog(getlogItem(888001));
+            NetManager.ins.clickLog(getlogItem(43));
         })
     }
 

mock/happyclear/exchange.json

 {
-    "success": false,
+    "success": true,
     "code": "444444",
     "desc": "操作太频繁，请稍后再试",
     "timestamp": 1576726906439,

mock/happyclear/hasBackReward.json

 {
-    "success": 0,
+    "success": 1,
     "code": "600074",
     "desc": "用户未达到回归奖励领取条件",
     "timestamp": 1578472496421,

mock/happyclear/home.json

@@ -23,7 +23,7 @@
                 "num": 3
             }
         ],
-        "remainEnargy": 99,
+        "remainEnargy": 1,
         "askForEnergy": false,
         "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 150