Skip to content

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

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

parents 249fb20e 67912a3f
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
egret/resource/skins/Prize2Skin.exml
View file @ 6c314a4a
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="Prize2Skin" width="750" height="1206" 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="809.52" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="809.52" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="206.13" anchorOffsetX="375.76" anchorOffsetY="327.27"/> <e:Image id="light" source="common_prizelight_png" x="376.19" y="598.89" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="11.58" horizontalCenter="0.5"/> <e:Image source="prizePanelbg_png" y="-73.38" horizontalCenter="2"/>
<e:Button id="closeBtn" label="" x="616" y="183.62"> <e:Button id="closeBtn" label="" x="588" y="367.88">
<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"/>
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="67.62"/> <e:Image id="picb" source="点亮 副本 2_png" x="144.88" y="480.62"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="67.62" scaleX="-1"/> <e:Image id="pica" source="点亮 副本 2_png" x="610.88" y="480.62" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="18.62" x="280"/> <e:Image id="picc" source="点亮_png" y="431.62" x="282.88"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="125.62" anchorOffsetX="80" anchorOffsetY="58"/> <e:Image id="pic1" source="点亮 副本 2_png" x="224.88" y="538.62" anchorOffsetX="80" anchorOffsetY="58"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="119.62" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/> <e:Image id="pic3" source="点亮 副本 2_png" x="538.88" y="532.62" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
<e:Image id="pic2" source="点亮_png" y="94.62" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/> <e:Image id="pic2" source="点亮_png" y="507.62" horizontalCenter="3" anchorOffsetX="96" anchorOffsetY="76"/>
<e:Image source="signprize元宝_png" y="361.86" horizontalCenter="-2" scaleX="0.8" scaleY="0.8"/> <e:Image source="signprize元宝_png" y="603" scaleX="0.8" scaleY="0.8" horizontalCenter="0"/>
<e:Button id="shareBtn" label="" y="663.62" horizontalCenter="-145.5"> <e:Button id="shareBtn" label="" y="894.62" horizontalCenter="-162" visible="false">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 3_png" source.down="按钮 副本 3_png" source.disabled="按钮 副本 3_png"/> <e:Image width="100%" height="100%" source="按钮 副本 3_png" source.down="按钮 副本 3_png" source.disabled="按钮 副本 3_png"/>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="goBtn" label="" y="663.62" horizontalCenter="144"> <e:Button id="goBtn" label="" y="870" 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"/>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Group id="numsgroup" x="407.38" y="365.38" scaleX="1.5" scaleY="1.5"> <e:Group id="numsgroup" x="415.75" y="611.39" scaleX="1.5" scaleY="1.5">
<e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/> <e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="tips" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/> <e:Label id="tips" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group> </e:Group>
......
egret/resource/skins/RedBombRuleSkin.exml
View file @ 6c314a4a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RedBombRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="RedBombRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Rect left="0" top="0" bottom="0" right="0" fillAlpha="0.65"/> <e:Rect left="0" top="0" bottom="0" right="0" fillAlpha="0.65"/>
<e:Image id="ruleBg" horizontalCenter="0" y="112" source="hbRule_bg_png"/> <e:Image id="ruleBg" horizontalCenter="0" y="213.7" source="hbRule_bg_png"/>
<e:Scroller id="scroller" width="545" x="103.76" height="507" y="337.2"> <e:Scroller id="scroller" width="545" x="103.76" height="507" y="337.2">
<e:Group id="group" width="100%"> <e:Group id="group" width="100%">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/> <e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</e:layout> </e:layout>
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
<e:Button id="closeBtn" label="" x="613" y="261"> <e:Button id="closeBtn" label="" x="599" y="213.7">
<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"/>
......
egret/resource/skins/StartPanelSkin.exml
View file @ 6c314a4a
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<e:Label id="nums2Txt" text="888" size="26" bold="true" y="573" textAlign="center" verticalAlign="middle" fontFamily="FZY3JW" horizontalCenter="-114.5" textColor="0x2f64a3"/> <e:Label id="nums2Txt" text="888" size="26" bold="true" y="573" textAlign="center" verticalAlign="middle" fontFamily="FZY3JW" horizontalCenter="-114.5" textColor="0x2f64a3"/>
<e:Label id="nums1Txt" text="8" size="26" bold="true" y="573" textAlign="center" verticalAlign="middle" fontFamily="FZY3JW" horizontalCenter="63.5" textColor="0x2f64a3"/> <e:Label id="nums1Txt" text="8" size="26" bold="true" y="573" textAlign="center" verticalAlign="middle" fontFamily="FZY3JW" horizontalCenter="63.5" textColor="0x2f64a3"/>
<e:Label id="nums3Txt" text="88" size="26" bold="true" y="573" textAlign="center" verticalAlign="middle" fontFamily="FZY3JW" horizontalCenter="238" textColor="0x2f64a3"/> <e:Label id="nums3Txt" text="88" size="26" bold="true" y="573" textAlign="center" verticalAlign="middle" fontFamily="FZY3JW" horizontalCenter="238" textColor="0x2f64a3"/>
<e:Button id="closeBtn" label="" x="620" y="252"> <e:Button id="closeBtn" label="" x="600" y="211.5">
<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"/>
......
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