Commit 6afbd441 authored by wildfirecode's avatar wildfirecode

1

parent 2c8063ee
...@@ -9,6 +9,7 @@ import { GTime } from '../../tc/util/GTime'; ...@@ -9,6 +9,7 @@ import { GTime } from '../../tc/util/GTime';
import { IExposureData } from '../data/common/IExposureData'; import { IExposureData } from '../data/common/IExposureData';
import { GDispatcher } from '../../tc/util/GDispatcher'; import { GDispatcher } from '../../tc/util/GDispatcher';
import onNotSuccess from '../../new_wx/onNotSuccess'; import onNotSuccess from '../../new_wx/onNotSuccess';
import { showToast } from '../../new_wx/ctrls/toastCtrl';
// import { IExposureData } from '..'; // import { IExposureData } from '..';
export class NetManager extends ABNetManager { export class NetManager extends ABNetManager {
...@@ -1816,7 +1817,7 @@ export class NetManager extends ABNetManager { ...@@ -1816,7 +1817,7 @@ export class NetManager extends ABNetManager {
if (!net.hideMsg) { if (!net.hideMsg) {
GDispatcher.dispatchEvent(ABNetManager.ERROR, net); GDispatcher.dispatchEvent(ABNetManager.ERROR, net);
onNotSuccess(); showToast('活动太火爆了\n请稍后再来');
} }
} }
// tslint:disable-next-line:max-file-line-count // tslint:disable-next-line:max-file-line-count
......
...@@ -83,7 +83,7 @@ export default class MapScene extends Scene { ...@@ -83,7 +83,7 @@ export default class MapScene extends Scene {
} }
getScrollV(lastOrder, stageHeight) { getScrollV(lastOrder, stageHeight) {
lastOrder = 8; lastOrder = 20;
if (lastOrder <= 7) {//顶部的1-7关 if (lastOrder <= 7) {//顶部的1-7关
return this.getScrollV1(lastOrder, stageHeight); return this.getScrollV1(lastOrder, stageHeight);
} }
...@@ -91,12 +91,19 @@ export default class MapScene extends Scene { ...@@ -91,12 +91,19 @@ export default class MapScene extends Scene {
if (lastOrder >= 60) {//底部的60-70关 if (lastOrder >= 60) {//底部的60-70关
return this.getScrollV2(lastOrder, stageHeight); return this.getScrollV2(lastOrder, stageHeight);
} }
//中部的4个循环*13 //中部的4个循环*13 8~59
return this.getScrollV3(lastOrder, stageHeight); return this.getScrollV3(lastOrder, stageHeight);
} }
getScrollV3(lastOrder, stageHeight) { getScrollV3(lastOrder, stageHeight) {
return 0; const ylist = [26, 158, 302, 435, 547, 674, 821, 897, 969, 1072, 1137, 1254, 1367];
const y0 = this._data.top.height;//顶部的高度
let a0 = (lastOrder - MapTopPart.LEVEL_NUMS) % MapRpeatPart.LEVEL_NUMS; //减去7后的order 8-7 = 1
if(a0==0)a0=MapRpeatPart.LEVEL_NUMS
const a1 = Math.ceil((lastOrder - MapTopPart.LEVEL_NUMS) / MapRpeatPart.LEVEL_NUMS) - 1;//当前地图repeat的顺序
const y1 = ylist[a0 - 1];
const y2 = y0 + y1 + a1 * this._data.list[0].height;
return y2 - stageHeight / 2;
} }
getScrollV1(lastOrder, stageHeight) { getScrollV1(lastOrder, stageHeight) {
......
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