Soullies/ichni_Creator_Studio
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/MiracleForest-Ichni/IchniCreatorStudio

Browse Source
This commit is contained in:
TRAfoer
2025-07-17 16:46:10 +08:00
parent 55af142af3 c52a2106db
commit d1bd2aeff3
19 changed files with 7836 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/EditorGame/Animations/Transform/Displacement.cs
View File

@@ -51,7 +51,7 @@ namespace Ichni.RhythmGame
{
animationReturnType = FlexibleReturnType.MiddleExecuting;
Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value);
targetTransformSubmodule.positionOffset.Add(currentPosition);
targetTransformSubmodule.positionOffset += currentPosition;
targetTransformSubmodule.positionDirtyMark = true;
}
else
@@ -59,7 +59,7 @@ namespace Ichni.RhythmGame
if (!EditorManager.instance.musicPlayer.isPlaying && animationReturnType != FlexibleReturnType.MiddleInterval)
{
Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value);
targetTransformSubmodule.positionOffset.Add(currentPosition);
targetTransformSubmodule.positionOffset += currentPosition;
targetTransformSubmodule.positionDirtyMark = true;
}

23
Assets/Scripts/EditorGame/Animations/Transform/LookAt.cs
View File

@@ -43,32 +43,32 @@ namespace Ichni.RhythmGame
{
timeDurationSubmodule = new TimeDurationSubmodule(this);
}
protected override void Update()
{
}
void LateUpdate()
{
UpdateAnimation(EditorManager.instance.songInformation.songTime);
(animatedObject as IHaveTransformSubmodule)?.UpdateLookAt(this);
}
protected override void UpdateAnimation(float songTime)
{
if (lookAtObject == null) return;
enabling.UpdateFlexibleBool(songTime);
targetTransformSubmodule.eulerAnglesOffsetLock = enabling.value;
enabling.UpdateFlexibleBool(EditorManager.instance.songInformation.songTime);
if (!targetTransformSubmodule.eulerAnglesOffsetLock || enabling.value)
{
targetTransformSubmodule.eulerAnglesOffsetLock = enabling.value;
}
if (enabling.value)
{
animationReturnType = FlexibleReturnType.MiddleExecuting;
targetTransformSubmodule.eulerAnglesDirtyMark = true;
gameCamera.UpdateLookAt(this);
}
else if (animationReturnType != FlexibleReturnType.MiddleInterval)
{
animationReturnType = FlexibleReturnType.MiddleInterval;
targetTransformSubmodule.eulerAnglesOffset.Add(Vector3.zero);
targetTransformSubmodule.eulerAnglesDirtyMark = true;
}
}
@@ -86,7 +86,6 @@ namespace Ichni.RhythmGame
}
public void OnDestroy()
{
targetTransformSubmodule.eulerAnglesOffset.Add(Vector3.zero);
targetTransformSubmodule.eulerAnglesDirtyMark = true;
}
}

4
Assets/Scripts/EditorGame/Animations/Transform/Scale.cs
View File

@@ -51,7 +51,7 @@ namespace Ichni.RhythmGame
{
animationReturnType = FlexibleReturnType.MiddleExecuting;
Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value);
targetTransformSubmodule.scaleOffset.Add(currentScale);
targetTransformSubmodule.scaleOffset += currentScale;
targetTransformSubmodule.scaleDirtyMark = true;
}
else
@@ -59,7 +59,7 @@ namespace Ichni.RhythmGame
if (!EditorManager.instance.musicPlayer.isPlaying && animationReturnType != FlexibleReturnType.MiddleInterval)
{
Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value);
targetTransformSubmodule.scaleOffset.Add(currentScale);
targetTransformSubmodule.scaleOffset += currentScale;
targetTransformSubmodule.scaleDirtyMark = true;
}

4
Assets/Scripts/EditorGame/Animations/Transform/Swirl.cs
View File

@@ -50,7 +50,7 @@ namespace Ichni.RhythmGame
{
animationReturnType = FlexibleReturnType.MiddleExecuting;
Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value);
targetTransformSubmodule.eulerAnglesOffset.Add(currentEulerAngles);
targetTransformSubmodule.eulerAnglesOffset += currentEulerAngles;
targetTransformSubmodule.eulerAnglesDirtyMark = true;
}
else
@@ -58,7 +58,7 @@ namespace Ichni.RhythmGame
if (!EditorManager.instance.musicPlayer.isPlaying && animationReturnType != FlexibleReturnType.MiddleInterval)
{
Vector3 currentRotation = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value);
targetTransformSubmodule.eulerAnglesOffset.Add(currentRotation);
targetTransformSubmodule.eulerAnglesOffset += currentRotation;
targetTransformSubmodule.eulerAnglesDirtyMark = true;
}

61
Assets/Scripts/EditorGame/Base/GeneralSubmodules/TransformSubmodule.cs
View File

