Skip to content

X
xiaoxiaole
Commit 3c53ad14 authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'hotfix20200326' into dev

parents a399369e b9c93791
Show whitespace changes
Inline Side-by-side
Showing with 304 additions and 301 deletions
egret/libs/new_wx/MainBase.ts
View file @ 3c53ad14
...@@ -79,6 +79,8 @@ import RechargePanel from "../../src/panels/RechargePanel"; ...@@ -79,6 +79,8 @@ import RechargePanel from "../../src/panels/RechargePanel";
import BombTips2Panel from "../../src/panels/BombTips2Panel"; import BombTips2Panel from "../../src/panels/BombTips2Panel";
import BackIndexPanel from "../../src/panels/BackIndexPanel"; import BackIndexPanel from "../../src/panels/BackIndexPanel";
import HelpBloodPanel from "../../src/panels/help/HelpBloodPanel"; import HelpBloodPanel from "../../src/panels/help/HelpBloodPanel";
import HelpInvitePanel from "../../src/panels/help/HelpInvitePanel";
import HelpScratchPanel from "../../src/panels/help/HelpScratchPanel";
export default class MainBase extends eui.UILayer { export default class MainBase extends eui.UILayer {
constructor() { constructor() {
...@@ -168,6 +170,8 @@ export default class MainBase extends eui.UILayer { ...@@ -168,6 +170,8 @@ export default class MainBase extends eui.UILayer {
['shopTip', { cls: ShopTipPanel }], ['shopTip', { cls: ShopTipPanel }],
['recharge', { cls: RechargePanel }], ['recharge', { cls: RechargePanel }],
['HelpBloodPanel', { cls: HelpBloodPanel }], ['HelpBloodPanel', { cls: HelpBloodPanel }],
['HelpInvitePanel', { cls: HelpInvitePanel }],
['HelpScratchPanel', { cls: HelpScratchPanel }],
]; ];
const scenes = [ const scenes = [
......
egret/resource/default.res.json
View file @ 3c53ad14
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
}, },
{ {
"name": "preload", "name": "preload",
"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_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"
} }
], ],
"resources": [ "resources": [
...@@ -5095,6 +5095,16 @@ ...@@ -5095,6 +5095,16 @@
"name": "help_blood_fail_text4_png", "name": "help_blood_fail_text4_png",
"type": "image", "type": "image",
"url": "assets/help/help_blood_fail_text4.png" "url": "assets/help/help_blood_fail_text4.png"
},
{
"name": "help_invite2_text3_png",
"type": "image",
"url": "assets/help/help_invite2_text3.png"
},
{
"name": "help_invite2_text4_png",
"type": "image",
"url": "assets/help/help_invite2_text4.png"
} }
] ]
} }
\ No newline at end of file
egret/resource/default.thm.json
View file @ 3c53ad14
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
"skins": {}, "skins": {},
"autoGenerateExmlsList": true, "autoGenerateExmlsList": true,
"exmls": [ "exmls": [
"resource/skins/HelpScratchSkin.exml",
"resource/skins/HelpBloodSkin.exml", "resource/skins/HelpBloodSkin.exml",
"resource/skins/HelpInviteSkin.exml",
"resource/skins/ADSkin.exml", "resource/skins/ADSkin.exml",
"resource/skins/ADSmallSkin.exml", "resource/skins/ADSmallSkin.exml",
"resource/skins/AlertSkin.exml", "resource/skins/AlertSkin.exml",
......
egret/resource/skins/HelpBloodSkin.exml
View file @ 3c53ad14
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<e:Group y="88" width="100%" horizontalCenter="0"> <e:Group y="88" width="100%" horizontalCenter="0">
<e:Image id="txt_standby" source="help_blood_1_text_png" y="0" horizontalCenter="0" visible="false"/> <e:Image id="txt_standby" source="help_blood_1_text_png" y="0" horizontalCenter="0" visible="false"/>
<e:Image id="txt_success" source="help_blood_success_text2_png" horizontalCenter="0" visible="false"/> <e:Image id="txt_success" source="help_blood_success_text2_png" horizontalCenter="0" visible="false"/>
<e:Image id="txt_error" source="help_blood_fail_text_png" horizontalCenter="0" visible="false"/> <e:Image id="txt_error2002002026" source="help_blood_fail_text_png" horizontalCenter="0" visible="false"/>
<e:Image id="txt_error2002002016" source="help_blood_fail_text2_png" horizontalCenter="0" visible="false"/> <e:Image id="txt_error2002002016" source="help_blood_fail_text2_png" horizontalCenter="0" visible="false"/>
<e:Image id="txt_error2002002036" source="help_blood_fail_text3_png" horizontalCenter="0"/> <e:Image id="txt_error2002002036" source="help_blood_fail_text3_png" horizontalCenter="0" visible="false"/>
<e:Image source="help_blood_fail_text4_png" x="379" y="21" visible="false"/> <e:Image id="txt_error2002002025" source="help_blood_fail_text4_png" horizontalCenter="0" visible="false"/>
</e:Group> </e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/HelpInviteSkin.exml 0 → 100644
View file @ 3c53ad14
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="HelpInviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="26" horizontalCenter="0" source="help_invite2_png"/>
<e:Group y="855" horizontalCenter="0">
<e:Image id="helpbtn" x="0" y="0" source="help_invite2_btn_png"/>
<e:Image id="gobtn" x="0" y="0" source="help_invite2_btn2_png" visible="false"/>
</e:Group>
<e:Group y="88" width="100%" horizontalCenter="0">
<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite2_text_png" visible="false"/>
<e:Image id="txt_success" horizontalCenter="0" source="help_invite2_text2_png" visible="false"/>
<e:Image id="txt_error0200202" horizontalCenter="0" source="help_invite2_text3_png" visible="false"/>
<e:Image id="txt_error400017" horizontalCenter="0" source="help_invite2_text4_png" visible="false"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/HelpScratchSkin.exml 0 → 100644
View file @ 3c53ad14
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="HelpScratchSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="26" horizontalCenter="0" source="help_invite2_png"/>
<e:Group y="855" horizontalCenter="0">
<e:Image id="helpbtn" x="0" y="0" source="help_invite2_btn_png"/>
<e:Image id="gobtn" x="0" y="0" source="help_invite2_btn2_png" visible="false"/>
</e:Group>
<e:Group y="88" width="100%" horizontalCenter="0">
<e:Image id="txt_standby" y="0" horizontalCenter="0" source="help_invite2_text_png" visible="false"/>
<e:Image id="txt_success" horizontalCenter="0" source="help_invite2_text2_png" visible="false"/>
<e:Image id="txt_error0200202" horizontalCenter="0" source="help_invite2_text3_png" visible="false"/>
<e:Image id="txt_error400017" horizontalCenter="0" source="help_invite2_text4_png" visible="false"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/MapScene.ts
View file @ 3c53ad14
...@@ -55,72 +55,38 @@ export default class MapScene extends Scene { ...@@ -55,72 +55,38 @@ export default class MapScene extends Scene {
private icons = {}; private icons = {};
private actIcon: ActIcon = null; private actIcon: ActIcon = null;
private sendInvite() { private sendInvite(panels: any[], parmas: any[]) {
const code = Utils.getRequestByKey('shareCode') || Utils.getRequestByKey('token');//0224新加用token取一边 const code = Utils.getRequestByKey('shareCode') || Utils.getRequestByKey('token');//0224新加用token取一边
if (!code) return; if (!code) return false;
if (doHelpFlag) { if (doHelpFlag) {
return; return false;
} }
const sceneCode = Utils.getRequestByKey('sceneCode') const sceneCode = Utils.getRequestByKey('sceneCode')
if (sceneCode == CodeChannels.AddBlood) { if (sceneCode == CodeChannels.AddBlood) {
const netCallback = ()=>{ doHelpFlag = true; }; const netCallback = () => { doHelpFlag = true; };
PanelCtrl.instance.show('HelpBloodPanel',{netCallback:netCallback,code:code}); panels.push('HelpBloodPanel');
parmas.push({ netCallback: netCallback, code: code });
} }
else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了 else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了
showToast("欢迎加入游戏，去闯关吧"); showToast("欢迎加入游戏，去闯关吧");
return false;
}//剩下的就是邀请有礼和刮刮卡了，本身code上有区分 }//剩下的就是邀请有礼和刮刮卡了，本身code上有区分
else if (code.indexOf("12345678") == -1) { // 邀请有礼 else if (code.indexOf("12345678") == -1) { // 邀请有礼
const dojoin = DataManager.ins.getData('hc_doJoin'); const dojoin = DataManager.ins.getData('hc_doJoin');
if (!dojoin) { if (!dojoin) {
showToast("开启消除之旅") showToast("开启消除之旅");
return; return false;
} }
NetManager.ins.doHelp((success, res) => { const netCallback = () => { doHelpFlag = true; };
doHelpFlag = true; panels.push('HelpInvitePanel');
switch (true) { parmas.push({ netCallback: netCallback, code: code });
case (res.code == "400017"):
showToast("您不是新用户呢～");
break;
case (res.code == "0000022"):
showToast("不可以给自己助力哦～");
break;
case (res.code == "0200202"):
showToast("已经给好友助力过了哦～");
break;
default:
break;
}
if (!success) {
return;
}
showToast("助力成功");
NetManager.ins.showLog(getlogItem(36));
}, code, dojoin.data);
} else { // 刮刮卡 } else { // 刮刮卡
const _code = code.slice(8); const netCallback = () => { doHelpFlag = true; };
NetManager.ins.scratchDoHelp((success, res) => { panels.push('HelpScratchPanel');
doHelpFlag = true; parmas.push({ netCallback: netCallback, code: code });
switch (true) {
case (res.code == "0000024"):
showToast("今日刮卡次数已达到上线限哦～");
break;
case (res.code == "0000022"):
showToast("不可以给自己刮哦～");
break;
case (res.code == "0000023"):
showToast("已经给好友刮过了哦～");
break;
default:
break;
}
if (!success) {
return;
}
showToast("助力成功，参与闯关赢现金"/*"帮刮成功！"*/);
NetManager.ins.showLog(getlogItem(52));
NetManager.ins.showLog(getlogItem(36));
}, _code);
} }
return true;
} }
// 邀请有礼角标倒计时 // 邀请有礼角标倒计时
...@@ -158,7 +124,7 @@ export default class MapScene extends Scene { ...@@ -158,7 +124,7 @@ export default class MapScene extends Scene {
this.addIcon(); // 添加Icon this.addIcon(); // 添加Icon
this.sendInvite();
this.hcRedBoobBaseInfo(); this.hcRedBoobBaseInfo();
this.updateSignBtn(); this.updateSignBtn();
this.updateMyInfo(); this.updateMyInfo();
...@@ -175,7 +141,13 @@ export default class MapScene extends Scene { ...@@ -175,7 +141,13 @@ export default class MapScene extends Scene {
stopGamebg(); stopGamebg();
NetManager.ins.getSignInfo(() => { NetManager.ins.getSignInfo(() => {
const parmas = [];
const panels = []; const panels = [];
const result = this.sendInvite(panels, parmas);
if (result) {
PanelCtrl.instance.showPanels(panels, parmas, this.onAllPanelHide);
return;
}
const date = new Date(); const date = new Date();
date.setHours(0, 0, 0, 0); date.setHours(0, 0, 0, 0);
const nowTimerStr = date.getTime() + ''; const nowTimerStr = date.getTime() + '';
...@@ -256,13 +228,13 @@ export default class MapScene extends Scene { ...@@ -256,13 +228,13 @@ export default class MapScene extends Scene {
if (!readCache() && getHomeData().levels.length <= 0) { //引导 if (!readCache() && getHomeData().levels.length <= 0) { //引导
const guide = new GuideCon(() => { const guide = new GuideCon(() => {
PanelCtrl.instance.showPanels(panels, [], this.onAllPanelHide); PanelCtrl.instance.showPanels(panels, parmas, this.onAllPanelHide);
}); });
this.addChild(guide); this.addChild(guide);
guide.play(1) guide.play(1)
// console.log(guide) // console.log(guide)
} else { //不用引导 } else { //不用引导
PanelCtrl.instance.showPanels(panels, [], this.onAllPanelHide); PanelCtrl.instance.showPanels(panels, parmas, this.onAllPanelHide);
} }
}, window['signActivityId']); }, window['signActivityId']);
......
egret/src/panels/help/HelpBloodPanel.ts
View file @ 3c53ad14
...@@ -2,6 +2,7 @@ import Panel from "../../../libs/new_wx/components/Panel"; ...@@ -2,6 +2,7 @@ import Panel from "../../../libs/new_wx/components/Panel";
import { NetManager } from "../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main"; import { getlogItem } from "../../Main";
import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl"; import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
import { gotoNextLevel } from "../gotoNextLevel";
export default class HelpBloodPanel extends Panel { export default class HelpBloodPanel extends Panel {
netCallback; netCallback;
...@@ -9,8 +10,6 @@ export default class HelpBloodPanel extends Panel { ...@@ -9,8 +10,6 @@ export default class HelpBloodPanel extends Panel {
start(data) { start(data) {
this.netCallback = data.netCallback; this.netCallback = data.netCallback;
this.code = data.code; this.code = data.code;
'helpbtn';
'gobtn';
NetManager.ins.showLog(getlogItem(87)); NetManager.ins.showLog(getlogItem(87));
this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this); this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
...@@ -21,21 +20,23 @@ export default class HelpBloodPanel extends Panel { ...@@ -21,21 +20,23 @@ export default class HelpBloodPanel extends Panel {
onclick_gobtn() { onclick_gobtn() {
NetManager.ins.clickLog(getlogItem(88)); NetManager.ins.clickLog(getlogItem(88));
this.hidePanel();
gotoNextLevel();
} }
onClick() { onClick() {
this['helpbtn'].visible = false; this['helpbtn'].visible = false;
this['gobtn'].visible = true; this['gobtn'].visible = true;
this['txt_success'].visible=true;
NetManager.ins.showLog(getlogItem(88)); NetManager.ins.showLog(getlogItem(88));
NetManager.ins.clickLog(getlogItem(87)); NetManager.ins.clickLog(getlogItem(87));
NetManager.ins.doHelpNew((s, res) => { NetManager.ins.doHelpNew((s, res) => {
this.netCallback(); this.netCallback();
this['txt_sutxt_standbyccess'].visible=false; this['txt_standby'].visible = false;
// doHelpFlag = true; // doHelpFlag = true;
if (s) { if (s) {
this['txt_success'].visible=true; this['txt_success'].visible = true;
showToast("助力成功！一起闯关赢现金吧") // showToast("助力成功！一起闯关赢现金吧")
} else { } else {
var codeMsgs = {//具体code还没给 var codeMsgs = {//具体code还没给
"2002002016": "不可以给自己助力哦~",// "2002002016": "不可以给自己助力哦~",//
...@@ -47,7 +48,12 @@ export default class HelpBloodPanel extends Panel { ...@@ -47,7 +48,12 @@ export default class HelpBloodPanel extends Panel {
"2002002015": "口令不存在", "2002002015": "口令不存在",
"2002002026": "好友今日被助力已达上限啦！" "2002002026": "好友今日被助力已达上限啦！"
} }
if (res && codeMsgs[res.code] && this[`txt_error${res.code}`]) {
this[`txt_error${res.code}`].visible = true;
} else {
showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败"); showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
// this.hidePanel();
}
} }
}, this.code) }, this.code)
} }
......
egret/src/panels/help/HelpInvitePanel.ts 0 → 100644
View file @ 3c53ad14
import Panel from "../../../libs/new_wx/components/Panel";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
import { gotoNextLevel } from "../gotoNextLevel";
import { DataManager } from "../../../libs/tw/manager/DataManager";
export default class HelpInvitePanel extends Panel {
netCallback;
code;
start(data) {
this.netCallback = data.netCallback;
this.code = data.code;
// NetManager.ins.showLog(getlogItem(87));
this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
this['txt_standby'].visible = true;
this['helpbtn'].visible = true;
}
onclick_gobtn() {
// NetManager.ins.clickLog(getlogItem(88));
this.hidePanel();
gotoNextLevel();
}
onClick() {
this['helpbtn'].visible = false;
this['gobtn'].visible = true;
const dojoin = DataManager.ins.getData('hc_doJoin');
NetManager.ins.doHelp((success, res) => {
this.netCallback();
this['txt_standby'].visible = false;
if (success) {
this['txt_success'].visible = true;
} else {
var codeMsgs = {
"400017": "您不是新用户呢～",
"0000022": "不可以给自己助力哦～",
"0200202": "已经给好友助力过了哦～",
}
if (res && codeMsgs[res.code] && this[`txt_error${res.code}`]) {
this[`txt_error${res.code}`].visible = true;
} else {
showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
}
}
}, this.code, dojoin.data);
}
get skinResKey() { return 'helpGroup' }
get skinKey() { return 'HelpInvite' }
}
\ No newline at end of file
egret/src/panels/help/HelpScratchPanel.ts 0 → 100644
View file @ 3c53ad14
import Panel from "../../../libs/new_wx/components/Panel";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
import { gotoNextLevel } from "../gotoNextLevel";
import { DataManager } from "../../../libs/tw/manager/DataManager";
export default class HelpScratchPanel extends Panel {
netCallback;
code;
start(data) {
this.netCallback = data.netCallback;
this.code = data.code;
// NetManager.ins.showLog(getlogItem(87));
this['gobtn'].once(egret.TouchEvent.TOUCH_TAP, this.onclick_gobtn, this);
this['helpbtn'].once(egret.TouchEvent.TOUCH_TAP, this.onClick, this);
this['txt_standby'].visible = true;
this['helpbtn'].visible = true;
}
onclick_gobtn() {
// NetManager.ins.clickLog(getlogItem(88));
this.hidePanel();
gotoNextLevel();
}
onClick() {
this['helpbtn'].visible = false;
this['gobtn'].visible = true;
const _code = this.code.slice(8);
NetManager.ins.scratchDoHelp((success, res) => {
this.netCallback();
switch (true) {
case (res.code == "0000024"):
showToast("今日刮卡次数已达到上线限哦～");
break;
case (res.code == "0000022"):
showToast("不可以给自己刮哦～");
break;
case (res.code == "0000023"):
showToast("已经给好友刮过了哦～");
break;
default:
break;
}
if (!success) {
return;
}
showToast("助力成功，参与闯关赢现金"/*"帮刮成功！"*/);
}, _code);
}
get skinResKey() { return 'helpGroup' }
get skinKey() { return 'HelpScratch' }
}
\ No newline at end of file
mock/happyclear/doHelp.json
View file @ 3c53ad14
{ {
"success":true, "success":0,
"code":null, "code":"0200202",
"desc":null, "desc":null,
"timestamp":1566199822308, "timestamp":1566199822308,
"data":"" "data":""
......
mock/happyclear/doHelpNew.json
View file @ 3c53ad14
{ {
"success": true, "success": false,
"code": "0000000000", "code": "2002002036",
"desc": "OK", "desc": "OK",
"timestamp": 1571052938097, "timestamp": 1571052938097,
"data": { "data": {
......
mock/happyclear/home.json
View file @ 3c53ad14
...@@ -2633,136 +2633,6 @@ ...@@ -2633,136 +2633,6 @@
"levelNum": 524, "levelNum": 524,
"maxScore": 47440, "maxScore": 47440,
"stars": 1 "stars": 1
},
{
"levelNum": 525,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 526,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 527,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 528,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 529,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 530,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 531,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 532,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 533,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 534,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 535,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 536,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 537,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 538,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 539,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 540,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 541,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 542,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 543,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 544,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 545,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 546,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 547,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 548,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 549,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 550,
"maxScore": 47440,
"stars": 1
} }
], ],
...@@ -2780,7 +2650,7 @@ ...@@ -2780,7 +2650,7 @@
"num": 3 "num": 3
} }
], ],
"remainEnargy": 0, "remainEnargy": 1,
"askForEnergy": false, "askForEnergy": false,
"canReceiveTreasureBoxNum": 10, "canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150 "nextRangeStarsNum": 150
......
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