Skip to content

X
xiaoxiaole
Commit 0907319a authored by wjf's avatar wjf
Browse files
Options

Merge branch 'dev' into 225

parents 77883254 24b27212
Show whitespace changes
Inline Side-by-side
Showing with 319 additions and 301 deletions
egret/libs/tw/manager/NetManager.ts
View file @ 0907319a
......@@ -2386,7 +2386,7 @@ export class NetManager extends ABNetManager {
param: {
activityId: DataManager.ins.customCfgData.actId,
activityType: "hdtool",
// dateUnit
// dateUnit //不传就是不失效，传1当天有效
},
callback: callback
};
......@@ -2408,7 +2408,7 @@ export class NetManager extends ABNetManager {
activityId: DataManager.ins.customCfgData.actId,
activityType: "hdtool",
shareCode,
// singleLimitType: "",//待写
singleLimitType: 0,//0每日一次，1永久一次
// subType: "" //待写
},
callback: callback
......
egret/resource/TextureMerger/sharecodepanel.tmproject
View file @ 0907319a
<<<<<<< HEAD
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["..\\assets\\shareCodePanel\\lijiqianwang.png","..\\assets\\shareCodePanel\\copyCodeBg.png","..\\assets\\shareCodePanel\\shareWxpyqIcon.png","..\\assets\\shareCodePanel\\shareWxIcon.png","..\\assets\\shareCodePanel\\shareQqIcon.png","..\\assets\\shareCodePanel\\shareWeiboIcon.png","..\\assets\\shareCodePanel\\zhantiegeihaoyou.png"]}
=======
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sharecodepanel","version":5,"files":["../assets/shareCodePanel/lijiqianwang.png","../assets/shareCodePanel/copyCodeBg.png","../assets/shareCodePanel/shareWxpyqIcon.png","../assets/shareCodePanel/shareWxIcon.png","../assets/shareCodePanel/shareQqIcon.png","../assets/shareCodePanel/shareWeiboIcon.png","../assets/shareCodePanel/zhantiegeihaoyou.png"]}
>>>>>>> cc335fd429a254bc0a7d0e0a972062841c38abeb
egret/src/mapScene/MapScene.ts
View file @ 0907319a
......@@ -60,25 +60,27 @@ export default class MapScene extends Scene {
//0224修改，取sceneCode，
const sceneCode = Utils.getRequestByKey('sceneCode')
if (sceneCode == CodeChannels.AddBlood) {//加体力的，0228到时会修改成助力，这里要加逻辑
if (window["test0228"]) {//测试助力，到时失败code再和后端对接
//if (window["test0228"]) {//测试助力，到时失败code再和后端对接
NetManager.ins.doHelpNew((s, res) => {
if (s) {
NetManager.ins.showLog(getlogItem(83))
showToast("助力成功！一起闯关赢现金吧")
}
else if (res) {
if (res.code == "0000") {//code再和后端对接
showToast("已经给好友助力过了哦~")
} else if (res.code == "00001") { //code再和后端对接
showToast("今日助力次数已达上限啦！")
} else { showToast("助力失败") }
} else {
showToast("助力失败")
else {
var codeMsgs = {//具体code还没给
"2002002016": "不可以给自己助力哦~",//
"2002002036": "已经给好友助力过了哦~",
"2002002037": "已经给好友助力过了哦~",
"2002002025": "今日助力次数已达上限啦！",
//新加的
}
}, code)
} else {
showToast("欢迎小主，闯关就能拿现金~");
showToast(res && codeMsgs[res.code] ? codeMsgs[res.code] : "助力失败");
}
}, code)
// } else {
// showToast("欢迎小主，闯关就能拿现金~");
// }
}
else if (sceneCode == CodeChannels.RankPlay) {//排行榜邀请好友的，不需要了
showToast("欢迎加入游戏，去闯关吧");
......
egret/src/panels/BloodPanel.ts
View file @ 0907319a
......@@ -92,49 +92,22 @@ export default class BloodPanel extends Panel {
}, 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() {
// if(iswx()) {
// getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData();
// if (iswx()) {
// //微信流程不变
// getShareUrl(this.stage);
// if (data.askForEnergy >= BloodPanel.MAX) {
// if(data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~');
// return;
// }
// this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true;
// if (success) {
// if(success) {
// }
// NetManager.ins.hc_home(() => {
// this.updateData();
......@@ -145,32 +118,59 @@ export default class BloodPanel extends Panel {
// 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 {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) {
......@@ -191,8 +191,8 @@ export default class BloodPanel extends Panel {
// }
// })
// }
// }
// }
}
}
......
egret/src/panels/BloodPanel2.ts
View file @ 0907319a
......@@ -88,50 +88,22 @@ export default class BloodPanel2 extends Panel {
}, 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() {
// if(iswx()) {
// getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.clickLog(getlogItem(4));
// const data = getHomeData();
// if (iswx()) {
// getShareUrl(this.stage);
// //原先微信流程不变
// if (data.askForEnergy >= BloodPanel.MAX) {
// if(data.askForEnergy >= BloodPanel.MAX) {
// showToast('对不起，索要体力的机会已经用完了~');
// return;
// }
// this['inviteBtn'].enabled = false;
// NetManager.ins.hc_askForEnergy((success) => {
// this['inviteBtn'].enabled = true;
// if (success) {
// if(success) {
// }
// NetManager.ins.hc_home(() => {
......@@ -143,32 +115,60 @@ export default class BloodPanel2 extends Panel {
// 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 {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// if (data.askForEnergy >= BloodPanel.MAX) {
......@@ -189,8 +189,8 @@ export default class BloodPanel2 extends Panel {
// }
// })
// }
// }
// }
}
}
protected get closeBtns(): eui.Button[] {
return [this['closeBtn']]
......
egret/src/panels/InvitePanel.ts
View file @ 0907319a
......@@ -130,9 +130,9 @@ export default class InvitePanel extends Panel {
window["invokeWX"]();
} else {//端内
this.wxShareTip.visible = false;
window["inviteShare"](shareCode);
// window["inviteShare"](shareCode);
//0224修改，去掉原先邀请逻辑，新增口令逻辑
// showShareCodePanel(CodeChannels.InvitePrize, shareCode)
showShareCodePanel(CodeChannels.InvitePrize, shareCode)
}
});
}
......
egret/src/panels/ScratchPanel.ts
View file @ 0907319a
......@@ -264,9 +264,9 @@ class ScratchItem extends eui.ItemRenderer {
window["invokeWX"]();
} else {//端内
this.data.wxShareTip.visible = false;
window["scratchShare"](code);
// window["scratchShare"](code);
//0224修改，去掉原先邀请逻辑，新增口令逻辑
// showShareCodePanel(CodeChannels.Scratch, code)
showShareCodePanel(CodeChannels.Scratch, code)
}
}, this.data.scratchTaskId);
}, this);
......
egret/src/panels/ShareCodePanel.ts
View file @ 0907319a
......@@ -75,10 +75,10 @@ const jumpFun = [
}
},
function () {//跳转微博
showToast("快打开微博，粘贴给好友吧")
},
function () {//跳转qq
showToast("快打开QQ，粘贴给好友吧")
},
]
......@@ -142,40 +142,50 @@ class ShareCodePanel extends ComponentBase {
onTouchWxBtn() {
this.mark = 0;
this.codeOpr()
this.codeOpr();
NetManager.ins.showLog(getlogItem(84));
}
onTouchWxpyqBtn() {
this.mark = 1;
this.codeOpr()
this.codeOpr();
}
onTouchWeiboBtn() {
this.mark = 2;
this.codeOpr()
this.codeOpr();
NetManager.ins.showLog(getlogItem(85));
}
onTouchQqBtn() {
this.mark = 3;
this.codeOpr()
this.codeOpr();
NetManager.ins.showLog(getlogItem(86));
}
onTouchGoBtn() {
this.goBtn.touchEnabled = false;
//点击埋点
NetManager.ins.clickLog(getlogItem(buridNums[this.data.channel]))
//有回调执行
if (this.data.addFun) {
this.data.addFun();
//跳转，考虑到要发接口,0228版本就没有接口要发了，可以只保留点击埋点延时1秒
setTimeout(() => {
this.goBtn.touchEnabled = true;
jumpFun[this.mark]()
}, 2000)
} else {
//跳转，考虑到要发接口
//延时1秒跳转，为了埋点
setTimeout(() => {
//有回调就执行
this.data.addFun && this.data.addFun();
this.goBtn.touchEnabled = true;
jumpFun[this.mark]()
}, 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() {
......@@ -261,6 +271,10 @@ export const showShareCodePanel = (channel: CodeChannels, shareCode?: string, ad
initShare();
inited = true;
}
//三个渠道点击埋点
NetManager.ins.showLog(getlogItem(84));
NetManager.ins.showLog(getlogItem(85));
NetManager.ins.showLog(getlogItem(86));
_share.setData({ channel, shareCode, addFun });
layers.shareCodeLayer.visible = true;
}
......
egret/src/panels/StartPanel.ts
View file @ 0907319a
......@@ -91,21 +91,10 @@ export default class StartPanel extends Panel {
if (homeData.askForEnergy) {
PanelCtrl.instance.show('blood2Panel');
} else {
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()) {
// if(iswx()) {
// getShareUrl(this.stage);
// } else
// showShare(1);
// NetManager.ins.hc_askForEnergy((success) => {
// NetManager.ins.hc_home(() => {
// SceneCtrl.instance.updateScene();
......@@ -114,34 +103,43 @@ export default class StartPanel extends Panel {
// showToast('分享成功~');
// });
// })
// } else
// // showShare(1);
// {
//0224修改，微信环境不变
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 (!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('分享成功'); }); }
// );
// }
//如果之前没获取到，就再发接口，几率很低
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 {
// showShareCodePanel(CodeChannels.AddBlood, null, () => {
// NetManager.ins.hc_askForEnergy((success) => {
......@@ -154,7 +152,7 @@ export default class StartPanel extends Panel {
// })
// });
// }
// }
}
}
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