Skip to content

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

1

parent ea48562f
Show whitespace changes
Inline Side-by-side
Showing with 219 additions and 120 deletions
egret/resource/default.res.json
View file @ 08f99b88
......@@ -177,7 +177,7 @@
"name": "turntableprize"
},
{
"keys": "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,hbCutTime_btn_null_png",
"name": "hbcuttime"
},
{
......@@ -197,8 +197,8 @@
"name": "redbagactivity"
},
{
"keys": "map2+_png,map2+bg_png,map2周一红包雨_png,map2热门引导_png,map2红包大作战_png,maphot_png",
"name": "preload"
"keys": "hbRule_bg_png",
"name": "hbrule"
}
],
"resources": [
......@@ -3286,6 +3286,16 @@
"url": "assets/map/maphot.png",
"type": "image",
"name": "maphot_png"
},
{
"url": "assets/hbRule/hbRule_bg.png",
"type": "image",
"name": "hbRule_bg_png"
},
{
"url": "assets/hbCutTime/hbCutTime_btn_null.png",
"type": "image",
"name": "hbCutTime_btn_null_png"
}
]
}
\ No newline at end of file
egret/resource/default.thm.json
View file @ 08f99b88
......@@ -30,6 +30,7 @@
"resource/skins/HbGameSkin.exml",
"resource/skins/HbNoPrizeSkin.exml",
"resource/skins/HbPrizeSkin.exml",
"resource/skins/HbRuleSkin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteCutTimePanelSkin.exml",
"resource/skins/InviteItemSkin.exml",
......
egret/resource/skins/HbCutTimeSkin.exml
View file @ 08f99b88
......@@ -13,14 +13,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="ok_bt" label="" y="668" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0" visible="false">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbCutTime_btn_enable_png" source.down="hbCutTime_btn_enable_png" source.disabled="hbCutTime_btn_disable_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="rule_btn" label="" y="740" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......
egret/resource/skins/HbNoPrizeSkin.exml
View file @ 08f99b88
......@@ -19,4 +19,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="tips" text="您的速度太慢啦，奖励已经被抢走了～" y="169" textColor="0xf54500" verticalAlign="bottom" textAlign="center" horizontalCenter="1" fontFamily="FZY4JW"/>
<e:Label text="下次继续努力吧！" y="211" textColor="0xF54500" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/HbRuleSkin.exml 0 → 100644
View file @ 08f99b88
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteRuleSkin" 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:Image id="ruleBg" horizontalCenter="0.5" y="152" source="hbRule_bg_png"/>
<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
<e:Group id="group" width="100%">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
<e:layout>
<e:VerticalLayout/>
</e:layout>
</e:Group>
</e:Scroller>
<e:Button id="closeBtn" label="" x="614" y="301">
<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"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin>
\ No newline at end of file
egret/src/panels/HongbaoRain/HbCutTime.ts
View file @ 08f99b88
......@@ -2,6 +2,7 @@ import Panel from "../../../libs/new_wx/components/Panel";
import CutTimer from "../../CutTimer";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import HbRule from "./HbRule";
/**
* 红包雨倒计时
......@@ -10,7 +11,6 @@ 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;
......@@ -63,7 +63,7 @@ export default class HbCutTime extends Panel {
this.cutTimer.start(time);
}
} else {
this.ok_btn.source = 'hbCutTime_btn_disable_png';
this.ok_btn.source = 'hbCutTime_btn_null_png';
this.tipImage.source = 'hbCutTime_cutLine_disable_png';
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}
......@@ -88,7 +88,10 @@ export default class HbCutTime extends Panel {
}
private tapRuleBtn() {
const rule = new HbRule();
rule.loadSkin();
rule.start();
this.addChild(rule);
}
removeEvents() {
......
egret/src/panels/HongbaoRain/HbGame.ts
View file @ 08f99b88
......@@ -72,48 +72,48 @@ export default class HbGame extends Panel {
if(!success) {
switch(true) {
case (code == "600015"): // 网络错误 //命中风控参与规则
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 2});
break;
case (code == "600016"): // 游戏分数提交失败~如有疑问，请联系客服 // 苏宁风控 命中
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 2});
break;
case (code == "600054"): // 红包雨活动暂未开启
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600055"): // 红包雨场次配置异常
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600056"): // 当前红包雨场次不存在
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600057"): // 当前红包雨场次已结束
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600058"): // 分数未达到目标
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600059"): // 红包炸弹活动暂未开启
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600060"): // 当前场次参与次数达到上限
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600061"): // 红包炸弹配置异常
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
case (code == "600062"): // 红包炸弹已经全部领取
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
default:
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
break;
}
return;
}
if(!data || !data.option || data.categoryType == 1) {
PanelCtrl.instance.show("HbNoPrize");
PanelCtrl.instance.show("HbNoPrize", {type: 1});
} else {
PanelCtrl.instance.show('HbPrize', data);
}
......
egret/src/panels/HongbaoRain/HbNoPrize.ts
View file @ 08f99b88
......@@ -13,22 +13,36 @@ import CutTimer from "../../CutTimer";
export default class HbNoPrize extends Panel {
public closeBtn:eui.Button;
public ok_btn:eui.Button;
public tips:eui.Label;
constructor(data) {
super();
this.data = data;
}
start() {
async start() {
super.start();
this.initUI();
}
initUI() {
let type = this.data.type;
switch(true) {
case (type == 1):
this.tips.text = '您的速度太慢啦，奖励已经被抢走了～';
break;
case (type == 2):
this.tips.text = '您的速度太慢啦，';
break;
default:
this.tips.text = '您的速度太慢啦，奖励已经被抢走了～';
break;
}
}
protected onSkinComplete() {
}
initEvents() {
......
egret/src/panels/HongbaoRain/HbPrize.ts
View file @ 08f99b88
import Panel from "../../../libs/new_wx/components/Panel";
import getHomeData from "../../getHomeData";
import { changeMapScene } from "../../startScene/StartScene";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
/**
* 红包雨奖励
......@@ -67,12 +71,14 @@ export default class HbPrize extends Panel {
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}
onTouchTap_closeBtn() {
super.onTouchTap_closeBtn();
}
onTouchOK() {
if((getHomeData().levels.length + 1) > window['last_level']) {
changeMapScene();
super.hidePanel();
return;
}
GDispatcher.dispatchEvent("getInviteInfo");
PanelCtrl.instance.show("StartPanel", getHomeData().levels.length + 1);
}
protected get closeBtns(): eui.Button[] {
......
egret/src/panels/HongbaoRain/HbRule.ts 0 → 100644
View file @ 08f99b88
import Panel from "../../../libs/new_wx/components/Panel";
import { DataManager } from "../../../libs/tw/manager/DataManager";
import { HtmlTextParser } from "../../../libs/new_wx/HtmlTextParser";
import getSkinPath from "../../../libs/new_wx/utils/getSkinPath";
/**
* 邀请规则面板
*/
export default class HbRule extends Panel {
public scroller: eui.Scroller;
public group: eui.Group;
public labContent: eui.Label;
public closeBtn: eui.Button;
private _mask: egret.Sprite;
start() {
super.start();
this.addRule();
this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, ()=>{
this.visible = false;
}, this);
}
loadSkin() {
this.skinName = getSkinPath(this.skinKey);
if (this.skin) {
this.onSkinComplete();
} else {
this.addEventListener(egret.Event.COMPLETE, this.onSkinComplete, this);
}
}
private addRule() {
const text =
`<br>1、用户每天邀请指定数量的新玩家参与闯关，可获得指定的现金券奖励。
2、用户发起邀请后，需在24小时内完成邀请任务；超过24小时，邀请任务失败，无法获得奖励，需重新发起邀请。
3、新用户仅包含未参与过狮狮连萌活动的用户。
4、用户不可为自己助力，或重复为好友助力。
5、完成邀请任务后，玩家可点击首页“邀请得现金券”图标领取现金券。
6、发放的奖励请在规定的有效时间内尽快领取或使用，逾期未领取或使用的会失效哦。
7、活动过程中，凡以不正当手段（包括但不限于作弊、恶意套现、扰乱系统、网络攻击等违规行为）参与本次活动的用户，苏宁易购有权终止其参加活动，并取消其获得奖励的资格。
8、极少数特殊情况下，若用户在完成活动的任务中被系统判定异常账户或风控账户，则可能导致奖励发放异常。
9、如遇不可抗力（包括但不限于重大自然灾害事件、活动受政府机关指令需要停止举办或调整的、活动遭受严重网络攻击不能正常进行的），苏宁易购有权取消、修改或暂停活动。`
this.labContent.textFlow = (new HtmlTextParser).parser(text);
}
get skinKey() {
return 'HbRule'
}
}
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