Merge remote-tracking branch 'upstream/master'

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: ca8b8e6916019834fb0ec5578fa0be37
   m_currentHash:
     serializedVersion: 2
-    Hash: 7ae1e00c82a3ef67da50633ae09c274f
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0
@@ -56,7 +56,7 @@ MonoBehaviour:
   m_ContentStateBuildPathProfileVariableName: <default settings path>
   m_CustomContentStateBuildPath: 
   m_ContentStateBuildPath: 
-  m_BuildAddressablesWithPlayerBuild: 2
+  m_BuildAddressablesWithPlayerBuild: 1
   m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
   m_GroupAssets:
   - {fileID: 11400000, guid: 00d23bf82261d794b8ad80777f3da3ae, type: 2}

Assets/Scripts/MDPro3/Program.cs

@@ -344,7 +344,6 @@ namespace MDPro3
 
         private async UniTask UnloadUnusedAssetsAsync()
         {
-            ABLoader.ClearTemp();
             await Resources.UnloadUnusedAssets();
         }
 

Assets/Scripts/MDPro3/Servant/CutinViewer.cs

@@ -37,7 +37,6 @@ namespace MDPro3.Servant
         private CancellationTokenSource cts;
 
         #region Servant
-
         public override int Depth => 1;
         protected override bool ShowLine => false;
 
@@ -65,7 +64,7 @@ namespace MDPro3.Servant
 
         protected override void AfterHidingEvent()
         {
-            Resources.UnloadUnusedAssets();
+            Program.instance.UnloadUnusedAssets();
         }
 
         public override void PerFrameFunction()
@@ -230,7 +229,7 @@ namespace MDPro3.Servant
             bool diy = false;
             if (codes.Contains(code))
                 //cutin = await ABLoader.LoadFromFolderAsync<PlayableDirector>("MonsterCutin/" + code, false, true);
-                cutin = await ABLoader.LoadMonsterCutinAsync(code);
+                cutin = await ABLoader.LoadMonsterCutinAsync(code, false);
             else
             {
                 cutin = await ABLoader.LoadFromFileAsync("MonsterCutin2/" + code, false, true);

ProjectSettings/ProjectSettings.asset

@@ -982,7 +982,14 @@ PlayerSettings:
   windowsGamepadBackendHint: 0
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0
-  qualitySettingsNames: []
+  qualitySettingsNames:
+  - Very Low
+  - Low
+  - Medium
+  - High
+  - Very High
+  - Ultra
+  - UI
   projectName: 
   organizationId: 
   cloudEnabled: 0

ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 5
+  m_CurrentQuality: 0
   m_QualitySettings:
   - serializedVersion: 4
     name: Very Low
@@ -371,7 +371,4 @@ QualitySettings:
     terrainMaxTrees: 50
     excludedTargetPlatforms: []
   m_TextureMipmapLimitGroupNames: []
-  m_PerPlatformDefaultQuality:
-    Android: 0
-    Standalone: 0
-    iPhone: 0
+  m_PerPlatformDefaultQuality: {}

README.md

@@ -6,7 +6,7 @@ Unity version: 6000.0.10f1
 
 ### Other required folders
 
-* Platforms: https://code.mycard.moe/sherry\_chaos/mdpro3-assetbundles
+* Platforms: https://code.mycard.moe/sherry_chaos/mdpro3-assetbundles
 * Picture/Art: https://code.mycard.moe/mycard/hd-arts
 * Picture/Closeup: https://code.mycard.moe/mycard/ygopro2-closeup
 * Picture/DIY: You can find it from the released MDPro3