细化一些UI

我觉得TimelineCanvas可以利用一下比如把note放在上面？
2025-02-20 15:25:42 +08:00
parent a00797dc99
commit 4d9694db60
22 changed files with 5808 additions and 1996 deletions
--- a/3/Resources/ES3/ES3GlobalReferences.asset
+++ b/3/Resources/ES3/ES3GlobalReferences.asset
--- a/Assets/Prefabs/DynamicUI/DynamicUIContainer.prefab
+++ b/Assets/Prefabs/DynamicUI/DynamicUIContainer.prefab
@@ -171,6 +171,81 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_HorizontalFit: 0
  m_VerticalFit: 2
+--- !u!1 &5680846414295147560
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4647946525925749065}
+  - component: {fileID: 3541765237773450975}
+  - component: {fileID: 4396373271110531618}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4647946525925749065
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5680846414295147560}
+  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: 2695193391143546800}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 114, y: 25}
+  m_SizeDelta: {x: 700, y: 5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3541765237773450975
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5680846414295147560}
+  m_CullTransparentMesh: 1
+--- !u!114 &4396373271110531618
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5680846414295147560}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.39215687}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &9196514445407840680
 GameObject:
  m_ObjectHideFlags: 0
@@ -200,7 +275,8 @@ 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: 4647946525925749065}
  m_Father: {fileID: 1751046927372055580}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
@@ -266,10 +342,10 @@ MonoBehaviour:
  m_fontSize: 36
  m_fontSizeBase: 36
  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 20
+  m_fontSizeMax: 36
+  m_fontStyle: 1
  m_HorizontalAlignment: 1
  m_VerticalAlignment: 512
  m_textAlignment: 65535
@@ -279,7 +355,7 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_enableWordWrapping: 0
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
--- a/Assets/Prefabs/DynamicUI/Elements/BaseColorPicker.prefab
+++ b/Assets/Prefabs/DynamicUI/Elements/BaseColorPicker.prefab
--- a/Assets/Prefabs/DynamicUI/Elements/EmissionColorPicker.prefab
+++ b/Assets/Prefabs/DynamicUI/Elements/EmissionColorPicker.prefab
--- a/Assets/Prefabs/DynamicUI/Hierarchy/HierarchyTab.prefab
+++ b/Assets/Prefabs/DynamicUI/Hierarchy/HierarchyTab.prefab
@@ -340,8 +340,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 222.04614, y: 0}
+  m_SizeDelta: {x: 444.0923, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2384484496230206924
 CanvasRenderer:
@@ -364,7 +364,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.39215687}
+  m_Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 0}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -829,6 +829,7 @@ MonoBehaviour:
  tabLayer: 0
  isSelected: 0
  isExpanded: 0
+  BgImage: {fileID: 6938976402216252178}
  tabRect: {fileID: 5040017337088069702}
  layoutElement: {fileID: -1606289094185495319}
  tabMainRect: {fileID: 4977671911614392296}