@@ -17,9 +17,9 @@ namespace Ichni.RhythmGame
public Vector3 originalEulerAngles;
public Vector3 originalScale;
public List<Vector3> positionOffset;
public List<Vector3> eulerAnglesOffset;
public List<Vector3> scaleOffset;
public Vector3 positionOffset;
public Vector3 eulerAnglesOffset;
public Vector3 scaleOffset;
public Vector3 currentPosition;
public Vector3 currentEulerAngles;
@@ -38,10 +38,10 @@ namespace Ichni.RhythmGame
this.originalEulerAngles = Vector3.zero;
this.originalScale = Vector3.one;
positionOffset = new List<Vector3>();
eulerAnglesOffset = new List<Vector3>();
scaleOffset = new List<Vector3>();
positionOffset = Vector3.zero;
eulerAnglesOffset = Vector3.zero;
scaleOffset = Vector3.zero;
currentPosition = Vector3.zero;
currentEulerAngles = Vector3.zero;
currentScale = Vector3.one;
@@ -66,10 +66,10 @@ namespace Ichni.RhythmGame
this.originalEulerAngles = originalEulerAngles;
this.originalScale = originalScale;
positionOffset = new List<Vector3>();
eulerAnglesOffset = new List<Vector3>();
scaleOffset = new List<Vector3>();
positionOffset = Vector3.zero;
eulerAnglesOffset = Vector3.zero;
scaleOffset = Vector3.zero;
currentPosition = originalPosition;
currentEulerAngles = originalEulerAngles;
currentScale = originalScale;
@@ -158,32 +158,29 @@ namespace Ichni.RhythmGame
if (transformSubmodule.scaleDirtyMark)
{
Vector3 offset = transformSubmodule.scaleOffset.Sum();
transformSubmodule.currentScale = transformSubmodule.originalScale + offset;
transformSubmodule.currentScale = transformSubmodule.originalScale + transformSubmodule.scaleOffset;
attachedGameElement.transform.localScale = transformSubmodule.currentScale;
transformSubmodule.scaleDirtyMark = false;
willRefresh = true;
transformSubmodule.scaleOffset.Clear();
transformSubmodule.scaleOffset = Vector3.zero;
}
if (transformSubmodule.eulerAnglesDirtyMark)
if (!transformSubmodule.eulerAnglesOffsetLock && transformSubmodule.eulerAnglesDirtyMark)
{
Vector3 offset = transformSubmodule.eulerAnglesOffset.Sum();
transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + offset;
transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + transformSubmodule.eulerAnglesOffset;
attachedGameElement.transform.localEulerAngles = transformSubmodule.currentEulerAngles;
transformSubmodule.eulerAnglesDirtyMark = false;
willRefresh = true;
transformSubmodule.eulerAnglesOffset.Clear();
transformSubmodule.eulerAnglesOffset = Vector3.zero;
}
if (transformSubmodule.positionDirtyMark)
{
Vector3 offset = transformSubmodule.positionOffset.Sum();
transformSubmodule.currentPosition = transformSubmodule.originalPosition + offset;
transformSubmodule.currentPosition = transformSubmodule.originalPosition + transformSubmodule.positionOffset;
attachedGameElement.transform.localPosition = transformSubmodule.currentPosition;
transformSubmodule.positionDirtyMark = false;
willRefresh = true;
transformSubmodule.positionOffset.Clear();
transformSubmodule.positionOffset = Vector3.zero;
}
if(willRefresh)
@@ -193,6 +190,28 @@ namespace Ichni.RhythmGame
}).AddTo(attachedGameElement);
}
public void UpdateLookAt(LookAt lookAt) // 处理LookAt
{
Transform target = lookAt.lookAtObject.transform;
Transform self = transformSubmodule.attachedGameElement.transform;
if (transformSubmodule.eulerAnglesOffsetLock && transformSubmodule.eulerAnglesDirtyMark)
{
Vector3 lookingDirection = (target.position - self.position).normalized;
Vector3 eulerAnglesOffset = Quaternion.LookRotation(lookingDirection).eulerAngles;
transformSubmodule.eulerAnglesOffset += eulerAnglesOffset;
transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + transformSubmodule.eulerAnglesOffset;
self.localEulerAngles = transformSubmodule.currentEulerAngles;
transformSubmodule.eulerAnglesDirtyMark = false;
transformSubmodule.eulerAnglesOffsetLock = false;
transformSubmodule.eulerAnglesOffset = Vector3.zero;
}
}
}
namespace Beatmap

33
Assets/Scripts/EditorGame/GameElements/GameCamera/GameCamera.cs
View File

