Skip to content

X
xiaoxiaole
Commit fab95b7a authored by wildfirecode's avatar wildfirecode
Browse files
Options

Merge branch 'hotfix20200330_' into dev

parents 094ed204 3ed316d9
Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 10 deletions
egret/index.html
View file @ fab95b7a
......@@ -127,8 +127,8 @@
// localStorage.clear();
window['imgver'] = '11112';
//top 8 ，repeat 22 , bottom 3
window['total_level'] = 8 + 3 + 22 * 25;
window['last_level'] = 550;
window['total_level'] = 8 + 3 + 22 * 26;
window['last_level'] = 575;
var sharePic = document.getElementById('pic');
sharePic.onclick = function () {
......
egret/src/panels/ADPanel.ts
View file @ fab95b7a
......@@ -24,6 +24,7 @@ export default class ADPanel extends Panel {
this.data.img = result.img;
this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
if(result.url=='0')return;
NetManager.ins.clickLog(getlogItem(25));
wait(100).then(()=>{
window.location.href = result.url;
......
egret/src/something/chapters/Chapter22.ts 0 → 100644
View file @ fab95b7a
import { ChapterData } from "../interface/ChapterData";
//551-575
export const Chapters22: ChapterData[] = [
]
egret/src/something/chapters/getChapter.ts
View file @ fab95b7a
......@@ -23,6 +23,7 @@ import { Chapters18 } from "./Chapter18";
import { Chapters19 } from "./Chapter19";
import { Chapters20 } from "./Chapter20";
import { Chapters21 } from "./Chapter21";
import { Chapters22 } from "./Chapter22";
//所有的关卡
const chapters: ChapterData[] = [].concat(
......@@ -47,6 +48,7 @@ const chapters: ChapterData[] = [].concat(
Chapters19,
Chapters20,
Chapters21,
Chapters22,
)
// console.log(chapters)
chapters.forEach((chapter,index) => {
......
mock/happyclear/advert.json
View file @ fab95b7a
......@@ -9,11 +9,11 @@
"advertList":[
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
"url":"0"
},
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
"url":"0"
}
]
},
......@@ -22,11 +22,11 @@
"advertList":[
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
"url":"0"
},
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
"url":"0"
}
]
},
......@@ -35,11 +35,11 @@
"advertList":[
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
"url":"0"
},
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
"url":"0"
}
]
}
......
mock/happyclear/home.json
View file @ fab95b7a
......@@ -2633,8 +2633,262 @@
"levelNum": 524,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 525,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 526,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 527,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 528,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 529,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 530,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 531,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 532,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 533,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 534,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 535,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 536,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 537,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 538,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 539,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 540,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 541,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 542,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 543,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 544,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 545,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 546,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 547,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 548,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 549,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 550,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 551,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 552,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 553,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 554,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 555,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 556,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 557,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 558,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 559,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 560,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 561,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 562,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 563,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 564,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 565,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 566,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 567,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 568,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 569,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 570,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 571,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 572,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 573,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 574,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 575,
"maxScore": 47440,
"stars": 1
}
],
"remainProp": [
{
......@@ -2650,7 +2904,7 @@
"num": 3
}
],
"remainEnargy": 1,
"remainEnargy": 99,
"askForEnergy": false,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150
......
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