Commit e7c8bc27 authored by shunx 马's avatar shunx 马

合并

parents 10734c46 684d71e1
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { sendLog } from "../WebNet";
import centerTextField from "./centerTextField"; import centerTextField from "./centerTextField";
import { getStageHeight } from "./stage";
let mask; let mask;
export default class ShareMask extends FYGE.Sprite { export default class ShareMask extends FYGE.Sprite {
...@@ -23,17 +25,18 @@ export default class ShareMask extends FYGE.Sprite { ...@@ -23,17 +25,18 @@ export default class ShareMask extends FYGE.Sprite {
let callback; let callback;
callback = () => { callback = () => {
sendLog("click",10);
this.parent && this.parent.removeChild(this); this.parent && this.parent.removeChild(this);
this.removeEventListener(FYGE.MouseEvent.CLICK, callback, this); this.removeEventListener(FYGE.MouseEvent.CLICK, callback, this);
mask=null; mask = null;
}; };
const sharepicWrapper = new FYGE.Sprite(); const sharepicWrapper = new FYGE.Sprite();
const pic = sharepicWrapper.addChild(new FYGE.Sprite(RES.getRes('sharemask.png'))); const pic = sharepicWrapper.addChild(new FYGE.Sprite(RES.getRes('sharemask.png')));
const gap = 30; const gap = 30;
sharepicWrapper.x = 750-pic.width-gap; sharepicWrapper.x = 750 - pic.width - gap;
sharepicWrapper.y = gap; sharepicWrapper.y = (1624 - getStageHeight()) + gap;
this.addChild(sharepicWrapper); this.addChild(sharepicWrapper);
this.addEventListener(FYGE.MouseEvent.CLICK, callback, this); this.addEventListener(FYGE.MouseEvent.CLICK, callback, this);
...@@ -41,13 +44,14 @@ export default class ShareMask extends FYGE.Sprite { ...@@ -41,13 +44,14 @@ export default class ShareMask extends FYGE.Sprite {
} }
export const showShareMask = ()=>{ export const showShareMask = () => {
if(mask)return; if (mask) return;
mask = new ShareMask(); mask = new ShareMask();
layers.shareLayer.addChild(mask); layers.shareLayer.addChild(mask);
sendLog("exposure",10);
} }
export const hideShareMask = ()=>{ export const hideShareMask = () => {
if(!mask) return; if (!mask) return;
layers.shareLayer.removeChild(mask); layers.shareLayer.removeChild(mask);
mask=null; mask = null;
} }
\ No newline at end of file
import { layers } from "../../module/views/layers"
export const getStageWidth = () => { return layers.stage.viewRect.width }
export const getStageHeight = () => { return layers.stage.viewRect.height }
export const getStageOffset = () => { return (1624 - getStageHeight()) / 2 }
\ No newline at end of file
...@@ -2,14 +2,19 @@ import { RES } from "../../module/RES"; ...@@ -2,14 +2,19 @@ import { RES } from "../../module/RES";
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { Tools } from "../Tools"; import { Tools } from "../Tools";
import { getWebData, sendWebNet } from "../WebNet"; import { getWebData, sendLog, sendWebNet } from "../WebNet";
import { WebNetName } from "../WebNetName"; import { WebNetName } from "../WebNetName";
let section; let section;
export class RulePanel extends Panel { export class RulePanel extends Panel {
hidePanel(){
super.hidePanel();
sendLog("click",4);
}
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",4);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
this.ruleTxt=getObject(this,'newRule_tips') this.ruleTxt=getObject(this,'newRule_tips')
......
...@@ -4,7 +4,7 @@ import { Panel } from "../../module/views/Panel"; ...@@ -4,7 +4,7 @@ import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { sendWebNetWithToken } from "../sendWebNetWithToken"; import { sendWebNetWithToken } from "../sendWebNetWithToken";
import { sendWebNet } from "../WebNet"; import { sendLog, sendWebNet } from "../WebNet";
import { WebNetName } from "../WebNetName"; import { WebNetName } from "../WebNetName";
import { NoPrizePanel } from "./noprize"; import { NoPrizePanel } from "./noprize";
import { notEnoughMoneyPanel } from "./notEnoughMoney"; import { notEnoughMoneyPanel } from "./notEnoughMoney";
...@@ -18,6 +18,7 @@ export class CostPanel extends Panel { ...@@ -18,6 +18,7 @@ export class CostPanel extends Panel {
getObject(this, "cost_tips").text = `消耗${cost}积分拆开1个盲盒`; getObject(this, "cost_tips").text = `消耗${cost}积分拆开1个盲盒`;
} }
cost_open() { cost_open() {
sendLog("click",1);
this.dispatchEvent("stopIndexEnterFrame", { }); this.dispatchEvent("stopIndexEnterFrame", { });
this.hidePanel(); this.hidePanel();
this.getPrize(); this.getPrize();
...@@ -51,6 +52,7 @@ export class CostPanel extends Panel { ...@@ -51,6 +52,7 @@ export class CostPanel extends Panel {
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
centerTextField(getObject(this, "cost_tips"), 496); centerTextField(getObject(this, "cost_tips"), 496);
sendLog("exposure",1);
} }
initEvents() { initEvents() {
......
...@@ -4,12 +4,14 @@ import { Panel } from "../../module/views/Panel"; ...@@ -4,12 +4,14 @@ import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { hideShareMask, showShareMask } from "../common/ShareMask"; import { hideShareMask, showShareMask } from "../common/ShareMask";
import { sendLog } from "../WebNet";
import { SharePanel } from "./share"; import { SharePanel } from "./share";
let section; let section;
export class getTimesPanel extends Panel { export class getTimesPanel extends Panel {
click_getTimes_go() { click_getTimes_go() {
sendLog("click",7);
this.hidePanel(); this.hidePanel();
showShareMask(); showShareMask();
setTimeout(() => { setTimeout(() => {
...@@ -23,6 +25,8 @@ export class getTimesPanel extends Panel { ...@@ -23,6 +25,8 @@ export class getTimesPanel extends Panel {
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",7);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
centerTextField(getObject(this,'getTimes_tips2'),496); centerTextField(getObject(this,'getTimes_tips2'),496);
......
...@@ -2,12 +2,14 @@ import { RES } from "../../module/RES"; ...@@ -2,12 +2,14 @@ import { RES } from "../../module/RES";
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { sendLog } from "../WebNet";
let section; let section;
export class memberGuidePanel extends Panel { export class memberGuidePanel extends Panel {
click_memberGuide_btn(){ click_memberGuide_btn(){
console.log('memberGuide_btn'); console.log('memberGuide_btn');
sendLog("click",6);
} }
get groupNames() { return ["memberGuide"] } get groupNames() { return ["memberGuide"] }
...@@ -15,6 +17,7 @@ export class memberGuidePanel extends Panel { ...@@ -15,6 +17,7 @@ export class memberGuidePanel extends Panel {
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",6);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
// centerTextField(getObject(this,'cost_tips'),496); // centerTextField(getObject(this,'cost_tips'),496);
......
...@@ -2,6 +2,7 @@ import { RES } from "../../module/RES"; ...@@ -2,6 +2,7 @@ import { RES } from "../../module/RES";
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { sendLog } from "../WebNet";
let section; let section;
export class NoPrizePanel extends Panel { export class NoPrizePanel extends Panel {
...@@ -10,6 +11,11 @@ export class NoPrizePanel extends Panel { ...@@ -10,6 +11,11 @@ export class NoPrizePanel extends Panel {
// console.log('share_share_go'); // console.log('share_share_go');
// } // }
hidePanel(){
super.hidePanel();
sendLog("click",3);
}
get groupNames() { return ["noprize"] } get groupNames() { return ["noprize"] }
get skinName() { return "noprize" } get skinName() { return "noprize" }
...@@ -18,6 +24,7 @@ export class NoPrizePanel extends Panel { ...@@ -18,6 +24,7 @@ export class NoPrizePanel extends Panel {
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",3);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
centerTextField(getObject(this, 'prize_name'), 731); centerTextField(getObject(this, 'prize_name'), 731);
......
...@@ -2,11 +2,13 @@ import { RES } from "../../module/RES"; ...@@ -2,11 +2,13 @@ import { RES } from "../../module/RES";
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { sendLog } from "../WebNet";
let section; let section;
export class notEnoughMoneyPanel extends Panel { export class notEnoughMoneyPanel extends Panel {
click_notEnoughMoney_btn(){ click_notEnoughMoney_btn(){
sendLog("click",5);
console.log('click_notEnoughMoney_btn'); console.log('click_notEnoughMoney_btn');
} }
...@@ -15,6 +17,7 @@ export class notEnoughMoneyPanel extends Panel { ...@@ -15,6 +17,7 @@ export class notEnoughMoneyPanel extends Panel {
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",5);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
centerTextField(getObject(this,'notEnoughMoney_tips'),496); centerTextField(getObject(this,'notEnoughMoney_tips'),496);
......
...@@ -6,7 +6,7 @@ import { showPanel } from "../../module/ctrls"; ...@@ -6,7 +6,7 @@ import { showPanel } from "../../module/ctrls";
import { getImage } from "../common/getImage"; import { getImage } from "../common/getImage";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { CostPanel } from "./cost"; import { CostPanel } from "./cost";
import { getWebData } from "../WebNet"; import { getWebData, sendLog } from "../WebNet";
import { WebNetName } from "../WebNetName"; import { WebNetName } from "../WebNetName";
let section; let section;
...@@ -21,6 +21,7 @@ export class PrizePanel extends Panel { ...@@ -21,6 +21,7 @@ export class PrizePanel extends Panel {
} }
click_prize_open() { click_prize_open() {
sendLog("click",2);
console.log('click_prize_open') console.log('click_prize_open')
} }
...@@ -30,6 +31,7 @@ export class PrizePanel extends Panel { ...@@ -30,6 +31,7 @@ export class PrizePanel extends Panel {
prizeContainer: FYGE.Sprite; prizeContainer: FYGE.Sprite;
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",2);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
centerTextField(getObject(this, 'prize_name'), 731); centerTextField(getObject(this, 'prize_name'), 731);
......
...@@ -3,7 +3,7 @@ import { Panel } from "../../module/views/Panel"; ...@@ -3,7 +3,7 @@ import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { Tools } from "../Tools"; import { Tools } from "../Tools";
import { getWebData, sendWebNet } from "../WebNet"; import { getWebData, sendLog, sendWebNet } from "../WebNet";
import { WebNetName } from "../WebNetName"; import { WebNetName } from "../WebNetName";
let section; let section;
...@@ -11,6 +11,7 @@ export class SharePanel extends Panel { ...@@ -11,6 +11,7 @@ export class SharePanel extends Panel {
share_share_go(){ share_share_go(){
console.log('share_go'); console.log('share_go');
sendLog("click",11);
this.hidePanel(); this.hidePanel();
} }
get groupNames() { return ["share"] } get groupNames() { return ["share"] }
...@@ -18,6 +19,8 @@ export class SharePanel extends Panel { ...@@ -18,6 +19,8 @@ export class SharePanel extends Panel {
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("exposure",11);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
......
...@@ -2,11 +2,13 @@ import { RES } from "../../module/RES"; ...@@ -2,11 +2,13 @@ import { RES } from "../../module/RES";
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import centerTextField from "../common/centerTextField"; import centerTextField from "../common/centerTextField";
import getObject from "../common/getObject"; import getObject from "../common/getObject";
import { sendLog } from "../WebNet";
let section; let section;
export class timesNotEnoughPanel extends Panel { export class timesNotEnoughPanel extends Panel {
share_share_go(){ share_share_go(){
sendLog("exposure",8);
console.log('timesNotEnough'); console.log('timesNotEnough');
} }
...@@ -15,6 +17,7 @@ export class timesNotEnoughPanel extends Panel { ...@@ -15,6 +17,7 @@ export class timesNotEnoughPanel extends Panel {
initUi() { initUi() {
super.initUi(); super.initUi();
sendLog("click",8);
var skin = RES.getSkinDataByName(this.skinName); var skin = RES.getSkinDataByName(this.skinName);
this.position.set(skin.x, skin.y); this.position.set(skin.x, skin.y);
// centerTextField(getObject(this,'cost_tips'),496); // centerTextField(getObject(this,'cost_tips'),496);
......
...@@ -14,7 +14,7 @@ import { RulePanel } from "../panels/RulePanel"; ...@@ -14,7 +14,7 @@ import { RulePanel } from "../panels/RulePanel";
import { Box } from "./Box"; import { Box } from "./Box";
import { BoxGroup } from "./BoxGroup"; import { BoxGroup } from "./BoxGroup";
import { ScrollItem } from "./ScrollItem"; import { ScrollItem } from "./ScrollItem";
import { getWebData, sendWebNet } from "../WebNet"; import { getWebData, sendLog, sendWebNet } from "../WebNet";
import { WebNetName } from "../WebNetName"; import { WebNetName } from "../WebNetName";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { showShareMask } from "../common/ShareMask"; import { showShareMask } from "../common/ShareMask";
...@@ -34,6 +34,11 @@ export class IndexScene extends Scene { ...@@ -34,6 +34,11 @@ export class IndexScene extends Scene {
super(); super();
} }
initUi(){
super.initUi();
sendLog("exposure",9);
}
start() { start() {
super.start(); super.start();
this.initContainer(); this.initContainer();
...@@ -62,6 +67,7 @@ export class IndexScene extends Scene { ...@@ -62,6 +67,7 @@ export class IndexScene extends Scene {
boxGroup.addEventListener("stopIndexEnterFrame", this.removeEvent, this); boxGroup.addEventListener("stopIndexEnterFrame", this.removeEvent, this);
shareButton = getObject(this, 'index_sharetips'); shareButton = getObject(this, 'index_sharetips');
shareButton.addEventListener(FYGE.MouseEvent.CLICK, () => { shareButton.addEventListener(FYGE.MouseEvent.CLICK, () => {
sendLog("click",9);
this.handleShare(); this.handleShare();
},this) },this)
} }
......
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