Skip to content

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

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

# Conflicts:
#	egret/resource/default.res.json
合并
parents 68a91829 e3bf7fae
Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 137 deletions
egret/libs/new_wx/components/NoPrizePanel.ts
View file @ ff9cc11a
......@@ -14,7 +14,7 @@ export default class NoPrizePanel extends Panel {
start(data) {
super.start();
this._level = parseInt(data.level + '');
this['lvTxt'].text = `关卡${this._level}`
this['lvTxt'].text = `关卡${this._level}`;
//0224需求，去掉炫耀按钮，继续闯关按钮居中
this['shareBtn'].visible = false;
......
egret/resource/default.res.json
View file @ ff9cc11a
......@@ -73,7 +73,7 @@
"name": "exchange"
},
{
"keys": "signitem_png,signicon6_png,signicon5_png,signicon4_png,signicon3_png,signicon2_png,signicon_blood_png,signbtn4_png,signbtn3_png,signbtn2_png,signbtn1_png,signbg_png,sign_quan88_png,sign_quan8_png,sign_quan58_png,sign_quan38_png,sign_quan28_png,sign_quan16_png,sign_quan15_png,sign_quan12_png,sign_line2_png,sign_line_png,sign_light_png,sign_icon1_png,sign_quan10_png,sign_quan23_png,sign_quan36_png,sign_quan25_png,sign_quan35_png,sign_quan30_png,sign_mask_png,signitemno_png,signitemyes_png,unsignbtn_png",
"keys": "signitem_png,signicon6_png,signicon5_png,signicon4_png,signicon3_png,signicon2_png,signicon_blood_png,signbtn4_png,signbtn3_png,signbtn2_png,signbtn1_png,signbg_png,sign_quan88_png,sign_quan8_png,sign_quan58_png,sign_quan38_png,sign_quan28_png,sign_quan16_png,sign_quan15_png,sign_quan12_png,sign_line2_png,sign_line_png,sign_light_png,sign_icon1_png,sign_quan10_png,sign_quan23_png,sign_quan36_png,sign_quan25_png,sign_quan35_png,sign_quan30_png,sign_mask_png,signitemno_png,signitemyes_png",
"name": "sign"
},
{
......@@ -181,7 +181,7 @@
"name": "hbprize"
},
{
"keys": "hbNoPrize_bg_png,hbNoPrize_btn_png",
"keys": "hbNoPrize_bg_png,hbNoPrize_btn_png,hbnoprizebg2_png",
"name": "hbnoprize"
},
{
......@@ -239,10 +239,6 @@
{
"keys": "help_blood_1_btn_png,help_blood_1_text_png,help_blood_fail_btn_png,help_blood_fail_text_png,help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_blood_success_text_png,help_blood_success_text2_png,help_card_bg_png,help_card_prize_png,help_closebtn1_png,help_invite2_btn_png,help_invite2_btn2_png,help_invite2_text_png,help_invite2_text2_png,help_invite2_text3_png,help_invite2_text4_png,help_invite_bg_png,help_invite_btn1_png,help_invite_fail_btn_png,help_invite_fail_text1_png,help_invite_fail_text2_png,help_invite_fail_text3_png,help_invite_fail_text4_png,help_invite_success_btn_png,help_invite_success_txt_png,help_invite_text_png,help_light_png",
"name": "helpGroup"
},
{
"keys": "unsignbtn_png",
"name": "preload"
}
],
"resources": [
......@@ -5373,9 +5369,9 @@
"name": "commom_share1_png"
},
{
"url": "assets/sign/unsignbtn.png",
"url": "assets/hbNoPrize/hbnoprizebg2.png",
"type": "image",
"name": "unsignbtn_png"
"name": "hbnoprizebg2_png"
}
]
}
\ No newline at end of file
egret/resource/default.thm.json
View file @ ff9cc11a
{
"skins": {},
"autoGenerateExmlsList": true,
"exmls": [
"resource/skins/ADSkin.exml",
"resource/skins/ADSmallSkin.exml",
"resource/skins/AlertSkin.exml",
"resource/skins/AvatarSkin.exml",
"resource/skins/BackIndexSkin.exml",
"resource/skins/BackSkin.exml",
"resource/skins/BagItem2Skin.exml",
"resource/skins/BagItemSkin.exml",
"resource/skins/BagQuitSkin.exml",
"resource/skins/BagSkin.exml",
"resource/skins/Blood2Skin.exml",
"resource/skins/BloodSkin.exml",
"resource/skins/Box2Skin.exml",
"resource/skins/BoxSkin.exml",
"resource/skins/Buy1Skin.exml",
"resource/skins/Buy2Skin.exml",
"resource/skins/Buy3Skin.exml",
"resource/skins/ExchangeSkin.exml",
"resource/skins/FailSkin.exml",
"resource/skins/FriendItem2Skin.exml",
"resource/skins/FriendItemSkin.exml",
"resource/skins/FriendShareSkin.exml",
"resource/skins/FriendSkin.exml",
"resource/skins/H52Skin.exml",
"resource/skins/H5Skin.exml",
"resource/skins/HbCutTimeSkin.exml",
"resource/skins/HbGameSkin.exml",
"resource/skins/HbNoPrizeSkin.exml",
"resource/skins/HbPrizeSkin.exml",
"resource/skins/HbRuleSkin.exml",
"resource/skins/HelpBloodSkin.exml",
"resource/skins/HelpInviteSkin.exml",
"resource/skins/HelpScratchSkin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteCutTimePanelSkin.exml",
"resource/skins/InviteItemSkin.exml",
"resource/skins/InvitePrizePanelSkin.exml",
"resource/skins/InviteRulePanelSkin.exml",
"resource/skins/InviteRuleSkin.exml",
"resource/skins/InviteSkin.exml",
"resource/skins/Main2Skin.exml",
"resource/skins/MapBottomSkin.exml",
"resource/skins/MapRepeatSkin.exml",
"resource/skins/MapSkin.exml",
"resource/skins/MapTopSkin.exml",
"resource/skins/NoPrizeSkin.exml",
"resource/skins/OptionItemSkin.exml",
"resource/skins/OptionsSkin.exml",
"resource/skins/PlaySkin.exml",
"resource/skins/Prize2Skin.exml",
"resource/skins/PrizeSkin.exml",
"resource/skins/QuitSkin.exml",
"resource/skins/RankFriendListSkin.exml",
"resource/skins/RankItemSkin.exml",
"resource/skins/RankSkin.exml",
"resource/skins/RechargeSkin.exml",
"resource/skins/RedBagActivitySkin.exml",
"resource/skins/RedBagAlertSkin.exml",
"resource/skins/RedBombAlertSkin.exml",
"resource/skins/RedBombRuleSkin.exml",
"resource/skins/RedBombTips2Skin.exml",
"resource/skins/RedBombTipsSkin.exml",
"resource/skins/ReliveSkin.exml",
"resource/skins/RuleSkin.exml",
"resource/skins/ScratchItemSkin.exml",
"resource/skins/ScratchPrizeSkin.exml",
"resource/skins/ScratchRuleSkin.exml",
"resource/skins/ScratchSkin.exml",
"resource/skins/Share2Skin.exml",
"resource/skins/Share3Skin.exml",
"resource/skins/ShareCodePanelSkin.exml",
"resource/skins/ShareSkin.exml",
"resource/skins/ShareTipsSkin.exml",
"resource/skins/ShopSkin.exml",
"resource/skins/ShopTipSkin.exml",
"resource/skins/ShowOffSkin.exml",
"resource/skins/SignItemSkin.exml",
"resource/skins/SignPrizeSkin.exml",
"resource/skins/SignSkin.exml",
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskCenterItemSkin.exml",
"resource/skins/TaskCenterNoPrizeSkin.exml",
"resource/skins/TaskCenterPrizeSkin.exml",
"resource/skins/TaskCenterSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPrizeSkin.exml",
"resource/skins/TaskSkin.exml",
"resource/skins/Toast2Skin.exml",
"resource/skins/ToastSkin.exml",
"resource/skins/TurnRuleSkin.exml",
"resource/skins/TurntableNoPrizeSkin.exml",
"resource/skins/TurntablePrize2Skin.exml",
"resource/skins/TurntablePrizeSkin.exml",
"resource/skins/TurntableSkin.exml",
"resource/skins/VScrollBarSkin.exml"
],
"path": "resource/default.thm.json"
"skins": {},
"autoGenerateExmlsList": true,
"exmls": [
"resource/skins/ADSkin.exml",
"resource/skins/ADSmallSkin.exml",
"resource/skins/AlertSkin.exml",
"resource/skins/AvatarSkin.exml",
"resource/skins/BackIndexSkin.exml",
"resource/skins/BackSkin.exml",
"resource/skins/BagItem2Skin.exml",
"resource/skins/BagItemSkin.exml",
"resource/skins/BagQuitSkin.exml",
"resource/skins/BagSkin.exml",
"resource/skins/Blood2Skin.exml",
"resource/skins/BloodSkin.exml",
"resource/skins/Box2Skin.exml",
"resource/skins/BoxSkin.exml",
"resource/skins/Buy1Skin.exml",
"resource/skins/Buy2Skin.exml",
"resource/skins/Buy3Skin.exml",
"resource/skins/ExchangeSkin.exml",
"resource/skins/FailSkin.exml",
"resource/skins/FriendItem2Skin.exml",
"resource/skins/FriendItemSkin.exml",
"resource/skins/FriendShareSkin.exml",
"resource/skins/FriendSkin.exml",
"resource/skins/H52Skin.exml",
"resource/skins/H5Skin.exml",
"resource/skins/HbCutTimeSkin.exml",
"resource/skins/HbGameSkin.exml",
"resource/skins/HbNoPrizeSkin.exml",
"resource/skins/HbPrizeSkin.exml",
"resource/skins/HbRuleSkin.exml",
"resource/skins/HelpBloodSkin.exml",
"resource/skins/HelpInviteSkin.exml",
"resource/skins/HelpScratchSkin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteCutTimePanelSkin.exml",
"resource/skins/InviteItemSkin.exml",
"resource/skins/InvitePrizePanelSkin.exml",
"resource/skins/InviteRulePanelSkin.exml",
"resource/skins/InviteRuleSkin.exml",
"resource/skins/InviteSkin.exml",
"resource/skins/Main2Skin.exml",
"resource/skins/MapBottomSkin.exml",
"resource/skins/MapRepeatSkin.exml",
"resource/skins/MapSkin.exml",
"resource/skins/MapTopSkin.exml",
"resource/skins/NoPrizeSkin.exml",
"resource/skins/OptionItemSkin.exml",
"resource/skins/OptionsSkin.exml",
"resource/skins/PlaySkin.exml",
"resource/skins/Prize2Skin.exml",
"resource/skins/PrizeSkin.exml",
"resource/skins/QuitSkin.exml",
"resource/skins/RankFriendListSkin.exml",
"resource/skins/RankItemSkin.exml",
"resource/skins/RankSkin.exml",
"resource/skins/RechargeSkin.exml",
"resource/skins/RedBagActivitySkin.exml",
"resource/skins/RedBagAlertSkin.exml",
"resource/skins/RedBombAlertSkin.exml",
"resource/skins/RedBombRuleSkin.exml",
"resource/skins/RedBombTips2Skin.exml",
"resource/skins/RedBombTipsSkin.exml",
"resource/skins/ReliveSkin.exml",
"resource/skins/RuleSkin.exml",
"resource/skins/ScratchItemSkin.exml",
"resource/skins/ScratchPrizeSkin.exml",
"resource/skins/ScratchRuleSkin.exml",
"resource/skins/ScratchSkin.exml",
"resource/skins/Share2Skin.exml",
"resource/skins/Share3Skin.exml",
"resource/skins/ShareCodePanelSkin.exml",
"resource/skins/ShareSkin.exml",
"resource/skins/ShareTipsSkin.exml",
"resource/skins/ShopSkin.exml",
"resource/skins/ShopTipSkin.exml",
"resource/skins/ShowOffSkin.exml",
"resource/skins/SignItemSkin.exml",
"resource/skins/SignPrizeSkin.exml",
"resource/skins/SignSkin.exml",
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskCenterItemSkin.exml",
"resource/skins/TaskCenterNoPrizeSkin.exml",
"resource/skins/TaskCenterPrizeSkin.exml",
"resource/skins/TaskCenterSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPrizeSkin.exml",
"resource/skins/TaskSkin.exml",
"resource/skins/Toast2Skin.exml",
"resource/skins/ToastSkin.exml",
"resource/skins/TurnRuleSkin.exml",
"resource/skins/TurntableNoPrizeSkin.exml",
"resource/skins/TurntablePrize2Skin.exml",
"resource/skins/TurntablePrizeSkin.exml",
"resource/skins/TurntableSkin.exml",
"resource/skins/VScrollBarSkin.exml"
],
"path": "resource/default.thm.json"
}
\ No newline at end of file
egret/resource/skins/HbNoPrize2Skin.exml 0 → 100644
View file @ ff9cc11a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image y="177" horizontalCenter="0" source="hbnoprizebg2_png"/>
<e:Button id="closeBtn" label="" x="590.91" y="177">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<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:Button id="ok_btn" label="" y="738.76" anchorOffsetX="186.36" anchorOffsetY="63.15" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbNoPrize_btn_png" source.down="hbNoPrize_btn_png" source.disabled="hbNoPrize_btn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin>
\ No newline at end of file
egret/resource/skins/HbNoPrizeSkin.exml
View file @ ff9cc11a
......@@ -11,7 +11,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="ok_btn" label="" y="563" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
<e:Button id="ok_btn" label="" y="558" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbNoPrize_btn_png" source.down="hbNoPrize_btn_png" source.disabled="hbNoPrize_btn_png"/>
......@@ -19,6 +19,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="tips" text="您的速度太慢啦，奖励已经被抢走了～" y="389" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW" textColor="0xc17343"/>
<e:Label text="下次继续努力吧！" y="431" verticalAlign="bottom" textAlign="center" horizontalCenter="-1" fontFamily="FZY4JW" textColor="0xc17343"/>
<e:Label id="tips" text="您的速度太慢啦，奖励已经被抢走了～" y="389" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW" textColor="0xc17343" visible="false"/>
<e:Label text="手速稍慢，再接再厉！" y="412.5" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW" textColor="0xc17343" size="36"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/HbPrizeSkin.exml
View file @ ff9cc11a
......@@ -31,6 +31,6 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label text="不愧是卓越的手速达人！" y="448" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343"/>
<e:Label id="tipLabel" text="一共抢到18个红包" y="398" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343"/>
<e:Label text="不愧是卓越的手速达人！" y="420" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343"/>
<e:Label id="tipLabel" text="一共抢到18个红包" y="398" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/src/panels/HongbaoRain/HbGame.ts
View file @ ff9cc11a
......@@ -95,10 +95,10 @@ export default class HbGame extends Panel {
if (!success) {
switch (true) {
case (code == "600015"): // 网络错误 //命中风控参与规则
PanelCtrl.instance.show("HbNoPrize", { type: 2 });
PanelCtrl.instance.show("HbNoPrize2", { type: 2 });
break;
case (code == "600016"): // 游戏分数提交失败~如有疑问，请联系客服 // 苏宁风控 命中
PanelCtrl.instance.show("HbNoPrize", { type: 2 });
PanelCtrl.instance.show("HbNoPrize2", { type: 2 });
break;
case (code == "600054"): // 红包雨活动暂未开启
PanelCtrl.instance.show("HbNoPrize", { type: 1 });
......
egret/src/panels/HongbaoRain/HbNoPrize.ts
View file @ ff9cc11a
......@@ -3,9 +3,6 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import getHomeData from "../../getHomeData";
import { changeMapScene } from "../../startScene/StartScene";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { addAdComp } from "../BoxPanel";
import Utils from "../../Utils";
import CutTimer from "../../CutTimer";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
......@@ -30,19 +27,19 @@ export default class HbNoPrize extends Panel {
initUI() {
NetManager.ins.showLog(getlogItem(60));
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;
}
// 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() {
......
egret/src/panels/HongbaoRain/HbNoPrize2.ts 0 → 100644
View file @ ff9cc11a
import Panel from "../../../libs/new_wx/components/Panel";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import getHomeData from "../../getHomeData";
import { changeMapScene } from "../../startScene/StartScene";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
/**
* 红包雨无奖励风控
*/
export default class HbNoPrize extends Panel {
public closeBtn:eui.Button;
public ok_btn:eui.Button;
constructor(data) {
super();
this.data = data;
}
async start() {
super.start();
this.initUI();
GDispatcher.dispatchEvent('updateHbRainIcon');
}
initUI() {
NetManager.ins.showLog(getlogItem(60));
}
protected onSkinComplete() {
}
initEvents() {
super.initEvents();
this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}
removeEvents() {
super.removeEvents();
this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
}
onTouchTap_closeBtn() {
super.onTouchTap_closeBtn();
}
onTouchOK() {
NetManager.ins.clickLog(getlogItem(60));
if((getHomeData().levels.length + 1) > window['last_level']) {
changeMapScene();
super.hidePanel();
return;
}
PanelCtrl.instance.show("StartPanel", getHomeData().levels.length + 1);
}
protected get closeBtns(): eui.Button[] {
return [this['closeBtn']]
}
get skinKey() {
return 'HbNoPrize2'
}
}
egret/src/panels/TaskCenter/TaskCenterNoPrize.ts
View file @ ff9cc11a
import Panel from "../../../libs/new_wx/components/Panel";
import { addAdComp } from "../BoxPanel";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
import getHomeData from "../../getHomeData";
import { changeMapScene } from "../../startScene/StartScene";
......
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