Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
db-game-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
崔立强
db-game-template
Commits
233d0e69
Commit
233d0e69
authored
Oct 30, 2018
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
ae3f1e22
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
14 deletions
+24
-14
isIPhoneX.ts
egret/libs/tc/utils/isIPhoneX.ts
+2
-2
MainBase.ts
egret/libs/tl/MainBase.ts
+2
-2
AssetAdapter.ts
egret/libs/tl/adapter/AssetAdapter.ts
+1
-1
Main.ts
egret/src/Main.ts
+1
-1
RulePanel.ts
egret/src/rulePanel/RulePanel.ts
+5
-3
Box.ts
egret/src/startScene/Box.ts
+2
-2
Net.ts
egret/src/startScene/Net.ts
+1
-1
StartScene.ts
egret/src/startScene/StartScene.ts
+1
-1
tslint.json
tslint.json
+9
-1
No files found.
egret/libs/tc/utils/isIPhoneX.ts
View file @
233d0e69
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
}
}
...
...
egret/libs/tl/MainBase.ts
View file @
233d0e69
...
@@ -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
//注入自定义的素材解析器
//注入自定义的素材解析器
le
t
assetAdapter
=
new
AssetAdapter
();
cons
t
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.
//加载皮肤主题配置文件,可以手动修改这个文件。替换默认皮肤。
//加载皮肤主题配置文件,可以手动修改这个文件。替换默认皮肤。
le
t
theme
=
new
eui
.
Theme
(
"resource/default.thm.json"
,
this
.
stage
);
cons
t
theme
=
new
eui
.
Theme
(
"resource/default.thm.json"
,
this
.
stage
);
theme
.
addEventListener
(
eui
.
UIEvent
.
COMPLETE
,
()
=>
{
theme
.
addEventListener
(
eui
.
UIEvent
.
COMPLETE
,
()
=>
{
resolve
();
resolve
();
},
this
);
},
this
);
...
...
egret/libs/tl/adapter/AssetAdapter.ts
View file @
233d0e69
...
@@ -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
))
{
le
t
data
=
RES
.
getRes
(
source
);
cons
t
data
=
RES
.
getRes
(
source
);
if
(
data
)
{
if
(
data
)
{
onGetRes
(
data
);
onGetRes
(
data
);
}
}
...
...
egret/src/Main.ts
View file @
233d0e69
...
@@ -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
||
...
...
egret/src/rulePanel/RulePanel.ts
View file @
233d0e69
...
@@ -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
(
text
list
[
i
]
+
''
);
l
.
textFlow
=
(
new
egret
.
HtmlTextParser
).
parser
(
text
Item
+
''
);
this
.
group
.
addChild
(
l
)
this
.
group
.
addChild
(
l
)
}
}
}
}
...
...
egret/src/startScene/Box.ts
View file @
233d0e69
...
@@ -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
()
{
le
t
url
=
this
.
boxData
.
skin
;
cons
t
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
()
{
le
t
url
=
this
.
boxData
.
skin
;
cons
t
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
;
...
...
egret/src/startScene/Net.ts
View file @
233d0e69
...
@@ -24,7 +24,7 @@ export default class Net extends egret.Sprite {
...
@@ -24,7 +24,7 @@ export default class Net extends egret.Sprite {
}
}
createBg
()
{
createBg
()
{
le
t
url
=
getResPath
()
+
`resource/assets/startScene/net.json`
;
cons
t
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
;
...
...
egret/src/startScene/StartScene.ts
View file @
233d0e69
...
@@ -247,7 +247,7 @@ export default class StartScene extends Scene {
...
@@ -247,7 +247,7 @@ export default class StartScene extends Scene {
}
}
}
}
async
getBg
()
{
async
getBg
()
{
le
t
url
=
__bgUrl__
cons
t
url
=
__bgUrl__
return
new
Promise
((
resolve
)
=>
{
return
new
Promise
((
resolve
)
=>
{
RES
.
getResByUrl
(
url
,
(
picData
)
=>
{
RES
.
getResByUrl
(
url
,
(
picData
)
=>
{
resolve
(
picData
)
resolve
(
picData
)
...
...
tslint.json
View file @
233d0e69
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment