Skip to content

X
xiaoxiaole
Commit 3dc05944 authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents d4d82e61 ccdd1e88
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
egret/libs/new_wx/components/RulePanel.ts
View file @ 3dc05944
...@@ -13,7 +13,10 @@ export default class RulePanel extends Panel { ...@@ -13,7 +13,10 @@ export default class RulePanel extends Panel {
group: eui.Group; group: eui.Group;
private addRule() { 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); this.labContent.textFlow = (new HtmlTextParser).parser(text);
} }
......
egret/libs/tw/manager/NetManager.ts
View file @ 3dc05944
...@@ -478,6 +478,7 @@ export class NetManager extends ABNetManager { ...@@ -478,6 +478,7 @@ export class NetManager extends ABNetManager {
deviceSessionId: window['_device_session_id'], deviceSessionId: window['_device_session_id'],
score: score score: score
}; };
console.log("通关提交",data);
if (relatedTaskType) { if (relatedTaskType) {
data['relatedTaskType'] = relatedTaskType; data['relatedTaskType'] = relatedTaskType;
} }
......
egret/resource/skins/FriendSkin.exml
View file @ 3dc05944
<?xml version="1.0" encoding="utf-8"?> <?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: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="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"/> <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: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: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"> <e:Button id="closeBtn" label="" x="634.94" y="239.98">
......
egret/resource/skins/SignSkin.exml
View file @ 3dc05944
<?xml version="1.0" encoding="utf-8"?> <?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: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="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"/> <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:Image source="signbg_png" y="66.75" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="632" y="257.77"> <e:Button id="closeBtn" label="" x="632" y="257.77">
<e:skinName> <e:skinName>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</e:List> </e:List>
</e:Group> </e:Group>
</e:Scroller> </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:Button id="btn1" label="" anchorOffsetX="184" anchorOffsetY="55" x="375" y="916" visible="false">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </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: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:Group id="lightbot" width="750" height="1206" x="0" y="0">
<e:Image source="lightdi_png" scaleX="1" scaleY="1" horizontalCenter="0" y="293"/> <e:Image source="lightdi_png" scaleX="1" scaleY="1" horizontalCenter="0" y="293"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment