diff --git a/.gitmodules b/.gitmodules index 1d01d17..e508a66 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Assets/Convention-Unity"] path = Assets/Convention-Unity - url = https://github.com/NINEMINEsigma/Convention-Unity.git + url = http://www.liubai.site:3000/ninemine/Convention-Unity-Demo.git diff --git a/Assets/Convention-Unity b/Assets/Convention-Unity index 073dd25..f50b263 160000 --- a/Assets/Convention-Unity +++ b/Assets/Convention-Unity @@ -1 +1 @@ -Subproject commit 073dd2585765c841297aae8673a041148e3fb0ee +Subproject commit f50b26377ec09a5674d5a703946a6df600e640c0 diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta index ffbca5f..bc93799 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta @@ -87,7 +87,7 @@ PluginImporter: - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} - first: Windows Store Apps: WindowsStoreApps diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta index 74b217f..3093363 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta @@ -87,7 +87,7 @@ PluginImporter: - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} - first: Windows Store Apps: WindowsStoreApps diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta index 7aeda01..873d64b 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta @@ -98,6 +98,11 @@ PluginImporter: enabled: 0 settings: CPU: + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} - first: Windows Store Apps: WindowsStoreApps second: diff --git a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta index e259a23..993eb8d 100644 --- a/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta +++ b/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta @@ -98,6 +98,11 @@ PluginImporter: enabled: 0 settings: CPU: + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} - first: Windows Store Apps: WindowsStoreApps second: diff --git a/Assets/Scripts/Framework/EditiorContent/EditorController.cs b/Assets/Scripts/Framework/EditiorContent/EditorController.cs index 7a1612e..3f5374e 100644 --- a/Assets/Scripts/Framework/EditiorContent/EditorController.cs +++ b/Assets/Scripts/Framework/EditiorContent/EditorController.cs @@ -309,7 +309,7 @@ namespace Demo.Editor new GameObject("GameContent").AddComponent(); } var content = GameContent.instance; - content.RootSourceDir = Path.Combine(PlatformIndicator.StreamingAssetsPath, ProjectName) + "/"; + content.RootSourceDir = Path.Combine(PlatformIndicator.PersistentDataPath, ProjectName) + "/"; content.IsCreateNewProject = IsCreateNewProject; content.ScriptableObjectTypen = GetDefaultScriptableObjectTypen(); content.IsAutoPlay = true; diff --git a/Assets/Scripts/Framework/GameContent/GameController.cs b/Assets/Scripts/Framework/GameContent/GameController.cs index da8720a..41a722f 100644 --- a/Assets/Scripts/Framework/GameContent/GameController.cs +++ b/Assets/Scripts/Framework/GameContent/GameController.cs @@ -61,6 +61,7 @@ namespace Demo.Game if (Editor.EditorController.instance.MainGameController == this) { string clipPath = (string)MainConfig.FindItem("song", ""); + AudioType audioType = (AudioType)MainConfig.FindItem("audioType", BasicAudioSystem.GetAudioType(clipPath)); if (string.IsNullOrEmpty(clipPath)) { foreach (var file in MainConfig.ConfigFile.BackToParentDir().DirToolFileIter()) @@ -79,15 +80,15 @@ namespace Demo.Game { IEnumerator Run() { - var clipFile = new ToolFile(clipPath); + var clipFile = new Interaction(clipPath); if (clipFile.Exists() == false) - clipFile = MainConfig.GetFile(clipPath); + clipFile = new(MainConfig.GetFile(clipPath).GetFullPath()); if (clipFile.Exists() == false) { Debug.LogError($"Cannt load {clipPath}", this); yield break; } - yield return MainAudio.LoadAudio(clipFile, BasicAudioSystem.GetAudioType(clipPath)); + yield return MainAudio.LoadAudio(clipFile, audioType); content.SongLoadOverCallback(MainAudio); yield return GameAudioSystemInit(); } diff --git a/Assets/Scripts/Framework/ScriptableObject.cs b/Assets/Scripts/Framework/ScriptableObject.cs index 0a238e5..301aa32 100644 --- a/Assets/Scripts/Framework/ScriptableObject.cs +++ b/Assets/Scripts/Framework/ScriptableObject.cs @@ -871,6 +871,7 @@ namespace Demo file = file | "Windows"; #endif file = file | ab; + var downloader = new Interaction(file.GetFullPath()); if (AssetBundlesItemEntry == null) { var hierarchy = HierarchyWindow.instance; @@ -880,7 +881,7 @@ namespace Demo var abLoadingItem = AssetBundlesItemEntry.ref_value.GetComponent().CreateSubPropertyItem(1)[0]; var loadingHierarchyItem = abLoadingItem.ref_value.GetComponent(); loadingHierarchyItem.title = $"{ab}"; - var ir = file.LoadAsAssetBundle(p => + var ir = downloader.LoadAsAssetBundle(p => { loadingHierarchyItem.title = $"{ab}"; }, x => @@ -908,39 +909,6 @@ namespace Demo AssetBundleLoading.Remove(ab); } - public static AssetBundle LoadAssetBundle(this IAssetBundleLoader self, string ab) - { - if (AssetBundleCounter.TryGetValue(ab, out var result)) - { - result.referenceCounter++; - return result.assetBundle; - } - var file = new ToolFile(PlatformIndicator.StreamingAssetsPath) | "AssetBundle/"; -#if PLATFORM_WINDOWS - file = file | "Windows"; -#endif - file = file | ab; - if (AssetBundlesItemEntry == null) - { - var hierarchy = HierarchyWindow.instance; - AssetBundlesItemEntry = hierarchy.CreateRootItemEntryWithBinders(nameof(AssetBundlesLoadHelper))[0]; - AssetBundlesItemEntry.ref_value.GetComponent().title = nameof(AssetBundlesLoadHelper); - } - var abLoadingItem = AssetBundlesItemEntry.ref_value.GetComponent().CreateSubPropertyItem(1)[0]; - abLoadingItem.ref_value.GetComponent().title = $"{ab}"; - var assetBundle = file.LoadAsAssetBundle(); - var item = abLoadingItem.ref_value.GetComponent(); - item.title = $"{ab}"; - var assets = assetBundle.GetAllAssetNames(); - var subAssetsItems = item.CreateSubPropertyItem(assets.Length); - for (int i = 0, e = assets.Length; i < e; i++) - { - subAssetsItems[i].ref_value.GetComponent().title = Path.GetFileName(assets[i]); - } - AssetBundleCounter[ab] = new(assetBundle, 1, abLoadingItem); - return assetBundle; - } - public static IEnumerator UnloadAssetBundle(this IAssetBundleLoader self, string ab) { // Editor中暂时忽略卸载功能 diff --git a/Assets/Scripts/MoreSpline/SplineTubeRenderer.cs b/Assets/Scripts/MoreSpline/SplineTubeRenderer.cs index 370e8bc..6c6834d 100644 --- a/Assets/Scripts/MoreSpline/SplineTubeRenderer.cs +++ b/Assets/Scripts/MoreSpline/SplineTubeRenderer.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using Convention; using Dreamteck.Splines; -using Dreamteck.Splines.Editor; using UnityEngine; namespace Demo.Game diff --git a/Assets/Settings/Mobile/Mobile_Low.asset b/Assets/Settings/Mobile/Mobile_Low.asset index 1e5f818..8e89410 100644 --- a/Assets/Settings/Mobile/Mobile_Low.asset +++ b/Assets/Settings/Mobile/Mobile_Low.asset @@ -104,11 +104,11 @@ MonoBehaviour: m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT3: 1 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 - m_PrefilterNativeRenderPass: 1 + m_PrefilterNativeRenderPass: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/Settings/PC/PC_Low.asset b/Assets/Settings/PC/PC_Low.asset index bcadde6..8f13328 100644 --- a/Assets/Settings/PC/PC_Low.asset +++ b/Assets/Settings/PC/PC_Low.asset @@ -106,6 +106,10 @@ MonoBehaviour: m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 + m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 diff --git a/Assets/StreamingAssets/Helper.meta b/Assets/StreamingAssets/Helper.meta new file mode 100644 index 0000000..e5349fc --- /dev/null +++ b/Assets/StreamingAssets/Helper.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..866561d --- /dev/null +++ b/Assets/StreamingAssets/Helper/Anchor.helper.h @@ -0,0 +1,4 @@ +#include "ScriptableObject.helper.h" + +#define Anchor + diff --git a/Assets/StreamingAssets/Helper/Anchor.helper.h.meta b/Assets/StreamingAssets/Helper/Anchor.helper.h.meta new file mode 100644 index 0000000..d4bd6d9 --- /dev/null +++ b/Assets/StreamingAssets/Helper/Anchor.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..99cf69c --- /dev/null +++ b/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h @@ -0,0 +1,14 @@ +#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 new file mode 100644 index 0000000..bb10a18 --- /dev/null +++ b/Assets/StreamingAssets/Helper/BaseOnMaterialUpdatement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..56c8012 --- /dev/null +++ b/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h @@ -0,0 +1,26 @@ +#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 new file mode 100644 index 0000000..f36f7ee --- /dev/null +++ b/Assets/StreamingAssets/Helper/BasicSplineJustFollow.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..c518dd2 --- /dev/null +++ b/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h @@ -0,0 +1,52 @@ +#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 new file mode 100644 index 0000000..be9b4f8 --- /dev/null +++ b/Assets/StreamingAssets/Helper/BasicSplineRenderer.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..d95d0b5 --- /dev/null +++ b/Assets/StreamingAssets/Helper/CameraObject.helper.h @@ -0,0 +1,120 @@ +#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 new file mode 100644 index 0000000..11fe29e --- /dev/null +++ b/Assets/StreamingAssets/Helper/CameraObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..e02aa7b --- /dev/null +++ b/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h @@ -0,0 +1,4 @@ +#include "BaseOnMaterialUpdatement.helper.h" + +#define ColorUpdatement + diff --git a/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h.meta new file mode 100644 index 0000000..8684b9b --- /dev/null +++ b/Assets/StreamingAssets/Helper/ColorUpdatement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..2ddb911 --- /dev/null +++ b/Assets/StreamingAssets/Helper/DDT.helper.h @@ -0,0 +1,17 @@ +#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 new file mode 100644 index 0000000..9464c5e --- /dev/null +++ b/Assets/StreamingAssets/Helper/DDT.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..fffbee8 --- /dev/null +++ b/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h @@ -0,0 +1,4 @@ +#include "BaseOnMaterialUpdatement.helper.h" + +#define EmissionColorUpdatement + diff --git a/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h.meta b/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h.meta new file mode 100644 index 0000000..50e7ce4 --- /dev/null +++ b/Assets/StreamingAssets/Helper/EmissionColorUpdatement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..067b69b --- /dev/null +++ b/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h @@ -0,0 +1,4 @@ +#include "IInteraction.helper.h" + +#define FullScreenInteraction + diff --git a/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h.meta b/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h.meta new file mode 100644 index 0000000..e00e4d9 --- /dev/null +++ b/Assets/StreamingAssets/Helper/FullScreenInteraction.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..a153dc6 --- /dev/null +++ b/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h @@ -0,0 +1,23 @@ +#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 new file mode 100644 index 0000000..07f18ec --- /dev/null +++ b/Assets/StreamingAssets/Helper/IEffectHookObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..cfd4441 --- /dev/null +++ b/Assets/StreamingAssets/Helper/IInteraction.helper.h @@ -0,0 +1,102 @@ +#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 new file mode 100644 index 0000000..1c11f56 --- /dev/null +++ b/Assets/StreamingAssets/Helper/IInteraction.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..9ba9cb7 --- /dev/null +++ b/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h @@ -0,0 +1,13 @@ +#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 new file mode 100644 index 0000000..1d63f96 --- /dev/null +++ b/Assets/StreamingAssets/Helper/IJudgementHookObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..07fc5b3 --- /dev/null +++ b/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h @@ -0,0 +1,24 @@ +#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 new file mode 100644 index 0000000..4277655 --- /dev/null +++ b/Assets/StreamingAssets/Helper/LookAtAnchor.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..c39accd --- /dev/null +++ b/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h @@ -0,0 +1,25 @@ +#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 new file mode 100644 index 0000000..4854d8d --- /dev/null +++ b/Assets/StreamingAssets/Helper/MaterialUpdatement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..7536643 --- /dev/null +++ b/Assets/StreamingAssets/Helper/ParticleEffect.helper.h @@ -0,0 +1,15 @@ +#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 new file mode 100644 index 0000000..685e162 --- /dev/null +++ b/Assets/StreamingAssets/Helper/ParticleEffect.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..6a3f03c --- /dev/null +++ b/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h @@ -0,0 +1,17 @@ +#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 new file mode 100644 index 0000000..057e044 --- /dev/null +++ b/Assets/StreamingAssets/Helper/ParticleJudgement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..5e52142 --- /dev/null +++ b/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h @@ -0,0 +1,15 @@ +#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 new file mode 100644 index 0000000..8e932ab --- /dev/null +++ b/Assets/StreamingAssets/Helper/PrefabRootObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..7888e64 --- /dev/null +++ b/Assets/StreamingAssets/Helper/RootObject.helper.h @@ -0,0 +1,4 @@ +#include "ScriptableObject.helper.h" + +#define RootObject + diff --git a/Assets/StreamingAssets/Helper/RootObject.helper.h.meta b/Assets/StreamingAssets/Helper/RootObject.helper.h.meta new file mode 100644 index 0000000..e867b4a --- /dev/null +++ b/Assets/StreamingAssets/Helper/RootObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..130c6af --- /dev/null +++ b/Assets/StreamingAssets/Helper/ScriptableObject.helper.h @@ -0,0 +1,104 @@ +/* + + +重设指定时间线 + +时间线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 new file mode 100644 index 0000000..ce3bc5d --- /dev/null +++ b/Assets/StreamingAssets/Helper/ScriptableObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..355beb8 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h @@ -0,0 +1,25 @@ +#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 new file mode 100644 index 0000000..037821a --- /dev/null +++ b/Assets/StreamingAssets/Helper/SkyUpdatement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..12b3e0a --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineAnchor.helper.h @@ -0,0 +1,36 @@ +#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 new file mode 100644 index 0000000..ff83450 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineAnchor.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..64eeaf5 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineCore.helper.h @@ -0,0 +1,54 @@ +#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 new file mode 100644 index 0000000..74f8b15 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineCore.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..a6637da --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h @@ -0,0 +1,14 @@ +#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 new file mode 100644 index 0000000..75be0a8 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineHeadObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..e4da404 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineMovement.helper.h @@ -0,0 +1,14 @@ +#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 new file mode 100644 index 0000000..c7ee15d --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineMovement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..438d427 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineNode.helper.h @@ -0,0 +1,39 @@ +#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 new file mode 100644 index 0000000..03e1918 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineNode.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..8e3f6af --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineRotation.helper.h @@ -0,0 +1,4 @@ +#include "BasicSplineJustFollow.helper.h" + +#define SplineRotation + diff --git a/Assets/StreamingAssets/Helper/SplineRotation.helper.h.meta b/Assets/StreamingAssets/Helper/SplineRotation.helper.h.meta new file mode 100644 index 0000000..34c0946 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineRotation.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..1615a9a --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineScaling.helper.h @@ -0,0 +1,4 @@ +#include "BasicSplineJustFollow.helper.h" + +#define SplineScaling + diff --git a/Assets/StreamingAssets/Helper/SplineScaling.helper.h.meta b/Assets/StreamingAssets/Helper/SplineScaling.helper.h.meta new file mode 100644 index 0000000..ed9727b --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineScaling.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..6cdd3f0 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h @@ -0,0 +1,4 @@ +#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 new file mode 100644 index 0000000..c616d93 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineTrackRenderer.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..5349d1d --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h @@ -0,0 +1,23 @@ +#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 new file mode 100644 index 0000000..2d40921 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SplineTubeRenderer.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..266c002 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SubWorld.helper.h @@ -0,0 +1,14 @@ +#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 new file mode 100644 index 0000000..ab9e0d0 --- /dev/null +++ b/Assets/StreamingAssets/Helper/SubWorld.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..9208272 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TickMovement.helper.h @@ -0,0 +1,18 @@ +#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 new file mode 100644 index 0000000..1414167 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TickMovement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..dd6538b --- /dev/null +++ b/Assets/StreamingAssets/Helper/TickRotation.helper.h @@ -0,0 +1,18 @@ +#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 new file mode 100644 index 0000000..fd771d9 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TickRotation.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..8976925 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TickScaling.helper.h @@ -0,0 +1,18 @@ +#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 new file mode 100644 index 0000000..53224a9 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TickScaling.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..1d105e4 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h @@ -0,0 +1,4 @@ +#include "ScriptableObject.helper.h" + +#define TimelineScriptObject + diff --git a/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h.meta b/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h.meta new file mode 100644 index 0000000..b5f8119 --- /dev/null +++ b/Assets/StreamingAssets/Helper/TimelineScriptObject.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..1b874a7 --- /dev/null +++ b/Assets/StreamingAssets/Helper/Updatement.helper.h @@ -0,0 +1,14 @@ +#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 new file mode 100644 index 0000000..e8abb28 --- /dev/null +++ b/Assets/StreamingAssets/Helper/Updatement.helper.h.meta @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..d8ab2f7 --- /dev/null +++ b/Assets/StreamingAssets/Helper/WorldLightObject.helper.h @@ -0,0 +1,4 @@ +#include "ScriptableObject.helper.h" + +#define WorldLightObject + diff --git a/Assets/StreamingAssets/Helper/WorldLightObject.helper.h.meta b/Assets/StreamingAssets/Helper/WorldLightObject.helper.h.meta new file mode 100644 index 0000000..ac6dab2 --- /dev/null +++ b/Assets/StreamingAssets/Helper/WorldLightObject.helper.h.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1867acb1a09c899438f49803555a5abf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 410f543..6ade9e9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -962,7 +962,7 @@ PlayerSettings: Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;PLATFORM_WINDOWS;DREAMTECK_SPLINES;UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING VisionOS: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING - WebGL: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING + WebGL: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING;DREAMTECK_SPLINES;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 Windows Store Apps: UNITY_VISUAL_SCRIPTING XboxOne: UNITY_POST_PROCESSING_STACK_V2;UNITY_VISUAL_SCRIPTING iPhone: UNITY_VISUAL_SCRIPTING