This commit is contained in:
SoulliesOfficial
2025-04-18 22:34:55 -04:00
parent 97427b0bf3
commit d7ce55cd04
21 changed files with 335 additions and 1590 deletions

View File

@@ -53,8 +53,7 @@ public class TimelineTab : MonoBehaviour
else if (gameElement is NoteBase)
{
float Judgetime = ((NoteBase)gameElement).exactJudgeTime;
print(Judgetime);
if (SubTabs.ContainsKey(Judgetime))
{
SubTabs[Judgetime].Set(gameElement, Judgetime);

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5dfa505c97037ac4e81daf1c042a3b01
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -15,10 +15,9 @@ namespace Ichni.RhythmGame
(attachedGameElement).gameObject.layer = LayerMask.NameToLayer("Selectable");
this.elementToSelect = elementToSelect == null ? attachedGameElement : elementToSelect;
}
public void SelectGameElement()
{
Debug.Log(elementToSelect);
EditorManager.instance.operationManager.ClearSelectedElements();
EditorManager.instance.operationManager.AddSelectElement(elementToSelect);
EditorManager.instance.uiManager.inspector.SetInspector(elementToSelect);

View File

@@ -0,0 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Ichni.RhythmGame
{
public class SelectionConnector : MonoBehaviour
{
public GameElement connectedGameElement;
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b37c44f04f3075045aef6be2c0506551
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -61,7 +61,7 @@ namespace Ichni.RhythmGame
inspector.GenerateCompositeParameterWindow(this, "Intensity Curve", nameof(intensityCurve)).SetAsCustomCurve();
});
var colorSettings = container.GenerateSubcontainer(3);
var colorSettings = container.GenerateSubcontainer(1);
var colorField = inspector.GenerateBaseColorPicker(this, colorSettings, "Color", nameof(color));
}
}

View File

@@ -242,8 +242,8 @@ namespace Ichni.Editor
Ray ray = EditorManager.instance.cameraManager.currentCamera.ScreenPointToRay(mousePosition);
if (Physics.Raycast(ray, out RaycastHit hit, float.MaxValue, LayerMask.GetMask("Selectable")))
{
GameElement clickedElement = hit.collider.GetComponent<GameElement>();//TODO: 对于Hold这种复杂的元素需要使用连接脚本进行获取
(clickedElement as IHaveSelectSubmodule)?.selectSubmodule.SelectGameElement();
SelectionConnector connector = hit.collider.GetComponent<SelectionConnector>();//TODO: 对于Hold这种复杂的元素需要使用连接脚本进行获取
(connector.connectedGameElement as IHaveSelectSubmodule)?.selectSubmodule.SelectGameElement();
}
}
}

View File

@@ -41,7 +41,7 @@ namespace Ichni.Editor
.AddListenerFunction(() => sceneCamera.orthographicSize = orthographicSize);
//摄像机位置与旋转设置
var transformSettings = container.GenerateSubcontainer(3);
var transformSettings = container.GenerateSubcontainer(1);
var positionInputFields =
inspector.GenerateVector3InputField(this, transformSettings, "Position", nameof(cameraPosition), true)
.AddListenerFunction(() => sceneCamera.transform.position = cameraPosition);

View File

@@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 2337150799
CRC: 92234822
AssetBundleManifest:
AssetBundleInfos:
Info_0:

View File

