Signed-off-by: TRAfoer <lhf190@outlook.com>

This commit is contained in:
2025-07-14 16:45:47 +08:00
parent 81ac6de8dc
commit 4a12777612
15 changed files with 109350 additions and 15978 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -38,6 +38,8 @@ namespace Ichni.Editor
clipSaveButton.onClick.AddListener(GenerateSaveClipWindow);
clipLoadButton.onClick.AddListener(GenerateLoadClipWindow);
beatmapToolsButton.onClick.AddListener(GenerateBeatmapToolsWindow);
//songInfoButton.onClick.AddListener(已经在songinfo好了);
//projectInfoButton.onClick.AddListener(已经在projectinfo好了);
}
}

View File

@@ -53,7 +53,7 @@ namespace Ichni.RhythmGame
}
protected override void UpdateAnimation(float songTime)
{
if (lookAtObject is null) return;
if (lookAtObject == null) return;
enabling.UpdateFlexibleBool(songTime);
targetTransformSubmodule.eulerAnglesOffsetLock = enabling.value;

View File

@@ -1,6 +1,8 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Ichni.Editor;
using Ichni.RhythmGame.Beatmap;
using UniRx;
using UnityEngine;
@@ -11,10 +13,10 @@ namespace Ichni.RhythmGame
public class BeatmapContainer : IBaseElement
{
public List<GameElement> gameElementList;
[NonSerialized]
public List<UnityAction> lowPriorityActions;
public BaseElement_BM matchedBM { get; set; }
public BeatmapContainer()
@@ -23,7 +25,7 @@ namespace Ichni.RhythmGame
lowPriorityActions = new List<UnityAction>();
Observable.EveryUpdate().Subscribe(_ => ExecuteLowPriorityActions());
}
public void ExecuteLowPriorityActions()
{
if (lowPriorityActions.Count > 0)
@@ -36,11 +38,12 @@ namespace Ichni.RhythmGame
public void SaveBM()
{
matchedBM = new BeatmapContainer_BM(gameElementList);
}
public void SetUpInspector()
{
throw new System.NotImplementedException();
return;
}
public void Refresh()
@@ -54,7 +57,7 @@ namespace Ichni.RhythmGame
public partial class BeatmapContainer_BM : BaseElement_BM
{
public List<BaseElement_BM> elementList;
public BeatmapContainer_BM()
{
@@ -64,7 +67,7 @@ namespace Ichni.RhythmGame
public BeatmapContainer_BM(List<GameElement> gameElementList)
{
elementList = new List<BaseElement_BM>();
gameElementList.ForEach(e =>
{
e.SaveBM();
@@ -90,7 +93,7 @@ namespace Ichni.RhythmGame
EditorManager.instance.beatmapContainer = new BeatmapContainer();
EditorManager.instance.beatmapContainer.matchedBM = this;
GameElement_BM.identifier.Clear();
elementList.ForEach(element =>
{
//#if UNITY_EDITOR
@@ -139,8 +142,9 @@ namespace Ichni.RhythmGame
public static readonly List<Type> LowPriorityGameElementTypes = new()
{
typeof(NoteJudgeSubmodule_BM),
typeof(LookAt_BM),
};
public static readonly List<Type> LowPriorityDataTypes = new()
{
typeof(EnableControlEffect_BM),

View File

@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using Ichni.Editor;
using Ichni.RhythmGame.Beatmap;
using UnityEngine;
@@ -8,7 +9,7 @@ namespace Ichni.RhythmGame
public class ProjectInformation : IBaseElement
{
public static string EditorVersion = "0.1.0";
public string projectName;
public string creatorName;
public string editorVersion;
@@ -18,7 +19,7 @@ namespace Ichni.RhythmGame
public string projectPath;
public BaseElement_BM matchedBM { get; set; }
public string peojectInfoPath => projectPath + "/ProjectInfo.json";
public string songInfoPath => projectPath + "/SongInfo.json";
public string songPath => projectPath + EditorManager.instance.songInformation.songName + ".wav";
@@ -36,17 +37,32 @@ namespace Ichni.RhythmGame
this.selectedThemeBundleList = selectedThemeBundleList;
projectPath = Application.streamingAssetsPath + "/Projects/" + projectName;
EditorManager.instance.uiManager.mainPage.toolBar.projectInfoButton.onClick.AddListener(() =>
{
EditorManager.instance.uiManager.inspector.ClearInspector();
SetUpInspector();
});
}
public void SaveBM()
{
matchedBM = new ProjectInformation_BM(projectName, creatorName, "0.1.0",
matchedBM = new ProjectInformation_BM(projectName, creatorName, "0.1.0",
createTime, lastSaveTime, selectedThemeBundleList);
}
public void SetUpInspector()
{
IHaveInspection inspector = EditorManager.instance.uiManager.inspector;
Inspector inspectorMain = EditorManager.instance.uiManager.inspector;
var container = inspector.GenerateContainer("Beatmap Container");
var sub = container.GenerateSubcontainer(2);
inspector.GenerateHintText(this, sub, projectName);
inspector.GenerateHintText(this, sub, creatorName);
inspector.GenerateHintText(this, sub, editorVersion);
inspector.GenerateHintText(this, sub, createTime);
inspector.GenerateHintText(this, sub, lastSaveTime);
inspector.GenerateHintText(this, sub, projectPath);
}
}
@@ -76,10 +92,10 @@ namespace Ichni.RhythmGame
this.lastSaveTime = lastSaveTime;
this.selectedThemeBundleList = selectedThemeBundleList;
}
public override void ExecuteBM()
{
EditorManager.instance.projectInformation = new ProjectInformation(projectName,
EditorManager.instance.projectInformation = new ProjectInformation(projectName,
creatorName, editorVersion, createTime, lastSaveTime, selectedThemeBundleList);
}
}

View File

@@ -95,6 +95,8 @@ namespace Ichni.RhythmGame
p.AddListenerFunction(action);
o.AddListenerFunction(action);
c.AddListenerFunction(action);
var info = a.GenerateSubcontainer(1);
inspector.GenerateHintText(this, info, songName);
}
}

View File

@@ -80,7 +80,7 @@
}
},{
"__type" : "Ichni.RhythmGame.Beatmap.ElementFolder_BM,Assembly-CSharp",
"elementName" : "New Folder",
"elementName" : "看,加盟调查",
"tags" : [
],
@@ -292,6 +292,12 @@
"startTime" : 52.61539,
"endTime" : 55.69231,
"animationCurveType" : 6
},{
"startValue" : 0,
"endValue" : 23,
"startTime" : 57.23077,
"endTime" : 58.15385,
"animationCurveType" : 6
}
]
},
@@ -495,6 +501,18 @@
"startTime" : 52.61539,
"endTime" : 55.38462,
"animationCurveType" : 2
},{
"startValue" : 0,
"endValue" : 0,
"startTime" : 57.23077,
"endTime" : 57.24077,
"animationCurveType" : 2
},{
"startValue" : 0,
"endValue" : 45,
"startTime" : 58.15385,
"endTime" : 58.46154,
"animationCurveType" : 2
}
]
},
@@ -608,6 +626,12 @@
"startTime" : 52.61539,
"endTime" : 55.38462,
"animationCurveType" : 5
},{
"startValue" : 0,
"endValue" : 12,
"startTime" : 57.23077,
"endTime" : 58.46154,
"animationCurveType" : 5
}
]
},
@@ -1769,6 +1793,18 @@
"startTime" : 54.46154,
"endTime" : 54.76923,
"animationCurveType" : 5
},{
"startValue" : 0,
"endValue" : 56,
"startTime" : 55.38462,
"endTime" : 55.69231,
"animationCurveType" : 5
},{
"startValue" : 56,
"endValue" : 0,
"startTime" : 56.30769,
"endTime" : 58.15385,
"animationCurveType" : 5
}
]
},
@@ -1797,6 +1833,12 @@
"startTime" : 48.61539,
"endTime" : 51.69231,
"animationCurveType" : 4
},{
"startValue" : 0,
"endValue" : 180,
"startTime" : 54.76923,
"endTime" : 55.07693,
"animationCurveType" : 4
}
]
},

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -80,7 +80,7 @@
}
},{
"__type" : "Ichni.RhythmGame.Beatmap.ElementFolder_BM,Assembly-CSharp",
"elementName" : "New Folder",
"elementName" : "看,加盟调查",
"tags" : [
],

File diff suppressed because it is too large Load Diff

View File

@@ -1,19 +1,23 @@
fileFormatVersion: 2
guid: e3265ab4bf004d28a9537516768c1c75
timeCreated: 1484171297
licenseType: Pro
TrueTypeFontImporter:
serializedVersion: 2
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 1
characterPadding: 0
characterSpacing: 0
characterPadding: 1
includeFontData: 1
use2xBehaviour: 0
fontNames: []
fallbackFontReferences: []
fontNames:
- Liberation Sans
- KTXP_ComRound
fallbackFontReferences:
- {fileID: 12800000, guid: 96bd02e8dddad6344938e2eb170be839, type: 3}
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@@ -29,7 +29,9 @@ MonoBehaviour:
m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
m_autoSizeTextContainer: 0
m_fallbackFontAssets: []
m_IsTextObjectScaleStatic: 0
m_fallbackFontAssets:
- {fileID: 11400000, guid: 3497dcff4899a0948918d45e2dd1209d, type: 2}
m_matchMaterialPreset: 1
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
type: 2}