Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
renderingEngine
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
王剑峰
renderingEngine
Commits
d0c4741f
Commit
d0c4741f
authored
Nov 26, 2019
by
rockyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复过程props缺少的问题
parent
54b6ab20
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
6 deletions
+17
-6
engine.js
debug/engine.js
+8
-2
engine.js.map
debug/engine.js.map
+1
-1
Process.ts
src/zeroing/behavior-runtime/Process.ts
+4
-2
utils.ts
src/zeroing/utils/utils.ts
+4
-1
No files found.
debug/engine.js
View file @
d0c4741f
...
...
@@ -1880,6 +1880,9 @@
return
exports
;
}
function
trimChar
(
str
,
char
)
{
if
(
!
str
||
!
char
)
{
return
;
}
while
(
true
)
{
var
len
=
str
.
length
,
from
=
0
,
end
=
len
;
if
(
str
[
0
]
===
char
)
{
...
...
@@ -2377,10 +2380,10 @@
case
'link'
:
var
linkedValue
=
this
.
resolveLinkedProp
(
value
,
key
);
if
(
linkedValue
!==
undefined
)
{
props
[
key
]
=
undefined
;
props
[
key
]
=
linkedValue
;
}
else
{
props
[
key
]
=
linkedValue
;
props
[
key
]
=
undefined
;
}
break
;
case
'static'
:
...
...
@@ -2407,6 +2410,9 @@
props
[
key
]
=
findNodeByUUID
(
this
.
_vm
.
globalContext
.
gameStage
,
uuid
);
}
}
else
if
(
originProps
[
key
]
!==
undefined
)
{
props
[
key
]
=
originProps
[
key
];
}
if
(
props
[
key
]
===
undefined
&&
propsConfig
[
key
].
hasOwnProperty
(
'default'
))
{
props
[
key
]
=
propsConfig
[
key
][
'default'
];
}
...
...
debug/engine.js.map
View file @
d0c4741f
This diff is collapsed.
Click to expand it.
src/zeroing/behavior-runtime/Process.ts
View file @
d0c4741f
...
...
@@ -183,9 +183,9 @@ export class Process {
case
'link'
:
let
linkedValue
=
this
.
resolveLinkedProp
(
value
,
key
);
if
(
linkedValue
!==
undefined
)
{
props
[
key
]
=
undefined
;
}
else
{
props
[
key
]
=
linkedValue
;
}
else
{
props
[
key
]
=
undefined
;
}
break
;
case
'static'
:
...
...
@@ -210,6 +210,8 @@ export class Process {
if
(
uuid
)
{
props
[
key
]
=
findNodeByUUID
(
this
.
_vm
.
globalContext
.
gameStage
,
uuid
);
}
}
else
if
(
originProps
[
key
]
!==
undefined
){
props
[
key
]
=
originProps
[
key
];
}
if
(
props
[
key
]
===
undefined
&&
propsConfig
[
key
].
hasOwnProperty
(
'default'
))
{
...
...
src/zeroing/utils/utils.ts
View file @
d0c4741f
...
...
@@ -164,6 +164,9 @@ export function importUMDCode(code) {
}
export
function
trimChar
(
str
:
string
,
char
:
string
)
{
if
(
!
str
||
!
char
)
{
return
;
}
while
(
true
)
{
let
len
=
str
.
length
,
from
=
0
,
end
=
len
;
if
(
str
[
0
]
===
char
)
{
...
...
@@ -194,7 +197,7 @@ export function findVariable(name: string, ...contexts) {
for
(
let
context
of
contexts
)
{
if
(
context
)
{
result
=
context
[
name
];
if
(
result
!==
undefined
)
{
if
(
result
!==
undefined
)
{
break
;
}
}
...
...
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