Commit 75e85328 authored by Master Q's avatar Master Q

complete for dev

parent e8f0cb64
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
"data": { "data": {
"activityState": 1, "activityState": 1,
"needTikectCount": 23, "needTikectCount": 23,
"gameTimeLimit": 60 "gameTimeLimit": 5
} }
} }
\ No newline at end of file
...@@ -2,6 +2,7 @@ import { CountDownFac, CountDownWithTweenCls } from './../scenes/utils'; ...@@ -2,6 +2,7 @@ import { CountDownFac, CountDownWithTweenCls } from './../scenes/utils';
import { ExtraConfig } from './../scenes/ExtraConfig'; import { ExtraConfig } from './../scenes/ExtraConfig';
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import UI from "../tools/UI"; import UI from "../tools/UI";
import { LOG_TYPE, sendLog } from '../tools/WebNet';
export class RescurrectionModal extends Panel { export class RescurrectionModal extends Panel {
get groupNames(): string[] { get groupNames(): string[] {
...@@ -9,6 +10,10 @@ export class RescurrectionModal extends Panel { ...@@ -9,6 +10,10 @@ export class RescurrectionModal extends Panel {
} }
roleCont: FYGE.Container roleCont: FYGE.Container
protected initUi(): void { protected initUi(): void {
sendLog(LOG_TYPE.EXPOSURE, 4)
sendLog(LOG_TYPE.EXPOSURE, 6)
sendLog(LOG_TYPE.EXPOSURE, 5)
const roleCont = this.roleCont = UI.Ctn(this, (750 - 547) / 2, 812 - 389 / 2) const roleCont = this.roleCont = UI.Ctn(this, (750 - 547) / 2, 812 - 389 / 2)
UI.Sp(roleCont, 'rescurrectionModalBack.png') UI.Sp(roleCont, 'rescurrectionModalBack.png')
...@@ -27,12 +32,16 @@ export class RescurrectionModal extends Panel { ...@@ -27,12 +32,16 @@ export class RescurrectionModal extends Panel {
}) })
UI.Btn(roleCont, 'fkBtn.png', () => { UI.Btn(roleCont, 'fkBtn.png', () => {
sendLog(LOG_TYPE.CLICK, 6)
simpleCountDonwFac.end() simpleCountDonwFac.end()
this.hidePanel() this.hidePanel()
this.data && this.data.onGiveUp() this.data && this.data.onGiveUp()
}, this, 270, 230) }, this, 270, 230)
UI.Btn(roleCont, 'lookBtn.png', () => { UI.Btn(roleCont, 'lookBtn.png', () => {
sendLog(LOG_TYPE.CLICK, 5)
simpleCountDonwFac.end() simpleCountDonwFac.end()
this.onShowPreviewImg() this.onShowPreviewImg()
}, this, 20, 230) }, this, 20, 230)
......
...@@ -3,7 +3,7 @@ import { Panel } from "../../module/views/Panel"; ...@@ -3,7 +3,7 @@ import { Panel } from "../../module/views/Panel";
import { IndexScene } from "../scenes/IndexScene/IndexScene"; import { IndexScene } from "../scenes/IndexScene/IndexScene";
import { promiseAwaitFunc } from "../scenes/utils"; import { promiseAwaitFunc } from "../scenes/utils";
import UI from "../tools/UI"; import UI from "../tools/UI";
import { sendWebNet, WebNetName } from "../tools/WebNet"; import { LOG_TYPE, sendLog, sendWebNet, WebNetName } from "../tools/WebNet";
export class ResultModal extends Panel { export class ResultModal extends Panel {
get groupNames(): string[] { get groupNames(): string[] {
...@@ -11,6 +11,10 @@ export class ResultModal extends Panel { ...@@ -11,6 +11,10 @@ export class ResultModal extends Panel {
} }
initUi() { initUi() {
sendLog(LOG_TYPE.EXPOSURE, 7)
sendLog(LOG_TYPE.EXPOSURE, 8)
sendLog(LOG_TYPE.EXPOSURE, 9)
const roleCont = UI.Ctn(this, (750 - 667) / 2 + 10, 170) const roleCont = UI.Ctn(this, (750 - 667) / 2 + 10, 170)
UI.Sp(roleCont, 'resultModalback.png') UI.Sp(roleCont, 'resultModalback.png')
...@@ -22,9 +26,13 @@ export class ResultModal extends Panel { ...@@ -22,9 +26,13 @@ export class ResultModal extends Panel {
UI.Btn(roleCont, 'cancelBtn.png', () => { UI.Btn(roleCont, 'cancelBtn.png', () => {
changeScene(IndexScene) changeScene(IndexScene)
this.hidePanel() this.hidePanel()
sendLog(LOG_TYPE.CLICK, 8)
}, this, 60, 810) }, this, 60, 810)
UI.Btn(roleCont, 'oneMoreTime.png', promiseAwaitFunc(async () => { UI.Btn(roleCont, 'oneMoreTime.png', promiseAwaitFunc(async () => {
sendLog(LOG_TYPE.CLICK, 9)
const { const {
success success
} = await sendWebNet(WebNetName.start) } = await sendWebNet(WebNetName.start)
......
...@@ -48,10 +48,12 @@ export class IndexScene extends Scene { ...@@ -48,10 +48,12 @@ export class IndexScene extends Scene {
UI.Txt(startBtnCont, `消耗${this.IndexSceneData.needTikectCount}门票`, 24, '#000000', FYGE.TEXT_ALIGN.CENTER, 374, 0, 120) UI.Txt(startBtnCont, `消耗${this.IndexSceneData.needTikectCount}门票`, 24, '#000000', FYGE.TEXT_ALIGN.CENTER, 374, 0, 120)
sendLog(LOG_TYPE.EXPOSURE, 1) sendLog(LOG_TYPE.EXPOSURE, 1)
sendLog(LOG_TYPE.EXPOSURE, 2)
} }
@PromiseAwait @PromiseAwait
async onJump2Scene() { async onJump2Scene() {
sendLog(LOG_TYPE.CLICK, 2)
const { const {
success success
} = await sendWebNet(WebNetName.start) } = await sendWebNet(WebNetName.start)
...@@ -62,12 +64,12 @@ export class IndexScene extends Scene { ...@@ -62,12 +64,12 @@ export class IndexScene extends Scene {
onShowRulePanel() { onShowRulePanel() {
showPanel(RuleModal, { showPanel(RuleModal, {
ruleTxt: '123' ruleTxt: getWebData(WebNetName.projectRule).data.split(/===+/)[0]
}) })
} }
onJump2AwardPage() { onJump2AwardPage() {
window.location.href = 'awardPage.html'
} }
initEvents(): void { initEvents(): void {
......
...@@ -5,6 +5,7 @@ import { ConveyorBelt, ConveyorBeltItem } from "./comp/ConveyorBelt"; ...@@ -5,6 +5,7 @@ import { ConveyorBelt, ConveyorBeltItem } from "./comp/ConveyorBelt";
import { GDispatcher } from '../Game'; import { GDispatcher } from '../Game';
import { CollisionDetection, RectPhysicsCont, WithCollisionDetection } from './CollisionComposite'; import { CollisionDetection, RectPhysicsCont, WithCollisionDetection } from './CollisionComposite';
import { BalalaScene } from './BalalaScene'; import { BalalaScene } from './BalalaScene';
import { LOG_TYPE, sendLog } from '../tools/WebNet';
/** /**
* 解个一元一次方程式咯 * 解个一元一次方程式咯
...@@ -61,6 +62,7 @@ export class ParkourScene extends Scene { ...@@ -61,6 +62,7 @@ export class ParkourScene extends Scene {
} }
initUi() { initUi() {
sendLog(LOG_TYPE.EXPOSURE, 3)
this.addChild(new BalalaScene()) this.addChild(new BalalaScene())
......
...@@ -43,6 +43,8 @@ export class LoadingScene extends Scene { ...@@ -43,6 +43,8 @@ export class LoadingScene extends Scene {
// 走下接口,这里有点小问题, 接口报错了, 还让进去吗 // 走下接口,这里有点小问题, 接口报错了, 还让进去吗
await sendWebNet(WebNetName.index, {}, undefined, true) await sendWebNet(WebNetName.index, {}, undefined, true)
await sendWebNet(WebNetName.projectRule)
this.setProgressValue(1) this.setProgressValue(1)
} }
......
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