Skip to content

X
xiaoxiaole
Commit c5f48176 authored by wjf's avatar wjf
Browse files
Options

Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

parents 5745a9bf 75e31530
Hide whitespace changes
Inline Side-by-side
Showing with 596 additions and 17 deletions
egret/index.html
View file @ c5f48176
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<script src="libs/fileSave.js"></script> <script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/> <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
<script> <script>
window['hbRainTime'] = 30; window['hbRainTime'] = 30; // 红包雨倒计时
window['plugs'] = [1, 2, 3] window['plugs'] = [1, 2, 3]
// localStorage.clear(); // localStorage.clear();
window['isInvitePage'] = 0; window['isInvitePage'] = 0;
......
egret/src/mapScene/MapScene.ts
View file @ c5f48176
...@@ -316,6 +316,13 @@ export default class MapScene extends Scene { ...@@ -316,6 +316,13 @@ export default class MapScene extends Scene {
if(icon.parent) if(icon.parent)
count++; count++;
} }
if(this._avatarsCache) {
this._avatarsCache.forEach((item) => {
if(item.parent) item.parent.addChild(item);
});
}
} }
// 添加图标 // 添加图标
......
egret/src/mapScene/icon/ActIcon.ts
View file @ c5f48176
...@@ -60,6 +60,13 @@ export default class ActIcon { ...@@ -60,6 +60,13 @@ export default class ActIcon {
private onTap_actsShowBtn() { private onTap_actsShowBtn() {
this.actIconsGroup.visible = !this.actIconsGroup.visible; this.actIconsGroup.visible = !this.actIconsGroup.visible;
if(this.actIconsGroup.visible){
for(let k in this.icons){
if(this.icons[k].visible){
this.icons[k].showLog();
}
}
}
this.actIconsGroup.x = 12.12; this.actIconsGroup.x = 12.12;
if(this.actIconsGroup.visible == false) { if(this.actIconsGroup.visible == false) {
this.actIconsGroup.x = -999; this.actIconsGroup.x = -999;
......
egret/src/mapScene/icon/HbRainIcon.ts
View file @ c5f48176
...@@ -2,6 +2,7 @@ import IconBase from "./IconBase"; ...@@ -2,6 +2,7 @@ import IconBase from "./IconBase";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl"; import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher"; import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import { NetManager } from "../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
export default class HbRainIcon extends IconBase { export default class HbRainIcon extends IconBase {
...@@ -15,6 +16,11 @@ export default class HbRainIcon extends IconBase { ...@@ -15,6 +16,11 @@ export default class HbRainIcon extends IconBase {
this.updateIcon(); this.updateIcon();
} }
public showLog() {
super.showLog();
NetManager.ins.showLog(getlogItem(57));
}
private updateIcon() { private updateIcon() {
NetManager.ins.hbRainBaseInfo((success, res) => { NetManager.ins.hbRainBaseInfo((success, res) => {
if(!success) { if(!success) {
...@@ -29,16 +35,18 @@ export default class HbRainIcon extends IconBase { ...@@ -29,16 +35,18 @@ export default class HbRainIcon extends IconBase {
return; return;
} }
this.visible = true; this.visible = true;
}) });
} }
/** /**
* 点击icon * 点击icon
* @param e 点击事件 * @param e 点击事件
*/ */
protected onTouchBtn(e: egret.TouchEvent) { protected onTouchBtn(e: egret.TouchEvent) {
super.onTouchBtn(e); super.onTouchBtn(e);
NetManager.ins.clickLog(getlogItem(57));
NetManager.ins.hbRainBaseInfo((success, res) => { NetManager.ins.hbRainBaseInfo((success, res) => {
PanelCtrl.instance.show("HbCutTime", {res: res}); PanelCtrl.instance.show("HbCutTime", {res: res});
}); });
......
egret/src/mapScene/icon/IconBase.ts
View file @ c5f48176
...@@ -25,6 +25,10 @@ export default class IconBase { ...@@ -25,6 +25,10 @@ export default class IconBase {
this.start(); this.start();
} }
public showLog(){
}
/** /**
* 设置图标提示的隐藏与显示 * 设置图标提示的隐藏与显示
* @param visible * @param visible
......
egret/src/panels/HongbaoRain/HbCutTime.ts
View file @ c5f48176
...@@ -3,6 +3,7 @@ import CutTimer from "../../CutTimer"; ...@@ -3,6 +3,7 @@ import CutTimer from "../../CutTimer";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl"; import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { NetManager } from "../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../libs/tw/manager/NetManager";
import HbRule from "./HbRule"; import HbRule from "./HbRule";
import { getlogItem } from "../../Main";
/** /**
* 红包雨倒计时 * 红包雨倒计时
...@@ -50,6 +51,7 @@ export default class HbCutTime extends Panel { ...@@ -50,6 +51,7 @@ export default class HbCutTime extends Panel {
time = data.currentSession.endTime - sysTime + 3000; time = data.currentSession.endTime - sysTime + 3000;
if(data.canJoin) { if(data.canJoin) {
this.ok_btn.source = 'hbCutTime_btn_enable_png'; this.ok_btn.source = 'hbCutTime_btn_enable_png';
NetManager.ins.showLog(getlogItem(58));
this.btnEffect(); this.btnEffect();
this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this); this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
} else { } else {
...@@ -128,6 +130,7 @@ export default class HbCutTime extends Panel { ...@@ -128,6 +130,7 @@ export default class HbCutTime extends Panel {
} }
onTouchOK() { onTouchOK() {
NetManager.ins.clickLog(getlogItem(58));
PanelCtrl.instance.show('HbGame', {needScore: this.data.res.data.currentSession.limitScore}); PanelCtrl.instance.show('HbGame', {needScore: this.data.res.data.currentSession.limitScore});
} }
......
egret/src/panels/HongbaoRain/HbNoPrize.ts
View file @ c5f48176
...@@ -6,6 +6,8 @@ import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl"; ...@@ -6,6 +6,8 @@ import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { addAdComp } from "../BoxPanel"; import { addAdComp } from "../BoxPanel";
import Utils from "../../Utils"; import Utils from "../../Utils";
import CutTimer from "../../CutTimer"; import CutTimer from "../../CutTimer";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../Main";
/** /**
* 红包雨无奖励 * 红包雨无奖励
...@@ -26,6 +28,7 @@ export default class HbNoPrize extends Panel { ...@@ -26,6 +28,7 @@ export default class HbNoPrize extends Panel {
} }
initUI() { initUI() {
NetManager.ins.showLog(getlogItem(60));
let type = this.data.type; let type = this.data.type;
switch(true) { switch(true) {
case (type == 1): case (type == 1):
...@@ -62,6 +65,7 @@ export default class HbNoPrize extends Panel { ...@@ -62,6 +65,7 @@ export default class HbNoPrize extends Panel {
} }
onTouchOK() { onTouchOK() {
NetManager.ins.clickLog(getlogItem(60));
if((getHomeData().levels.length + 1) > window['last_level']) { if((getHomeData().levels.length + 1) > window['last_level']) {
changeMapScene(); changeMapScene();
super.hidePanel(); super.hidePanel();
......
egret/src/panels/HongbaoRain/HbPrize.ts
View file @ c5f48176
...@@ -4,6 +4,8 @@ import { changeMapScene } from "../../startScene/StartScene"; ...@@ -4,6 +4,8 @@ import { changeMapScene } from "../../startScene/StartScene";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher"; import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl"; import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { HtmlTextParser } from "../../../libs/new_wx/HtmlTextParser"; import { HtmlTextParser } from "../../../libs/new_wx/HtmlTextParser";
import { getlogItem } from "../../Main";
import { NetManager } from "../../../libs/tw/manager/NetManager";
/** /**
* 红包雨奖励 * 红包雨奖励
...@@ -57,6 +59,7 @@ export default class HbPrize extends Panel { ...@@ -57,6 +59,7 @@ export default class HbPrize extends Panel {
} }
initUI() { initUI() {
NetManager.ins.showLog(getlogItem(59));
} }
...@@ -76,6 +79,7 @@ export default class HbPrize extends Panel { ...@@ -76,6 +79,7 @@ export default class HbPrize extends Panel {
} }
onTouchOK() { onTouchOK() {
NetManager.ins.clickLog(getlogItem(59));
if((getHomeData().levels.length + 1) > window['last_level']) { if((getHomeData().levels.length + 1) > window['last_level']) {
changeMapScene(); changeMapScene();
super.hidePanel(); super.hidePanel();
......
egret/src/panels/HongbaoRain/RainMgr.ts
View file @ c5f48176
...@@ -35,7 +35,7 @@ export default class RainMgr { ...@@ -35,7 +35,7 @@ export default class RainMgr {
GDispatcher.addEvent('hbRainGameOver', this.gameOver, this); GDispatcher.addEvent('hbRainGameOver', this.gameOver, this);
this.timer = new egret.Timer(1200, 0); this.timer = new egret.Timer(1000, 0);
this.timer.addEventListener(egret.TimerEvent.TIMER, this.addRain, this); this.timer.addEventListener(egret.TimerEvent.TIMER, this.addRain, this);
this.timer.start(); this.timer.start();
} }
......
egret/src/panels/HongbaoRain/RainObj.ts
View file @ c5f48176
...@@ -30,9 +30,9 @@ export default class RainObj { ...@@ -30,9 +30,9 @@ export default class RainObj {
this.module.alpha = 1; this.module.alpha = 1;
this.module.touchEnabled = true; this.module.touchEnabled = true;
this.module.source = `hbGame_${this.data.key}_png`; this.module.source = `hbGame_${this.data.key}_png`;
this.module.addEventListener(egret.TouchEvent.TOUCH_TAP, this.touchTap, this); this.module.addEventListener(egret.TouchEvent.TOUCH_BEGIN, this.touchTap, this);
egret.Tween.get(this.module, {loop: true}).to({rotation: ~~(Math.random() * 2) ? 360 : -360}, 18000); egret.Tween.get(this.module, {loop: true}).to({rotation: ~~(Math.random() * 2) ? 360 : -360}, 18000);
egret.Tween.get(this.module).to({y: this.rainGroup.height + 200}, 5000).call(() => this.destroy()); egret.Tween.get(this.module).to({y: this.rainGroup.height + 200}, 4000).call(() => this.destroy());
} }
private touchTap() { private touchTap() {
......
egret/src/panels/TurntablePanel/Turntable.ts
View file @ c5f48176
...@@ -122,10 +122,10 @@ export default class Turntable extends Panel { ...@@ -122,10 +122,10 @@ export default class Turntable extends Panel {
console.warn(error) console.warn(error)
} }
NetManager.ins.hc_turnableDojoin((success, res) => { NetManager.ins.hc_turnableDojoin((success, res) => {
NetManager.ins.hc_home(() => { // NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene(); // SceneCtrl.instance.updateScene();
this['nums'].text = `当前可用元宝：${getHomeData().wealth}`; // this['nums'].text = `当前可用元宝：${getHomeData().wealth}`;
}, window['collectRuleId']); // }, window['collectRuleId']);
Loading.instace.hide(); Loading.instace.hide();
// if(!success) { // if(!success) {
// return; // return;
...@@ -144,6 +144,10 @@ export default class Turntable extends Panel { ...@@ -144,6 +144,10 @@ export default class Turntable extends Panel {
id = data.option.categoryType; id = data.option.categoryType;
} }
this.rotateByPrize(id, () => { this.rotateByPrize(id, () => {
NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene();
this['nums'].text = `当前可用元宝：${getHomeData().wealth}`;
}, window['collectRuleId']);
if(!success) { if(!success) {
switch(true) { switch(true) {
case (code == "600051"): // 元宝不足 case (code == "600051"): // 元宝不足
......
mock/happyclear/hbRainBaseInfo.json
View file @ c5f48176
...@@ -2,11 +2,15 @@ ...@@ -2,11 +2,15 @@
"success": true, "success": true,
"code": "0000000000", "code": "0000000000",
"desc": "OK", "desc": "OK",
"timestamp": 1573131493110, "timestamp": 1573206010193,
"data": { "data": {
"currentSession": null,
"currentRemainTimes": 0, "currentRemainTimes": 0,
"nextSession": null, "currentSession": {
"canJoin": false "sessionIndex": 10,
"startTime": 1573210800000,
"endTime": 1573212600000,
"limitScore": 10
},
"canJoin": true
} }
} }
\ No newline at end of file
mock/happyclear/home.json
View file @ c5f48176
{"success":true,"code":"0000000000","desc":"OK","timestamp":1573183122904,"data":{"wealth":40,"totalStars":42,"levels":[{"levelNum":1,"maxScore":99999,"stars":3},{"levelNum":2,"maxScore":99999,"stars":3},{"levelNum":3,"maxScore":12030,"stars":3},{"levelNum":4,"maxScore":17710,"stars":3},{"levelNum":5,"maxScore":16260,"stars":3},{"levelNum":6,"maxScore":22110,"stars":2},{"levelNum":7,"maxScore":17740,"stars":2},{"levelNum":8,"maxScore":19950,"stars":3},{"levelNum":9,"maxScore":31360,"stars":3},{"levelNum":10,"maxScore":26470,"stars":3},{"levelNum":11,"maxScore":59190,"stars":3},{"levelNum":12,"maxScore":37400,"stars":3},{"levelNum":13,"maxScore":25870,"stars":2},{"levelNum":14,"maxScore":49810,"stars":3},{"levelNum":15,"maxScore":31930,"stars":3}],"remainProp":[{"type":3,"num":1}],"remainEnargy":5,"askForEnergy":0,"canReceiveTreasureBoxNum":1,"nextRangeStarsNum":30,"isGetAllTreasureBox":false,"refectionCountdown":0}} {
\ No newline at end of file "success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1566885811031,
"data": {
"wealth": 7960,
"totalStars": 145,
"levels": [
{
"levelNum": 1,
"maxScore": 39870,
"stars": 3
},
{
"levelNum": 2,
"maxScore": 36770,
"stars": 3
},
{
"levelNum": 3,
"maxScore": 28800,
"stars": 3
},
{
"levelNum": 4,
"maxScore": 36340,
"stars": 3
},
{
"levelNum": 5,
"maxScore": 64750,
"stars": 3
},
{
"levelNum": 6,
"maxScore": 59590,
"stars": 3
},
{
"levelNum": 7,
"maxScore": 37810,
"stars": 3
},
{
"levelNum": 8,
"maxScore": 24050,
"stars": 3
},
{
"levelNum": 9,
"maxScore": 43210,
"stars": 3
},
{
"levelNum": 10,
"maxScore": 25630,
"stars": 3
},
{
"levelNum": 11,
"maxScore": 25420,
"stars": 3
},
{
"levelNum": 12,
"maxScore": 32580,
"stars": 3
},
{
"levelNum": 13,
"maxScore": 56700,
"stars": 3
},
{
"levelNum": 14,
"maxScore": 34450,
"stars": 3
},
{
"levelNum": 15,
"maxScore": 42080,
"stars": 3
},
{
"levelNum": 16,
"maxScore": 18990,
"stars": 3
},
{
"levelNum": 17,
"maxScore": 51180,
"stars": 3
},
{
"levelNum": 18,
"maxScore": 38390,
"stars": 3
},
{
"levelNum": 19,
"maxScore": 20160,
"stars": 3
},
{
"levelNum": 20,
"maxScore": 55860,
"stars": 3
},
{
"levelNum": 21,
"maxScore": 21630,
"stars": 3
},
{
"levelNum": 22,
"maxScore": 115670,
"stars": 3
},
{
"levelNum": 23,
"maxScore": 26840,
"stars": 3
},
{
"levelNum": 24,
"maxScore": 39310,
"stars": 3
},
{
"levelNum": 25,
"maxScore": 28010,
"stars": 3
},
{
"levelNum": 26,
"maxScore": 36710,
"stars": 3
},
{
"levelNum": 27,
"maxScore": 37610,
"stars": 3
},
{
"levelNum": 28,
"maxScore": 67430,
"stars": 3
},
{
"levelNum": 29,
"maxScore": 118210,
"stars": 3
},
{
"levelNum": 30,
"maxScore": 52800,
"stars": 3
},
{
"levelNum": 31,
"maxScore": 32060,
"stars": 3
},
{
"levelNum": 32,
"maxScore": 15000,
"stars": 3
},
{
"levelNum": 33,
"maxScore": 36350,
"stars": 3
},
{
"levelNum": 34,
"maxScore": 35930,
"stars": 3
},
{
"levelNum": 35,
"maxScore": 69590,
"stars": 3
},
{
"levelNum": 36,
"maxScore": 65520,
"stars": 3
},
{
"levelNum": 37,
"maxScore": 72220,
"stars": 3
},
{
"levelNum": 38,
"maxScore": 46450,
"stars": 3
},
{
"levelNum": 39,
"maxScore": 46340,
"stars": 3
},
{
"levelNum": 40,
"maxScore": 50220,
"stars": 3
},
{
"levelNum": 41,
"maxScore": 35080,
"stars": 3
},
{
"levelNum": 42,
"maxScore": 20690,
"stars": 3
},
{
"levelNum": 43,
"maxScore": 22950,
"stars": 3
},
{
"levelNum": 44,
"maxScore": 32270,
"stars": 3
},
{
"levelNum": 45,
"maxScore": 77730,
"stars": 3
},
{
"levelNum": 46,
"maxScore": 37680,
"stars": 3
},
{
"levelNum": 47,
"maxScore": 53230,
"stars": 3
},
{
"levelNum": 48,
"maxScore": 58830,
"stars": 3
},
{
"levelNum": 49,
"maxScore": 95480,
"stars": 3
},
{
"levelNum": 50,
"maxScore": 74370,
"stars": 3
},
{
"levelNum": 51,
"maxScore": 59300,
"stars": 3
},
{
"levelNum": 52,
"maxScore": 54770,
"stars": 3
},
{
"levelNum": 53,
"maxScore": 25710,
"stars": 3
},
{
"levelNum": 54,
"maxScore": 39220,
"stars": 3
},
{
"levelNum": 55,
"maxScore": 52860,
"stars": 3
},
{
"levelNum": 56,
"maxScore": 74730,
"stars": 3
},
{
"levelNum": 57,
"maxScore": 44770,
"stars": 3
},
{
"levelNum": 58,
"maxScore": 44610,
"stars": 3
},
{
"levelNum": 59,
"maxScore": 72310,
"stars": 3
},
{
"levelNum": 60,
"maxScore": 47880,
"stars": 3
},
{
"levelNum": 61,
"maxScore": 89810,
"stars": 3
},
{
"levelNum": 62,
"maxScore": 24420,
"stars": 3
},
{
"levelNum": 63,
"maxScore": 36960,
"stars": 3
},
{
"levelNum": 64,
"maxScore": 31840,
"stars": 3
},
{
"levelNum": 65,
"maxScore": 74220,
"stars": 3
},
{
"levelNum": 66,
"maxScore": 176910,
"stars": 3
},
{
"levelNum": 67,
"maxScore": 61010,
"stars": 3
},
{
"levelNum": 68,
"maxScore": 47900,
"stars": 3
},
{
"levelNum": 69,
"maxScore": 39940,
"stars": 3
},
{
"levelNum": 70,
"maxScore": 55620,
"stars": 3
},
{
"levelNum": 71,
"maxScore": 23480,
"stars": 3
},
{
"levelNum": 72,
"maxScore": 44670,
"stars": 3
},
{
"levelNum": 73,
"maxScore": 57750,
"stars": 3
},
{
"levelNum": 74,
"maxScore": 53350,
"stars": 3
},
{
"levelNum": 75,
"maxScore": 27430,
"stars": 3
},
{
"levelNum": 76,
"maxScore": 34370,
"stars": 3
},
{
"levelNum": 77,
"maxScore": 41730,
"stars": 3
},
{
"levelNum": 78,
"maxScore": 33080,
"stars": 3
},
{
"levelNum": 79,
"maxScore": 16860,
"stars": 3
},
{
"levelNum": 80,
"maxScore": 35460,
"stars": 3
},
{
"levelNum": 81,
"maxScore": 47380,
"stars": 3
},
{
"levelNum": 82,
"maxScore": 39230,
"stars": 3
},
{
"levelNum": 83,
"maxScore": 33710,
"stars": 3
},
{
"levelNum": 84,
"maxScore": 49520,
"stars": 3
},
{
"levelNum": 85,
"maxScore": 55970,
"stars": 3
},
{
"levelNum": 86,
"maxScore": 94160,
"stars": 3
},
{
"levelNum": 87,
"maxScore": 49370,
"stars": 3
},
{
"levelNum": 88,
"maxScore": 41570,
"stars": 3
},
{
"levelNum": 89,
"maxScore": 34480,
"stars": 3
},
{
"levelNum": 90,
"maxScore": 77170,
"stars": 3
},
{
"levelNum": 91,
"maxScore": 36230,
"stars": 3
},
{
"levelNum": 92,
"maxScore": 36890,
"stars": 3
},
{
"levelNum": 93,
"maxScore": 33800,
"stars": 3
},
{
"levelNum": 94,
"maxScore": 34200,
"stars": 3
},
{
"levelNum": 95,
"maxScore": 39460,
"stars": 3
},
{
"levelNum": 96,
"maxScore": 30800,
"stars": 2
},
{
"levelNum": 97,
"maxScore": 62330,
"stars": 3
},
{
"levelNum": 98,
"maxScore": 43080,
"stars": 3
},
{
"levelNum": 99,
"maxScore": 43850,
"stars": 3
},
{
"levelNum": 100,
"maxScore": 58060,
"stars": 3
},
{
"levelNum": 101,
"maxScore": 33440,
"stars": 3
}
],
"remainProp": [
{
"type": 2,
"num": 1
},
{
"type": 3,
"num": 2
},
{
"type": 4,
"num": 3
}
],
"remainEnargy": 99,
"askForEnergy": false,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150
}
}
\ No newline at end of file
mock/happyclear/mapRank.json
View file @ c5f48176
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"timestamp": 1571322224593, "timestamp": 1571322224593,
"data": [ "data": [
{ {
"levelNum": 21, "levelNum": 101,
"rank": [ "rank": [
{ {
"nickName": null, "nickName": null,
......
mock/happyclear/turnablebaseInfo.json
View file @ c5f48176
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
], ],
"id": null "id": null
}, },
"nextTimeNeedCoin": 8888 "nextTimeNeedCoin": 1
}, },
"success": true, "success": true,
"desc": "OK", "desc": "OK",
......
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