Merge pull request #332 from cocos/v3.7

V3.7
This commit is contained in:
minggo 2023-01-06 12:10:45 +08:00 committed by GitHub
commit 9a8d34c93b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 7 additions and 4 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
%{ %{
bool js_register_$jsmangledname(se::Object* obj) { bool js_register_$jsmangledname(se::Object* obj) {
$jsclass_inheritance $jsclass_inheritance
cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
$jsclassvariables $jsclassvariables
$jsclassfunctions $jsclassfunctions
$jsstaticclassvariables $jsstaticclassvariables

Binary file not shown.

View File

@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
%{ %{
bool js_register_$jsmangledname(se::Object* obj) { bool js_register_$jsmangledname(se::Object* obj) {
$jsclass_inheritance $jsclass_inheritance
cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
$jsclassvariables $jsclassvariables
$jsclassfunctions $jsclassfunctions
$jsstaticclassvariables $jsstaticclassvariables

View File

@ -131,7 +131,7 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
ios: 11.5.0 (commit: 1978c76) ios: 11.5.0 (commit: 1978c76)
linux: 11.5.0 linux: 11.5.0
swig (Built using https://github.com/dumganhar/swig/tree/cocos-se) swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.2 )
win64: cocos-v1.1.0 (commit: fac0dbb) win64: cocos-v1.1.2 (commit: 5c7c430)
mac: cocos-v1.1.0 (commit: fac0dbb) mac: cocos-v1.1.2 (commit: 5c7c430)
linux: cocos-v1.1.0 (commit: fac0dbb) linux: cocos-v1.1.2 (commit: 5c7c430)

Binary file not shown.

View File

@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
%{ %{
bool js_register_$jsmangledname(se::Object* obj) { bool js_register_$jsmangledname(se::Object* obj) {
$jsclass_inheritance $jsclass_inheritance
cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
$jsclassvariables $jsclassvariables
$jsclassfunctions $jsclassfunctions
$jsstaticclassvariables $jsstaticclassvariables