@@ -1,15 +1,15 @@
ManifestFileVersion: 0
CRC: 3025065508
CRC: 2278704170
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 94a47516420622b19f8a3027ea5225f2
Hash: 3dfa1f8ac42e4799b2d93a126f4aae3d
TypeTreeHash:
serializedVersion: 2
Hash: b0381af468dfa38d2d34223ebeb2d739
Hash: 19f4d4c13f57af668b073e4c3205f059
IncrementalBuildHash:
serializedVersion: 2
Hash: 94a47516420622b19f8a3027ea5225f2
Hash: 3dfa1f8ac42e4799b2d93a126f4aae3d
HashAppended: 0
ClassTypes:
- Class: 1
@@ -28,6 +28,8 @@ ClassTypes:
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 64
Script: {instanceID: 0}
- Class: 65
Script: {instanceID: 0}
- Class: 108
@@ -56,6 +58,8 @@ ClassTypes:
Script: {fileID: 11500000, guid: cba1fe17342b14361bb504a9a506878b, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: f92b9b8f89de544adaa001ccfdf7eae4, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 212

View File

@@ -1,15 +1,15 @@
ManifestFileVersion: 0
CRC: 2545563612
CRC: 2856880787
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ee1494abca029c6f32fd1dff8d5695fa
Hash: 7053cf4f60c0782bf7d59ec99a9b62b6
TypeTreeHash:
serializedVersion: 2
Hash: 7d4efed0a5b6066f81d3b84d7269aad1
Hash: b1a2a3a6b336133189b50637512f9e51
IncrementalBuildHash:
serializedVersion: 2
Hash: ee1494abca029c6f32fd1dff8d5695fa
Hash: 7053cf4f60c0782bf7d59ec99a9b62b6
HashAppended: 0
ClassTypes:
- Class: 1
@@ -32,10 +32,12 @@ ClassTypes:
Script: {instanceID: 0}
- Class: 96
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: eb907071d10d7324995ff3aefbc2f1df, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: ea0771a0c87f746769a9ffd7286a0665, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: eb907071d10d7324995ff3aefbc2f1df, type: 3}
Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 135

File diff suppressed because one or more lines are too long

View File

@@ -12,7 +12,9 @@ GameObject:
- component: {fileID: 4419373029870813976}
- component: {fileID: 466442562606768818}
- component: {fileID: 1090375219705033731}
m_Layer: 0
- component: {fileID: 2971356753947631934}
- component: {fileID: 8876091283221430739}
m_Layer: 9
m_Name: Strip
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -172,6 +174,41 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
_shapeExposure: 1
--- !u!64 &2971356753947631934
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4718363974630876385}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 0}
--- !u!114 &8876091283221430739
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4718363974630876385}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1017732945410167678}
--- !u!1 &6759562726529963496
GameObject:
m_ObjectHideFlags: 0
@@ -182,7 +219,7 @@ GameObject:
m_Component:
- component: {fileID: 8577101396104971865}
- component: {fileID: 1652441339443578052}
m_Layer: 0
m_Layer: 9
m_Name: JudgeEffect
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -268,7 +305,9 @@ GameObject:
- component: {fileID: 9089737222488076669}
- component: {fileID: 1773068845366186070}
- component: {fileID: 6156702432362452020}
m_Layer: 0
- component: {fileID: 6317868314846977129}
- component: {fileID: 757833848761629952}
m_Layer: 9
m_Name: Tail
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -439,6 +478,40 @@ MonoBehaviour:
_followTargetDirection: -1
_position: 0
_mode: 0
--- !u!65 &6317868314846977129
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971801465093075595}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &757833848761629952
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971801465093075595}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1017732945410167678}
--- !u!1 &7060303612444197885
GameObject:
m_ObjectHideFlags: 0
@@ -451,7 +524,9 @@ GameObject:
- component: {fileID: 6523011263434424233}
- component: {fileID: 561382234009730444}
- component: {fileID: 487969501831859198}
m_Layer: 0
- component: {fileID: 7998261196637056522}
- component: {fileID: 512383380983688327}
m_Layer: 9
m_Name: Head
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -622,6 +697,40 @@ MonoBehaviour:
_followTargetDirection: -1
_position: 0
_mode: 0
--- !u!65 &7998261196637056522
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7060303612444197885}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &512383380983688327
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7060303612444197885}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1017732945410167678}
--- !u!1 &7418166426351319151
GameObject:
m_ObjectHideFlags: 0
@@ -631,7 +740,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2236104322558172231}
m_Layer: 0
m_Layer: 9
m_Name: Hold
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -666,7 +775,7 @@ GameObject:
m_Component:
- component: {fileID: 4303129164719886000}
- component: {fileID: 1017732945410167678}
m_Layer: 0
m_Layer: 9
m_Name: BasicNoteHoldStrip
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@@ -12,7 +12,9 @@ GameObject:
- component: {fileID: 8599098550281215569}
- component: {fileID: 2220589031961287304}
- component: {fileID: 6641325028710567983}
m_Layer: 0
- component: {fileID: 353892268438578816}
- component: {fileID: 829174807912269766}
m_Layer: 9
m_Name: Tube
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -162,6 +164,41 @@ MonoBehaviour:
_revolve: 360
_capUVScale: 1
_uvTwist: 0
--- !u!64 &353892268438578816
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963102079152663584}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 0}
--- !u!114 &829174807912269766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963102079152663584}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1017732945410167678}
--- !u!1 &6759562726529963496
GameObject:
m_ObjectHideFlags: 0
@@ -172,7 +209,7 @@ GameObject:
m_Component:
- component: {fileID: 8577101396104971865}
- component: {fileID: 1652441339443578052}
m_Layer: 0
m_Layer: 9
m_Name: JudgeEffect
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -258,7 +295,9 @@ GameObject:
- component: {fileID: 9089737222488076669}
- component: {fileID: 1773068845366186070}
- component: {fileID: 6156702432362452020}
m_Layer: 0
- component: {fileID: 8194990663172150086}
- component: {fileID: 5578662268952762582}
m_Layer: 9
m_Name: Tail
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -429,6 +468,40 @@ MonoBehaviour:
_followTargetDirection: -1
_position: 0
_mode: 0
--- !u!65 &8194990663172150086
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971801465093075595}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5578662268952762582
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6971801465093075595}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1017732945410167678}
--- !u!1 &7060303612444197885
GameObject:
m_ObjectHideFlags: 0
@@ -441,7 +514,9 @@ GameObject:
- component: {fileID: 6523011263434424233}
- component: {fileID: 561382234009730444}
- component: {fileID: 487969501831859198}
m_Layer: 0
- component: {fileID: 9031358905518928749}
- component: {fileID: 1217047077392103470}
m_Layer: 9
m_Name: Head
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -612,6 +687,40 @@ MonoBehaviour:
_followTargetDirection: -1
_position: 0
_mode: 0
--- !u!65 &9031358905518928749
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7060303612444197885}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1217047077392103470
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7060303612444197885}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1017732945410167678}
--- !u!1 &7418166426351319151
GameObject:
m_ObjectHideFlags: 0
@@ -621,7 +730,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2236104322558172231}
m_Layer: 0
m_Layer: 9
m_Name: Hold
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -656,7 +765,7 @@ GameObject:
m_Component:
- component: {fileID: 4303129164719886000}
- component: {fileID: 1017732945410167678}
m_Layer: 0
m_Layer: 9
m_Name: BasicNoteHoldTube
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@@ -19941,6 +19941,7 @@ GameObject:
- component: {fileID: 2828557749403774688}
- component: {fileID: 1230482840604333981}
- component: {fileID: 2070171037236872191}
- component: {fileID: 3210412380801450278}
m_Layer: 9
m_Name: DTM_NoteVisualFlick
m_TagString: Untagged
@@ -20037,6 +20038,19 @@ SphereCollider:
serializedVersion: 3
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &3210412380801450278
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3918812215425595527}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1230482840604333981}
--- !u!1 &4411086403337526732
GameObject:
m_ObjectHideFlags: 0

