fix decorator warning of ValueTypes (#7553)

* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
This commit is contained in:
Jare Guo
2020-10-21 16:31:41 +08:00
committed by GitHub
parent efb5e573b5
commit 0319477911
266 changed files with 331 additions and 302 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
@@ -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 http://www.cocos2d-x.org
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
@@ -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 http://www.cocos.com
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -2,7 +2,7 @@
Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2011-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
@@ -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 http://www.cocos.com
@@ -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 http://www.cocos.com
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+9 -8
View File
@@ -122,28 +122,29 @@ function genProperty (
cache, cache,
) { ) {
let fullOptions; let fullOptions;
let isGetset = descriptor && (descriptor.get || descriptor.set);
if (options) { if (options) {
fullOptions = DEV ? getFullFormOfProperty(options, propertyKey, js.getClassName(ctor)) : fullOptions = DEV ? getFullFormOfProperty(options, isGetset, propertyKey, js.getClassName(ctor)) :
getFullFormOfProperty(options); getFullFormOfProperty(options, isGetset);
fullOptions = fullOptions || options; fullOptions = fullOptions || options;
} }
const existsPropertyRecord = properties[propertyKey]; const existsPropertyRecord = properties[propertyKey];
const propertyRecord = js.mixin(existsPropertyRecord || {}, fullOptions || {}); const propertyRecord = js.mixin(existsPropertyRecord || {}, fullOptions || {});
if (descriptor && (descriptor.get || descriptor.set)) { // If the target property is accessor if (isGetset) {
// typescript or babel // typescript or babel
if (DEV && options && (options.get || options.set)) { if (DEV && options && ((fullOptions || options).get || (fullOptions || options).set)) {
const errorProps = getSubDict(cache, 'errorProps'); const errorProps = getSubDict(cache, 'errorProps');
if (!errorProps[propertyKey]) { if (!errorProps[propertyKey]) {
errorProps[propertyKey] = true; errorProps[propertyKey] = true;
warnID(3655, propertyKey, js.getClassName(ctor), propertyKey, propertyKey); warnID(3655, propertyKey, js.getClassName(ctor), propertyKey, propertyKey);
} }
} }
if (descriptor.get) { if (descriptor!.get) {
propertyRecord.get = descriptor.get; propertyRecord.get = descriptor!.get;
} }
if (descriptor.set) { if (descriptor!.set) {
propertyRecord.set = descriptor.set; propertyRecord.set = descriptor!.set;
} }
} else { // Target property is non-accessor } else { // Target property is non-accessor
if (DEV && (propertyRecord.get || propertyRecord.set)) { if (DEV && (propertyRecord.get || propertyRecord.set)) {
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+25 -30
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
@@ -221,41 +221,36 @@ function getBaseClassWherePropertyDefined_DEV (propName, cls) {
// tslint:disable: no-shadowed-variable // 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; const isLiteral = options && options.constructor === Object;
if ( !isLiteral ) { if ( !isLiteral ) {
if (Array.isArray(options) && options.length > 0) { if (Array.isArray(options) && options.length > 0) {
return _wrapOptions(isGetset, [], options);
const type = options[0];
return {
default: [],
type: options,
_short: true,
};
} else if (typeof options === 'function') { } else if (typeof options === 'function') {
const type = options; const type = options;
if (!legacyCC.RawAsset.isRawAssetType(type)) { return _wrapOptions(isGetset, js.isChildClassOf(type, legacyCC.ValueType) ? new type() : null, type);
return {
default: js.isChildClassOf(type, legacyCC.ValueType) ? new type() : null,
type,
_short: true,
};
}
return {
default: '',
url: type,
_short: true,
};
} else if (options instanceof PrimitiveType) { } else if (options instanceof PrimitiveType) {
return { return _wrapOptions(isGetset, options.default);
default: options.default,
_short: true,
};
} else { } else {
return { return _wrapOptions(isGetset, options);
default: options,
_short: true,
};
} }
} }
return null; return null;
@@ -264,7 +259,7 @@ export function getFullFormOfProperty (options, propname_dev?, classname_dev?) {
export function preprocessAttrs (properties, className, cls) { export function preprocessAttrs (properties, className, cls) {
for (const propName in properties) { for (const propName in properties) {
let val = properties[propName]; let val = properties[propName];
const fullForm = getFullFormOfProperty(val, propName, className); const fullForm = getFullFormOfProperty(val, false, propName, className);
if (fullForm) { if (fullForm) {
val = properties[propName] = fullForm; val = properties[propName] = fullForm;
} }
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -2,7 +2,7 @@
Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2011-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2016 Chukong Technologies Inc. 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 http://www.cocos.com
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -2,7 +2,7 @@
Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2011-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2016 Chukong Technologies Inc. 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/ https://www.cocos.com/
Permission is hereby granted, free of charge, to any person obtaining a copy 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, of this software and associated engine source code (the "Software"), a limited,
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -2,7 +2,7 @@
Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2011-2012 cocos2d-x.org Copyright (c) 2011-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos2d-x.org
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com
+1 -1
View File
@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013-2016 Chukong Technologies Inc. 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 http://www.cocos.com

Some files were not shown because too many files have changed in this diff Show More