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

egret/resource/default.res.json

@@ -976,11 +976,6 @@
 			"type": "image",
 			"name": "startpanel_ele6_png"
 		},
-		{
-			"url": "assets/startpanel2/startpanel_ice1.png",
-			"type": "image",
-			"name": "startpanel_ice1_png"
-		},
 		{
 			"url": "assets/startpanel2/startpanel_icon.png",
 			"type": "image",

egret/src/mapScene/MapScene.ts

@@ -31,6 +31,11 @@ export default class MapScene extends Scene {
     static iconHash: any = {};
     static starHash: any = {};
     _data;
+    sendInvite(){
+        const dojoin = DataManager.ins.getData('hc_doJoin');
+        if(!dojoin)return;
+        NetManager.ins.doHelp(()=>{},,dojoin.data);
+    }
 
     // 邀请有礼角标倒计时
     private timer: egret.Timer;
@@ -39,6 +44,9 @@ export default class MapScene extends Scene {
     async start(data?) {
 
         super.start();
+        
+        this.sendInvite();
+
         this.updateMyInfo();
         this.updateAdData();
         this.getInviteInfo(); // 查询邀请信息，控制邀请有礼角标

mock/sign/getSignInfo.json

@@ -2,6 +2,6 @@
     "success": true,
     "signInfoVO": {
         "continueDay": 6,
-        "todaySigned": 1
+        "todaySigned": 0
     }
 }
\ No newline at end of file