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

egret/resource/skins/BloodSkin.exml

@@ -24,7 +24,7 @@
 
 
 	<e:Group id="selbox" width="531" y="427.37" horizontalCenter="6.5">
-		<e:Group id="zhuanpan" width="531" height="121" scaleX="1" scaleY="1" horizontalCenter="0" top="0">
+		<e:Group id="zhuanpan" width="531" height="121" scaleX="1" scaleY="1" horizontalCenter="0" top="0" visible="false">
 			<e:Image source="itembg_png" horizontalCenter="0" verticalCenter="0"/>
 			<e:Image source="bloodhert_png" x="12" verticalCenter="6.5"/>
 			<e:Label text="+1" x="38" y="48.6" size="24" fontFamily="FZY3JW"/>
@@ -38,7 +38,7 @@
 				</e:skinName>
 			</e:Button>
 		</e:Group>
-		<e:Group id="yuanbao" width="531" height="121" scaleX="1" scaleY="1" y="141">
+		<e:Group id="yuanbao" width="531" height="121" scaleX="1" scaleY="1">
 			<e:Image source="itembg_png" horizontalCenter="0" verticalCenter="0"/>
 			<e:Image source="bloodhert_png" x="12" verticalCenter="6.5"/>
 			<e:Label text="+1" x="38" y="48.6" size="24" fontFamily="FZY3JW"/>
@@ -53,7 +53,7 @@
 				</e:skinName>
 			</e:Button>
 		</e:Group>
-		<e:Group id="fenxiang" width="531" height="121" scaleX="1" scaleY="1" y="282">
+		<e:Group id="fenxiang" width="531" height="121" scaleX="1" scaleY="1" y="141">
 			<e:Image source="itembg_png" horizontalCenter="0" verticalCenter="0"/>
 			<e:Image source="bloodhert_png" x="12" verticalCenter="6.5"/>
 			<e:Label text="+1" x="38" y="48.6" size="24" fontFamily="FZY3JW"/>
@@ -77,9 +77,9 @@
 			</e:Button>
 		</e:Group>
 	</e:Group>
-	<e:Group id="botinfo" width="750" height="170" y="846.45" horizontalCenter="0">
-		<e:Image id="countheart" source="bloodhert_png" x="257.3" scaleX="0.4" scaleY="0.4" y="11"/>
-		<e:Label id="countdownTxt" text="恢复 : 00 : 32 : 41" size="24" width="509" verticalAlign="middle" textAlign="left" x="298.02" scaleX="1" scaleY="1" y="13" textColor="0xc17343" fontFamily="FZY3JW" bold="false"/>
+	<e:Group id="botinfo" width="750" height="170" y="633" horizontalCenter="0">
+		<e:Image id="countheart" source="bloodhert_png" x="257.3" scaleX="0.4" scaleY="0.4" y="11" visible="false"/>
+		<e:Label id="countdownTxt" text="恢复 : 00 : 32 : 41" size="24" width="509" verticalAlign="middle" textAlign="left" x="298.02" scaleX="1" scaleY="1" y="13" textColor="0xc17343" fontFamily="FZY3JW" bold="false" visible="false"/>
 		<e:Button id="resumeBtn" label="" y="50" horizontalCenter="0" x="189" scaleX="1" scaleY="1">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">

egret/src/panels/BloodPanel.ts

@@ -18,6 +18,7 @@ import { DataManager } from "../../libs/tw/manager/DataManager";
 import { loadSvga } from "../loadSvga";
 import getResPath from "../../libs/new_tc/getResPath";
 import setGlow from "../setGlow";
+import { NetName } from "../../libs/tw/enum/NetName";
 
 export default class BloodPanel extends Panel {
     //修改，暂时只能根据接口获取
@@ -41,12 +42,15 @@ export default class BloodPanel extends Panel {
         }
 
         //切换显示状态，todo
-        NetManager.ins.getConfigInfo((s,res)=>{
-            console.log("收到获取是否展示转盘",s,res);
+        // NetManager.ins.getConfigInfo((s,res)=>{
+            let config = DataManager.ins.getData(NetName.GET_CONFIG).data;
+            let luckyDrawConf = config && config.luckyDrawConf;
+
+            // console.log("收到获取是否展示转盘",s,res);
             //是否显示抽奖得体力
             var showcj:boolean = false;
-            if(res&&res.data&&res.data.luckyDrawConf&&res.data.luckyDrawConf.enable){
-                var bloodadd = res.data.luckyDrawConf.prizeList.filter(item => item.categoryType == 2);
+            if(luckyDrawConf&&luckyDrawConf.enable){
+                var bloodadd = luckyDrawConf.prizeList.filter(item => item.categoryType == 2);
                 if(bloodadd.length>0){
                     showcj = true;
                 }
@@ -94,7 +98,7 @@ export default class BloodPanel extends Panel {
             }
             this["bg2"].height = bgheight;
             this["botinfo"].y = bgheight-cutheight-75-40;
-        })
+        // })
         this['price1Txt'].text = `${window['price1']}个元宝=1个体力值`;
         this['resumeBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             gotoNextLevel();