Sync fork (#73)

* Improved UI layout and live vocals * New Live Compatibility * Android build support * Update build.yml * Fix issues with the new version of the game * add config button * Improve performance * bug fix, new uma compatibility --------- Co-authored-by: CroakFang <[email protected]>
katboi01 · Nov 6, 2024 · d97cb90 · d97cb90
1 parent 817b8a3
commit d97cb90
Show file tree

Hide file tree

Showing 23 changed files with 918 additions and 268 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build Windows Player
+name: Build Windows Player and Android APK
 
 on: 
   push:
@@ -7,10 +7,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  buildWindowsPlayer:
-    name: build Windows Player
+  buildForPlatform:
+    name: build Player
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
@@ -21,13 +20,13 @@ jobs:
         unityVersion:
           - 2020.3.24f1
         targetPlatform:
-          - StandaloneWindows64 # Build a Windows 64-bit standalone.
-
+          - Android # Build an Android APK.
+          - StandaloneWindows64 # Build a Windows 64-bit standalone
     steps:
       - uses: actions/checkout@v2
         with:
           lfs: true
-          
+
       - uses: game-ci/unity-builder@v2
         env:
             UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
@@ -38,15 +37,37 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
-
-      - uses: actions/upload-artifact@v4
-        with:
-            name: Build
-            path: build
 
       - name: Zip Binary
+        if: matrix.targetPlatform == 'StandaloneWindows64'
         run: zip -r UmaViewer_${{ matrix.targetPlatform }}.zip build/${{ matrix.targetPlatform }}/*
 
+      - name: Upload Artifact for Android
+        if: matrix.targetPlatform == 'Android'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Build-${{ matrix.targetPlatform }}
+          path: build/${{ matrix.targetPlatform }}/*
+
+      - name: Upload Artifact for Windows
+        if: matrix.targetPlatform == 'StandaloneWindows64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Build-${{ matrix.targetPlatform }}
+          path: UmaViewer_StandaloneWindows64.zip
+
+  createRelease:
+    needs: buildForPlatform
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: build/
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -58,13 +79,22 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload Release Asset
-        id: upload-release-asset 
+      - name: Upload Windows Release Asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./UmaViewer_${{ matrix.targetPlatform }}.zip
+          asset_path: ./build/Build-StandaloneWindows64/UmaViewer_StandaloneWindows64.zip
           asset_name: UmaViewer.zip
-          asset_content_type: application/zip 
+          asset_content_type: application/zip
+
+      - name: Upload Android Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./build/Build-Android/UmaViewer.apk
+          asset_name: UmaViewer.apk
+          asset_content_type: application/vnd.android.package-archive
diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta
diff --git a/Assets/Plugins/StandaloneFileBrowser/StandalongFileBrowser.runtime.asmdef b/Assets/Plugins/StandaloneFileBrowser/StandalongFileBrowser.runtime.asmdef
@@ -3,7 +3,9 @@
     "rootNamespace": "",
     "references": [],
     "includePlatforms": [],
-    "excludePlatforms": [],
+    "excludePlatforms": [
+        "Android"
+    ],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],

diff --git a/Assets/Resources/Animations/Controller.controller b/Assets/Resources/Animations/Controller.controller
@@ -299,7 +299,7 @@ AnimatorController:
     m_Behaviours: []
     m_BlendingMode: 0
     m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
+    m_DefaultWeight: 1
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}