diff --git a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity index 01ab09cb..21414f04 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/WhaleAttackScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7158546f4df118e9c0589a3af4cedf9e4a3b7010ddbac37db3c54bbeb79e8a81 -size 72341 +oid sha256:6a8814b35845dc5a63b68d93dcc9f4ea6939346c1a30ceffc6864f6fcf57d65f +size 73032 diff --git a/Assets/01_Scenes/blackjack.unity b/Assets/01_Scenes/blackjack.unity index 9c6bfe53..5c891a9e 100644 --- a/Assets/01_Scenes/blackjack.unity +++ b/Assets/01_Scenes/blackjack.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d4e5ff2c609175179caeb01ed70e5b29c9388ee442d25129c50beecac2a49b -size 2192004 +oid sha256:ea6a25faf1d8e5cc79b93e6149c401df7334f88022598e40dc05b1be7e3cf667 +size 2199261 diff --git a/Assets/01_Scenes/test/1.unity b/Assets/01_Scenes/test/1.unity deleted file mode 100644 index 8b11eea4..00000000 --- a/Assets/01_Scenes/test/1.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74f09ae142e8dc56f5bd62755719c2ebe3222e5e23f3086ae102b8cfdaaf0c75 -size 15102 diff --git a/Assets/01_Scenes/test/1.unity.meta b/Assets/01_Scenes/test/1.unity.meta deleted file mode 100644 index 93026f83..00000000 --- a/Assets/01_Scenes/test/1.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 35897533394ad724cab0afd3b3bea74b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/01_Scenes/test/2.unity b/Assets/01_Scenes/test/2.unity deleted file mode 100644 index 389ad72c..00000000 --- a/Assets/01_Scenes/test/2.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e4aa94d6409a16b2e25f268399fc6e604fc3cb60681c86328337b2a09d1f7e9 -size 11349 diff --git a/Assets/01_Scenes/test/2.unity.meta b/Assets/01_Scenes/test/2.unity.meta deleted file mode 100644 index baca3eb4..00000000 --- a/Assets/01_Scenes/test/2.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 70194d04fb069be4b84ec6f17a5041cc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/01_Scenes/test/3.unity b/Assets/01_Scenes/test/3.unity deleted file mode 100644 index feb02199..00000000 --- a/Assets/01_Scenes/test/3.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f60e17e2763b9ea264dda40d6a8e00754d1d723276c6f9a06ce131c7391d7b68 -size 11325 diff --git a/Assets/01_Scenes/test/3.unity.meta b/Assets/01_Scenes/test/3.unity.meta deleted file mode 100644 index f7e6ba2b..00000000 --- a/Assets/01_Scenes/test/3.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 44d13b2a5a7bee0409f1a5c7d0486e35 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/01_Scenes/test/4.unity b/Assets/01_Scenes/test/4.unity deleted file mode 100644 index 68009137..00000000 --- a/Assets/01_Scenes/test/4.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31cdb0cb4ae220ad4fec9d7c96c032decfda5d974ce428171c6ef32279e2e4e6 -size 21428 diff --git a/Assets/01_Scenes/test/test.unity b/Assets/01_Scenes/test/test.unity deleted file mode 100644 index 44c4482e..00000000 --- a/Assets/01_Scenes/test/test.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9cfeec8f34f9f3a79f7ecadc4d90a42819a3c4b893d66be3f92263fa0071f9a -size 11386 diff --git a/Assets/01_Scenes/test/test.unity.meta b/Assets/01_Scenes/test/test.unity.meta deleted file mode 100644 index 780016f3..00000000 --- a/Assets/01_Scenes/test/test.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9cb5c840e1b895a4d81a65fe59250140 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/02_Scripts/Blackjack/CardSpawnTest.cs b/Assets/02_Scripts/Blackjack/CardSpawnTest.cs index 137993a9..bbaabee8 100644 --- a/Assets/02_Scripts/Blackjack/CardSpawnTest.cs +++ b/Assets/02_Scripts/Blackjack/CardSpawnTest.cs @@ -405,10 +405,10 @@ void EndRound(int winner, string message) if (dealerWinCount >= targetWinCount) { isMatchOver = true; - ShowResult("Final Result\nDealer Wins!"); - Debug.Log("Final Result: Dealer Wins!"); + ShowResult("Final Result\nDealer Wins!\nTry Again!"); + Debug.Log("Final Result: Dealer Wins! Restarting match."); - StartCoroutine(EndMatchAfterDelay()); + StartCoroutine(RestartMatchAfterLose()); return; } @@ -439,6 +439,31 @@ IEnumerator EndMatchAfterDelay() onMatchEnded?.Invoke(); } + IEnumerator RestartMatchAfterLose() + { + if (isEndingMatch) + { + yield break; + } + + isEndingMatch = true; + + yield return new WaitForSeconds(matchEndDelay); + + playerWinCount = 0; + dealerWinCount = 0; + + isMatchOver = false; + isGameOver = true; + isPlayerTurn = false; + isEndingMatch = false; + + HideAllWinMarks(); + StartRound(); + + Debug.Log("Blackjack restarted after player lost."); + } + void UpdateScoreUI(bool showDealerFullScore) { int playerScore = CalculateScore(playerCards); diff --git a/Assets/02_Scripts/Managers/RoomMoveButton.cs b/Assets/02_Scripts/Managers/RoomMoveButton.cs deleted file mode 100644 index 5d7ad891..00000000 --- a/Assets/02_Scripts/Managers/RoomMoveButton.cs +++ /dev/null @@ -1,18 +0,0 @@ -using UnityEngine; - -public class RoomMoveButton : MonoBehaviour -{ - [Header("이 버튼을 눌렀을 때 이동할 방 번호 입력")] - [SerializeField] private int targetRoomNumber; - - public void OnClickMoveRoom() - { - if (RoomRouteManager.Instance == null) - { - Debug.LogError("RoomRouteManager가 없습니다."); - return; - } - - RoomRouteManager.Instance.MoveToRoom(targetRoomNumber); - } -} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/RoomMoveButton.cs.meta b/Assets/02_Scripts/Managers/RoomMoveButton.cs.meta deleted file mode 100644 index efeacb5b..00000000 --- a/Assets/02_Scripts/Managers/RoomMoveButton.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8eb4311a25437fd468487f681f4662e3 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/RoomRouteDebugTester.cs b/Assets/02_Scripts/Managers/RoomRouteDebugTester.cs deleted file mode 100644 index 81b35c15..00000000 --- a/Assets/02_Scripts/Managers/RoomRouteDebugTester.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.InputSystem; - -public class RoomRouteDebugTester : MonoBehaviour -{ - private List currentChoices = - new List(); - - private void Update() - { - if (RoomRouteManager.Instance == null) - { - return; - } - - if (Keyboard.current == null) - { - return; - } - - // C키: 방문 안 한 방 중 랜덤 후보 뽑기 - if (Keyboard.current.cKey.wasPressedThisFrame) - { - currentChoices = RoomRouteManager.Instance.GetRandomNextRooms(); - - Debug.Log($"현재 선택 가능한 후보 개수: {currentChoices.Count}"); - - for (int i = 0; i < currentChoices.Count; i++) - { - Debug.Log($"{i + 1}번 선택지 → 방 번호: {currentChoices[i].roomNumber}, 씬 이름: {currentChoices[i].sceneName}"); - } - } - - // 1키: 첫 번째 후보 선택 - if (Keyboard.current.digit1Key.wasPressedThisFrame) - { - MoveToChoice(0); - } - - // 2키: 두 번째 후보 선택 - if (Keyboard.current.digit2Key.wasPressedThisFrame) - { - MoveToChoice(1); - } - - // T키: 방문 상태 확인 - if (Keyboard.current.tKey.wasPressedThisFrame) - { - Debug.Log($"방문한 방 개수: {RoomRouteManager.Instance.VisitedRoomCount} / {RoomRouteManager.Instance.TotalRoomCount}"); - Debug.Log($"현재 방 번호: {RoomRouteManager.Instance.CurrentRoomNumber}"); - } - - // X키: 테스트용 방문 기록 초기화 - if (Keyboard.current.xKey.wasPressedThisFrame) - { - Debug.Log("방문 기록 초기화"); - currentChoices.Clear(); - RoomRouteManager.Instance.ResetVisitedRooms(); - } - - // F키: 모든 방 방문 후 마지막 씬 이동 테스트 - if (Keyboard.current.fKey.wasPressedThisFrame) - { - Debug.Log("마지막 씬 이동 테스트"); - RoomRouteManager.Instance.MoveToFinalScene(); - } - } - - private void MoveToChoice(int index) - { - if (currentChoices == null || currentChoices.Count == 0) - { - Debug.LogWarning("먼저 C키를 눌러 랜덤 후보를 뽑아야 합니다."); - return; - } - - if (index < 0 || index >= currentChoices.Count) - { - Debug.LogWarning("해당 번호의 선택지가 없습니다."); - return; - } - - int targetRoomNumber = currentChoices[index].roomNumber; - - Debug.Log($"{index + 1}번 선택지 선택 → 방 {targetRoomNumber} 이동"); - - currentChoices.Clear(); - - RoomRouteManager.Instance.MoveToRoom(targetRoomNumber); - } -} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/RoomRouteDebugTester.cs.meta b/Assets/02_Scripts/Managers/RoomRouteDebugTester.cs.meta deleted file mode 100644 index b225af43..00000000 --- a/Assets/02_Scripts/Managers/RoomRouteDebugTester.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 9e414802b02a03e469c541b086f805bb \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/RoomRouteManager.cs b/Assets/02_Scripts/Managers/RoomRouteManager.cs deleted file mode 100644 index 6a978b31..00000000 --- a/Assets/02_Scripts/Managers/RoomRouteManager.cs +++ /dev/null @@ -1,219 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -public class RoomRouteManager : MonoBehaviour -{ - public static RoomRouteManager Instance; - - [System.Serializable] - public class RoomData - { - [Header("방 번호 입력")] - public int roomNumber; - - [Header("이 방에 해당하는 Scene 이름 입력")] - public string sceneName; - } - - [Header("전체 방 정보 입력")] - [SerializeField] private List rooms = new List(); - - [Header("시작 방 번호 입력")] - [SerializeField] private int startRoomNumber; - - [Header("랜덤 선택지 개수")] - [SerializeField] private int randomChoiceCount = 2; - - [Header("모든 방 방문 후 이동할 마지막 Scene 이름")] - [SerializeField] private string finalSceneName; - - private int _currentRoomNumber; - private readonly HashSet _visitedRooms = new HashSet(); - - public int CurrentRoomNumber => _currentRoomNumber; - public int VisitedRoomCount => _visitedRooms.Count; - public int TotalRoomCount => rooms.Count; - - private void Awake() - { - if (Instance == null) - { - Instance = this; - DontDestroyOnLoad(gameObject); - - _currentRoomNumber = startRoomNumber; - - if (startRoomNumber != 0) - { - _visitedRooms.Add(startRoomNumber); - } - } - else - { - Destroy(gameObject); - } - } - - // 방문하지 않은 방 전체 반환 - public List GetUnvisitedRooms() - { - List result = new List(); - - foreach (RoomData room in rooms) - { - if (!_visitedRooms.Contains(room.roomNumber)) - { - result.Add(room); - } - } - - return result; - } - - // 대화 선택지에 보여줄 랜덤 방 목록 반환 - public List GetRandomNextRooms() - { - List unvisitedRooms = GetUnvisitedRooms(); - List randomRooms = new List(); - - int count = Mathf.Min(randomChoiceCount, unvisitedRooms.Count); - - for (int i = 0; i < count; i++) - { - int randomIndex = Random.Range(0, unvisitedRooms.Count); - - randomRooms.Add(unvisitedRooms[randomIndex]); - unvisitedRooms.RemoveAt(randomIndex); - } - - return randomRooms; - } - - // 버튼이나 대화 선택지에서 호출 - public void MoveToRoom(int roomNumber) - { - if (SceneLoadManager.Instance == null) - { - Debug.LogError("SceneLoadManager가 씬에 없습니다."); - return; - } - - if (SceneLoadManager.Instance.IsChangingScene) - { - Debug.Log("이미 씬 이동 중입니다."); - return; - } - - RoomData targetRoom = GetRoomData(roomNumber); - - if (targetRoom == null) - { - Debug.LogWarning($"방 정보를 찾을 수 없습니다. 방 번호: {roomNumber}"); - return; - } - - if (_visitedRooms.Contains(roomNumber)) - { - Debug.Log($"이미 방문한 방입니다. 방 번호: {roomNumber}"); - return; - } - - if (string.IsNullOrEmpty(targetRoom.sceneName)) - { - Debug.LogWarning($"방 {roomNumber}의 Scene 이름이 비어있습니다."); - return; - } - - _currentRoomNumber = roomNumber; - _visitedRooms.Add(roomNumber); - - SceneLoadManager.Instance.RequestSceneChange(targetRoom.sceneName); - } - - // 랜덤 방 하나로 바로 이동하고 싶을 때 사용 - public void MoveToRandomRoom() - { - List unvisitedRooms = GetUnvisitedRooms(); - - if (unvisitedRooms.Count <= 0) - { - Debug.Log("방문하지 않은 방이 없습니다."); - - if (IsAllRoomsVisited()) - { - MoveToFinalScene(); - } - - return; - } - - int randomIndex = Random.Range(0, unvisitedRooms.Count); - RoomData randomRoom = unvisitedRooms[randomIndex]; - - MoveToRoom(randomRoom.roomNumber); - } - - public bool IsAllRoomsVisited() - { - return rooms.Count > 0 && _visitedRooms.Count >= rooms.Count; - } - - public void MoveToFinalScene() - { - if (!IsAllRoomsVisited()) - { - Debug.Log("아직 모든 방을 방문하지 않았습니다."); - return; - } - - if (SceneLoadManager.Instance == null) - { - Debug.LogError("SceneLoadManager가 씬에 없습니다."); - return; - } - - if (SceneLoadManager.Instance.IsChangingScene) - { - Debug.Log("이미 씬 이동 중입니다."); - return; - } - - if (string.IsNullOrEmpty(finalSceneName)) - { - Debug.LogWarning("마지막 Scene 이름이 비어있습니다."); - return; - } - - SceneLoadManager.Instance.RequestSceneChange(finalSceneName); - } - - public bool IsVisitedRoom(int roomNumber) - { - return _visitedRooms.Contains(roomNumber); - } - - public void ResetVisitedRooms() - { - _visitedRooms.Clear(); - - _currentRoomNumber = startRoomNumber; - - if (startRoomNumber != 0) - { - _visitedRooms.Add(startRoomNumber); - } - } - - private RoomData GetRoomData(int roomNumber) - { - foreach (RoomData room in rooms) - { - if (room.roomNumber == roomNumber) - { - return room; - } - } - - return null; - } -} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/RoomRouteManager.cs.meta b/Assets/02_Scripts/Managers/RoomRouteManager.cs.meta deleted file mode 100644 index 5fb2a0d7..00000000 --- a/Assets/02_Scripts/Managers/RoomRouteManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 0a9c2a7a081e65e43806d1ecb3cca28c \ No newline at end of file diff --git a/Assets/01_Scenes/test.meta b/Assets/02_Scripts/Managers/change room manager.meta similarity index 77% rename from Assets/01_Scenes/test.meta rename to Assets/02_Scripts/Managers/change room manager.meta index e89670f2..6e668d12 100644 --- a/Assets/01_Scenes/test.meta +++ b/Assets/02_Scripts/Managers/change room manager.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c8e12991b4e9da4cae8a152c52eadba +guid: 1583d3297de606648b62dde46dc74678 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/02_Scripts/Managers/change room manager/GateOpenZone.cs b/Assets/02_Scripts/Managers/change room manager/GateOpenZone.cs new file mode 100644 index 00000000..0745de74 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/GateOpenZone.cs @@ -0,0 +1,55 @@ +using UnityEngine; + +public class GateOpenZone : MonoBehaviour +{ + [Header("Ʈ ")] + [SerializeField] private RoomClearGateController roomClearGateController; + + [Header("Player Check")] + [SerializeField] private string playerTag = "Player"; + + private bool used = false; + + private void OnTriggerEnter(Collider other) + { + if (used) + { + return; + } + + if (!IsPlayer(other)) + { + return; + } + + if (roomClearGateController == null) + { + Debug.LogWarning("RoomClearGateController ʾҽϴ."); + return; + } + + if (!roomClearGateController.IsRoomCleared) + { + Debug.Log(" Ŭ Դϴ. Ʈ ʽϴ."); + return; + } + + used = true; + roomClearGateController.OpenClearGate(); + } + + private bool IsPlayer(Collider other) + { + if (other.CompareTag(playerTag)) + { + return true; + } + + if (other.transform.root.CompareTag(playerTag)) + { + return true; + } + + return false; + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/GateOpenZone.cs.meta b/Assets/02_Scripts/Managers/change room manager/GateOpenZone.cs.meta new file mode 100644 index 00000000..16038a4f --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/GateOpenZone.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6986d649e7cfba74881058e544e2f727 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs b/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs new file mode 100644 index 00000000..b268d287 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs @@ -0,0 +1,134 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class RandomSceneRouteManager : MonoBehaviour +{ + public static RandomSceneRouteManager Instance; + + [Header(" ̵ Scene ̸")] + [SerializeField] private string[] roomSceneNames; + + [Header(" 湮 ̵ Scene ̸")] + [SerializeField] private string finalSceneName; + + private readonly HashSet visitedScenes = new HashSet(); + private bool finalSceneUsed = false; + + private void Awake() + { + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); + } + else + { + Destroy(gameObject); + } + } + + public string GetNextSceneName() + { + string currentSceneName = SceneManager.GetActiveScene().name; + + Debug.Log(" ̸: " + currentSceneName); + + if (IsRoomScene(currentSceneName)) + { + visitedScenes.Add(currentSceneName); + } + + List candidates = new List(); + + foreach (string sceneName in roomSceneNames) + { + if (string.IsNullOrWhiteSpace(sceneName)) + { + continue; + } + + string cleanSceneName = sceneName.Trim(); + + if (cleanSceneName == currentSceneName) + { + continue; + } + + if (visitedScenes.Contains(cleanSceneName)) + { + continue; + } + + candidates.Add(cleanSceneName); + } + + if (candidates.Count > 0) + { + int randomIndex = Random.Range(0, candidates.Count); + string selectedSceneName = candidates[randomIndex]; + + visitedScenes.Add(selectedSceneName); + + Debug.Log(" õ : " + selectedSceneName); + return selectedSceneName; + } + + if (!finalSceneUsed && !string.IsNullOrWhiteSpace(finalSceneName)) + { + finalSceneUsed = true; + + string cleanFinalSceneName = finalSceneName.Trim(); + Debug.Log(" 湮 Ϸ. ̵: " + cleanFinalSceneName); + return cleanFinalSceneName; + } + + Debug.LogWarning("̵ ϴ."); + return string.Empty; + } + + private bool IsRoomScene(string sceneName) + { + foreach (string roomSceneName in roomSceneNames) + { + if (string.IsNullOrWhiteSpace(roomSceneName)) + { + continue; + } + + if (roomSceneName.Trim() == sceneName) + { + return true; + } + } + + return false; + } + + public void RequestRandomSceneChange() + { + if (SceneLoadManager.Instance == null) + { + Debug.LogError("SceneLoadManager ϴ."); + return; + } + + string nextSceneName = GetNextSceneName(); + + if (string.IsNullOrEmpty(nextSceneName)) + { + Debug.LogWarning("̵ ̸ ֽϴ."); + return; + } + + Debug.Log(" ̵ û: " + nextSceneName); + SceneLoadManager.Instance.RequestSceneChange(nextSceneName); + } + + public void ResetRoute() + { + visitedScenes.Clear(); + finalSceneUsed = false; + Debug.Log(" 湮 ʱȭ"); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs.meta b/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs.meta new file mode 100644 index 00000000..2fa8fb4e --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/RandomSceneRouteManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a3fdc82688b5a7144956b337157facc9 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/RoomClearGateController.cs b/Assets/02_Scripts/Managers/change room manager/RoomClearGateController.cs new file mode 100644 index 00000000..408f7d93 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/RoomClearGateController.cs @@ -0,0 +1,53 @@ +using UnityEngine; + +public class RoomClearGateController : MonoBehaviour +{ + [Header(" Ŭ Ʈ")] + [SerializeField] private RoomExitGate exitGate; + + private bool isRoomCleared = false; + private bool gateOpened = false; + + public bool IsRoomCleared => isRoomCleared; + + // ¸ ȣ + // Լ Ʈ ٷ ʰ, " Ŭ Ϸ" ¸ + public void MarkRoomCleared() + { + isRoomCleared = true; + Debug.Log(" Ŭ Ϸ.  Ʈ ϴ."); + } + + //  ȣ + public void OpenClearGate() + { + if (!isRoomCleared) + { + Debug.Log(" Ŭ ̶ Ʈ ϴ."); + return; + } + + if (gateOpened) + { + return; + } + + gateOpened = true; + + if (exitGate != null) + { + exitGate.OpenGate(); + Debug.Log(" Ŭ Ʈ "); + } + else + { + Debug.LogWarning("Exit Gate ʾҽϴ."); + } + } + + public void ResetClearState() + { + isRoomCleared = false; + gateOpened = false; + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/RoomClearGateController.cs.meta b/Assets/02_Scripts/Managers/change room manager/RoomClearGateController.cs.meta new file mode 100644 index 00000000..e9ccf888 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/RoomClearGateController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 125cade625c9b644b842b1a4f20527e4 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/RoomExitGate.cs b/Assets/02_Scripts/Managers/change room manager/RoomExitGate.cs new file mode 100644 index 00000000..8267e72b --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/RoomExitGate.cs @@ -0,0 +1,326 @@ +using System.Collections; +using UnityEngine; + +public class RoomExitGate : MonoBehaviour +{ + [Header("Gate Root")] + [SerializeField] private GameObject gateVisualRoot; + + [Header("Door")] + [SerializeField] private Transform leftDoor; + [SerializeField] private Transform rightDoor; + + [Header("Door Open Angle")] + [SerializeField] private float leftOpenAngleY = 110f; + [SerializeField] private float rightOpenAngleY = -110f; + + [Header("Portal")] + [SerializeField] private GameObject portalEffectRoot; + [SerializeField] private ParticleSystem[] portalParticles; + + [Header("Open Effect")] + [SerializeField] private ParticleSystem openParticle; + [SerializeField] private AudioSource openSound; + + [Header("Trigger")] + [SerializeField] private Collider gateTrigger; + + [Header("Timing")] + [SerializeField] private float openDelay = 1.2f; + [SerializeField] private float openDuration = 1.2f; + [SerializeField] private float portalShowDelay = 0.3f; + + [Header("Player Check")] + [SerializeField] private string playerTag = "Player"; + + [Header("Scene Move")] + [SerializeField] private bool useRandomScene = true; + [SerializeField] private string fallbackSceneName; + [SerializeField] private float sceneMoveDelay = 0.2f; + + [Header("Start Setting")] + [SerializeField] private bool hideGateOnStart = true; + [SerializeField] private bool hidePortalOnStart = true; + + private Quaternion leftClosedRotation; + private Quaternion rightClosedRotation; + private Quaternion leftOpenRotation; + private Quaternion rightOpenRotation; + + private bool isOpened = false; + private bool isOpening = false; + private bool isEntering = false; + + private void Awake() + { + CacheDoorRotations(); + AutoFindPortalParticles(); + PrepareTrigger(); + PrepareStartState(); + } + + private void CacheDoorRotations() + { + if (leftDoor != null) + { + leftClosedRotation = leftDoor.localRotation; + leftOpenRotation = leftClosedRotation * Quaternion.Euler(0f, leftOpenAngleY, 0f); + } + + if (rightDoor != null) + { + rightClosedRotation = rightDoor.localRotation; + rightOpenRotation = rightClosedRotation * Quaternion.Euler(0f, rightOpenAngleY, 0f); + } + } + + private void AutoFindPortalParticles() + { + if ((portalParticles == null || portalParticles.Length == 0) && portalEffectRoot != null) + { + portalParticles = portalEffectRoot.GetComponentsInChildren(true); + } + } + + private void PrepareTrigger() + { + if (gateTrigger != null) + { + gateTrigger.enabled = false; + gateTrigger.isTrigger = true; + } + + Rigidbody rb = GetComponent(); + + if (rb == null) + { + rb = gameObject.AddComponent(); + } + + rb.isKinematic = true; + rb.useGravity = false; + } + + private void PrepareStartState() + { + if (hideGateOnStart && gateVisualRoot != null) + { + gateVisualRoot.SetActive(false); + } + + if (hidePortalOnStart && portalEffectRoot != null) + { + portalEffectRoot.SetActive(false); + } + } + + public void OpenGate() + { + if (isOpened || isOpening) + { + return; + } + + StartCoroutine(OpenGateRoutine()); + } + + private IEnumerator OpenGateRoutine() + { + isOpening = true; + + if (openParticle != null) + { + openParticle.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); + openParticle.Play(); + } + + if (openSound != null) + { + openSound.Play(); + } + + yield return new WaitForSeconds(openDelay); + + if (gateVisualRoot != null) + { + gateVisualRoot.SetActive(true); + } + + float timer = 0f; + bool portalShown = false; + + while (timer < openDuration) + { + timer += Time.deltaTime; + + float t = Mathf.Clamp01(timer / openDuration); + t = Mathf.SmoothStep(0f, 1f, t); + + if (leftDoor != null) + { + leftDoor.localRotation = Quaternion.Slerp(leftClosedRotation, leftOpenRotation, t); + } + + if (rightDoor != null) + { + rightDoor.localRotation = Quaternion.Slerp(rightClosedRotation, rightOpenRotation, t); + } + + if (!portalShown && timer >= portalShowDelay) + { + ShowPortal(); + portalShown = true; + } + + yield return null; + } + + if (leftDoor != null) + { + leftDoor.localRotation = leftOpenRotation; + } + + if (rightDoor != null) + { + rightDoor.localRotation = rightOpenRotation; + } + + ShowPortal(); + + if (gateTrigger != null) + { + gateTrigger.enabled = true; + } + + isOpened = true; + isOpening = false; + + Debug.Log("Ʈ Ϸ"); + } + + private void ShowPortal() + { + if (portalEffectRoot != null && !portalEffectRoot.activeSelf) + { + portalEffectRoot.SetActive(true); + } + + if (portalParticles == null) + { + return; + } + + foreach (ParticleSystem particle in portalParticles) + { + if (particle != null && !particle.isPlaying) + { + particle.Play(); + } + } + } + + private void OnTriggerEnter(Collider other) + { + if (!isOpened || isEntering) + { + return; + } + + if (!IsPlayer(other)) + { + return; + } + + StartCoroutine(EnterGateRoutine()); + } + + private bool IsPlayer(Collider other) + { + if (other.CompareTag(playerTag)) + { + return true; + } + + if (other.transform.root.CompareTag(playerTag)) + { + return true; + } + + return false; + } + + private IEnumerator EnterGateRoutine() + { + isEntering = true; + + yield return new WaitForSeconds(sceneMoveDelay); + + string nextSceneName = GetNextSceneName(); + + if (string.IsNullOrEmpty(nextSceneName)) + { + Debug.LogWarning(" ̸ ֽϴ."); + isEntering = false; + yield break; + } + + if (SceneLoadManager.Instance == null) + { + Debug.LogError("SceneLoadManager ϴ."); + isEntering = false; + yield break; + } + + Debug.Log("Ʈ , ̵ : " + nextSceneName); + SceneLoadManager.Instance.RequestSceneChange(nextSceneName); + } + + private string GetNextSceneName() + { + if (useRandomScene && RandomSceneRouteManager.Instance != null) + { + return RandomSceneRouteManager.Instance.GetNextSceneName(); + } + + return fallbackSceneName; + } + + public void CloseGateImmediately() + { + StopAllCoroutines(); + + isOpened = false; + isOpening = false; + isEntering = false; + + if (leftDoor != null) + { + leftDoor.localRotation = leftClosedRotation; + } + + if (rightDoor != null) + { + rightDoor.localRotation = rightClosedRotation; + } + + if (portalEffectRoot != null) + { + portalEffectRoot.SetActive(false); + } + + if (gateTrigger != null) + { + gateTrigger.enabled = false; + } + + if (openParticle != null) + { + openParticle.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); + } + + if (hideGateOnStart && gateVisualRoot != null) + { + gateVisualRoot.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/RoomExitGate.cs.meta b/Assets/02_Scripts/Managers/change room manager/RoomExitGate.cs.meta new file mode 100644 index 00000000..e6759b87 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/RoomExitGate.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 317d18e41b8485446ac641a9e1cd4ce2 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/change room manager/SceneLoadManager.cs similarity index 100% rename from Assets/02_Scripts/Managers/SceneLoadManager.cs rename to Assets/02_Scripts/Managers/change room manager/SceneLoadManager.cs diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs.meta b/Assets/02_Scripts/Managers/change room manager/SceneLoadManager.cs.meta similarity index 100% rename from Assets/02_Scripts/Managers/SceneLoadManager.cs.meta rename to Assets/02_Scripts/Managers/change room manager/SceneLoadManager.cs.meta diff --git a/Assets/04_Models/Objects/ExitGatePrefab.prefab b/Assets/04_Models/Objects/ExitGatePrefab.prefab new file mode 100644 index 00000000..375db112 --- /dev/null +++ b/Assets/04_Models/Objects/ExitGatePrefab.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa06bb98051b97cec4ce10bfd78db80ae6ab4d11f60b7990346ef402c1648a72 +size 28354 diff --git a/Assets/01_Scenes/test/4.unity.meta b/Assets/04_Models/Objects/ExitGatePrefab.prefab.meta similarity index 63% rename from Assets/01_Scenes/test/4.unity.meta rename to Assets/04_Models/Objects/ExitGatePrefab.prefab.meta index 00f9fcb5..61cb06e7 100644 --- a/Assets/01_Scenes/test/4.unity.meta +++ b/Assets/04_Models/Objects/ExitGatePrefab.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: fda7347beb006a24fafc02220fe9d5f5 -DefaultImporter: +guid: 2db9810c93356ab4ea45fcbefaf101d8 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/11_Audio/Source/BGM/포탈 생성.mp3 b/Assets/11_Audio/Source/BGM/포탈 생성.mp3 new file mode 100644 index 00000000..f93a6100 --- /dev/null +++ b/Assets/11_Audio/Source/BGM/포탈 생성.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa4ed744c0b3a222f4b0b60ebe5c4b1800be11e2dfa56cba640b2cfbc1b5aedc +size 381178 diff --git a/Assets/11_Audio/Source/BGM/포탈 생성.mp3.meta b/Assets/11_Audio/Source/BGM/포탈 생성.mp3.meta new file mode 100644 index 00000000..83edd093 --- /dev/null +++ b/Assets/11_Audio/Source/BGM/포탈 생성.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 05a0a2d8275285146bfebf0056e9f6e9 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CartoonVFX9X/PortalGateVFX/Material/Shader Graphs_Energy2.mat b/Assets/CartoonVFX9X/PortalGateVFX/Material/Shader Graphs_Energy2.mat index e9083ea9..8592c64a 100644 --- a/Assets/CartoonVFX9X/PortalGateVFX/Material/Shader Graphs_Energy2.mat +++ b/Assets/CartoonVFX9X/PortalGateVFX/Material/Shader Graphs_Energy2.mat @@ -58,8 +58,8 @@ Material: - Vector1_367d1f6935384c0c9e909d05201f89ef: 2 - Vector1_660f5c9cd5c74b639e8661869bac5348: -13.64 - Vector1_9f3c88a22c3e496a993e7ced8437c0ab: 0.617 - - Vector1_aa21db59e9434d02b4046419b4dde1a2: 1 - - Vector1_b59379f19e4048d1bcdbab0657a81408: 1.59 + - Vector1_aa21db59e9434d02b4046419b4dde1a2: 0.772 + - Vector1_b59379f19e4048d1bcdbab0657a81408: 1.25 - Vector1_c092ccbd60ff4cce9e5cd450da31036b: -0.14 - Vector1_edc8574cad634c8dbb1012d65d87bb7b: 5 - _QueueControl: 0 diff --git a/Assets/CartoonVFX9X/PortalGateVFX/Prefabs/Portal_Gate_11.prefab b/Assets/CartoonVFX9X/PortalGateVFX/Prefabs/Portal_Gate_11.prefab index ee09266e..3d706a1c 100644 --- a/Assets/CartoonVFX9X/PortalGateVFX/Prefabs/Portal_Gate_11.prefab +++ b/Assets/CartoonVFX9X/PortalGateVFX/Prefabs/Portal_Gate_11.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b34fe97ee0bcfb933a3dc546b1dec074f5e50c8dcdab4903bc8a51e25d3bac5a -size 354953 +oid sha256:a49ee3ced0c06a04175acac22b866ac2c3743a7df45d7c5e426b89f934af32a9 +size 357436 diff --git a/Assets/Piloto Studio/Materials/Blood/BloodRibbon.mat b/Assets/Piloto Studio/Materials/Blood/BloodRibbon.mat index 0e060270..3ed3463e 100644 --- a/Assets/Piloto Studio/Materials/Blood/BloodRibbon.mat +++ b/Assets/Piloto Studio/Materials/Blood/BloodRibbon.mat @@ -40,6 +40,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +115,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -125,7 +128,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -133,7 +136,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0 - _SourceBlendRGB: 10 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Others/ModelGrads.mat b/Assets/Piloto Studio/Materials/Others/ModelGrads.mat index 9d382c6d..966e1048 100644 --- a/Assets/Piloto Studio/Materials/Others/ModelGrads.mat +++ b/Assets/Piloto Studio/Materials/Others/ModelGrads.mat @@ -32,11 +32,13 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: MotionVector: User + RenderType: Opaque disabledShaderPasses: - TransparentBackface - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -110,6 +112,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -122,7 +125,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -131,6 +134,7 @@ Material: - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 10 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare 1.mat b/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare 1.mat index 76ee1316..b3490e99 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare 1.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare 1.mat @@ -55,6 +55,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -239,6 +241,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -280,7 +283,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -296,7 +299,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare.mat b/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare.mat index dfe9f107..020f51ad 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/FullRainbowFlare.mat @@ -56,6 +56,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -240,6 +242,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -281,7 +284,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -297,7 +300,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/ImpactLightrays_Blurry 1.mat b/Assets/Piloto Studio/Materials/Rainbow/ImpactLightrays_Blurry 1.mat index 6604063f..fcf7adbd 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/ImpactLightrays_Blurry 1.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/ImpactLightrays_Blurry 1.mat @@ -41,6 +41,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -114,6 +116,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -126,7 +129,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 0 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -134,7 +137,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.45 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/Rainbow360.mat b/Assets/Piloto Studio/Materials/Rainbow/Rainbow360.mat index f962a789..dc9a4e64 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/Rainbow360.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/Rainbow360.mat @@ -43,6 +43,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -116,6 +118,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -128,7 +131,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -136,7 +139,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam.mat b/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam.mat index 00ea9749..3417ffcd 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam.mat @@ -69,6 +69,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -142,6 +144,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -154,7 +157,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -162,7 +165,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam_NoGaps.mat b/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam_NoGaps.mat index cff78140..7525c15b 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam_NoGaps.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/RainbowBeam_lootbeam_NoGaps.mat @@ -44,6 +44,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -117,6 +119,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -129,7 +132,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -137,7 +140,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 10 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/RainbowSided.mat b/Assets/Piloto Studio/Materials/Rainbow/RainbowSided.mat index 1caf085c..65a4e831 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/RainbowSided.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/RainbowSided.mat @@ -55,6 +55,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -128,6 +130,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -140,7 +143,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -148,7 +151,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/RainbowSided_Soft.mat b/Assets/Piloto Studio/Materials/Rainbow/RainbowSided_Soft.mat index a6f05067..c64c436f 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/RainbowSided_Soft.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/RainbowSided_Soft.mat @@ -57,6 +57,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -130,6 +132,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -142,7 +145,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -150,7 +153,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Rainbow/Smoke_Harsh_Alpha_Rainbow_Soft.mat b/Assets/Piloto Studio/Materials/Rainbow/Smoke_Harsh_Alpha_Rainbow_Soft.mat index d269bdc0..41b8a9dd 100644 --- a/Assets/Piloto Studio/Materials/Rainbow/Smoke_Harsh_Alpha_Rainbow_Soft.mat +++ b/Assets/Piloto Studio/Materials/Rainbow/Smoke_Harsh_Alpha_Rainbow_Soft.mat @@ -40,6 +40,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +115,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -125,7 +128,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 0 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -133,7 +136,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 1 - _SourceBlendRGB: 10 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/Circle_Generic_Hollow.mat b/Assets/Piloto Studio/Materials/Shared/Circle_Generic_Hollow.mat index d27768e9..0f61edc6 100644 --- a/Assets/Piloto Studio/Materials/Shared/Circle_Generic_Hollow.mat +++ b/Assets/Piloto Studio/Materials/Shared/Circle_Generic_Hollow.mat @@ -40,6 +40,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +115,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -125,7 +128,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -133,7 +136,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/Flare4_Additive.mat b/Assets/Piloto Studio/Materials/Shared/Flare4_Additive.mat index 3e602da8..e86847fb 100644 --- a/Assets/Piloto Studio/Materials/Shared/Flare4_Additive.mat +++ b/Assets/Piloto Studio/Materials/Shared/Flare4_Additive.mat @@ -70,6 +70,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -254,6 +256,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -295,7 +298,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -311,7 +314,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/Flare_Glowdot.mat b/Assets/Piloto Studio/Materials/Shared/Flare_Glowdot.mat index cc75c10d..26cc3b66 100644 --- a/Assets/Piloto Studio/Materials/Shared/Flare_Glowdot.mat +++ b/Assets/Piloto Studio/Materials/Shared/Flare_Glowdot.mat @@ -27,6 +27,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -108,6 +110,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -120,7 +123,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceiveShadows: 1 - _ReceivesSSR: 0 @@ -129,7 +132,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/Flare_SoftCross_Soft.mat b/Assets/Piloto Studio/Materials/Shared/Flare_SoftCross_Soft.mat index 6b17d655..a0d378dd 100644 --- a/Assets/Piloto Studio/Materials/Shared/Flare_SoftCross_Soft.mat +++ b/Assets/Piloto Studio/Materials/Shared/Flare_SoftCross_Soft.mat @@ -44,6 +44,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -117,6 +119,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -129,7 +132,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -137,7 +140,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/SilkyPanningNoise_Inverted_Distorted.mat b/Assets/Piloto Studio/Materials/Shared/SilkyPanningNoise_Inverted_Distorted.mat index 4e797715..7b1d00a2 100644 --- a/Assets/Piloto Studio/Materials/Shared/SilkyPanningNoise_Inverted_Distorted.mat +++ b/Assets/Piloto Studio/Materials/Shared/SilkyPanningNoise_Inverted_Distorted.mat @@ -70,6 +70,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -254,6 +256,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -296,7 +299,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -312,7 +315,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/Speckle_Cluster.mat b/Assets/Piloto Studio/Materials/Shared/Speckle_Cluster.mat index eb3da311..02df6cd8 100644 --- a/Assets/Piloto Studio/Materials/Shared/Speckle_Cluster.mat +++ b/Assets/Piloto Studio/Materials/Shared/Speckle_Cluster.mat @@ -68,6 +68,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -141,6 +143,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -153,7 +156,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -161,7 +164,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Shared/White_AlphaDouble_10xBright.mat b/Assets/Piloto Studio/Materials/Shared/White_AlphaDouble_10xBright.mat index 66439076..7d86af31 100644 --- a/Assets/Piloto Studio/Materials/Shared/White_AlphaDouble_10xBright.mat +++ b/Assets/Piloto Studio/Materials/Shared/White_AlphaDouble_10xBright.mat @@ -40,6 +40,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +115,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 0 - _EnableFogOnTransparent: 0 - _ExcludeFromTUAndAA: 0 @@ -125,7 +128,7 @@ Material: - _MiddlePointPos1: 0.5 - _MultiplyNoiseDesaturation: 1 - _OpaqueCullMode: 2 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -133,7 +136,8 @@ Material: - _RequireSplitLighting: 0 - _SoftFadeFactor: 0.1 - _SourceBlendRGB: 10 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaBlend.mat b/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaBlend.mat index e9517b3d..169add0e 100644 --- a/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaBlend.mat +++ b/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaBlend.mat @@ -69,6 +69,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -253,6 +255,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -295,7 +298,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -311,7 +314,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaClipped.mat b/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaClipped.mat index 29bfa30c..f52f118e 100644 --- a/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaClipped.mat +++ b/Assets/Piloto Studio/Materials/Trails/Spark1_AlphaClipped.mat @@ -69,6 +69,8 @@ Material: - MOTIONVECTORS - TransparentDepthPrepass - TransparentDepthPostpass + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -253,6 +255,7 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -295,7 +298,7 @@ Material: - _PPDMinSamples: 5 - _PPDPrimitiveLength: 1 - _PPDPrimitiveWidth: 1 - - _QueueControl: -1 + - _QueueControl: 1 - _QueueOffset: 0 - _ReceivesSSR: 0 - _ReceivesSSRTransparent: 0 @@ -311,7 +314,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Stylized Door/Scene.unity b/Assets/Stylized Door/Scene.unity index aa0af5eb..08babff0 100644 --- a/Assets/Stylized Door/Scene.unity +++ b/Assets/Stylized Door/Scene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f35ef5328a03ddae01dfda7cb88b9539548ec0cd38668abe539ddcd8372b2bd2 -size 12542 +oid sha256:cd2d5e391b300d3f3f62e9fe8d6c7409de88f222073b16a9c80375219c56892e +size 12659 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 88c35099..22d18211 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47a3c7fbb626ac30ca03fb77b586d372e8f10a277eb8db5b8d15b2a68b951db3 -size 1546 +oid sha256:c97619610ec8363e88d2adbf7ba17f88b6e72ffa0f5e61abf2a72b5795c0bfd7 +size 1278