Skip to content

X
xiaoxiaole
Commit 8bbcbbe9 authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents e3e1299f 36731817
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 42 deletions
egret/resource/default.res.json
View file @ 8bbcbbe9
......@@ -81,7 +81,7 @@
"name": "signprize"
},
{
"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,turnprize_icon3_png,turnprize_icon2_png,turnprize_icon1_png,commom_prop_bg_png,arrowbg_png,common_closebtn2_png,nums4_png,nums4_fnt,commom_share1_png,turnnoprize继续闯关2_png,combglight_png,common_box_btn_png",
"keys": "turnnoprize再来一次_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,turnprize_icon3_png,turnprize_icon2_png,turnprize_icon1_png,commom_prop_bg_png,arrowbg_png,common_closebtn2_png,nums4_png,nums4_fnt,commom_share1_png,turnnoprize继续闯关_png,combglight_png,common_box_btn_png",
"name": "common"
},
{
......@@ -153,7 +153,7 @@
"name": "turnrule"
},
{
"keys": "turnnoprize再来一次_png,turnnoprize离奖励只差一毫米！ 再来一次吧！_png,turnnoprize奖励溜走了，再试一次吧！_png,turnnoprize继续闯关_png,turnnoprize换个姿势再来一次！_png,turnnoprizebg_png",
"keys": "turnnoprize离奖励只差一毫米！ 再来一次吧！_png,turnnoprize奖励溜走了，再试一次吧！_png,turnnoprize换个姿势再来一次！_png,turnnoprizebg_png",
"name": "turntablenoprize"
},
{
......@@ -169,7 +169,7 @@
"name": "turntable"
},
{
"keys": "turprizebg_png,turprize继续闯关按钮_png",
"keys": "turprizebg_png",
"name": "turntableprize"
},
{
......@@ -2691,11 +2691,6 @@
"type": "image",
"name": "scratch_user2_png"
},
{
"url": "assets/turnnoprize/turnnoprize再来一次.png",
"type": "image",
"name": "turnnoprize再来一次_png"
},
{
"url": "assets/turnnoprize/turnnoprize奖励溜走了，再试一次吧！.png",
"type": "image",
......@@ -2711,11 +2706,6 @@
"type": "image",
"name": "turnnoprize离奖励只差一毫米！ 再来一次吧！_png"
},
{
"url": "assets/turnnoprize/turnnoprize继续闯关.png",
"type": "image",
"name": "turnnoprize继续闯关_png"
},
{
"url": "assets/h52/h52按钮.png",
"type": "image",
......@@ -2729,7 +2719,7 @@
{
"url": "assets/common/turnnoprize再来一次.png",
"type": "image",
"name": "turnnoprize再来一次2_png"
"name": "turnnoprize再来一次_png"
},
{
"url": "assets/turnnoprize/turnnoprizebg.png",
......@@ -2806,11 +2796,6 @@
"type": "image",
"name": "turprizebg_png"
},
{
"url": "assets/turntableprize/turprize继续闯关按钮.png",
"type": "image",
"name": "turprize继续闯关按钮_png"
},
{
"url": "assets/turntable/turntable_oupon.png",
"type": "image",
......@@ -5355,7 +5340,7 @@
{
"url": "assets/common/turnnoprize继续闯关.png",
"type": "image",
"name": "turnnoprize继续闯关2_png"
"name": "turnnoprize继续闯关_png"
},
{
"url": "assets/mainScene/gameGuide.png",
......
egret/resource/skins/BloodSkin.exml
View file @ 8bbcbbe9
......@@ -6,7 +6,7 @@
<e:Group id="topinfo" width="750" height="50" y="355.57" horizontalCenter="0">
<e:Image source="bloodhert_png" x="293.98" scaleX="0.4" scaleY="0.4" verticalCenter="2.5"/>
<e:Label text="剩余：" textColor="0xF54500" size="30" horizontalCenter="0" x="330" scaleX="1" scaleY="1" verticalCenter="0" fontFamily="FZY3JW"/>
<e:Label id="bloodTxt" text="5" textColor="0xF54500" size="40" scaleX="1" scaleY="1" verticalCenter="0" fontFamily="FZY3JW" textAlign="left" left="411" anchorOffsetX="0" width="95"/>
<e:Label id="bloodTxt" text="" textColor="0xF54500" size="40" scaleX="1" scaleY="1" verticalCenter="0" fontFamily="FZY3JW" textAlign="left" left="411" anchorOffsetX="0" width="95"/>
</e:Group>
......
egret/resource/skins/SignSkin.exml
View file @ 8bbcbbe9
......@@ -44,7 +44,7 @@
<e:Group id="giftbox" width="750" height="1206"/>
<e:Group id="contmid" width="750" height="1206" anchorOffsetX="375" x="375" anchorOffsetY="603" y="603">
<e:Image id="prizeimg" scaleX="2" scaleY="2" y="537" source="" horizontalCenter="0"/>
<e:Group id="prize1" width="606" height="286" y="526.39" scaleX="1" scaleY="1" horizontalCenter="0">
<e:Group id="prize1" width="606" height="286" y="450.63" scaleX="1" scaleY="1" horizontalCenter="0">
<e:Image source="virprizebg_png" scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="prizeimg1" scaleX="1" scaleY="1" source="" width="585" height="273" anchorOffsetX="0" verticalCenter="0" horizontalCenter="0"/>
<e:Image id="maskimg" source="virprizebg_png" scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0" x="10" y="10" width="585" height="273"/>
......
egret/resource/skins/TurntableNoPrizeSkin.exml
View file @ 8bbcbbe9
......@@ -15,11 +15,12 @@
<e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize再来一次2_png" source.down="turnnoprize再来一次2_png" source.disabled="turnnoprize再来一次2_png"/>
<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="btn2" label="" y="0" x="279">
<e:skinName>
......
egret/resource/skins/TurntablePrize2Skin.exml
View file @ 8bbcbbe9
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TurntablePrize2" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e02c1ad57"/>
<e:Image id="combglight" source="combglight_png" y="362.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="362.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight" source="combglight_png" y="374.44" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="374.44" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Group id="container" y="-98.45" x="-3"/>
......
egret/resource/skins/TurntablePrizeSkin.exml
View file @ 8bbcbbe9
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TurntablePrize" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e02c1ad57"/>
<e:Image id="combglight" source="combglight_png" y="369.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="369.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight" source="combglight_png" y="414.77" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="414.77" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Component y="788" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
......@@ -33,20 +33,22 @@
<e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize再来一次2_png" source.down="turnnoprize再来一次2_png" source.disabled="turnnoprize再来一次2_png"/>
<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="btn2" label="" y="0" x="279">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize继续闯关2_png" source.down="turnnoprize继续闯关2_png" source.disabled="turnnoprize继续闯关2_png"/>
<e:Image width="100%" height="100%" source="turnnoprize继续闯关_png" source.down="turnnoprize继续闯关_png" source.disabled="turnnoprize继续闯关_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="status1" x="52" y="69.32">
<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
......
egret/src/panels/SignPanel.ts
View file @ 8bbcbbe9
......@@ -474,6 +474,7 @@ export default class SignPanel extends Panel {
egret.Tween.get(this["lightbot"]).set({
alpha:0.3
})
.wait(150)
.to({
alpha:1,
},150)
......
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @ 8bbcbbe9
......@@ -30,38 +30,30 @@ export default class TurnPrizePanel extends Panel {
this['status2'].text = `免费次数:${data.remainTimes}次`;
});
console.log(data)
// console.log(data);
this.updateOption(data.option);
}
updateOption(option: any) {
const { categoryType, img, num, propType,realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this["prop"].visible = this['numsgroup'].visible = this['img'].visible = false;
this['propnums'].text = 'x1';
if(num)
this['propnums'].text = 'x' + num;
switch (categoryType) {
case 2:
// this['blood'].visible = true;
// this['numsgroup'].visible = true;
this["prop"].source = 'common_blood_png';
this['numsgroup'].visible = true;
this['numsgroup'].visible = this["prop"].visible = true;
break;
case 3:
this["prop"].source = `hbPrize_icon${propType}_png`;
this['numsgroup'].visible = true;
// this['numsgroup'].visible = true;
// this['img'].visible = true;
// this.data.url = `turnprize_icon${propType}_png`;
this['numsgroup'].visible= this["prop"].visible = true;
break;
case 4:
this["prop"].source = 'common_yuanbao_png';
this['numsgroup'].visible = true;
// this['money'].visible = true;
this['numsgroup'].visible = this["prop"].visible = true;
this['propnums'].text = '×' + realValue;
// this['numsgroup'].visible = true;
// this['money'].visible = true;
// this['propnums'].text = 'x' + realValue;
break;
default:
this['img'].visible = true;
......
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