Commit 233d0e69 authored by wildfirecode's avatar wildfirecode

1

parent ae3f1e22
const isIPhoneX = () => { const isIPhoneX = () => {
var u = navigator.userAgent; const u = navigator.userAgent;
var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端 const isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
return isIOS && screen.height == 812 && screen.width == 375 return isIOS && screen.height == 812 && screen.width == 375
} }
......
...@@ -30,7 +30,7 @@ export default class MainBase extends eui.UILayer { ...@@ -30,7 +30,7 @@ export default class MainBase extends eui.UILayer {
//inject the custom material parser //inject the custom material parser
//注入自定义的素材解析器 //注入自定义的素材解析器
let assetAdapter = new AssetAdapter(); const assetAdapter = new AssetAdapter();
egret.registerImplementation("eui.IAssetAdapter", assetAdapter); egret.registerImplementation("eui.IAssetAdapter", assetAdapter);
egret.registerImplementation("eui.IThemeAdapter", new ThemeAdapter()); egret.registerImplementation("eui.IThemeAdapter", new ThemeAdapter());
...@@ -86,7 +86,7 @@ export default class MainBase extends eui.UILayer { ...@@ -86,7 +86,7 @@ export default class MainBase extends eui.UILayer {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// load skin theme configuration file, you can manually modify the file. And replace the default skin. // load skin theme configuration file, you can manually modify the file. And replace the default skin.
//加载皮肤主题配置文件,可以手动修改这个文件。替换默认皮肤。 //加载皮肤主题配置文件,可以手动修改这个文件。替换默认皮肤。
let theme = new eui.Theme("resource/default.thm.json", this.stage); const theme = new eui.Theme("resource/default.thm.json", this.stage);
theme.addEventListener(eui.UIEvent.COMPLETE, () => { theme.addEventListener(eui.UIEvent.COMPLETE, () => {
resolve(); resolve();
}, this); }, this);
......
...@@ -12,7 +12,7 @@ export default class AssetAdapter implements eui.IAssetAdapter { ...@@ -12,7 +12,7 @@ export default class AssetAdapter implements eui.IAssetAdapter {
compFunc.call(thisObject, data, source); compFunc.call(thisObject, data, source);
} }
if (RES.hasRes(source)) { if (RES.hasRes(source)) {
let data = RES.getRes(source); const data = RES.getRes(source);
if (data) { if (data) {
onGetRes(data); onGetRes(data);
} }
......
...@@ -37,7 +37,7 @@ window['Main'] = Main; ...@@ -37,7 +37,7 @@ window['Main'] = Main;
egret.runEgret({ egret.runEgret({
renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor: (context:any)=> { renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor: (context:any)=> {
var backingStore = context.backingStorePixelRatio || const backingStore = context.backingStorePixelRatio ||
context.webkitBackingStorePixelRatio || context.webkitBackingStorePixelRatio ||
context.mozBackingStorePixelRatio || context.mozBackingStorePixelRatio ||
context.msBackingStorePixelRatio || context.msBackingStorePixelRatio ||
......
...@@ -25,14 +25,16 @@ export default class RulePanel extends Panel { ...@@ -25,14 +25,16 @@ export default class RulePanel extends Panel {
console.log(text); console.log(text);
// this.labContent.textFlow = (new egret.HtmlTextParser).parser(DataManager.ins.getRuleData.ruleText); // this.labContent.textFlow = (new egret.HtmlTextParser).parser(DataManager.ins.getRuleData.ruleText);
for (const textItem of textlist) {
for (let i = 0; i < textlist.length; i++) { // }
// for (let i = 0; i < textlist.length; i++) {
const l = new eui.Label(); const l = new eui.Label();
l.textColor=this.labContent.textColor; l.textColor=this.labContent.textColor;
l.size=this.labContent.size; l.size=this.labContent.size;
l.width=this.labContent.width; l.width=this.labContent.width;
l.minHeight=20; l.minHeight=20;
l.textFlow = (new egret.HtmlTextParser).parser(textlist[i]+''); l.textFlow = (new egret.HtmlTextParser).parser(textItem+'');
this.group.addChild(l) this.group.addChild(l)
} }
} }
......
...@@ -69,7 +69,7 @@ export default class Box extends egret.Sprite { ...@@ -69,7 +69,7 @@ export default class Box extends egret.Sprite {
} }
async createBg() { async createBg() {
let url = this.boxData.skin; const url = this.boxData.skin;
return new Promise((resolve) => { return new Promise((resolve) => {
RES.getResByUrl(url, (sheet: egret.SpriteSheet) => { RES.getResByUrl(url, (sheet: egret.SpriteSheet) => {
this._pic.sheet = sheet; this._pic.sheet = sheet;
...@@ -86,7 +86,7 @@ export default class Box extends egret.Sprite { ...@@ -86,7 +86,7 @@ export default class Box extends egret.Sprite {
} }
async createFirstBg() { async createFirstBg() {
let url = this.boxData.skin; const url = this.boxData.skin;
return new Promise((resolve) => { return new Promise((resolve) => {
RES.getResByUrl(url, (sheet: egret.SpriteSheet) => { RES.getResByUrl(url, (sheet: egret.SpriteSheet) => {
this._pic.sheet = sheet; this._pic.sheet = sheet;
......
...@@ -24,7 +24,7 @@ export default class Net extends egret.Sprite { ...@@ -24,7 +24,7 @@ export default class Net extends egret.Sprite {
} }
createBg() { createBg() {
let url = getResPath() + `resource/assets/startScene/net.json`; const url = getResPath() + `resource/assets/startScene/net.json`;
RES.getResByUrl(url, (sheet: egret.SpriteSheet) => { RES.getResByUrl(url, (sheet: egret.SpriteSheet) => {
this._pic.sheet = sheet; this._pic.sheet = sheet;
this._pic.fps = 20; this._pic.fps = 20;
......
...@@ -247,7 +247,7 @@ export default class StartScene extends Scene { ...@@ -247,7 +247,7 @@ export default class StartScene extends Scene {
} }
} }
async getBg() { async getBg() {
let url = __bgUrl__ const url = __bgUrl__
return new Promise((resolve) => { return new Promise((resolve) => {
RES.getResByUrl(url, (picData) => { RES.getResByUrl(url, (picData) => {
resolve(picData) resolve(picData)
......
...@@ -5,7 +5,15 @@ ...@@ -5,7 +5,15 @@
], ],
"jsRules": {}, "jsRules": {},
"rules": { "rules": {
"only-arrow-functions":true "only-arrow-functions": true,
"no-namespace": true,
"no-var-keyword": true,
"prefer-const": true,
"no-conditional-assignment": true,
"prefer-for-of": true,
"no-inferrable-types": true,
// "no-magic-numbers": true,
"cyclomatic-complexity": true
}, },
"rulesDirectory": [] "rulesDirectory": []
} }
\ No newline at end of file
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