Merge branch 'v3.4.0' of https://gitlab.cocos.net/publics/engine into v3.5.0

This commit is contained in:
santy-wang
2021-12-10 19:20:01 +08:00
65 changed files with 504 additions and 1022 deletions
-5
View File
@@ -621,7 +621,6 @@ Invalid index in MultiplexLayer switchTo message
cc.Layer.addLayer(): layer should be non-null
### 2104
Layer collision. The name of layer (%s) is collided with the name or value of some layer
### 2200
@@ -3185,7 +3184,3 @@ Graph update has been interrupted since too many transitions(greater than %s) oc
### 14100
Pool.destroy no longer take a function as parameter, Please specify destruct function in the construction of Pool instead
### 14200
Batcher2D.commitComp could not be used for components without render data, please use commitPlainComp instead