diff --git a/@types/globals.d.ts b/@types/globals.d.ts index b0598aa8c6..d3f2fe6541 100644 --- a/@types/globals.d.ts +++ b/@types/globals.d.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/audio/assets/clip.ts b/cocos/audio/assets/clip.ts index 6f0a8b8ba1..d3a42f0117 100644 --- a/cocos/audio/assets/clip.ts +++ b/cocos/audio/assets/clip.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/audio/assets/player-dom.ts b/cocos/audio/assets/player-dom.ts index 2b37a59418..681dd2403e 100644 --- a/cocos/audio/assets/player-dom.ts +++ b/cocos/audio/assets/player-dom.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/audio/assets/player-web.ts b/cocos/audio/assets/player-web.ts index e3d6e845df..f4441858c9 100644 --- a/cocos/audio/assets/player-web.ts +++ b/cocos/audio/assets/player-web.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/audio/assets/player.ts b/cocos/audio/assets/player.ts index 565b998258..f0115fc168 100644 --- a/cocos/audio/assets/player.ts +++ b/cocos/audio/assets/player.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/audio/audio-downloader.ts b/cocos/audio/audio-downloader.ts index f0d0af60e0..0ff420241d 100644 --- a/cocos/audio/audio-downloader.ts +++ b/cocos/audio/audio-downloader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/audio/audio-source.ts b/cocos/audio/audio-source.ts index 082f572811..80bc968db0 100644 --- a/cocos/audio/audio-source.ts +++ b/cocos/audio/audio-source.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/3d/framework/camera-component.ts b/cocos/core/3d/framework/camera-component.ts index 42fb5539c9..3b48bf78e7 100644 --- a/cocos/core/3d/framework/camera-component.ts +++ b/cocos/core/3d/framework/camera-component.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/directional-light-component.ts b/cocos/core/3d/framework/directional-light-component.ts index 02c2ca1985..be7310d3d7 100644 --- a/cocos/core/3d/framework/directional-light-component.ts +++ b/cocos/core/3d/framework/directional-light-component.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/index.ts b/cocos/core/3d/framework/index.ts index ddae03054e..63f1d7af21 100644 --- a/cocos/core/3d/framework/index.ts +++ b/cocos/core/3d/framework/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/3d/framework/light-component.ts b/cocos/core/3d/framework/light-component.ts index f1e96aab65..9b40fcfa7a 100644 --- a/cocos/core/3d/framework/light-component.ts +++ b/cocos/core/3d/framework/light-component.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/mesh-renderer.ts b/cocos/core/3d/framework/mesh-renderer.ts index 52d0244694..a2e329ea0d 100644 --- a/cocos/core/3d/framework/mesh-renderer.ts +++ b/cocos/core/3d/framework/mesh-renderer.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/skinned-mesh-batch-renderer.ts b/cocos/core/3d/framework/skinned-mesh-batch-renderer.ts index 928b1945ad..702649d405 100644 --- a/cocos/core/3d/framework/skinned-mesh-batch-renderer.ts +++ b/cocos/core/3d/framework/skinned-mesh-batch-renderer.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/skinned-mesh-renderer.ts b/cocos/core/3d/framework/skinned-mesh-renderer.ts index 9a62c70e13..4fa959f8cf 100644 --- a/cocos/core/3d/framework/skinned-mesh-renderer.ts +++ b/cocos/core/3d/framework/skinned-mesh-renderer.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/sphere-light-component.ts b/cocos/core/3d/framework/sphere-light-component.ts index 3bb55448f1..6a83c354d3 100644 --- a/cocos/core/3d/framework/sphere-light-component.ts +++ b/cocos/core/3d/framework/sphere-light-component.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/framework/spot-light-component.ts b/cocos/core/3d/framework/spot-light-component.ts index 34653c438e..9aacdaab71 100644 --- a/cocos/core/3d/framework/spot-light-component.ts +++ b/cocos/core/3d/framework/spot-light-component.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/3d/index.ts b/cocos/core/3d/index.ts index 540e3434e5..71007497a3 100644 --- a/cocos/core/3d/index.ts +++ b/cocos/core/3d/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/animation/animation-component.ts b/cocos/core/animation/animation-component.ts index ac93e1ee1a..b479c12257 100644 --- a/cocos/core/animation/animation-component.ts +++ b/cocos/core/animation/animation-component.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/animation/animation-state.ts b/cocos/core/animation/animation-state.ts index dae6724cbe..5a4d13400e 100644 --- a/cocos/core/animation/animation-state.ts +++ b/cocos/core/animation/animation-state.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/animation/skeletal-animation-data-hub.ts b/cocos/core/animation/skeletal-animation-data-hub.ts index 99c4312c6c..3794db5a5f 100644 --- a/cocos/core/animation/skeletal-animation-data-hub.ts +++ b/cocos/core/animation/skeletal-animation-data-hub.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/animation/skeletal-animation-state.ts b/cocos/core/animation/skeletal-animation-state.ts index 41717bda13..90a4f6fa73 100644 --- a/cocos/core/animation/skeletal-animation-state.ts +++ b/cocos/core/animation/skeletal-animation-state.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/animation/skeletal-animation.ts b/cocos/core/animation/skeletal-animation.ts index 8eaacb92da..99f2a5c08d 100644 --- a/cocos/core/animation/skeletal-animation.ts +++ b/cocos/core/animation/skeletal-animation.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/animation/transform-utils.ts b/cocos/core/animation/transform-utils.ts index 9e14587286..d809d15491 100644 --- a/cocos/core/animation/transform-utils.ts +++ b/cocos/core/animation/transform-utils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/asset-library.ts b/cocos/core/assets/asset-library.ts index 3208bd33f4..77385c6c18 100644 --- a/cocos/core/assets/asset-library.ts +++ b/cocos/core/assets/asset-library.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/asset.ts b/cocos/core/assets/asset.ts index aeda42d98f..0b352ba72a 100644 --- a/cocos/core/assets/asset.ts +++ b/cocos/core/assets/asset.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/bitmap-font.ts b/cocos/core/assets/bitmap-font.ts index bb2788375e..3808fc6ada 100644 --- a/cocos/core/assets/bitmap-font.ts +++ b/cocos/core/assets/bitmap-font.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/effect-asset.ts b/cocos/core/assets/effect-asset.ts index aaa2ea76f7..7fc632fb96 100644 --- a/cocos/core/assets/effect-asset.ts +++ b/cocos/core/assets/effect-asset.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/font.ts b/cocos/core/assets/font.ts index d82603a7db..6692872e71 100644 --- a/cocos/core/assets/font.ts +++ b/cocos/core/assets/font.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/image-asset.ts b/cocos/core/assets/image-asset.ts index 72f7d57575..572ed71df8 100644 --- a/cocos/core/assets/image-asset.ts +++ b/cocos/core/assets/image-asset.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/index.ts b/cocos/core/assets/index.ts index 30a8177439..7eaccbe356 100644 --- a/cocos/core/assets/index.ts +++ b/cocos/core/assets/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/json-asset.ts b/cocos/core/assets/json-asset.ts index 68699cfd2f..b4bde7caee 100644 --- a/cocos/core/assets/json-asset.ts +++ b/cocos/core/assets/json-asset.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/label-atlas.ts b/cocos/core/assets/label-atlas.ts index f416adc51a..ce74e7b937 100644 --- a/cocos/core/assets/label-atlas.ts +++ b/cocos/core/assets/label-atlas.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/material.ts b/cocos/core/assets/material.ts index 51e6cc244f..5c53258702 100644 --- a/cocos/core/assets/material.ts +++ b/cocos/core/assets/material.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/mesh.ts b/cocos/core/assets/mesh.ts index dbf60fdda5..9351830dfc 100644 --- a/cocos/core/assets/mesh.ts +++ b/cocos/core/assets/mesh.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/prefab.ts b/cocos/core/assets/prefab.ts index 481691617f..15d75a24e5 100644 --- a/cocos/core/assets/prefab.ts +++ b/cocos/core/assets/prefab.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/raw-asset.ts b/cocos/core/assets/raw-asset.ts index bea18e3b08..f6e7b0f266 100644 --- a/cocos/core/assets/raw-asset.ts +++ b/cocos/core/assets/raw-asset.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/render-texture.ts b/cocos/core/assets/render-texture.ts index 28e2552760..0eb386a853 100644 --- a/cocos/core/assets/render-texture.ts +++ b/cocos/core/assets/render-texture.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/scene-asset.ts b/cocos/core/assets/scene-asset.ts index a696b64440..5050d13e57 100644 --- a/cocos/core/assets/scene-asset.ts +++ b/cocos/core/assets/scene-asset.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/scripts.ts b/cocos/core/assets/scripts.ts index 57d2846a35..38e30cc1cb 100644 --- a/cocos/core/assets/scripts.ts +++ b/cocos/core/assets/scripts.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/skeleton.ts b/cocos/core/assets/skeleton.ts index 911975325e..e489f20e04 100644 --- a/cocos/core/assets/skeleton.ts +++ b/cocos/core/assets/skeleton.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/sprite-atlas.ts b/cocos/core/assets/sprite-atlas.ts index 766c009b41..9a2c407c11 100644 --- a/cocos/core/assets/sprite-atlas.ts +++ b/cocos/core/assets/sprite-atlas.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/sprite-frame.ts b/cocos/core/assets/sprite-frame.ts index 2fa6c0baeb..a2790c79b2 100644 --- a/cocos/core/assets/sprite-frame.ts +++ b/cocos/core/assets/sprite-frame.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/assets/text-asset.ts b/cocos/core/assets/text-asset.ts index ce45d96ea2..a3efa28f20 100644 --- a/cocos/core/assets/text-asset.ts +++ b/cocos/core/assets/text-asset.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/texture-2d.ts b/cocos/core/assets/texture-2d.ts index f1b203a67e..59a42d686e 100644 --- a/cocos/core/assets/texture-2d.ts +++ b/cocos/core/assets/texture-2d.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/texture-base.ts b/cocos/core/assets/texture-base.ts index aaf401fc85..a885535202 100644 --- a/cocos/core/assets/texture-base.ts +++ b/cocos/core/assets/texture-base.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/texture-cube.ts b/cocos/core/assets/texture-cube.ts index bcb2acae4a..7f1982082a 100644 --- a/cocos/core/assets/texture-cube.ts +++ b/cocos/core/assets/texture-cube.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/texture-util.ts b/cocos/core/assets/texture-util.ts index cce569b195..23da0dfd82 100644 --- a/cocos/core/assets/texture-util.ts +++ b/cocos/core/assets/texture-util.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/ttf-font.ts b/cocos/core/assets/ttf-font.ts index 977e459e3e..5600e86a93 100644 --- a/cocos/core/assets/ttf-font.ts +++ b/cocos/core/assets/ttf-font.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/assets/utils/mesh-utils.ts b/cocos/core/assets/utils/mesh-utils.ts index cd562c3704..0e9a120745 100644 --- a/cocos/core/assets/utils/mesh-utils.ts +++ b/cocos/core/assets/utils/mesh-utils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/component-event-handler.ts b/cocos/core/components/component-event-handler.ts index 5289ad21b1..a553da3f62 100644 --- a/cocos/core/components/component-event-handler.ts +++ b/cocos/core/components/component-event-handler.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/component.ts b/cocos/core/components/component.ts index 3b8ea06436..161447a03d 100644 --- a/cocos/core/components/component.ts +++ b/cocos/core/components/component.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/index.ts b/cocos/core/components/index.ts index d935408a85..505195cd31 100644 --- a/cocos/core/components/index.ts +++ b/cocos/core/components/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2018-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2018-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/missing-script.ts b/cocos/core/components/missing-script.ts index 5dd4ce4cbc..dc5497b758 100644 --- a/cocos/core/components/missing-script.ts +++ b/cocos/core/components/missing-script.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/ui-base/canvas.ts b/cocos/core/components/ui-base/canvas.ts index b8397fa2df..e4d6671649 100644 --- a/cocos/core/components/ui-base/canvas.ts +++ b/cocos/core/components/ui-base/canvas.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/ui-base/ui-component.ts b/cocos/core/components/ui-base/ui-component.ts index 89cca62353..e8f40d137a 100644 --- a/cocos/core/components/ui-base/ui-component.ts +++ b/cocos/core/components/ui-base/ui-component.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/ui-base/ui-renderable.ts b/cocos/core/components/ui-base/ui-renderable.ts index 0e488c7ad1..f30548ce25 100644 --- a/cocos/core/components/ui-base/ui-renderable.ts +++ b/cocos/core/components/ui-base/ui-renderable.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/components/ui-base/ui-transform.ts b/cocos/core/components/ui-base/ui-transform.ts index bdbd45d16f..8b8729cb90 100644 --- a/cocos/core/components/ui-base/ui-transform.ts +++ b/cocos/core/components/ui-base/ui-transform.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/class-decorator.ts b/cocos/core/data/class-decorator.ts index b8c47f1536..6ac84c6238 100644 --- a/cocos/core/data/class-decorator.ts +++ b/cocos/core/data/class-decorator.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/class.ts b/cocos/core/data/class.ts index 5207c3f7da..b4912c66eb 100644 --- a/cocos/core/data/class.ts +++ b/cocos/core/data/class.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/decorators/property.ts b/cocos/core/data/decorators/property.ts index ae96d66e4c..1a4e53efd8 100644 --- a/cocos/core/data/decorators/property.ts +++ b/cocos/core/data/decorators/property.ts @@ -122,28 +122,29 @@ function genProperty ( cache, ) { let fullOptions; + let isGetset = descriptor && (descriptor.get || descriptor.set); if (options) { - fullOptions = DEV ? getFullFormOfProperty(options, propertyKey, js.getClassName(ctor)) : - getFullFormOfProperty(options); + fullOptions = DEV ? getFullFormOfProperty(options, isGetset, propertyKey, js.getClassName(ctor)) : + getFullFormOfProperty(options, isGetset); fullOptions = fullOptions || options; } const existsPropertyRecord = properties[propertyKey]; const propertyRecord = js.mixin(existsPropertyRecord || {}, fullOptions || {}); - if (descriptor && (descriptor.get || descriptor.set)) { // If the target property is accessor + if (isGetset) { // typescript or babel - if (DEV && options && (options.get || options.set)) { + if (DEV && options && ((fullOptions || options).get || (fullOptions || options).set)) { const errorProps = getSubDict(cache, 'errorProps'); if (!errorProps[propertyKey]) { errorProps[propertyKey] = true; warnID(3655, propertyKey, js.getClassName(ctor), propertyKey, propertyKey); } } - if (descriptor.get) { - propertyRecord.get = descriptor.get; + if (descriptor!.get) { + propertyRecord.get = descriptor!.get; } - if (descriptor.set) { - propertyRecord.set = descriptor.set; + if (descriptor!.set) { + propertyRecord.set = descriptor!.set; } } else { // Target property is non-accessor if (DEV && (propertyRecord.get || propertyRecord.set)) { diff --git a/cocos/core/data/deserialize.ts b/cocos/core/data/deserialize.ts index 675cabf9f6..7bbf938a7f 100644 --- a/cocos/core/data/deserialize.ts +++ b/cocos/core/data/deserialize.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/instantiate-jit.ts b/cocos/core/data/instantiate-jit.ts index 8222082d18..62f27ed0f8 100644 --- a/cocos/core/data/instantiate-jit.ts +++ b/cocos/core/data/instantiate-jit.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/instantiate.ts b/cocos/core/data/instantiate.ts index ba06a6f8b3..e7cddb4096 100644 --- a/cocos/core/data/instantiate.ts +++ b/cocos/core/data/instantiate.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/object.ts b/cocos/core/data/object.ts index 84efd726de..0a0729876a 100644 --- a/cocos/core/data/object.ts +++ b/cocos/core/data/object.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/utils/attribute.ts b/cocos/core/data/utils/attribute.ts index 26389ccee2..89b3e3094f 100644 --- a/cocos/core/data/utils/attribute.ts +++ b/cocos/core/data/utils/attribute.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/utils/compiler.ts b/cocos/core/data/utils/compiler.ts index 3268a08afa..7ed108c40d 100644 --- a/cocos/core/data/utils/compiler.ts +++ b/cocos/core/data/utils/compiler.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/data/utils/preprocess-class.ts b/cocos/core/data/utils/preprocess-class.ts index fdbc732647..2172568406 100644 --- a/cocos/core/data/utils/preprocess-class.ts +++ b/cocos/core/data/utils/preprocess-class.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -221,41 +221,36 @@ function getBaseClassWherePropertyDefined_DEV (propName, cls) { // tslint:disable: no-shadowed-variable -export function getFullFormOfProperty (options, propname_dev?, classname_dev?) { +function _wrapOptions (isGetset: boolean, _default, type?: Function | Function[], isUrlType?: boolean) { + let res: { + default?: any, + _short?: boolean, + url?: any, + type?: any, + } = isGetset ? { _short: true } : { _short: true, default: _default }; + if (type) { + if (isUrlType) { + res.url = type; + } + else { + res.type = type; + } + } + return res; +} + +export function getFullFormOfProperty (options, isGetset, propname_dev?, classname_dev?) { const isLiteral = options && options.constructor === Object; if ( !isLiteral ) { if (Array.isArray(options) && options.length > 0) { - - const type = options[0]; - return { - default: [], - type: options, - _short: true, - }; + return _wrapOptions(isGetset, [], options); } else if (typeof options === 'function') { const type = options; - if (!legacyCC.RawAsset.isRawAssetType(type)) { - return { - default: js.isChildClassOf(type, legacyCC.ValueType) ? new type() : null, - type, - _short: true, - }; - } - return { - default: '', - url: type, - _short: true, - }; + return _wrapOptions(isGetset, js.isChildClassOf(type, legacyCC.ValueType) ? new type() : null, type); } else if (options instanceof PrimitiveType) { - return { - default: options.default, - _short: true, - }; + return _wrapOptions(isGetset, options.default); } else { - return { - default: options, - _short: true, - }; + return _wrapOptions(isGetset, options); } } return null; @@ -264,7 +259,7 @@ export function getFullFormOfProperty (options, propname_dev?, classname_dev?) { export function preprocessAttrs (properties, className, cls) { for (const propName in properties) { let val = properties[propName]; - const fullForm = getFullFormOfProperty(val, propName, className); + const fullForm = getFullFormOfProperty(val, false, propName, className); if (fullForm) { val = properties[propName] = fullForm; } diff --git a/cocos/core/data/utils/requiring-frame.ts b/cocos/core/data/utils/requiring-frame.ts index c9937f150d..ca188f21d5 100644 --- a/cocos/core/data/utils/requiring-frame.ts +++ b/cocos/core/data/utils/requiring-frame.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/director.ts b/cocos/core/director.ts index 23437cfe90..2cc8cf4214 100644 --- a/cocos/core/director.ts +++ b/cocos/core/director.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/event/event-target.ts b/cocos/core/event/event-target.ts index e796794124..3109fb50a7 100644 --- a/cocos/core/event/event-target.ts +++ b/cocos/core/event/event-target.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/event/event.ts b/cocos/core/event/event.ts index e187c08b82..44f861aa47 100644 --- a/cocos/core/event/event.ts +++ b/cocos/core/event/event.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/event/index.ts b/cocos/core/event/index.ts index 2886fdad3a..6ef25f7de6 100644 --- a/cocos/core/event/index.ts +++ b/cocos/core/event/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/game.ts b/cocos/core/game.ts index 48b40e480f..07171aa8b1 100644 --- a/cocos/core/game.ts +++ b/cocos/core/game.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/global-exports.ts b/cocos/core/global-exports.ts index 9205c926d7..f85a39f9da 100644 --- a/cocos/core/global-exports.ts +++ b/cocos/core/global-exports.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/index.ts b/cocos/core/index.ts index 87857ff5a7..f5fd24b202 100644 --- a/cocos/core/index.ts +++ b/cocos/core/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/CCLoader.ts b/cocos/core/load-pipeline/CCLoader.ts index 9c91cbb8c6..0c0629c706 100644 --- a/cocos/core/load-pipeline/CCLoader.ts +++ b/cocos/core/load-pipeline/CCLoader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/asset-loader.ts b/cocos/core/load-pipeline/asset-loader.ts index 3902ce1af2..c55a93375e 100644 --- a/cocos/core/load-pipeline/asset-loader.ts +++ b/cocos/core/load-pipeline/asset-loader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/asset-table.ts b/cocos/core/load-pipeline/asset-table.ts index 2feae2104f..d1084a3cde 100644 --- a/cocos/core/load-pipeline/asset-table.ts +++ b/cocos/core/load-pipeline/asset-table.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/auto-release-utils.ts b/cocos/core/load-pipeline/auto-release-utils.ts index 927d363c04..3132c455b4 100644 --- a/cocos/core/load-pipeline/auto-release-utils.ts +++ b/cocos/core/load-pipeline/auto-release-utils.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/binary-downloader.ts b/cocos/core/load-pipeline/binary-downloader.ts index 4dc36eb0da..acb284f850 100644 --- a/cocos/core/load-pipeline/binary-downloader.ts +++ b/cocos/core/load-pipeline/binary-downloader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/downloader.ts b/cocos/core/load-pipeline/downloader.ts index ad6d263f22..a0869b6a5b 100644 --- a/cocos/core/load-pipeline/downloader.ts +++ b/cocos/core/load-pipeline/downloader.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/font-loader.ts b/cocos/core/load-pipeline/font-loader.ts index 36834d8c48..bde0691eb3 100644 --- a/cocos/core/load-pipeline/font-loader.ts +++ b/cocos/core/load-pipeline/font-loader.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/index.ts b/cocos/core/load-pipeline/index.ts index 91a740fc55..17f0922e79 100644 --- a/cocos/core/load-pipeline/index.ts +++ b/cocos/core/load-pipeline/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/loader.ts b/cocos/core/load-pipeline/loader.ts index 37143afb53..6d84e89ec4 100644 --- a/cocos/core/load-pipeline/loader.ts +++ b/cocos/core/load-pipeline/loader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/loading-items.ts b/cocos/core/load-pipeline/loading-items.ts index ec60dbbb6b..b4da544639 100644 --- a/cocos/core/load-pipeline/loading-items.ts +++ b/cocos/core/load-pipeline/loading-items.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/md5-pipe.ts b/cocos/core/load-pipeline/md5-pipe.ts index 79c7389d8b..7384076dee 100644 --- a/cocos/core/load-pipeline/md5-pipe.ts +++ b/cocos/core/load-pipeline/md5-pipe.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/pack-downloader.ts b/cocos/core/load-pipeline/pack-downloader.ts index cc4d0861d2..9b834be06f 100644 --- a/cocos/core/load-pipeline/pack-downloader.ts +++ b/cocos/core/load-pipeline/pack-downloader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/pipeline.ts b/cocos/core/load-pipeline/pipeline.ts index 7c0a36ea58..601b7045b3 100644 --- a/cocos/core/load-pipeline/pipeline.ts +++ b/cocos/core/load-pipeline/pipeline.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/plist-parser.ts b/cocos/core/load-pipeline/plist-parser.ts index 8592d02604..9fe0841abb 100644 --- a/cocos/core/load-pipeline/plist-parser.ts +++ b/cocos/core/load-pipeline/plist-parser.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/load-pipeline/released-asset-checker.ts b/cocos/core/load-pipeline/released-asset-checker.ts index bbe31708fe..86336e82eb 100644 --- a/cocos/core/load-pipeline/released-asset-checker.ts +++ b/cocos/core/load-pipeline/released-asset-checker.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/subpackage-pipe.ts b/cocos/core/load-pipeline/subpackage-pipe.ts index 939f748a63..a6d0925642 100644 --- a/cocos/core/load-pipeline/subpackage-pipe.ts +++ b/cocos/core/load-pipeline/subpackage-pipe.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, diff --git a/cocos/core/load-pipeline/text-downloader.ts b/cocos/core/load-pipeline/text-downloader.ts index 938da9f7d5..555c18f869 100644 --- a/cocos/core/load-pipeline/text-downloader.ts +++ b/cocos/core/load-pipeline/text-downloader.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/unpackers.ts b/cocos/core/load-pipeline/unpackers.ts index e42c6c8705..5d044f3aed 100644 --- a/cocos/core/load-pipeline/unpackers.ts +++ b/cocos/core/load-pipeline/unpackers.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/url.ts b/cocos/core/load-pipeline/url.ts index d93f6971d9..aba64fd99b 100644 --- a/cocos/core/load-pipeline/url.ts +++ b/cocos/core/load-pipeline/url.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/utils.ts b/cocos/core/load-pipeline/utils.ts index 7cffa4ed0d..1efd64f349 100644 --- a/cocos/core/load-pipeline/utils.ts +++ b/cocos/core/load-pipeline/utils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/load-pipeline/uuid-loader.ts b/cocos/core/load-pipeline/uuid-loader.ts index d049456fcf..ec3dd1b5bd 100644 --- a/cocos/core/load-pipeline/uuid-loader.ts +++ b/cocos/core/load-pipeline/uuid-loader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/math/affine-transform.ts b/cocos/core/math/affine-transform.ts index d72b46960c..77848fd990 100644 --- a/cocos/core/math/affine-transform.ts +++ b/cocos/core/math/affine-transform.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/math/color.ts b/cocos/core/math/color.ts index ed5de9d280..f1d7e57a26 100644 --- a/cocos/core/math/color.ts +++ b/cocos/core/math/color.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/math/index.ts b/cocos/core/math/index.ts index d5b8395959..e91d5bb521 100644 --- a/cocos/core/math/index.ts +++ b/cocos/core/math/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/math/rect.ts b/cocos/core/math/rect.ts index 5af419e81e..43f9964448 100644 --- a/cocos/core/math/rect.ts +++ b/cocos/core/math/rect.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/math/size.ts b/cocos/core/math/size.ts index 412db54634..b8e050b03f 100644 --- a/cocos/core/math/size.ts +++ b/cocos/core/math/size.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com @@ -86,8 +86,8 @@ export class Size extends ValueType { constructor (width?: Size | number, height?: number) { super(); if (width && typeof width === 'object') { - this.height = width.height; this.width = width.width; + this.height = width.height; } else { this.width = width || 0; this.height = height || 0; diff --git a/cocos/core/math/vec2.ts b/cocos/core/math/vec2.ts index 723e94d0c1..6b943bc0a1 100644 --- a/cocos/core/math/vec2.ts +++ b/cocos/core/math/vec2.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/math/vec3.ts b/cocos/core/math/vec3.ts index 8387a8e88c..b97b2a0807 100644 --- a/cocos/core/math/vec3.ts +++ b/cocos/core/math/vec3.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/math/vec4.ts b/cocos/core/math/vec4.ts index 376a95d64a..26eeeeb98a 100644 --- a/cocos/core/math/vec4.ts +++ b/cocos/core/math/vec4.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/SubContextView.ts b/cocos/core/platform/SubContextView.ts index 54b9fe9651..f6dd97f473 100644 --- a/cocos/core/platform/SubContextView.ts +++ b/cocos/core/platform/SubContextView.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/event-manager/event-manager.ts b/cocos/core/platform/event-manager/event-manager.ts index 7bf36c9b32..69da259a94 100644 --- a/cocos/core/platform/event-manager/event-manager.ts +++ b/cocos/core/platform/event-manager/event-manager.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/event-manager/index.ts b/cocos/core/platform/event-manager/index.ts index f0f576946d..b9bdddd403 100644 --- a/cocos/core/platform/event-manager/index.ts +++ b/cocos/core/platform/event-manager/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/event-manager/input-manager.ts b/cocos/core/platform/event-manager/input-manager.ts index fc9174bde2..f03d0af819 100644 --- a/cocos/core/platform/event-manager/input-manager.ts +++ b/cocos/core/platform/event-manager/input-manager.ts @@ -1,7 +1,7 @@ /* Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/platform/event-manager/system-event.ts b/cocos/core/platform/event-manager/system-event.ts index 5d52f83474..91b9a7a1c3 100644 --- a/cocos/core/platform/event-manager/system-event.ts +++ b/cocos/core/platform/event-manager/system-event.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/core/platform/event-manager/touch.ts b/cocos/core/platform/event-manager/touch.ts index 8a13d841fa..a81a244abb 100644 --- a/cocos/core/platform/event-manager/touch.ts +++ b/cocos/core/platform/event-manager/touch.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/index.ts b/cocos/core/platform/index.ts index 74c0b2ef62..e3cfdbc8bd 100644 --- a/cocos/core/platform/index.ts +++ b/cocos/core/platform/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/macro.ts b/cocos/core/platform/macro.ts index c12cb421a2..b59a92f05c 100644 --- a/cocos/core/platform/macro.ts +++ b/cocos/core/platform/macro.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/platform/screen.ts b/cocos/core/platform/screen.ts index f6d13711fc..16ed678411 100644 --- a/cocos/core/platform/screen.ts +++ b/cocos/core/platform/screen.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/platform/sys.ts b/cocos/core/platform/sys.ts index 3e23955d90..de4f724d6d 100644 --- a/cocos/core/platform/sys.ts +++ b/cocos/core/platform/sys.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/platform/view.ts b/cocos/core/platform/view.ts index 182f484c8b..efb6f4858e 100644 --- a/cocos/core/platform/view.ts +++ b/cocos/core/platform/view.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/platform/visible-rect.ts b/cocos/core/platform/visible-rect.ts index b98a9b8a03..54a64f2ed5 100644 --- a/cocos/core/platform/visible-rect.ts +++ b/cocos/core/platform/visible-rect.ts @@ -1,7 +1,7 @@ /* Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/renderer/core/material-instance.ts b/cocos/core/renderer/core/material-instance.ts index a1587b2b84..74974e27bf 100644 --- a/cocos/core/renderer/core/material-instance.ts +++ b/cocos/core/renderer/core/material-instance.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/memory-pools.ts b/cocos/core/renderer/core/memory-pools.ts index 19dabb3358..7285a8f0c7 100644 --- a/cocos/core/renderer/core/memory-pools.ts +++ b/cocos/core/renderer/core/memory-pools.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/native-pools.ts b/cocos/core/renderer/core/native-pools.ts index e015af3fe6..0bfa020212 100644 --- a/cocos/core/renderer/core/native-pools.ts +++ b/cocos/core/renderer/core/native-pools.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/pass-instance.ts b/cocos/core/renderer/core/pass-instance.ts index fb4cbe4931..cb40e928bf 100644 --- a/cocos/core/renderer/core/pass-instance.ts +++ b/cocos/core/renderer/core/pass-instance.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/pass-utils.ts b/cocos/core/renderer/core/pass-utils.ts index ab8c8df76b..a7a2c9c5e6 100644 --- a/cocos/core/renderer/core/pass-utils.ts +++ b/cocos/core/renderer/core/pass-utils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/pass.ts b/cocos/core/renderer/core/pass.ts index eddb605a68..bc0a5e87ba 100644 --- a/cocos/core/renderer/core/pass.ts +++ b/cocos/core/renderer/core/pass.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/program-lib.ts b/cocos/core/renderer/core/program-lib.ts index 2db71144c6..7d5922c0e5 100644 --- a/cocos/core/renderer/core/program-lib.ts +++ b/cocos/core/renderer/core/program-lib.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/core/sampler-lib.ts b/cocos/core/renderer/core/sampler-lib.ts index d09a5fc304..9fa82be6d9 100644 --- a/cocos/core/renderer/core/sampler-lib.ts +++ b/cocos/core/renderer/core/sampler-lib.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/models/baked-skinning-model.ts b/cocos/core/renderer/models/baked-skinning-model.ts index d379898d03..cec2a03b88 100644 --- a/cocos/core/renderer/models/baked-skinning-model.ts +++ b/cocos/core/renderer/models/baked-skinning-model.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/models/skeletal-animation-utils.ts b/cocos/core/renderer/models/skeletal-animation-utils.ts index b5c3a89ac1..a48f48545e 100644 --- a/cocos/core/renderer/models/skeletal-animation-utils.ts +++ b/cocos/core/renderer/models/skeletal-animation-utils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/models/skinning-model.ts b/cocos/core/renderer/models/skinning-model.ts index 36aef75d5f..b03e8f612b 100644 --- a/cocos/core/renderer/models/skinning-model.ts +++ b/cocos/core/renderer/models/skinning-model.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/renderer/scene/model.ts b/cocos/core/renderer/scene/model.ts index 8d1b0caeaf..9704d1612e 100644 --- a/cocos/core/renderer/scene/model.ts +++ b/cocos/core/renderer/scene/model.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. +// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. import { builtinResMgr } from '../../3d/builtin/init'; import { Material } from '../../assets/material'; import { RenderingSubMesh } from '../../assets/mesh'; diff --git a/cocos/core/scene-graph/base-node-dev.ts b/cocos/core/scene-graph/base-node-dev.ts index 5e10e99592..9cde067a21 100644 --- a/cocos/core/scene-graph/base-node-dev.ts +++ b/cocos/core/scene-graph/base-node-dev.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/base-node.ts b/cocos/core/scene-graph/base-node.ts index ddd46b1803..09047303a8 100644 --- a/cocos/core/scene-graph/base-node.ts +++ b/cocos/core/scene-graph/base-node.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/component-scheduler.ts b/cocos/core/scene-graph/component-scheduler.ts index 2ab4a6745d..6e1dc297f4 100644 --- a/cocos/core/scene-graph/component-scheduler.ts +++ b/cocos/core/scene-graph/component-scheduler.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/find.ts b/cocos/core/scene-graph/find.ts index fe60f96def..df33c95d9b 100644 --- a/cocos/core/scene-graph/find.ts +++ b/cocos/core/scene-graph/find.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/index.ts b/cocos/core/scene-graph/index.ts index a35ae07007..c6b2bd731a 100644 --- a/cocos/core/scene-graph/index.ts +++ b/cocos/core/scene-graph/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/layers.ts b/cocos/core/scene-graph/layers.ts index 9c9c1773c7..ffbd79f78b 100644 --- a/cocos/core/scene-graph/layers.ts +++ b/cocos/core/scene-graph/layers.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/node-activator.ts b/cocos/core/scene-graph/node-activator.ts index f4603c7950..0cf3401d66 100644 --- a/cocos/core/scene-graph/node-activator.ts +++ b/cocos/core/scene-graph/node-activator.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/node-enum.ts b/cocos/core/scene-graph/node-enum.ts index 87ddd723a4..8d365f6c0e 100644 --- a/cocos/core/scene-graph/node-enum.ts +++ b/cocos/core/scene-graph/node-enum.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/node-event-processor.ts b/cocos/core/scene-graph/node-event-processor.ts index 1584e41d30..7e2dafdc52 100644 --- a/cocos/core/scene-graph/node-event-processor.ts +++ b/cocos/core/scene-graph/node-event-processor.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/node-ui-properties.ts b/cocos/core/scene-graph/node-ui-properties.ts index e99ae8082d..8d9b54d692 100644 --- a/cocos/core/scene-graph/node-ui-properties.ts +++ b/cocos/core/scene-graph/node-ui-properties.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/node.ts b/cocos/core/scene-graph/node.ts index f5d020e726..21e01fbbe3 100644 --- a/cocos/core/scene-graph/node.ts +++ b/cocos/core/scene-graph/node.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/private-node.ts b/cocos/core/scene-graph/private-node.ts index eb87fb75b8..787874e6e3 100644 --- a/cocos/core/scene-graph/private-node.ts +++ b/cocos/core/scene-graph/private-node.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scene-graph/scene-globals.ts b/cocos/core/scene-graph/scene-globals.ts index fc55f5d319..79d28c7628 100644 --- a/cocos/core/scene-graph/scene-globals.ts +++ b/cocos/core/scene-graph/scene-globals.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated engine source code (the "Software"), a limited, diff --git a/cocos/core/scene-graph/scene.ts b/cocos/core/scene-graph/scene.ts index 1841be6567..f43100820d 100644 --- a/cocos/core/scene-graph/scene.ts +++ b/cocos/core/scene-graph/scene.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/scheduler.ts b/cocos/core/scheduler.ts index dc4cc79762..1b3625c8e8 100644 --- a/cocos/core/scheduler.ts +++ b/cocos/core/scheduler.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/binary-search.ts b/cocos/core/utils/binary-search.ts index d48f177172..d373cfdfbd 100644 --- a/cocos/core/utils/binary-search.ts +++ b/cocos/core/utils/binary-search.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/decode-uuid.ts b/cocos/core/utils/decode-uuid.ts index 7fa1faafa7..624c666e59 100644 --- a/cocos/core/utils/decode-uuid.ts +++ b/cocos/core/utils/decode-uuid.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/html-text-parser.ts b/cocos/core/utils/html-text-parser.ts index 934c66e28e..b07cb39425 100644 --- a/cocos/core/utils/html-text-parser.ts +++ b/cocos/core/utils/html-text-parser.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/id-generator.ts b/cocos/core/utils/id-generator.ts index 5b91431402..50324e05c2 100644 --- a/cocos/core/utils/id-generator.ts +++ b/cocos/core/utils/id-generator.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/index.ts b/cocos/core/utils/index.ts index 2aa14fae94..f0e25213e4 100644 --- a/cocos/core/utils/index.ts +++ b/cocos/core/utils/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/js.ts b/cocos/core/utils/js.ts index 7284a96840..b01676e3b8 100644 --- a/cocos/core/utils/js.ts +++ b/cocos/core/utils/js.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/core/utils/misc.ts b/cocos/core/utils/misc.ts index 38d54698d0..05a6af2832 100644 --- a/cocos/core/utils/misc.ts +++ b/cocos/core/utils/misc.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/mutable-forward-iterator.ts b/cocos/core/utils/mutable-forward-iterator.ts index 917984b1b4..6ec1a19b4a 100644 --- a/cocos/core/utils/mutable-forward-iterator.ts +++ b/cocos/core/utils/mutable-forward-iterator.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/path.ts b/cocos/core/utils/path.ts index f25c932465..c353073958 100644 --- a/cocos/core/utils/path.ts +++ b/cocos/core/utils/path.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/prefab-helper.ts b/cocos/core/utils/prefab-helper.ts index 960c1efc54..b2e2cb8d74 100644 --- a/cocos/core/utils/prefab-helper.ts +++ b/cocos/core/utils/prefab-helper.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/profiler/profiler.ts b/cocos/core/utils/profiler/profiler.ts index 90cee1b70f..ca6ead7c70 100644 --- a/cocos/core/utils/profiler/profiler.ts +++ b/cocos/core/utils/profiler/profiler.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/utils/text-utils.ts b/cocos/core/utils/text-utils.ts index 285595275e..0a5ea973b3 100644 --- a/cocos/core/utils/text-utils.ts +++ b/cocos/core/utils/text-utils.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/value-types/enum.ts b/cocos/core/value-types/enum.ts index 193549579a..c343cd8434 100644 --- a/cocos/core/value-types/enum.ts +++ b/cocos/core/value-types/enum.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/value-types/index.ts b/cocos/core/value-types/index.ts index fcd012fc6c..4dd9ead892 100644 --- a/cocos/core/value-types/index.ts +++ b/cocos/core/value-types/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/core/value-types/value-type.ts b/cocos/core/value-types/value-type.ts index ece1edc3ab..0a06f2cf07 100644 --- a/cocos/core/value-types/value-type.ts +++ b/cocos/core/value-types/value-type.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/particle/models/particle-batch-model.ts b/cocos/particle/models/particle-batch-model.ts index a6715fe2cf..29fe091983 100644 --- a/cocos/particle/models/particle-batch-model.ts +++ b/cocos/particle/models/particle-batch-model.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/particle/particle-system.ts b/cocos/particle/particle-system.ts index 32538e7cb2..51e297bed5 100644 --- a/cocos/particle/particle-system.ts +++ b/cocos/particle/particle-system.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. +// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. /** * @packageDocumentation diff --git a/cocos/physics-2d/box2d/physics-contact.ts b/cocos/physics-2d/box2d/physics-contact.ts index 6f56948f54..e1be6cb306 100644 --- a/cocos/physics-2d/box2d/physics-contact.ts +++ b/cocos/physics-2d/box2d/physics-contact.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/box2d/platform/physics-aabb-query-callback.ts b/cocos/physics-2d/box2d/platform/physics-aabb-query-callback.ts index cae90f9ce3..4c8c58f780 100644 --- a/cocos/physics-2d/box2d/platform/physics-aabb-query-callback.ts +++ b/cocos/physics-2d/box2d/platform/physics-aabb-query-callback.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/box2d/platform/physics-contact-listener.ts b/cocos/physics-2d/box2d/platform/physics-contact-listener.ts index 05ced2f19d..a7e65a5675 100644 --- a/cocos/physics-2d/box2d/platform/physics-contact-listener.ts +++ b/cocos/physics-2d/box2d/platform/physics-contact-listener.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/box2d/platform/physics-debug-draw.ts b/cocos/physics-2d/box2d/platform/physics-debug-draw.ts index 877dbd1d7c..60ce1b0c9d 100644 --- a/cocos/physics-2d/box2d/platform/physics-debug-draw.ts +++ b/cocos/physics-2d/box2d/platform/physics-debug-draw.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/box2d/platform/physics-ray-cast-callback.ts b/cocos/physics-2d/box2d/platform/physics-ray-cast-callback.ts index 735b1224a6..25c27c481b 100644 --- a/cocos/physics-2d/box2d/platform/physics-ray-cast-callback.ts +++ b/cocos/physics-2d/box2d/platform/physics-ray-cast-callback.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/builtin/builtin-contact.ts b/cocos/physics-2d/builtin/builtin-contact.ts index a4cb01b23a..5b2364d5f5 100644 --- a/cocos/physics-2d/builtin/builtin-contact.ts +++ b/cocos/physics-2d/builtin/builtin-contact.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/builtin/intersection-2d.ts b/cocos/physics-2d/builtin/intersection-2d.ts index 423db97502..5cc93a80e7 100644 --- a/cocos/physics-2d/builtin/intersection-2d.ts +++ b/cocos/physics-2d/builtin/intersection-2d.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/physics-2d/framework/utils/polygon-separator.ts b/cocos/physics-2d/framework/utils/polygon-separator.ts index 4303a6937e..13a1a8b61a 100644 --- a/cocos/physics-2d/framework/utils/polygon-separator.ts +++ b/cocos/physics-2d/framework/utils/polygon-separator.ts @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/tween/actions/action-instant.ts b/cocos/tween/actions/action-instant.ts index 906b27eab6..bc6d6b548a 100644 --- a/cocos/tween/actions/action-instant.ts +++ b/cocos/tween/actions/action-instant.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/tween/actions/action-interval.ts b/cocos/tween/actions/action-interval.ts index a4f61b74f3..f35ed7d459 100644 --- a/cocos/tween/actions/action-interval.ts +++ b/cocos/tween/actions/action-interval.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/tween/actions/action-manager.ts b/cocos/tween/actions/action-manager.ts index 818afe0937..3c1e438357 100644 --- a/cocos/tween/actions/action-manager.ts +++ b/cocos/tween/actions/action-manager.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/tween/actions/action.ts b/cocos/tween/actions/action.ts index 2c1431a40f..c29488494c 100644 --- a/cocos/tween/actions/action.ts +++ b/cocos/tween/actions/action.ts @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/cocos/tween/index.ts b/cocos/tween/index.ts index 7e96d365f7..443c815a94 100644 --- a/cocos/tween/index.ts +++ b/cocos/tween/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/assembler/graphics/helper.ts b/cocos/ui/assembler/graphics/helper.ts index cb343fd19e..91796a01f3 100644 --- a/cocos/ui/assembler/graphics/helper.ts +++ b/cocos/ui/assembler/graphics/helper.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/graphics/index.ts b/cocos/ui/assembler/graphics/index.ts index 4bea54cff3..b8987534d3 100644 --- a/cocos/ui/assembler/graphics/index.ts +++ b/cocos/ui/assembler/graphics/index.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/graphics/types.ts b/cocos/ui/assembler/graphics/types.ts index c2deaa430b..696a398d33 100644 --- a/cocos/ui/assembler/graphics/types.ts +++ b/cocos/ui/assembler/graphics/types.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/graphics/webgl/earcut.ts b/cocos/ui/assembler/graphics/webgl/earcut.ts index 4c02f6e8cd..524017f250 100644 --- a/cocos/ui/assembler/graphics/webgl/earcut.ts +++ b/cocos/ui/assembler/graphics/webgl/earcut.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts b/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts index 412d05a118..03294284a1 100644 --- a/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts +++ b/cocos/ui/assembler/graphics/webgl/graphics-assembler.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/graphics/webgl/index.ts b/cocos/ui/assembler/graphics/webgl/index.ts index 314b46f27d..36e3064c6d 100644 --- a/cocos/ui/assembler/graphics/webgl/index.ts +++ b/cocos/ui/assembler/graphics/webgl/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/index.ts b/cocos/ui/assembler/index.ts index 81a472c7ea..b4b49a96ba 100644 --- a/cocos/ui/assembler/index.ts +++ b/cocos/ui/assembler/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/label/bmfont.ts b/cocos/ui/assembler/label/bmfont.ts index 6bbac6895e..6a73947ea8 100644 --- a/cocos/ui/assembler/label/bmfont.ts +++ b/cocos/ui/assembler/label/bmfont.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/label/bmfontUtils.ts b/cocos/ui/assembler/label/bmfontUtils.ts index aea0af6ca4..e705144083 100644 --- a/cocos/ui/assembler/label/bmfontUtils.ts +++ b/cocos/ui/assembler/label/bmfontUtils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/label/index.ts b/cocos/ui/assembler/label/index.ts index f566c4ae8f..d606282285 100644 --- a/cocos/ui/assembler/label/index.ts +++ b/cocos/ui/assembler/label/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/label/letter.ts b/cocos/ui/assembler/label/letter.ts index 31bc42386b..d0bd289e54 100644 --- a/cocos/ui/assembler/label/letter.ts +++ b/cocos/ui/assembler/label/letter.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/assembler/label/ttf.ts b/cocos/ui/assembler/label/ttf.ts index 57e70a9339..f42f126659 100644 --- a/cocos/ui/assembler/label/ttf.ts +++ b/cocos/ui/assembler/label/ttf.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/label/ttfUtils.ts b/cocos/ui/assembler/label/ttfUtils.ts index e06da55a17..18148527a7 100644 --- a/cocos/ui/assembler/label/ttfUtils.ts +++ b/cocos/ui/assembler/label/ttfUtils.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/mask/mask-assembler.ts b/cocos/ui/assembler/mask/mask-assembler.ts index b2f9b72fa4..1bf868236d 100644 --- a/cocos/ui/assembler/mask/mask-assembler.ts +++ b/cocos/ui/assembler/mask/mask-assembler.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/sprite/bar-filled.ts b/cocos/ui/assembler/sprite/bar-filled.ts index 93c17e64ef..9656cb5766 100644 --- a/cocos/ui/assembler/sprite/bar-filled.ts +++ b/cocos/ui/assembler/sprite/bar-filled.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/assembler/sprite/index.ts b/cocos/ui/assembler/sprite/index.ts index d7d0985568..7126f678b5 100644 --- a/cocos/ui/assembler/sprite/index.ts +++ b/cocos/ui/assembler/sprite/index.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/sprite/mesh.js b/cocos/ui/assembler/sprite/mesh.js index 54aacaeba4..254ceed190 100644 --- a/cocos/ui/assembler/sprite/mesh.js +++ b/cocos/ui/assembler/sprite/mesh.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/sprite/radial-filled.ts b/cocos/ui/assembler/sprite/radial-filled.ts index 370872b236..cd3cfa3cf5 100644 --- a/cocos/ui/assembler/sprite/radial-filled.ts +++ b/cocos/ui/assembler/sprite/radial-filled.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/assembler/sprite/simple.ts b/cocos/ui/assembler/sprite/simple.ts index 0ed414ef80..4265e4c113 100644 --- a/cocos/ui/assembler/sprite/simple.ts +++ b/cocos/ui/assembler/sprite/simple.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/assembler/sprite/sliced.ts b/cocos/ui/assembler/sprite/sliced.ts index 30209cd9a9..a96d12d963 100644 --- a/cocos/ui/assembler/sprite/sliced.ts +++ b/cocos/ui/assembler/sprite/sliced.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/assembler/sprite/tiled.ts b/cocos/ui/assembler/sprite/tiled.ts index 8f29a388df..157d64894f 100644 --- a/cocos/ui/assembler/sprite/tiled.ts +++ b/cocos/ui/assembler/sprite/tiled.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/block-input-events.ts b/cocos/ui/components/block-input-events.ts index 738f2cbd92..5a5e106e2d 100644 --- a/cocos/ui/components/block-input-events.ts +++ b/cocos/ui/components/block-input-events.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/button.ts b/cocos/ui/components/button.ts index 3045847ef9..3aa3ad9ce8 100644 --- a/cocos/ui/components/button.ts +++ b/cocos/ui/components/button.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/editbox/edit-box-impl-base.ts b/cocos/ui/components/editbox/edit-box-impl-base.ts index e1583a9588..83b5f6e7a2 100644 --- a/cocos/ui/components/editbox/edit-box-impl-base.ts +++ b/cocos/ui/components/editbox/edit-box-impl-base.ts @@ -2,7 +2,7 @@ Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2012 James Chen Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/components/editbox/edit-box-impl.ts b/cocos/ui/components/editbox/edit-box-impl.ts index c6e26020c0..69d1e53da4 100644 --- a/cocos/ui/components/editbox/edit-box-impl.ts +++ b/cocos/ui/components/editbox/edit-box-impl.ts @@ -2,7 +2,7 @@ Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2012 James Chen Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/editbox/edit-box.ts b/cocos/ui/components/editbox/edit-box.ts index 06441df269..4aff067730 100644 --- a/cocos/ui/components/editbox/edit-box.ts +++ b/cocos/ui/components/editbox/edit-box.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/editbox/types.ts b/cocos/ui/components/editbox/types.ts index 96264b9a91..309d113921 100644 --- a/cocos/ui/components/editbox/types.ts +++ b/cocos/ui/components/editbox/types.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/graphics.ts b/cocos/ui/components/graphics.ts index 6d3fa536bb..897bf1d21e 100644 --- a/cocos/ui/components/graphics.ts +++ b/cocos/ui/components/graphics.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/label-outline.ts b/cocos/ui/components/label-outline.ts index ab237a8ed5..bbb01c05bd 100644 --- a/cocos/ui/components/label-outline.ts +++ b/cocos/ui/components/label-outline.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/label.ts b/cocos/ui/components/label.ts index 75e483cf9e..96b165f37f 100644 --- a/cocos/ui/components/label.ts +++ b/cocos/ui/components/label.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/layout.ts b/cocos/ui/components/layout.ts index 184585e48e..0ad84d8a31 100644 --- a/cocos/ui/components/layout.ts +++ b/cocos/ui/components/layout.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/mask.ts b/cocos/ui/components/mask.ts index 82a36616e3..0ba1d9df36 100644 --- a/cocos/ui/components/mask.ts +++ b/cocos/ui/components/mask.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/page-view-indicator.ts b/cocos/ui/components/page-view-indicator.ts index 606e12a56a..6791bd7f13 100644 --- a/cocos/ui/components/page-view-indicator.ts +++ b/cocos/ui/components/page-view-indicator.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/components/page-view.ts b/cocos/ui/components/page-view.ts index 44f5a25477..e2a0a5dab8 100644 --- a/cocos/ui/components/page-view.ts +++ b/cocos/ui/components/page-view.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/components/progress-bar.ts b/cocos/ui/components/progress-bar.ts index 2b697d3dcb..eb0b09f475 100644 --- a/cocos/ui/components/progress-bar.ts +++ b/cocos/ui/components/progress-bar.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/rich-text.ts b/cocos/ui/components/rich-text.ts index 6b01bed360..616b06b681 100644 --- a/cocos/ui/components/rich-text.ts +++ b/cocos/ui/components/rich-text.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/scroll-bar.ts b/cocos/ui/components/scroll-bar.ts index 4d200aa462..7fa0d3d699 100644 --- a/cocos/ui/components/scroll-bar.ts +++ b/cocos/ui/components/scroll-bar.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/scroll-view.ts b/cocos/ui/components/scroll-view.ts index e65d108cdd..0bd0939b5f 100644 --- a/cocos/ui/components/scroll-view.ts +++ b/cocos/ui/components/scroll-view.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/slider.ts b/cocos/ui/components/slider.ts index f3ac081dff..c19037cab5 100644 --- a/cocos/ui/components/slider.ts +++ b/cocos/ui/components/slider.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/sprite.ts b/cocos/ui/components/sprite.ts index 6f4092f011..84c3b5655e 100644 --- a/cocos/ui/components/sprite.ts +++ b/cocos/ui/components/sprite.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/toggle-container.ts b/cocos/ui/components/toggle-container.ts index 50a2152330..d8e3594f79 100644 --- a/cocos/ui/components/toggle-container.ts +++ b/cocos/ui/components/toggle-container.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/toggle.ts b/cocos/ui/components/toggle.ts index 84cf54a20a..c64ebde47d 100644 --- a/cocos/ui/components/toggle.ts +++ b/cocos/ui/components/toggle.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/ui-coodinate-tracker.ts b/cocos/ui/components/ui-coodinate-tracker.ts index 1c3ce4e742..387f868337 100644 --- a/cocos/ui/components/ui-coodinate-tracker.ts +++ b/cocos/ui/components/ui-coodinate-tracker.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/ui-mesh-renderer.ts b/cocos/ui/components/ui-mesh-renderer.ts index 9c584dbc46..8230402031 100644 --- a/cocos/ui/components/ui-mesh-renderer.ts +++ b/cocos/ui/components/ui-mesh-renderer.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/ui-static-batch.ts b/cocos/ui/components/ui-static-batch.ts index 9017ab40db..b3046d7776 100644 --- a/cocos/ui/components/ui-static-batch.ts +++ b/cocos/ui/components/ui-static-batch.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/view-group.ts b/cocos/ui/components/view-group.ts index 7afd82fbbe..6eb502731a 100644 --- a/cocos/ui/components/view-group.ts +++ b/cocos/ui/components/view-group.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/ui/components/widget-manager.ts b/cocos/ui/components/widget-manager.ts index baa333506e..f3547303c6 100644 --- a/cocos/ui/components/widget-manager.ts +++ b/cocos/ui/components/widget-manager.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/cocos/ui/components/widget.ts b/cocos/ui/components/widget.ts index a4f89f8908..20513f1e2d 100644 --- a/cocos/ui/components/widget.ts +++ b/cocos/ui/components/widget.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/video/assets/video-clip.ts b/cocos/video/assets/video-clip.ts index 1a56fd82f8..e324f6bb52 100644 --- a/cocos/video/assets/video-clip.ts +++ b/cocos/video/assets/video-clip.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/video/video-downloader.ts b/cocos/video/video-downloader.ts index f8eebb49c7..5fbaeeb433 100644 --- a/cocos/video/video-downloader.ts +++ b/cocos/video/video-downloader.ts @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/video/video-player-impl-manager.ts b/cocos/video/video-player-impl-manager.ts index 6071c5ced3..c700fa6a3b 100644 --- a/cocos/video/video-player-impl-manager.ts +++ b/cocos/video/video-player-impl-manager.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/video/video-player.ts b/cocos/video/video-player.ts index d8fd276993..d113909663 100644 --- a/cocos/video/video-player.ts +++ b/cocos/video/video-player.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/web-view/web-view-impl-manager.ts b/cocos/web-view/web-view-impl-manager.ts index 9de895ea3a..60295dd862 100644 --- a/cocos/web-view/web-view-impl-manager.ts +++ b/cocos/web-view/web-view-impl-manager.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/cocos/web-view/web-view.ts b/cocos/web-view/web-view.ts index 9168a1fda2..2ca37b11e2 100644 --- a/cocos/web-view/web-view.ts +++ b/cocos/web-view/web-view.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/editor/assets/chunks/cc-forward-light.chunk b/editor/assets/chunks/cc-forward-light.chunk index e691a97749..6d5b8ad5c0 100644 --- a/editor/assets/chunks/cc-forward-light.chunk +++ b/editor/assets/chunks/cc-forward-light.chunk @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. +// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. #define LIGHTS_PER_PASS 1 #pragma builtin(local) diff --git a/editor/assets/effects/builtin-wireframe.effect b/editor/assets/effects/builtin-wireframe.effect index 6fa622d429..cc44853236 100644 --- a/editor/assets/effects/builtin-wireframe.effect +++ b/editor/assets/effects/builtin-wireframe.effect @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. +// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. CCEffect %{ techniques: - name: opaque diff --git a/extensions/ccpool/node-pool.ts b/extensions/ccpool/node-pool.ts index 3df5c4ffa6..9120879d06 100644 --- a/extensions/ccpool/node-pool.ts +++ b/extensions/ccpool/node-pool.ts @@ -9,7 +9,7 @@ import { legacyCC } from '../../cocos/core/global-exports'; /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index f41e5cd395..c0ff6f40ce 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/dragonbones/CCFactory.js b/extensions/dragonbones/CCFactory.js index b02da97d98..ce1ae89afa 100644 --- a/extensions/dragonbones/CCFactory.js +++ b/extensions/dragonbones/CCFactory.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/CCSlot.js b/extensions/dragonbones/CCSlot.js index 44d39a3e9c..313663eda3 100644 --- a/extensions/dragonbones/CCSlot.js +++ b/extensions/dragonbones/CCSlot.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/CCTextureData.js b/extensions/dragonbones/CCTextureData.js index 9fa1ddad1d..98406f8af0 100644 --- a/extensions/dragonbones/CCTextureData.js +++ b/extensions/dragonbones/CCTextureData.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/DragonBonesAsset.js b/extensions/dragonbones/DragonBonesAsset.js index 7b4b49dd8e..00ce33a2c8 100644 --- a/extensions/dragonbones/DragonBonesAsset.js +++ b/extensions/dragonbones/DragonBonesAsset.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/dragonbones/DragonBonesAtlasAsset.js b/extensions/dragonbones/DragonBonesAtlasAsset.js index 32e55d6a6b..9b4b84427b 100644 --- a/extensions/dragonbones/DragonBonesAtlasAsset.js +++ b/extensions/dragonbones/DragonBonesAtlasAsset.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/dragonbones/editor/dragonbones-atlas-meta.js b/extensions/dragonbones/editor/dragonbones-atlas-meta.js index 00f3b1cb0f..a2ef92519f 100644 --- a/extensions/dragonbones/editor/dragonbones-atlas-meta.js +++ b/extensions/dragonbones/editor/dragonbones-atlas-meta.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/dragonbones/editor/dragonbones-meta.js b/extensions/dragonbones/editor/dragonbones-meta.js index c7978521ff..7f1300f9d5 100644 --- a/extensions/dragonbones/editor/dragonbones-meta.js +++ b/extensions/dragonbones/editor/dragonbones-meta.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/dragonbones/index.js b/extensions/dragonbones/index.js index cc405aff6e..27e3bf134d 100644 --- a/extensions/dragonbones/index.js +++ b/extensions/dragonbones/index.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/dragonbones/webgl-assembler.js b/extensions/dragonbones/webgl-assembler.js index 299617e563..61290bdb1d 100644 --- a/extensions/dragonbones/webgl-assembler.js +++ b/extensions/dragonbones/webgl-assembler.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/spine/Skeleton.js b/extensions/spine/Skeleton.js index ba134a6a01..d59afdc46f 100644 --- a/extensions/spine/Skeleton.js +++ b/extensions/spine/Skeleton.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/spine/editor/spine-meta.js b/extensions/spine/editor/spine-meta.js index fb7f9921d6..622a7c94a5 100644 --- a/extensions/spine/editor/spine-meta.js +++ b/extensions/spine/editor/spine-meta.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/spine/index.js b/extensions/spine/index.js index b5936ddcef..4ae778bdb6 100644 --- a/extensions/spine/index.js +++ b/extensions/spine/index.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/spine/skeleton-data.js b/extensions/spine/skeleton-data.js index 818b9b448a..c94c81de6c 100644 --- a/extensions/spine/skeleton-data.js +++ b/extensions/spine/skeleton-data.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/spine/skeleton-texture.js b/extensions/spine/skeleton-texture.js index 6a31f54ff7..766b43f363 100644 --- a/extensions/spine/skeleton-texture.js +++ b/extensions/spine/skeleton-texture.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/spine/spine-assembler.js b/extensions/spine/spine-assembler.js index fb0de3b931..c9c6666a78 100644 --- a/extensions/spine/spine-assembler.js +++ b/extensions/spine/spine-assembler.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/spine/track-entry-listeners.js b/extensions/spine/track-entry-listeners.js index 170acaeeb3..af5027439b 100644 --- a/extensions/spine/track-entry-listeners.js +++ b/extensions/spine/track-entry-listeners.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/CCTMXXMLParser.js b/extensions/tilemap/CCTMXXMLParser.js index 67afeb90e1..d2881f58b3 100644 --- a/extensions/tilemap/CCTMXXMLParser.js +++ b/extensions/tilemap/CCTMXXMLParser.js @@ -2,7 +2,7 @@ Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos2d-x.org diff --git a/extensions/tilemap/CCTiledLayer.js b/extensions/tilemap/CCTiledLayer.js index 5c830b20ae..4be71ce0fa 100644 --- a/extensions/tilemap/CCTiledLayer.js +++ b/extensions/tilemap/CCTiledLayer.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/CCTiledMap.js b/extensions/tilemap/CCTiledMap.js index af8794d87b..05f3e0dfb4 100644 --- a/extensions/tilemap/CCTiledMap.js +++ b/extensions/tilemap/CCTiledMap.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/CCTiledMapAsset.js b/extensions/tilemap/CCTiledMapAsset.js index a9213a1d2f..1338db1a8e 100644 --- a/extensions/tilemap/CCTiledMapAsset.js +++ b/extensions/tilemap/CCTiledMapAsset.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/CCTiledObjectGroup.js b/extensions/tilemap/CCTiledObjectGroup.js index bf472342c3..cf21a926bc 100644 --- a/extensions/tilemap/CCTiledObjectGroup.js +++ b/extensions/tilemap/CCTiledObjectGroup.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/CCTiledTile.js b/extensions/tilemap/CCTiledTile.js index 344951aa5e..8b434759d6 100644 --- a/extensions/tilemap/CCTiledTile.js +++ b/extensions/tilemap/CCTiledTile.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/editor/tiled-map.js b/extensions/tilemap/editor/tiled-map.js index 141b0a30f8..01f7782b2f 100644 --- a/extensions/tilemap/editor/tiled-map.js +++ b/extensions/tilemap/editor/tiled-map.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/tilemap/tmx-layer-assembler.js b/extensions/tilemap/tmx-layer-assembler.js index dde3eb961a..2b6338034b 100644 --- a/extensions/tilemap/tmx-layer-assembler.js +++ b/extensions/tilemap/tmx-layer-assembler.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/videoplayer/CCVideoPlayer.js b/extensions/videoplayer/CCVideoPlayer.js index 65cf28bd85..621890771f 100644 --- a/extensions/videoplayer/CCVideoPlayer.js +++ b/extensions/videoplayer/CCVideoPlayer.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/extensions/videoplayer/video-player-impl.js b/extensions/videoplayer/video-player-impl.js index 16c7485f6a..085adf1d10 100644 --- a/extensions/videoplayer/video-player-impl.js +++ b/extensions/videoplayer/video-player-impl.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/gulpfile.js b/gulpfile.js index e15bf6aa98..2fc0f356a5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,6 @@ /* Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/licenses/License_and_terms_en.rtf b/licenses/License_and_terms_en.rtf index 837b109223..a804fad13d 100755 --- a/licenses/License_and_terms_en.rtf +++ b/licenses/License_and_terms_en.rtf @@ -96,7 +96,7 @@ In order to use Cocos Creator 3D, you must first agree to this License Agreement \f2 \cf2 Appendix A: Cocos2d-x \f0 Software License\ -Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd.\ +Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.\ Copyright (c) 2013-2016 Chukong Technologies\ Copyright (c) 2010-2012 cocos2d-x community\ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\ diff --git a/licenses/License_and_terms_zh.rtf b/licenses/License_and_terms_zh.rtf index f2ec85b4b4..cf0d17a27c 100755 --- a/licenses/License_and_terms_zh.rtf +++ b/licenses/License_and_terms_zh.rtf @@ -356,7 +356,7 @@ \f1 \cf2 \'b8\'bd\'bc\'fe\'d2\'bb\'a3\'ba\ Cocos2d-x \f0 Software License\ -Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd.\ +Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.\ Copyright (c) 2013-2016 Chukong Technologies\ Copyright (c) 2010-2012 cocos2d-x community\ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\ diff --git a/port/native/engine/jsb-audio.js b/port/native/engine/jsb-audio.js index d436a20ad6..2c2ac81536 100644 --- a/port/native/engine/jsb-audio.js +++ b/port/native/engine/jsb-audio.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/port/native/engine/jsb-loader.js b/port/native/engine/jsb-loader.js index 0bba9bdd92..e4a20229f2 100644 --- a/port/native/engine/jsb-loader.js +++ b/port/native/engine/jsb-loader.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/port/native/engine/jsb-sys.js b/port/native/engine/jsb-sys.js index ffc382421d..57ac14a99b 100644 --- a/port/native/engine/jsb-sys.js +++ b/port/native/engine/jsb-sys.js @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/port/native/engine/jsb-webview.js b/port/native/engine/jsb-webview.js index 70b32379b4..dbaa2bbde6 100644 --- a/port/native/engine/jsb-webview.js +++ b/port/native/engine/jsb-webview.js @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. https://www.cocos.com/ diff --git a/predefine.ts b/predefine.ts index 09f7bf88d8..7a1607065f 100644 --- a/predefine.ts +++ b/predefine.ts @@ -1,5 +1,5 @@ /* - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. http://www.cocos.com diff --git a/tests/core/test-component-scheduler.js b/tests/core/test-component-scheduler.js index ba3099249c..de9b77e891 100644 --- a/tests/core/test-component-scheduler.js +++ b/tests/core/test-component-scheduler.js @@ -883,6 +883,39 @@ test('start should always invoke before update', function () { node.active = false; }); +test('different start executionOrder', function () { + var invoked = false; + var TestComp = cc.Class({ + extends: cc.Component, + start: function () { + invoked = true; + }, + update: function () { + strictEqual(invoked, true, 'should always be invoked before update'); + }, + }); + + var AfterTestComp = cc.Class({ + extends: cc.Component, + editor: { + executionOrder: 1, + }, + start: function () { + // execute inside start phase dynamically + this.node.addComponent(TestComp); + }, + }); + + var node = new cc.Node(); + node.addComponent(AfterTestComp); + + cc.director.getScene().addChild(node); + cc.game.step(); + cc.game.step(); + + strictEqual(invoked, true, 'start should be invoked on new component with lower executionOrder'); +}); + test('start should only called once', function () { var TestComp1 = cc.Class({ extends: cc.Component,