non-strip hold完成

This commit is contained in:
SoulliesOfficial
2025-03-16 20:19:04 -04:00
parent 4aad7b3882
commit 1c2e703bbc
25 changed files with 1353 additions and 3026 deletions

View File

@@ -0,0 +1,255 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6759562726529963496
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8577101396104971865}
- component: {fileID: 1652441339443578052}
m_Layer: 0
m_Name: JudgeEffect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8577101396104971865
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6759562726529963496}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4303129164719886000}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1652441339443578052
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6759562726529963496}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 0ab11be59df835d4099df401d7420c44, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 1
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7418166426351319151
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2236104322558172231}
- component: {fileID: 4662184346438900431}
- component: {fileID: 7556478762474901918}
m_Layer: 0
m_Name: NoteMain
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2236104322558172231
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7418166426351319151}
serializedVersion: 2
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: 4303129164719886000}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4662184346438900431
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7418166426351319151}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7556478762474901918
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7418166426351319151}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b39306d2c39754d0aafabe8570b8e640, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8969796646526822168
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4303129164719886000}
- component: {fileID: 1274404912192895846}
m_Layer: 0
m_Name: BasicNoteHoldMovable
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4303129164719886000
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8969796646526822168}
serializedVersion: 2
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:
- {fileID: 2236104322558172231}
- {fileID: 8577101396104971865}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1274404912192895846
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8969796646526822168}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cba1fe17342b14361bb504a9a506878b, type: 3}
m_Name:
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: elementGuid
Entry: 2
Data: 00000000000000000000000000000000
- Name: submoduleList
Entry: 7
Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase,
Assembly-CSharp]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
elementName:
tags: []
parentElement: {fileID: 0}
connectedTab: {fileID: 0}
childElementList: []
themeBundleName:
objectName:
note: {fileID: 0}
noteMain: {fileID: 7418166426351319151}
judgeEffect: {fileID: 6759562726529963496}
notePartList:
- {fileID: 7418166426351319151}
effectPartList:
- {fileID: 6759562726529963496}
hold: {fileID: 0}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e8618d7bd895943258b55c798f5b3da6
PrefabImporter:
externalObjects: {}
userData:
assetBundleName: basic
assetBundleVariant:

View File

@@ -178,7 +178,7 @@ GameObject:
- component: {fileID: 4303129164719886000}
- component: {fileID: 7543664491821477037}
m_Layer: 0
m_Name: BasicNoteHold
m_Name: BasicNoteHoldStatic
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -243,8 +243,8 @@ MonoBehaviour:
parentElement: {fileID: 0}
connectedTab: {fileID: 0}
childElementList: []
themeBundleName: basic
objectName: BasicNoteHold
themeBundleName:
objectName:
note: {fileID: 0}
noteMain: {fileID: 7418166426351319151}
judgeEffect: {fileID: 6759562726529963496}
@@ -252,3 +252,4 @@ MonoBehaviour:
- {fileID: 7418166426351319151}
effectPartList:
- {fileID: 6759562726529963496}
hold: {fileID: 0}

View File