@@ -93,29 +93,6 @@ namespace Ichni.RhythmGame
public partial class GameCamera
{
public void UpdateLookAt(LookAt lookAt) // 处理LookAt
{
if (
transformSubmodule.eulerAnglesOffsetLock &&
transformSubmodule.eulerAnglesDirtyMark)
{
Vector3 lookingDirection = (lookAt.lookAtObject.transform.position - transform.position).normalized;
Vector3 eulerAnglesOffse = Quaternion.LookRotation(lookingDirection).eulerAngles;
transformSubmodule.eulerAnglesOffset.Add(eulerAnglesOffse);
Vector3 offset = transformSubmodule.eulerAnglesOffset.Sum();
transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + offset;
// transform.LookAt(transformSubmodule.lookAt.lookAtObject.transform);
transform.localEulerAngles = transformSubmodule.currentEulerAngles;
transformSubmodule.eulerAnglesDirtyMark = false;
transformSubmodule.eulerAnglesOffset.Clear();
}
}
public void SetTransformObserver()
{
Observable.EveryLateUpdate().Subscribe(_ =>
@@ -129,22 +106,20 @@ namespace Ichni.RhythmGame
if (!transformSubmodule.eulerAnglesOffsetLock && transformSubmodule.eulerAnglesDirtyMark)
{
Vector3 offset = transformSubmodule.eulerAnglesOffset.Sum();
transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + offset;
transformSubmodule.currentEulerAngles = transformSubmodule.originalEulerAngles + transformSubmodule.eulerAnglesOffset;
transform.localEulerAngles = transformSubmodule.currentEulerAngles;
transformSubmodule.eulerAnglesDirtyMark = false;
willRefresh = true;
transformSubmodule.eulerAnglesOffset.Clear();
transformSubmodule.eulerAnglesOffset = Vector3.zero;
}
if (transformSubmodule.positionDirtyMark)
{
Vector3 offset = transformSubmodule.positionOffset.Sum();
transformSubmodule.currentPosition = transformSubmodule.originalPosition + offset;
transformSubmodule.currentPosition = transformSubmodule.originalPosition + transformSubmodule.positionOffset;
transform.localPosition = transformSubmodule.currentPosition;
transformSubmodule.positionDirtyMark = false;
willRefresh = true;
transformSubmodule.positionOffset.Clear();
transformSubmodule.positionOffset = Vector3.zero;
}
if (willRefresh)

8
Assets/StreamingAssets/Projects/Space Rain.meta Normal file
View File

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

6013
Assets/StreamingAssets/Projects/Space Rain/Beatmap.json Normal file
View File

File diff suppressed because it is too large Load Diff

2
Assets/NLayer/NLayer.csproj.meta → Assets/StreamingAssets/Projects/Space Rain/Beatmap.json.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6dbdd314784e80440b48088e6357c1ef
guid: 7d4b51b7162387b43a401791dbae00c1
DefaultImporter:
externalObjects: {}
userData:

13
Assets/StreamingAssets/Projects/Space Rain/CommandScripts.json Normal file
View File

@@ -0,0 +1,13 @@
{
"CommandScripts" : {
"__type" : "Ichni.RhythmGame.Beatmap.CommandScripts_BM,Assembly-CSharp",
"value" : {
"commandList" : [
],
"attachedElementGuid" : {
"value" : "00000000-0000-0000-0000-000000000000"
}
}
}
}

7
Assets/StreamingAssets/Projects/Space Rain/CommandScripts.json.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4c2ab609ddf67104ea41fbdf89b0bfc0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/StreamingAssets/Projects/Space Rain/ProjectInfo.json Normal file
View File

@@ -0,0 +1,18 @@
{
"ProjectInformation" : {
"__type" : "Ichni.RhythmGame.Beatmap.ProjectInformation_BM,Assembly-CSharp",
"value" : {
"projectName" : "Space Rain",
"creatorName" : "mora",
"editorVersion" : "0.1.0",
"createTime" : "2025\/6\/21 20:53:45",
"lastSaveTime" : "2025\/6\/21 20:53:45",
"selectedThemeBundleList" : [
"basic","departure_to_multiverse"
],
"attachedElementGuid" : {
"value" : "00000000-0000-0000-0000-000000000000"
}
}
}
}

7
Assets/StreamingAssets/Projects/Space Rain/ProjectInfo.json.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1f8ab3a217a3c4f44acbd2c0d5c7f84a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/StreamingAssets/Projects/Space Rain/SongInfo.json Normal file
View File

@@ -0,0 +1,14 @@
{
"SongInformation" : {
"__type" : "Ichni.RhythmGame.Beatmap.SongInformation_BM,Assembly-CSharp",
"value" : {
"songName" : "Space Rain.wav",
"bpm" : 180,
"delay" : 0,
"offset" : 0,
"attachedElementGuid" : {
"value" : "00000000-0000-0000-0000-000000000000"
}
}
}
}

7
Assets/StreamingAssets/Projects/Space Rain/SongInfo.json.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a4d494096f33b7d42bf63d6107b26c6a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/StreamingAssets/Projects/Space Rain/Space Rain.wav Normal file
View File

Binary file not shown.

7
Assets/StreamingAssets/Projects/Space Rain/Space Rain.wav.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 402b924b98fb52d459c141c2a2ed1862
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/StreamingAssets/Projects/tesxt/Beatmap.json
View File

@@ -728,8 +728,8 @@
"animatedFloatList" : [
{
"startValue" : 0,
"endValue" : 0,
"startTime" : 2,
"endValue" : 360,
"startTime" : 0,
"endTime" : 2.5,
"animationCurveType" : 0
},{
@@ -1861,9 +1861,6 @@
"value" : "7e1f2e2d-1e13-4ad9-b14f-1cca01476469"
}
}
],
"lowPriorityElementList" : [
],
"attachedElementGuid" : {
"value" : "00000000-0000-0000-0000-000000000000"

1689
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long