Merge branch 'v3.5.0' into v3.6_merge_v3.5.0

This commit is contained in:
minggo
2022-01-25 19:52:06 +08:00
1002 changed files with 7024 additions and 6337 deletions
@@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2018-2021 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2022 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
@@ -218,7 +218,9 @@ Java_com_cocos_lib_JsbBridge_nativeSendToScript(JNIEnv *env, jclass clazz, jstri
ScriptNativeBridge *ScriptNativeBridge::bridgeCxxInstance{nullptr};
JavaScriptJavaBridge::CallInfo::~CallInfo() {
_mEnv->DeleteLocalRef(_mClassID);
if (_mReturnType == ValueType::STRING && _mRet.stringValue) {
_mEnv->DeleteLocalRef(_mRetjstring);
delete _mRet.stringValue;
}
}