Skip to content

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

1

parent d909c4a2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 109 deletions
egret/resource/TextureMerger/hbcuttime.tmproject 0 → 100644
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbcuttime","version":5,"files":["../assets/hbCutTime/hbCutTime_bg.png","../assets/hbCutTime/hbCutTime_btn_disable.png","../assets/hbCutTime/hbCutTime_btn_enable.png","../assets/hbCutTime/hbCutTime_cutLine_disable.png","../assets/hbCutTime/hbCutTime_cutLine_enable.png","../assets/hbCutTime/hbCutTime_rule_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/hbgame.tmproject 0 → 100644
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbgame","version":5,"files":["../assets/hbGame/hbGame_CutTime_bg.png","../assets/hbGame/hbGame_CutTime_progress.png","../assets/hbGame/hbGame_num_bg.png","../assets/hbGame/hbGame_tips.png","../assets/hbGame/hbGame_1.png","../assets/hbGame/hbGame_2.png","../assets/hbGame/hbGame_3.png","../assets/hbGame/hbGame_+1.png","../assets/hbGame/hbGame_bird_touch.png","../assets/hbGame/hbGame_bird.png","../assets/hbGame/hbGame_cattle.png","../assets/hbGame/hbGame_cattle_touch.png","../assets/hbGame/hbGame_hongbao_touch.png","../assets/hbGame/hbGame_+2.png","../assets/hbGame/hbGame_hongbao.png","../assets/hbGame/hbGame_lion.png","../assets/hbGame/hbGame_lion_touch.png","../assets/hbGame/hbGame_pig_touch.png","../assets/hbGame/hbGame_pig.png","../assets/hbGame/hbGame_rabbit_touch.png","../assets/hbGame/hbGame_rabbit.png","../assets/hbGame/hbGame_CutTime_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/hbnoprize.tmproject 0 → 100644
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbnoprize","version":5,"files":["../assets/hbNoPrize/hbNoPrize_bg.png","../assets/hbNoPrize/hbNoPrize_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/hbprize.tmproject 0 → 100644
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbprize","version":5,"files":["../assets/hbPrize/hbPrize_bg.png","../assets/hbPrize/hbPrize_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/map.tmproject
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/icongray.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png"]}
\ No newline at end of file
egret/resource/TextureMerger/preload.tmproject
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/map/icongray.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2周一红包雨.png","../assets/map/map2热门引导.png","../assets/map/map2红包大作战.png","../assets/map/maphot.png"]}
\ No newline at end of file
egret/resource/TextureMerger/redbagactivity.tmproject 0 → 100644
View file @ dc88943c
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbagactivity","version":5,"files":["../assets/redbagactivity/redbagact_rule按钮.png","../assets/redbagactivity/redbagactbtn.png","../assets/redbagactivity/redbagact热门活动专区.png","../assets/redbagactivity/redbagact退出按钮.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ dc88943c
......@@ -81,7 +81,7 @@
"name": "signprize"
},
{
"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png,FZY4JW_TTF,FZY3JW_1_TTF",
"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png,FZY4JW_TTF,FZY3JW_1_TTF,hbGameCutTimeFont_fnt,hbGameScoreFont_fnt,hbCutTimeFont_fnt",
"name": "common"
},
{
......@@ -177,7 +177,7 @@
"name": "turntableprize"
},
{
"keys": "hbCutTimeFont_fnt,hbCutTimeFont_png,hbCutTime_bg_png,hbCutTime_btn_disable_png,hbCutTime_btn_enable_png,hbCutTime_cutLine_disable_png,hbCutTime_cutLine_enable_png,hbCutTime_rule_btn_png",
"keys": "hbCutTime_bg_png,hbCutTime_btn_disable_png,hbCutTime_btn_enable_png,hbCutTime_cutLine_disable_png,hbCutTime_cutLine_enable_png,hbCutTime_rule_btn_png",
"name": "hbcuttime"
},
{
......@@ -189,7 +189,7 @@
"name": "hbnoprize"
},
{
"keys": "hbGameCutTimeFont_fnt,hbGameCutTimeFont_png,hbGame_CutTime_bg_png,hbGame_CutTime_progress_png,hbGame_num_bg_png,hbGame_tips_png,hbGame_1_png,hbGame_2_png,hbGame_3_png,hbGame_+1_png,hbGame_bird_touch_png,hbGame_bird_png,hbGame_cattle_png,hbGame_cattle_touch_png,hbGame_hongbao_touch_png,hbGame_+2_png,hbGame_hongbao_png,hbGame_lion_png,hbGame_lion_touch_png,hbGame_pig_touch_png,hbGame_pig_png,hbGame_rabbit_touch_png,hbGame_rabbit_png,hbGameScoreFont_fnt,hbGameScoreFont_png,hbGame_CutTime_btn_png",
"keys": "hbGame_CutTime_bg_png,hbGame_CutTime_progress_png,hbGame_num_bg_png,hbGame_tips_png,hbGame_1_png,hbGame_2_png,hbGame_3_png,hbGame_+1_png,hbGame_bird_touch_png,hbGame_bird_png,hbGame_cattle_png,hbGame_cattle_touch_png,hbGame_hongbao_touch_png,hbGame_+2_png,hbGame_hongbao_png,hbGame_lion_png,hbGame_lion_touch_png,hbGame_pig_touch_png,hbGame_pig_png,hbGame_rabbit_touch_png,hbGame_rabbit_png,hbGame_CutTime_btn_png",
"name": "hbgame"
},
{
......
egret/resource/default.thm.json
View file @ dc88943c
......@@ -27,9 +27,9 @@
"resource/skins/H52Skin.exml",
"resource/skins/H5Skin.exml",
"resource/skins/HbCutTimeSkin.exml",
"resource/skins/HbPrizeSkin.exml",
"resource/skins/HbNoPrizeSkin.exml",
"resource/skins/HbGameSkin.exml",
"resource/skins/HbNoPrizeSkin.exml",
"resource/skins/HbPrizeSkin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteCutTimePanelSkin.exml",
"resource/skins/InviteItemSkin.exml",
......@@ -52,6 +52,8 @@
"resource/skins/RankFriendListSkin.exml",
"resource/skins/RankItemSkin.exml",
"resource/skins/RankSkin.exml",
"resource/skins/RedBagActivitySkin.exml",
"resource/skins/RedBagAlertSkin.exml",
"resource/skins/ReliveSkin.exml",
"resource/skins/RuleSkin.exml",
"resource/skins/ScratchItemSkin.exml",
......
egret/scripts/MyExmlPlugin.ts
View file @ dc88943c
......@@ -12,7 +12,11 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
'sharenums.png',
'nums.png',
'nums3.png',
'nums2.png'
'nums2.png',
'hbCutTimeFont.png',
'hbGameScoreFont.png',
'hbGameCutTimeFont.png'
];
if (excludes.indexOf(file.basename) != -1) {
return file;
......
egret/src/panels/HongbaoRain/HbCutTime.ts
View file @ dc88943c
......@@ -7,12 +7,12 @@ import { NetManager } from "../../../libs/tw/manager/NetManager";
* 红包雨倒计时
*/
export default class HbCutTime extends Panel {
public cutTimeLabel:eui.BitmapLabel;
public tipImage:eui.Image;
public closeBtn:eui.Button;
public ok_bt:eui.Button;
public rule_btn:eui.Button;
public ok_btn:eui.Image;
public cutTimeLabel: eui.BitmapLabel;
public tipImage: eui.Image;
public closeBtn: eui.Button;
public ok_bt: eui.Button;
public rule_btn: eui.Button;
public ok_btn: eui.Image;
private cutTimer: CutTimer = null;
......@@ -36,30 +36,37 @@ export default class HbCutTime extends Panel {
return;
}
let data = res.data;
this.cutTimer = new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', ()=>this.hbRainBaseInfo());
this.cutTimer = new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', () => this.hbRainBaseInfo());
let sysTime = res.timestamp; // 当前系统事件
let time;
if(data.currentSession){
if(data.currentSession) {
time = data.currentSession.endTime - sysTime;
if(data.canJoin){
if(data.canJoin) {
this.ok_btn.source = 'hbCutTime_btn_enable_png';
this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}else {
} else {
this.ok_btn.source = 'hbCutTime_btn_disable_png';
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}
this.tipImage.source = 'hbCutTime_cutLine_enable_png';
}else if (data.nextSession) {
if(!this.cutTimer.start(time)) {
this.cutTimer.stop();
this.cutTimer.start(time);
}
} else if(data.nextSession) {
time = data.nextSession.startTime - sysTime;
this.ok_btn.source = 'hbCutTime_btn_disable_png';
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
this.tipImage.source = 'hbCutTime_cutLine_enable_png';
}
this.tipImage.source = 'hbCutTime_cutLine_disable_png';
if(!this.cutTimer.start(time)) {
this.cutTimer.stop();
this.cutTimer.start(time);
}
} else {
this.ok_btn.source = 'hbCutTime_btn_disable_png';
this.tipImage.source = 'hbCutTime_cutLine_disable_png';
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}
})
}
......
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