Skip to content

X
xiaoxiaole
Commit 593af8ce authored by zjz1994's avatar zjz1994
Browse files
Options

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

parents 0ad405f7 a83746cb
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
egret/libs/new_wx/components/NoPrizePanel.ts
View file @ 593af8ce
...@@ -41,7 +41,7 @@ export default class NoPrizePanel extends Panel { ...@@ -41,7 +41,7 @@ export default class NoPrizePanel extends Panel {
changeMapScene(); changeMapScene();
}, this); }, this);
addRankFriendList(68,1100,this); addRankFriendList(68,1112.14,this);
} }
showlog() { showlog() {
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ 593af8ce
...@@ -79,7 +79,7 @@ export default class PrizePanel extends Panel { ...@@ -79,7 +79,7 @@ export default class PrizePanel extends Panel {
this.setStar(hc_submitData.stars); this.setStar(hc_submitData.stars);
addRankFriendList(68, 1085, this); addRankFriendList(68, 1113.29, this);
} }
showlog() { showlog() {
......
egret/resource/skins/FailSkin.exml
View file @ 593af8ce
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="FailSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="FailSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Component y="741" skinName="ADSmallSkin" horizontalCenter="0.5" visible="false"/> <e:Component y="951" skinName="ADSmallSkin" horizontalCenter="9.5" visible="false"/>
<e:Image source="闯关失败_png" y="-94" horizontalCenter="-4.5" /> <e:Image source="闯关失败_png" y="119" horizontalCenter="0.5" />
<e:Label id="lvTxt" text="关卡1" y="190" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" <e:Label id="lvTxt" text="关卡1" y="403" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339"
stroke="3" horizontalCenter="0"/> stroke="3" horizontalCenter="5.5"/>
<e:Button id="closeBtn" label="" x="606" y="159.5"> <e:Button id="closeBtn" label="" x="611" y="372.5">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing"> <e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="againBtn" label="" y="595" horizontalCenter="0"> <e:Button id="againBtn" label="" y="808" horizontalCenter="5">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 9_png" source.down="按钮 副本 9_png" source.disabled="按钮 副本 9_png" /> <e:Image width="100%" height="100%" source="按钮 副本 9_png" source.down="按钮 副本 9_png" source.disabled="按钮 副本 9_png" />
......
egret/resource/skins/NoPrizeSkin.exml
View file @ 593af8ce
...@@ -35,6 +35,6 @@ ...@@ -35,6 +35,6 @@
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="643.91" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/> <e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="643.91" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="634.03" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/> <e:Image id="pic2" source="点亮_png" y="634.03" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Label id="lvTxt" text="关卡1" y="481.52" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/> <e:Label id="lvTxt" text="关卡1" y="481.52" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
<e:Component y="1101.14" skinName="ADSmallSkin" x="68" visible="false"/> <e:Component y="1112.14" skinName="ADSmallSkin" x="68" visible="false"/>
<w:Config id="1690063a75e"/> <w:Config id="1690063a75e"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @ 593af8ce
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="PrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="169005181d0"/> <w:Config id="169005181d0"/>
<e:Component y="1086.79" skinName="ADSmallSkin" x="68" visible="false"/> <e:Component y="1113.29" skinName="ADSmallSkin" x="68" visible="false"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27" visible="false"/> <e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27" visible="false"/>
<e:Image id="combglight" source="combglight_png" y="540.11" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/> <e:Image id="combglight" source="combglight_png" y="540.11" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="540.11" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/> <e:Image id="combglight1" source="combglight_png" y="540.11" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
......
egret/src/panels/FailedPanel.ts
View file @ 593af8ce
...@@ -22,7 +22,7 @@ export default class FailedPanel extends Panel { ...@@ -22,7 +22,7 @@ export default class FailedPanel extends Panel {
}, this); }, this);
addRankFriendList(68,741,this); addRankFriendList(68,951,this);
} }
onTouchTap_closeBtn() { onTouchTap_closeBtn() {
......
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