Skip to content

D
db-game-template
Commit 417d9b0c authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent 80b1f974
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 44 deletions
.idea/workspace.xml
View file @ 417d9b0c
......@@ -3,10 +3,16 @@
<component name="ChangeListManager">
<list default="true" id="9464afa6-0efb-46c2-9cfd-05475acd81df" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/ProgressMgr.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/ProgressMgr.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/TimeProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/TimeProgressBar.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/default.thm.json" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/default.thm.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/SelledPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/SelledPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/comm/statistics.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/comm/statistics.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/ctrls/panelCtrl.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/ctrls/panelCtrl.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/ctrls/topLayerCtrl.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/ctrls/topLayerCtrl.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/projectX/getUserSpList.json" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -83,7 +89,7 @@
<workItem from="1575512375307" duration="22831000" />
<workItem from="1575602130550" duration="39482000" />
<workItem from="1575855730362" duration="63686000" />
<workItem from="1576028222753" duration="9853000" />
<workItem from="1576028222753" duration="14253000" />
</task>
<servers />
</component>
......@@ -119,10 +125,10 @@
<screen x="36" y="23" width="1644" height="1027" />
</state>
<state x="586" y="160" key="refactoring.ChangeSignatureDialog/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1575965663028" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1576043365701">
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1576047450320">
<screen x="36" y="23" width="1644" height="1027" />
</state>
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1576043365701" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1576047450320" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1575960048181" />
</component>
</project>
\ No newline at end of file
egret/libs/tw/manager/NetManager.ts
View file @ 417d9b0c
......@@ -749,6 +749,31 @@ export class NetManager extends ABNetManager {
this.send(net);
}
/**
* 停留时长
* @param remain 停留时长
* @param first 是否第一次进入
* @param from 来源
*/
public remainDurationProjectX(remain, first, from = 1): void {
const net: INetData = {
name: 'remainDuration',
uri: '/customActivity/api/remainDuration',
type: 'get',
dataType: 'json',
param: {
activityId: window['projectId'],
activityType: '60000',
remain: remain,
first: first,
from: from
},
callback: null,
hideMsg: true
};
NetManager.ins.send(net);
}
/**
* 活动工具抽奖
* @param {number} collectRuleId 集卡规则ID，活动与集卡规则关联才能获得发卡资格
......
egret/resource/default.thm.json
View file @ 417d9b0c
......@@ -16,12 +16,12 @@
"resource/skins/TaskToastSkin.exml",
"resource/skins/ToastPanelSkin.exml",
"resource/skins/WareHouseSkin.exml",
"resource/skins/Component/BarSkin.exml",
"resource/skins/Component/ProgressNumSkin.exml",
"resource/skins/Component/TimeProgressBarSkin.exml",
"resource/skins/Objs/CropSkin.exml",
"resource/skins/Objs/LandSkin.exml",
"resource/skins/Objs/OptionPanelSkin.exml",
"resource/skins/Component/BarSkin.exml",
"resource/skins/Component/ProgressNumSkin.exml",
"resource/skins/Component/TimeProgressBarSkin.exml",
"resource/skins/ui/IconButtonSkin.exml",
"resource/skins/ui/ProgressBarSkin.exml"
],
......
egret/src/Main.ts
View file @ 417d9b0c
......@@ -88,7 +88,7 @@ class Main extends eui.UILayer {
DataManager.ins.customCfgData = window["CFG"];
Buried.init();
// initstatistics(); // 页面停留时长（接口）
initstatistics(); // 页面停留时长（接口）
docEvent(); // document事件（显示，隐藏，重载）
NetManager.ins.getRule((success, res)=>{
......
egret/src/Panels/RulePanel/RulePanel.ts
View file @ 417d9b0c
......@@ -2,6 +2,7 @@ import Panel from "../../views/Panel";
import { HtmlTextParser } from "../../../libs/tc/util/HtmlTextParser";
import { DataManager } from "../../../libs/tw/manager/DataManager";
import { NetName } from "../../../libs/tw/enum/NetName";
import TopLayerCtrl from "../../ctrls/topLayerCtrl";
export default class RulePanel extends Panel {
public closeBtn: eui.Button;
......@@ -15,16 +16,12 @@ export default class RulePanel extends Panel {
}
protected onSkinComplete(): void {
super.onSkinComplete();
this.preLoadRes();
this.onLoad();
}
protected onLoad(): void {
protected start() {
TopLayerCtrl.instance.closeCurrent();
TopLayerCtrl.instance.removeMask();
super.start();
this.initUI();
}
private initUI(): void {
......
egret/src/Panels/SelledPanel.ts
View file @ 417d9b0c
......@@ -33,9 +33,9 @@ export default class SelledPanel extends Panel {
}
onTouchClose(): any {
super.onTouchClose();
IndexDispatcher.dispatchEvent('closeWareHouse');
IndexDispatcher.dispatchEvent('addGold');
super.onTouchClose();
}
private initUI(): void {
......
egret/src/Panels/WareHousePanel.ts
View file @ 417d9b0c
......@@ -98,6 +98,10 @@ export default class WareHousePanel extends Panel {
IndexDispatcher.addEvent('closeWareHouse', this.onTouchClose, this);
}
onTouchClose(): any {
return super.onTouchClose();
}
destroy() {
super.destroy();
IndexDispatcher.removeEvent('updateWareHouse', this.getWareHouseInfo, this);
......
egret/src/comm/statistics.ts
View file @ 417d9b0c
......@@ -26,7 +26,7 @@ const handleVisibilityChange = (e) => {
if (document.visibilityState == "hidden") {
endTimer = new Date().getTime();
console.log('endTimer', endTimer)
console.log('endTimer', endTimer);
sendData();
}
};
......@@ -34,13 +34,15 @@ const sendData = () => {
const t0 = endTimer - startTimer;
console.log('停留时间是', t0);
// if (localStorage.getItem('xxl_first_statistics') == null) {
if (localStorage.getItem('xxl_first_statistics') == null) {
// NetManager.ins.remainDuration(t0, true);
// localStorage.setItem('xxl_first_statistics', '1');
// } else {
NetManager.ins.remainDuration(t0, false);
// }
}
NetManager.ins.remainDurationProjectX(t0, true);
localStorage.setItem('xxl_first_statistics', '1');
} else {
// NetManager.ins.remainDuration(t0, false);
NetManager.ins.remainDurationProjectX(t0, false);
}
};
export const initstatistics = () => {
document.addEventListener(
......@@ -53,4 +55,4 @@ export const initstatistics = () => {
endTimer = new Date().getTime();
return sendData();
}
}
};
egret/src/ctrls/panelCtrl.ts
View file @ 417d9b0c
......@@ -47,10 +47,10 @@ export default class PanelCtrl {
* 显示
* @param type 类型
* @param data 数据
* @param afterAni
*/
public show(type: ModuleTypes, data?) {
if (this._current) {
this._current.destroy(); /// TODO 不知道谁干的，没写这句导致事件清除不完善！自定义事件起冲突
this.remove(this._current, true);
this._current = null;
}
......@@ -92,13 +92,13 @@ export default class PanelCtrl {
* 移除蒙层
*/
removeMask(rightNow = false) {
if (this._mask) {
if (rightNow) {
this._parent.removeChild(this._mask);
} else
egret.Tween.get(this._mask).to({ alpha: 0 }, 300, egret.Ease.quartIn).call(
() => this._parent.removeChild(this._mask), this);
}
// if (this._mask) {
// if (rightNow) {
// this._parent.removeChild(this._mask);
// } else
// egret.Tween.get(this._mask).to({ alpha: 0 }, 300, egret.Ease.quartIn).call(
// () => this._parent.removeChild(this._mask), this);
// }
this._parent.visible = false;
}
......@@ -108,8 +108,9 @@ export default class PanelCtrl {
this.removeMask(rightNow);
return;
}
/// TODO 改造自定义移除动画
const tw = egret.Tween.get(panel);
tw.to({ y: panel.stage.stageHeight }, 300, egret.Ease.quartIn)
tw.to({ y: this.canvasH }, 300, egret.Ease.quartIn)
.call(() => {
this._parent.removeChild(panel);
this.removeMask();
......
egret/src/ctrls/topLayerCtrl.ts
View file @ 417d9b0c
......@@ -40,6 +40,7 @@ export default class TopLayerCtrl {
* 加入黑色蒙层
*/
private addMask(maskAlpha: number) {
/// TODO 临时改造，将生成的mask alpha 设置为 1，使用生成后的Sprite来设置透明度，比免重复的移除和生成
if(!this._mask) {
this._mask = new egret.Sprite();
this._mask.touchEnabled = true;
......@@ -55,9 +56,10 @@ export default class TopLayerCtrl {
* 移除蒙层
*/
removeMask() {
if(this._mask) {
this._parent.removeChild(this._mask);
}
/// TODO 不知道谁干的。 暂时认为没必要移除，且移除易造成_mask不是_parent的子渲染项
// if(this._mask) {
// this._parent.removeChild(this._mask);
// }
this._parent.visible = false;
}
......@@ -80,8 +82,9 @@ export default class TopLayerCtrl {
}
private remove(panel: Panel) {
this._current && this._current.destroy();
this._current = null;
this._parent.removeChild(panel);
panel.parent && this._parent.removeChild(panel);
}
private onPanelHide(e: egret.Event) {
......
mock/projectX/getUserSpList.json
View file @ 417d9b0c
......@@ -3,8 +3,8 @@
"message": null,
"code": null,
"data": {
"sp_1": 0,
"sp_2": 0,
"sp_1": 100,
"sp_2": 100,
"sp_food_1": 100,
"sp_food_2": 100,
"sp_task_1": 10,
......
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