diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index c0ac35ba..15e2f210 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.51536673 + - _EdgeValue: 0.995674 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.48463327 + - _Opacity: 0.004325986 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index 55f529c4..898e015d 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/Editor/QuickSelector.CS b/Assets/Editor/QuickSelector.CS new file mode 100644 index 00000000..20484d10 --- /dev/null +++ b/Assets/Editor/QuickSelector.CS @@ -0,0 +1,231 @@ +using UnityEngine; +using UnityEditor; +using UnityEngine.UI; +using System.Collections.Generic; +using System.Linq; + +[InitializeOnLoad] +public class QuickSelectorHud +{ + public static GameObject HoveredObject; + + static QuickSelectorHud() + { + SceneView.duringSceneGui += OnSceneGUI; + } + + private static void OnSceneGUI(SceneView sceneView) + { + if (HoveredObject != null) + { + DrawHighlight(HoveredObject); + sceneView.Repaint(); + } + + Event e = Event.current; + if (e.type == EventType.MouseDown && e.button == 1 && e.shift) + { + var entries = CollectData(sceneView, e.mousePosition); + QuickSelectorPopup popup = new QuickSelectorPopup(entries); + PopupWindow.Show(new Rect(e.mousePosition.x, e.mousePosition.y, 0, 0), popup); + e.Use(); + } + } + + private static void DrawHighlight(GameObject go) + { + Handles.color = new Color(0f, 0.7f, 1f, 1f); // 亮蓝色 + RectTransform rt = go.GetComponent(); + if (rt != null) + { + Vector3[] corners = new Vector3[4]; + rt.GetWorldCorners(corners); + Handles.DrawPolyLine(corners[0], corners[1], corners[2], corners[3], corners[0]); + Handles.color = new Color(0f, 0.7f, 1f, 0.1f); + Handles.DrawAAConvexPolygon(corners); + } + else + { + Renderer r = go.GetComponent(); + if (r != null) Handles.DrawWireCube(r.bounds.center, r.bounds.size); + } + } + + private static List CollectData(SceneView sceneView, Vector2 mousePos) + { + bool enableUI = EditorPrefs.GetBool("QS_UI", true); + bool enable3D = EditorPrefs.GetBool("QS_3D", true); + Vector2 guiPos = mousePos; + guiPos.y = sceneView.camera.pixelHeight - guiPos.y; + Ray ray = HandleUtility.GUIPointToWorldRay(mousePos); + + HashSet processed = new HashSet(); + List list = new List(); + + GameObject smart = HandleUtility.PickGameObject(mousePos, false); + if (smart != null) AddEntry(list, processed, smart, "PICK"); + + if (enableUI) + { + var rects = GameObject.FindObjectsByType(FindObjectsSortMode.None); + foreach (var rect in rects) + { + if (rect.gameObject.activeInHierarchy && RectTransformUtility.RectangleContainsScreenPoint(rect, guiPos, sceneView.camera)) + AddEntry(list, processed, rect.gameObject, "UI"); + } + } + + if (enable3D) + { + RaycastHit[] hits = Physics.RaycastAll(ray, float.MaxValue); + foreach (var hit in hits) AddEntry(list, processed, hit.collider.gameObject, "3D"); + foreach (var r in GameObject.FindObjectsByType(FindObjectsSortMode.None)) + if (!processed.Contains(r.gameObject) && r.bounds.IntersectRay(ray, out _)) + AddEntry(list, processed, r.gameObject, "Mesh"); + } + return list; + } + + private static void AddEntry(List list, HashSet set, GameObject go, string src) + { + if (go == null || !set.Add(go)) return; + string maj = (go.GetComponent() != null) ? "UI" : (go.GetComponent() != null ? "3D" : "Mesh"); + string min = (maj == "UI") ? GetUIType(go) : (go.GetComponent()?.GetType().Name ?? "Object"); + list.Add(new SelectionEntry { go = go, root = GetRoot(go.transform), depth = GetDepth(go.transform), sibling = go.transform.GetSiblingIndex(), major = maj, minor = min }); + } + + private static string GetUIType(GameObject go) + { + if (go.GetComponent("TextMeshProUGUI")) return "TMPro"; + if (go.GetComponent()) return "Text"; + if (go.GetComponent()) return "Image"; + return "Rect"; + } + private static GameObject GetRoot(Transform t) { while (t.parent != null) t = t.parent; return t.gameObject; } + private static int GetDepth(Transform t) { int d = 0; while (t.parent != null) { d++; t = t.parent; } return d; } +} + +public class SelectionEntry { public GameObject go, root; public int depth, sibling; public string major, minor; } + +public class QuickSelectorPopup : PopupWindowContent +{ + private List _entries; + private List _displayItems; + private Vector2 _scroll; + private GUIStyle _hoverStyle; + private GUIStyle _richLabelStyle; // 修正点：手动创建支持富文本的 Style + + public QuickSelectorPopup(List entries) + { + _entries = entries; + RefreshList(); + } + + public override Vector2 GetWindowSize() => new Vector2(280, Mathf.Min((_displayItems.Count * 22) + 30, 450)); + + public override void OnGUI(Rect rect) + { + // 样式初始化 + if (_hoverStyle == null) + { + _hoverStyle = new GUIStyle(EditorStyles.label); + _hoverStyle.normal.background = MakeTex(2, 2, new Color(0.2f, 0.5f, 1f, 0.4f)); + } + if (_richLabelStyle == null) + { + _richLabelStyle = new GUIStyle(EditorStyles.label); + _richLabelStyle.richText = true; // 关键修正：开启富文本支持 + } + + _scroll = EditorGUILayout.BeginScrollView(_scroll); + Event e = Event.current; + + foreach (var item in _displayItems) + { + if (item.isSep) { EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); continue; } + + Rect r = EditorGUILayout.GetControlRect(false, 20); + bool isHover = r.Contains(e.mousePosition); + + if (isHover) + { + GUI.Box(r, "", _hoverStyle); + if (QuickSelectorHud.HoveredObject != item.ent.go) + { + QuickSelectorHud.HoveredObject = item.ent.go; + EditorGUIUtility.PingObject(item.ent.go); + SceneView.RepaintAll(); + } + if (e.type == EventType.MouseDown && e.button == 0) + { + Selection.activeGameObject = item.ent.go; + this.editorWindow.Close(); + } + } + + // 使用修正后的富文本样式绘制 + GUI.Label(r, item.label, _richLabelStyle); + } + EditorGUILayout.EndScrollView(); + + DrawToolbar(); + + if (e.type == EventType.MouseMove && !rect.Contains(e.mousePosition)) + { + QuickSelectorHud.HoveredObject = null; + } + } + + private void DrawToolbar() + { + GUILayout.BeginHorizontal(EditorStyles.toolbar); + if (GUILayout.Toggle(EditorPrefs.GetBool("QS_UI", true), "UI", EditorStyles.toolbarButton) != EditorPrefs.GetBool("QS_UI", true)) + { + EditorPrefs.SetBool("QS_UI", !EditorPrefs.GetBool("QS_UI")); RefreshList(); + } + if (GUILayout.Toggle(EditorPrefs.GetBool("QS_3D", true), "3D", EditorStyles.toolbarButton) != EditorPrefs.GetBool("QS_3D", true)) + { + EditorPrefs.SetBool("QS_3D", !EditorPrefs.GetBool("QS_3D")); RefreshList(); + } + GUILayout.FlexibleSpace(); + if (GUILayout.Toggle(EditorPrefs.GetBool("QS_REV", false), "Reverse", EditorStyles.toolbarButton) != EditorPrefs.GetBool("QS_REV", false)) + { + EditorPrefs.SetBool("QS_REV", !EditorPrefs.GetBool("QS_REV")); RefreshList(); + } + GUILayout.EndHorizontal(); + } + + public override void OnClose() { QuickSelectorHud.HoveredObject = null; SceneView.RepaintAll(); } + + private void RefreshList() + { + _displayItems = new List(); + bool rev = EditorPrefs.GetBool("QS_REV", false); + var groups = _entries.GroupBy(x => x.root).OrderByDescending(g => g.Any(e => e.major == "UI")).ThenBy(g => g.Key.name); + bool first = true; + foreach (var g in groups) + { + if (!first) _displayItems.Add(new DisplayItem { isSep = true }); + first = false; + var sorted = rev ? g.OrderByDescending(x => x.depth).ThenByDescending(x => x.sibling) : g.OrderBy(x => x.depth).ThenBy(x => x.sibling); + int minD = g.Min(x => x.depth); + int maxD = g.Max(x => x.depth); + foreach (var ent in sorted) + { + int ind = rev ? (maxD - ent.depth) : (ent.depth - minD); + string color = (ent.major == "UI" ? "#00E6FF" : "#AAAAAA"); // 调整 UI 标签为更亮的青色 + string label = $"{new string(' ', ind * 4)}[{ent.major}|{ent.minor}] {ent.go.name}"; + _displayItems.Add(new DisplayItem { ent = ent, label = label }); + } + } + if (editorWindow != null) editorWindow.Repaint(); + } + + private Texture2D MakeTex(int w, int h, Color col) + { + Color[] pix = new Color[w * h]; for (int i = 0; i < pix.Length; i++) pix[i] = col; + Texture2D t = new Texture2D(w, h); t.SetPixels(pix); t.Apply(); return t; + } + + private class DisplayItem { public bool isSep; public SelectionEntry ent; public string label; } +} \ No newline at end of file diff --git a/Assets/Editor/QuickSelector.CS.meta b/Assets/Editor/QuickSelector.CS.meta new file mode 100644 index 00000000..7288762a --- /dev/null +++ b/Assets/Editor/QuickSelector.CS.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7e9809a5644224c4fb21f9c621b3bda6 \ No newline at end of file diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index fe02f2ff..74da1a20 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1406401b638900b688c39f7d50aa2119f94fd5310bc63f0f09038d032e495b68 -size 8841392 +oid sha256:175a498e206ddb28ac479598717892c76c0690c7d036feeeaedaab60982a861f +size 8815902 diff --git a/Assets/Prefabs/GameElements/GameCamera.prefab b/Assets/Prefabs/GameElements/GameCamera.prefab index 3a76b8f5..2b045037 100644 --- a/Assets/Prefabs/GameElements/GameCamera.prefab +++ b/Assets/Prefabs/GameElements/GameCamera.prefab @@ -212,7 +212,7 @@ Camera: width: 1 height: 1 near clip plane: 0.1 - far clip plane: 1000 + far clip plane: 2000 field of view: 60 orthographic: 0 orthographic size: 5 diff --git a/Assets/Prefabs/Menu/UI Elements/Dropdown.prefab b/Assets/Prefabs/Menu/UI Elements/Dropdown.prefab index e6d553fe..5eb57ead 100644 --- a/Assets/Prefabs/Menu/UI Elements/Dropdown.prefab +++ b/Assets/Prefabs/Menu/UI Elements/Dropdown.prefab @@ -608,20 +608,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 5 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -819,46 +822,46 @@ MonoBehaviour: selectedItemIndex: 0 animationType: 0 panelDirection: 0 - panelSize: 200 - curveSpeed: 3 + panelSize: 600 + curveSpeed: 2 animationCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 value: 0 - inSlope: 2 - outSlope: 2 + inSlope: 4.36188 + outSlope: 4.36188 tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0 + outWeight: 0.176818 - serializedVersion: 3 - time: 0.18851778 - value: 0.47798252 - inSlope: 2.068921 - outSlope: 2.068921 + time: 0.13800304 + value: 0.68698835 + inSlope: 1.4016798 + outSlope: 1.4016798 tangentMode: 0 weightedMode: 0 inWeight: 0.29272804 - outWeight: 0.07063071 + outWeight: 0.22682661 - serializedVersion: 3 - time: 0.36163384 - value: 0.7607662 - inSlope: 1.2336681 - outSlope: 1.2336681 + time: 0.5366349 + value: 0.95052403 + inSlope: 0.19610302 + outSlope: 0.19610302 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.37128827 - serializedVersion: 3 time: 1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: 0.0087971045 + outSlope: 0.0087971045 tangentMode: 0 weightedMode: 0 - inWeight: 0 + inWeight: 0.34593526 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -926,7 +929,7 @@ MonoBehaviour: m_Calls: [] --- !u!95 &520950462690864226 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -940,6 +943,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -1283,6 +1287,7 @@ GameObject: - component: {fileID: 9062131400857904031} - component: {fileID: 5643495456631530129} - component: {fileID: 4929733186451828159} + - component: {fileID: 3667704046227438547} m_Layer: 5 m_Name: Item List m_TagString: Untagged @@ -1335,6 +1340,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Delegates: [] +--- !u!114 &3667704046227438547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6979408506574131292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RectMask2D + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &7708928578317463321 GameObject: m_ObjectHideFlags: 0 @@ -1440,20 +1459,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1615,20 +1637,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Assets/Prefabs/Menu/UI Elements/Switch.prefab b/Assets/Prefabs/Menu/UI Elements/Switch.prefab index 7aea5b5b..aeefbc62 100644 --- a/Assets/Prefabs/Menu/UI Elements/Switch.prefab +++ b/Assets/Prefabs/Menu/UI Elements/Switch.prefab @@ -35,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 25, y: 0} + m_AnchoredPosition: {x: 30, y: 0} m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3052240434638749590 @@ -239,20 +239,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -375,20 +378,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -550,20 +556,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -740,7 +749,7 @@ MonoBehaviour: m_Calls: [] --- !u!95 &4382169920134238140 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -754,6 +763,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -1015,20 +1025,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Assets/Prefabs/Menu/UI Elements/Switch/Switch Off.anim b/Assets/Prefabs/Menu/UI Elements/Switch/Switch Off.anim index dfb2af33..85d070ad 100644 --- a/Assets/Prefabs/Menu/UI Elements/Switch/Switch Off.anim +++ b/Assets/Prefabs/Menu/UI Elements/Switch/Switch Off.anim @@ -24,24 +24,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 436.54633 + outSlope: 436.54633 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.1278386 - serializedVersion: 3 time: 0.41666666 - value: 25 + value: 30 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -342,24 +333,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: -25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 436.54633 + outSlope: 436.54633 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.1278386 - serializedVersion: 3 time: 0.41666666 - value: 25 + value: 30 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Prefabs/Menu/UI Elements/Switch/Switch On.anim b/Assets/Prefabs/Menu/UI Elements/Switch/Switch On.anim index cb63e856..dc1cd2c6 100644 --- a/Assets/Prefabs/Menu/UI Elements/Switch/Switch On.anim +++ b/Assets/Prefabs/Menu/UI Elements/Switch/Switch On.anim @@ -101,30 +101,21 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 25 + value: 30 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: -440.22556 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.3610527 - serializedVersion: 3 time: 0.41666666 - value: -25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -30 + inSlope: -20.223478 + outSlope: -20.223478 + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.23105529 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -419,30 +410,21 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 25 + value: 30 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: -440.22556 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.3610527 - serializedVersion: 3 time: 0.41666666 - value: -25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -30 + inSlope: -20.223478 + outSlope: -20.223478 + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.23105529 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/Assets/Prefabs/Story/Dialog/HistoryText.prefab b/Assets/Prefabs/Story/Dialog/HistoryText.prefab index 7a596c3c..e0d52038 100644 --- a/Assets/Prefabs/Story/Dialog/HistoryText.prefab +++ b/Assets/Prefabs/Story/Dialog/HistoryText.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1643897006236830438} - component: {fileID: 6202551277621388703} - component: {fileID: 6295076540922261237} + - component: {fileID: 3225969788610800911} m_Layer: 5 m_Name: Speaker m_TagString: Untagged @@ -29,13 +30,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 509104315688032213} m_Father: {fileID: 5159032239856795640} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 225, y: 0} - m_SizeDelta: {x: 250, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6202551277621388703 CanvasRenderer: @@ -132,12 +134,32 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 50, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &3225969788610800911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65537282130585173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 100 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1609519350888832602 GameObject: m_ObjectHideFlags: 0 @@ -149,6 +171,8 @@ GameObject: - component: {fileID: 4891349041236814278} - component: {fileID: 4388088537228770510} - component: {fileID: 5176135775194928437} + - component: {fileID: 4096726825029793806} + - component: {fileID: 4661480717819729425} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -170,10 +194,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5159032239856795640} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 175.00002, y: 0} - m_SizeDelta: {x: -349.99997, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1455.01, y: -50} + m_SizeDelta: {x: 2136.15, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4388088537228770510 CanvasRenderer: @@ -276,6 +300,112 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &4096726825029793806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609519350888832602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &4661480717819729425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609519350888832602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 100 + m_PreferredWidth: 2136.15 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &2750754522682648536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 509104315688032213} + - component: {fileID: 4755514015703345037} + - component: {fileID: 3237230749472310464} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &509104315688032213 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750754522682648536} + 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: 1643897006236830438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4755514015703345037 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750754522682648536} + m_CullTransparentMesh: 1 +--- !u!114 &3237230749472310464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750754522682648536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &3327801269455335983 GameObject: m_ObjectHideFlags: 0 @@ -286,6 +416,8 @@ GameObject: m_Component: - component: {fileID: 5159032239856795640} - component: {fileID: 5965612576668694196} + - component: {fileID: 7192079378290287000} + - component: {fileID: 7746438911129537834} m_Layer: 5 m_Name: HistoryText m_TagString: Untagged @@ -307,13 +439,12 @@ RectTransform: m_Children: - {fileID: 1643897006236830438} - {fileID: 4891349041236814278} - - {fileID: 572619156665643296} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2560, y: 100} + m_SizeDelta: {x: 2560, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5965612576668694196 MonoBehaviour: @@ -329,79 +460,44 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Ichni.Story.UI.DialogueHistoryEntryView speakerText: {fileID: 6295076540922261237} contentText: {fileID: 5176135775194928437} - choiceIndicator: {fileID: 4440795975948891807} ---- !u!1 &4440795975948891807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 572619156665643296} - - component: {fileID: 7654607494418361635} - - component: {fileID: 4823002412552371432} - m_Layer: 5 - m_Name: ChoiceIndicator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &572619156665643296 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4440795975948891807} - 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: 5159032239856795640} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: 25, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7654607494418361635 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4440795975948891807} - m_CullTransparentMesh: 1 ---- !u!114 &4823002412552371432 + choiceIndicator: {fileID: 0} +--- !u!114 &7192079378290287000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4440795975948891807} + m_GameObject: {fileID: 3327801269455335983} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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 + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &7746438911129537834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3327801269455335983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.HorizontalLayoutGroup + m_Padding: + m_Left: 50 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 diff --git a/Assets/Resources/Chapter0.asset b/Assets/Resources/Chapter0.asset index 733f892f..ee9eace4 100644 --- a/Assets/Resources/Chapter0.asset +++ b/Assets/Resources/Chapter0.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:146d63a7f30d0b5158ff3227924245c3424155f190e2e8e51bd720d60edbc26f -size 17333 +oid sha256:c56a762b967bd5c4ca20bd3d5f0003cea7329f53769b71b0956a0012e1938249 +size 17613 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 97a16388..af775930 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -4308,7 +4308,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Test version, all content in the game may not be final. + m_text: "\u6D4B\u8BD5\u7248\u672C\uFF0C\u6E38\u620F\u4E2D\u7684\u6240\u6709\u5185\u5BB9\u90FD\u6709\u53EF\u80FD\u4E0D\u662F\u6700\u7EC8\u5448\u73B0\u3002" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 87c1b020037c81841b3d98dd497cbdeb, type: 2} m_sharedMaterial: {fileID: -5812992765432063453, guid: 87c1b020037c81841b3d98dd497cbdeb, @@ -13934,6 +13934,8 @@ GameObject: - component: {fileID: 845689280} - component: {fileID: 845689282} - component: {fileID: 845689281} + - component: {fileID: 845689284} + - component: {fileID: 845689283} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -13992,7 +13994,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 0 + m_Spacing: 50 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -14000,6 +14002,41 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &845689283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845689279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.7294118} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &845689284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 845689279} + m_CullTransparentMesh: 1 --- !u!1001 &846975560 PrefabInstance: m_ObjectHideFlags: 0 @@ -16116,6 +16153,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1870072471} + - {fileID: 2005595457} m_Father: {fileID: 871906516} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -25745,7 +25783,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: '- Touch to start -' + m_text: "- \u89E6\u6478\u4EE5\u5F00\u59CB\u6E38\u620F -" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 87c1b020037c81841b3d98dd497cbdeb, type: 2} m_sharedMaterial: {fileID: -5812992765432063453, guid: 87c1b020037c81841b3d98dd497cbdeb, @@ -27653,7 +27691,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1834199646} - - {fileID: 2005595457} m_Father: {fileID: 871906516} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -28941,14 +28978,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005595456} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 520601619} - {fileID: 1089279498} - m_Father: {fileID: 1876757693} + m_Father: {fileID: 993868749} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs b/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs index 92cf1f92..03b231c3 100644 --- a/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs +++ b/Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs @@ -118,12 +118,13 @@ namespace Ichni.Story /// 点击 Helper 的统一入口：播放反馈后创建一条新的专属气泡。 private void HandleHelperClicked() { - if (Time.unscaledTime < _nextClickTime) - return; + if (Time.unscaledTime > _nextClickTime) + { + _nextClickTime = Time.unscaledTime + clickCooldown; + TryCreateRandomTalk(); - _nextClickTime = Time.unscaledTime + clickCooldown; + } PlayClickAnimation(); - TryCreateRandomTalk(); } /// diff --git a/Assets/Scripts/UI/Base/ModifyValueSlider.cs b/Assets/Scripts/UI/Base/ModifyValueSlider.cs index f029c408..1e4b6e86 100644 --- a/Assets/Scripts/UI/Base/ModifyValueSlider.cs +++ b/Assets/Scripts/UI/Base/ModifyValueSlider.cs @@ -10,15 +10,15 @@ namespace Ichni.UI { public ValueModifier valueModifier; public RectTransform sliderBackground; - + public void OnPointerClick(PointerEventData eventData) { - valueModifier.SetValue(valueModifier.GetNearestValue(GetPercentage(eventData.position))); + valueModifier.SetValue(valueModifier.GetNearestValue(GetPercentage(eventData.position)), true); } public void OnDrag(PointerEventData eventData) { - valueModifier.SetValue(valueModifier.GetNearestValue(GetPercentage(eventData.position))); + valueModifier.SetValue(valueModifier.GetNearestValue(GetPercentage(eventData.position)), true); } private float GetPercentage(Vector2 inputPosition) @@ -46,7 +46,7 @@ namespace Ichni.UI return percentage; } - + return 0f; } } diff --git a/Assets/Scripts/UI/Base/ValueModifier.cs b/Assets/Scripts/UI/Base/ValueModifier.cs index 97cf1f0b..5e08d246 100644 --- a/Assets/Scripts/UI/Base/ValueModifier.cs +++ b/Assets/Scripts/UI/Base/ValueModifier.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using DG.Tweening; using I2.Loc; using TMPro; using UnityEngine; @@ -15,17 +16,17 @@ namespace Ichni.UI public int intStep; public int intMin; public int intMax; - + public ModifyValueButton increaseButton; public ModifyValueButton decreaseButton; public TMP_Text valueText; public Image barImage; - + public string prefix; public string suffix; public bool showPositiveMark; - + public void SetUp(int initialValue, int step, string title = "") { intStep = step; @@ -33,19 +34,21 @@ namespace Ichni.UI intMax = int.MaxValue; base.SetUp(title); - + increaseButton.SetUpButton(IncreaseValue, IncreaseValue); decreaseButton.SetUpButton(DecreaseValue, DecreaseValue); SetValue(initialValue); UpdateValueText(); } - + public void SetMinMax(int min, int max) { intMin = Convert.ToInt32(min); intMax = Convert.ToInt32(max); + UpdateValueText(); + } - + public void SetPrefixAndSuffix(string prefix, string suffix, bool showPositiveMark) { this.showPositiveMark = showPositiveMark; @@ -62,42 +65,50 @@ namespace Ichni.UI int valueRange = intMax - intMin; int stepCount = Mathf.RoundToInt(percentage * valueRange / intStep); int nearestValue = intMin + stepCount * intStep; - + return nearestValue; } } - + public partial class ValueModifier { - public void SetValue(int value) + public void SetValue(int value, bool usingAnimation = false) { intValue = Convert.ToInt32(value); intValue = Mathf.Clamp(intValue, intMin, intMax); - - UpdateValueText(); + + if (usingAnimation) UpdateValueTextTween(); else UpdateValueText(); } - + public void IncreaseValue() { - intValue += intStep; - intValue = Mathf.Clamp(intValue, intMin, intMax); - - UpdateValueText(); + SetValue(intValue + 1, true); } - + public void DecreaseValue() { - intValue -= intStep; - intValue = Mathf.Clamp(intValue, intMin, intMax); - - UpdateValueText(); + SetValue(intValue - 1, true); } - + public void UpdateValueText() { + valueText.text = prefix + (showPositiveMark && intValue > 0 ? "+" : "") + intValue.ToString() + suffix; - barImage.rectTransform.sizeDelta = new Vector2((float)(intValue - intMin) / (intMax - intMin) * 660, 20); - + var target = new Vector2((float)(intValue - intMin) / (intMax - intMin) * 660, 20); + barImage.rectTransform.sizeDelta = target; + updateValueAction?.Invoke(); + } + + private Tween tween; + private int LastValue = -1; + public void UpdateValueTextTween() + { + if (LastValue == intValue) return; + tween?.Complete(); + valueText.text = prefix + (showPositiveMark && intValue > 0 ? "+" : "") + intValue.ToString() + suffix; + var target = new Vector2((float)(intValue - intMin) / (intMax - intMin) * 660, 20); + tween = barImage.rectTransform.DOSizeDelta(target, 0.2f).SetEase(Ease.OutExpo).Play(); + LastValue = intValue; updateValueAction?.Invoke(); } diff --git a/Assets/Scripts/UI/ChapterSelection/ChapterSelectionUI.cs b/Assets/Scripts/UI/ChapterSelection/ChapterSelectionUI.cs index d75769a8..119c4363 100644 --- a/Assets/Scripts/UI/ChapterSelection/ChapterSelectionUI.cs +++ b/Assets/Scripts/UI/ChapterSelection/ChapterSelectionUI.cs @@ -171,22 +171,22 @@ namespace Ichni.UI expansionBackground.gameObject.SetActive(true); })); expandSequence.Join(DOTween.To(() => layoutElement.preferredWidth, - x => layoutElement.preferredWidth = x, 1147, 0.3f)); - expandSequence.Join(avatarMask.rectTransform.DOSizeDelta(new Vector2(1147, 826), 0.3f)); - expandSequence.Join(titleRect.DOSizeDelta(new Vector2(0, 100), 0.3f)); - expandSequence.Append(expansionInfos.GetComponent().DOFade(1, 0.3f) + x => layoutElement.preferredWidth = x, 1147, 0.3f).SetEase(Ease.OutExpo)); + expandSequence.Join(avatarMask.rectTransform.DOSizeDelta(new Vector2(1147, 826), 0.3f).SetEase(Ease.OutExpo)); + expandSequence.Join(titleRect.DOSizeDelta(new Vector2(0, 100), 0.3f).SetEase(Ease.OutExpo)); + expandSequence.Append(expansionInfos.GetComponent().DOFade(1, 0.3f).SetEase(Ease.OutExpo) .OnStart(() => { expansionInfos.gameObject.SetActive(true); })); - expandSequence.Join(expansionFunctions.GetComponent().DOFade(1, 0.3f) + expandSequence.Join(expansionFunctions.GetComponent().DOFade(1, 0.3f).SetEase(Ease.OutExpo) .OnStart(() => { expansionFunctions.gameObject.SetActive(true); })); - expandSequence.Join(bottomTip.DOFade(1f, 0.3f)); - expandSequence.Join(upperTip.DOFade(1f, 0.3f)); + expandSequence.Join(bottomTip.DOFade(1f, 0.3f).SetEase(Ease.OutExpo)); + expandSequence.Join(upperTip.DOFade(1f, 0.3f).SetEase(Ease.OutExpo)); expandSequence.OnStart(() => isDuringAnimation = true); expandSequence.OnComplete(() => @@ -194,8 +194,8 @@ namespace Ichni.UI isDuringAnimation = false; expansionRipple.material.SetFloat("_RippleTime", 0f); rippleSequence = DOTween.Sequence(); - rippleSequence.AppendInterval(5f); rippleSequence.Append(expansionRipple.material.DOFloat(1, "_RippleTime", 2f)); + rippleSequence.AppendInterval(5f); rippleSequence.SetLoops(-1); rippleSequence.Play(); }); @@ -211,31 +211,31 @@ namespace Ichni.UI Sequence shrinkSequence = DOTween.Sequence(); - shrinkSequence.Append(bottomTip.DOFade(0f, 0.3f)); - shrinkSequence.Join(upperTip.DOFade(0f, 0.3f)); + shrinkSequence.Append(bottomTip.DOFade(0f, 0.3f).SetEase(Ease.OutExpo)); + shrinkSequence.Join(upperTip.DOFade(0f, 0.3f).SetEase(Ease.OutExpo)); - shrinkSequence.Join(expansionInfos.GetComponent().DOFade(0, 0.3f) + shrinkSequence.Join(expansionInfos.GetComponent().DOFade(0, 0.3f).SetEase(Ease.OutExpo) .OnComplete(() => { expansionInfos.gameObject.SetActive(false); })); - shrinkSequence.Join(expansionFunctions.GetComponent().DOFade(0, 0.3f) + shrinkSequence.Join(expansionFunctions.GetComponent().DOFade(0, 0.3f).SetEase(Ease.OutExpo) .OnComplete(() => { expansionFunctions.gameObject.SetActive(false); })); - shrinkSequence.Join(titleRect.DOSizeDelta(new Vector2(322, 100), 0.3f)); + shrinkSequence.Join(titleRect.DOSizeDelta(new Vector2(322, 100), 0.3f).SetEase(Ease.OutExpo)); - shrinkSequence.Append(expansionBackground.DOSizeDelta(new Vector2(322, 826), 0.3f) + shrinkSequence.Append(expansionBackground.DOSizeDelta(new Vector2(322, 826), 0.3f).SetEase(Ease.OutExpo) .OnComplete(() => { expansionBackground.gameObject.SetActive(false); })); shrinkSequence.Join(DOTween.To(() => layoutElement.preferredWidth, - x => layoutElement.preferredWidth = x, 322, 0.3f)); - shrinkSequence.Join(avatarMask.rectTransform.DOSizeDelta(new Vector2(322, 826), 0.3f)); + x => layoutElement.preferredWidth = x, 322, 0.3f).SetEase(Ease.OutExpo)); + shrinkSequence.Join(avatarMask.rectTransform.DOSizeDelta(new Vector2(322, 826), 0.3f).SetEase(Ease.OutExpo)); shrinkSequence.OnStart(() => isDuringAnimation = true); shrinkSequence.OnComplete(() => isDuringAnimation = false); diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index dfc1e51b..466d617c 100644 --- a/Assets/Settings/URP-HighFidelity.asset +++ b/Assets/Settings/URP-HighFidelity.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d4398514f6e7f3df219d1ebd195c58e9c9288085289292c45f5488a669ac130 -size 4594 +oid sha256:1fcd0af0523aaedc90eac0cdfd9474fd1b1c0ee9c616adbc810bf7ed911c308c +size 4596 diff --git a/Assets/Shaders/UI/UIBlurShader.shadergraph b/Assets/Shaders/UI/UIBlurShader.shadergraph new file mode 100644 index 00000000..7a5719d8 --- /dev/null +++ b/Assets/Shaders/UI/UIBlurShader.shadergraph @@ -0,0 +1,797 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "ed7778945c804dcb888ae93f8fe42140", + "m_Properties": [ + { + "m_Id": "505dec7887ef4e2bbe437c4598de7def" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "2874fc39f603417982396451bee218ea" + } + ], + "m_Nodes": [ + { + "m_Id": "78db3bf5faeb451f852ea364d0d277e7" + }, + { + "m_Id": "e921c73a772a476e97ee0cc37800efe7" + }, + { + "m_Id": "3fea01d54930476997a12aeea851c958" + }, + { + "m_Id": "0a97a98ddb834ffebcc96cfae09f08c4" + }, + { + "m_Id": "5c78dc8f4be54744a9ecd626e18ff165" + }, + { + "m_Id": "09137a9a407a4ce7a030dbb22a866da3" + }, + { + "m_Id": "0415a160844e4b1086c6f29f2988ec9d" + }, + { + "m_Id": "8309c276ca0d4fe1b498579bddd92b6d" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "09137a9a407a4ce7a030dbb22a866da3" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0a97a98ddb834ffebcc96cfae09f08c4" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 561.9998779296875, + "y": 112.00000762939453 + }, + "m_Blocks": [ + { + "m_Id": "78db3bf5faeb451f852ea364d0d277e7" + }, + { + "m_Id": "e921c73a772a476e97ee0cc37800efe7" + }, + { + "m_Id": "3fea01d54930476997a12aeea851c958" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 561.9998779296875, + "y": 312.0 + }, + "m_Blocks": [ + { + "m_Id": "0a97a98ddb834ffebcc96cfae09f08c4" + }, + { + "m_Id": "5c78dc8f4be54744a9ecd626e18ff165" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "87b92f4a57b94766a052672b4cac4f1d" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TilingAndOffsetNode", + "m_ObjectId": "0415a160844e4b1086c6f29f2988ec9d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Tiling And Offset", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -114.00007629394531, + "y": 318.0, + "width": 208.00006103515626, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "544e8cd6da0648508ab7a4237264418b" + }, + { + "m_Id": "201de6e8b98c41f4bbbad7241fc1bda6" + }, + { + "m_Id": "733cc73016e0413bb4ce051e59424082" + }, + { + "m_Id": "45044c79bd92431ca4b7f25a9d89f5da" + } + ], + "synonyms": [ + "pan", + "scale" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.UniversalSampleBufferNode", + "m_ObjectId": "09137a9a407a4ce7a030dbb22a866da3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "URP Sample Buffer", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -440.00006103515627, + "y": 88.9999771118164, + "width": 154.99996948242188, + "height": 128.0 + } + }, + "m_Slots": [ + { + "m_Id": "e5203943dffa46f690651d74c0282829" + }, + { + "m_Id": "5df3bdec482542e08c6013ab01b490bb" + } + ], + "synonyms": [ + "normal", + "motion vector", + "blit" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_BufferType": 2 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0a97a98ddb834ffebcc96cfae09f08c4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "7317387dc15e41c7896d544aeb97f700" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "201de6e8b98c41f4bbbad7241fc1bda6", + "m_Id": 1, + "m_DisplayName": "Tiling", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tiling", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 1.0, + "y": 1.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "2874fc39f603417982396451bee218ea", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "505dec7887ef4e2bbe437c4598de7def" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "337d58108d2f443b8b7718374a823e54", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ScreenPositionMaterialSlot", + "m_ObjectId": "3437aa8e664a4009997c5f0d228bf102", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [], + "m_ScreenSpaceType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3fea01d54930476997a12aeea851c958", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c99fbb59c02f475eb7e29e7aea007f18" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "45044c79bd92431ca4b7f25a9d89f5da", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "505dec7887ef4e2bbe437c4598de7def", + "m_Guid": { + "m_GuidSerialized": "266c5540-54b7-41b5-913f-5b2829d57ae9" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "BlurStrengh", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "BlurStrengh", + "m_DefaultReferenceName": "_BlurStrengh", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "544e8cd6da0648508ab7a4237264418b", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5c78dc8f4be54744a9ecd626e18ff165", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "8b0739a7257c4637a624109aee02417d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot", + "m_ObjectId": "5df3bdec482542e08c6013ab01b490bb", + "m_Id": 2, + "m_DisplayName": "Output", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Output", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 1.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "7317387dc15e41c7896d544aeb97f700", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "733cc73016e0413bb4ce051e59424082", + "m_Id": 2, + "m_DisplayName": "Offset", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Offset", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "77d4a4593f2743c3b6b13af364be44a8", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "78db3bf5faeb451f852ea364d0d277e7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "337d58108d2f443b8b7718374a823e54" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SceneColorNode", + "m_ObjectId": "8309c276ca0d4fe1b498579bddd92b6d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Scene Color", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -565.0, + "y": -87.00000762939453, + "width": 138.0, + "height": 76.9999771118164 + } + }, + "m_Slots": [ + { + "m_Id": "3437aa8e664a4009997c5f0d228bf102" + }, + { + "m_Id": "77d4a4593f2743c3b6b13af364be44a8" + } + ], + "synonyms": [ + "screen buffer" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "87b92f4a57b94766a052672b4cac4f1d", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "ab9aa7e1b8934f4c87f8b97a8aa8ed4e" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8b0739a7257c4637a624109aee02417d", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget", + "m_ObjectId": "ab9aa7e1b8934f4c87f8b97a8aa8ed4e" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "b57b7b8396ca4def9ceba692eb22475a", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "c99fbb59c02f475eb7e29e7aea007f18", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ScreenPositionMaterialSlot", + "m_ObjectId": "e5203943dffa46f690651d74c0282829", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [], + "m_ScreenSpaceType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e921c73a772a476e97ee0cc37800efe7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b57b7b8396ca4def9ceba692eb22475a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + diff --git a/Assets/Shaders/UI/UIBlurShader.shadergraph.meta b/Assets/Shaders/UI/UIBlurShader.shadergraph.meta new file mode 100644 index 00000000..8b025f6c --- /dev/null +++ b/Assets/Shaders/UI/UIBlurShader.shadergraph.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: 80d5d5dc275b1a24287655abe958b4d5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} + useAsTemplate: 0 + exposeTemplateAsShader: 0 + template: + name: + category: + description: + icon: {instanceID: 0} + thumbnail: {instanceID: 0} diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android b/Assets/StreamingAssets/ThemeBundles/Android/Android index e8e1afc7..a2f9cd87 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/Android and b/Assets/StreamingAssets/ThemeBundles/Android/Android differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest index 2830e376..220a0273 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest @@ -1,21 +1,21 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3630187769 +CRC: 1212460786 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: Info_0: - Name: unifiedraytracing + Name: shapes Dependencies: {} Info_1: Name: basic Dependencies: {} Info_2: - Name: departure_to_multiverse - Dependencies: {} - Info_3: Name: metropolis_on_orbit Dependencies: {} - Info_4: - Name: shapes + Info_3: + Name: departure_to_multiverse + Dependencies: {} + Info_4: + Name: unifiedraytracing Dependencies: {} diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic b/Assets/StreamingAssets/ThemeBundles/Android/basic index db3a6616..6dc588d1 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Android/basic and b/Assets/StreamingAssets/ThemeBundles/Android/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest index 121cd866..a0f77f99 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/basic.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3948698453 +CRC: 4187162310 Hashes: AssetFileHash: serializedVersion: 2 - Hash: af7857bf316830adc26e256fe67e7e6e + Hash: 041639c891c497f5cda773d76795250a TypeTreeHash: serializedVersion: 2 Hash: dfed41e3b38758e5f34df30221d719dc IncrementalBuildHash: serializedVersion: 2 - Hash: 3808ec220bbc7f0a81ac1b76e5dfc9cf + Hash: fd431a0871b3281e203d8c5ae1ef07e3 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse index 9e0bca35..7d73eb98 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a31ba986fa72fb99202317eed9ffdbe519fa46e8e56675bb3edbcab95434387a -size 1504647 +oid sha256:ee34964900f07e3853f5b0fc28cfa81dbca697d08d6ddb7f7e741d984ca6c6b7 +size 1502797 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest index d2e092ee..36a55626 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 2734173510 +CRC: 1325295300 Hashes: AssetFileHash: serializedVersion: 2 - Hash: a4542586529d099b3c27cdc77de4f41d + Hash: 5451f82a726dcc14425b20ee9bc64122 TypeTreeHash: serializedVersion: 2 Hash: 6d9f9b8bc1074349261a0dbbf7f0f9f8 IncrementalBuildHash: serializedVersion: 2 - Hash: 36398cc0e2113060e136863ff5a62156 + Hash: 93d05b1cb2304ccbb2af18c7f4892613 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest b/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest index 8ef44fe2..88bde296 100644 --- a/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest @@ -10,7 +10,7 @@ Hashes: Hash: 8ab77e54d824a64c30bc20496c5f5926 IncrementalBuildHash: serializedVersion: 2 - Hash: 839fe28321d6bb7ee758d0377b2aba67 + Hash: b9d9c1ed16d6159626cf983018a7d02a HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta index b722297d..21e19158 100644 --- a/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta +++ b/Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkUnitySoundEngine.dll.meta @@ -16,7 +16,7 @@ PluginImporter: settings: Exclude Editor: 1 Editor: - enabled: 0 + enabled: 1 settings: CPU: x86 DefaultValueInitialized: true diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a62d5351..3054298b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fa34b7292233e8f000d9f73cc6ff837fc2c2deb505dc3bd98aa9b87cb0b81f2 -size 29426 +oid sha256:d35a71c3032b670a17f4186006405da3c88cc0eef17511e8b740109d818fac09 +size 29428 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7f7e5841..7e25ee53 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb2f43660e71665568da1c9a539de4df36d4eeace4af47d0b8f453414c7c6ea5 -size 3683 +oid sha256:5c25a0d81423ad53e2446546d73e6582f30f6e2f26405f46e56845af1e3cfd23 +size 3555 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 5403a583..f973c491 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -18,12 +18,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 36 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 83 + controlID: 103970 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -34,23 +34,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Text: "\u6E38\u620F" + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Console\u200B" + m_TextWithWhitespace: "\u6E38\u620F\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 642 - width: 1131 - height: 224 + x: 458 + y: 79 + width: 516 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -64,6 +64,73 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - D:\Projects\ichni Official\Library\PlayModeViewStates\cb35746b7305de745a489f7d790ee0b7 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 06000000000000001200000006000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + 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: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 516 + height: 511 + m_Scale: {x: 0.26875, y: 0.26875} + m_Translation: {x: 257.99997, y: 255.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -959.9998 + y: -950.69763 + width: 1919.9999 + height: 1901.3953 + m_MinimalGUI: 1 + m_defaultScale: 0.26875 + m_LastWindowPixelSize: {x: 516, y: 532} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} + m_showToolbar: 1 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -78,17 +145,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 16} + - {fileID: 17} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 84 + controlID: 103971 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -109,12 +176,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1132 - height: 813.3333 + width: 913 + height: 801 m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 85 + controlID: 103972 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -135,12 +202,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1132 - height: 563.3333 + width: 913 + height: 558 m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 61 + controlID: 103973 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -159,10 +226,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 285.33334 - height: 563.3333 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} + width: 395 + height: 558 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -183,17 +250,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Hierarchy\u200B" + m_TextWithWhitespace: "\u5C42\u7EA7\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 78.66667 - width: 284.33334 - height: 537.3333 + x: 63 + y: 79 + width: 394 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -209,13 +276,90 @@ MonoBehaviour: m_DynamicPanelBehavior: 0 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 65} m_SelectedIDs: - - m_Data: 48546 + - m_Data: -179740 m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -1340 + - m_Data: -207606 + - m_Data: -181032 + - m_Data: -181018 + - m_Data: -179764 + - m_Data: -179758 + - m_Data: -179740 + - m_Data: -179710 + - m_Data: -179308 + - m_Data: -178494 + - m_Data: -164700 + - m_Data: -152312 + - m_Data: -150680 + - m_Data: -68604 + - m_Data: -66952 + - m_Data: -26628 + - m_Data: -18454 + - m_Data: -15364 + - m_Data: -3434 + - m_Data: -1334 + - m_Data: -12 + - m_Data: 79216 + - m_Data: 79324 + - m_Data: 79376 + - m_Data: 82610 + - m_Data: 83484 + - m_Data: 83542 + - m_Data: 84074 + - m_Data: 84172 + - m_Data: 84222 + - m_Data: 84534 + - m_Data: 84646 + - m_Data: 84892 + - m_Data: 84904 + - m_Data: 90100 + - m_Data: 90836 + - m_Data: 90894 + - m_Data: 91070 + - m_Data: 91426 + - m_Data: 91574 + - m_Data: 91886 + - m_Data: 91998 + - m_Data: 92244 + - m_Data: 92256 + - m_Data: 108424 + - m_Data: 108686 + - m_Data: 109156 + - m_Data: 109446 + - m_Data: 112274 + - m_Data: 113008 + - m_Data: 113170 + - m_Data: 113202 + - m_Data: 113402 + - m_Data: 113438 + - m_Data: 113664 + - m_Data: 114424 + - m_Data: 117846 + - m_Data: 118436 + - m_Data: 118584 + - m_Data: 119254 + - m_Data: 119266 + - m_Data: 120316 + - m_Data: 120528 + - m_Data: 120668 + - m_Data: 120726 + - m_Data: 120840 + - m_Data: 120902 + - m_Data: 121114 + - m_Data: 121258 + - m_Data: 121406 + - m_Data: 121654 + - m_Data: 121718 + - m_Data: 121772 + - m_Data: 121806 + - m_Data: 121944 + - m_Data: 122050 + - m_Data: 122056 + - m_Data: 122064 + - m_Data: 122088 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -256,15 +400,16 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 285.33334 + x: 395 y: 0 - width: 846.6666 - height: 563.3333 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 10} + width: 518 + height: 558 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 2} m_Panes: - {fileID: 9} + - {fileID: 2} - {fileID: 10} - {fileID: 11} m_Selected: 1 @@ -284,17 +429,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Text: "\u573A\u666F" + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Scene\u200B" + m_TextWithWhitespace: "\u573A\u666F\u200B" m_Pos: serializedVersion: 2 - x: 285.33334 - y: 78.66667 - width: 844.6666 - height: 544.6667 + x: 458 + y: 79 + width: 516 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -337,12 +482,12 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-toolbar index: 4 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-469.3333740234375,"y":25.333332061767579},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":46.6666259765625,"y":25.333332061767579},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -469.33337, y: 25.333332} + snapOffset: {x: 46.666626, y: 25.333332} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 0 layout: 1 size: {x: 0, y: 0} sizeOverridden: 0 @@ -957,15 +1102,15 @@ 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_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -41.481003, y: -5.709297, z: 20161.71} + m_Target: {x: -40.499294, y: 15.785117, z: -4.457644} speed: 2 - m_Value: {x: -41.481003, y: -5.709297, z: 20161.71} + m_Value: {x: -40.499294, y: 15.785117, z: -4.457644} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1011,17 +1156,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.08836473, y: 0.03326898, z: -0.0025345457, w: 0.99569273} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: 0.08835035, y: 0.033263568, z: -0.0025341334, w: 0.9955307} m_Size: - m_Target: 96.360664 + m_Target: 10.7481 speed: 2 - m_Value: 96.360664 + m_Value: 10.7481 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 @@ -1052,112 +1197,6 @@ MonoBehaviour: section: Baked Global Illumination m_ViewIsLockedToObject: 0 --- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, 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, - type: 0} - m_Tooltip: - m_TextWithWhitespace: "Game\u200B" - m_Pos: - serializedVersion: 2 - x: 285.33334 - y: 78.66667 - width: 844.6666 - height: 537.3333 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_DynamicPanelContainerData: [] - m_OverlaysVisible: 1 - m_DynamicPanelBehavior: 0 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - D:\Projects\ichni Official\Library\PlayModeViewStates\cb35746b7305de745a489f7d790ee0b7 - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1267, y: 713} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 0a000000000000001200000006000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -422.33334 - m_HBaseRangeMax: 422.33334 - m_VBaseRangeMin: -237.66667 - m_VBaseRangeMax: 237.66667 - 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: 844.6666 - height: 516.3333 - m_Scale: {x: 0.99999994, y: 0.9999999} - m_Translation: {x: 422.3333, y: 258.16666} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -422.33334 - y: -258.1667 - width: 844.6667 - height: 516.3334 - m_MinimalGUI: 1 - m_defaultScale: 0.99999994 - m_LastWindowPixelSize: {x: 1267, y: 806} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} - m_showToolbar: 1 ---- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1172,17 +1211,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B\u5668" + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animator\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u5668\u200B" m_Pos: serializedVersion: 2 - x: 264 - y: 78.66667 - width: 780.6666 - height: 544 + x: 458 + y: 79 + width: 516 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1201,6 +1240,7 @@ MonoBehaviour: - {fileID: 1107513844591874750, guid: 6bb62cb4c18d9d64db0b1e04206d84de, type: 2} - {fileID: 1107513844591874750, guid: c20c187d4b7282b4a976d0c296710fb8, type: 2} - {fileID: -9213322630146201385, guid: 258a1e0e215e6ee47ba26fc1c3662225, type: 2} + - {fileID: 1107572334616935164, guid: 93fbe37370f09fe4a934819f103333ea, type: 2} m_ValueSerializationHelper: - e00: 0.5192983 e01: 0 @@ -1218,14 +1258,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5192983 + - e00: 0.7288988 e01: 0 e02: 0 - e03: -10.964935 + e03: -5.7432556 e10: 0 - e11: 0.5192983 + e11: 0.7288988 e12: 0 - e13: 198.66666 + e13: 124.03904 e20: 0 e21: 0 e22: 1 @@ -1250,9 +1290,29 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 0} - m_BreadCrumbs: [] + m_AnimatorController: {fileID: 9100000, guid: 93fbe37370f09fe4a934819f103333ea, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1107572334616935164, guid: 93fbe37370f09fe4a934819f103333ea, + type: 2} + m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} blendTreeGraph: {fileID: 0} @@ -1264,6 +1324,282 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 924ffcbe75518854f97b48776d0f1939, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.ShaderGraph.Editor::UnityEditor.ShaderGraph.Drawing.MaterialGraphEditWindow + m_MinSize: {x: 50, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: UIBlurShader + m_Image: {fileID: 2800000, guid: 7129268cf102b2f45809905bcb27ce8b, type: 3} + m_Tooltip: + m_TextWithWhitespace: "UIBlurShader\u200B" + m_Pos: + serializedVersion: 2 + x: 293 + y: 79 + width: 681 + height: 532 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_Selected: 80d5d5dc275b1a24287655abe958b4d5 + m_GraphObject: {fileID: 0} + m_LastSerializedFileContents: "{\n \"m_SGVersion\": 3,\n \"m_Type\": \"UnityEditor.ShaderGraph.GraphData\",\n + \"m_ObjectId\": \"ed7778945c804dcb888ae93f8fe42140\",\n \"m_Properties\": + [\n {\n \"m_Id\": \"505dec7887ef4e2bbe437c4598de7def\"\n + }\n ],\n \"m_Keywords\": [],\n \"m_Dropdowns\": [],\n \"m_CategoryData\": + [\n {\n \"m_Id\": \"2874fc39f603417982396451bee218ea\"\n + }\n ],\n \"m_Nodes\": [\n {\n \"m_Id\": \"78db3bf5faeb451f852ea364d0d277e7\"\n + },\n {\n \"m_Id\": \"e921c73a772a476e97ee0cc37800efe7\"\n + },\n {\n \"m_Id\": \"3fea01d54930476997a12aeea851c958\"\n + },\n {\n \"m_Id\": \"0a97a98ddb834ffebcc96cfae09f08c4\"\n + },\n {\n \"m_Id\": \"5c78dc8f4be54744a9ecd626e18ff165\"\n + },\n {\n \"m_Id\": \"09137a9a407a4ce7a030dbb22a866da3\"\n + },\n {\n \"m_Id\": \"0415a160844e4b1086c6f29f2988ec9d\"\n + },\n {\n \"m_Id\": \"8309c276ca0d4fe1b498579bddd92b6d\"\n + }\n ],\n \"m_GroupDatas\": [],\n \"m_StickyNoteDatas\": [],\n \"m_Edges\": + [\n {\n \"m_OutputSlot\": {\n \"m_Node\": {\n + \"m_Id\": \"09137a9a407a4ce7a030dbb22a866da3\"\n },\n + \"m_SlotId\": 2\n },\n \"m_InputSlot\": {\n + \"m_Node\": {\n \"m_Id\": \"0a97a98ddb834ffebcc96cfae09f08c4\"\n + },\n \"m_SlotId\": 0\n }\n }\n ],\n \"m_VertexContext\": + {\n \"m_Position\": {\n \"x\": 561.9998779296875,\n + \"y\": 112.00000762939453\n },\n \"m_Blocks\": [\n {\n + \"m_Id\": \"78db3bf5faeb451f852ea364d0d277e7\"\n },\n {\n + \"m_Id\": \"e921c73a772a476e97ee0cc37800efe7\"\n },\n {\n + \"m_Id\": \"3fea01d54930476997a12aeea851c958\"\n }\n ]\n + },\n \"m_FragmentContext\": {\n \"m_Position\": {\n \"x\": + 561.9998779296875,\n \"y\": 312.0\n },\n \"m_Blocks\": + [\n {\n \"m_Id\": \"0a97a98ddb834ffebcc96cfae09f08c4\"\n + },\n {\n \"m_Id\": \"5c78dc8f4be54744a9ecd626e18ff165\"\n + }\n ]\n },\n \"m_PreviewData\": {\n \"serializedMesh\": {\n + \"m_SerializedMesh\": \"{\\\"mesh\\\":{\\\"instanceID\\\":0}}\",\n + \"m_Guid\": \"\"\n },\n \"preventRotation\": false\n },\n + \"m_Path\": \"Shader Graphs\",\n \"m_GraphPrecision\": 1,\n \"m_PreviewMode\": + 2,\n \"m_OutputNode\": {\n \"m_Id\": \"\"\n },\n \"m_SubDatas\": + [],\n \"m_ActiveTargets\": [\n {\n \"m_Id\": \"87b92f4a57b94766a052672b4cac4f1d\"\n + }\n ]\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.TilingAndOffsetNode\",\n + \"m_ObjectId\": \"0415a160844e4b1086c6f29f2988ec9d\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"Tiling And Offset\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": -114.00007629394531,\n \"y\": 318.0,\n + \"width\": 208.00006103515626,\n \"height\": 326.0\n }\n + },\n \"m_Slots\": [\n {\n \"m_Id\": \"544e8cd6da0648508ab7a4237264418b\"\n + },\n {\n \"m_Id\": \"201de6e8b98c41f4bbbad7241fc1bda6\"\n + },\n {\n \"m_Id\": \"733cc73016e0413bb4ce051e59424082\"\n + },\n {\n \"m_Id\": \"45044c79bd92431ca4b7f25a9d89f5da\"\n + }\n ],\n \"synonyms\": [\n \"pan\",\n \"scale\"\n ],\n + \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_DismissedVersion\": + 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": {\n \"m_SerializableColors\": + []\n }\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.Rendering.Universal.UniversalSampleBufferNode\",\n + \"m_ObjectId\": \"09137a9a407a4ce7a030dbb22a866da3\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"URP Sample Buffer\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": -440.00006103515627,\n \"y\": 88.9999771118164,\n + \"width\": 154.99996948242188,\n \"height\": 128.0\n }\n + },\n \"m_Slots\": [\n {\n \"m_Id\": \"e5203943dffa46f690651d74c0282829\"\n + },\n {\n \"m_Id\": \"5df3bdec482542e08c6013ab01b490bb\"\n + }\n ],\n \"synonyms\": [\n \"normal\",\n \"motion vector\",\n + \"blit\"\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n + \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_BufferType\": 2\n}\n\n{\n + \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"0a97a98ddb834ffebcc96cfae09f08c4\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"SurfaceDescription.BaseColor\",\n + \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n + \"serializedVersion\": \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n + \"width\": 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": + [\n {\n \"m_Id\": \"7317387dc15e41c7896d544aeb97f700\"\n + }\n ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"SurfaceDescription.BaseColor\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.Vector2MaterialSlot\",\n \"m_ObjectId\": \"201de6e8b98c41f4bbbad7241fc1bda6\",\n + \"m_Id\": 1,\n \"m_DisplayName\": \"Tiling\",\n \"m_SlotType\": 0,\n + \"m_Hidden\": false,\n \"m_ShaderOutputName\": \"Tiling\",\n \"m_StageCapability\": + 3,\n \"m_Value\": {\n \"x\": 1.0,\n \"y\": 1.0\n },\n + \"m_DefaultValue\": {\n \"x\": 1.0,\n \"y\": 1.0\n },\n \"m_Labels\": + []\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.CategoryData\",\n + \"m_ObjectId\": \"2874fc39f603417982396451bee218ea\",\n \"m_Name\": \"\",\n + \"m_ChildObjectList\": [\n {\n \"m_Id\": \"505dec7887ef4e2bbe437c4598de7def\"\n + }\n ]\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.PositionMaterialSlot\",\n + \"m_ObjectId\": \"337d58108d2f443b8b7718374a823e54\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"Position\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"Position\",\n \"m_StageCapability\": 1,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n + \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": + 0.0\n },\n \"m_Labels\": [],\n \"m_Space\": 0\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.ScreenPositionMaterialSlot\",\n + \"m_ObjectId\": \"3437aa8e664a4009997c5f0d228bf102\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"UV\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"UV\",\n \"m_StageCapability\": 3,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0,\n \"w\": + 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n + \"z\": 0.0,\n \"w\": 0.0\n },\n \"m_Labels\": [],\n \"m_ScreenSpaceType\": + 0\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"3fea01d54930476997a12aeea851c958\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"VertexDescription.Tangent\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": + 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": [\n + {\n \"m_Id\": \"c99fbb59c02f475eb7e29e7aea007f18\"\n }\n + ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"VertexDescription.Tangent\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.Vector2MaterialSlot\",\n \"m_ObjectId\": \"45044c79bd92431ca4b7f25a9d89f5da\",\n + \"m_Id\": 3,\n \"m_DisplayName\": \"Out\",\n \"m_SlotType\": 1,\n \"m_Hidden\": + false,\n \"m_ShaderOutputName\": \"Out\",\n \"m_StageCapability\": 3,\n + \"m_Value\": {\n \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_DefaultValue\": + {\n \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_Labels\": []\n}\n\n{\n + \"m_SGVersion\": 1,\n \"m_Type\": \"UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty\",\n + \"m_ObjectId\": \"505dec7887ef4e2bbe437c4598de7def\",\n \"m_Guid\": {\n + \"m_GuidSerialized\": \"266c5540-54b7-41b5-913f-5b2829d57ae9\"\n },\n \"promotedFromAssetID\": + \"\",\n \"promotedFromCategoryName\": \"\",\n \"promotedOrdering\": -1,\n + \"m_Name\": \"BlurStrengh\",\n \"m_DefaultRefNameVersion\": 1,\n \"m_RefNameGeneratedByDisplayName\": + \"BlurStrengh\",\n \"m_DefaultReferenceName\": \"_BlurStrengh\",\n \"m_OverrideReferenceName\": + \"\",\n \"m_GeneratePropertyBlock\": true,\n \"m_UseCustomSlotLabel\": + false,\n \"m_CustomSlotLabel\": \"\",\n \"m_DismissedVersion\": 0,\n + \"m_Precision\": 0,\n \"overrideHLSLDeclaration\": false,\n \"hlslDeclarationOverride\": + 0,\n \"m_Hidden\": false,\n \"m_PerRendererData\": false,\n \"m_customAttributes\": + [],\n \"m_Value\": 0.0,\n \"m_FloatType\": 0,\n \"m_LiteralFloatMode\": + false,\n \"m_RangeValues\": {\n \"x\": 0.0,\n \"y\": 1.0\n + },\n \"m_SliderType\": 0,\n \"m_SliderPower\": 3.0,\n \"m_EnumType\": + 0,\n \"m_CSharpEnumString\": \"\",\n \"m_EnumNames\": [\n \"Default\"\n + ],\n \"m_EnumValues\": [\n 0\n ]\n}\n\n{\n \"m_SGVersion\": 0,\n + \"m_Type\": \"UnityEditor.ShaderGraph.UVMaterialSlot\",\n \"m_ObjectId\": + \"544e8cd6da0648508ab7a4237264418b\",\n \"m_Id\": 0,\n \"m_DisplayName\": + \"UV\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n \"m_ShaderOutputName\": + \"UV\",\n \"m_StageCapability\": 3,\n \"m_Value\": {\n \"x\": 0.0,\n + \"y\": 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": + 0.0\n },\n \"m_Labels\": [],\n \"m_Channel\": 0\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n \"m_ObjectId\": + \"5c78dc8f4be54744a9ecd626e18ff165\",\n \"m_Group\": {\n \"m_Id\": + \"\"\n },\n \"m_Name\": \"SurfaceDescription.Alpha\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": + 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": [\n + {\n \"m_Id\": \"8b0739a7257c4637a624109aee02417d\"\n }\n + ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"SurfaceDescription.Alpha\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.ColorRGBAMaterialSlot\",\n \"m_ObjectId\": \"5df3bdec482542e08c6013ab01b490bb\",\n + \"m_Id\": 2,\n \"m_DisplayName\": \"Output\",\n \"m_SlotType\": 1,\n + \"m_Hidden\": false,\n \"m_ShaderOutputName\": \"Output\",\n \"m_StageCapability\": + 2,\n \"m_Value\": {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": + 0.0,\n \"w\": 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n + \"y\": 0.0,\n \"z\": 0.0,\n \"w\": 1.0\n },\n \"m_Labels\": + []\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.ColorRGBMaterialSlot\",\n + \"m_ObjectId\": \"7317387dc15e41c7896d544aeb97f700\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"Base Color\",\n \"m_SlotType\": 0,\n \"m_Hidden\": + false,\n \"m_ShaderOutputName\": \"BaseColor\",\n \"m_StageCapability\": + 2,\n \"m_Value\": {\n \"x\": 0.5,\n \"y\": 0.5,\n \"z\": + 0.5\n },\n \"m_DefaultValue\": {\n \"x\": 0.5,\n \"y\": 0.5,\n + \"z\": 0.5\n },\n \"m_Labels\": [],\n \"m_ColorMode\": 0,\n \"m_DefaultColor\": + {\n \"r\": 0.5,\n \"g\": 0.5,\n \"b\": 0.5,\n \"a\": + 1.0\n }\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.Vector2MaterialSlot\",\n + \"m_ObjectId\": \"733cc73016e0413bb4ce051e59424082\",\n \"m_Id\": 2,\n + \"m_DisplayName\": \"Offset\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"Offset\",\n \"m_StageCapability\": 3,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_DefaultValue\": {\n + \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_Labels\": []\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.Vector3MaterialSlot\",\n \"m_ObjectId\": + \"77d4a4593f2743c3b6b13af364be44a8\",\n \"m_Id\": 1,\n \"m_DisplayName\": + \"Out\",\n \"m_SlotType\": 1,\n \"m_Hidden\": false,\n \"m_ShaderOutputName\": + \"Out\",\n \"m_StageCapability\": 2,\n \"m_Value\": {\n \"x\": 0.0,\n + \"y\": 0.0,\n \"z\": 0.0\n },\n \"m_DefaultValue\": {\n \"x\": + 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n \"m_Labels\": []\n}\n\n{\n + \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"78db3bf5faeb451f852ea364d0d277e7\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"VertexDescription.Position\",\n + \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n + \"serializedVersion\": \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n + \"width\": 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": + [\n {\n \"m_Id\": \"337d58108d2f443b8b7718374a823e54\"\n + }\n ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"VertexDescription.Position\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.SceneColorNode\",\n \"m_ObjectId\": \"8309c276ca0d4fe1b498579bddd92b6d\",\n + \"m_Group\": {\n \"m_Id\": \"\"\n },\n \"m_Name\": \"Scene Color\",\n + \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n + \"serializedVersion\": \"2\",\n \"x\": -565.0,\n \"y\": + -87.00000762939453,\n \"width\": 138.0,\n \"height\": 76.9999771118164\n + }\n },\n \"m_Slots\": [\n {\n \"m_Id\": \"3437aa8e664a4009997c5f0d228bf102\"\n + },\n {\n \"m_Id\": \"77d4a4593f2743c3b6b13af364be44a8\"\n + }\n ],\n \"synonyms\": [\n \"screen buffer\"\n ],\n \"m_Precision\": + 0,\n \"m_PreviewExpanded\": true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": + 0,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}\n\n{\n + \"m_SGVersion\": 1,\n \"m_Type\": \"UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget\",\n + \"m_ObjectId\": \"87b92f4a57b94766a052672b4cac4f1d\",\n \"m_Datas\": [],\n + \"m_ActiveSubTarget\": {\n \"m_Id\": \"ab9aa7e1b8934f4c87f8b97a8aa8ed4e\"\n + },\n \"m_AllowMaterialOverride\": false,\n \"m_SurfaceType\": 0,\n \"m_ZTestMode\": + 4,\n \"m_ZWriteControl\": 0,\n \"m_AlphaMode\": 0,\n \"m_RenderFace\": + 2,\n \"m_AlphaClip\": false,\n \"m_CastShadows\": true,\n \"m_ReceiveShadows\": + true,\n \"m_DisableTint\": false,\n \"m_Sort3DAs2DCompatible\": false,\n + \"m_AdditionalMotionVectorMode\": 0,\n \"m_AlembicMotionVectors\": false,\n + \"m_SupportsLODCrossFade\": false,\n \"m_CustomEditorGUI\": \"\",\n \"m_SupportVFX\": + false\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\",\n + \"m_ObjectId\": \"8b0739a7257c4637a624109aee02417d\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"Alpha\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"Alpha\",\n \"m_StageCapability\": 2,\n \"m_Value\": + 1.0,\n \"m_DefaultValue\": 1.0,\n \"m_Labels\": [],\n \"m_LiteralMode\": + false\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget\",\n + \"m_ObjectId\": \"ab9aa7e1b8934f4c87f8b97a8aa8ed4e\"\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.NormalMaterialSlot\",\n \"m_ObjectId\": + \"b57b7b8396ca4def9ceba692eb22475a\",\n \"m_Id\": 0,\n \"m_DisplayName\": + \"Normal\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n \"m_ShaderOutputName\": + \"Normal\",\n \"m_StageCapability\": 1,\n \"m_Value\": {\n \"x\": + 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n \"m_DefaultValue\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n + \"m_Labels\": [],\n \"m_Space\": 0\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.TangentMaterialSlot\",\n \"m_ObjectId\": \"c99fbb59c02f475eb7e29e7aea007f18\",\n + \"m_Id\": 0,\n \"m_DisplayName\": \"Tangent\",\n \"m_SlotType\": 0,\n + \"m_Hidden\": false,\n \"m_ShaderOutputName\": \"Tangent\",\n \"m_StageCapability\": + 1,\n \"m_Value\": {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": + 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n + \"z\": 0.0\n },\n \"m_Labels\": [],\n \"m_Space\": 0\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.ScreenPositionMaterialSlot\",\n + \"m_ObjectId\": \"e5203943dffa46f690651d74c0282829\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"UV\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"UV\",\n \"m_StageCapability\": 3,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0,\n \"w\": + 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n + \"z\": 0.0,\n \"w\": 0.0\n },\n \"m_Labels\": [],\n \"m_ScreenSpaceType\": + 0\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"e921c73a772a476e97ee0cc37800efe7\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"VertexDescription.Normal\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": + 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": [\n + {\n \"m_Id\": \"b57b7b8396ca4def9ceba692eb22475a\"\n }\n + ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"VertexDescription.Normal\"\n}\n\n" + m_AssetMaybeChangedOnDisk: 0 + m_AssetMaybeDeleted: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1274,25 +1610,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 563.3333 - width: 1132 - height: 250 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 2} + y: 558 + width: 913 + height: 243 + m_MinSize: {x: 231, y: 276} + m_MaxSize: {x: 10001, y: 10026} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - - {fileID: 2} - {fileID: 14} - {fileID: 15} - m_Selected: 1 - m_LastSelected: 0 + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 2 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1308,17 +1644,17 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Project\u200B" + m_TextWithWhitespace: "\u9879\u76EE\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 642 - width: 1131 - height: 224 + x: 63 + y: 637 + width: 912 + height: 217 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1333,7 +1669,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_SearchFilter: - m_NameFilter: SettingsM + m_NameFilter: m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] @@ -1341,139 +1677,81 @@ MonoBehaviour: m_SceneHandles: [] m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 1 + m_SearchArea: 0 m_Folders: - - Assets/Story/Chapter0 + - Assets/Scripts/UI/ChapterSelection m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 - m_OriginalText: SettingsM + m_OriginalText: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Story/Chapter0 + - Assets/Scripts/UI/ChapterSelection m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Projects\ichni Official + m_LastProjectPath: C:\ichniOfficial\ichni_Official m_LockTracker: m_IsLocked: 0 - m_LastLocalAssetsSearchArea: 1 + m_LastLocalAssetsSearchArea: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 904} + scrollPos: {x: 0, y: 955} m_SelectedIDs: - - m_Data: 87572 + - m_Data: 93780 m_LastClickedID: - m_Data: 87572 + m_Data: 93780 m_ExpandedIDs: - m_Data: 0 - - m_Data: 84666 - - m_Data: 84668 - - m_Data: 84670 - - m_Data: 84672 - - m_Data: 84674 - - m_Data: 84676 - - m_Data: 84678 - - m_Data: 84680 - - m_Data: 84682 - - m_Data: 84684 - - m_Data: 84686 - - m_Data: 84688 - - m_Data: 84690 - - m_Data: 84692 - - m_Data: 84694 - - m_Data: 84696 - - m_Data: 84698 - - m_Data: 84700 - - m_Data: 84702 - - m_Data: 84704 - - m_Data: 84706 - - m_Data: 84708 - - m_Data: 84710 - - m_Data: 84712 - - m_Data: 84714 - - m_Data: 84716 - - m_Data: 84718 - - m_Data: 84720 - - m_Data: 84722 - - m_Data: 84724 - - m_Data: 84726 - - m_Data: 84728 - - m_Data: 84730 - - m_Data: 84732 - - m_Data: 84734 - - m_Data: 84736 - - m_Data: 84738 - - m_Data: 84740 - - m_Data: 84742 - - m_Data: 84744 - - m_Data: 84746 - - m_Data: 84748 - - m_Data: 84750 - - m_Data: 84752 - - m_Data: 84754 - - m_Data: 84756 - - m_Data: 84758 - - m_Data: 84760 - - m_Data: 84762 - - m_Data: 84764 - - m_Data: 84766 - - m_Data: 84768 - - m_Data: 84770 - - m_Data: 84772 - - m_Data: 84774 - - m_Data: 84776 - - m_Data: 84778 - - m_Data: 84780 - - m_Data: 84782 - - m_Data: 84784 - - m_Data: 84786 - - m_Data: 84788 - - m_Data: 84790 - - m_Data: 84792 - - m_Data: 84794 - - m_Data: 84796 - - m_Data: 84798 - - m_Data: 84800 - - m_Data: 84802 - - m_Data: 84804 - - m_Data: 84806 - - m_Data: 84808 - - m_Data: 84810 - - m_Data: 84812 - - m_Data: 84814 - - m_Data: 84816 - - m_Data: 84818 - - m_Data: 84820 - - m_Data: 84822 - - m_Data: 84824 - - m_Data: 84826 - - m_Data: 84828 - - m_Data: 84830 - - m_Data: 84832 - - m_Data: 84834 - - m_Data: 84836 - - m_Data: 84838 - - m_Data: 84840 - - m_Data: 84842 - - m_Data: 84844 - - m_Data: 84846 - - m_Data: 84848 - - m_Data: 84850 - - m_Data: 84852 - - m_Data: 84854 - - m_Data: 84856 - - m_Data: 84858 - - m_Data: 84860 - - m_Data: 84862 - - m_Data: 84864 - - m_Data: 84866 - - m_Data: 84868 - - m_Data: 84870 - - m_Data: 84872 - - m_Data: 84874 - - m_Data: 84876 - - m_Data: 87556 + - m_Data: 81284 + - m_Data: 81286 + - m_Data: 81288 + - m_Data: 81290 + - m_Data: 81292 + - m_Data: 81294 + - m_Data: 81296 + - m_Data: 81298 + - m_Data: 81300 + - m_Data: 81302 + - m_Data: 81304 + - m_Data: 81306 + - m_Data: 81308 + - m_Data: 81310 + - m_Data: 81312 + - m_Data: 81314 + - m_Data: 81316 + - m_Data: 81318 + - m_Data: 81320 + - m_Data: 81322 + - m_Data: 81324 + - m_Data: 81326 + - m_Data: 81328 + - m_Data: 81330 + - m_Data: 81332 + - m_Data: 81334 + - m_Data: 81336 + - m_Data: 81338 + - m_Data: 81340 + - m_Data: 81342 + - m_Data: 81344 + - m_Data: 81346 + - m_Data: 81348 + - m_Data: 81350 + - m_Data: 81352 + - m_Data: 81354 + - m_Data: 81356 + - m_Data: 81358 + - m_Data: 81360 + - m_Data: 81362 + - m_Data: 81364 + - m_Data: 81366 + - m_Data: 81368 + - m_Data: 81370 + - m_Data: 81810 + - m_Data: 81876 + - m_Data: 81968 + - m_Data: 88024 + - m_Data: 88026 - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1507,112 +1785,55 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 84666 - - m_Data: 84668 - - m_Data: 84670 - - m_Data: 84672 - - m_Data: 84674 - - m_Data: 84676 - - m_Data: 84678 - - m_Data: 84680 - - m_Data: 84682 - - m_Data: 84684 - - m_Data: 84686 - - m_Data: 84688 - - m_Data: 84690 - - m_Data: 84692 - - m_Data: 84694 - - m_Data: 84696 - - m_Data: 84698 - - m_Data: 84700 - - m_Data: 84702 - - m_Data: 84704 - - m_Data: 84706 - - m_Data: 84708 - - m_Data: 84710 - - m_Data: 84712 - - m_Data: 84714 - - m_Data: 84716 - - m_Data: 84718 - - m_Data: 84720 - - m_Data: 84722 - - m_Data: 84724 - - m_Data: 84726 - - m_Data: 84728 - - m_Data: 84730 - - m_Data: 84732 - - m_Data: 84734 - - m_Data: 84736 - - m_Data: 84738 - - m_Data: 84740 - - m_Data: 84742 - - m_Data: 84744 - - m_Data: 84746 - - m_Data: 84748 - - m_Data: 84750 - - m_Data: 84752 - - m_Data: 84754 - - m_Data: 84756 - - m_Data: 84758 - - m_Data: 84760 - - m_Data: 84762 - - m_Data: 84764 - - m_Data: 84766 - - m_Data: 84768 - - m_Data: 84770 - - m_Data: 84772 - - m_Data: 84774 - - m_Data: 84776 - - m_Data: 84778 - - m_Data: 84780 - - m_Data: 84782 - - m_Data: 84784 - - m_Data: 84786 - - m_Data: 84788 - - m_Data: 84790 - - m_Data: 84792 - - m_Data: 84794 - - m_Data: 84796 - - m_Data: 84798 - - m_Data: 84800 - - m_Data: 84802 - - m_Data: 84804 - - m_Data: 84806 - - m_Data: 84808 - - m_Data: 84810 - - m_Data: 84812 - - m_Data: 84814 - - m_Data: 84816 - - m_Data: 84818 - - m_Data: 84820 - - m_Data: 84822 - - m_Data: 84824 - - m_Data: 84826 - - m_Data: 84828 - - m_Data: 84830 - - m_Data: 84832 - - m_Data: 84834 - - m_Data: 84836 - - m_Data: 84838 - - m_Data: 84840 - - m_Data: 84842 - - m_Data: 84844 - - m_Data: 84846 - - m_Data: 84848 - - m_Data: 84850 - - m_Data: 84852 - - m_Data: 84854 - - m_Data: 84856 - - m_Data: 84858 - - m_Data: 84860 - - m_Data: 84862 - - m_Data: 84864 - - m_Data: 84866 - - m_Data: 84868 - - m_Data: 84870 - - m_Data: 84872 - - m_Data: 84874 - - m_Data: 84876 + - m_Data: 81284 + - m_Data: 81286 + - m_Data: 81288 + - m_Data: 81290 + - m_Data: 81292 + - m_Data: 81294 + - m_Data: 81296 + - m_Data: 81298 + - m_Data: 81300 + - m_Data: 81302 + - m_Data: 81304 + - m_Data: 81306 + - m_Data: 81308 + - m_Data: 81310 + - m_Data: 81312 + - m_Data: 81314 + - m_Data: 81316 + - m_Data: 81318 + - m_Data: 81320 + - m_Data: 81322 + - m_Data: 81324 + - m_Data: 81326 + - m_Data: 81328 + - m_Data: 81330 + - m_Data: 81332 + - m_Data: 81334 + - m_Data: 81336 + - m_Data: 81338 + - m_Data: 81340 + - m_Data: 81342 + - m_Data: 81344 + - m_Data: 81346 + - m_Data: 81348 + - m_Data: 81350 + - m_Data: 81352 + - m_Data: 81354 + - m_Data: 81356 + - m_Data: 81358 + - m_Data: 81360 + - m_Data: 81362 + - m_Data: 81364 + - m_Data: 81366 + - m_Data: 81368 + - m_Data: 81370 + - m_Data: 81810 + - m_Data: 81968 + - m_Data: 88024 + - m_Data: 88026 + - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1640,8 +1861,8 @@ MonoBehaviour: m_ResourceFile: m_ListAreaState: m_SelectedInstanceIDs: - - m_Data: 48546 - m_LastClickedInstanceID: 48546 + - m_Data: -179740 + m_LastClickedInstanceID: -179740 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: - m_Data: 0 @@ -1653,6 +1874,7 @@ MonoBehaviour: - m_Data: 81828 - m_Data: 75488 - m_Data: 81570 + - m_Data: 126408 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1683,6 +1905,45 @@ MonoBehaviour: m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 209 --- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u63A7\u5236\u53F0" + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_TextWithWhitespace: "\u63A7\u5236\u53F0\u200B" + m_Pos: + serializedVersion: 2 + x: 63 + y: 637 + width: 912 + height: 217 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1697,17 +1958,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B" + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animation\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 648.6667 - width: 1045.6666 - height: 217.33331 + x: 63 + y: 637 + width: 912 + height: 217 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1723,8 +1984,8 @@ MonoBehaviour: m_DynamicPanelBehavior: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 48546 ---- !u!114 &15 + m_LastSelectedObjectID: -179740 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1762,7 +2023,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1777,22 +2038,22 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1132 + x: 913 y: 0 - width: 574.6666 - height: 813.3333 - m_MinSize: {x: 276, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 19} + width: 464 + height: 801 + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 17} - {fileID: 18} - {fileID: 19} - {fileID: 20} - {fileID: 21} + - {fileID: 22} m_Selected: 2 m_LastSelected: 1 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} @@ -1831,10 +2092,40 @@ MonoBehaviour: m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 m_WidgetStates: - m_Keys: [] - m_Values: [] + m_Keys: + - Display Stats -> Frame Stats + - Display Stats -> Bottlenecks + - Display Stats -> Detailed Stats + - Frequently Used -> Rendering Debug + - Frequently Used -> Material Filters + - Frequently Used -> Lighting Debug Modes + - Rendering -> Pixel Validation + - Rendering -> HDR Output + - Rendering -> GPU Resident Drawer Settings + - Rendering -> Occlusion Context Stats + - Rendering -> Instance Culler Stats + - Rendering -> Render Graph + - Material -> Material Validation + - Volume -> Camera + - Volume -> Component + m_Values: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Settings: {fileID: 0} ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1849,17 +2140,17 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 - x: 1132 - y: 78.66667 - width: 573.66675 - height: 787.3334 + x: 976 + y: 79 + width: 463 + height: 775 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1880,65 +2171,13 @@ MonoBehaviour: m_CachedPref: -312.99988 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 75430 + m_LastInspectedObjectInstanceID: 75380 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 1 m_PreviewWindow: {fileID: 0} ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" - m_Pos: - serializedVersion: 2 - x: 1132 - y: 78.66667 - width: 573.6666 - height: 787.3333 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_DynamicPanelContainerData: [] - m_OverlaysVisible: 1 - m_DynamicPanelBehavior: 0 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 184.33334 - m_ControlHash: 1412526313 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} --- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1954,11 +2193,63 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" + m_Pos: + serializedVersion: 2 + x: 976 + y: 79 + width: 463 + height: 775 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -184.33334 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &21 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 x: 1046.6667 @@ -1984,14 +2275,14 @@ MonoBehaviour: m_CachedPref: 165.66669 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 48546 + m_LastInspectedObjectInstanceID: -179740 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2006,11 +2297,11 @@ MonoBehaviour: m_MinSize: {x: 390, y: 390} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Lighting - m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, + m_Text: "\u5149\u7167" + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Lighting\u200B" + m_TextWithWhitespace: "\u5149\u7167\u200B" m_Pos: serializedVersion: 2 x: 1102.6667 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 37066ca7..de2cdb0a 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 42.666668 - width: 1706.6667 - height: 869.3334 + x: 63 + y: 43 + width: 1377 + height: 857 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: "\u6E38\u620F" m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 - height: 869.3333 + width: 1377 + height: 857 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 + width: 1377 height: 36 m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 849.3333 - width: 1706.6666 + y: 837 + width: 1377 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -113,12 +113,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 36 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 56 + controlID: 105370 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1706.6666 - height: 813.3333 + width: 1377 + height: 801 m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 57 + controlID: 105371 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1132 - height: 813.3333 + width: 913 + height: 801 m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 58 + controlID: 105336 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -191,12 +191,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1132 - height: 566.6667 + width: 913 + height: 558 m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 59 + controlID: 105337 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 285.33334 - height: 566.6667 + width: 395 + height: 558 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 15} @@ -239,10 +239,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 285.33334 + x: 395 y: 0 - width: 846.6666 - height: 566.6667 + width: 518 + height: 558 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 14} @@ -250,6 +250,7 @@ MonoBehaviour: - {fileID: 16} - {fileID: 14} - {fileID: 17} + - {fileID: 18} m_Selected: 1 m_LastSelected: 0 --- !u!114 &11 @@ -262,25 +263,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 566.6667 - width: 1132 - height: 246.66663 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} + y: 558 + width: 913 + height: 243 + m_MinSize: {x: 231, y: 276} + m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 19} m_Panes: - - {fileID: 18} - {fileID: 19} - {fileID: 20} - {fileID: 21} - m_Selected: 1 - m_LastSelected: 0 + - {fileID: 22} + m_Selected: 0 + m_LastSelected: 2 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -296,19 +297,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1132 + x: 913 y: 0 - width: 574.6666 - height: 813.3333 + width: 464 + height: 801 m_MinSize: {x: 276, y: 126} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 25} m_Panes: - - {fileID: 22} - {fileID: 23} - {fileID: 24} - {fileID: 25} - {fileID: 26} + - {fileID: 27} m_Selected: 2 m_LastSelected: 1 --- !u!114 &13 @@ -332,9 +333,9 @@ MonoBehaviour: m_TextWithWhitespace: "UnityEditor.MainToolbarWindow\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 0 - width: 1706.6666 + x: 63 + y: 43 + width: 1377 height: 36 m_SerializedDataModeController: m_DataMode: 0 @@ -392,10 +393,10 @@ MonoBehaviour: displayed: 1 id: Package Management/Package Manager index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":250.66665649414063,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 250.66666, y: 0} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 @@ -417,7 +418,7 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 0 containerId: overlay-toolbar__top - displayed: 1 + displayed: 0 id: Services/AI index: 5 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' @@ -459,8 +460,8 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 1 containerId: overlay-toolbar__top - displayed: 0 - id: Editor Utility/Quality + displayed: 1 + id: Editor Controls/Layout index: 1 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -473,8 +474,8 @@ MonoBehaviour: sizeOverridden: 0 - dockPosition: 1 containerId: overlay-toolbar__top - displayed: 1 - id: Editor Controls/Layout + displayed: 0 + id: Editor Utility/Quality index: 2 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -560,57 +561,15 @@ MonoBehaviour: displayed: 1 id: Play Mode Controls index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-781.3333129882813,"y":-36.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-644.0,"y":-36.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -781.3333, y: -36} + snapOffset: {x: -644, y: -36} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 - - dockPosition: 0 - containerId: overlay-toolbar__top - displayed: 0 - id: Asset Inventory/Add To Scene - index: 7 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 0 - containerId: overlay-toolbar__top - displayed: 0 - id: Asset Inventory/Open Asset Inventory - index: 8 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-toolbar__top - displayed: 0 - id: Services/Environment - index: 8 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 m_ContainerData: - containerId: overlay-toolbar__top scrollOffset: 0 @@ -634,17 +593,17 @@ MonoBehaviour: 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: "\u6E38\u620F" + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Game\u200B" + m_TextWithWhitespace: "\u6E38\u620F\u200B" m_Pos: serializedVersion: 2 - x: 286.33334 - y: 24 - width: 844.6666 - height: 540.6667 + x: 458 + y: 79 + width: 516 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -666,7 +625,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1267, y: 713} + m_TargetSize: {x: 1920, y: 1080} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -675,22 +634,22 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 0a000000000000001200000006000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 06000000000000001200000006000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -422.33334 - m_HBaseRangeMax: 422.33334 - m_VBaseRangeMin: -237.66667 - m_VBaseRangeMax: 237.66667 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 0 + m_HSlider: 1 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 @@ -702,23 +661,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 844.6666 - height: 519.6667 - m_Scale: {x: 0.99999994, y: 0.99999994} - m_Translation: {x: 422.3333, y: 259.83334} + width: 516 + height: 511 + m_Scale: {x: 0.26875, y: 0.26875} + m_Translation: {x: 257.99997, y: 255.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -422.33334 - y: -259.83337 - width: 844.6667 - height: 519.66675 + x: -959.9998 + y: -950.69763 + width: 1919.9999 + height: 1901.3953 m_MinimalGUI: 1 - m_defaultScale: 0.99999994 - m_LastWindowPixelSize: {x: 1267, y: 811} + m_defaultScale: 0.26875 + m_LastWindowPixelSize: {x: 516, y: 532} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -740,17 +699,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Hierarchy\u200B" + m_TextWithWhitespace: "\u5C42\u7EA7\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 24 - width: 284.33334 - height: 540.6667 + x: 63 + y: 79 + width: 394 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -766,23 +725,90 @@ MonoBehaviour: m_DynamicPanelBehavior: 0 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: [] + scrollPos: {x: 0, y: 65} + m_SelectedIDs: + - m_Data: -179740 m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -30886 - - m_Data: -30550 - - m_Data: -28216 - - m_Data: -24752 - - m_Data: -20840 - - m_Data: -1342 - - m_Data: 140206 - - m_Data: 140768 - - m_Data: 142306 - - m_Data: 143760 - - m_Data: 143908 - - m_Data: 145556 + - m_Data: -207606 + - m_Data: -181032 + - m_Data: -181018 + - m_Data: -179764 + - m_Data: -179758 + - m_Data: -179740 + - m_Data: -179710 + - m_Data: -179308 + - m_Data: -178494 + - m_Data: -164700 + - m_Data: -152312 + - m_Data: -150680 + - m_Data: -68604 + - m_Data: -66952 + - m_Data: -26628 + - m_Data: -18454 + - m_Data: -15364 + - m_Data: -3434 + - m_Data: -1334 + - m_Data: -12 + - m_Data: 79216 + - m_Data: 79324 + - m_Data: 79376 + - m_Data: 82610 + - m_Data: 83484 + - m_Data: 83542 + - m_Data: 84074 + - m_Data: 84172 + - m_Data: 84222 + - m_Data: 84534 + - m_Data: 84646 + - m_Data: 84892 + - m_Data: 84904 + - m_Data: 90100 + - m_Data: 90836 + - m_Data: 90894 + - m_Data: 91070 + - m_Data: 91426 + - m_Data: 91574 + - m_Data: 91886 + - m_Data: 91998 + - m_Data: 92244 + - m_Data: 92256 + - m_Data: 108424 + - m_Data: 108686 + - m_Data: 109156 + - m_Data: 109446 + - m_Data: 112274 + - m_Data: 113008 + - m_Data: 113170 + - m_Data: 113202 + - m_Data: 113402 + - m_Data: 113438 + - m_Data: 113664 + - m_Data: 114424 + - m_Data: 117846 + - m_Data: 118436 + - m_Data: 118584 + - m_Data: 119254 + - m_Data: 119266 + - m_Data: 120316 + - m_Data: 120528 + - m_Data: 120668 + - m_Data: 120726 + - m_Data: 120840 + - m_Data: 120902 + - m_Data: 121114 + - m_Data: 121258 + - m_Data: 121406 + - m_Data: 121654 + - m_Data: 121718 + - m_Data: 121772 + - m_Data: 121806 + - m_Data: 121944 + - m_Data: 122050 + - m_Data: 122056 + - m_Data: 122064 + - m_Data: 122088 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -823,17 +849,17 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Text: "\u573A\u666F" + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Scene\u200B" + m_TextWithWhitespace: "\u573A\u666F\u200B" m_Pos: serializedVersion: 2 - x: 285.33334 - y: 78.66667 - width: 844.6666 - height: 544.6667 + x: 458 + y: 79 + width: 516 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -876,12 +902,12 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-toolbar index: 4 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-469.3333740234375,"y":25.333332061767579},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":46.6666259765625,"y":25.333332061767579},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -469.33337, y: 25.333332} + snapOffset: {x: 46.666626, y: 25.333332} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 0 layout: 1 size: {x: 0, y: 0} sizeOverridden: 0 @@ -1496,15 +1522,15 @@ 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_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -41.481003, y: -5.709297, z: 20161.71} + m_Target: {x: -40.499294, y: 15.785117, z: -4.457644} speed: 2 - m_Value: {x: -41.481003, y: -5.709297, z: 20161.71} + m_Value: {x: -40.499294, y: 15.785117, z: -4.457644} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1550,17 +1576,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.08836473, y: 0.03326898, z: -0.0025345457, w: 0.99569273} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0.08836473, y: -0.03326898, z: 0.0025345457, w: -0.99569273} m_Size: - m_Target: 96.360664 + m_Target: 10.7481 speed: 2 - m_Value: 96.360664 + m_Value: 10.7481 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 @@ -1605,17 +1631,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B\u5668" + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animator\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u5668\u200B" m_Pos: serializedVersion: 2 - x: 264 - y: 78.66667 - width: 780.6666 - height: 544 + x: 458 + y: 79 + width: 516 + height: 532 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1634,6 +1660,7 @@ MonoBehaviour: - {fileID: 1107513844591874750, guid: 6bb62cb4c18d9d64db0b1e04206d84de, type: 2} - {fileID: 1107513844591874750, guid: c20c187d4b7282b4a976d0c296710fb8, type: 2} - {fileID: -9213322630146201385, guid: 258a1e0e215e6ee47ba26fc1c3662225, type: 2} + - {fileID: 1107572334616935164, guid: 93fbe37370f09fe4a934819f103333ea, type: 2} m_ValueSerializationHelper: - e00: 0.5192983 e01: 0 @@ -1651,14 +1678,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.5192983 + - e00: 0.7288988 e01: 0 e02: 0 - e03: -10.964935 + e03: -5.7432556 e10: 0 - e11: 0.5192983 + e11: 0.7288988 e12: 0 - e13: 198.66666 + e13: 124.03904 e20: 0 e21: 0 e22: 1 @@ -1683,9 +1710,29 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 0} - m_BreadCrumbs: [] + m_AnimatorController: {fileID: 9100000, guid: 93fbe37370f09fe4a934819f103333ea, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1107572334616935164, guid: 93fbe37370f09fe4a934819f103333ea, + type: 2} + m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} blendTreeGraph: {fileID: 0} @@ -1698,6 +1745,282 @@ MonoBehaviour: m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 924ffcbe75518854f97b48776d0f1939, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.ShaderGraph.Editor::UnityEditor.ShaderGraph.Drawing.MaterialGraphEditWindow + m_MinSize: {x: 50, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: UIBlurShader + m_Image: {fileID: 2800000, guid: 7129268cf102b2f45809905bcb27ce8b, type: 3} + m_Tooltip: + m_TextWithWhitespace: "UIBlurShader\u200B" + m_Pos: + serializedVersion: 2 + x: 293 + y: 79 + width: 681 + height: 532 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_Selected: 80d5d5dc275b1a24287655abe958b4d5 + m_GraphObject: {fileID: 0} + m_LastSerializedFileContents: "{\n \"m_SGVersion\": 3,\n \"m_Type\": \"UnityEditor.ShaderGraph.GraphData\",\n + \"m_ObjectId\": \"ed7778945c804dcb888ae93f8fe42140\",\n \"m_Properties\": + [\n {\n \"m_Id\": \"505dec7887ef4e2bbe437c4598de7def\"\n + }\n ],\n \"m_Keywords\": [],\n \"m_Dropdowns\": [],\n \"m_CategoryData\": + [\n {\n \"m_Id\": \"2874fc39f603417982396451bee218ea\"\n + }\n ],\n \"m_Nodes\": [\n {\n \"m_Id\": \"78db3bf5faeb451f852ea364d0d277e7\"\n + },\n {\n \"m_Id\": \"e921c73a772a476e97ee0cc37800efe7\"\n + },\n {\n \"m_Id\": \"3fea01d54930476997a12aeea851c958\"\n + },\n {\n \"m_Id\": \"0a97a98ddb834ffebcc96cfae09f08c4\"\n + },\n {\n \"m_Id\": \"5c78dc8f4be54744a9ecd626e18ff165\"\n + },\n {\n \"m_Id\": \"09137a9a407a4ce7a030dbb22a866da3\"\n + },\n {\n \"m_Id\": \"0415a160844e4b1086c6f29f2988ec9d\"\n + },\n {\n \"m_Id\": \"8309c276ca0d4fe1b498579bddd92b6d\"\n + }\n ],\n \"m_GroupDatas\": [],\n \"m_StickyNoteDatas\": [],\n \"m_Edges\": + [\n {\n \"m_OutputSlot\": {\n \"m_Node\": {\n + \"m_Id\": \"09137a9a407a4ce7a030dbb22a866da3\"\n },\n + \"m_SlotId\": 2\n },\n \"m_InputSlot\": {\n + \"m_Node\": {\n \"m_Id\": \"0a97a98ddb834ffebcc96cfae09f08c4\"\n + },\n \"m_SlotId\": 0\n }\n }\n ],\n \"m_VertexContext\": + {\n \"m_Position\": {\n \"x\": 561.9998779296875,\n + \"y\": 112.00000762939453\n },\n \"m_Blocks\": [\n {\n + \"m_Id\": \"78db3bf5faeb451f852ea364d0d277e7\"\n },\n {\n + \"m_Id\": \"e921c73a772a476e97ee0cc37800efe7\"\n },\n {\n + \"m_Id\": \"3fea01d54930476997a12aeea851c958\"\n }\n ]\n + },\n \"m_FragmentContext\": {\n \"m_Position\": {\n \"x\": + 561.9998779296875,\n \"y\": 312.0\n },\n \"m_Blocks\": + [\n {\n \"m_Id\": \"0a97a98ddb834ffebcc96cfae09f08c4\"\n + },\n {\n \"m_Id\": \"5c78dc8f4be54744a9ecd626e18ff165\"\n + }\n ]\n },\n \"m_PreviewData\": {\n \"serializedMesh\": {\n + \"m_SerializedMesh\": \"{\\\"mesh\\\":{\\\"instanceID\\\":0}}\",\n + \"m_Guid\": \"\"\n },\n \"preventRotation\": false\n },\n + \"m_Path\": \"Shader Graphs\",\n \"m_GraphPrecision\": 1,\n \"m_PreviewMode\": + 2,\n \"m_OutputNode\": {\n \"m_Id\": \"\"\n },\n \"m_SubDatas\": + [],\n \"m_ActiveTargets\": [\n {\n \"m_Id\": \"87b92f4a57b94766a052672b4cac4f1d\"\n + }\n ]\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.TilingAndOffsetNode\",\n + \"m_ObjectId\": \"0415a160844e4b1086c6f29f2988ec9d\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"Tiling And Offset\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": -114.00007629394531,\n \"y\": 318.0,\n + \"width\": 208.00006103515626,\n \"height\": 326.0\n }\n + },\n \"m_Slots\": [\n {\n \"m_Id\": \"544e8cd6da0648508ab7a4237264418b\"\n + },\n {\n \"m_Id\": \"201de6e8b98c41f4bbbad7241fc1bda6\"\n + },\n {\n \"m_Id\": \"733cc73016e0413bb4ce051e59424082\"\n + },\n {\n \"m_Id\": \"45044c79bd92431ca4b7f25a9d89f5da\"\n + }\n ],\n \"synonyms\": [\n \"pan\",\n \"scale\"\n ],\n + \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_DismissedVersion\": + 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": {\n \"m_SerializableColors\": + []\n }\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.Rendering.Universal.UniversalSampleBufferNode\",\n + \"m_ObjectId\": \"09137a9a407a4ce7a030dbb22a866da3\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"URP Sample Buffer\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": -440.00006103515627,\n \"y\": 88.9999771118164,\n + \"width\": 154.99996948242188,\n \"height\": 128.0\n }\n + },\n \"m_Slots\": [\n {\n \"m_Id\": \"e5203943dffa46f690651d74c0282829\"\n + },\n {\n \"m_Id\": \"5df3bdec482542e08c6013ab01b490bb\"\n + }\n ],\n \"synonyms\": [\n \"normal\",\n \"motion vector\",\n + \"blit\"\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": false,\n + \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_BufferType\": 2\n}\n\n{\n + \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"0a97a98ddb834ffebcc96cfae09f08c4\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"SurfaceDescription.BaseColor\",\n + \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n + \"serializedVersion\": \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n + \"width\": 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": + [\n {\n \"m_Id\": \"7317387dc15e41c7896d544aeb97f700\"\n + }\n ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"SurfaceDescription.BaseColor\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.Vector2MaterialSlot\",\n \"m_ObjectId\": \"201de6e8b98c41f4bbbad7241fc1bda6\",\n + \"m_Id\": 1,\n \"m_DisplayName\": \"Tiling\",\n \"m_SlotType\": 0,\n + \"m_Hidden\": false,\n \"m_ShaderOutputName\": \"Tiling\",\n \"m_StageCapability\": + 3,\n \"m_Value\": {\n \"x\": 1.0,\n \"y\": 1.0\n },\n + \"m_DefaultValue\": {\n \"x\": 1.0,\n \"y\": 1.0\n },\n \"m_Labels\": + []\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.CategoryData\",\n + \"m_ObjectId\": \"2874fc39f603417982396451bee218ea\",\n \"m_Name\": \"\",\n + \"m_ChildObjectList\": [\n {\n \"m_Id\": \"505dec7887ef4e2bbe437c4598de7def\"\n + }\n ]\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.PositionMaterialSlot\",\n + \"m_ObjectId\": \"337d58108d2f443b8b7718374a823e54\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"Position\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"Position\",\n \"m_StageCapability\": 1,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n + \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": + 0.0\n },\n \"m_Labels\": [],\n \"m_Space\": 0\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.ScreenPositionMaterialSlot\",\n + \"m_ObjectId\": \"3437aa8e664a4009997c5f0d228bf102\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"UV\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"UV\",\n \"m_StageCapability\": 3,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0,\n \"w\": + 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n + \"z\": 0.0,\n \"w\": 0.0\n },\n \"m_Labels\": [],\n \"m_ScreenSpaceType\": + 0\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"3fea01d54930476997a12aeea851c958\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"VertexDescription.Tangent\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": + 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": [\n + {\n \"m_Id\": \"c99fbb59c02f475eb7e29e7aea007f18\"\n }\n + ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"VertexDescription.Tangent\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.Vector2MaterialSlot\",\n \"m_ObjectId\": \"45044c79bd92431ca4b7f25a9d89f5da\",\n + \"m_Id\": 3,\n \"m_DisplayName\": \"Out\",\n \"m_SlotType\": 1,\n \"m_Hidden\": + false,\n \"m_ShaderOutputName\": \"Out\",\n \"m_StageCapability\": 3,\n + \"m_Value\": {\n \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_DefaultValue\": + {\n \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_Labels\": []\n}\n\n{\n + \"m_SGVersion\": 1,\n \"m_Type\": \"UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty\",\n + \"m_ObjectId\": \"505dec7887ef4e2bbe437c4598de7def\",\n \"m_Guid\": {\n + \"m_GuidSerialized\": \"266c5540-54b7-41b5-913f-5b2829d57ae9\"\n },\n \"promotedFromAssetID\": + \"\",\n \"promotedFromCategoryName\": \"\",\n \"promotedOrdering\": -1,\n + \"m_Name\": \"BlurStrengh\",\n \"m_DefaultRefNameVersion\": 1,\n \"m_RefNameGeneratedByDisplayName\": + \"BlurStrengh\",\n \"m_DefaultReferenceName\": \"_BlurStrengh\",\n \"m_OverrideReferenceName\": + \"\",\n \"m_GeneratePropertyBlock\": true,\n \"m_UseCustomSlotLabel\": + false,\n \"m_CustomSlotLabel\": \"\",\n \"m_DismissedVersion\": 0,\n + \"m_Precision\": 0,\n \"overrideHLSLDeclaration\": false,\n \"hlslDeclarationOverride\": + 0,\n \"m_Hidden\": false,\n \"m_PerRendererData\": false,\n \"m_customAttributes\": + [],\n \"m_Value\": 0.0,\n \"m_FloatType\": 0,\n \"m_LiteralFloatMode\": + false,\n \"m_RangeValues\": {\n \"x\": 0.0,\n \"y\": 1.0\n + },\n \"m_SliderType\": 0,\n \"m_SliderPower\": 3.0,\n \"m_EnumType\": + 0,\n \"m_CSharpEnumString\": \"\",\n \"m_EnumNames\": [\n \"Default\"\n + ],\n \"m_EnumValues\": [\n 0\n ]\n}\n\n{\n \"m_SGVersion\": 0,\n + \"m_Type\": \"UnityEditor.ShaderGraph.UVMaterialSlot\",\n \"m_ObjectId\": + \"544e8cd6da0648508ab7a4237264418b\",\n \"m_Id\": 0,\n \"m_DisplayName\": + \"UV\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n \"m_ShaderOutputName\": + \"UV\",\n \"m_StageCapability\": 3,\n \"m_Value\": {\n \"x\": 0.0,\n + \"y\": 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": + 0.0\n },\n \"m_Labels\": [],\n \"m_Channel\": 0\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n \"m_ObjectId\": + \"5c78dc8f4be54744a9ecd626e18ff165\",\n \"m_Group\": {\n \"m_Id\": + \"\"\n },\n \"m_Name\": \"SurfaceDescription.Alpha\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": + 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": [\n + {\n \"m_Id\": \"8b0739a7257c4637a624109aee02417d\"\n }\n + ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"SurfaceDescription.Alpha\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.ColorRGBAMaterialSlot\",\n \"m_ObjectId\": \"5df3bdec482542e08c6013ab01b490bb\",\n + \"m_Id\": 2,\n \"m_DisplayName\": \"Output\",\n \"m_SlotType\": 1,\n + \"m_Hidden\": false,\n \"m_ShaderOutputName\": \"Output\",\n \"m_StageCapability\": + 2,\n \"m_Value\": {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": + 0.0,\n \"w\": 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n + \"y\": 0.0,\n \"z\": 0.0,\n \"w\": 1.0\n },\n \"m_Labels\": + []\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.ColorRGBMaterialSlot\",\n + \"m_ObjectId\": \"7317387dc15e41c7896d544aeb97f700\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"Base Color\",\n \"m_SlotType\": 0,\n \"m_Hidden\": + false,\n \"m_ShaderOutputName\": \"BaseColor\",\n \"m_StageCapability\": + 2,\n \"m_Value\": {\n \"x\": 0.5,\n \"y\": 0.5,\n \"z\": + 0.5\n },\n \"m_DefaultValue\": {\n \"x\": 0.5,\n \"y\": 0.5,\n + \"z\": 0.5\n },\n \"m_Labels\": [],\n \"m_ColorMode\": 0,\n \"m_DefaultColor\": + {\n \"r\": 0.5,\n \"g\": 0.5,\n \"b\": 0.5,\n \"a\": + 1.0\n }\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.Vector2MaterialSlot\",\n + \"m_ObjectId\": \"733cc73016e0413bb4ce051e59424082\",\n \"m_Id\": 2,\n + \"m_DisplayName\": \"Offset\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"Offset\",\n \"m_StageCapability\": 3,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_DefaultValue\": {\n + \"x\": 0.0,\n \"y\": 0.0\n },\n \"m_Labels\": []\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.Vector3MaterialSlot\",\n \"m_ObjectId\": + \"77d4a4593f2743c3b6b13af364be44a8\",\n \"m_Id\": 1,\n \"m_DisplayName\": + \"Out\",\n \"m_SlotType\": 1,\n \"m_Hidden\": false,\n \"m_ShaderOutputName\": + \"Out\",\n \"m_StageCapability\": 2,\n \"m_Value\": {\n \"x\": 0.0,\n + \"y\": 0.0,\n \"z\": 0.0\n },\n \"m_DefaultValue\": {\n \"x\": + 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n \"m_Labels\": []\n}\n\n{\n + \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"78db3bf5faeb451f852ea364d0d277e7\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"VertexDescription.Position\",\n + \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n + \"serializedVersion\": \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n + \"width\": 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": + [\n {\n \"m_Id\": \"337d58108d2f443b8b7718374a823e54\"\n + }\n ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"VertexDescription.Position\"\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.SceneColorNode\",\n \"m_ObjectId\": \"8309c276ca0d4fe1b498579bddd92b6d\",\n + \"m_Group\": {\n \"m_Id\": \"\"\n },\n \"m_Name\": \"Scene Color\",\n + \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n + \"serializedVersion\": \"2\",\n \"x\": -565.0,\n \"y\": + -87.00000762939453,\n \"width\": 138.0,\n \"height\": 76.9999771118164\n + }\n },\n \"m_Slots\": [\n {\n \"m_Id\": \"3437aa8e664a4009997c5f0d228bf102\"\n + },\n {\n \"m_Id\": \"77d4a4593f2743c3b6b13af364be44a8\"\n + }\n ],\n \"synonyms\": [\n \"screen buffer\"\n ],\n \"m_Precision\": + 0,\n \"m_PreviewExpanded\": true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": + 0,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n }\n}\n\n{\n + \"m_SGVersion\": 1,\n \"m_Type\": \"UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget\",\n + \"m_ObjectId\": \"87b92f4a57b94766a052672b4cac4f1d\",\n \"m_Datas\": [],\n + \"m_ActiveSubTarget\": {\n \"m_Id\": \"ab9aa7e1b8934f4c87f8b97a8aa8ed4e\"\n + },\n \"m_AllowMaterialOverride\": false,\n \"m_SurfaceType\": 0,\n \"m_ZTestMode\": + 4,\n \"m_ZWriteControl\": 0,\n \"m_AlphaMode\": 0,\n \"m_RenderFace\": + 2,\n \"m_AlphaClip\": false,\n \"m_CastShadows\": true,\n \"m_ReceiveShadows\": + true,\n \"m_DisableTint\": false,\n \"m_Sort3DAs2DCompatible\": false,\n + \"m_AdditionalMotionVectorMode\": 0,\n \"m_AlembicMotionVectors\": false,\n + \"m_SupportsLODCrossFade\": false,\n \"m_CustomEditorGUI\": \"\",\n \"m_SupportVFX\": + false\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.Vector1MaterialSlot\",\n + \"m_ObjectId\": \"8b0739a7257c4637a624109aee02417d\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"Alpha\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"Alpha\",\n \"m_StageCapability\": 2,\n \"m_Value\": + 1.0,\n \"m_DefaultValue\": 1.0,\n \"m_Labels\": [],\n \"m_LiteralMode\": + false\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget\",\n + \"m_ObjectId\": \"ab9aa7e1b8934f4c87f8b97a8aa8ed4e\"\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.NormalMaterialSlot\",\n \"m_ObjectId\": + \"b57b7b8396ca4def9ceba692eb22475a\",\n \"m_Id\": 0,\n \"m_DisplayName\": + \"Normal\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n \"m_ShaderOutputName\": + \"Normal\",\n \"m_StageCapability\": 1,\n \"m_Value\": {\n \"x\": + 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n \"m_DefaultValue\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0\n },\n + \"m_Labels\": [],\n \"m_Space\": 0\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": + \"UnityEditor.ShaderGraph.TangentMaterialSlot\",\n \"m_ObjectId\": \"c99fbb59c02f475eb7e29e7aea007f18\",\n + \"m_Id\": 0,\n \"m_DisplayName\": \"Tangent\",\n \"m_SlotType\": 0,\n + \"m_Hidden\": false,\n \"m_ShaderOutputName\": \"Tangent\",\n \"m_StageCapability\": + 1,\n \"m_Value\": {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": + 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n + \"z\": 0.0\n },\n \"m_Labels\": [],\n \"m_Space\": 0\n}\n\n{\n \"m_SGVersion\": + 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.ScreenPositionMaterialSlot\",\n + \"m_ObjectId\": \"e5203943dffa46f690651d74c0282829\",\n \"m_Id\": 0,\n + \"m_DisplayName\": \"UV\",\n \"m_SlotType\": 0,\n \"m_Hidden\": false,\n + \"m_ShaderOutputName\": \"UV\",\n \"m_StageCapability\": 3,\n \"m_Value\": + {\n \"x\": 0.0,\n \"y\": 0.0,\n \"z\": 0.0,\n \"w\": + 0.0\n },\n \"m_DefaultValue\": {\n \"x\": 0.0,\n \"y\": 0.0,\n + \"z\": 0.0,\n \"w\": 0.0\n },\n \"m_Labels\": [],\n \"m_ScreenSpaceType\": + 0\n}\n\n{\n \"m_SGVersion\": 0,\n \"m_Type\": \"UnityEditor.ShaderGraph.BlockNode\",\n + \"m_ObjectId\": \"e921c73a772a476e97ee0cc37800efe7\",\n \"m_Group\": {\n + \"m_Id\": \"\"\n },\n \"m_Name\": \"VertexDescription.Normal\",\n \"m_DrawState\": + {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": + \"2\",\n \"x\": 0.0,\n \"y\": 0.0,\n \"width\": + 0.0,\n \"height\": 0.0\n }\n },\n \"m_Slots\": [\n + {\n \"m_Id\": \"b57b7b8396ca4def9ceba692eb22475a\"\n }\n + ],\n \"synonyms\": [],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": + true,\n \"m_DismissedVersion\": 0,\n \"m_PreviewMode\": 0,\n \"m_CustomColors\": + {\n \"m_SerializableColors\": []\n },\n \"m_SerializedDescriptor\": + \"VertexDescription.Normal\"\n}\n\n" + m_AssetMaybeChangedOnDisk: 0 + m_AssetMaybeDeleted: 0 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1712,17 +2035,17 @@ MonoBehaviour: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Project\u200B" + m_TextWithWhitespace: "\u9879\u76EE\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 645.3334 - width: 1131 - height: 220.66669 + x: 63 + y: 637 + width: 912 + height: 217 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1745,7 +2068,7 @@ MonoBehaviour: m_SceneHandles: [] m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 1 + m_SearchArea: 0 m_Folders: - Assets/Scripts/UI/ChapterSelection m_Globs: [] @@ -1759,124 +2082,68 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts/UI/ChapterSelection m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Projects\ichni Official + m_LastProjectPath: C:\ichniOfficial\ichni_Official m_LockTracker: m_IsLocked: 0 - m_LastLocalAssetsSearchArea: 1 + m_LastLocalAssetsSearchArea: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 695.3333} + scrollPos: {x: 0, y: 955} m_SelectedIDs: - - m_Data: 85396 + - m_Data: 93780 m_LastClickedID: - m_Data: 85396 + m_Data: 93780 m_ExpandedIDs: - m_Data: 0 - - m_Data: 84666 - - m_Data: 84668 - - m_Data: 84670 - - m_Data: 84672 - - m_Data: 84674 - - m_Data: 84676 - - m_Data: 84678 - - m_Data: 84680 - - m_Data: 84682 - - m_Data: 84684 - - m_Data: 84686 - - m_Data: 84688 - - m_Data: 84690 - - m_Data: 84692 - - m_Data: 84694 - - m_Data: 84696 - - m_Data: 84698 - - m_Data: 84700 - - m_Data: 84702 - - m_Data: 84704 - - m_Data: 84706 - - m_Data: 84708 - - m_Data: 84710 - - m_Data: 84712 - - m_Data: 84714 - - m_Data: 84716 - - m_Data: 84718 - - m_Data: 84720 - - m_Data: 84722 - - m_Data: 84724 - - m_Data: 84726 - - m_Data: 84728 - - m_Data: 84730 - - m_Data: 84732 - - m_Data: 84734 - - m_Data: 84736 - - m_Data: 84738 - - m_Data: 84740 - - m_Data: 84742 - - m_Data: 84744 - - m_Data: 84746 - - m_Data: 84748 - - m_Data: 84750 - - m_Data: 84752 - - m_Data: 84754 - - m_Data: 84756 - - m_Data: 84758 - - m_Data: 84760 - - m_Data: 84762 - - m_Data: 84764 - - m_Data: 84766 - - m_Data: 84768 - - m_Data: 84770 - - m_Data: 84772 - - m_Data: 84774 - - m_Data: 84776 - - m_Data: 84778 - - m_Data: 84780 - - m_Data: 84782 - - m_Data: 84784 - - m_Data: 84786 - - m_Data: 84788 - - m_Data: 84790 - - m_Data: 84792 - - m_Data: 84794 - - m_Data: 84796 - - m_Data: 84798 - - m_Data: 84800 - - m_Data: 84802 - - m_Data: 84804 - - m_Data: 84806 - - m_Data: 84808 - - m_Data: 84810 - - m_Data: 84812 - - m_Data: 84814 - - m_Data: 84816 - - m_Data: 84818 - - m_Data: 84820 - - m_Data: 84822 - - m_Data: 84824 - - m_Data: 84826 - - m_Data: 84828 - - m_Data: 84830 - - m_Data: 84832 - - m_Data: 84834 - - m_Data: 84836 - - m_Data: 84838 - - m_Data: 84840 - - m_Data: 84842 - - m_Data: 84844 - - m_Data: 84846 - - m_Data: 84848 - - m_Data: 84850 - - m_Data: 84852 - - m_Data: 84854 - - m_Data: 84856 - - m_Data: 84858 - - m_Data: 84860 - - m_Data: 84862 - - m_Data: 84864 - - m_Data: 84866 - - m_Data: 84868 - - m_Data: 84870 - - m_Data: 84872 - - m_Data: 84874 - - m_Data: 84876 + - m_Data: 81284 + - m_Data: 81286 + - m_Data: 81288 + - m_Data: 81290 + - m_Data: 81292 + - m_Data: 81294 + - m_Data: 81296 + - m_Data: 81298 + - m_Data: 81300 + - m_Data: 81302 + - m_Data: 81304 + - m_Data: 81306 + - m_Data: 81308 + - m_Data: 81310 + - m_Data: 81312 + - m_Data: 81314 + - m_Data: 81316 + - m_Data: 81318 + - m_Data: 81320 + - m_Data: 81322 + - m_Data: 81324 + - m_Data: 81326 + - m_Data: 81328 + - m_Data: 81330 + - m_Data: 81332 + - m_Data: 81334 + - m_Data: 81336 + - m_Data: 81338 + - m_Data: 81340 + - m_Data: 81342 + - m_Data: 81344 + - m_Data: 81346 + - m_Data: 81348 + - m_Data: 81350 + - m_Data: 81352 + - m_Data: 81354 + - m_Data: 81356 + - m_Data: 81358 + - m_Data: 81360 + - m_Data: 81362 + - m_Data: 81364 + - m_Data: 81366 + - m_Data: 81368 + - m_Data: 81370 + - m_Data: 81810 + - m_Data: 81876 + - m_Data: 81968 + - m_Data: 88024 + - m_Data: 88026 + - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1909,112 +2176,55 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 84666 - - m_Data: 84668 - - m_Data: 84670 - - m_Data: 84672 - - m_Data: 84674 - - m_Data: 84676 - - m_Data: 84678 - - m_Data: 84680 - - m_Data: 84682 - - m_Data: 84684 - - m_Data: 84686 - - m_Data: 84688 - - m_Data: 84690 - - m_Data: 84692 - - m_Data: 84694 - - m_Data: 84696 - - m_Data: 84698 - - m_Data: 84700 - - m_Data: 84702 - - m_Data: 84704 - - m_Data: 84706 - - m_Data: 84708 - - m_Data: 84710 - - m_Data: 84712 - - m_Data: 84714 - - m_Data: 84716 - - m_Data: 84718 - - m_Data: 84720 - - m_Data: 84722 - - m_Data: 84724 - - m_Data: 84726 - - m_Data: 84728 - - m_Data: 84730 - - m_Data: 84732 - - m_Data: 84734 - - m_Data: 84736 - - m_Data: 84738 - - m_Data: 84740 - - m_Data: 84742 - - m_Data: 84744 - - m_Data: 84746 - - m_Data: 84748 - - m_Data: 84750 - - m_Data: 84752 - - m_Data: 84754 - - m_Data: 84756 - - m_Data: 84758 - - m_Data: 84760 - - m_Data: 84762 - - m_Data: 84764 - - m_Data: 84766 - - m_Data: 84768 - - m_Data: 84770 - - m_Data: 84772 - - m_Data: 84774 - - m_Data: 84776 - - m_Data: 84778 - - m_Data: 84780 - - m_Data: 84782 - - m_Data: 84784 - - m_Data: 84786 - - m_Data: 84788 - - m_Data: 84790 - - m_Data: 84792 - - m_Data: 84794 - - m_Data: 84796 - - m_Data: 84798 - - m_Data: 84800 - - m_Data: 84802 - - m_Data: 84804 - - m_Data: 84806 - - m_Data: 84808 - - m_Data: 84810 - - m_Data: 84812 - - m_Data: 84814 - - m_Data: 84816 - - m_Data: 84818 - - m_Data: 84820 - - m_Data: 84822 - - m_Data: 84824 - - m_Data: 84826 - - m_Data: 84828 - - m_Data: 84830 - - m_Data: 84832 - - m_Data: 84834 - - m_Data: 84836 - - m_Data: 84838 - - m_Data: 84840 - - m_Data: 84842 - - m_Data: 84844 - - m_Data: 84846 - - m_Data: 84848 - - m_Data: 84850 - - m_Data: 84852 - - m_Data: 84854 - - m_Data: 84856 - - m_Data: 84858 - - m_Data: 84860 - - m_Data: 84862 - - m_Data: 84864 - - m_Data: 84866 - - m_Data: 84868 - - m_Data: 84870 - - m_Data: 84872 - - m_Data: 84874 - - m_Data: 84876 + - m_Data: 81284 + - m_Data: 81286 + - m_Data: 81288 + - m_Data: 81290 + - m_Data: 81292 + - m_Data: 81294 + - m_Data: 81296 + - m_Data: 81298 + - m_Data: 81300 + - m_Data: 81302 + - m_Data: 81304 + - m_Data: 81306 + - m_Data: 81308 + - m_Data: 81310 + - m_Data: 81312 + - m_Data: 81314 + - m_Data: 81316 + - m_Data: 81318 + - m_Data: 81320 + - m_Data: 81322 + - m_Data: 81324 + - m_Data: 81326 + - m_Data: 81328 + - m_Data: 81330 + - m_Data: 81332 + - m_Data: 81334 + - m_Data: 81336 + - m_Data: 81338 + - m_Data: 81340 + - m_Data: 81342 + - m_Data: 81344 + - m_Data: 81346 + - m_Data: 81348 + - m_Data: 81350 + - m_Data: 81352 + - m_Data: 81354 + - m_Data: 81356 + - m_Data: 81358 + - m_Data: 81360 + - m_Data: 81362 + - m_Data: 81364 + - m_Data: 81366 + - m_Data: 81368 + - m_Data: 81370 + - m_Data: 81810 + - m_Data: 81968 + - m_Data: 88024 + - m_Data: 88026 + - m_Data: 1000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2042,9 +2252,9 @@ MonoBehaviour: m_ResourceFile: m_ListAreaState: m_SelectedInstanceIDs: - - m_Data: 55380 - m_LastClickedInstanceID: 55380 - m_HadKeyboardFocusLastEvent: 1 + - m_Data: -179740 + m_LastClickedInstanceID: -179740 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: - m_Data: 0 - m_Data: 80838 @@ -2055,6 +2265,7 @@ MonoBehaviour: - m_Data: 81828 - m_Data: 75488 - m_Data: 81570 + - m_Data: 126408 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2084,7 +2295,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 209 ---- !u!114 &19 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2099,17 +2310,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Text: "\u63A7\u5236\u53F0" + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Console\u200B" + m_TextWithWhitespace: "\u63A7\u5236\u53F0\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 590.6667 - width: 1131 - height: 220.66663 + x: 63 + y: 637 + width: 912 + height: 217 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2123,7 +2334,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2138,17 +2349,17 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Text: "\u52A8\u753B" + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Animation\u200B" + m_TextWithWhitespace: "\u52A8\u753B\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 648.6667 - width: 1045.6666 - height: 217.33331 + x: 63 + y: 637 + width: 912 + height: 217 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2164,8 +2375,8 @@ MonoBehaviour: m_DynamicPanelBehavior: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 48546 ---- !u!114 &21 + m_LastSelectedObjectID: -179740 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2203,7 +2414,7 @@ MonoBehaviour: m_DynamicPanelContainerData: [] m_OverlaysVisible: 1 m_DynamicPanelBehavior: 0 ---- !u!114 &22 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} @@ -2245,7 +2456,7 @@ MonoBehaviour: m_Keys: [] m_Values: [] m_Settings: {fileID: 0} ---- !u!114 &23 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2260,17 +2471,17 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 - x: 1132 - y: 78.66667 - width: 573.66675 - height: 787.3334 + x: 976 + y: 79 + width: 463 + height: 775 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2291,65 +2502,13 @@ MonoBehaviour: m_CachedPref: -312.99988 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 75380 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 1 m_PreviewWindow: {fileID: 0} ---- !u!114 &24 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" - m_Pos: - serializedVersion: 2 - x: 1133 - y: 24 - width: 573.6666 - height: 787.3333 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_DynamicPanelContainerData: [] - m_OverlaysVisible: 1 - m_DynamicPanelBehavior: 0 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 184.33334 - m_ControlHash: 1412526313 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} --- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 @@ -2365,11 +2524,63 @@ MonoBehaviour: m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" + m_Pos: + serializedVersion: 2 + x: 976 + y: 79 + width: 463 + height: 775 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_DynamicPanelContainerData: [] + m_OverlaysVisible: 1 + m_DynamicPanelBehavior: 0 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -184.33334 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &26 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_TextWithWhitespace: "\u68C0\u67E5\u5668\u200B" m_Pos: serializedVersion: 2 x: 1046.6667 @@ -2395,14 +2606,14 @@ MonoBehaviour: m_CachedPref: 165.66669 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: -179740 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &26 +--- !u!114 &27 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -2417,11 +2628,11 @@ MonoBehaviour: m_MinSize: {x: 390, y: 390} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Lighting - m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, + m_Text: "\u5149\u7167" + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: - m_TextWithWhitespace: "Lighting\u200B" + m_TextWithWhitespace: "\u5149\u7167\u200B" m_Pos: serializedVersion: 2 x: 1102.6667