Skip to content

X
xiaoxiaole
Commit ea87f682 authored by wildfirecode's avatar wildfirecode
Browse files
Options

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

parents 3ca40377 11ab032c
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 30 deletions
egret/libs/new_wx/components/NoPrizePanel.ts
View file @ ea87f682
...@@ -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(84,917.46,this); addRankFriendList(68,1100,this);
} }
showlog() { showlog() {
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ ea87f682
...@@ -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, 930, this); addRankFriendList(68, 1085, this);
} }
showlog() { showlog() {
......
egret/resource/skins/NoPrizeSkin.exml
View file @ ea87f682
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="NoPrizeSkin" width="750" height="1000" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="NoPrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/> <e:Image id="light" source="common_prizelight_png" x="374.19" y="512.23" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image y="-165.72" source="擦肩而过弹窗 _png" horizontalCenter="0"/> <e:Image y="17" source="擦肩而过弹窗 _png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="596.48" y="254"> <e:Button id="closeBtn" label="" x="596.48" y="436.72">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/> <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="goBtn" label="" y="770" horizontalCenter="0"> <e:Button id="goBtn" label="" y="952.72" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/> <e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="picb" x="286" y="391.28" source="点亮 副本 2gray_png" scaleX="-1"/> <e:Image id="picb" x="286" y="574" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="466.48" y="384.28" source="点亮 副本 2gray_png"/> <e:Image id="pica" x="466.48" y="567" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="367.28" source="点亮gray_png" x="293"/> <e:Image id="picc" y="550" source="点亮gray_png" x="293"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="450.39" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/> <e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="633.11" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="449.89" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/> <e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="632.61" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="440.01" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/> <e:Image id="pic2" source="点亮_png" y="622.73" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Label id="lvTxt" text="关卡1" y="287.5" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0"/> <e:Label id="lvTxt" text="关卡1" y="470.22" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
<e:Component y="917.46" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="1101.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 @ ea87f682
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PrizeSkin" width="750" height="1206" 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="929.78" skinName="ADSmallSkin" x="68" visible="false"/> <e:Component y="1086.79" 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 source="prizePanelbg_png" y="-138.02" scale9Grid="87,543,522,23" x="0"/> <e:Image source="prizePanelbg_png" y="0" scale9Grid="87,543,522,23" x="0"/>
<e:Label id="lvTxt" text="关卡1" y="313.7" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/> <e:Label id="lvTxt" text="关卡1" y="451.72" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
<e:Image id="picb" x="286" y="404.48" source="点亮 副本 2gray_png" scaleX="-1"/> <e:Image id="picb" x="286" y="542.5" source="点亮 副本 2gray_png" scaleX="-1"/>
<e:Image id="pica" x="465.48" y="410.48" source="点亮 副本 2gray_png"/> <e:Image id="pica" x="465.48" y="548.5" source="点亮 副本 2gray_png"/>
<e:Image id="picc" y="386.48" source="点亮gray_png" x="293"/> <e:Image id="picc" y="524.5" source="点亮gray_png" x="293"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="470.48" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/> <e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="608.5" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="476.48" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/> <e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="614.5" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="457.48" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/> <e:Image id="pic2" source="点亮_png" y="595.5" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
<e:Group id="propGroup" y="568.96" horizontalCenter="0"> <e:Group id="propGroup" y="706.98" horizontalCenter="0">
<e:Image source="物品奖励_png" x="0" y="0"/> <e:Image source="物品奖励_png" x="0" y="0"/>
<e:Label id="nums" text="×8" size="48" verticalAlign="middle" textAlign="left" fontFamily="FZY3JW" textColor="0xC17343" bold="true" anchorOffsetX="0" width="205" x="278" y="102.24"/> <e:Label id="nums" text="×8" size="48" verticalAlign="middle" textAlign="left" fontFamily="FZY3JW" textColor="0xC17343" bold="true" anchorOffsetX="0" width="205" x="278" y="102.24"/>
<e:Image id="prop" scaleY="0.8" scaleX="0.8" x="173" y="80.24" source="prize_blood_png"/> <e:Image id="prop" scaleY="0.8" scaleX="0.8" x="173" y="80.24" source="prize_blood_png"/>
</e:Group> </e:Group>
<e:Image id="img" width="480" height="214" source="{data.url}" horizontalCenter="0" y="575.76" visible="false"/> <e:Image id="img" width="480" height="214" source="{data.url}" horizontalCenter="0" y="575.76" visible="false"/>
<e:Button id="closeBtn" label="" x="594.5" y="291.2"> <e:Button id="closeBtn" label="" x="594.5" y="429.22">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/> <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="goBtn" label="" y="808.48" horizontalCenter="0"> <e:Button id="goBtn" label="" y="946.5" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/> <e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
......
egret/resource/skins/RankFriendListSkin.exml
View file @ ea87f682
...@@ -7,11 +7,10 @@ ...@@ -7,11 +7,10 @@
<e:Object a="null"/> <e:Object a="null"/>
<e:Object a="null"/> <e:Object a="null"/>
<e:Object a="null"/> <e:Object a="null"/>
<e:Object a="null"/>
</e:Array> </e:Array>
</e:ArrayCollection> </e:ArrayCollection>
<e:layout> <e:layout>
<e:HorizontalLayout gap="20"/> <e:HorizontalLayout gap="20" horizontalAlign="center" verticalAlign="middle"/>
</e:layout> </e:layout>
</e:List> </e:List>
<e:Label id="empty" text="该关卡没有好友通关" y="97" textColor="0xC33700" size="26" x="183"/> <e:Label id="empty" text="该关卡没有好友通关" y="97" textColor="0xC33700" size="26" x="183"/>
......
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