Commit 2385f210 authored by wjf's avatar wjf

l

parent 3f72dc9e
{
"success":true,
"data":44
}
\ No newline at end of file
...@@ -11458,7 +11458,7 @@ var TbNetName; ...@@ -11458,7 +11458,7 @@ var TbNetName;
TbNetName["completeTask"] = "babycare.completeTask"; TbNetName["completeTask"] = "babycare.completeTask";
TbNetName["getTaskList"] = "babycare.getTaskList"; TbNetName["getTaskList"] = "babycare.getTaskList";
TbNetName["luckyDraw"] = "babycare.luckyDraw"; TbNetName["luckyDraw"] = "babycare.luckyDraw";
TbNetName["getAppointCount"] = "mine.getAppointCount"; TbNetName["getAppointCount"] = "babycare.getAppointCount";
TbNetName["authorize"] = "mine.authorize"; TbNetName["authorize"] = "mine.authorize";
TbNetName["favorShop"] = "mine.favorShop"; TbNetName["favorShop"] = "mine.favorShop";
TbNetName["getUserAddress"] = "mine.getUserAddress"; TbNetName["getUserAddress"] = "mine.getUserAddress";
...@@ -22593,6 +22593,7 @@ var MapScene = (function (_super) { ...@@ -22593,6 +22593,7 @@ var MapScene = (function (_super) {
var bottomData = arr.splice(0, 8); var bottomData = arr.splice(0, 8);
var midData = arr; var midData = arr;
var maxHeight = MapTop_1.default.HEIGHT; var maxHeight = MapTop_1.default.HEIGHT;
this.mapContainer.addChild(new MapTop_1.default(topData));
for (var i = midData.length / 10 - 1; i >= 0; i--) { for (var i = midData.length / 10 - 1; i >= 0; i--) {
var data = midData.splice(i * 10, 10); var data = midData.splice(i * 10, 10);
var nMid = new MapMid_1.default(data); var nMid = new MapMid_1.default(data);
...@@ -22604,7 +22605,6 @@ var MapScene = (function (_super) { ...@@ -22604,7 +22605,6 @@ var MapScene = (function (_super) {
this.mapContainer.addChild(bottom); this.mapContainer.addChild(bottom);
bottom.y = maxHeight; bottom.y = maxHeight;
maxHeight += MapBottom_1.default.HEIGHT; maxHeight += MapBottom_1.default.HEIGHT;
this.mapContainer.addChild(new MapTop_1.default(topData));
this.scrollPage.maxDistance = maxHeight; this.scrollPage.maxDistance = maxHeight;
this.scrollPage.scrollTo(maxHeight, 0); this.scrollPage.scrollTo(maxHeight, 0);
this.scrollToCheck(1); this.scrollToCheck(1);
...@@ -22696,8 +22696,8 @@ var MapTop = (function (_super) { ...@@ -22696,8 +22696,8 @@ var MapTop = (function (_super) {
var _this = _super.call(this, data) || this; var _this = _super.call(this, data) || this;
_this.totalCount = 2; _this.totalCount = 2;
_this.btnPos = [ _this.btnPos = [
[207, 418], [207, 400],
[149, 282], [149, 272],
]; ];
_this.data = data; _this.data = data;
_this.bg.texture = RES_1.RES.getRes('map_bg3.jpg'); _this.bg.texture = RES_1.RES.getRes('map_bg3.jpg');
...@@ -22870,7 +22870,7 @@ var MapUI = (function (_super) { ...@@ -22870,7 +22870,7 @@ var MapUI = (function (_super) {
__extends(class_1, _super); __extends(class_1, _super);
function class_1() { function class_1() {
var _this = _super.call(this, RES_1.RES.getRes("appointCountBg.png")) || this; var _this = _super.call(this, RES_1.RES.getRes("appointCountBg.png")) || this;
_this.addChild(Tools_1.Tools.getText(res.data + "\u4EBA\u5DF2\u89E3\u9501120\u5173", 26, "#ffffff", TEXT_ALIGN.CENTER, 259, 0, 10)); _this.addChild(Tools_1.Tools.getText(res.data + "\u4EBA\u5DF2\u89E3\u9501120\u5173", 26, "#ffffff", TEXT_ALIGN.CENTER, 259, 0, 8));
return _this; return _this;
} }
return class_1; return class_1;
...@@ -29694,7 +29694,7 @@ exports.Chapters4 = [ ...@@ -29694,7 +29694,7 @@ exports.Chapters4 = [
passTarget: { type: 1, elements: [{ type: 1, count: 90 }] }, passTarget: { type: 1, elements: [{ type: 1, count: 90 }] },
starScores: [5000, 11000, 20000], starScores: [5000, 11000, 20000],
map: { map: {
lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }] lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }]
} }
}, },
{ {
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -81,13 +81,12 @@ export enum TbNetName { ...@@ -81,13 +81,12 @@ export enum TbNetName {
* activityId * activityId
*/ */
luckyDraw = "babycare.luckyDraw", luckyDraw = "babycare.luckyDraw",
///////////////////前端调用接口都加个mine
/** /**
* 获取120名通关的人数 * 获取120名通关的人数
*/ */
getAppointCount = "mine.getAppointCount", getAppointCount = "babycare.getAppointCount",
///////////////////前端调用接口都加个mine
////带用户操作,和index.js特殊操作的 ////带用户操作,和index.js特殊操作的
/** /**
......
...@@ -219,6 +219,8 @@ export class MapScene extends Scene { ...@@ -219,6 +219,8 @@ export class MapScene extends Scene {
let maxHeight = MapTop.HEIGHT; let maxHeight = MapTop.HEIGHT;
this.mapContainer.addChild(new MapTop(topData));
for (let i = midData.length / 10 - 1; i >= 0; i--) { for (let i = midData.length / 10 - 1; i >= 0; i--) {
const data = midData.splice(i * 10, 10); const data = midData.splice(i * 10, 10);
const nMid = new MapMid(data); const nMid = new MapMid(data);
...@@ -232,7 +234,7 @@ export class MapScene extends Scene { ...@@ -232,7 +234,7 @@ export class MapScene extends Scene {
bottom.y = maxHeight; bottom.y = maxHeight;
maxHeight += MapBottom.HEIGHT; maxHeight += MapBottom.HEIGHT;
this.mapContainer.addChild(new MapTop(topData)); // 最后加,因为有个层级问题 // this.mapContainer.addChild(new MapTop(topData)); // 最后加,因为有个层级问题
this.scrollPage.maxDistance = maxHeight; this.scrollPage.maxDistance = maxHeight;
this.scrollPage.scrollTo(maxHeight, 0); this.scrollPage.scrollTo(maxHeight, 0);
......
...@@ -8,9 +8,13 @@ export default class MapTop extends MapPart { ...@@ -8,9 +8,13 @@ export default class MapTop extends MapPart {
protected totalCount = 2; protected totalCount = 2;
// public btnPos = [
// [207, 418],
// [149, 282],
// ];
public btnPos = [ public btnPos = [
[207, 418], [207, 400],
[149, 282], [149, 272],
]; ];
constructor(data) { constructor(data) {
......
...@@ -114,7 +114,7 @@ export default class MapUI extends Container { ...@@ -114,7 +114,7 @@ export default class MapUI extends Container {
26, 26,
"#ffffff", "#ffffff",
TEXT_ALIGN.CENTER, 259, TEXT_ALIGN.CENTER, 259,
0, 9 0, 8
)) ))
} }
}) })
......
...@@ -266,7 +266,7 @@ export const Chapters4: ChapterData[] = [ ...@@ -266,7 +266,7 @@ export const Chapters4: ChapterData[] = [
passTarget: { type: 1, elements: [{ type: 1, count: 90 }] }, passTarget: { type: 1, elements: [{ type: 1, count: 90 }] },
starScores: [5000, 11000, 20000], starScores: [5000, 11000, 20000],
map: { map: {
lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }] lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }]
} }
}, },
//71 //71
......
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