Skip to content

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

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

parents b56f8d02 60ba0a8c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1199 additions and 11 deletions
egret/index.html
View file @ c9617534
......@@ -132,8 +132,8 @@
];
// localStorage.clear();
window['imgver'] = '1022'
window['total_level'] = 18 + 13 * 14;
window['last_level'] = 200;//必须大于等于total_level
window['total_level'] = 18 + 13 * 16;
window['last_level'] = 225;//必须大于等于total_level
// localStorage.clear();
......
egret/libs/new_wx/MainBase.ts
View file @ c9617534
......@@ -70,6 +70,7 @@ import getRedBombAward from "../../src/getRedBombAward";
import BombTipsPanel from "../../src/panels/BombTipsPanel";
import RedBombRule from "../../src/panels/RedBombRule";
import RedBombAlertPanel from "../../src/panels/RedBombAlertPanel";
import { GFun } from "../tc/util/GFun";
export default class MainBase extends eui.UILayer {
constructor() {
......@@ -78,6 +79,29 @@ export default class MainBase extends eui.UILayer {
Loading2.instace.loadImage();
DataManager.ins.customCfgData = window['CFG'];
this.getData();
try {
if (GFun.isIOS) {
// 通过window.SNNativeClient. setNavigationHiden (0)调用客户端隐藏WebView原生导航栏
// 功能。
// 0：隐藏
// 1：不隐藏
window['SNNativeClient'].setNavigationHiden(0);
} else {
// 1.页面引入
// http://res.suning.cn/project/mvs/RES/common/script/android/sneapp.js
// 2.
// document.addEventListener("deviceready", function() {
// baseApi.enableTitleShow(false);
// }, false);
document.addEventListener("deviceready", () => {
window['baseApi'].enableTitleShow(false);
}, false);
}
} catch (error) {
console.log(error)
}
}
protected registerModules() {
......
egret/src/panels/HongbaoRain/HbCutTime.ts
View file @ c9617534
......@@ -55,7 +55,7 @@ export default class HbCutTime extends Panel {
time = data.currentSession.endTime - sysTime + 3000;
if(data.canJoin) {
this.ok_btn.source = 'hbCutTime_btn_enable_png';
NetManager.ins.showLog(getlogItem(59));
NetManager.ins.showLog(getlogItem(58));
this.btnEffect();
this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
} else {
......@@ -134,7 +134,7 @@ export default class HbCutTime extends Panel {
}
onTouchOK() {
NetManager.ins.clickLog(getlogItem(59));
NetManager.ins.clickLog(getlogItem(58));
PanelCtrl.instance.show('HbGame', {needScore: this.data.res.data.currentSession.limitScore});
}
......
egret/src/panels/HongbaoRain/HbNoPrize.ts
View file @ c9617534
......@@ -28,7 +28,7 @@ export default class HbNoPrize extends Panel {
}
initUI() {
NetManager.ins.showLog(getlogItem(61));
NetManager.ins.showLog(getlogItem(60));
let type = this.data.type;
switch(true) {
case (type == 1):
......@@ -65,7 +65,7 @@ export default class HbNoPrize extends Panel {
}
onTouchOK() {
NetManager.ins.clickLog(getlogItem(61));
NetManager.ins.clickLog(getlogItem(60));
if((getHomeData().levels.length + 1) > window['last_level']) {
changeMapScene();
super.hidePanel();
......
egret/src/panels/HongbaoRain/HbPrize.ts
View file @ c9617534
......@@ -59,7 +59,7 @@ export default class HbPrize extends Panel {
}
initUI() {
NetManager.ins.showLog(getlogItem(60));
NetManager.ins.showLog(getlogItem(59));
}
......@@ -79,7 +79,7 @@ export default class HbPrize extends Panel {
}
onTouchOK() {
NetManager.ins.clickLog(getlogItem(60));
NetManager.ins.clickLog(getlogItem(59));
if((getHomeData().levels.length + 1) > window['last_level']) {
changeMapScene();
super.hidePanel();
......
egret/src/something/Tool.ts
View file @ c9617534
......@@ -15,7 +15,7 @@ import { StateType } from "./enum/StateType";
const offsetYTwo: number[] = [];
const gameAreaHeightTwo: number[] = [];
//初始化适配位置，就因为棒棒糖的45偏移
(function () {
function initClientScale() {
var stageHeight = document.body.clientHeight / document.body.clientWidth * 750;
var middleHeight = 80 * 9;
var smallestHeight = 230 + middleHeight + 180;
......@@ -30,7 +30,7 @@ const gameAreaHeightTwo: number[] = [];
gameAreaHeightTwo[0] = stageHeight - 230 - 180;;
gameAreaHeightTwo[1] = stageHeight - 230 - 180;
}
})()
}
export class Tool {
/**
......@@ -95,6 +95,8 @@ export class Tool {
* 提前的缓存数据，千万别修改，因为给出的数据都没有深拷贝过
*/
public static init(isTwo: boolean = false, hasLollipop: boolean = false) {
//初始化屏幕尺寸
if(!offsetYTwo.length)initClientScale();
//x的偏移
var ooox: number = isTwo ? 55 : 15;// 49 : 8.25
var oooy: number = hasLollipop ? offsetYTwo[1] : offsetYTwo[0];
......
egret/src/something/chapters/Chapter11.ts 0 → 100644
View file @ c9617534
This diff is collapsed.
egret/src/something/chapters/Chapter12.ts 0 → 100644
View file @ c9617534
This diff is collapsed.
egret/src/something/chapters/getChapter.ts
View file @ c9617534
......@@ -9,9 +9,11 @@ import { Chapters7 } from "./Chapter7";
import { Chapters8 } from "./Chapter8";
import { Chapters9 } from "./Chapter9";
import { Chapters10 } from "./Chapter10";
import { Chapters11 } from "./Chapter11";
import { PassTargetData } from "../interface/PassTargetData";
import { PassType } from "../enum/PassType";
import { submitTran } from "../enum/ElementType";
import { Chapters12 } from "./Chapter12";
//所有的关卡
const chapters: ChapterData[] = [].concat(
......@@ -25,6 +27,8 @@ const chapters: ChapterData[] = [].concat(
Chapters8,
Chapters9,
Chapters10,
Chapters11,
Chapters12,
)
/**
* 获取关卡数据，返回关卡数据
......
mock/config.js
View file @ c9617534
......@@ -52,7 +52,7 @@ const config = {
data: './happyclear/openTreasureBox.json'
},
'/customActivity/happyclear/home': {
data: './happyclear/home.json'
data: './happyclear/homemax.json'
},
'/customActivity/happyclear/getLevelInfo': {
data: './happyclear/getLevelInfo.json'
......
mock/happyclear/homemax.json
View file @ c9617534
......@@ -986,6 +986,151 @@
"levelNum": 196,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 197,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 198,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 199,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 200,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 201,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 202,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 203,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 204,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 205,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 206,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 207,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 208,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 209,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 210,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 211,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 212,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 213,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 214,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 215,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 216,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 217,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 218,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 219,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 220,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 221,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 222,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 223,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 224,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 225,
"maxScore": 47440,
"stars": 1
}
],
"remainProp": [
......
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