ソースを参照

Modified the curve

Nathan Gusatto 3 日 前
コミット
c2aa017e21

ファイルの差分が大きいため隠しています
+ 178 - 31
Assets/Scenes/Game.unity


+ 82 - 6
Assets/Scenes/Menu.unity

@@ -507,6 +507,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1911888184}
   - {fileID: 954010969}
   - {fileID: 831581255}
   - {fileID: 721468047}
@@ -1936,7 +1937,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: PlanetRain Valley
+  m_text: Valley Runner
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -1945,8 +1946,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1969,9 +1970,9 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_characterHorizontalScale: 1
@@ -2967,6 +2968,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1872546591}
   m_CullTransparentMesh: 1
+--- !u!1 &1911888183
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1911888184}
+  - component: {fileID: 1911888186}
+  - component: {fileID: 1911888185}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1911888184
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1911888183}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 371659784}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1911888185
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1911888183}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.10208259, g: 0.5849056, b: 0.26791164, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1911888186
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1911888183}
+  m_CullTransparentMesh: 1
 --- !u!1 &1996448973
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/Daylight Cycle/Skybox.mat

@@ -33,7 +33,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Blend: 0.33253524
+    - _Blend: 0.44960117
     - _Exposure1: 1
     - _Exposure2: 1
     - _ImageType: 0

+ 16 - 2
Assets/Scripts/GameManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using TMPro;
 using UnityEditor;
 using UnityEngine;
@@ -18,10 +19,12 @@ public class GameManager : MonoBehaviour
     private TimeManager timeManager;
     private MapGenerator mapGenerator;
     private OrbManager orbManager;
-    public TMP_Text UI;
+    public TMP_Text scoreText;
+    public Canvas loadingScreen;
 
     private GameObject player;
     private int score;
+    private float tempGameSpeed;
     // Start is called once before the first execution of Update after the MonoBehaviour is created
     void Start()
     {
@@ -37,6 +40,10 @@ public class GameManager : MonoBehaviour
         orbManager = GetComponent<OrbManager>();
 
         data = saveManager.LoadGame();
+        
+        tempGameSpeed = timeManager.gameSpeed;
+        timeManager.gameSpeed = 0;
+        StartCoroutine(DisableLoadingScreen());
 
         if (data.Orbs.Length == 0)
         {
@@ -157,6 +164,13 @@ public class GameManager : MonoBehaviour
 
     }
 
+    IEnumerator DisableLoadingScreen()
+    {
+        yield return new WaitForSeconds(5);
+        loadingScreen.enabled = false;
+        timeManager.gameSpeed = tempGameSpeed;
+    }
+
     IEnumerator SpawnPlayer()
     {
         yield return new WaitForSeconds(3);
@@ -205,7 +219,7 @@ public class GameManager : MonoBehaviour
 
     private void UpdateUI()
     {
-        UI.text = score.ToString();
+        scoreText.text = score.ToString();
     }
 
     private void OnGameOver()

+ 0 - 3
Assets/Scripts/Menus/Menu.cs

@@ -1,9 +1,6 @@
 using TMPro;
-using UnityEditor.UI;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-using UnityEngine.UIElements;
 using Button = UnityEngine.UI.Button;
 
 public class Menu : MonoBehaviour

+ 13 - 4
Assets/TerrainAssets/DefaultTerrain.asset

@@ -39,14 +39,23 @@ MonoBehaviour:
       inWeight: 0.33333334
       outWeight: 0.18444628
     - serializedVersion: 3
-      time: 0.7825925
+      time: 0.63088995
+      value: 0.1875116
+      inSlope: 0.7309856
+      outSlope: 0.7309856
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.31126678
+    - serializedVersion: 3
+      time: 0.8194786
       value: 0.45571017
-      inSlope: 1.5272214
-      outSlope: 1.5272214
+      inSlope: 2.1185122
+      outSlope: 2.1185122
       tangentMode: 0
       weightedMode: 0
       inWeight: 0.12623401
-      outWeight: 0.18317983
+      outWeight: 0.2584503
     - serializedVersion: 3
       time: 1.0000234
       value: 1.0039519

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません