Commit 35b2e517 authored by lujinlei's avatar lujinlei

-a

parent 7e482974
......@@ -934,5 +934,5 @@ export const ResJson = {
"name": "svga"
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/template/1632710518/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/template/1632724226/resource/"
}
\ No newline at end of file
......@@ -7,28 +7,43 @@ import { WEIXIN_URL } from "../datas";
import { Tools } from "../Tools";
import { sendLog } from "../WebNet";
export class ShareHintPanel extends Panel {
let mask;
export class ShareHintPanel extends FYGE.Sprite {
constructor() {
super()
this.initUi();
}
initUi() {
super.initUi();
let btn = this.addChild(Tools.getRect(750,1624))
btn.alpha = 0;
btn.addEventListener(FYGE.MouseEvent.CLICK,()=>{
this.btnDelay(btn)
this.hidePanel()
},this)
let btn = this.addChild(Tools.getRect(750,1624,0x000000))
btn.alpha = 0.7;
let bg = this.addChild(Tools.getSprite('share.png'))
bg.position.set(250,80+layers.stageOffsetY)
bg.position.set(250,180+layers.stageOffsetY)
bg.mouseChildren = false;
bg.mouseEnable = false;
bg.addChild(Tools.getText('点击分享',30,"#ffffff")).position.set(120,240)
}
get groupNames() { return ["share_success"] }
let callback;
callback = () => {
this.parent && this.parent.removeChild(this);
this.removeEventListener(FYGE.MouseEvent.CLICK, callback, this);
mask=null;
};
async start(data) {
super.start();
sendLog("exposure",7);
btn.addEventListener(FYGE.MouseEvent.CLICK,callback,this)
}
}
export const showShareHintPanel = ()=>{
if(mask)return;
mask = new ShareHintPanel();
layers.shareLayer.addChild(mask);
}
export const hideShareHintPanel = ()=>{
if(!mask) return;
layers.shareLayer.removeChild(mask);
mask=null;
}
export {mask}
\ No newline at end of file
......@@ -8,7 +8,8 @@ import { sendLog } from "../WebNet";
export class AssistPanel extends Panel {
onClick_share_go(){
sendLog("click", 11);
location.href=getAutoPrizeUrl()
// location.href=getAutoPrizeUrl()
window["miniJump"](getAutoPrizeUrl())
}
initUi() {
super.initUi();
......
......@@ -8,7 +8,7 @@ import { MAX_MONEY, MONEY_PERCENT } from "../datas";
import { IndexScene } from "../scenes/IndexScene";
import updateShareFunc from "../share";
import { getPxTokenSave, sendLog, sendWebNet, WebNetName } from "../WebNet";
import { ShareHintPanel } from "./ShareHintPanel";
import { ShareHintPanel, showShareHintPanel } from "./ShareHintPanel";
const createMask = (w, h) => {
const s = new FYGE.Shape();
......@@ -134,7 +134,7 @@ export class PrizePanel extends Panel {
onClick_inviteBtn() {
// showShareMask();
showPanel(ShareHintPanel)
showShareHintPanel();
sendLog("click",2);
}
......
import { unwatchPageVisibility, watchPageVisibility } from '@spark/utils';
import { hideWaiting, showPanel, showToast, showWaiting } from "../../module/ctrls";
import { closeAllPanels, hideWaiting, showPanel, showToast, showWaiting } from "../../module/ctrls";
import PanelCtrl from '../../module/ctrls/panelCtrl';
import { Scene } from "../../module/views/Scene";
import centerTextField from '../common/centerTextField';
......@@ -7,12 +7,12 @@ import getObject, { getObjects } from '../common/getObject';
import getQueryParams from '../common/getQueryParams';
import Marquee from '../common/Marquee';
import { ProgressBarS } from '../common/ProgressBarS';
import { hideShareMask, showShareMask,mask } from '../common/ShareMask';
// import { hideShareMask, showShareMask,mask } from '../common/ShareMask';
import { getStageHeight, getStageOffset } from '../common/stage';
import { KAIHU_URL, MAX_MONEY, MONEY_PERCENT } from '../datas';
import { DrawPanel } from '../panels/draw';
import { RulePanel } from '../panels/rule';
import { ShareHintPanel } from '../panels/ShareHintPanel';
import { hideShareHintPanel, mask, ShareHintPanel, showShareHintPanel } from '../panels/ShareHintPanel';
import { ShareFailPanel } from '../panels/share_fail';
import { ShareSuccessPanel } from '../panels/share_success';
import updateShareFunc from '../share';
......@@ -59,7 +59,7 @@ export class IndexScene extends Scene {
onclick_index_inviteBtn() {
// showShareMask();
showPanel(ShareHintPanel)
showShareHintPanel()
sendLog("click",4);
}
/**
......@@ -120,8 +120,6 @@ export class IndexScene extends Scene {
async start(data) {
super.start(data);
sendLog("exposure",3);
sendLog("exposure",4);
sendLog("exposure",5);
......@@ -188,7 +186,8 @@ export class IndexScene extends Scene {
console.log('有弹窗就不重复弹分享弹窗了');
if (visible && !current) {
if(mask){
hideShareMask();
hideShareHintPanel();
// closeAllPanels()
this.showSharePanel();
}
......
import { unwatchPageVisibility, watchPageVisibility } from "@spark/utils";
import { changeScene, closeCurrentPanel, hideWaiting, showPanel, showWaiting } from "../../module/ctrls";
import { changeScene, closeAllPanels, closeCurrentPanel, hideWaiting, showPanel, showWaiting } from "../../module/ctrls";
import { RES } from "../../module/RES";
import { layers } from "../../module/views/layers";
import { Scene } from "../../module/views/Scene";
......@@ -10,6 +10,7 @@ import Mask from "../common/Mask";
import { hideShareMask } from "../common/ShareMask";
import { PrizePanel } from "../panels/prize";
import { RulePanel } from "../panels/rule";
import { hideShareHintPanel } from "../panels/ShareHintPanel";
import updateShareFunc from "../share";
import { getPxTokenSave, sendLog, sendWebNet, WebNetName } from "../WebNet";
import { IndexScene } from "./IndexScene";
......@@ -22,8 +23,9 @@ export class NewbieScene extends Scene {
console.log('没有领体验金'); return;
};
if (visible) {
hideShareMask();
closeCurrentPanel();
// hideShareMask();
hideShareHintPanel();
changeScene(IndexScene, { from: 'NewbieScene', action: 'showSharePanel' });
}
}
......
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