@@ -225,79 +225,10 @@ MonoBehaviour:
- Name: elementGuid
Entry: 2
Data: 00000000000000000000000000000000
- Name: timeDurationSubmodule
- Name: submoduleList
Entry: 7
Data: 0|Ichni.RhythmGame.TimeDurationSubmodule, Assembly-CSharp
- Name: attachedElement
Entry: 6
Data:
- Name: isOverridingDuration
Entry: 5
Data: false
- Name: startTime
Entry: 4
Data: 0
- Name: endTime
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: transformSubmodule
Entry: 7
Data: 1|Ichni.RhythmGame.TransformSubmodule, Assembly-CSharp
- Name: attachedElement
Entry: 6
Data:
- Name: originalPosition
Entry: 7
Data: UnityEngine.Vector3, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: originalEulerAngles
Entry: 7
Data: UnityEngine.Vector3, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: originalScale
Entry: 7
Data: UnityEngine.Vector3, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 1
- Name:
Entry: 4
Data: 1
- Name:
Entry: 4
Data: 1
- Name:
Entry: 8
Data:
- Name: positionOffset
Entry: 7
Data: 2|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]],
mscorlib
Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase,
Assembly-CSharp]], mscorlib
- Name:
Entry: 12
Data: 0
@@ -307,242 +238,13 @@ MonoBehaviour:
- Name:
Entry: 8
Data:
- Name: eulerAnglesOffset
Entry: 7
Data: 3|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]],
mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name: scaleOffset
Entry: 7
Data: 4|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]],
mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name: currentPosition
Entry: 7
Data: UnityEngine.Vector3, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: currentEulerAngles
Entry: 7
Data: UnityEngine.Vector3, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: currentScale
Entry: 7
Data: UnityEngine.Vector3, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 1
- Name:
Entry: 4
Data: 1
- Name:
Entry: 4
Data: 1
- Name:
Entry: 8
Data:
- Name: positionDirtyMark
Entry: 5
Data: false
- Name: eulerAnglesDirtyMark
Entry: 5
Data: false
- Name: scaleDirtyMark
Entry: 5
Data: false
- Name: eulerAnglesOffsetLock
Entry: 5
Data: false
- Name: OnPositionChanged
Entry: 6
Data:
- Name: OnEulerAnglesChanged
Entry: 6
Data:
- Name: OnScaleChanged
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: colorSubmodule
Entry: 7
Data: 5|Ichni.RhythmGame.ColorSubmodule, Assembly-CSharp
- Name: attachedElement
Entry: 6
Data:
- Name: originalBaseColor
Entry: 7
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: emissionEnabled
Entry: 5
Data: false
- Name: originalEmissionColor
Entry: 7
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: originalEmissionIntensity
Entry: 4
Data: 0
- Name: baseColorOffset
Entry: 7
Data: 6|System.Collections.Generic.List`1[[UnityEngine.Color, UnityEngine.CoreModule]],
mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name: emissionColorOffset
Entry: 7
Data: 7|System.Collections.Generic.List`1[[UnityEngine.Color, UnityEngine.CoreModule]],
mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name: emissionIntensityOffset
Entry: 7
Data: 8|System.Collections.Generic.List`1[[System.Single, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name: currentBaseColor
Entry: 7
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: currentEmissionColor
Entry: 7
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 4
Data: 0
- Name:
Entry: 8
Data:
- Name: currentEmissionIntensity
Entry: 4
Data: 0
- Name: baseColorDirtyMark
Entry: 5
Data: false
- Name: emissionColorDirtyMark
Entry: 5
Data: false
- Name:
Entry: 8
Data:
elementName:
serialNumber: 0
tags: []
parentElement: {fileID: 0}
connectedTab: {fileID: 0}
childElementList: []
themeBundleName: basic
objectName: BasicNoteTap3D
themeBundleName:
objectName:
note: {fileID: 0}
noteMain: {fileID: 7418166426351319151}
judgeEffect: {fileID: 6759562726529963496}

View File

@@ -0,0 +1,85 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Ichni.RhythmGame.Beatmap;
using UnityEngine;
namespace Ichni.RhythmGame.ThemeBundles.Basic
{
public partial class BasicHoldVisualMovable : NoteVisualBaseHold
{
public static BasicHoldVisualMovable GenerateElement(string elementName, Guid id, List<string> tags,
bool isFirstGenerated, GameElement parentElement, string themeBundleName, string objectName)
{
BasicHoldVisualMovable holdVisualMovable = SubstantialObject.GenerateElement(elementName, id, tags,
isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<BasicHoldVisualMovable>();
return holdVisualMovable;
}
public override void FirstSetUpObject(bool isFirstGenerated)
{
NoteBase note = parentElement as NoteBase;
if(note == null) throw new System.Exception("NoteVisual只能生成在Note下。");
this.note = note;
note.noteVisual = this;
this.hold = note as Hold;
if (isFirstGenerated)
{
effectSubmodule.effectCollection["Generate"].Add(new BasicNoteGenerateExpand(this));
effectSubmodule.effectCollection["Holding"].Add(new BasicNoteHoldingExpand(this));
effectSubmodule.effectCollection["Perfect"].Add(new BasicNotePerfectBurst(this));
effectSubmodule.effectCollection["Good"].Add(new BasicNoteGoodBurst(this));
effectSubmodule.effectCollection["Bad"].Add(new BasicNoteBadShrink(this));
effectSubmodule.effectCollection["Miss"].Add(new BasicNoteMissPale(this));
}
}
}
public partial class BasicHoldVisualMovable
{
public override void SaveBM()
{
matchedBM = new Beatmap.BasicHoldVisualMovable_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
}
public override void UpdateHoldInMovableTrack()
{
if (hold.isHolding)
{
float percent = (hold.track.trackTimeSubmodule as TrackTimeSubmoduleMovable).GetTrackPercent(hold.exactJudgeTime + hold.holdingTime);
hold.trackPositioner.SetPercent(percent);
}
}
}
namespace Beatmap
{
public class BasicHoldVisualMovable_BM : SubstantialObject_BM
{
public BasicHoldVisualMovable_BM()
{
}
public BasicHoldVisualMovable_BM(string elementName, Guid id, List<string> tags,
GameElement_BM parent, string themeBundleName, string objectName) :
base(elementName, id, tags, parent, themeBundleName, objectName)
{
}
public override void ExecuteBM()
{
matchedElement = BasicHoldVisualMovable.GenerateElement(elementName, elementGuid, tags, false,
GetElement(attachedElementGuid), themeBundleName, objectName);
}
public override GameElement DuplicateBM(GameElement parent)
{
return BasicHoldVisualMovable.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
}
}
}
}

View File

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

View File

@@ -6,15 +6,15 @@ using UnityEngine;
namespace Ichni.RhythmGame.ThemeBundles.Basic
{
public partial class BasicHoldVisual : NoteVisualBaseHold
public partial class BasicHoldVisualStatic : NoteVisualBaseHold
{
public static BasicHoldVisual GenerateElement(string elementName, Guid id, List<string> tags,
public static BasicHoldVisualStatic GenerateElement(string elementName, Guid id, List<string> tags,
bool isFirstGenerated, GameElement parentElement, string themeBundleName, string objectName)
{
BasicHoldVisual holdVisual = SubstantialObject.GenerateElement(elementName, id, tags,
isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<BasicHoldVisual>();
BasicHoldVisualStatic holdVisualStatic = SubstantialObject.GenerateElement(elementName, id, tags,
isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<BasicHoldVisualStatic>();
return holdVisual;
return holdVisualStatic;
}
public override void FirstSetUpObject(bool isFirstGenerated)
@@ -23,6 +23,7 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
if(note == null) throw new System.Exception("NoteVisual只能生成在Note下。");
this.note = note;
note.noteVisual = this;
this.hold = note as Hold;
if (isFirstGenerated)
{
@@ -36,24 +37,24 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
}
}
public partial class BasicHoldVisual
public partial class BasicHoldVisualStatic
{
public override void SaveBM()
{
matchedBM = new Beatmap.BasicHoldVisual_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
matchedBM = new Beatmap.BasicHoldVisualStatic_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
}
}
namespace Beatmap
{
public class BasicHoldVisual_BM : SubstantialObject_BM
public class BasicHoldVisualStatic_BM : SubstantialObject_BM
{
public BasicHoldVisual_BM()
public BasicHoldVisualStatic_BM()
{
}
public BasicHoldVisual_BM(string elementName, Guid id, List<string> tags,
public BasicHoldVisualStatic_BM(string elementName, Guid id, List<string> tags,
GameElement_BM parent, string themeBundleName, string objectName) :
base(elementName, id, tags, parent, themeBundleName, objectName)
{
@@ -62,13 +63,13 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic
public override void ExecuteBM()
{
matchedElement = BasicHoldVisual.GenerateElement(elementName, elementGuid, tags, false,
matchedElement = BasicHoldVisualStatic.GenerateElement(elementName, elementGuid, tags, false,
GetElement(attachedElementGuid), themeBundleName, objectName);
}
public override GameElement DuplicateBM(GameElement parent)
{
return BasicHoldVisual.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
return BasicHoldVisualStatic.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
}
}
}