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

egret/libs/new_wx/components/PrizePanel.ts

@@ -79,7 +79,7 @@ export default class PrizePanel extends Panel {
 
         this.setStar(hc_submitData.stars);
 
-        addRankFriendList(84, 889.74, this);
+        addRankFriendList(68, 930, this);
     }
 
     showlog() {

egret/resource/skins/PrizeSkin.exml

 <?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">
 	<w:Config id="169005181d0"/>
-	<e:Component y="889.74" skinName="ADSmallSkin" x="84" visible="false"/>
+	<e:Component y="929.78" 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 source="prizePanelbg_png" y="-131.22" scale9Grid="87,543,522,23" x="0"/>
-	<e:Label id="lvTxt" text="关卡1" y="320.5" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
-	<e:Image id="picb" x="286" y="411.28" source="点亮 副本 2gray_png" scaleX="-1"/>
-	<e:Image id="pica" x="465.48" y="417.28" source="点亮 副本 2gray_png"/>
-	<e:Image id="picc" y="393.28" source="点亮gray_png" x="293"/>
-	<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="477.28" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
-	<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="483.28" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
-	<e:Image id="pic2" source="点亮_png" y="464.28" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
-	<e:Group id="propGroup" y="575.76" horizontalCenter="0">
+	<e:Image source="prizePanelbg_png" y="-155.72" scale9Grid="87,543,522,23" x="0"/>
+	<e:Label id="lvTxt" text="关卡1" y="296" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
+	<e:Image id="picb" x="286" y="386.78" source="点亮 副本 2gray_png" scaleX="-1"/>
+	<e:Image id="pica" x="465.48" y="392.78" source="点亮 副本 2gray_png"/>
+	<e:Image id="picc" y="368.78" source="点亮gray_png" x="293"/>
+	<e:Image id="pic1" source="点亮 副本 2_png" x="203.18" y="452.78" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
+	<e:Image id="pic3" source="点亮 副本 2_png" x="536.24" y="458.78" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
+	<e:Image id="pic2" source="点亮_png" y="439.78" anchorOffsetX="73.94" anchorOffsetY="74.73" x="366.94"/>
+	<e:Group id="propGroup" y="551.26" horizontalCenter="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:Image id="prop" scaleY="0.8" scaleX="0.8" x="173" y="80.24" source="prize_blood_png"/>
 	</e:Group>
 	<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="298">
+	<e:Button id="closeBtn" label="" x="594.5" y="273.5">
 		<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"/>
@@ -33,7 +33,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="goBtn" label="" y="815.28" horizontalCenter="0">
+	<e:Button id="goBtn" label="" y="790.78" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>