Merge pull request #216 from sfc-sdp/v6.1.2

GameCanvas 6.1.2
sfc-sdp · Apr 8, 2022 · d50ee02 · d50ee02
2 parents 9e9ea0a + 6abe40c
commit d50ee02
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 17 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -3,17 +3,18 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches: [master]
-    paths: "**.cs"
+    paths: ["**.cs"]
 jobs:
   dotnet-format:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_VERSION: 5.0.x
+      DOTNET_FORMAT_VERSION: 5.1.250801
       GC_PACKAGE_PATH: ./Packages/GameCanvas/
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false
@@ -31,14 +32,14 @@ jobs:
 
       - name: Setup .NET Core SDK
         if: steps.check_folder.outputs.files_exists == 'true'
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Cache .NET Tools
         if: steps.check_folder.outputs.files_exists == 'true'
         id: dotnet_tools_cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${ env.DOTNET_ROOT }/tools
           key: ${{ runner.os }}-dotnet-tools-${{ env.DOTNET_VERSION }}
@@ -47,12 +48,12 @@ jobs:
 
       - name: Install dotnet-format
         if: steps.check_folder.outputs.files_exists == 'true'
-        run: dotnet tool install -g dotnet-format
+        run: dotnet tool install -g dotnet-format --version ${{ env.DOTNET_FORMAT_VERSION }}
 
       - name: DryRun dotnet-format
         if: steps.check_folder.outputs.files_exists == 'true'
         id: format
-        uses: brmenchl/[email protected] # v1 にすると動かない
+        uses: brmenchl/[email protected]
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           action: "check"
@@ -61,7 +62,7 @@ jobs:
 
       - name: Run dotnet-format
         if: steps.format.outputs.has-changes == 'true'
-        uses: brmenchl/[email protected] # v1 にすると動かない
+        uses: brmenchl/[email protected]
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           action: "fix"
@@ -87,14 +88,14 @@ jobs:
     strategy:
       matrix:
         unity-version:
-          - 2020.3.3f1
+          - 2020.3.32f1
     env:
       UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
       UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
       UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
     runs-on: ubuntu-latest
     container:
-      image: unityci/editor:ubuntu-${{ matrix.unity-version }}-linux-il2cpp-0
+      image: unityci/editor:ubuntu-${{ matrix.unity-version }}-linux-il2cpp-1
     steps:
       - uses: actions/checkout@v2
 

diff --git a/Packages/GameCanvas/CHANGELOG.md b/Packages/GameCanvas/CHANGELOG.md
@@ -1,4 +1,12 @@
 # CHANGE LOG
+## 6.1.2
+### 不具合修正
+- [#215](https://github.com/sfc-sdp/GameCanvas-Unity/issues/215) AppBuilderからWebGLビルドできない件の修正
+
+## 6.1.1
+### 仕様変更
+- Unity 2020.3.32f1 に更新
+
 ## 6.1.0
 ### 機能追加
 - [#61](https://github.com/sfc-sdp/GameCanvas-Unity/issues/61), [#208](https://github.com/sfc-sdp/GameCanvas-Unity/pull/208) 角丸長方形の描画関数を追加

diff --git a/Packages/GameCanvas/Editor/GcEditorBuilder.cs b/Packages/GameCanvas/Editor/GcEditorBuilder.cs
@@ -165,8 +165,14 @@ public static void Build(Option option)
                     EditorUserBuildSettings.symlinkLibraries = true;
                     break;
 
+                case GcRuntimePlatform.WebGL:
+                    PlayerSettings.WebGL.compressionFormat = WebGLCompressionFormat.Disabled;
+                    PlayerSettings.SetScriptingBackend(BuildTargetGroup.WebGL, ScriptingImplementation.IL2CPP);
+                    PlayerSettings.SetApiCompatibilityLevel(BuildTargetGroup.WebGL, ApiCompatibilityLevel.NET_Standard_2_0);
+                    break;
+
                 default:
-                    return;
+                    throw new System.NotImplementedException($"[GameCanvas] {option.m_Platform} ターゲットのビルドスクリプトがありません");
             }
 
 

diff --git a/Packages/GameCanvas/package.json b/Packages/GameCanvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jp.ac.keio.sfc.sdp",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "displayName": "GameCanvas",
   "description": "GameCanvas for Unity",
   "unity": "2020.3",
@@ -23,4 +23,4 @@
     "com.unity.modules.unitywebrequesttexture": "1.0.0",
     "com.unity.modules.video": "1.0.0"
   }
