Merge pull request #78 from Live2D/develop

Update to Cubism 5 SDK for Unity R2

Assets/Live2D/Cubism/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [5-r.2] - 2024-04-04
+
+### Added
+
+* Add HarmonyOS NEXT from the tested environment.
+
+### Fixed
+
+* Fix an issue where the `Allow 'unsafe' Code` property was not enabled in the `Live2D.Cubism.asmdef`.
+
 
 ## [5-r.1] - 2024-03-26
 
@@ -396,6 +406,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix issue where Priority value was not reset after playing motion with CubismMotionController.
 
 
+[5-r.2]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1...5-r.2
 [5-r.1]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.4...5-r.1
 [5-r.1-beta.4]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.3...5-r.1-beta.4
 [5-r.1-beta.3]: https://github.com/Live2D/CubismUnityComponents/compare/5-r.1-beta.2...5-r.1-beta.3

Assets/Live2D/Cubism/Live2D.Cubism.asmdef

@@ -1,3 +1,14 @@
 {
-	"name": "Live2D.Cubism"
-}
+    "name": "Live2D.Cubism",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/Live2D/Cubism/Plugins/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## 2024-04-04
+
+### Added
+
+* [Unity] Add library(.so) for HarmonyOS build.
+
+
 ## 2024-03-26
 
 ### Remove

Assets/Live2D/Cubism/Plugins/README.ja.md

@@ -17,6 +17,9 @@
 | Android | x86 | Android/x86 |   |
 | Android | x86_64 | Android/x86_64 |   |
 | Emscripten |  | Experimental/Emscripten/latest | bitcode（upstream LLVM wasmバックエンド） |
+| HarmonyOS | ARM64 | HarmonyOS/arm64-v8a |   |
+| HarmonyOS | ARMv7 | HarmonyOS/armeabi-v7a |  |
+| HarmonyOS | x86_64 | HarmonyOS/x86_64 |   |
 | iOS | ARM64 | iOS/xxx-iphoneos | iOSデバイス |
 | iOS | x86_64 | iOS/xxx-iphonesimulator | iOS Simulator |
 | Linux | x86_64 | Linux/x86_64 |   |

Assets/Live2D/Cubism/Plugins/README.md

@@ -17,6 +17,9 @@ This folder contains platform-specific library files.
 | Android | x86 | Android/x86 |   |
 | Android | x86_64 | Android/x86_64 |   |
 | Emscripten |  | Experimental/Emscripten/latest | bitcode(upstream LLVM wasm backend) |
+| HarmonyOS | ARM64 | HarmonyOS/arm64-v8a |   |
+| HarmonyOS | ARMv7 | HarmonyOS/armeabi-v7a |  |
+| HarmonyOS | x86_64 | HarmonyOS/x86_64 |   |
 | iOS | ARM64 | iOS/xxx-iphoneos | iOS Devices |
 | iOS | x86_64 | iOS/xxx-iphonesimulator | iOS Simulator |
 | Linux | x86_64 | Linux/x86_64 |   |

Assets/Live2D/Cubism/Plugins/RedistributableFiles.txt

@@ -10,6 +10,9 @@ under the terms of the Live2D Proprietary Software License Agreement:
 - Experimental/UWP/arm64/Live2DCubismCore.dll
 - Experimental/UWP/x64/Live2DCubismCore.dll
 - Experimental/UWP/x86/Live2DCubismCore.dll
+- HarmonyOS/arm64-v8a/libLive2DCubismCore.so
+- HarmonyOS/armeabi-v7a/libLive2DCubismCore.so
+- HarmonyOS/x86_64/libLive2DCubismCore.so
 - iOS/Debug-iphoneos/libLive2DCubismCore.a
 - iOS/Debug-iphonesimulator/libLive2DCubismCore.a
 - iOS/Release-iphoneos/libLive2DCubismCore.a

Assets/Live2D/Cubism/README.ja.md

@@ -69,6 +69,13 @@ Unity Editor拡張機能は、`./Assets/Live2D/Cubism/Editor`にあります。
 
 *2 Unityに組み込まれたライブラリまたは推奨ライブラリを使用してください。
 
+| HarmonyOS NEXT 対応ツール | バージョン |
+| --- | --- |
+| Tuanjie | 1.0.1 |
+| DevEco Studio *3 | 4.0 |
+
+*3 中国国外でのHarmonyOS NEXT向けビルドはDevEcoを通じてビルドする必要があります。
+
 ### C#コンパイラ
 
 Unity2018.4以降でサポートされているRoslynまたはmcsコンパイラを使用してビルドします。
@@ -92,6 +99,7 @@ https://docs.unity3d.com/ja/2018.4/Manual/CSharpCompiler.html
 | Google Chrome | 122.0.6261.129 |
 | Chrome OS 64bit (x86_64) | 122.0.6261.118 |
 | Chrome OS 32bit (ARMv8) (*3) | 122.0.6261.118 |
+| HarmonyOS NEXT | 4.0.0.66 |
 
 *3 Android向けAPKファイルでの動作確認です。
 

Assets/Live2D/Cubism/README.md

@@ -70,6 +70,13 @@ Resources like shaders and other assets are located in `./Assets/Live2D/Cubism/R
 
 *2 Use libraries embedded with Unity or recommended.
 
+| HarmonyOS NEXT Supported Tools | Version |
+| --- | --- |
+| Tuanjie | 1.0.1 |
+| DevEco Studio *3 | 4.0 |
+
+*3 Builds for HarmonyOS NEXT outside of China must be built through DevEco.
+
 ### C# compiler
 
 Build using Roslyn or mcs compiler supported by Unity 2018.4 and above.
@@ -93,6 +100,7 @@ https://docs.unity3d.com/ja/2018.4/Manual/CSharpCompiler.html
 | Google Chrome | 122.0.6261.129 |
 | Chrome OS 64bit (x86_64) | 122.0.6261.118 |
 | Chrome OS 32bit (ARMv8) (*3) | 122.0.6261.118 |
+| HarmonyOS NEXT | 4.0.0.66 |
 
 *3 This is a confirmation of operation with APK files for Android.