Merge branch 'Tencent:master' into master

.github/workflows/unity_publish.yml

@@ -345,27 +345,27 @@ jobs:
           echo "API_LEVEL=$(cat unity/native_src/Src/Puerts.cpp | grep -Po '(?<=API_LEVEL\s)(\d+)')" >> $GITHUB_ENV
           node -e "const pjson = JSON.parse(fs.readFileSync('$GITHUB_WORKSPACE/unity/Assets/core/upm/package.json', 'utf-8')); pjson.version = '${{ github.event.inputs.tag_name }}' ; fs.writeFileSync('$GITHUB_WORKSPACE/unity/Assets/core/upm/package.json', JSON.stringify(pjson))"
             
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           name: Unity_Plugins (v8_9.4_Release)
           path: V8/upm/Plugins/
 
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           name: Unity_Plugins (v8_10.6.194_Release)
           path: V8_10/upm/Plugins/
 
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           name: Unity_Plugins (quickjs_Release)
           path: Quickjs/upm/Plugins/
 
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           name: Unity_Plugins (nodejs_16_Release)
           path: Nodejs/upm/Plugins/
 
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           name: Unity_Plugins (mult_Release)
           path: Mult/upm/Plugins/

README.md

@@ -5,7 +5,7 @@
 
 [![unreal](https://img.shields.io/badge/unreal-v1.0.7-blue.svg)](https://github.com/Tencent/puerts/releases/tag/Unreal_v1.0.7)
 
-[![unity](https://img.shields.io/badge/unity(stable)-v2.1.0-blue.svg)](doc/unity/zhcn/install.md)
+[![unity](https://img.shields.io/badge/unity(stable)-v2.1.1-blue.svg)](doc/unity/zhcn/install.md)
 ![Unity_Test](https://github.com/Tencent/puerts/workflows/unity%20unittest/badge.svg)
 
 [跳转中文](#what---普洱ts是什么)

doc/unreal/en/template_binding.md

@@ -106,6 +106,24 @@ CombineOverloads(
     )
 ```
 
+### Static Variables
+
+~~~c++
+class TestClass
+{
+public:
+    static int StaticInt;
+};
+~~~
+
+Statement
+
+~~~c++
+puerts::DefineClass<TestClass>()
+    .Variable("StaticInt", MakeVariable(&TestClass::StaticInt))
+    .Register();
+~~~
+
 ### Member variables
 
 ``` c++
@@ -126,6 +144,38 @@ puerts::DefineClass<TestClass>()
     .Register();
 ```
 
+### Getter and Setter
+
+~~~c++
+class TestClass
+{
+private:
+    int32_t _x;
+
+    static int _si;
+
+public:
+    int32_t GetX()
+	{
+		return _x;
+	}
+
+    static int32_t GetStaticInt()
+	{
+		return _si;
+	}
+};
+~~~
+
+Statement
+
+~~~c++
+puerts::DefineClass<TestClass>()
+    .Property("X", MakePropertyByGetterSetter(&TestClass::GetX, nullptr))
+    .Variable("StaticInt", MakeVariableByGetterSetter(&TestClass::GetStaticInt, nullptr))
+    .Register();
+~~~
+
 ### Constructor
 
 ``` c++

doc/unreal/zhcn/template_binding.md

@@ -108,6 +108,23 @@ CombineOverloads(
 
 * 函数没有重载，但希望校验参数：MakeCheckFunction(&Calc::Add)
 
+## 静态变量
+
+~~~c++
+class TestClass
+{
+public:
+    static int StaticInt;
+};
+~~~
+
+声明：
+~~~c++
+puerts::DefineClass<TestClass>()
+    .Variable("StaticInt", MakeVariable(&TestClass::StaticInt))
+    .Register();
+~~~
+
 ## 成员变量
 
 ~~~c++
@@ -127,6 +144,37 @@ puerts::DefineClass<TestClass>()
     .Register();
 ~~~
 
+## Getter、Setter
+
+~~~c++
+class TestClass
+{
+private:
+    int32_t _x;
+
+    static int _si;
+
+public:
+    int32_t GetX()
+	{
+		return _x;
+	}
+
+    static int32_t GetStaticInt()
+	{
+		return _si;
+	}
+};
+~~~
+
+声明：
+~~~c++
+puerts::DefineClass<TestClass>()
+    .Property("X", MakePropertyByGetterSetter(&TestClass::GetX, nullptr))
+    .Variable("StaticInt", MakeVariableByGetterSetter(&TestClass::GetStaticInt, nullptr))
+    .Register();
+~~~
+
 ## 构造函数
 
 ~~~c++