Skip to content

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

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

parents de570a1c b5904458
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 15 deletions
egret/resource/default.res.json
View file @ f9995ad1
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
"name": "hbcuttime" "name": "hbcuttime"
}, },
{ {
"keys": "hbPrize_bg_png,hbPrize_btn_png,hbPrize_money_png,hbPrize_blood_png,hbPrize_icon1_png,hbPrize_icon3_png,hbPrize_icon2_png", "keys": "hbPrize_bg_png,hbPrize_btn_png,hbPrize_money_png,hbPrize_blood_png,hbPrize_icon1_png,hbPrize_icon3_png,hbPrize_icon2_png,hbp_bg_png",
"name": "hbprize" "name": "hbprize"
}, },
{ {
...@@ -5381,6 +5381,11 @@ ...@@ -5381,6 +5381,11 @@
"url": "assets/sign/lightdi.png", "url": "assets/sign/lightdi.png",
"type": "image", "type": "image",
"name": "lightdi_png" "name": "lightdi_png"
},
{
"url": "assets/hbPrize/hbp_bg.png",
"type": "image",
"name": "hbp_bg_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/FailSkin.exml
View file @ f9995ad1
<?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="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Component y="772.52" skinName="ADSmallSkin" horizontalCenter="0" visible="false" /> <e:Component y="741" skinName="ADSmallSkin" horizontalCenter="0.5" visible="false"/>
<e:Image source="闯关失败_png" y="-94" horizontalCenter="-4.5" /> <e:Image source="闯关失败_png" y="-94" horizontalCenter="-4.5" />
<e:Label id="lvTxt" text="关卡1" y="190" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" <e:Label id="lvTxt" text="关卡1" y="190" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339"
stroke="3" horizontalCenter="0"/> stroke="3" horizontalCenter="0"/>
......
egret/resource/skins/HbPrizeSkin.exml
View file @ f9995ad1
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
<e:Image id="combglight" source="combglight_png" y="385.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/> <e:Image id="combglight" source="combglight_png" y="385.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="385.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/> <e:Image id="combglight1" source="combglight_png" y="385.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image y="-145.5" source="hbPrize_bg_png" horizontalCenter="1"/> <e:Image y="-145.5" source="hbPrize_bg_png" horizontalCenter="1"/>
<e:Image id="img" width="508" height="225" source="{data.url}" y="518.96" horizontalCenter="0"/> <e:Image id="img" width="518" height="230" source="{data.url}" y="516.3" horizontalCenter="0"/>
<e:Image id="prop" scaleX="1" scaleY="1" horizontalCenter="-70.5" source="taskPrize_money_png" verticalCenter="15.5"/> <e:Image id="prop" scaleX="1" scaleY="1" horizontalCenter="-63.5" source="taskPrize_money_png" verticalCenter="15.5"/>
<e:Group id="numsgroup" x="376.42" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="15.5"> <e:Image source="hbp_bg_png" y="517.96" horizontalCenter="0"/>
<e:Group id="numsgroup" x="384.4" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="16">
<e:Label id="nums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" textColor="0xC17343" left="0" bold="true"/> <e:Label id="nums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" textColor="0xC17343" left="0" bold="true"/>
</e:Group> </e:Group>
<e:Image id="money" source="signprize元宝_png" y="491.4" scaleX="0.8" scaleY="0.8" horizontalCenter="-3" visible="false"/> <e:Image id="money" source="signprize元宝_png" y="491.4" scaleX="0.8" scaleY="0.8" horizontalCenter="-3" visible="false"/>
......
egret/resource/skins/PrizeSkin.exml
View file @ f9995ad1
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<e:Group id="propGroup" y="733.77" horizontalCenter="0"> <e:Group id="propGroup" y="733.77" 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="81.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="456.01"> <e:Button id="closeBtn" label="" x="594.5" y="456.01">
......
egret/resource/skins/ScratchSkin.exml
View file @ f9995ad1
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<e:Image id="light2" x="375" y="496" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png" visible="false"/> <e:Image id="light2" x="375" y="496" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png" visible="false"/>
<e:Image id="light1" x="375" y="496" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png" visible="false"/> <e:Image id="light1" x="375" y="496" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png" visible="false"/>
<e:Group id="con" y="232.03" x="-1" visible="false"/> <e:Group id="con" y="232.03" x="-1" visible="false"/>
<e:Label id="numLabel" text="共2位好友帮你刮了90.3%" y="560.33" textColor="0xF54500" size="27" horizontalCenter="-1" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW"/> <e:Label id="numLabel" text="共2位好友帮你刮了90.3%" y="554.33" size="27" horizontalCenter="-1" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" textColor="0xa54615"/>
<e:Image y="593" horizontalCenter="-1" source="scratch_card_bg_png"/> <e:Image y="593" horizontalCenter="-1" source="scratch_card_bg_png"/>
<e:Image id="prizeImg" y="614" source="" width="510" height="228" horizontalCenter="-1"/> <e:Image id="prizeImg" y="614" source="" width="510" height="228" horizontalCenter="-1"/>
<e:Button id="closeBtn" label="" x="606.5" y="448"> <e:Button id="closeBtn" label="" x="606.5" y="448">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="helpBtn" label="" x="563" y="555.33"> <e:Button id="helpBtn" label="" x="563" y="551.33">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="scratch_help_png" source.down="scratch_help_png" source.disabled="scratch_help_png"/> <e:Image width="100%" height="100%" source="scratch_help_png" source.down="scratch_help_png" source.disabled="scratch_help_png"/>
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label id="cutTimeLabel" text="23:43:21" y="1067.5" size="28" textColor="0xffffff" fontFamily="FZY3JW" verticalAlign="middle" anchorOffsetX="0" width="487" textAlign="center" x="164"/> <e:Label id="cutTimeLabel" text="23:43:21" y="1067.5" size="28" textColor="0xffffff" fontFamily="FZY3JW" verticalAlign="middle" anchorOffsetX="0" width="487" textAlign="center" horizontalCenter="0"/>
<e:Scroller width="487" height="90" y="962" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="31.5"> <e:Scroller width="429" height="90" y="962" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="2.5">
<e:Group anchorOffsetX="0" y="2"> <e:Group anchorOffsetX="0" y="2" width="430">
<e:List id="list" x="0" y="0" anchorOffsetX="0"> <e:List id="list" x="0" y="0" anchorOffsetX="0">
<e:layout> <e:layout>
<e:HorizontalLayout horizontalAlign="center" verticalAlign="middle" gap="23"/> <e:HorizontalLayout horizontalAlign="center" verticalAlign="middle" gap="23"/>
......
egret/src/mainScene/MainScene.ts
View file @ f9995ad1
...@@ -1414,7 +1414,7 @@ export default class MainScene extends Scene { ...@@ -1414,7 +1414,7 @@ export default class MainScene extends Scene {
this.stepCircle = new egret.Shape(); this.stepCircle = new egret.Shape();
this.stepCircle.touchEnabled = true; this.stepCircle.touchEnabled = true;
this.stepCircle.graphics.beginFill(0xff0000, 0); this.stepCircle.graphics.beginFill(0xff0000, 0);
this.stepCircle.graphics.drawCircle(181, 125, 90); this.stepCircle.graphics.drawCircle(178, 85, 80);
this.stepCircle.graphics.endFill(); this.stepCircle.graphics.endFill();
this.stepCircle.addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this.stepCircle.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
this.sendPropUse(PropType.CHANCE_NUM) this.sendPropUse(PropType.CHANCE_NUM)
......
egret/src/panels/FailedPanel.ts
View file @ f9995ad1
...@@ -22,7 +22,7 @@ export default class FailedPanel extends Panel { ...@@ -22,7 +22,7 @@ export default class FailedPanel extends Panel {
}, this); }, this);
addRankFriendList(68,772.52,this); addRankFriendList(68,741,this);
} }
onTouchTap_closeBtn() { onTouchTap_closeBtn() {
......
egret/src/something/uis/PropGuide.ts
View file @ f9995ad1
...@@ -35,7 +35,7 @@ export class PropGuide extends egret.DisplayObjectContainer { ...@@ -35,7 +35,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
text.textColor = 0xffffff; text.textColor = 0xffffff;
text.size = 20; text.size = 20;
text.x = (750 - 500) / 2; text.x = (750 - 500) / 2;
text.y = offsetY - 92; text.y = offsetY - 80;
text.textAlign = egret.HorizontalAlign.CENTER; text.textAlign = egret.HorizontalAlign.CENTER;
text.width = 500; text.width = 500;
this.addChild(text); this.addChild(text);
...@@ -72,7 +72,7 @@ export class PropGuide extends egret.DisplayObjectContainer { ...@@ -72,7 +72,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
this.bg.graphics.lineTo(750, 1624); this.bg.graphics.lineTo(750, 1624);
this.bg.graphics.lineTo(0, 1624); this.bg.graphics.lineTo(0, 1624);
this.bg.graphics.lineTo(0, 0); this.bg.graphics.lineTo(0, 0);
this.bg.graphics.drawArc(181, 125, 90, 0, Math.PI * 2, true) this.bg.graphics.drawArc(178, 85, 80, 0, Math.PI * 2, true)
this.bg.graphics.endFill(); this.bg.graphics.endFill();
this.msgTxt.text = "点击左上方步数，可为闯关时增加额外5次步数"; this.msgTxt.text = "点击左上方步数，可为闯关时增加额外5次步数";
// this.msgTxt.x = 320; // this.msgTxt.x = 320;
......
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