Merge branch 'main' of https://git.personalnas.com/Misaki/Unity20GameJam

Assets/Gameplay/Scripts/UI/LaunchPanel.cs

@@ -2,6 +2,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using A2W;
 using Cysharp.Threading.Tasks;
+using DG.Tweening;
 
 public class LaunchPanel : UIPanel
 {

Assets/Gameplay/Scripts/UI/LoadingPanel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using Cysharp.Threading.Tasks;
 using A2W;
+using DG.Tweening;
 
 public class LoadingPanel : UIPanel, ITransition
 {
@@ -21,14 +22,13 @@ public class LoadingPanel : UIPanel, ITransition
     {
         isDirty = true;
 
-        //Tween tween = canvasGroup.DOFade(1, 0.2f);
+        Tween tween = canvasGroup.DOFade(1, 0.2f);
+        while (tween != null && tween.active && !tween.IsComplete())
+        {
+            await UniTask.Yield();
+        }
 
-        //while (tween != null && tween.active && !tween.IsComplete())
+        //canvasGroup.alpha = 1;
-        //{
-        //    await UniTask.Yield();
-        //}
-
-        canvasGroup.alpha = 1;
 
         isDirty = false;
 
@@ -39,14 +39,13 @@ public class LoadingPanel : UIPanel, ITransition
     {
         isDirty = true;
 
-        //Tween tween = canvasGroup.DOFade(0, 0.2f);
+        Tween tween = canvasGroup.DOFade(0, 0.2f);
+        while (tween != null && tween.active && !tween.IsComplete())
+        {
+            await UniTask.Yield();
+        }
 
-        //while (tween != null && tween.active && !tween.IsComplete())
+        //canvasGroup.alpha = 0;
-        //{
-        //    await UniTask.Yield();
-        //}
-
-        canvasGroup.alpha = 0;
 
         isDirty = false;
 

Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef

@@ -0,0 +1,3 @@
+{
+	"name": "DOTween.Modules"
+}

Assets/Plugins/Demigiant/DOTween/Modules/DOTween.Modules.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4a52bb1e4dc996b4dab9614342469223
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: