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

egret/libs/new_wx/components/RulePanel.ts

@@ -13,7 +13,10 @@ export default class RulePanel extends Panel {
 
     group: eui.Group;
     private addRule() {
-        const text ='<br>'+ DataManager.ins.ajaxElementData.rule;
+        console.log("游戏规则",DataManager.ins.ajaxElementData.rule);
+        var str1:string = DataManager.ins.ajaxElementData.rule;
+        var str2 = str1.replace(/&nbsp/g,"\n");
+        const text ='<br>'+ str2;
         this.labContent.textFlow = (new HtmlTextParser).parser(text);
     }
 

egret/libs/tw/manager/NetManager.ts

@@ -478,6 +478,7 @@ export class NetManager extends ABNetManager {
             deviceSessionId: window['_device_session_id'],
             score: score
         };
+        console.log("通关提交",data);
         if (relatedTaskType) {
             data['relatedTaskType'] = relatedTaskType;
         }

egret/resource/skins/FriendSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="FriendSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image id="combglight" source="combglight_png" y="319.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
-	<e:Image id="combglight1" source="combglight_png" y="319.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight" source="combglight_png" y="319.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0" visible="false"/>
+	<e:Image id="combglight1" source="combglight_png" y="319.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0" visible="false"/>
 	<e:Image source="friendbg_png" y="48.29" horizontalCenter="2" locked="true"/>
 	<e:Label id="star" text="X0" x="588.96" y="366.08" size="24" fontFamily="FZY3JW"/>
 	<e:Button id="closeBtn" label="" x="634.94" y="239.98">

egret/resource/skins/SignSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image id="combglight" source="combglight_png" y="339.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
-	<e:Image id="combglight1" source="combglight_png" y="339.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight" source="combglight_png" y="339.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0" visible="false"/>
+	<e:Image id="combglight1" source="combglight_png" y="339.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0" visible="false"/>
 	<e:Image source="signbg_png" y="66.75" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="632" y="257.77">
 		<e:skinName>
@@ -18,7 +18,7 @@
 			</e:List>
 		</e:Group>
 	</e:Scroller>
-	<e:Label text="连续登录闯关可以获得更丰厚的奖励哦～" y="371" textColor="0xf7713a" size="26" horizontalCenter="0" fontFamily="FZY4JW"/>
+	<e:Label text="连续登录闯关可以获得更丰厚的奖励哦～" y="371" textColor="0xf7713a" size="26" horizontalCenter="0" fontFamily="FZY4JW" visible="false"/>
 	<e:Button id="btn1" label="" anchorOffsetX="184" anchorOffsetY="55" x="375" y="916" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
@@ -36,7 +36,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="prizegroup" width="750" height="1206" x="0" y="0">
+	<e:Group id="prizegroup" width="750" height="1206" x="0" y="0" visible="false">
 		<e:Rect id="mask1" fillAlpha="0.8" x="0" y="0" scaleX="1" scaleY="1" width="750" height="1206"/>
 		<e:Group id="lightbot" width="750" height="1206" x="0" y="0">
 			<e:Image source="lightdi_png" scaleX="1" scaleY="1" horizontalCenter="0" y="293"/>