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

egret/libs/new_wx/components/RulePanel.ts

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

egret/resource/skins/BagSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BagSkin" 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="414.06" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
-	<e:Image id="combglight1" source="combglight_png" y="414.06" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
-	<e:Image source="bagbg_png" horizontalCenter="0" verticalCenter="-71.5"/>
-	<e:Group id="group1" y="377" horizontalCenter="0" visible="false">
+	<e:Image id="combglight" source="combglight_png" y="374.67" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="374.67" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image source="bagbg_png" horizontalCenter="0" verticalCenter="-110.5"/>
+	<e:Group id="group1" y="337.61" horizontalCenter="0" visible="false">
 		<e:Image source="bag我的道具_png" y="0" x="0"/>
 		<e:Image id="btn1" source="bagbtn我的奖券_png" x="56.14" y="6"/>
 		<e:Image id="shopbtn" source="bag按钮 副本 9_png" y="619" horizontalCenter="0"/>
@@ -20,7 +20,7 @@
 			</e:layout>
 		</e:List>
 	</e:Group>
-	<e:Group id="group2" y="377" horizontalCenter="0">
+	<e:Group id="group2" y="337.61" horizontalCenter="0.5">
 		<e:Image y="0" source="bag我的奖券_png" horizontalCenter="0"/>
 		<e:Image id="btn2" x="302.41" y="5" source="bagbtn我的道具_png"/>
 		<e:Image id="recordbtn" source="bag按钮 副本 10_png" y="619" horizontalCenter="0.5"/>
@@ -41,7 +41,7 @@
 			</e:Group>
 		</e:Scroller>
 	</e:Group>
-	<e:Button id="closeBtn" label="" x="599.94" y="255.92">
+	<e:Button id="closeBtn" label="" x="599.94" y="216.53">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>

egret/src/panels/ShareCodePanel.ts

@@ -304,8 +304,8 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad
  * @param shareCode 分享加体力暂时没有分享码（27号版本要加上），排行榜邀请一起玩也没有分享码，默认传0
  */
 function generateCode(callback: Function, channel: CodeChannels, shareCode: string = "0") {
-    // var activityCode = getParamString("snactCode") || "ACT0000002664";//上线必须改回来，动态获取
-    var activityCode = "ACT0000002664";
+    var activityCode = getParamString("snactCode") || "ACT0000002664";//上线必须改回来，动态获取
+    // var activityCode = "ACT0000002664";
     var sceneCode = channel;
     var token = shareCode || "0";
     window['$'].ajax({