1

egret/resource/default.res.json

@@ -175,6 +175,10 @@
 		{
 			"keys": "turnprize_icon1_png,turnprize_icon2_png,turnprize_icon3_png,turprizebg_png,turprize继续闯关按钮_png",
 			"name": "turntableprize"
+		},
+		{
+			"name": "preload",
+			"keys": "blood去分享_png,blood2去分享按钮_png"
 		}
 	],
 	"resources": [
@@ -2782,6 +2786,16 @@
 			"url": "assets/turntableprize/turprize继续闯关按钮.png",
 			"type": "image",
 			"name": "turprize继续闯关按钮_png"
+		},
+		{
+			"name": "blood去分享_png",
+			"type": "image",
+			"url": "assets/blood/blood去分享.png"
+		},
+		{
+			"name": "blood2去分享按钮_png",
+			"type": "image",
+			"url": "assets/blood2/blood2去分享按钮.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/Blood2Skin.exml

@@ -25,6 +25,14 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Button id="inviteBtn2" label="" x="439.08" y="621.6">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="blood2去分享按钮_png" source.down="blood2去分享按钮_png" source.disabled="blood2去分享按钮_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
 	<e:Label id="bloodTxt" text="你的可用体力值为：5" y="299.92" horizontalCenter="0" textColor="0xf54500" size="33"/>
 	<e:Label id="countdownTxt" text="距离下一次体力补给时间:" y="753.76" size="22" width="509" horizontalCenter="0.5" verticalAlign="middle" textAlign="center" textColor="0x86533a"/>
 	<e:Label text="元宝兑换得体力" y="492.08" size="26" x="218.88" textColor="0xc33700"/>

egret/resource/skins/BloodSkin.exml

@@ -37,6 +37,14 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Button id="inviteBtn2" label="" x="433" y="635">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="blood去分享_png" source.down="blood按钮 副本1_png" source.disabled="blood按钮 副本1_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
 	<e:Label id="bloodTxt" text="你的可用体力值为：5" y="303.92" horizontalCenter="0" textColor="0xF54500" size="33"/>
 	<e:Label id="countdownTxt" text="距离下一次体力补给时间:" y="753.76" size="22" width="509" horizontalCenter="0.5" verticalAlign="middle" textAlign="center" textColor="0x86533A"/>
 </e:Skin>
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -118,8 +118,8 @@ export default class MapScene extends Scene {
                 localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
             }
 
-            const backData = DataManager.ins.getData('hc_getBackReward').data;
-            if(backData) {
+            const backData = DataManager.ins.getData('hc_getBackReward');
+            if(backData.data) {
                 panels.push('back');
             }
 
@@ -604,6 +604,7 @@ export default class MapScene extends Scene {
                     break;
                 case (flag == 6):   // 无入口
                     this["inviteGroup"].visible = false;
+                    this['adBtn'].y = 323.76;
                     break;
                 default:
                     break;

egret/src/panels/BackPanel.ts

@@ -8,14 +8,14 @@ export default class BackPanel extends Panel {
         super.start();
         this.showlog();
         addAdComp(84, 806.52, this)
+        const backData = DataManager.ins.getData('hc_getBackReward');
+        this.updateOption(backData.data);
+
+        backData.data =null;
     }
 
     showlog(){
-        // NetManager.ins.showLog(getlogItem(3));
-        // NetManager.ins.showLog(getlogItem(4));
-        const {data}=DataManager.ins.getData('hc_getBackReward');
         
-        this.updateOption(data);
     }
 
     initEvents() {

egret/src/panels/BloodPanel.ts

@@ -38,9 +38,10 @@ export default class BloodPanel extends Panel {
         this['bloodTxt'].text = `你的可用体力值为：${homeData.remainEnargy}`;
         const data = getHomeData();
         this['invitTxt'].text = `(已领0/1)`;
-        if (data.askForEnergy)
+        if (data.askForEnergy){
             this['invitTxt'].text = `(已领1/1)`;
-        
+            this['inviteBtn2'].visible=true;
+        }
         if(data.remainEnargy >= BLOOD_NUMS_MAX) { //满了
             this['bloodTxt'].text = `你的可用体力值为：${homeData.remainEnargy}`;
             this._countDown.stop();
@@ -59,6 +60,7 @@ export default class BloodPanel extends Panel {
     initEvents() {
         super.initEvents();
         this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+        this['inviteBtn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
         this['buyBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapBuy, this)
     }
 

egret/src/panels/BloodPanel2.ts

@@ -56,6 +56,7 @@ this['price1Txt'].text =`${ window['price1']}个元宝=1个体力值`;
     initEvents() {
         super.initEvents();
         this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+        this['inviteBtn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
         this['buyBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapBuy, this)
     }
 

mock/happyclear/getInviteInfo.json

 {
     "success": true,
-    "code": null,
-    "desc": null,
-    "timestamp": 1566199822308,
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1572249599076,
     "data": {
-        "invitationId": "活动id",
-        "invitationCount": 5,
-        "img": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
-        "sysTime": 1570673808000,
-        "endTime": 1570673810000,
-        "invitationUser": [
-            {
-                "nickname": "nickname",
-                "avatar": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg"
-            },
-            {
-                "nickname": "nickname",
-                "avatar": null
-            }
-        ],
-        "completeFlag": 0,
-        "openPrizeMsg": "图片",
-        "prizeType": "nickname",
-        "prizeName": "nickname",
-        "prizeImg": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
-        "facePrice": "avatar"
+        "invitationId": null,
+        "invitationCount": null,
+        "sysTime": null,
+        "endTime": null,
+        "completeFlag": 6,
+        "openPrizMsg": null,
+        "prizeType": null,
+        "prizeName": null,
+        "prizeImg": null,
+        "facePrice": null,
+        "invitationUser": null
     }
 }
\ No newline at end of file

mock/happyclear/home.1.json

@@ -372,7 +372,7 @@
                 "num": 3
             }
         ],
-        "remainEnargy": 9979,
+        "remainEnargy": 10,
         "askForEnergy": false,
         "canReceiveTreasureBoxNum": 0,
         "nextRangeStarsNum": 150

mock/happyclear/home.json

@@ -623,7 +623,7 @@
             }
         ],
         "remainEnargy": 1,
-        "askForEnergy": true,
+        "askForEnergy":false,
         "canReceiveTreasureBoxNum": 0,
         "nextRangeStarsNum": 0,
         "isGetAllTreasureBox": true,