diff --git a/Assets/Scripts/Framework/EditiorContent/ProjectCreateHelper.cs b/Assets/Scripts/Framework/EditiorContent/ProjectCreateHelper.cs index e6766d7..0d17736 100644 --- a/Assets/Scripts/Framework/EditiorContent/ProjectCreateHelper.cs +++ b/Assets/Scripts/Framework/EditiorContent/ProjectCreateHelper.cs @@ -26,19 +26,24 @@ namespace Demo.Editor { typeName = typeName[..typeName.LastIndexOf('`')]; } - stream.Write($"#include \"{currentType.BaseType.Name}.helper.h\"\n\n#define {typeName}\n\n"); + string baseTypeName = currentType.BaseType.Name; + if (baseTypeName.Contains('`')) + { + baseTypeName = baseTypeName[..baseTypeName.LastIndexOf('`')]; + } + stream.Write($"#include \"{baseTypeName}.helper.h\"\n\n#define {typeName}\n\n"); } private static void WriteCPPStyleFunction(StreamWriter stream, string name, IEnumerable paramList, string description) { if (name == nameof(ScriptableObject.LoadSubScript)) { - // stream.WriteLine("#define __build_in_pragma #"); - // stream.WriteLine("#define __build_in_to_text(x) #x"); + stream.WriteLine("#define __build_in_pragma #"); + stream.WriteLine("#define __build_in_to_text(x) #x"); - // stream.Write("/*\n" + description + "\n*/\n"); - // stream.Write($"#define {name}({string.Join(',', paramList)}) __build_in_pragma include __build_in_to_text(./##{paramList.First()})\n\n"); - stream.Write($"#define {name}({string.Join(',', paramList)})\n\n"); + stream.Write("/*\n" + description + "\n*/\n"); + stream.Write($"#define {name}({string.Join(',', paramList)}) __build_in_pragma include {paramList.ToArray()[1]}\n\n"); + //stream.Write($"#define {name}({string.Join(',', paramList)})\n\n"); } else { diff --git a/Assets/Scripts/Framework/ScriptableObject.cs b/Assets/Scripts/Framework/ScriptableObject.cs index f079579..800f2fd 100644 --- a/Assets/Scripts/Framework/ScriptableObject.cs +++ b/Assets/Scripts/Framework/ScriptableObject.cs @@ -394,6 +394,11 @@ namespace Demo { // 先天支持的工具函数 + [Content, SerializeField] private Vector3 + EnterGameLocalPosition = Vector3.zero, + EnterGameEulerAngles = Vector3.zero, + EnterGameLocalScaling = Vector3.one; + /// /// 设置坐标 /// @@ -410,7 +415,7 @@ namespace Demo ")] public void SetLocalPosition(string x, string y, string z) { - transform.localPosition = new(Parse(x), Parse(y), Parse(z)); + EnterGameLocalPosition = new(Parse(x), Parse(y), Parse(z)); } /// /// 设置欧拉角 @@ -428,7 +433,7 @@ namespace Demo ")] public void SetLocalEulerAngles(string x, string y, string z) { - transform.localEulerAngles = new(Parse(x), Parse(y), Parse(z)); + EnterGameEulerAngles = new(Parse(x), Parse(y), Parse(z)); } /// /// 设置缩放 @@ -446,7 +451,14 @@ namespace Demo ")] public void SetLocalScaling(string x, string y, string z) { - transform.localScale = new(Parse(x), Parse(y), Parse(z)); + EnterGameLocalScaling = new(Parse(x), Parse(y), Parse(z)); + } + + public virtual void ResetEnterGameStatus() + { + transform.localPosition = EnterGameLocalPosition; + transform.localEulerAngles = EnterGameEulerAngles; + transform.localScale = EnterGameLocalScaling; } /// @@ -473,13 +485,13 @@ namespace Demo /// 指定多少个状态的执行一次更新,不会影响到子物体 /// 属于性能优化的高级选项 /// - /// 间隔帧数, 小于等于1的值代表无论如何都会更新 + /// 每frame帧更新一次, 等于0代表不会在状态运行 [ScriptableCall(@" 指定多少个Update状态的UpdateTicks执行一次更新,不会影响到子物体 属于性能优化的高级选项 -间隔帧数, 小于等于1的值代表无论如何都会更新 +每frame帧更新一次, 等于0代表不会在Update状态运行 ")] public void SetUpdatePerFrame(string frame) { @@ -571,18 +583,24 @@ namespace Demo // GetParent ScriptableObject result = Parent; + if (path[0] == '/' || path[0]=='\\') + { + result = GetRoot(); + } + if (Parent == null) { throw new InvalidOperationException($"Root is nosupport to {nameof(FindWithPath)}"); } + // Find var components = path.Split('/', '\\'); components[^1] = new ToolFile(components[^1]).GetFilename(true); foreach (var component in components) { if (component == "..") result = result.Parent; - else if (component == ".") + else if (component == "." || string.IsNullOrEmpty(component)) continue; else { @@ -590,7 +608,7 @@ namespace Demo string targetScriptObjectPath = component; Regex regex = new(@"^(.*)\[(\d*)\]$"); var match = regex.Match(component); - if(match.Success) + if (match.Success) { targetScriptObjectPath = match.Groups[1].Value; index = int.Parse(match.Groups[2].Value); @@ -901,7 +919,12 @@ namespace Demo #if UNITY_EDITOR s_PreparePerfMarker.Begin(this); #endif + if (tickType == TickType.Reset) + { + ResetEnterGameStatus(); + } // UpdateTicks + if (UpdatePerFrame > 0) { if (ScriptUpdateCounter % UpdatePerFrame == 0) UpdateTicks(currentTime, deltaTime, tickType); diff --git a/Assets/Scripts/Framework/Updatement.cs b/Assets/Scripts/Framework/Updatement.cs index 8a8d6e6..b2dfae5 100644 --- a/Assets/Scripts/Framework/Updatement.cs +++ b/Assets/Scripts/Framework/Updatement.cs @@ -65,6 +65,12 @@ namespace Demo.Game protected override void UpdateTicks(float currentTime, float deltaTime, TickType tickType) { base.UpdateTicks(currentTime, deltaTime, tickType); + + float GetPercentValue() + { + return (currentTime - Entries[Content].TimePoint) / (Entries[Content + 1].TimePoint - Entries[Content].TimePoint); + } + if (Entries.Count == 0) return; if (Entries.Count == 1) @@ -72,22 +78,20 @@ namespace Demo.Game UpdateEntry(0, 0); return; } + // TODO : 删除后存在问题 if (Entries[0].TimePoint <= 0 && tickType == TickType.Reset) { UpdateEntry(0, 0); } switch (tickType) { - case TickType.Pause: - //case TickType.LateUpdate: - break; case TickType.Reset: case TickType.Start: { Content = 0; while (Content + 1 < Entries.Count && Entries[Content + 1].TimePoint < currentTime) Content++; - UpdateEntry(Content, 0); + UpdateEntry(Content, GetPercentValue()); } break; default: @@ -100,7 +104,7 @@ namespace Demo.Game if (Content + 1 >= Entries.Count) UpdateEntry(Content, 1); else - UpdateEntry(Content, (currentTime - Entries[Content].TimePoint) / (Entries[Content + 1].TimePoint - Entries[Content].TimePoint)); + UpdateEntry(Content, GetPercentValue()); break; } } diff --git a/Assets/Scripts/MoreSpline/SplineNode.cs b/Assets/Scripts/MoreSpline/SplineNode.cs index ff3d275..2705890 100644 --- a/Assets/Scripts/MoreSpline/SplineNode.cs +++ b/Assets/Scripts/MoreSpline/SplineNode.cs @@ -28,10 +28,10 @@ namespace Demo.Game public void AddTo(SplineCore core) { MyNodeContent = core.NodeContent; - MyNode.AddConnection(core.MySplineComputer, MyNodeContent); - core.MySplineComputer.SetPointSize(MyNodeContent, NodeSize); core.MySplineComputer.SetPointColor(MyNodeContent, NodeColor); + core.MySplineComputer.SetPointSize(MyNodeContent, NodeSize); core.MySplineComputer.SetPointNormal(MyNodeContent, IsSetupNodeRotation ? NodeRotation.normalized : transform.up); + MyNode.AddConnection(core.MySplineComputer, MyNodeContent); } /// @@ -44,9 +44,9 @@ namespace Demo.Game ")] - public void SetNoteSize(string size) + public void SetNodeSize(string size) { - NodeSize = float.Parse(size); + NodeSize = Parse(size); } /// @@ -65,9 +65,9 @@ namespace Demo.Game ")] - public void SetNoteColor(string r, string g, string b, string a) + public void SetNodeColor(string r, string g, string b, string a) { - NodeColor = new(float.Parse(r), float.Parse(g), float.Parse(b), float.Parse(a)); + NodeColor = new(Parse(r), Parse(g), Parse(b), Parse(a)); } /// @@ -84,10 +84,10 @@ namespace Demo.Game ")] - public void SetNoteRotation(string x, string y, string z) + public void SetNodeRotation(string x, string y, string z) { IsSetupNodeRotation = true; - this.transform.localEulerAngles = NodeRotation = new(float.Parse(x), float.Parse(y), float.Parse(z)); + this.transform.localEulerAngles = NodeRotation = new(Parse(x), Parse(y), Parse(z)); } } } diff --git a/Assets/Scripts/MoreSpline/SplineTrackRenderer.cs b/Assets/Scripts/MoreSpline/SplineTrackRenderer.cs index 9c96733..74fcb7e 100644 --- a/Assets/Scripts/MoreSpline/SplineTrackRenderer.cs +++ b/Assets/Scripts/MoreSpline/SplineTrackRenderer.cs @@ -25,7 +25,7 @@ namespace Demo.Game public override void SetupMeshGenerator(SplineRenderer meshGenerater) { base.SetupMeshGenerator(meshGenerater); - meshGenerater.autoUpdate = IsAutoOrient; + meshGenerater.autoOrient = IsAutoOrient; } public override IEnumerator UnloadScript() diff --git a/Assets/Scripts/MoreSpline/Updatement/SplineHeadObject.cs b/Assets/Scripts/MoreSpline/Updatement/SplineHeadObject.cs index a958f26..128949a 100644 --- a/Assets/Scripts/MoreSpline/Updatement/SplineHeadObject.cs +++ b/Assets/Scripts/MoreSpline/Updatement/SplineHeadObject.cs @@ -27,7 +27,7 @@ namespace Demo.Game { var sample = MySplineCore.MySplineComputer.Evaluate(data); Cache = sample.percent; - UpdateTarget.transform.SetLocalPositionAndRotation(sample.position, sample.rotation); + UpdateTarget.transform.SetPositionAndRotation(sample.position, sample.rotation); //UpdateTarget.transform.localScale = Vector3.one * sample.size; } diff --git a/Assets/StreamingAssets/CMakeLists.txt b/Assets/StreamingAssets/CMakeLists.txt deleted file mode 100644 index 4482f76..0000000 --- a/Assets/StreamingAssets/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(CMAKE_BINARY_DIR E:\[TEMP]) -project(ProjectHelper) -include_directories(Helper) -add_executable(ProjectHelper ProjectHelper.cpp) \ No newline at end of file diff --git a/Assets/StreamingAssets/CMakeLists.txt.meta b/Assets/StreamingAssets/CMakeLists.txt.meta deleted file mode 100644 index 26fe332..0000000 --- a/Assets/StreamingAssets/CMakeLists.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: caa319b6f626575468d5a22968abd31f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/CMakePresets.json b/Assets/StreamingAssets/CMakePresets.json deleted file mode 100644 index 39fbebd..0000000 --- a/Assets/StreamingAssets/CMakePresets.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 3, - "configurePresets": [ - { - "name": "virtual-base", - "hidden": true, - "generator": "Ninja", - "binaryDir": "E:\\Downloads\\.build", - "installDir": "E:\\Downloads\\.install", - "cacheVariables": { - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "PLATFORM_EXTENSION": "no" - } - }, - { - "name": "virtual-debug", - "hidden": true, - "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" } - }, - { - "name": "virtual-windows", - "hidden": true, - "cacheVariables": { - "PLATFORM_NAME": "Windows", - "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_CXX_COMPILER": "cl.exe" - }, - "condition": { - "type": "equals", - "lhs": "Windows", - "rhs": "Windows" - } - }, - { - "name": "virtual-x64", - "hidden": true, - "architecture": { - "value": "x64", - "strategy": "external" - }, - "cacheVariables": { - "PLATFORM_VERSION": "x64" - } - }, - { - "name": "windows-x64-debug", - "inherits": [ - "virtual-base", - "virtual-windows", - "virtual-x64", - "virtual-debug" - ] - } - ] -} diff --git a/Assets/StreamingAssets/CMakePresets.json.meta b/Assets/StreamingAssets/CMakePresets.json.meta deleted file mode 100644 index 6794350..0000000 --- a/Assets/StreamingAssets/CMakePresets.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 446bd1d115349fc4e8ff7a753c4f8253 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper.meta b/Assets/StreamingAssets/Helper.meta deleted file mode 100644 index e5349fc..0000000 --- a/Assets/StreamingAssets/Helper.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5b2b99f9313f15644a6fcb7754cfe8cf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/Anchor.helper.h b/Assets/StreamingAssets/Helper/Anchor.helper.h deleted file mode 100644 index 866561d..0000000 --- a/Assets/StreamingAssets/Helper/Anchor.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define Anchor - diff --git a/Assets/StreamingAssets/Helper/Anchor.helper.h.meta b/Assets/StreamingAssets/Helper/Anchor.helper.h.meta deleted file mode 100644 index d4bd6d9..0000000 --- a/Assets/StreamingAssets/Helper/Anchor.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8444d0278637d09479486d189127ec65 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h b/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h deleted file mode 100644 index 99cf69c..0000000 --- a/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "Updatement`1.helper.h" - -#define BaseOnMaterialUpdatement - -/* - - -绑定到允许的渲染器 - -脚本位置 - -*/ -#define Load(path) - diff --git a/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h.meta deleted file mode 100644 index bb10a18..0000000 --- a/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3f320bdad28bfa440946d2cdbf0c76a6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h b/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h deleted file mode 100644 index 56c8012..0000000 --- a/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h +++ /dev/null @@ -1,26 +0,0 @@ -#include "Updatement`1.helper.h" - -#define BasicSplineJustFollow - -/* - - -新增 - -插值时间 - -可取值为30种缓动曲线 - -*/ -#define Add(time,value,curveType) - -/* - - -如未加载则加载,然后绑定到样条线 - -脚本位置 - -*/ -#define Load(path) - diff --git a/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h.meta b/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h.meta deleted file mode 100644 index f36f7ee..0000000 --- a/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c9379e999fe839a4299645c8b475f826 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h b/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h deleted file mode 100644 index c518dd2..0000000 --- a/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h +++ /dev/null @@ -1,52 +0,0 @@ -#include "Updatement`1.helper.h" - -#define BasicSplineRenderer - -/* - - -新增 - -插值时间 - - -可取值为30种缓动曲线 - -*/ -#define Add(time,from,to,curveType) - -/* - - -加载并绑定到新样条线 - -对象相对路径,若对象不存在则作为脚本相对路径加载 - -*/ -#define LoadSpline(path) - -/* - - -加载对应ab包并加载指定材质 - - - - -*/ -#define LoadMaterial(ab,material) - -#include "BasicSplineRenderer.helper.h" - -#define BasicSplineRenderer - -/* - - -设置材质UV映射 - -Clip, UniformClip, Clamp, UniformClamp - -*/ -#define SetUVMode(mode) - diff --git a/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h.meta b/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h.meta deleted file mode 100644 index be9b4f8..0000000 --- a/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f9fef1eefba151544bf86abbb7ccbb3f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/CameraObject.helper.h b/Assets/StreamingAssets/Helper/CameraObject.helper.h deleted file mode 100644 index d95d0b5..0000000 --- a/Assets/StreamingAssets/Helper/CameraObject.helper.h +++ /dev/null @@ -1,120 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define CameraObject - -/* - - -设置是否为正交相机 - - - -*/ -#define SetOrthographic(arg) - -/* - - -设置相机视野角度 - -视野角度值 - -*/ -#define SetFieldOfView(arg) - -/* - - -设置正交相机的尺寸 - -正交相机尺寸值 - -*/ -#define SetOrthographicSize(arg) - -/* - - -设置近裁剪面距离 - -近裁剪面距离值 - -*/ -#define SetNearClipPlane(arg) - -/* - - -设置远裁剪面距离 - -远裁剪面距离值 - -*/ -#define SetFarClipPlane(arg) - -/* - - -设置相机深度 - -相机深度值 - -*/ -#define SetDepth(arg) - -/* - - -设置虚拟相机跟随目标 - -对象相对路径 - -*/ -#define SetVirtualCameraFollow(targetName) - -/* - - -设置虚拟相机观察目标 - -对象相对路径 - -*/ -#define SetVirtualCameraLookAt(targetName) - -/* - - -设置虚拟相机跟随偏移 - -X轴偏移 -Y轴偏移 -Z轴偏移 - -*/ -#define SetVirtualCameraFollowOffset(x,y,z) - -/* - - -设置虚拟相机跟随阻尼 - -X轴阻尼 -Y轴阻尼 -Z轴阻尼 - -*/ -#define SetVirtualCameraFollowDamping(x,y,z) - -/* - - -设置虚拟相机观察阻尼 - -X轴阻尼 -Y轴阻尼 -Z轴阻尼 - -*/ -#define SetVirtualCameraLookAtDamping(x,y,z) - diff --git a/Assets/StreamingAssets/Helper/CameraObject.helper.h.meta b/Assets/StreamingAssets/Helper/CameraObject.helper.h.meta deleted file mode 100644 index 11fe29e..0000000 --- a/Assets/StreamingAssets/Helper/CameraObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a250708085f3cf04cbb75d1624c80c11 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h b/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h deleted file mode 100644 index e02aa7b..0000000 --- a/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "BaseOnMaterialUpdatement.helper.h" - -#define ColorUpdatement - diff --git a/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h.meta deleted file mode 100644 index 8684b9b..0000000 --- a/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 592a3c681ade5c6409436c3b62a543ce -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/DDT.helper.h b/Assets/StreamingAssets/Helper/DDT.helper.h deleted file mode 100644 index 2ddb911..0000000 --- a/Assets/StreamingAssets/Helper/DDT.helper.h +++ /dev/null @@ -1,17 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define DDT - -/* - -添加float数据, 随后可以用对象路径+索引获取变量值, -e.g: CameraObject/DDT[3], 获取CameraObject/DDT对象路径下DDT数据中的第四个值 - -*/ -#define Add(value) - -/* -从特定的json中读取数据 -*/ -#define Load() - diff --git a/Assets/StreamingAssets/Helper/DDT.helper.h.meta b/Assets/StreamingAssets/Helper/DDT.helper.h.meta deleted file mode 100644 index 9464c5e..0000000 --- a/Assets/StreamingAssets/Helper/DDT.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2973b3a6cf8b3bd4a8d990b7a70a88c9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h b/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h deleted file mode 100644 index fffbee8..0000000 --- a/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "BaseOnMaterialUpdatement.helper.h" - -#define EmissionColorUpdatement - diff --git a/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h.meta deleted file mode 100644 index 50e7ce4..0000000 --- a/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 46db8a6233d6da14db4d0bcdb1ca32d6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h b/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h deleted file mode 100644 index 067b69b..0000000 --- a/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "IInteraction.helper.h" - -#define FullScreenInteraction - diff --git a/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h.meta b/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h.meta deleted file mode 100644 index e00e4d9..0000000 --- a/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6515b1e604e3f3f4f96fca78db823502 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h b/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h deleted file mode 100644 index a153dc6..0000000 --- a/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h +++ /dev/null @@ -1,23 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define IEffectHookObject - -/* - - -绑定IInteraction对象,若不手动绑定则会自动绑定到父物体的IInteraction - - -*/ -#define Bind(path) - -/* - - -设置监听状态,当目标进入指定监听的状态时触发启动事件,退出时触发结束事件 - -VisibleDuration,InteractiveDuration,InteractableScoreInterval,InteractableIntervalThatCanScoreBest - -*/ -#define SetInteractiveEffectType(type) - diff --git a/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h.meta b/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h.meta deleted file mode 100644 index 07f18ec..0000000 --- a/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6c040d74f33d0e141bdea00298f691be -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/IInteraction.helper.h b/Assets/StreamingAssets/Helper/IInteraction.helper.h deleted file mode 100644 index cfd4441..0000000 --- a/Assets/StreamingAssets/Helper/IInteraction.helper.h +++ /dev/null @@ -1,102 +0,0 @@ -#include "TimelineScriptObject.helper.h" - -#define IInteraction - -/* - - -通过传递对称区间进行初始化 - -最佳判定点 -区间时长,最终结果为 -(bestJudgementTimePoint-interactableIntervalThatCanScoreBest/2,bestJudgementTimePoint+interactableIntervalThatCanScoreBest/2) -区间时长,最终结果为 -(bestJudgementTimePoint-interactableScoreInterval/2,bestJudgementTimePoint+interactableScoreInterval/2) -区间时长,最终结果为 -(bestJudgementTimePoint-interactiveDuration/2,bestJudgementTimePoint+interactiveDuration/2) -区间时长,最终结果为 -(bestJudgementTimePoint-visibleDuration/2,bestJudgementTimePoint+visibleDuration/2) - -*/ -#define SetupJudgementLevels(bestJudgementTimePoint,interactableIntervalThatCanScoreBest,interactableScoreInterval,interactiveDuration,visibleDuration) - -/* - - -设置可见区间(显现但不可判定,3级判定区间)开始时间 - - - -*/ -#define SetVisibleDurationBegin(value) - -/* - - -设置可见区间(显现但不可判定,3级判定区间)结束时间 - - - -*/ -#define SetVisibleDurationEnd(value) - -/* - - -设置2级判定区间(可判定但错误的)开始时间 - - - -*/ -#define SetInteractiveDurationBegin(value) - -/* - - -设置2级判定区间(可判定但错误的)结束时间 - - - -*/ -#define SetInteractiveDurationEnd(value) - -/* - - -设置1级判定区间(可判定的)开始时间 - - - -*/ -#define SetInteractableScoreIntervalBegin(value) - -/* - - -设置1级判定区间(可判定的)结束时间 - - - -*/ -#define SetInteractableScoreIntervalEnd(value) - -/* - - -设置0级判定区间(最佳判定)开始时间 - - - -*/ -#define SetInteractableIntervalThatCanScoreBestBegin(value) - -/* - - -设置0级判定区间(最佳判定)结束时间 - - - -*/ -#define SetInteractableIntervalThatCanScoreBestEnd(value) - diff --git a/Assets/StreamingAssets/Helper/IInteraction.helper.h.meta b/Assets/StreamingAssets/Helper/IInteraction.helper.h.meta deleted file mode 100644 index 1c11f56..0000000 --- a/Assets/StreamingAssets/Helper/IInteraction.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f98e2b0f2d7a07643990ba5727c3ba6f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h b/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h deleted file mode 100644 index 9ba9cb7..0000000 --- a/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h +++ /dev/null @@ -1,13 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define IJudgementHookObject - -/* - - -绑定IInteraction对象,若不手动绑定则会自动绑定到父物体的IInteraction - - -*/ -#define Bind(path) - diff --git a/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h.meta b/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h.meta deleted file mode 100644 index 1d63f96..0000000 --- a/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f020094d932901c4298ae797f9f2b45e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h b/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h deleted file mode 100644 index 07fc5b3..0000000 --- a/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h +++ /dev/null @@ -1,24 +0,0 @@ -#include "Updatement`1.helper.h" - -#define LookAtAnchor - -/* - - -在指定时刻切换面向的物体,并尝试一次更新 - - - - -*/ -#define Add(time,target) - -/* - - -启动自动更新,将持续锁定面向的物体并更新 - - -*/ -#define EnableUpdateEveryTick() - diff --git a/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h.meta b/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h.meta deleted file mode 100644 index 4277655..0000000 --- a/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 63e39fd35ba9d6f41b4387d1e35cfa21 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h b/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h deleted file mode 100644 index c39accd..0000000 --- a/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h +++ /dev/null @@ -1,25 +0,0 @@ -#include "Updatement`1.helper.h" - -#define MaterialUpdatement - -/* - - -对应ab包名称,自动匹配对应平台 - - - -*/ -#define Load(ab) - -/* - - -在指定时刻切换父物体上的MeshRenderer.material - - - - -*/ -#define Add(time,material) - diff --git a/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h.meta deleted file mode 100644 index 4854d8d..0000000 --- a/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e15049878c91eb8468fc85288b4e54fe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/ParticleEffect.helper.h b/Assets/StreamingAssets/Helper/ParticleEffect.helper.h deleted file mode 100644 index 7536643..0000000 --- a/Assets/StreamingAssets/Helper/ParticleEffect.helper.h +++ /dev/null @@ -1,15 +0,0 @@ -#include "IEffectHookObject.helper.h" - -#define ParticleEffect - -/* - - -加载预制体作为子物体 - - - - -*/ -#define Load(ab,prefab) - diff --git a/Assets/StreamingAssets/Helper/ParticleEffect.helper.h.meta b/Assets/StreamingAssets/Helper/ParticleEffect.helper.h.meta deleted file mode 100644 index 685e162..0000000 --- a/Assets/StreamingAssets/Helper/ParticleEffect.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 045f24c4c7b9f914489a2d1f774f8e51 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h b/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h deleted file mode 100644 index 6a3f03c..0000000 --- a/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h +++ /dev/null @@ -1,17 +0,0 @@ -#include "IJudgementHookObject.helper.h" - -#define ParticleJudgement - -/* - - -加载预制体作为子物体 - -判定等级对应会出现的粒子效果,若没有对应的则向更低的值寻找 - - -判定效果的持续时间 - -*/ -#define Load(level,ab,prefab,duration) - diff --git a/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h.meta b/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h.meta deleted file mode 100644 index 057e044..0000000 --- a/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 739b4b9b9f01c684c8267f90c251a295 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h b/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h deleted file mode 100644 index 5e52142..0000000 --- a/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h +++ /dev/null @@ -1,15 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define PrefabRootObject - -/* - - -加载预制体作为子物体 - - - - -*/ -#define Load(ab,prefab) - diff --git a/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h.meta b/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h.meta deleted file mode 100644 index 8e932ab..0000000 --- a/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e7fd21d310ee4d94c9a688db8ae382ca -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/RootObject.helper.h b/Assets/StreamingAssets/Helper/RootObject.helper.h deleted file mode 100644 index 7888e64..0000000 --- a/Assets/StreamingAssets/Helper/RootObject.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define RootObject - diff --git a/Assets/StreamingAssets/Helper/RootObject.helper.h.meta b/Assets/StreamingAssets/Helper/RootObject.helper.h.meta deleted file mode 100644 index e867b4a..0000000 --- a/Assets/StreamingAssets/Helper/RootObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: dfa234b92798a79459a04aadd25226a0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/ScriptableObject.helper.h b/Assets/StreamingAssets/Helper/ScriptableObject.helper.h deleted file mode 100644 index 130c6af..0000000 --- a/Assets/StreamingAssets/Helper/ScriptableObject.helper.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - - -重设指定时间线 - -时间线ID,若不存在则创建 -当每次调用NextTimePoint函数时使用的单位值 -初始化时间 - -*/ -#define ResetTimePoint(id,delta,value) - -/* - - -推动时间线前进 - -时间线ID -前进次数,最终时间的增量为前进次数乘该时间线的单位值 - -*/ -#define NextTimePoint(id,times) - -/* - - -设置时间线的值 - -时间线ID -次数,时间线的值将被设置为次数乘该时间线的单位值 - -*/ -#define SetTimePoint(id,value) - -/* - - -设置局部上下文变量,将会传递给子物体使用 - -字符串 -浮点数 - -*/ -#define SetContext(name,value) - -/* - - -设置坐标 - - - - - -*/ -#define SetLocalPosition(x,y,z) - -/* - - -设置欧拉角 - - - - - -*/ -#define SetLocalEulerAngles(x,y,z) - -/* - - -设置缩放 - - - - - -*/ -#define SetLocalScaling(x,y,z) - -/* - - -关闭该物体, -在面对如多Game场景时关闭某些GameWorld中默认存在的全局灯光等场景时非常有用 - - -*/ -#define SetObjectDisable() - -#define __build_in_pragma # -#define __build_in_to_text(x) #x -/* - - -加载子脚本 - -指定类型 -指定脚本,可用决定路径或与当前脚本目录的相对路径 - -*/ -#define LoadSubScript(type,path) __build_in_pragma include __build_in_to_text(./##type) - diff --git a/Assets/StreamingAssets/Helper/ScriptableObject.helper.h.meta b/Assets/StreamingAssets/Helper/ScriptableObject.helper.h.meta deleted file mode 100644 index ce3bc5d..0000000 --- a/Assets/StreamingAssets/Helper/ScriptableObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ffcb5fc7a6d58bc45af2f2dc9033db76 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h b/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h deleted file mode 100644 index 355beb8..0000000 --- a/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h +++ /dev/null @@ -1,25 +0,0 @@ -#include "Updatement`1.helper.h" - -#define SkyUpdatement - -/* - - -对应ab包名称,自动匹配对应平台 - - - -*/ -#define Load(ab) - -/* - - -在指定时刻切换天空 - - - - -*/ -#define Add(time,sky) - diff --git a/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h.meta deleted file mode 100644 index 037821a..0000000 --- a/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f93d535b9ce7cfd42be306766bce5ebd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineAnchor.helper.h b/Assets/StreamingAssets/Helper/SplineAnchor.helper.h deleted file mode 100644 index 12b3e0a..0000000 --- a/Assets/StreamingAssets/Helper/SplineAnchor.helper.h +++ /dev/null @@ -1,36 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define SplineAnchor - -/* - - -加载并绑定到新样条线 - -对象相对路径,若对象不存在则作为脚本相对路径加载 - -*/ -#define LoadSpline(path) - -/* - - -必须先执行LoadSpline加载样条线 - -百分比所在位置,取值范围是[0,1] - -*/ -#define EvaluatePosition(value) - -/* - - -绑定到样条线渲染器上(必须已经加载), -并设置位置为指定时间的时刻渲染器所生成的头部位置 - -对象路径, 不存在时则立刻加载 -时刻 - -*/ -#define LoadSplineRenderer(path,time) - diff --git a/Assets/StreamingAssets/Helper/SplineAnchor.helper.h.meta b/Assets/StreamingAssets/Helper/SplineAnchor.helper.h.meta deleted file mode 100644 index ff83450..0000000 --- a/Assets/StreamingAssets/Helper/SplineAnchor.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0a6ffb0a4a419774681ba46af610100a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineCore.helper.h b/Assets/StreamingAssets/Helper/SplineCore.helper.h deleted file mode 100644 index 64eeaf5..0000000 --- a/Assets/StreamingAssets/Helper/SplineCore.helper.h +++ /dev/null @@ -1,54 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define SplineCore - -/* - - -设置样条线类型 - -CatmullRom, BSpline, Bezier, Linear - -*/ -#define SetType(mode) - -/* - - -设置采样类型 - -Default, Uniform, Optimized - -*/ -#define SetSampleMode(mode) - -/* - - -闭环曲线 - - -*/ -#define SetClose() - -/* - - -加载并加入新节点 - -脚本位置 - -*/ -#define LoadNode(path) - -/* - - -加入已加载的节点,如果目标脚本不是SplineNode, -那么为其添加SplineNode组件 - -脚本位置 - -*/ -#define AddNode(path) - diff --git a/Assets/StreamingAssets/Helper/SplineCore.helper.h.meta b/Assets/StreamingAssets/Helper/SplineCore.helper.h.meta deleted file mode 100644 index 74f8b15..0000000 --- a/Assets/StreamingAssets/Helper/SplineCore.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: de36bb50641485344bb37dd3fc8f26b6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h b/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h deleted file mode 100644 index a6637da..0000000 --- a/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "BasicSplineJustFollow.helper.h" - -#define SplineHeadObject - -/* - - -设置为仅跟随,将会被动的跟随spline运动, -这在多个脚本都绑定在同一个spline计算核心上时非常有用 - - -*/ -#define JustFollow() - diff --git a/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h.meta b/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h.meta deleted file mode 100644 index 75be0a8..0000000 --- a/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: aee05617c4c971d42bc2dfdde557d836 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineMovement.helper.h b/Assets/StreamingAssets/Helper/SplineMovement.helper.h deleted file mode 100644 index e4da404..0000000 --- a/Assets/StreamingAssets/Helper/SplineMovement.helper.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "BasicSplineJustFollow.helper.h" - -#define SplineMovement - -/* - - -设置为仅跟随,将会被动的跟随spline运动, -这在多个脚本都绑定在同一个spline计算核心上时非常有用 - - -*/ -#define JustFollow() - diff --git a/Assets/StreamingAssets/Helper/SplineMovement.helper.h.meta b/Assets/StreamingAssets/Helper/SplineMovement.helper.h.meta deleted file mode 100644 index c7ee15d..0000000 --- a/Assets/StreamingAssets/Helper/SplineMovement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ec01448b7be56ed44a9c1cd763a1c461 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineNode.helper.h b/Assets/StreamingAssets/Helper/SplineNode.helper.h deleted file mode 100644 index 438d427..0000000 --- a/Assets/StreamingAssets/Helper/SplineNode.helper.h +++ /dev/null @@ -1,39 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define SplineNode - -/* - - -设置节点大小,默认为1 - - - -*/ -#define SetNoteSize(size) - -/* - - -设置节点颜色,默认为(1,1,1,1) - - - - - - -*/ -#define SetNoteColor(r,g,b,a) - -/* - - -设置节点旋转,节点正面forward向量为法线 - - - - - -*/ -#define SetNoteRotation(x,y,z) - diff --git a/Assets/StreamingAssets/Helper/SplineNode.helper.h.meta b/Assets/StreamingAssets/Helper/SplineNode.helper.h.meta deleted file mode 100644 index 03e1918..0000000 --- a/Assets/StreamingAssets/Helper/SplineNode.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: dfe84ad975e44cd40b5c7061ee2621b0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineRotation.helper.h b/Assets/StreamingAssets/Helper/SplineRotation.helper.h deleted file mode 100644 index 8e3f6af..0000000 --- a/Assets/StreamingAssets/Helper/SplineRotation.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "BasicSplineJustFollow.helper.h" - -#define SplineRotation - diff --git a/Assets/StreamingAssets/Helper/SplineRotation.helper.h.meta b/Assets/StreamingAssets/Helper/SplineRotation.helper.h.meta deleted file mode 100644 index 34c0946..0000000 --- a/Assets/StreamingAssets/Helper/SplineRotation.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ee1e7c4f60be1e949a1cb2fe6d595d68 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineScaling.helper.h b/Assets/StreamingAssets/Helper/SplineScaling.helper.h deleted file mode 100644 index 1615a9a..0000000 --- a/Assets/StreamingAssets/Helper/SplineScaling.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "BasicSplineJustFollow.helper.h" - -#define SplineScaling - diff --git a/Assets/StreamingAssets/Helper/SplineScaling.helper.h.meta b/Assets/StreamingAssets/Helper/SplineScaling.helper.h.meta deleted file mode 100644 index ed9727b..0000000 --- a/Assets/StreamingAssets/Helper/SplineScaling.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b6711757b0184a1409af1cea057e3138 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h b/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h deleted file mode 100644 index 6cdd3f0..0000000 --- a/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "BasicSplineRenderer`1.helper.h" - -#define SplineTrackRenderer - diff --git a/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h.meta b/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h.meta deleted file mode 100644 index c616d93..0000000 --- a/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ac8ca5da17cd34a48b911b9266ff9c3b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h b/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h deleted file mode 100644 index 5349d1d..0000000 --- a/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h +++ /dev/null @@ -1,23 +0,0 @@ -#include "BasicSplineRenderer`1.helper.h" - -#define SplineTubeRenderer - -/* - - -禁用双面渲染,用于优化性能 - - -*/ -#define DisableDoubleSide() - -/* - - -设置面数,越高越圆润 - - - -*/ -#define SetSides(sides) - diff --git a/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h.meta b/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h.meta deleted file mode 100644 index 2d40921..0000000 --- a/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9b3c8b0bde99a8d4eaefb2e479dc04c5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/SubWorld.helper.h b/Assets/StreamingAssets/Helper/SubWorld.helper.h deleted file mode 100644 index 266c002..0000000 --- a/Assets/StreamingAssets/Helper/SubWorld.helper.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define SubWorld - -/* - - -加载附属场景 - - - -*/ -#define Load(project) - diff --git a/Assets/StreamingAssets/Helper/SubWorld.helper.h.meta b/Assets/StreamingAssets/Helper/SubWorld.helper.h.meta deleted file mode 100644 index ab9e0d0..0000000 --- a/Assets/StreamingAssets/Helper/SubWorld.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2e7da0254e799714d8e80c6bd975fc0e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/TickMovement.helper.h b/Assets/StreamingAssets/Helper/TickMovement.helper.h deleted file mode 100644 index 9208272..0000000 --- a/Assets/StreamingAssets/Helper/TickMovement.helper.h +++ /dev/null @@ -1,18 +0,0 @@ -#include "Updatement`1.helper.h" - -#define TickMovement - -/* - - -新增 - -插值时间 -x -y -z -可取值为30种缓动曲线 - -*/ -#define Add(time,x,y,z,curveType) - diff --git a/Assets/StreamingAssets/Helper/TickMovement.helper.h.meta b/Assets/StreamingAssets/Helper/TickMovement.helper.h.meta deleted file mode 100644 index 1414167..0000000 --- a/Assets/StreamingAssets/Helper/TickMovement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b9e4cad5b570e02419c03ae8bbdf3a80 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/TickRotation.helper.h b/Assets/StreamingAssets/Helper/TickRotation.helper.h deleted file mode 100644 index dd6538b..0000000 --- a/Assets/StreamingAssets/Helper/TickRotation.helper.h +++ /dev/null @@ -1,18 +0,0 @@ -#include "Updatement`1.helper.h" - -#define TickRotation - -/* - - -新增 - -插值时间 -x -y -z -可取值为30种缓动曲线 - -*/ -#define Add(time,x,y,z,curveType) - diff --git a/Assets/StreamingAssets/Helper/TickRotation.helper.h.meta b/Assets/StreamingAssets/Helper/TickRotation.helper.h.meta deleted file mode 100644 index fd771d9..0000000 --- a/Assets/StreamingAssets/Helper/TickRotation.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: af9d3f3f4025d7949b705b5d98e13525 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/TickScaling.helper.h b/Assets/StreamingAssets/Helper/TickScaling.helper.h deleted file mode 100644 index 8976925..0000000 --- a/Assets/StreamingAssets/Helper/TickScaling.helper.h +++ /dev/null @@ -1,18 +0,0 @@ -#include "Updatement`1.helper.h" - -#define TickScaling - -/* - - -新增 - -插值时间 -x -y -z -可取值为30种缓动曲线 - -*/ -#define Add(time,x,y,z,curveType) - diff --git a/Assets/StreamingAssets/Helper/TickScaling.helper.h.meta b/Assets/StreamingAssets/Helper/TickScaling.helper.h.meta deleted file mode 100644 index 53224a9..0000000 --- a/Assets/StreamingAssets/Helper/TickScaling.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e8d85ca636740424b9c63310ef85f9fa -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h b/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h deleted file mode 100644 index 1d105e4..0000000 --- a/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define TimelineScriptObject - diff --git a/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h.meta b/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h.meta deleted file mode 100644 index b5f8119..0000000 --- a/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 99b6f8195ad78d548a4d2049a150a958 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/Updatement.helper.h b/Assets/StreamingAssets/Helper/Updatement.helper.h deleted file mode 100644 index 1b874a7..0000000 --- a/Assets/StreamingAssets/Helper/Updatement.helper.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "TimelineScriptObject.helper.h" - -#define Updatement - -/* - - -设置更新对象 - -脚本的相对路径 - -*/ -#define SetUpdateTarget(path) - diff --git a/Assets/StreamingAssets/Helper/Updatement.helper.h.meta b/Assets/StreamingAssets/Helper/Updatement.helper.h.meta deleted file mode 100644 index e8abb28..0000000 --- a/Assets/StreamingAssets/Helper/Updatement.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8a43591229b4dcd4aa367fd7b7af6e9b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Helper/WorldLightObject.helper.h b/Assets/StreamingAssets/Helper/WorldLightObject.helper.h deleted file mode 100644 index d8ab2f7..0000000 --- a/Assets/StreamingAssets/Helper/WorldLightObject.helper.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "ScriptableObject.helper.h" - -#define WorldLightObject - diff --git a/Assets/StreamingAssets/Helper/WorldLightObject.helper.h.meta b/Assets/StreamingAssets/Helper/WorldLightObject.helper.h.meta deleted file mode 100644 index ac6dab2..0000000 --- a/Assets/StreamingAssets/Helper/WorldLightObject.helper.h.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1867acb1a09c899438f49803555a5abf -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/Project.meta b/Assets/StreamingAssets/Project.meta deleted file mode 100644 index f33153b..0000000 --- a/Assets/StreamingAssets/Project.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3413fd20a60537b48afc7d4fffc8c26a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/ProjectHelper.cpp b/Assets/StreamingAssets/ProjectHelper.cpp deleted file mode 100644 index 82200c6..0000000 --- a/Assets/StreamingAssets/ProjectHelper.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#define __build_in_pragma # -#define __build_in_to_text(x) #x -#define imp(x) __build_in_pragma include __build_in_to_text(./##x) - -imp(Tutorial/root.h) \ No newline at end of file diff --git a/Assets/StreamingAssets/ProjectHelper.cpp.meta b/Assets/StreamingAssets/ProjectHelper.cpp.meta deleted file mode 100644 index d8276f6..0000000 --- a/Assets/StreamingAssets/ProjectHelper.cpp.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c35860b3acaa4484e8c242d94930665b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/README/Tutorial/README.md b/Assets/StreamingAssets/README/Tutorial/README.md index c6f2373..b2c1756 100644 --- a/Assets/StreamingAssets/README/Tutorial/README.md +++ b/Assets/StreamingAssets/README/Tutorial/README.md @@ -4,7 +4,7 @@ # 项目 -项目的位置全部位于StreamingAssets文件夹内 +项目的位置全部位于Unity持久化文件夹的Project文件夹内, 如C:\Users\ASUS\AppData\LocalLow\LiuBai\Murmur-Resonance-Editor\Projects ## 打开 @@ -25,7 +25,9 @@ find中包含的内容是被尝试读取但不存在的内容,值为读取时 # 初次运行 -StreamingAssets中包含两个特殊的文件夹(AssetBundle与Helper)与辅助编辑的CMake项目结构 +在Unity持久化文件夹中会生成Helper文件夹, 包含可调用函数的注释 + +下载需要的AssetBundle到StreamingAssets/AssetBundle ## AssetBundle @@ -37,17 +39,13 @@ StreamingAssets中包含两个特殊的文件夹(AssetBundle与Helper)与辅 ## CMake辅助编辑 -脚本风格默认采用c风格,因此利用CMake与.h文件关联应用可以快速编写物体脚本 +脚本风格默认采用c++风格,因此利用CMake与.h文件关联应用可以快速编写物体脚本 +如在Unity持久化文件夹, 添加以下文本到CMakeLists.txt, 使用vs打开即可 ``` -set(CMAKE_BINARY_DIR TEMP_PATH) -project(ProjectHelper) include_directories(Helper) -add_executable(ProjectHelper ProjectHelper.cpp) ``` -如VS,更改其中的ProjectHelper.cpp所包含的项目root.h以获取编辑器的智能引擎的支持 - # 快捷键 ## 音频播放控制快捷键 @@ -119,32 +117,50 @@ add_executable(ProjectHelper ProjectHelper.cpp) 每个文件包含可调用的类成员函数,include的头文件是父类,可通过其查看其他可调用的父类成员函数 -## RootObject +## ScriptableObject -每个项目都从RootObject开始,唯一且不可再生成 - -## TimelineScriptObject - -许多类都从TimelineScriptObject派生,此处额外讲解其中的关键函数, -之后便可以编写如 +所有类都从ScriptableObject派生,了解其中的关键函数, +之后便可以编写灵活的脚本以实现行为 ```cpp -//SkyUpdatement -Add(Timeline-Sky, sky) +// 在任一ScriptableObject中设置Var变量为0, +// 此后在该脚本以及该处之后加载的子脚本都会含有Var=0的上下文 +SetContext("Var", 0); +// 如在DDT中, 使用花括号包裹的正整型三元组表示时间点, +// 形式为: {该小节划分的节拍数, 小节数, 位于该小节的节拍数} +// 如在BPM=60的情况下, 下例将会被翻译为(4+1/8)*1s=4.125s +Add({8,4,1}); ``` -的脚本代码,而Timeline-Sky的值可由全体脚本动态指定 +通过脚本实现模板对象 -### ResetTimeline +例如在 +- root.cpp +- root + - TemplateLine.h(加载类型为SplineCore的脚本对象) + - TemplateLine + - ...(TemplateLine的子脚本) + - A-Anchor.h(加载类型为Anchor的脚本对象) + - B-Anchor.h(加载类型为Anchor的脚本对象) -重置时间线,不存在时生成,通过时间线变量来灵活获取浮点型的变量, -如分别生成1/4分音单位的时间线与1/8分音的时间线, -并配合SetTimePoint与NextTimePoint获取第几个音符的时间 +```cpp +// A-Anchor.h +// 将自身在父脚本对象的坐标系中设置为x=-2的偏移 +SetLocalPosition(-2,0,0); +// 设置上下文变量 +... +// 加载 +LoadSubScript(SplineCore, "TemplateLine.h") +``` -### NextTimePoint +```cpp +// B-Anchor.h +// 将自身在父脚本对象的坐标系中设置为x=2的偏移 +SetLocalPosition(2,0,0); +// 设置上下文变量 +... +// 也加载 +LoadSubScript(SplineCore, "TemplateLine.h") +``` -每次都将时间线变量向前推进times个单位,总计会增加times*delta - -### SetTimePoint - -重新赋值时间线变量,该函数不能生成时间线 \ No newline at end of file +自此实现了以脚本TemplateLine.h为根的预制体 \ No newline at end of file diff --git a/Assets/StreamingAssets/song.mp3 b/Assets/StreamingAssets/song.mp3 deleted file mode 100644 index 8ccc667..0000000 Binary files a/Assets/StreamingAssets/song.mp3 and /dev/null differ diff --git a/Assets/StreamingAssets/song.mp3.meta b/Assets/StreamingAssets/song.mp3.meta deleted file mode 100644 index 445801e..0000000 --- a/Assets/StreamingAssets/song.mp3.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: eadb111e7ecacb24d9e1f6a728ce6aae -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: