Skip to content

X
xiaoxiaole
Commit 97680d6d authored by wjf's avatar wjf
Browse files
Options

l

parent 61d06202
Show whitespace changes
Inline Side-by-side
Showing with 301 additions and 294 deletions
egret/libs/tw/manager/NetManager.ts
View file @ 97680d6d
...@@ -2386,7 +2386,7 @@ export class NetManager extends ABNetManager { ...@@ -2386,7 +2386,7 @@ export class NetManager extends ABNetManager {
param: { param: {
activityId: DataManager.ins.customCfgData.actId, activityId: DataManager.ins.customCfgData.actId,
activityType: "hdtool", activityType: "hdtool",
// dateUnit // dateUnit //不传就是不失效，传1当天有效
}, },
callback: callback callback: callback
}; };
...@@ -2408,7 +2408,7 @@ export class NetManager extends ABNetManager { ...@@ -2408,7 +2408,7 @@ export class NetManager extends ABNetManager {
activityId: DataManager.ins.customCfgData.actId, activityId: DataManager.ins.customCfgData.actId,
activityType: "hdtool", activityType: "hdtool",
shareCode, shareCode,
// singleLimitType: "",//待写 singleLimitType: 0,//0每日一次，1永久一次
// subType: "" //待写 // subType: "" //待写
}, },
callback: callback callback: callback
......
egret/src/mapScene/MapScene.ts
View file @ 97680d6d
...@@ -60,25 +60,27 @@ export default class MapScene extends Scene { ...@@ -60,25 +60,27 @@ export default class MapScene extends Scene {
//0224修改，取sceneCode， //0224修改，取sceneCode，
const sceneCode = Utils.getRequestByKey('sceneCode') const sceneCode = Utils.getRequestByKey('sceneCode')
if (sceneCode == CodeChannels.AddBlood) {//加体力的，0228到时会修改成助力，这里要加逻辑 if (sceneCode == CodeChannels.AddBlood) {//加体力的，0228到时会修改成助力，这里要加逻辑
if (window["test0228"]) {//测试助力，到时失败code再和后端对接 //if (window["test0228"]) {//测试助力，到时失败code再和后端对接
NetManager.ins.doHelpNew((s, res) => { NetManager.ins.doHelpNew((s, res) => {
if (s) { if (s) {
NetManager.ins.showLog(getlogItem(83)) NetManager.ins.showLog(getlogItem(83))
showToast("助力成功！一起闯关赢现金吧") showToast("助力成功！一起闯关赢现金吧")
} }
else if (res) { else {
if (res.code == "0000") {//code再和后端对接 var codeMsgs = {//具体code还没给
showToast("已经给好友助力过了哦~") "2002002016": "不可以给自己助力哦~",//
} else if (res.code == "00001") { //code再和后端对接 "2002002036": "已经给好友助力过了哦~",
showToast("今日助力次数已达上限啦！") "2002002037": "已经给好友助力过了哦~",
} else { showToast("助力失败") } "2002002025": "今日助力次数已达上限啦！",
} else { //新加的
showToast("助力失败")
} }
}, code) showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
} else {
showToast("欢迎小主，闯关就能拿现金~");
} }
}, code)
// } else {
// showToast("欢迎小主，闯关就能拿现金~");
// }
} }
else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了 else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了
showToast("欢迎加入游戏，去闯关吧"); showToast("欢迎加入游戏，去闯关吧");
......
egret/src/panels/BloodPanel.ts
View file @ 97680d6d
...@@ -92,49 +92,22 @@ export default class BloodPanel extends Panel { ...@@ -92,49 +92,22 @@ export default class BloodPanel extends Panel {
}, 1); }, 1);
} }
onTapInvite() {
if(iswx()) {
getShareUrl(this.stage);
} else
showShare(1);
NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData();
if(data.askForEnergy >= BloodPanel.MAX) {
showToast('对不起，索要体力的机会已经用完了~');
return;
}
this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if(success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
}
//0224修改
// onTapInvite() { // onTapInvite() {
// if(iswx()) {
// getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.clickLog(getlogItem(4)); // NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData(); // const data = getHomeData();
// if (iswx()) { // if(data.askForEnergy >= BloodPanel.MAX) {
// //微信流程不变
// getShareUrl(this.stage);
// if (data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~'); // showToast('对不起，索要体力的机会已经用完了~');
// return; // return;
// } // }
// this['inviteBtn'].enabled = false; // this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => { // NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true; // this['inviteBtn'].enabled = true;
// if (success) { // if(success) {
// } // }
// NetManager.ins.hc_home(() => { // NetManager.ins.hc_home(() => {
// this.updateData(); // this.updateData();
...@@ -145,32 +118,59 @@ export default class BloodPanel extends Panel { ...@@ -145,32 +118,59 @@ export default class BloodPanel extends Panel {
// showToast('分享成功~'); // showToast('分享成功~');
// }); // });
// }) // })
// } else {
// if (window["test0228"]) {
// //如果之前没获取到，就再发接口，几率很低
// if (!DataManager.ins.getData("getUserShareCode")) {
// this.touchEnabled = false
// this.touchChildren = false
// NetManager.ins.getUserShareCode((s, res) => {
// this.touchEnabled = true
// this.touchChildren = true
// if (!s) {
// showToast("获取分享信息失败，请重试")
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// res.data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// )
// }
// })
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// DataManager.ins.getData("getUserShareCode").data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// );
// } // }
//0224修改
onTapInvite() {
NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData();
if (iswx()) {
//微信流程不变
getShareUrl(this.stage);
if (data.askForEnergy >= BloodPanel.MAX) {
showToast('对不起，索要体力的机会已经用完了~');
return;
}
this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if (success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
} else {
// if (window["test0228"]) {
//如果之前没获取到，就再发接口，几率很低
if (!DataManager.ins.getData("getUserShareCode")) {
this.touchEnabled = false
this.touchChildren = false
NetManager.ins.getUserShareCode((s, res) => {
this.touchEnabled = true
this.touchChildren = true
if (!s) {
showToast("获取分享信息失败，请重试")
} else {
showShareCodePanel(
CodeChannels.AddBlood,
res.data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
)
}
})
} else {
showShareCodePanel(
CodeChannels.AddBlood,
DataManager.ins.getData("getUserShareCode").data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
);
}
// } else { // } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => { // showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) { // if (data.askForEnergy >= BloodPanel.MAX) {
...@@ -191,8 +191,8 @@ export default class BloodPanel extends Panel { ...@@ -191,8 +191,8 @@ export default class BloodPanel extends Panel {
// } // }
// }) // })
// } // }
// } }
// } }
......
egret/src/panels/BloodPanel2.ts
View file @ 97680d6d
...@@ -88,50 +88,22 @@ export default class BloodPanel2 extends Panel { ...@@ -88,50 +88,22 @@ export default class BloodPanel2 extends Panel {
}, 1); }, 1);
} }
onTapInvite() {
if(iswx()) {
getShareUrl(this.stage);
} else
showShare(1);
NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData();
if(data.askForEnergy >= BloodPanel.MAX) {
showToast('对不起，索要体力的机会已经用完了~');
return;
}
this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if(success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
}
//0224修改
// onTapInvite() { // onTapInvite() {
// if(iswx()) {
// getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.clickLog(getlogItem(4)); // NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData(); // const data = getHomeData();
// if (iswx()) { // if(data.askForEnergy >= BloodPanel.MAX) {
// getShareUrl(this.stage);
// //原先微信流程不变
// if (data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~'); // showToast('对不起，索要体力的机会已经用完了~');
// return; // return;
// } // }
// this['inviteBtn'].enabled = false; // this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => { // NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true; // this['inviteBtn'].enabled = true;
// if (success) { // if(success) {
// } // }
// NetManager.ins.hc_home(() => { // NetManager.ins.hc_home(() => {
...@@ -143,32 +115,60 @@ export default class BloodPanel2 extends Panel { ...@@ -143,32 +115,60 @@ export default class BloodPanel2 extends Panel {
// showToast('分享成功~'); // showToast('分享成功~');
// }); // });
// }) // })
// } else {
// if (window["test0228"]) {
// //如果之前没获取到，就再发接口，几率很低
// if (!DataManager.ins.getData("getUserShareCode")) {
// this.touchEnabled = false
// this.touchChildren = false
// NetManager.ins.getUserShareCode((s, res) => {
// this.touchEnabled = true
// this.touchChildren = true
// if (!s) {
// showToast("获取分享信息失败，请重试")
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// res.data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// )
// }
// })
// } else {
// showShareCodePanel(
// CodeChannels.AddBlood,
// DataManager.ins.getData("getUserShareCode").data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); }
// );
// } // }
//0224修改
onTapInvite() {
NetManager.ins.clickLog(getlogItem(4));
const data = getHomeData();
if (iswx()) {
getShareUrl(this.stage);
//原先微信流程不变
if (data.askForEnergy >= BloodPanel.MAX) {
showToast('对不起，索要体力的机会已经用完了~');
return;
}
this['inviteBtn'].enabled = false;
NetManager.ins.hc_askForEnergy((success) => {
this['inviteBtn'].enabled = true;
if (success) {
}
NetManager.ins.hc_home(() => {
this.updateData();
updateMainTimer();
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
} else {
// if (window["test0228"]) {
//如果之前没获取到，就再发接口，几率很低
if (!DataManager.ins.getData("getUserShareCode")) {
this.touchEnabled = false
this.touchChildren = false
NetManager.ins.getUserShareCode((s, res) => {
this.touchEnabled = true
this.touchChildren = true
if (!s) {
showToast("获取分享信息失败，请重试")
} else {
showShareCodePanel(
CodeChannels.AddBlood,
res.data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
)
}
})
} else {
showShareCodePanel(
CodeChannels.AddBlood,
DataManager.ins.getData("getUserShareCode").data,
() => { wait(2000).then(() => { showToast('分享成功'); }); }
);
}
// } else { // } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => { // showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) { // if (data.askForEnergy >= BloodPanel.MAX) {
...@@ -189,8 +189,8 @@ export default class BloodPanel2 extends Panel { ...@@ -189,8 +189,8 @@ export default class BloodPanel2 extends Panel {
// } // }
// }) // })
// } // }
// } }
// } }
protected get closeBtns(): eui.Button[] { protected get closeBtns(): eui.Button[] {
return [this['closeBtn']] return [this['closeBtn']]
......
egret/src/panels/InvitePanel.ts
View file @ 97680d6d
...@@ -130,9 +130,9 @@ export default class InvitePanel extends Panel { ...@@ -130,9 +130,9 @@ export default class InvitePanel extends Panel {
window["invokeWX"](); window["invokeWX"]();
} else {//端内 } else {//端内
this.wxShareTip.visible = false; this.wxShareTip.visible = false;
window["inviteShare"](shareCode); // window["inviteShare"](shareCode);
//0224修改，去掉原先邀请逻辑，新增口令逻辑 //0224修改，去掉原先邀请逻辑，新增口令逻辑
// showShareCodePanel(CodeChannels.InvitePrize, shareCode) showShareCodePanel(CodeChannels.InvitePrize, shareCode)
} }
}); });
} }
......
egret/src/panels/ScratchPanel.ts
View file @ 97680d6d
...@@ -264,9 +264,9 @@ class ScratchItem extends eui.ItemRenderer { ...@@ -264,9 +264,9 @@ class ScratchItem extends eui.ItemRenderer {
window["invokeWX"](); window["invokeWX"]();
} else {//端内 } else {//端内
this.data.wxShareTip.visible = false; this.data.wxShareTip.visible = false;
window["scratchShare"](code); // window["scratchShare"](code);
//0224修改，去掉原先邀请逻辑，新增口令逻辑 //0224修改，去掉原先邀请逻辑，新增口令逻辑
// showShareCodePanel(CodeChannels.Scratch, code) showShareCodePanel(CodeChannels.Scratch, code)
} }
}, this.data.scratchTaskId); }, this.data.scratchTaskId);
}, this); }, this);
......
egret/src/panels/ShareCodePanel.ts
View file @ 97680d6d
...@@ -164,21 +164,28 @@ class ShareCodePanel extends ComponentBase { ...@@ -164,21 +164,28 @@ class ShareCodePanel extends ComponentBase {
this.goBtn.touchEnabled = false; this.goBtn.touchEnabled = false;
//点击埋点 //点击埋点
NetManager.ins.clickLog(getlogItem(buridNums[this.data.channel])) NetManager.ins.clickLog(getlogItem(buridNums[this.data.channel]))
//有回调执行 //延时1秒跳转，为了埋点
if (this.data.addFun) {
this.data.addFun();
//跳转，考虑到要发接口,0228版本就没有接口要发了，可以只保留点击埋点延时1秒
setTimeout(() => {
this.goBtn.touchEnabled = true;
jumpFun[this.mark]()
}, 2000)
} else {
//跳转，考虑到要发接口
setTimeout(() => { setTimeout(() => {
//有回调就执行
this.data.addFun && this.data.addFun();
this.goBtn.touchEnabled = true; this.goBtn.touchEnabled = true;
jumpFun[this.mark]() jumpFun[this.mark]()
}, 1000) }, 1000)
} //有回调执行
// if (this.data.addFun) {
// this.data.addFun();
// //跳转，考虑到要发接口,0228版本就没有接口要发了，可以只保留点击埋点延时1秒
// setTimeout(() => {
// this.goBtn.touchEnabled = true;
// jumpFun[this.mark]()
// }, 2000)
// } else {
// //跳转，考虑到要发接口
// setTimeout(() => {
// this.goBtn.touchEnabled = true;
// jumpFun[this.mark]()
// }, 1000)
// }
} }
onTouchClickBg() { onTouchClickBg() {
......
egret/src/panels/StartPanel.ts
View file @ 97680d6d
...@@ -91,21 +91,10 @@ export default class StartPanel extends Panel { ...@@ -91,21 +91,10 @@ export default class StartPanel extends Panel {
if (homeData.askForEnergy) { if (homeData.askForEnergy) {
PanelCtrl.instance.show('blood2Panel'); PanelCtrl.instance.show('blood2Panel');
} else { } else {
if(iswx()) { // if(iswx()) {
getShareUrl(this.stage);
} else
showShare(1);
NetManager.ins.hc_askForEnergy((success) => {
NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
//0224修改，微信环境不变
// if (iswx()) {
// getShareUrl(this.stage); // getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.hc_askForEnergy((success) => { // NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => { // NetManager.ins.hc_home(() => {
// SceneCtrl.instance.updateScene(); // SceneCtrl.instance.updateScene();
...@@ -114,34 +103,43 @@ export default class StartPanel extends Panel { ...@@ -114,34 +103,43 @@ export default class StartPanel extends Panel {
// showToast('分享成功~'); // showToast('分享成功~');
// }); // });
// }) // })
// } else //0224修改，微信环境不变
// // showShare(1); if (iswx()) {
// { getShareUrl(this.stage);
NetManager.ins.hc_askForEnergy((success) => {
NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene();
}, window['collectRuleId']);
wait(2000).then(() => {
showToast('分享成功~');
});
})
} else {
// if (window["test0228"]) { // if (window["test0228"]) {
// //如果之前没获取到，就再发接口，几率很低 //如果之前没获取到，就再发接口，几率很低
// if (!DataManager.ins.getData("getUserShareCode")) { if (!DataManager.ins.getData("getUserShareCode")) {
// this.touchEnabled = false this.touchEnabled = false
// this.touchChildren = false this.touchChildren = false
// NetManager.ins.getUserShareCode((s, res) => { NetManager.ins.getUserShareCode((s, res) => {
// this.touchEnabled = true this.touchEnabled = true
// this.touchChildren = true this.touchChildren = true
// if (!s) { if (!s) {
// showToast("获取分享信息失败，请重试") showToast("获取分享信息失败，请重试")
// } else { } else {
// showShareCodePanel( showShareCodePanel(
// CodeChannels.AddBlood, CodeChannels.AddBlood,
// res.data, res.data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); } () => { wait(2000).then(() => { showToast('分享成功'); }); }
// ) )
// } }
// }) })
// } else { } else {
// showShareCodePanel( showShareCodePanel(
// CodeChannels.AddBlood, CodeChannels.AddBlood,
// DataManager.ins.getData("getUserShareCode").data, DataManager.ins.getData("getUserShareCode").data,
// () => { wait(2000).then(() => { showToast('分享成功'); }); } () => { wait(2000).then(() => { showToast('分享成功'); }); }
// ); );
// } }
// } else { // } else {
// showShareCodePanel(CodeChannels.AddBlood, null, () => { // showShareCodePanel(CodeChannels.AddBlood, null, () => {
// NetManager.ins.hc_askForEnergy((success) => { // NetManager.ins.hc_askForEnergy((success) => {
...@@ -154,7 +152,7 @@ export default class StartPanel extends Panel { ...@@ -154,7 +152,7 @@ export default class StartPanel extends Panel {
// }) // })
// }); // });
// } // }
// } }
} }
return; return;
} }
......
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