Skip to content

X
xiaoxiaole
Commit 10a575cb authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents b4e347ef c5f6066f
Hide whitespace changes
Inline Side-by-side
Showing with 472 additions and 29 deletions
egret/src/mapScene/MapScene.ts
View file @ 10a575cb
......@@ -316,6 +316,13 @@ export default class MapScene extends Scene {
if(icon.parent)
count++;
}
if(this._avatarsCache) {
this._avatarsCache.forEach((item) => {
if(item.parent) item.parent.addChild(item);
});
}
}
// 添加图标
......
mock/happyclear/home.json
View file @ 10a575cb
......@@ -2,98 +2,534 @@
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1573183122904,
"timestamp": 1566885811031,
"data": {
"wealth": 8888,
"totalStars": 42,
"wealth": 7960,
"totalStars": 145,
"levels": [
{
"levelNum": 1,
"maxScore": 99999,
"maxScore": 39870,
"stars": 3
},
{
"levelNum": 2,
"maxScore": 99999,
"maxScore": 36770,
"stars": 3
},
{
"levelNum": 3,
"maxScore": 12030,
"maxScore": 28800,
"stars": 3
},
{
"levelNum": 4,
"maxScore": 17710,
"maxScore": 36340,
"stars": 3
},
{
"levelNum": 5,
"maxScore": 16260,
"maxScore": 64750,
"stars": 3
},
{
"levelNum": 6,
"maxScore": 22110,
"stars": 2
"maxScore": 59590,
"stars": 3
},
{
"levelNum": 7,
"maxScore": 17740,
"stars": 2
"maxScore": 37810,
"stars": 3
},
{
"levelNum": 8,
"maxScore": 19950,
"maxScore": 24050,
"stars": 3
},
{
"levelNum": 9,
"maxScore": 31360,
"maxScore": 43210,
"stars": 3
},
{
"levelNum": 10,
"maxScore": 26470,
"maxScore": 25630,
"stars": 3
},
{
"levelNum": 11,
"maxScore": 59190,
"maxScore": 25420,
"stars": 3
},
{
"levelNum": 12,
"maxScore": 37400,
"maxScore": 32580,
"stars": 3
},
{
"levelNum": 13,
"maxScore": 25870,
"stars": 2
"maxScore": 56700,
"stars": 3
},
{
"levelNum": 14,
"maxScore": 49810,
"maxScore": 34450,
"stars": 3
},
{
"levelNum": 15,
"maxScore": 31930,
"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": 3,
"type": 2,
"num": 1
},
{
"type": 3,
"num": 2
},
{
"type": 4,
"num": 3
}
],
"remainEnargy": 5,
"askForEnergy": 0,
"canReceiveTreasureBoxNum": 1,
"nextRangeStarsNum": 30,
"isGetAllTreasureBox": false,
"refectionCountdown": 0
"remainEnargy": 99,
"askForEnergy": false,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150
}
}
\ No newline at end of file
mock/happyclear/mapRank.json
View file @ 10a575cb
......@@ -5,7 +5,7 @@
"timestamp": 1571322224593,
"data": [
{
"levelNum": 21,
"levelNum": 101,
"rank": [
{
"nickName": null,
......
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