View File

@@ -9805,6 +9805,7 @@ GameObject:
- component: {fileID: 2828557749403774688}
- component: {fileID: 1230482840604333981}
- component: {fileID: 1149845662485922453}
- component: {fileID: 8253441719605867906}
m_Layer: 9
m_Name: DTM_NoteVisualStay
m_TagString: Untagged
@@ -9901,6 +9902,19 @@ SphereCollider:
serializedVersion: 3
m_Radius: 0.4
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8253441719605867906
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3918812215425595527}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 1230482840604333981}
--- !u!1 &5131198242182004625
GameObject:
m_ObjectHideFlags: 0

View File

@@ -44074,6 +44074,7 @@ GameObject:
- component: {fileID: 1955393630991878621}
- component: {fileID: 2759238525513880590}
- component: {fileID: 2624384507000342927}
- component: {fileID: 7338296482691180570}
m_Layer: 9
m_Name: DTM_NoteVisualTap
m_TagString: Untagged
@@ -44172,6 +44173,19 @@ SphereCollider:
serializedVersion: 3
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &7338296482691180570
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4673306895708997148}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3}
m_Name:
m_EditorClassIdentifier:
connectedGameElement: {fileID: 2759238525513880590}
--- !u!1 &5850232885066616162
GameObject:
m_ObjectHideFlags: 0