--- a/Assets/Scenes/EditorScene.unity
+++ b/Assets/Scenes/EditorScene.unity
--- a/Assets/Scripts/Console/EditorConsole.cs
+++ b/Assets/Scripts/Console/EditorConsole.cs
@@ -21,7 +21,7 @@ namespace Ichni.Editor
 {
    public partial class EditorConsole : MonoBehaviour
    {
-
+        public Canvas[] scaleParts;
        public Interpreter functionInterpreter;
        public TMP_InputField InputCommand;
        private Dictionary<int,string> historyCommand=new Dictionary<int,string>();
@@ -52,6 +52,19 @@ namespace Ichni.Editor
                
                isHide=!isHide;
            }
+            if(Keyboard.current.leftCtrlKey.isPressed&&Keyboard.current.upArrowKey.wasPressedThisFrame){
+                foreach(Canvas i in scaleParts){
+                   var canvasScaler = i.GetComponent<CanvasScaler>();
+                    canvasScaler.referenceResolution = new Vector2(canvasScaler.referenceResolution.x + 100, canvasScaler.referenceResolution.y);
+                }
+            }else
+            if(Keyboard.current.leftCtrlKey.isPressed&&Keyboard.current.downArrowKey.wasPressedThisFrame){
+                foreach(Canvas i in scaleParts){
+                    var canvasScaler = i.GetComponent<CanvasScaler>();
+                    canvasScaler.referenceResolution = new Vector2(canvasScaler.referenceResolution.x - 100, canvasScaler.referenceResolution.y);
+
+                }
+            }
            if(InputCommand.isFocused){
                 if(Keyboard.current.downArrowKey.wasPressedThisFrame){
                    if(historyCommand.Count-1>historycount){
--- a/Assets/Scripts/DynamicUI/DynamicUIContainer.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIContainer.cs
@@ -25,8 +25,13 @@ namespace Ichni.Editor
            foreach(var i in GetComponentsInChildren<DynamicUIElement>()){
                i.DeviverSet(num);
                if(i.GetType()!=typeof(DynamicUIButton))CanCompress=false;
+                if(i.GetType()==typeof(DynamicUIBaseColorPicker)||
+                    i.GetType()==typeof(DynamicUIEmissionColorPicker)){//一个container可能不会有除了color以外的的东西吧
+                        gridLayoutGroup.cellSize=new Vector2(gridLayoutGroup.cellSize.x,gridLayoutGroup.cellSize.y*2.5f);
+                    }
            }
            if(CanCompress)gridLayoutGroup.cellSize=new Vector2(gridLayoutGroup.cellSize.x,gridLayoutGroup.cellSize.y/2);
+            //Danger：写了好多特判
        }
    }
 }
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIBaseColorPicker.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIBaseColorPicker.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Ichni.RhythmGame;
@@ -13,6 +14,11 @@ namespace Ichni.Editor
        public TMP_InputField inputFieldBaseG;
        public TMP_InputField inputFieldBaseB;
        public TMP_InputField inputFieldBaseA;
+
+        public Slider sliderR;
+        public Slider sliderG;
+        public Slider sliderB;
+        public Slider sliderA;
        public Image colorPreview;

        public override void Initialize(IBaseElement baseElement, string title, string parameterName)
@@ -23,12 +29,16 @@ namespace Ichni.Editor
            inputFieldBaseG.text = baseColor.g.ToString();
            inputFieldBaseB.text = baseColor.b.ToString();
            inputFieldBaseA.text = baseColor.a.ToString();
-            
+            sliderR.value=baseColor.r;
+            sliderG.value=baseColor.g;
+            sliderB.value=baseColor.b;
+            sliderA.value=baseColor.a;
            inputFieldBaseR.onEndEdit.AddListener(_ => ApplyParameters());
            inputFieldBaseG.onEndEdit.AddListener(_ => ApplyParameters());
            inputFieldBaseB.onEndEdit.AddListener(_ => ApplyParameters());
            inputFieldBaseA.onEndEdit.AddListener(_ => ApplyParameters());
            
+            
            colorPreview.color = baseColor;
        }

@@ -40,5 +50,12 @@ namespace Ichni.Editor
            colorPreview.color = newValue;
            connectedBaseElement.Refresh();
        }
+        public void SliderChange(float value){
+            inputFieldBaseR.text=sliderR.value.ToString();
+            inputFieldBaseG.text=sliderG.value.ToString();
+            inputFieldBaseB.text=sliderB.value.ToString();
+            inputFieldBaseA.text=sliderA.value.ToString();
+            ApplyParameters();
+        }
    }
 }
--- a/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEmissionColorPicker.cs
+++ b/Assets/Scripts/DynamicUI/DynamicUIElements/Simple/DynamicUIEmissionColorPicker.cs
@@ -16,6 +16,10 @@ namespace Ichni.Editor
        public TMP_InputField inputFieldEmissionG;
        public TMP_InputField inputFieldEmissionB;
        public TMP_InputField inputFieldEmissionI;
+        public Slider sliderR;
+        public Slider sliderG;
+        public Slider sliderB;
+       
        public Image colorPreview;
        
        public void Initialize(IBaseElement baseElement, string title, 
@@ -36,6 +40,11 @@ namespace Ichni.Editor
            inputFieldEmissionB.text = emissionColor.b.ToString();
            inputFieldEmissionI.text = emissionIntensity.ToString();
            
+            sliderR.value=emissionColor.r;
+            sliderG.value=emissionColor.g;
+            sliderB.value=emissionColor.b;
+            
+            
            toggleEnableEmission.onValueChanged.AddListener(_ => ApplyParameters());
            inputFieldEmissionR.onEndEdit.AddListener(_ => ApplyParameters());
            inputFieldEmissionG.onEndEdit.AddListener(_ => ApplyParameters());
@@ -58,5 +67,11 @@ namespace Ichni.Editor
            colorPreview.color = emissionColor;
            connectedBaseElement.Refresh();
        }
+        public void SliderChange(float value){
+            inputFieldEmissionR.text=sliderR.value.ToString();
+            inputFieldEmissionG.text=sliderG.value.ToString();
+            inputFieldEmissionB.text=sliderB.value.ToString();
+            ApplyParameters();
+        }
    }
 }
--- a/Assets/Scripts/DynamicUI/Hierarchy/HierarchyTab.cs
+++ b/Assets/Scripts/DynamicUI/Hierarchy/HierarchyTab.cs
@@ -20,7 +20,7 @@ namespace Ichni.Editor
        public int tabLayer;
        public bool isSelected;
        public bool isExpanded;
-        
+        public Image BgImage;
        public RectTransform tabRect;
        public LayoutElement layoutElement;
        public RectTransform tabMainRect;
--- a/Assets/Scripts/EditorGame/Base/GeneralSubmodules/ColorSubmodule.cs
+++ b/Assets/Scripts/EditorGame/Base/GeneralSubmodules/ColorSubmodule.cs
@@ -86,6 +86,7 @@ namespace Ichni.RhythmGame
                var emissionColor = inspector.GenerateEmissionColorPicker(this, container, "Emission Color",
                    nameof(emissionEnabled), nameof(originalEmissionColor), nameof(originalEmissionIntensity));
            }
+            container.SetDeviver(1);
        }
    }

--- a/Assets/Scripts/Manager/OperationManager.cs
+++ b/Assets/Scripts/Manager/OperationManager.cs
@@ -19,7 +19,14 @@ namespace Ichni.Editor
        
        public void SelectElement(GameElement gameElement)
        {
+            if(currentSelectedElement != null)
+            {
+                currentSelectedElement.connectedTab.isSelected = false;
+                currentSelectedElement.connectedTab.BgImage.color = new Color(0.5f, 0.5f, 0.5f, 0);
+            }
            currentSelectedElement = gameElement;
+            currentSelectedElement.connectedTab.isSelected = true;
+            currentSelectedElement.connectedTab.BgImage.color = new Color(0.5f,0.5f, 0.5f, 0.2f);
        }
    }

--- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest
@@ -1,7 +1,10 @@
 ManifestFileVersion: 0
-CRC: 1773651032
+CRC: 3233006006
 AssetBundleManifest:
  AssetBundleInfos:
    Info_0:
      Name: basic
      Dependencies: {}
+    Info_1:
+      Name: departure_to_multiverse
+      Dependencies: {}
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/basic
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/basic
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest
@@ -1,15 +1,15 @@
 ManifestFileVersion: 0
-CRC: 4245054749
+CRC: 2095642820
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: f530ae7325c749054b1c2af2f2a8f842
+    Hash: ea410c4ce44753445963c9cb3e024ec4
  TypeTreeHash:
    serializedVersion: 2
-    Hash: 0b29093cb0b98a6a3edca231f6a05b16
+    Hash: 1ef893ba1f7dbb963dd1eb4ef557d65f
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: f530ae7325c749054b1c2af2f2a8f842
+    Hash: ea410c4ce44753445963c9cb3e024ec4
 HashAppended: 0
 ClassTypes:
 - Class: 1
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest
@@ -0,0 +1,44 @@
+ManifestFileVersion: 0
+CRC: 165692382
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 07993068db883847c1f47aa90b0f1fd6
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 625a8bf3466c7efbf901d88367e54446
+  IncrementalBuildHash:
+    serializedVersion: 2
+    Hash: 07993068db883847c1f47aa90b0f1fd6
+HashAppended: 0
+ClassTypes:
+- Class: 1
+  Script: {instanceID: 0}
+- Class: 4
+  Script: {instanceID: 0}
+- Class: 21
+  Script: {instanceID: 0}
+- Class: 23
+  Script: {instanceID: 0}
+- Class: 33
+  Script: {instanceID: 0}
+- Class: 43
+  Script: {instanceID: 0}
+- Class: 48
+  Script: {instanceID: 0}
+- Class: 89
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {fileID: 11500000, guid: ea0771a0c87f746769a9ffd7286a0665, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers:
+- AssemblyName: Sirenix.Serialization
+  ClassName: Sirenix.Serialization.SerializationData
+Assets:
+- Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/Blueprint03_06.mat
+- Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualTap.prefab
+- Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/Blueprint02_06.mat
+- Assets/ThemeBundles/DepartureToMultiverse/Materials/Skybox/Blueprint01_06.mat
+- Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualStay.prefab
+Dependencies: []
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest.meta
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1ac6105af2d1cc34b9d1a6298507d02f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.meta
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 98f59871cfa0d694fadd60ea53efba87
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ProjectSettings/TimelineSettings.asset
+++ b/ProjectSettings/TimelineSettings.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  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: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60