Skip to content

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

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

parents a1460c47 e2615556
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 27 deletions
egret/resource/default.res.json
View file @ eb5860bd
......@@ -209,7 +209,7 @@
"name": "taskcenter"
},
{
"keys": "TaskCenterPrize_bg_png",
"keys": "TaskCenterPrize_bg_png,taskPrize_money_png,taskPrize_step_png,taskPrize_bomb_png,taskPrize_chuizi_png",
"name": "taskcenterprize"
},
{
......@@ -245,8 +245,8 @@
"name": "helpGroup"
},
{
"name": "preload",
"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,commom_prop_bg2_png,turnprize_icon12_png,turnprize_icon22_png,turnprize_icon32_png,help_blood_1_bg2_png,help_blood_1_btn2_png,help_blood_1_text2_png,help_blood_fail2_png,help_blood_fail_btn2_png,help_blood_fail_text5_png,help_blood_fail_text22_png,help_blood_fail_text32_png,help_blood_fail_text42_png,help_blood_success2_png,help_blood_success_text3_png,help_blood_success_text22_png,help_closebtn_png,help_invite22_png,help_invite2_btn3_png,help_invite2_btn22_png,help_invite2_text5_png,help_invite2_text22_png,help_invite_bg2_png,help_invite_btn_png,help_invite_fail2_png,help_invite_fail_btn2_png,help_invite_fail_text12_png,help_invite_fail_text22_png,help_invite_fail_text32_png,help_invite_fail_text42_png,help_invite_success2_png,help_invite_success_btn2_png,recharge_icon2_png,help_invite2_text32_png,help_invite2_text42_png,turntabletit_png,turntable_paneldi_png,turntable_paneldi2_png,turntabletit2_png,sign_mask_png,signitemno_png,signitemyes_png"
"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,commom_prop_bg2_png,turnprize_icon12_png,turnprize_icon22_png,turnprize_icon32_png,recharge_icon2_png,turntabletit_png,turntable_paneldi_png,turntable_paneldi2_png,turntabletit2_png,sign_mask_png,signitemno_png,signitemyes_png,sign_mask2_png,signitemno2_png,signitemyes2_png",
"name": "preload"
}
],
"resources": [
......@@ -5157,34 +5157,69 @@
"name": "help_invite_success_txt_png"
},
{
"name": "help_invite_text_png",
"url": "assets/help/help_invite_text.png",
"type": "image"
"type": "image",
"name": "help_invite_text_png"
},
{
"url": "assets/turntable/turntable_paneldi.png",
"type": "image",
"name": "turntable_paneldi2_png"
},
{
"url": "assets/turntable/turntabletit.png",
"type": "image",
"name": "turntabletit2_png"
},
{
"url": "assets/sign/sign_mask.png",
"type": "image",
"name": "sign_mask_png"
},
{
"url": "assets/sign/signitemno.png",
"type": "image",
"name": "signitemno_png"
},
{
"url": "assets/sign/signitemyes.png",
"type": "image",
"name": "signitemyes_png"
},
{
"url": "assets/sign/sign_mask.png",
"type": "image",
"name": "sign_mask2_png"
},
{
"url": "assets/sign/signitemno.png",
"type": "image",
"name": "signitemno2_png"
},
{
"name": "turntable_paneldi2_png",
"url": "assets/sign/signitemyes.png",
"type": "image",
"url": "assets/turntable/turntable_paneldi.png"
"name": "signitemyes2_png"
},
{
"name": "turntabletit2_png",
"url": "assets/TaskCenterPrize/taskPrize_money.png",
"type": "image",
"url": "assets/turntable/turntabletit.png"
"name": "taskPrize_money_png"
},
{
"name": "sign_mask_png",
"url": "assets/TaskCenterPrize/taskPrize_step.png",
"type": "image",
"url": "assets/sign/sign_mask.png"
"name": "taskPrize_step_png"
},
{
"name": "signitemno_png",
"url": "assets/TaskCenterPrize/taskPrize_bomb.png",
"type": "image",
"url": "assets/sign/signitemno.png"
"name": "taskPrize_bomb_png"
},
{
"name": "signitemyes_png",
"url": "assets/TaskCenterPrize/taskPrize_chuizi.png",
"type": "image",
"url": "assets/sign/signitemyes.png"
"name": "taskPrize_chuizi_png"
}
]
}
\ No newline at end of file
egret/resource/skins/TaskCenterNoPrizeSkin.exml
View file @ eb5860bd
......@@ -2,8 +2,8 @@
<e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/>
<e:Component y="867.5" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image y="101.5" source="TaskCenterNoPrizebg_png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="631" y="136">
<e:Image y="14" source="TaskCenterNoPrizebg_png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="599" y="210">
<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"/>
......@@ -11,14 +11,14 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="duibaGroup" horizontalCenter="-1" top="214" visible="false">
<e:Label text="啊哦，奖励擦肩而过…" y="0" textColor="0xf54500" fontFamily="FZY3JW" size="40" horizontalCenter="0"/>
<e:Group id="duibaGroup" horizontalCenter="-1" y="316" visible="false">
<e:Label text="啊哦，奖励擦肩而过…" y="0" fontFamily="FZY3JW" size="40" horizontalCenter="0" textColor="0xc17343"/>
</e:Group>
<e:Group id="suningGroup" horizontalCenter="-1" top="214" visible="false">
<e:Label id="suningLabel" text="继续完成任务，还可以获得更多奖励哦～" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xfb6300"/>
<e:Label text="换个姿势，再来一次！" y="-40" textColor="0xF54500" fontFamily="FZY3JW" size="46" horizontalCenter="0" x="-30" scaleX="1" scaleY="1"/>
<e:Group id="suningGroup" horizontalCenter="-1" y="321" visible="false">
<e:Label id="suningLabel" text="继续完成任务，还可以获得更多奖励哦～" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xc17343"/>
<e:Label text="换个姿势，再来一次！" y="-40" fontFamily="FZY3JW" size="46" horizontalCenter="0" x="-30" scaleX="1" scaleY="1" textColor="0xc17343"/>
</e:Group>
<e:Group id="btn" y="728.5" width="358" height="113" horizontalCenter="0">
<e:Group id="btn" y="722.5" horizontalCenter="0">
<e:Button label="" y="0" x="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -27,6 +27,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="btnLabel" text="继续闯关" y="29" size="42" strokeColor="0x2091e9" stroke="3" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Label id="btnLabel" text="继续闯关" size="42" strokeColor="0xff7038" stroke="3" horizontalCenter="0" fontFamily="FZY3JW" verticalCenter="-7.5"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TaskCenterPrizeSkin.exml
View file @ eb5860bd
......@@ -3,7 +3,7 @@
<w:Config id="16d5c2563cb"/>
<e:Component y="830" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image horizontalCenter="0" source="TaskCenterPrize_bg_png" y="-150.5"/>
<e:Button id="closeBtn" label="" x="631" y="291.12">
<e:Button id="closeBtn" label="" x="607" y="240">
<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"/>
......@@ -11,7 +11,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="img" y="375.77" touchEnabled="true" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" source="{data.url}" visible="false"/>
<e:Image id="img" y="375.77" touchEnabled="true" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" source="{data.url}"/>
<e:Image id="money" y="376.4" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" horizontalCenter="0" visible="false"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="526.64" width="75" textAlign="right" x="287.6" fontFamily="FZY3JW" visible="false"/>
<e:Image id="blood" y="376.16" source="common_blood_png" scaleX="0.7" scaleY="0.7" horizontalCenter="0" visible="false"/>
......@@ -22,6 +22,6 @@
<e:Label id="tipsLabel" text="继续完成任务可以获得更多元宝哦~" y="632.73" textColor="0xF54500" fontFamily="FZY3JW" size="26" horizontalCenter="0"/>
<e:Group id="btn" y="690" anchorOffsetX="0" width="332.33" anchorOffsetY="0" height="104.33" horizontalCenter="0">
<e:Image y="0" source="TaskCenter_btn_png" scaleX="0.9" scaleY="0.9" x="0"/>
<e:Label id="btnLabel" text="继续闯关" size="42" strokeColor="0xff7038" stroke="3" fontFamily="FZY3JW" horizontalCenter="0" verticalCenter="0"/>
<e:Label id="btnLabel" text="继续闯关" size="42" strokeColor="0xff7038" stroke="3" fontFamily="FZY3JW" horizontalCenter="-0.16499999999999204" verticalCenter="-1.1649999999999991"/>
</e:Group>
</e:Skin>
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