-}
+}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -17,7 +17,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 0
+  m_ShowUnitySplashScreen: 1
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1
@@ -44,8 +44,8 @@ PlayerSettings:
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1024
   defaultScreenHeight: 768
-  defaultScreenWidthWeb: 640
-  defaultScreenHeightWeb: 480
+  defaultScreenWidthWeb: 1280
+  defaultScreenHeightWeb: 720
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
@@ -68,6 +68,12 @@ PlayerSettings:
   androidRenderOutsideSafeArea: 1
   androidUseSwappy: 1
   androidBlitType: 0
+  androidResizableWindow: 0
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
   runInBackground: 1
@@ -121,6 +127,7 @@ PlayerSettings:
   vulkanEnableSetSRGBWrite: 0
   vulkanEnablePreTransform: 0
   vulkanEnableLateAcquireNextImage: 0
+  vulkanEnableCommandBufferRecycling: 1
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -149,6 +156,7 @@ PlayerSettings:
     Android: jp.ac.keio.sfc.sdp
     Standalone: jp.ac.keio.sfc.sdp
     Tizen: jp.ac.keio.sfc.sdp
+    WebGL: jp.ac.keio.sfc.sdp
     iPhone: jp.ac.keio.sfc.sdp
     tvOS: jp.ac.keio.sfc.sdp
   buildNumber:
@@ -240,6 +248,7 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 2
+  AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: '{inproject}: '
@@ -256,6 +265,7 @@ PlayerSettings:
     height: 180
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
+  chromeosInputEmulation: 1
   AndroidMinifyWithR8: 0
   AndroidMinifyRelease: 0
   AndroidMinifyDebug: 0
@@ -682,6 +692,7 @@ PlayerSettings:
   cameraUsageDescription: made by GameCanvas
   locationUsageDescription: made by GameCanvas
   microphoneUsageDescription: 
+  bluetoothUsageDescription: 
   switchNMETAOverride: 
   switchNetLibKey: 
   switchSocketMemoryPoolSize: 6144
@@ -707,6 +718,7 @@ PlayerSettings:
   switchTitleNames_12: 
   switchTitleNames_13: 
   switchTitleNames_14: 
+  switchTitleNames_15: 
   switchPublisherNames_0: 
   switchPublisherNames_1: 
   switchPublisherNames_2: 
@@ -722,6 +734,7 @@ PlayerSettings:
   switchPublisherNames_12: 
   switchPublisherNames_13: 
   switchPublisherNames_14: 
+  switchPublisherNames_15: 
   switchIcons_0: {fileID: 0}
   switchIcons_1: {fileID: 0}
   switchIcons_2: {fileID: 0}
@@ -737,6 +750,7 @@ PlayerSettings:
   switchIcons_12: {fileID: 0}
   switchIcons_13: {fileID: 0}
   switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
   switchSmallIcons_0: {fileID: 0}
   switchSmallIcons_1: {fileID: 0}
   switchSmallIcons_2: {fileID: 0}
@@ -752,6 +766,7 @@ PlayerSettings:
   switchSmallIcons_12: {fileID: 0}
   switchSmallIcons_13: {fileID: 0}
   switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
   switchManualHTML: 
   switchAccessibleURLs: 
   switchLegalInformation: 
@@ -815,6 +830,10 @@ PlayerSettings:
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
+  switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
+  switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -885,6 +904,7 @@ PlayerSettings:
   ps4videoRecordingFeaturesUsed: 0
   ps4contentSearchFeaturesUsed: 0
   ps4CompatibilityPS5: 0
+  ps4AllowPS5Detection: 0
   ps4GPU800MHz: 1
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
@@ -901,10 +921,10 @@ PlayerSettings:
   webGLDebugSymbols: 0
   webGLEmscriptenArgs: 
   webGLModulesDirectory: 
-  webGLTemplate: APPLICATION:Default
+  webGLTemplate: APPLICATION:Minimal
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 1
+  webGLCompressionFormat: 2
   webGLWasmArithmeticExceptions: 0
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
@@ -968,6 +988,7 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
+  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: