Merge pull request #9223 from cocos-creator/v3.3.1

sync V3.3.1
This commit is contained in:
Santy-Wang
2021-08-21 14:26:32 +08:00
committed by GitHub
13 changed files with 81 additions and 79 deletions
+6 -12
View File
@@ -50,16 +50,12 @@
"endSizeVar": 0,
"positionType": 0,
"sourcePos": {
"_array": {
"0": 0,
"1": 0
}
"x": 0,
"y": 0
},
"posVar": {
"_array": {
"0": 7,
"1": 7
}
"x": 7,
"y": 7
},
"angle": 360,
"angleVar": 360,
@@ -69,10 +65,8 @@
"endSpinVar": -142.11000061035156,
"emitterMode": 0,
"gravity": {
"_array": {
"0": 0.25,
"1": 0.8600000143051147
}
"x": 0.25,
"y": 0.8600000143051147
},
"speed": 0,
"speedVar": 190.7899932861328,
+11 -3
View File
@@ -164,6 +164,10 @@ const Elements = {
length = 10;
}
if (!Array.isArray(this.meta.userData.dependencies)) {
this.meta.userData.dependencies = [];
}
while (this.meta.userData.dependencies.length < length) {
this.meta.userData.dependencies.push('');
}
@@ -172,6 +176,10 @@ const Elements = {
this.meta.userData.dependencies.pop();
}
if (!this.meta.userData.dependencies.length) {
this.meta.userData.dependencies = undefined;
}
this.dispatch('change');
Elements.dependencies.update.call(this);
@@ -188,14 +196,14 @@ const Elements = {
return;
}
this.$.dependenciesContent.innerText = '';
if (!Array.isArray(this.meta.userData.dependencies)) {
this.meta.userData.dependencies = [];
return;
}
const length = this.meta.userData.dependencies.length;
this.$.dependenciesInput.value = length;
this.$.dependenciesContent.innerText = '';
for (let i = 0; i < length; i++) {
const child = document.createElement('ui-asset');