Skip to content

X
xiaoxiaoleTuia
Commit b4165376 authored by wjf's avatar wjf
Browse files
Options

l

parent 5d6618bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 365 deletions
egret/bin-release/output.js
View file @ b4165376
This diff is collapsed.
egret/bin-release/output_develop.js
View file @ b4165376
This diff is collapsed.
egret/index.html
View file @ b4165376
This diff is collapsed.
egret/libs/new_wx/MainBase.ts
View file @ b4165376
......@@ -87,7 +87,7 @@ export default class MainBase extends eui.UILayer {
['sign', { cls: SignPanel }],
['signPrize', { cls: SignPrizePanel }],
['friend', { cls: FriendPanel }],
['ad', { cls: ADPanel }],
['BombTipsPanel', { cls: BombTipsPanel }],
......@@ -416,43 +416,67 @@ export default class MainBase extends eui.UILayer {
// });
updateMainTimer();
//注释，页面停留时间
initstatistics();
document.addEventListener("visibilitychange", () => {
if (document.visibilityState == "visible") {
if (getBgOn()) {
if (SceneCtrl.instance.currentScene instanceof MapScene)
playBg();
else if (SceneCtrl.instance.currentScene instanceof MainScene)
playGameBg();
}
// if(timerInit) {
NetManager.ins.hc_home(() => {
updateMainTimer();
//更新bloodpanel和mapscene
const currentScene = SceneCtrl.instance.currentScene;
if (currentScene && currentScene['updateTimerView'])
currentScene['updateTimerView']();
const current = PanelCtrl.instance._current;
if (current && current['updateTimerView'])
current['updateTimerView']();
}, window['collectRuleId']);
// }
GDispatcher.dispatchEvent('docVisible'); // 触发document显示事件
}
if (document.visibilityState == "hidden") {
stopBg();
stopGamebg();
GDispatcher.dispatchEvent('docHide'); // 触发document隐藏事件
// document.addEventListener("visibilitychange", () => {
// if (document.visibilityState == "visible") {
// if (getBgOn()) {
// if (SceneCtrl.instance.currentScene instanceof MapScene)
// playBg();
// else if (SceneCtrl.instance.currentScene instanceof MainScene)
// playGameBg();
// }
// // if(timerInit) {
// NetManager.ins.hc_home(() => {
// updateMainTimer();
// //更新bloodpanel和mapscene
// const currentScene = SceneCtrl.instance.currentScene;
// if (currentScene && currentScene['updateTimerView'])
// currentScene['updateTimerView']();
// const current = PanelCtrl.instance._current;
// if (current && current['updateTimerView'])
// current['updateTimerView']();
// }, window['collectRuleId']);
// // }
// GDispatcher.dispatchEvent('docVisible'); // 触发document显示事件
// }
// if (document.visibilityState == "hidden") {
// stopBg();
// stopGamebg();
// GDispatcher.dispatchEvent('docHide'); // 触发document隐藏事件
// }
// })
window["webviewHide"] = () => {
stopBg();
stopGamebg();
}
window["webviewShow"] = () => {
if (getBgOn()) {
if (SceneCtrl.instance.currentScene instanceof MapScene)
playBg();
else if (SceneCtrl.instance.currentScene instanceof MainScene)
playGameBg();
}
})
// if(timerInit) {
NetManager.ins.hc_home(() => {
updateMainTimer();
//更新bloodpanel和mapscene
const currentScene = SceneCtrl.instance.currentScene;
if (currentScene && currentScene['updateTimerView'])
currentScene['updateTimerView']();
const current = PanelCtrl.instance._current;
if (current && current['updateTimerView'])
current['updateTimerView']();
}, window['collectRuleId']);
}
}
}
// let timerInit=false;
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ b4165376
......@@ -85,7 +85,7 @@ export default class PrizePanel extends Panel {
(s) => {
Loading.instace.hide()
if (s) {
// showToast("成功加倍");
showToast("翻倍成功");
NetManager.ins.hc_home(() => {
}, window['collectRuleId']);
} else {
......
egret/pro.html
View file @ b4165376
This diff is collapsed.
egret/src/mainScene/MainScene.ts
View file @ b4165376
......@@ -1922,7 +1922,7 @@ export default class MainScene extends Scene {
if (movieClips["bonusTime"].parent) {
this.removeChild(movieClips["bonusTime"])
}
}, 1930)
}, 2217)
} else {
this.addChild(this.bonusTime);
this.bonusTime.play(() => {
......
egret/src/myVideo/Video.ts
View file @ b4165376
......@@ -214,7 +214,7 @@ class Video extends eui.Component/*egret.DisplayObjectContainer*/ {
s._isAdded = true;
document.body.appendChild(s.media)
if (s.element1) document.body.appendChild(s.element1);
if (s.appUi) document.body.appendChild(s.appUi);
// if (s.appUi) document.body.appendChild(s.appUi);
} else {
if (s.media && s.visible) {
s.media.style.display = "block";
......@@ -293,6 +293,13 @@ class Video extends eui.Component/*egret.DisplayObjectContainer*/ {
this.volume = 1;
this.volumeBtn.src = "https://yun.duiba.com.cn/db_games/activity/xiaoxiaoleTuia/cssImage/voice.png";
var v = this.videoRaw.rewardvideo;
this.initAppUi({
appIcon: v.endcardicon || '',
name: v.endcardtitle || '',
slogen: v.endcarddesc || ''
})
//挂方法
window["videoCloseEvent"] = () => {
this.closeEvent();
......@@ -389,10 +396,10 @@ class Video extends eui.Component/*egret.DisplayObjectContainer*/ {
var closeBtn = new Image()
closeBtn.src = "https://yun.duiba.com.cn/db_games/activity/xiaoxiaoleTuia/cssImage/videoCloseBtn.png";
closeBtn.style.position = "absolute";
closeBtn.style.top = "10vw";
closeBtn.style.right = "10px";
closeBtn.style.width = "10vw";
closeBtn.style.height = "10vw"
closeBtn.style.top = "5vw";
closeBtn.style.right = "5vw";
closeBtn.style.width = "5vw";
closeBtn.style.height = "5vw"
closeBtn.style.zIndex = "9999"
element1.appendChild(closeBtn)
closeBtn.addEventListener("click", (e) => {
......@@ -423,25 +430,13 @@ class Video extends eui.Component/*egret.DisplayObjectContainer*/ {
//appUi,待修改
this.appUi = document.createElement('div');
this.appUi.style.display = "none";
document.body.appendChild(this.appUi);
var v = this.videoRaw.rewardvideo;
this.initAppUi({
appIcon: v.endcardicon || '',
name: v.endcardtitle || '',
slogen: v.endcarddesc || ''
})
//事件
let appUiChild = document.querySelector('.video-land-page-content');
let appClose = document.querySelector('.app-close');
let appButton = document.querySelector('.app-button');
appUiChild.addEventListener('click', (e) => {
if (e.target === appClose) {
this.closeEvent();
this.appAdClose();
} else if (e.target === appButton) {
this.downloadEvent(e);
}
})
}
private initAppUi(content: { appIcon: String, name: String, slogen: String }) {
......@@ -452,14 +447,14 @@ class Video extends eui.Component/*egret.DisplayObjectContainer*/ {
src="data:image/png;base64,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">
</img>
<div class="app-info-wrap">
<div class="app-logo" style="backgroundImage:url(${appIcon})"></div>
<div class="app-logo" style="background-image:url(${appIcon})"></div>
<div class="app-name">${name}</div>
<div class="app-button">${slogen}</div>
<div class="app-button">${slogen||"马上下载"}</div>
</div>
</div>
`;
// document.body.appendChild(this.appUi);
// this.appUiEvent();
this.appUiEvent();
}
private appUiEvent() {
let appUiChild = document.querySelector('.video-land-page-content');
......@@ -467,9 +462,10 @@ class Video extends eui.Component/*egret.DisplayObjectContainer*/ {
let appButton = document.querySelector('.app-button');
appUiChild.addEventListener('click', (e) => {
if (e.target === appClose) {
this.appUi.style.display = "none";
this.closeEvent();
this.appAdClose();
} else if (e.target === appButton) {
console.log('点击事件');
this.downloadEvent(e);
}
})
}
......
egret/src/myVideo/getDefaultConfig.ts
View file @ b4165376
......@@ -87,7 +87,7 @@ const reflectObj = {
'3g': 3,
'4g': 4,
'5g': 5,
other: 6
other: 1
};
function getNetworkType(obj = reflectObj) {
......
egret/src/panels/BoxPanel.ts
View file @ b4165376
......@@ -50,7 +50,7 @@ export default class BoxPanel extends Panel {
(s) => {
Loading.instace.hide()
if (s) {
// showToast("成功加倍");
showToast("翻倍成功");
NetManager.ins.hc_home(() => {
updateMainTimer();
SceneCtrl.instance.updateScene();
......
egret/src/panels/SignPanel.ts
View file @ b4165376
......@@ -40,7 +40,6 @@ export default class SignPanel extends Panel {
}
item['btn1'].enabled=false;
NetManager.ins.doSign((s)=>{
NetManager.ins.showLog(getlogItem(22));
item['btn1'].enabled=true;
wait(300).then(()=>{
NetManager.ins.getSignInfo(() => {
......@@ -52,9 +51,9 @@ export default class SignPanel extends Panel {
const {customInfo,success} =DataManager.ins.getData('dosign');
if(!success || !customInfo.success || customInfo.prizeType =='none') {
if(customInfo.code==100004) {
showToast('哎呀，奖励擦肩而过！明天再来试试吧！');
showToast('与奖励失之交臂！明天再来试试吧！');
}else {
showToast('哎呀，奖励擦肩而过！');
showToast('与奖励失之交臂');
}
return;
}
......@@ -71,7 +70,7 @@ export default class SignPanel extends Panel {
}, window['collectRuleId']);
});
}else {
showToast('哎呀，奖励擦肩而过！');
showToast('与奖励失之交臂');
}
this.hidePanel();
......
egret/src/panels/SignPrizePanel.ts
View file @ b4165376
......@@ -61,7 +61,7 @@ export default class SignPrizePanel extends Panel {
this['close2Btn'].visible = true;
this['doubleBtn'].visible = false;
if (s) {
// showToast("成功加倍");
showToast("翻倍成功");
NetManager.ins.hc_home(() => {
updateMainTimer();
SceneCtrl.instance.updateScene();
......
mock/tuia/getAds.json
View file @ b4165376
......@@ -56,9 +56,9 @@
"duration": 24,
"endcardhtml": "http://xxx.xxx.html",
"endcardimage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"endcardicon": "http://xxx.jpg",
"endcardtitle": "xxx",
"endcarddesc": "xxxxx",
"endcardicon": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"endcardtitle": "665",
"endcarddesc": "qqq",
"endcardshownotice": [
"http://xxx.xxx.xxx"
],
......
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