From 64c84ac6857cefc7cf49956e398d03b8c6fd6ae8 Mon Sep 17 00:00:00 2001 From: SoulliesOfficial Date: Sat, 6 Sep 2025 21:58:48 -0400 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../000_assets/material/M_SquareFrame 1.mat | 4 +- .../Chapter 0 Tutorial/Easy/Beatmap.bytes | Bin 5968 -> 8896 bytes .../Easy/CommandScripts.bytes | Bin 192 -> 192 bytes .../Chapter 0 Tutorial/Easy/ProjectInfo.bytes | Bin 304 -> 336 bytes .../Chapter 0 Tutorial/Easy/SongInfo.bytes | Bin 256 -> 224 bytes Assets/Scenes/GameScene.unity | 138 -------------- Assets/Scenes/MenuScene.unity | 11 +- .../TimeDurationSubmodule.cs | 2 +- .../GameElements/Notes/NoteObjects/Flick.cs | 44 ++++- Assets/Scripts/Manager/GameInputManager.cs | 14 +- Assets/Scripts/Manager/GameManager.cs | 2 +- Assets/Scripts/Manager/NoteJudgeManager.cs | 109 +++++------ Assets/Scripts/Menu/InformationTransistor.cs | 2 + Assets/Scripts/Menu/MenuManager.cs | 16 +- .../Story/StoryUI/Blocks/TutorialBlockUI.cs | 7 +- Assets/Scripts/UI/SongSelection/PlaySongUI.cs | 2 +- .../UI/SongSelection/SongSelectionTab.cs | 2 +- Assets/Settings/URP-HighFidelity.asset | 8 +- .../Scripts/NoteVisual/DTMNoteVisual.cs | 5 + UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2022.dwlt | 171 +++++++----------- 21 files changed, 206 insertions(+), 335 deletions(-) diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index cda12869..4a755aa7 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.49106154 + - _EdgeValue: 0.9525006 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.50893843 + - _Opacity: 0.04749942 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/Beatmap.bytes index a66cd702dd8133f5bc862f9d3552dba2bae3aef9..8b7f4420c2653642cab95efa828e418dd96978b7 100644 GIT binary patch literal 8896 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 diff --git a/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Chapter 0 Tutorial/Easy/CommandScripts.bytes index d2f59cf95d1dc6838d0409bf8d7c6b7f15905409..558e43f70ab78412c62ccc0b6ec02cbfdfac3e62 100644 GIT binary patch literal 192 zcmV;x06+iYxL8ct>xAI>cMz*KZobP=>rZ_HofuN#gcRb?AI}3sXh-OI<>45Dp?t(Q}MP&YAg= z%Zcb1#Z;i6ax0F%wi%3EV|cLs%pZ%u20@1T)J}$NwH73Rc`PT8sm)&M z#EJ=ea}$OHh>`#!aC%uR(KKQgP)+i}5v|69_PP~?(dEOvdXkv0|5If+U^}=EwBmYY zbxc=ErFS0^TP7913UZpp1;Yz9wzFBi{x+mr^T;~XF2n>$VHuXxo}^+wKRh^Du+Q}- u*sK zG9wtzw*JapPe@WqOTpb8|L3_!n!J!{I*b>6$orU!$akL!p+(Ar10x}w)K(!y7Qtr= zJ8BpzMpOue_<}*^gjujP@^x&$O%vS;2tee+i?frNCyzbxA%DazK`gGj@~B(80@f%S zOA0xdkU@;8P5xix00*zt-O!f*0KL%_IBaX(Po-_l@|+J4xetk@;t3KBfN`f`uK+12 ikS3x9*H$l-MyeFjVA4;A#G8zc(G0gw#+b0Nw}HW4Wu?Xd literal 304 zcmV-00nh%5o#rG<`6j01IFKX1lrxmyq=2-9Rhk$wkv}d~p}OQC)`cd53bhgdZeb1F zs7iiGBCCj?XmFyKU;a*yge8P4rk z-h%Z@ekI4fZGi)F7MH=Jx0Zu<^dJz;aZnM&PF<*al*8Zkt>zit4uhb`L$K)%R4>e5)>ZjNX(iM>Zm zxE2C=BeL#|t0!K`SIr!zgIcAW^W=e6yLmUGYenDkAYU~Iytp9s zBsCjtm3O;SMhk7f9sO>nIIaF&6TFt7BAe7HK$EVTbr53Z zFwg_V>VVC$t@f$S(nnzy^(=U1C3to!ighfuBY^`QT<^sfqS)W?@60-393Xef5FIGlz%6R2L aN2YOxTNO>Tv8sDs;wRcn5?Z?)yRuXEL@W@4=pS z`e0;XvG#ak^KkusoqNdmbM(6{egSfEkf+@?(l~aW43#|O^+goppH() { Vector2.left, Vector2.right }; + //flick.availableFlickDirections = new List() { Vector2.left, Vector2.right }; flick.judgeIntervals = new NoteJudgeIntervals( new TimeInterval(-0.15f, -0.15f), new TimeInterval(-0.15f, -0.15f), new TimeInterval(-0.15f, -0.15f), new TimeInterval(-0.15f, 0.15f), @@ -85,11 +85,7 @@ namespace Ichni.RhythmGame float timeDifference = triggerTime - exactJudgeTime; NoteJudgeType startJudgeType = GetStartJudgeType(timeDifference); - - if (startJudgeType != NoteJudgeType.Perfect) - { - return; - } + RemoveFromCheckingList(); preJudgeType = startJudgeType; @@ -127,6 +123,42 @@ namespace Ichni.RhythmGame isFinalJudged = true; } } + + public void ExecuteTapJudge() + { + RemoveFromCheckingList(); + + float triggerTime = GameManager.instance.songTime; + float timeDifference = triggerTime - exactJudgeTime; + + NoteJudgeType startJudgeType = GetStartJudgeType(timeDifference); + + if (startJudgeType == NoteJudgeType.Perfect) + { + Perfect(triggerTime); + GameManager.instance.playingRecorder.resultData.Add(0); + } + else if (startJudgeType == NoteJudgeType.Good) + { + Good(triggerTime); + } + else if (startJudgeType == NoteJudgeType.Bad) + { + Bad(triggerTime); + } + else if (startJudgeType == NoteJudgeType.Miss) + { + Miss(triggerTime); + } + + if (startJudgeType != NoteJudgeType.Miss) + { + noteAudioSubmodule.PlayGeneralJudgeAudios(); + } + + isFirstJudged = true; + isFinalJudged = true; + } } public partial class Flick diff --git a/Assets/Scripts/Manager/GameInputManager.cs b/Assets/Scripts/Manager/GameInputManager.cs index e11e6210..c106602b 100644 --- a/Assets/Scripts/Manager/GameInputManager.cs +++ b/Assets/Scripts/Manager/GameInputManager.cs @@ -127,10 +127,6 @@ public class GameInputManager : MonoBehaviour GameManager.instance.noteJudgeManager.SetNewInputUnitSwipe(id, position, isGeneric, isFirst, direction); } - - // ===================================================================== - // 核心处理逻辑 (Core Processing Logic) - // ===================================================================== #if UNITY_STANDALONE /// @@ -315,7 +311,7 @@ public class GameInputManager : MonoBehaviour if (holdingSwipe0) { Vector2 inputPosition = new Vector2(Screen.width * 0.5f, 200f); - OnSwipe(0, inputPosition, true, Vector2.zero); + OnSwipe(0, inputPosition, true, false, Vector2.zero); } } #endif @@ -362,8 +358,7 @@ public class GameInputManager : MonoBehaviour if (_activeTouches.TryGetValue(touchId, out TouchState movedState)) { OnTouch(touchId, position); - DetectSwipe(movedState, _activeTouches[touchId].isFirstSwipe, position); - //_activeTouches[touchId].isFirstSwipe = false; + DetectSwipe(movedState, position); } break; @@ -401,7 +396,7 @@ public class GameInputManager : MonoBehaviour /// /// 检测划动逻辑 (无需修改) /// - private void DetectSwipe(TouchState state, bool isFirst, Vector2 currentPosition) + private void DetectSwipe(TouchState state, Vector2 currentPosition) { Vector2 swipeVector = currentPosition - state.StartPosition; if (swipeVector.magnitude < minSwipeDistance) return; @@ -411,10 +406,11 @@ public class GameInputManager : MonoBehaviour // 检查是否是新的划动方向 if (Vector2.Dot(direction, state.LastSwipeDirection) <= swipeAngleThreshold) { - OnSwipe(state.TouchId, state.StartPosition, false, isFirst, direction); + OnSwipe(state.TouchId, state.StartPosition, false, state.isFirstSwipe, direction); state.LastSwipeDirection = direction; state.StartPosition = currentPosition; state.StartTime = Time.time; + state.isFirstSwipe = false; } } diff --git a/Assets/Scripts/Manager/GameManager.cs b/Assets/Scripts/Manager/GameManager.cs index 7b35430a..42ccc715 100644 --- a/Assets/Scripts/Manager/GameManager.cs +++ b/Assets/Scripts/Manager/GameManager.cs @@ -74,7 +74,7 @@ namespace Ichni public static void ReturnToMenu() { - InformationTransistor.instance.isReturnedFromGame = true; + //InformationTransistor.instance.isReturnedFromGame = true; SceneManager.LoadScene("MenuScene"); Time.timeScale = 1f; // 确保返回时时间缩放恢复正常 } diff --git a/Assets/Scripts/Manager/NoteJudgeManager.cs b/Assets/Scripts/Manager/NoteJudgeManager.cs index 17d917ac..561b745c 100644 --- a/Assets/Scripts/Manager/NoteJudgeManager.cs +++ b/Assets/Scripts/Manager/NoteJudgeManager.cs @@ -36,6 +36,9 @@ namespace Ichni return; } + List tapSwipeList = inputUnitSwipeList.Where(x => x.isFirst).ToList(); + List holdSwipeList = inputUnitSwipeList.Where(x => !x.isFirst).ToList(); + foreach (InputUnitTap inputUnitTap in inputUnitTapList) { List availableTaps = new List(); @@ -61,8 +64,8 @@ namespace Ichni if (haveHold && haveTap) { - List minHolds = GetAllMinHolds(availableHolds); - List minTaps = GetAllMinTaps(availableTaps); + List minHolds = GetAllMinNotes(availableHolds); + List minTaps = GetAllMinNotes(availableTaps); Hold closestHold = minHolds[0]; Tap closestTap = minTaps[0]; if (closestHold.exactJudgeTime < closestTap.exactJudgeTime) @@ -73,7 +76,7 @@ namespace Ichni } else { - GetNearestHold(minHolds, inputUnitTap.inputPosition).ExecuteStartJudge(); + GetNearestNote(minHolds, inputUnitTap.inputPosition).ExecuteStartJudge(); } } else @@ -84,40 +87,64 @@ namespace Ichni } else { - GetNearestTap(minTaps, inputUnitTap.inputPosition).ExecuteStartJudge(); + GetNearestNote(minTaps, inputUnitTap.inputPosition).ExecuteStartJudge(); } } } else if (haveHold) { - List minHolds = GetAllMinHolds(availableHolds); + List minHolds = GetAllMinNotes(availableHolds); if (minHolds.Count == 1) { minHolds[0].ExecuteStartJudge(); } else { - GetNearestHold(minHolds, inputUnitTap.inputPosition).ExecuteStartJudge(); + GetNearestNote(minHolds, inputUnitTap.inputPosition).ExecuteStartJudge(); } } else if (haveTap) { - List minTaps = GetAllMinTaps(availableTaps); + List minTaps = GetAllMinNotes(availableTaps); if (minTaps.Count == 1) { minTaps[0].ExecuteStartJudge(); } else { - GetNearestTap(minTaps, inputUnitTap.inputPosition).ExecuteStartJudge(); + GetNearestNote(minTaps, inputUnitTap.inputPosition).ExecuteStartJudge(); } } } - foreach (InputUnitSwipe inputUnitSwipe in inputUnitSwipeList) + foreach (InputUnitSwipe tapSwipe in tapSwipeList) { List availableFlicks = new List(); + + foreach (Flick flick in checkingFlickList) + { + if (flick.CheckJudgeAvailability(tapSwipe)) + { + availableFlicks.Add(flick); + } + } + + List minFlicks = GetAllMinNotes(availableFlicks); + + if (minFlicks.Count == 1) + { + minFlicks[0].ExecuteStartJudge(); + } + else if (minFlicks.Count > 1) + { + GetNearestNote(minFlicks, tapSwipe.inputPosition).ExecuteTapJudge(); + } + } + foreach (InputUnitSwipe inputUnitSwipe in holdSwipeList) + { + List availableFlicks = new List(); + foreach (Flick flick in checkingFlickList) { if (flick.CheckJudgeAvailability(inputUnitSwipe)) @@ -200,69 +227,31 @@ namespace Ichni public partial class NoteJudgeManager { - private List GetAllMinTaps(List availableTaps) + private List GetAllMinNotes(List availableFlicks) where T : NoteBase { - List minTaps = new List(); + List minFlicks = new List(); float minTime = float.MaxValue; - foreach (Tap tap in availableTaps) + foreach (T flick in availableFlicks) { - if (tap.exactJudgeTime < minTime) + if (flick.exactJudgeTime < minTime) { - minTime = tap.exactJudgeTime; - minTaps.Clear(); - minTaps.Add(tap); + minTime = flick.exactJudgeTime; + minFlicks.Clear(); + minFlicks.Add(flick); } - else if (Mathf.Approximately(tap.exactJudgeTime, minTime)) + else if (Mathf.Approximately(flick.exactJudgeTime, minTime)) { - minTaps.Add(tap); + minFlicks.Add(flick); } } - - return minTaps; + return minFlicks; } - private List GetAllMinHolds(List availableHolds) - { - List minHolds = new List(); - float minTime = float.MaxValue; - foreach (Hold hold in availableHolds) - { - if (hold.exactJudgeTime < minTime) - { - minTime = hold.exactJudgeTime; - minHolds.Clear(); - minHolds.Add(hold); - } - else if (Mathf.Approximately(hold.exactJudgeTime, minTime)) - { - minHolds.Add(hold); - } - } - return minHolds; - } - - private Tap GetNearestTap(List notes, Vector2 inputPosition) + private T GetNearestNote(List notes, Vector2 inputPosition) where T : NoteBase { float minDistance = float.MaxValue; - Tap closestNote = null; - foreach (Tap note in notes) - { - float distance = Vector2.Distance(inputPosition, note.noteScreenPosition); - if (distance < minDistance) - { - minDistance = distance; - closestNote = note; - } - } - - return closestNote; - } - - private Hold GetNearestHold(List notes, Vector2 inputPosition) - { - float minDistance = float.MaxValue; - Hold closestNote = null; - foreach (Hold note in notes) + T closestNote = null; + foreach (T note in notes) { float distance = Vector2.Distance(inputPosition, note.noteScreenPosition); if (distance < minDistance) diff --git a/Assets/Scripts/Menu/InformationTransistor.cs b/Assets/Scripts/Menu/InformationTransistor.cs index 6f38a9a9..cd61b8b2 100644 --- a/Assets/Scripts/Menu/InformationTransistor.cs +++ b/Assets/Scripts/Menu/InformationTransistor.cs @@ -12,6 +12,7 @@ namespace Ichni public static InformationTransistor instance; public bool isReturnedFromGame; + public bool isReturnedFromTutorial; public ChapterSelectionUnit chapter; public SongItemData song; @@ -30,6 +31,7 @@ namespace Ichni instance = this; DontDestroyOnLoad(gameObject); isReturnedFromGame = false; + isReturnedFromTutorial = false; } else { diff --git a/Assets/Scripts/Menu/MenuManager.cs b/Assets/Scripts/Menu/MenuManager.cs index 656ea791..36c17292 100644 --- a/Assets/Scripts/Menu/MenuManager.cs +++ b/Assets/Scripts/Menu/MenuManager.cs @@ -54,6 +54,13 @@ namespace Ichni new SongSelectionRecord(InformationTransistor.instance.song, InformationTransistor.instance.difficulty)); songSelectionUIPage.FadeIn(); } + else if (InformationTransistor.instance.isReturnedFromTutorial) + { + startUIPage.mainCanvasGroup.gameObject.SetActive(false); + ChapterSelectionManager.instance.currentChapter = InformationTransistor.instance.chapter; + MenuAudioManager.instance.audioContainer.SetSwitch(ChapterSelectionManager.instance.currentChapter.chapterSwitch); + storyUIPage.FadeIn(); + } Application.targetFrameRate = SettingsManager.instance.gameSettings.targetFrame; asyncOperation = SceneManager.LoadSceneAsync("GameScene"); @@ -63,7 +70,14 @@ namespace Ichni public partial class MenuManager { - public void TestEnterGame() + public void EnterGame() + { + InformationTransistor.instance.isReturnedFromTutorial = false; + InformationTransistor.instance.isReturnedFromGame = true; + EnterGameScene(); + } + + public void EnterGameScene() { MenuInputManager.instance.gameInput.Menu.Disable(); asyncOperation.allowSceneActivation = true; diff --git a/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs b/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs index d28e50dd..2dea2485 100644 --- a/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs +++ b/Assets/Scripts/Story/StoryUI/Blocks/TutorialBlockUI.cs @@ -1,8 +1,10 @@ +using System; using System.Collections; using System.Collections.Generic; using DG.Tweening; using Ichni.Menu; using TMPro; +using UniRx; using UnityEngine; using UnityEngine.UI; @@ -36,13 +38,14 @@ namespace Ichni.Story.UI SongItemData song = ChapterSelectionManager.instance.tutorialCollection.songs[chapter.chapterIndex]; DifficultyData difficulty = song.difficultyDataList[0]; InformationTransistor.instance.SetInformation(chapter, song, difficulty); + InformationTransistor.instance.isReturnedFromTutorial = true; + InformationTransistor.instance.isReturnedFromGame = false; MenuAudioManager.instance.audioContainer.PlaySoundFX("EnterToGame"); MenuAudioManager.instance.audioContainer.StopEvent("PlayPreview"); DOTween.KillAll(); - - MenuManager.instance.TestEnterGame(); + Observable.Timer(TimeSpan.FromSeconds(0.6f)).Subscribe(_ => { MenuManager.instance.EnterGameScene(); }); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/SongSelection/PlaySongUI.cs b/Assets/Scripts/UI/SongSelection/PlaySongUI.cs index 509d049c..56080899 100644 --- a/Assets/Scripts/UI/SongSelection/PlaySongUI.cs +++ b/Assets/Scripts/UI/SongSelection/PlaySongUI.cs @@ -53,7 +53,7 @@ namespace Ichni.Menu MenuManager.instance.transitionUIPage.FadeIn(); Observable.Timer(TimeSpan.FromSeconds(0.6f)).Subscribe(_ => { - MenuManager.instance.TestEnterGame(); + MenuManager.instance.EnterGame(); }); }); diff --git a/Assets/Scripts/UI/SongSelection/SongSelectionTab.cs b/Assets/Scripts/UI/SongSelection/SongSelectionTab.cs index a66a083c..91e01c6a 100644 --- a/Assets/Scripts/UI/SongSelection/SongSelectionTab.cs +++ b/Assets/Scripts/UI/SongSelection/SongSelectionTab.cs @@ -62,7 +62,7 @@ namespace Ichni.Menu Observable.Timer(TimeSpan.FromSeconds(0.6f)).Subscribe(_ => { - MenuManager.instance.TestEnterGame(); + MenuManager.instance.EnterGame(); }); } else diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index 795fb881..bcec56f8 100644 --- a/Assets/Settings/URP-HighFidelity.asset +++ b/Assets/Settings/URP-HighFidelity.asset @@ -88,19 +88,19 @@ MonoBehaviour: m_PrefilterXRKeywords: 1 m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeDeferredRendering: 0 - m_PrefilteringModeScreenSpaceOcclusion: 2 + m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 - m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthHigh: 1 - m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOInterleaved: 1 m_PrefilterSSAOBlueNoise: 1 m_PrefilterSSAOSampleCountLow: 1 m_PrefilterSSAOSampleCountMedium: 1 - m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT3: 1 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisual.cs b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisual.cs index 9c1962e5..fadb7fd6 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisual.cs +++ b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisual.cs @@ -27,6 +27,11 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse if (note == null) throw new System.Exception("NoteVisual只能生成在Note下。"); this.note = note; note.noteVisual = this; + + if (note is Flick flick) + { + flick.availableFlickDirections = new List() { Vector2.left, Vector2.right }; + } } public override void AfterInitialize() diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 2c43b890..4d1a5670 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 5550060701065c085e5c5924162609444f4f4b297e70226674284564b1b8326d flags: 0 RecentlyUsedSceneGuid-3: - value: 0006570300050d0a550b087144275c4412164f7f7d7970327c7e1961b1b4616f + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 RecentlyUsedSceneGuid-4: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 0006570300050d0a550b087144275c4412164f7f7d7970327c7e1961b1b4616f flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index e360719b..10583e42 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1706.6667 height: 869.3334 m_ShowMode: 4 - m_Title: Game + m_Title: Simulator m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 121 + controlID: 126 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -209,7 +209,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SimulatorWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -218,8 +218,8 @@ MonoBehaviour: y: 0 width: 930.66675 height: 562.6667 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 22} m_Panes: - {fileID: 13} @@ -237,7 +237,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -246,16 +246,16 @@ MonoBehaviour: y: 562.6667 width: 1197.3334 height: 256.66663 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} - {fileID: 16} - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -275,8 +275,8 @@ MonoBehaviour: y: 0 width: 509.33325 height: 819.3333 - m_MinSize: {x: 276, y: 121} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 19} @@ -324,7 +324,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8cb6ffff98beffff1af9ffff02fbffff949a0000d6ee000084ef000020f0000040f20000 + m_ExpandedIDs: 78cdfdff1ccefdff20d9fdffe4e0fdffe600fefff401feff8e0cfeff5214feffbac9ffffd0caffffcad2ffffb6dbffff96e2ffff28f9ffff02fbfffff4ffffff70a3000096a50000aea5000004f100001cf10000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -765,14 +765,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 849.8244, y: 156.46439, z: 0.07204684} + m_Target: {x: 8.383683, y: -1.7852159, z: 5.9926147} speed: 2 - m_Value: {x: 849.8195, y: 156.45961, z: 0.0717944} + m_Value: {x: 8.383683, y: -1.7852159, z: 5.9926147} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -818,17 +818,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: -0.018804695, y: 0.02009148, z: -0.0003779848, w: -0.9996227} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0.01880467, y: 0.020091452, z: -0.00037798425, w: -0.9996213} m_Size: - m_Target: 0.535748 + m_Target: 35.57526 speed: 2 - m_Value: 0.56099266 + m_Value: 35.57526 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -1002,7 +1002,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Sprites/Illustrations/Characters + - Assets/Scripts/Menu m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1010,16 +1010,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Sprites/Illustrations/Characters + - Assets/Scripts/Menu m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 548.3334} - m_SelectedIDs: 18e00000 - m_LastClickedID: 57368 - m_ExpandedIDs: 0000000006a2000008a200000aa200000ca200000ea2000010a2000012a2000014a2000016a2000018a200001aa200001ca200001ea2000020a2000022a2000024a2000026a2000028a200002aa200002ca200002ea2000030a2000032a2000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca2000058a20000d6a20000e6a20000eca2000016b7000000ca9a3b + scrollPos: {x: 0, y: 360.33337} + m_SelectedIDs: fc450100 + m_LastClickedID: 83452 + m_ExpandedIDs: 000000001aa200001ca200001ea2000020a2000022a2000024a2000026a2000028a200002aa200002ca200002ea2000030a2000032a2000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca200004ea2000050a2000052a2000054a2000058a200005aa200005ca20000a8a20000c4a20000c6a2000092b0000098b00000a0b00000482b01004c2b01000046010000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1047,7 +1047,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000006a2000008a200000aa200000ca200000ea2000010a2000012a2000014a2000016a2000018a200001aa200001ca200001ea2000020a2000022a2000024a2000026a2000028a200002aa200002ca200002ea2000030a2000032a2000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca200004ea2000050a2000052a2000054a2000056a2000058a200005aa200005ca20000 + m_ExpandedIDs: 000000001aa200001ca200001ea2000020a2000022a2000024a2000026a2000028a200002aa200002ca200002ea2000030a2000032a2000034a2000036a2000038a200003aa200003ca200003ea2000040a2000042a2000044a2000046a2000048a200004aa200004ca200004ea2000050a2000052a2000054a2000056a2000058a200005aa200005ca20000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1072,24 +1072,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: f0f10000 + m_LastClickedInstanceID: 61936 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d2c101005ac60100bec80100b6c80100000000000cd901003ada010074b30100d4a10600f8a300000e8e00003e91000044900000e8920000c6d400005aa10000909600007ca300009a9d00004ab90000fa9e0000aaab00006ea6000014ab000022e0000028e00000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Gemini_Generated_Image_d3qj4dd3qj4dd3qj - m_OriginalName: Gemini_Generated_Image_d3qj4dd3qj4dd3qj + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 57384 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: @@ -1175,7 +1175,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 52388 + m_LastSelectedObjectID: 62008 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1274,7 +1274,7 @@ MonoBehaviour: m_CachedPref: 181.66656 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 37280 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 @@ -1372,15 +1372,15 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 13974, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Text: Simulator + m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1400,69 +1400,36 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow + - UnityEditor.GameView m_SerializedViewValues: - - D:\Projects\ichni Official\Library\PlayModeViewStates\5d367d67919082841bd25ba0b3a8ed87 - m_PlayModeViewName: GameView + - D:\Projects\ichni Official\Library\PlayModeViewStates\aab98a45e4519fc4886efefa30e63b95 + m_PlayModeViewName: Device Simulator m_ShowGizmos: 0 m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} + m_ClearColor: {r: 0, g: 0, b: 0, a: 1} + m_TargetSize: {x: 2688, y: 1242} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 2 m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000006000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -640 - m_HBaseRangeMax: 640 - m_VBaseRangeMin: -360 - m_VBaseRangeMax: 360 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 928.66675 - height: 520.6667 - m_Scale: {x: 0.72314817, y: 0.72314817} - m_Translation: {x: 464.33337, y: 260.33334} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -642.0999 - y: -360 - width: 1284.1998 - height: 720 - m_MinimalGUI: 1 - m_defaultScale: 0.72314817 - m_LastWindowPixelSize: {x: 1393.0001, y: 812.5} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1 + m_SimulatorState: + controlPanelVisible: 0 + controlPanelWidth: 0 + controlPanelFoldoutKeys: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + controlPanelFoldoutValues: 00 + pluginNames: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + - UnityEngine.InputSystem.Editor.InputSystemPlugin + pluginStates: + - '{}' + - '{}' + scale: 33 + fitToScreenEnabled: 1 + rotationDegree: 90 + highlightSafeAreaEnabled: 0 + friendlyName: Apple iPhone XS Max + screenIndex: 0 + networkReachability: 1 + systemLanguage: 10