Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
new_taobao
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
wildfirecode13
new_taobao
Commits
4ff0d25f
Commit
4ff0d25f
authored
Nov 22, 2020
by
wildfirecode13
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
4d1ea0a3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
RES.ts
src/canvas/game/module/RES.ts
+5
-1
Module.ts
src/canvas/game/module/views/Module.ts
+1
-0
package.json
src/canvas/game/package.json
+1
-1
No files found.
src/canvas/game/module/RES.ts
View file @
4ff0d25f
//@ts-ignore 存在my就初始化
interface
ResData
{
interface
ResData
{
/**
/**
...
@@ -129,6 +129,7 @@ export namespace RES {
...
@@ -129,6 +129,7 @@ export namespace RES {
let
p
:
Promise
<
any
>
=
new
Promise
((
resolve
,
reject
)
=>
{
let
p
:
Promise
<
any
>
=
new
Promise
((
resolve
,
reject
)
=>
{
loadResList
((
s
)
=>
{
loadResList
((
s
)
=>
{
if
(
s
)
{
if
(
s
)
{
//@ts-ignore 存在my就初始化
resolve
()
resolve
()
}
else
{
}
else
{
reject
();
reject
();
...
@@ -148,6 +149,7 @@ export namespace RES {
...
@@ -148,6 +149,7 @@ export namespace RES {
//已经加载完成的直接返回
//已经加载完成的直接返回
if
(
groupsCompleteHash
[
name
])
{
if
(
groupsCompleteHash
[
name
])
{
return
new
Promise
((
resolve
)
=>
{
return
new
Promise
((
resolve
)
=>
{
//@ts-ignore 存在my就初始化
resolve
()
resolve
()
})
})
}
}
...
@@ -162,6 +164,7 @@ export namespace RES {
...
@@ -162,6 +164,7 @@ export namespace RES {
if
(
!
arr
||
!
arr
.
length
)
{
if
(
!
arr
||
!
arr
.
length
)
{
groupsCompleteHash
[
name
]
=
true
;
groupsCompleteHash
[
name
]
=
true
;
return
new
Promise
((
resolve
)
=>
{
return
new
Promise
((
resolve
)
=>
{
//@ts-ignore 存在my就初始化
resolve
()
resolve
()
})
})
}
}
...
@@ -172,6 +175,7 @@ export namespace RES {
...
@@ -172,6 +175,7 @@ export namespace RES {
delete
groupsPromiseHash
[
name
];
delete
groupsPromiseHash
[
name
];
if
(
s
)
{
if
(
s
)
{
groupsCompleteHash
[
name
]
=
true
;
groupsCompleteHash
[
name
]
=
true
;
//@ts-ignore 存在my就初始化
resolve
()
resolve
()
}
else
{
}
else
{
reject
();
reject
();
...
...
src/canvas/game/module/views/Module.ts
View file @
4ff0d25f
...
@@ -40,6 +40,7 @@ export class Module extends FYGE.Container {
...
@@ -40,6 +40,7 @@ export class Module extends FYGE.Container {
}
}
Promise
.
all
(
arr
).
then
(
resolve
,
reject
)
Promise
.
all
(
arr
).
then
(
resolve
,
reject
)
}
else
{
}
else
{
//@ts-ignore 存在my就初始化
resolve
()
resolve
()
}
}
})
})
...
...
src/canvas/game/package.json
View file @
4ff0d25f
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
"psd"
:
"^3.2.0"
,
"psd"
:
"^3.2.0"
,
"ts-loader"
:
"^4.0.0"
,
"ts-loader"
:
"^4.0.0"
,
"tslint"
:
"^5.9.1"
,
"tslint"
:
"^5.9.1"
,
"typescript"
:
"^4.
1
.2"
,
"typescript"
:
"^4.
0
.2"
,
"uglifyjs-webpack-plugin"
:
"^2.1.2"
,
"uglifyjs-webpack-plugin"
:
"^2.1.2"
,
"webpack"
:
"^4.1.0"
,
"webpack"
:
"^4.1.0"
,
"webpack-cli"
:
"^3.1.1"
,
"webpack-cli"
:
"^3.1.1"
,
...
...
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