效果模块,以及代码位置整理
This commit is contained in:
BIN
Assets/.DS_Store
vendored
BIN
Assets/.DS_Store
vendored
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
316
Assets/Scenes/StartPage.unity
Normal file
316
Assets/Scenes/StartPage.unity
Normal file
@@ -0,0 +1,316 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!29 &1
|
||||||
|
OcclusionCullingSettings:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_OcclusionBakeSettings:
|
||||||
|
smallestOccluder: 5
|
||||||
|
smallestHole: 0.25
|
||||||
|
backfaceThreshold: 100
|
||||||
|
m_SceneGUID: 00000000000000000000000000000000
|
||||||
|
m_OcclusionCullingData: {fileID: 0}
|
||||||
|
--- !u!104 &2
|
||||||
|
RenderSettings:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 9
|
||||||
|
m_Fog: 0
|
||||||
|
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||||
|
m_FogMode: 3
|
||||||
|
m_FogDensity: 0.01
|
||||||
|
m_LinearFogStart: 0
|
||||||
|
m_LinearFogEnd: 300
|
||||||
|
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||||
|
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||||
|
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||||
|
m_AmbientIntensity: 1
|
||||||
|
m_AmbientMode: 0
|
||||||
|
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||||
|
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_HaloStrength: 0.5
|
||||||
|
m_FlareStrength: 1
|
||||||
|
m_FlareFadeSpeed: 3
|
||||||
|
m_HaloTexture: {fileID: 0}
|
||||||
|
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_DefaultReflectionMode: 0
|
||||||
|
m_DefaultReflectionResolution: 128
|
||||||
|
m_ReflectionBounces: 1
|
||||||
|
m_ReflectionIntensity: 1
|
||||||
|
m_CustomReflection: {fileID: 0}
|
||||||
|
m_Sun: {fileID: 0}
|
||||||
|
m_UseRadianceAmbientProbe: 0
|
||||||
|
--- !u!157 &3
|
||||||
|
LightmapSettings:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 12
|
||||||
|
m_GIWorkflowMode: 1
|
||||||
|
m_GISettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_BounceScale: 1
|
||||||
|
m_IndirectOutputScale: 1
|
||||||
|
m_AlbedoBoost: 1
|
||||||
|
m_EnvironmentLightingMode: 0
|
||||||
|
m_EnableBakedLightmaps: 1
|
||||||
|
m_EnableRealtimeLightmaps: 0
|
||||||
|
m_LightmapEditorSettings:
|
||||||
|
serializedVersion: 12
|
||||||
|
m_Resolution: 2
|
||||||
|
m_BakeResolution: 40
|
||||||
|
m_AtlasSize: 1024
|
||||||
|
m_AO: 0
|
||||||
|
m_AOMaxDistance: 1
|
||||||
|
m_CompAOExponent: 1
|
||||||
|
m_CompAOExponentDirect: 0
|
||||||
|
m_ExtractAmbientOcclusion: 0
|
||||||
|
m_Padding: 2
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_LightmapsBakeMode: 1
|
||||||
|
m_TextureCompression: 1
|
||||||
|
m_FinalGather: 0
|
||||||
|
m_FinalGatherFiltering: 1
|
||||||
|
m_FinalGatherRayCount: 256
|
||||||
|
m_ReflectionCompression: 2
|
||||||
|
m_MixedBakeMode: 2
|
||||||
|
m_BakeBackend: 1
|
||||||
|
m_PVRSampling: 1
|
||||||
|
m_PVRDirectSampleCount: 32
|
||||||
|
m_PVRSampleCount: 512
|
||||||
|
m_PVRBounces: 2
|
||||||
|
m_PVREnvironmentSampleCount: 256
|
||||||
|
m_PVREnvironmentReferencePointCount: 2048
|
||||||
|
m_PVRFilteringMode: 1
|
||||||
|
m_PVRDenoiserTypeDirect: 1
|
||||||
|
m_PVRDenoiserTypeIndirect: 1
|
||||||
|
m_PVRDenoiserTypeAO: 1
|
||||||
|
m_PVRFilterTypeDirect: 0
|
||||||
|
m_PVRFilterTypeIndirect: 0
|
||||||
|
m_PVRFilterTypeAO: 0
|
||||||
|
m_PVREnvironmentMIS: 1
|
||||||
|
m_PVRCulling: 1
|
||||||
|
m_PVRFilteringGaussRadiusDirect: 1
|
||||||
|
m_PVRFilteringGaussRadiusIndirect: 5
|
||||||
|
m_PVRFilteringGaussRadiusAO: 2
|
||||||
|
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||||
|
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||||
|
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||||
|
m_ExportTrainingData: 0
|
||||||
|
m_TrainingDataDestination: TrainingData
|
||||||
|
m_LightProbeSampleCountMultiplier: 4
|
||||||
|
m_LightingDataAsset: {fileID: 0}
|
||||||
|
m_LightingSettings: {fileID: 0}
|
||||||
|
--- !u!196 &4
|
||||||
|
NavMeshSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_BuildSettings:
|
||||||
|
serializedVersion: 3
|
||||||
|
agentTypeID: 0
|
||||||
|
agentRadius: 0.5
|
||||||
|
agentHeight: 2
|
||||||
|
agentSlope: 45
|
||||||
|
agentClimb: 0.4
|
||||||
|
ledgeDropHeight: 0
|
||||||
|
maxJumpAcrossDistance: 0
|
||||||
|
minRegionArea: 2
|
||||||
|
manualCellSize: 0
|
||||||
|
cellSize: 0.16666667
|
||||||
|
manualTileSize: 0
|
||||||
|
tileSize: 256
|
||||||
|
buildHeightMesh: 0
|
||||||
|
maxJobWorkers: 0
|
||||||
|
preserveTilesOutsideBounds: 0
|
||||||
|
debug:
|
||||||
|
m_Flags: 0
|
||||||
|
m_NavMeshData: {fileID: 0}
|
||||||
|
--- !u!1 &87189950
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 87189953}
|
||||||
|
- component: {fileID: 87189952}
|
||||||
|
- component: {fileID: 87189951}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Main Camera
|
||||||
|
m_TagString: MainCamera
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!81 &87189951
|
||||||
|
AudioListener:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 87189950}
|
||||||
|
m_Enabled: 1
|
||||||
|
--- !u!20 &87189952
|
||||||
|
Camera:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 87189950}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_ClearFlags: 1
|
||||||
|
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
|
||||||
|
m_projectionMatrixMode: 1
|
||||||
|
m_GateFitMode: 2
|
||||||
|
m_FOVAxisMode: 0
|
||||||
|
m_Iso: 200
|
||||||
|
m_ShutterSpeed: 0.005
|
||||||
|
m_Aperture: 16
|
||||||
|
m_FocusDistance: 10
|
||||||
|
m_FocalLength: 50
|
||||||
|
m_BladeCount: 5
|
||||||
|
m_Curvature: {x: 2, y: 11}
|
||||||
|
m_BarrelClipping: 0.25
|
||||||
|
m_Anamorphism: 0
|
||||||
|
m_SensorSize: {x: 36, y: 24}
|
||||||
|
m_LensShift: {x: 0, y: 0}
|
||||||
|
m_NormalizedViewPortRect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 1
|
||||||
|
height: 1
|
||||||
|
near clip plane: 0.3
|
||||||
|
far clip plane: 1000
|
||||||
|
field of view: 60
|
||||||
|
orthographic: 0
|
||||||
|
orthographic size: 5
|
||||||
|
m_Depth: -1
|
||||||
|
m_CullingMask:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_RenderingPath: -1
|
||||||
|
m_TargetTexture: {fileID: 0}
|
||||||
|
m_TargetDisplay: 0
|
||||||
|
m_TargetEye: 3
|
||||||
|
m_HDR: 1
|
||||||
|
m_AllowMSAA: 1
|
||||||
|
m_AllowDynamicResolution: 0
|
||||||
|
m_ForceIntoRT: 0
|
||||||
|
m_OcclusionCulling: 1
|
||||||
|
m_StereoConvergence: 10
|
||||||
|
m_StereoSeparation: 0.022
|
||||||
|
--- !u!4 &87189953
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 87189950}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 1, z: -10}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &1800672650
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1800672652}
|
||||||
|
- component: {fileID: 1800672651}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Directional Light
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!108 &1800672651
|
||||||
|
Light:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1800672650}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 10
|
||||||
|
m_Type: 1
|
||||||
|
m_Shape: 0
|
||||||
|
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
|
||||||
|
m_Intensity: 1
|
||||||
|
m_Range: 10
|
||||||
|
m_SpotAngle: 30
|
||||||
|
m_InnerSpotAngle: 21.80208
|
||||||
|
m_CookieSize: 10
|
||||||
|
m_Shadows:
|
||||||
|
m_Type: 2
|
||||||
|
m_Resolution: -1
|
||||||
|
m_CustomResolution: -1
|
||||||
|
m_Strength: 1
|
||||||
|
m_Bias: 0.05
|
||||||
|
m_NormalBias: 0.4
|
||||||
|
m_NearPlane: 0.2
|
||||||
|
m_CullingMatrixOverride:
|
||||||
|
e00: 1
|
||||||
|
e01: 0
|
||||||
|
e02: 0
|
||||||
|
e03: 0
|
||||||
|
e10: 0
|
||||||
|
e11: 1
|
||||||
|
e12: 0
|
||||||
|
e13: 0
|
||||||
|
e20: 0
|
||||||
|
e21: 0
|
||||||
|
e22: 1
|
||||||
|
e23: 0
|
||||||
|
e30: 0
|
||||||
|
e31: 0
|
||||||
|
e32: 0
|
||||||
|
e33: 1
|
||||||
|
m_UseCullingMatrixOverride: 0
|
||||||
|
m_Cookie: {fileID: 0}
|
||||||
|
m_DrawHalo: 0
|
||||||
|
m_Flare: {fileID: 0}
|
||||||
|
m_RenderMode: 0
|
||||||
|
m_CullingMask:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_Lightmapping: 4
|
||||||
|
m_LightShadowCasterMode: 0
|
||||||
|
m_AreaSize: {x: 1, y: 1}
|
||||||
|
m_BounceIntensity: 1
|
||||||
|
m_ColorTemperature: 6570
|
||||||
|
m_UseColorTemperature: 0
|
||||||
|
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_UseBoundingSphereOverride: 0
|
||||||
|
m_UseViewFrustumForShadowCasterCull: 1
|
||||||
|
m_ShadowRadius: 0
|
||||||
|
m_ShadowAngle: 0
|
||||||
|
--- !u!4 &1800672652
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1800672650}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
|
||||||
|
m_LocalPosition: {x: 0, y: 3, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||||
|
--- !u!1660057539 &9223372036854775807
|
||||||
|
SceneRoots:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_Roots:
|
||||||
|
- {fileID: 87189953}
|
||||||
|
- {fileID: 1800672652}
|
||||||
7
Assets/Scenes/StartPage.unity.meta
Normal file
7
Assets/Scenes/StartPage.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 28c134965d47644a98d3ba8a1343674a
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Ichni.RhythmGame;
|
|
||||||
using Ichni.RhythmGame.Beatmap;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Ichni
|
|
||||||
{
|
|
||||||
public class EditorSettings
|
|
||||||
{
|
|
||||||
public int autoSaveInterval = 300;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using Ichni.RhythmGame;
|
using Ichni.RhythmGame;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Events;
|
||||||
|
|
||||||
namespace Ichni.Editor
|
namespace Ichni.Editor
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Ichni.RhythmGame;
|
using Ichni.RhythmGame;
|
||||||
@@ -20,7 +21,19 @@ namespace Ichni.Editor
|
|||||||
|
|
||||||
private void ApplyParameters(string text)
|
private void ApplyParameters(string text)
|
||||||
{
|
{
|
||||||
connectedBaseElement.GetType().GetField(parameterName).SetValue(connectedBaseElement, text);
|
Type type = connectedBaseElement.GetType().GetField(parameterName).FieldType;
|
||||||
|
if (type == typeof(int))
|
||||||
|
{
|
||||||
|
connectedBaseElement.GetType().GetField(parameterName).SetValue(connectedBaseElement, int.Parse(text));
|
||||||
|
}
|
||||||
|
else if (type == typeof(float))
|
||||||
|
{
|
||||||
|
connectedBaseElement.GetType().GetField(parameterName).SetValue(connectedBaseElement, float.Parse(text));
|
||||||
|
}
|
||||||
|
else if (type == typeof(string))
|
||||||
|
{
|
||||||
|
connectedBaseElement.GetType().GetField(parameterName).SetValue(connectedBaseElement, text);
|
||||||
|
}
|
||||||
connectedBaseElement.Refresh();
|
connectedBaseElement.Refresh();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Ichni.RhythmGame;
|
using Ichni.RhythmGame;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Events;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
namespace Ichni.Editor
|
namespace Ichni.Editor
|
||||||
@@ -22,5 +23,10 @@ namespace Ichni.Editor
|
|||||||
connectedBaseElement.GetType().GetField(parameterName).SetValue(connectedBaseElement, value);
|
connectedBaseElement.GetType().GetField(parameterName).SetValue(connectedBaseElement, value);
|
||||||
connectedBaseElement.Refresh();
|
connectedBaseElement.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void AddListenerFunction(UnityAction<bool> action)
|
||||||
|
{
|
||||||
|
toggle.onValueChanged.AddListener(action);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,9 +6,9 @@ namespace Ichni.Editor
|
|||||||
{
|
{
|
||||||
public class EditorUIManager : MonoBehaviour
|
public class EditorUIManager : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
public MainPage mainPage;
|
||||||
public Hierarchy hierarchy;
|
public Hierarchy hierarchy;
|
||||||
public Inspector inspector;
|
public Inspector inspector;
|
||||||
public Timeline timeline;
|
public Timeline timeline;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,6 +72,16 @@ namespace Ichni.Editor
|
|||||||
container.dynamicUIElements.Add(button);
|
container.dynamicUIElements.Add(button);
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DynamicUIToggle GenerateToggle(IBaseElement baseElement, DynamicUIContainer container, string title,
|
||||||
|
string parameterName)
|
||||||
|
{
|
||||||
|
DynamicUIToggle toggle = Instantiate(EditorManager.instance.basePrefabs.toggle, container.rect)
|
||||||
|
.GetComponent<DynamicUIToggle>();
|
||||||
|
toggle.Initialize(baseElement, title, parameterName);
|
||||||
|
container.dynamicUIElements.Add(toggle);
|
||||||
|
return toggle;
|
||||||
|
}
|
||||||
|
|
||||||
public DynamicUIInputField GenerateInputField(IBaseElement baseElement, DynamicUIContainer container,
|
public DynamicUIInputField GenerateInputField(IBaseElement baseElement, DynamicUIContainer container,
|
||||||
string title, string parameterName)
|
string title, string parameterName)
|
||||||
|
|||||||
8
Assets/Scripts/DynamicUI/MainUI.meta
Normal file
8
Assets/Scripts/DynamicUI/MainUI.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6795f50bfe6d14cb7a78043ec0d9b433
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
13
Assets/Scripts/DynamicUI/MainUI/MainPage.cs
Normal file
13
Assets/Scripts/DynamicUI/MainUI/MainPage.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Ichni.Editor
|
||||||
|
{
|
||||||
|
public class MainPage : StaticWindow
|
||||||
|
{
|
||||||
|
public Canvas mainCanvas;
|
||||||
|
public ToolBar toolBar;
|
||||||
|
public ResolutionHints resolutionHints;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Scripts/DynamicUI/MainUI/MainPage.cs.meta
Normal file
11
Assets/Scripts/DynamicUI/MainUI/MainPage.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: dcc87ae8f9fe04833b49d5d7396d9693
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
8
Assets/Scripts/DynamicUI/MainUI/ResolusionHints.meta
Normal file
8
Assets/Scripts/DynamicUI/MainUI/ResolusionHints.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 77cef690bc8234daba9231732db8dfb4
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Ichni.Editor
|
||||||
|
{
|
||||||
|
public partial class ResolutionHints : MonoBehaviour
|
||||||
|
{
|
||||||
|
public Image phoneFrame;
|
||||||
|
public Image iPadFrame;
|
||||||
|
public Image safeAreaFrame;
|
||||||
|
}
|
||||||
|
|
||||||
|
public partial class ResolutionHints
|
||||||
|
{
|
||||||
|
public void SetPhoneFrame()
|
||||||
|
{
|
||||||
|
phoneFrame.gameObject.SetActive(!phoneFrame.gameObject.activeSelf);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetIPadFrame()
|
||||||
|
{
|
||||||
|
iPadFrame.gameObject.SetActive(!iPadFrame.gameObject.activeSelf);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetSafeAreaFrame()
|
||||||
|
{
|
||||||
|
safeAreaFrame.gameObject.SetActive(!safeAreaFrame.gameObject.activeSelf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f39aaf316b5904be48688dae23e2e35f
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
28
Assets/Scripts/DynamicUI/MainUI/ToolBar/ToolBar.cs
Normal file
28
Assets/Scripts/DynamicUI/MainUI/ToolBar/ToolBar.cs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Ichni.Editor
|
||||||
|
{
|
||||||
|
public partial class ToolBar : MonoBehaviour
|
||||||
|
{
|
||||||
|
public Button projectInfoButton;
|
||||||
|
public Button songInfoButton;
|
||||||
|
public Button saveButton;
|
||||||
|
public Button exportButton;
|
||||||
|
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
saveButton.onClick.AddListener(EditorManager.instance.projectManager.saveManager.Save);
|
||||||
|
exportButton.onClick.AddListener(EditorManager.instance.projectManager.exportManager.Export);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public partial class ToolBar
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
8
Assets/Scripts/EditorGame.meta
Normal file
8
Assets/Scripts/EditorGame.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7bf117e642611451c8562357254c1e83
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -40,6 +40,7 @@ namespace Ichni.RhythmGame
|
|||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Inspector inspector => EditorManager.instance.uiManager.inspector;
|
||||||
public void SetUpInspector();
|
public void SetUpInspector();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,15 +81,18 @@ namespace Ichni.RhythmGame
|
|||||||
{
|
{
|
||||||
var container = inspector.GenerateContainer("Color");
|
var container = inspector.GenerateContainer("Color");
|
||||||
var baseColor = inspector.GenerateBaseColorPicker(this, container, "Base Color", nameof(originalBaseColor));
|
var baseColor = inspector.GenerateBaseColorPicker(this, container, "Base Color", nameof(originalBaseColor));
|
||||||
var emissionColor = inspector.GenerateEmissionColorPicker(this, container, "Emission Color", nameof(emissionEnabled),
|
if ((attachedGameElement as IHaveColorSubmodule).haveEmission)
|
||||||
nameof(originalEmissionColor), nameof(originalEmissionIntensity));
|
{
|
||||||
|
var emissionColor = inspector.GenerateEmissionColorPicker(this, container, "Emission Color",
|
||||||
|
nameof(emissionEnabled), nameof(originalEmissionColor), nameof(originalEmissionIntensity));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface IHaveColorSubmodule
|
public interface IHaveColorSubmodule
|
||||||
{
|
{
|
||||||
public ColorSubmodule colorSubmodule { get; set; }
|
public ColorSubmodule colorSubmodule { get; set; }
|
||||||
|
public bool haveEmission { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Beatmap
|
namespace Beatmap
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Ichni.Editor;
|
||||||
using Ichni.RhythmGame.Beatmap;
|
using Ichni.RhythmGame.Beatmap;
|
||||||
|
using Sirenix.Utilities;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Ichni.RhythmGame
|
namespace Ichni.RhythmGame
|
||||||
@@ -47,11 +49,26 @@ namespace Ichni.RhythmGame
|
|||||||
effectCollection.Add(effect.Key, effectList);
|
effectCollection.Add(effect.Key, effectList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public partial class EffectSubmodule
|
||||||
|
{
|
||||||
public override void SaveBM()
|
public override void SaveBM()
|
||||||
{
|
{
|
||||||
matchedBM = new EffectSubmodule_BM(attachedGameElement);
|
matchedBM = new EffectSubmodule_BM(attachedGameElement);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void SetUpInspector()
|
||||||
|
{
|
||||||
|
foreach (var effect in effectCollection)
|
||||||
|
{
|
||||||
|
var container = inspector.GenerateContainer(effect.Key);
|
||||||
|
foreach (var effectBase in effect.Value)
|
||||||
|
{
|
||||||
|
effectBase.SetUpInspector();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public partial class EffectSubmodule
|
public partial class EffectSubmodule
|
||||||
@@ -110,7 +127,7 @@ namespace Ichni.RhythmGame
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract class EffectBase
|
public abstract class EffectBase : IBaseElement
|
||||||
{
|
{
|
||||||
public enum EffectState
|
public enum EffectState
|
||||||
{
|
{
|
||||||
@@ -120,6 +137,9 @@ namespace Ichni.RhythmGame
|
|||||||
Error = 100
|
Error = 100
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public BaseElement_BM matchedBM { get; set; }
|
||||||
|
public Inspector inspector => EditorManager.instance.uiManager.inspector;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 效果的持续时间,如果为0则表示瞬间效果
|
/// 效果的持续时间,如果为0则表示瞬间效果
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -146,10 +166,15 @@ namespace Ichni.RhythmGame
|
|||||||
this.effectTime = effectTime;
|
this.effectTime = effectTime;
|
||||||
this.nowEffectState = EffectState.Before;
|
this.nowEffectState = EffectState.Before;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void UpdateEffect()
|
public void SaveBM()
|
||||||
{
|
{
|
||||||
EffectState state = CheckEffectState();
|
throw new System.NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void UpdateEffect(float triggerTime)
|
||||||
|
{
|
||||||
|
EffectState state = CheckEffectState(triggerTime);
|
||||||
|
|
||||||
if (state == EffectState.Before && nowEffectState != EffectState.Before)
|
if (state == EffectState.Before && nowEffectState != EffectState.Before)
|
||||||
{
|
{
|
||||||
@@ -168,9 +193,27 @@ namespace Ichni.RhythmGame
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual EffectState CheckEffectState()
|
protected virtual EffectState CheckEffectState(float triggerTime)
|
||||||
{
|
{
|
||||||
throw new System.NotImplementedException();
|
float songTime = EditorManager.instance.songInformation.songTime;
|
||||||
|
|
||||||
|
if (songTime < triggerTime)
|
||||||
|
{
|
||||||
|
return EffectState.Before;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (songTime >= triggerTime &&
|
||||||
|
songTime <= triggerTime + effectTime)
|
||||||
|
{
|
||||||
|
return EffectState.Middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (songTime > triggerTime + effectTime)
|
||||||
|
{
|
||||||
|
return EffectState.After;
|
||||||
|
}
|
||||||
|
|
||||||
|
return EffectState.Error;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -203,6 +246,13 @@ namespace Ichni.RhythmGame
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public abstract EffectBase_BM ConvertToBM();
|
public abstract EffectBase_BM ConvertToBM();
|
||||||
|
|
||||||
|
public void Refresh()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract void SetUpInspector();
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Beatmap
|
namespace Beatmap
|
||||||
@@ -13,6 +13,8 @@ namespace Ichni.RhythmGame
|
|||||||
|
|
||||||
public BaseElement_BM matchedBM { get; set; }
|
public BaseElement_BM matchedBM { get; set; }
|
||||||
|
|
||||||
|
public Inspector inspector => EditorManager.instance.uiManager.inspector;
|
||||||
|
|
||||||
public SubmoduleBase(GameElement attachedGameElement)
|
public SubmoduleBase(GameElement attachedGameElement)
|
||||||
{
|
{
|
||||||
this.attachedGameElement = attachedGameElement;
|
this.attachedGameElement = attachedGameElement;
|
||||||
@@ -34,9 +36,7 @@ namespace Ichni.RhythmGame
|
|||||||
{
|
{
|
||||||
attachedGameElement.submoduleList.Remove(this);
|
attachedGameElement.submoduleList.Remove(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Inspector inspector => EditorManager.instance.uiManager.inspector;
|
|
||||||
|
|
||||||
public virtual void SetUpInspector()
|
public virtual void SetUpInspector()
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace Ichni.RhythmGame
|
namespace Ichni.RhythmGame
|
||||||
{
|
{
|
||||||
public class TimeDurationSubmodule: SubmoduleBase
|
public partial class TimeDurationSubmodule : SubmoduleBase
|
||||||
{
|
{
|
||||||
public bool isOverridingDuration; //是否手动设置了时间区间,开启时,子物体的时间区间将被忽略,且在自动计算区间时跳过此模块
|
public bool isOverridingDuration; //是否手动设置了时间区间,开启时,子物体的时间区间将被忽略,且在自动计算区间时跳过此模块
|
||||||
public float startTime, endTime; //起止时间
|
public float startTime, endTime; //起止时间
|
||||||
@@ -82,6 +82,28 @@ namespace Ichni.RhythmGame
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public partial class TimeDurationSubmodule
|
||||||
|
{
|
||||||
|
public override void SetUpInspector()
|
||||||
|
{
|
||||||
|
var container = inspector.GenerateContainer("Time Duration");
|
||||||
|
var overrideToggle = inspector.GenerateToggle(this, container, "Override Duration", nameof(isOverridingDuration));
|
||||||
|
var startTimeInputField = inspector.GenerateInputField(this, container, "Start Time", nameof(startTime));
|
||||||
|
var endTimeInputField = inspector.GenerateInputField(this, container, "End Time", nameof(endTime));
|
||||||
|
|
||||||
|
void SetInputFieldInteractable(bool interactable)
|
||||||
|
{
|
||||||
|
startTimeInputField.inputField.interactable = interactable;
|
||||||
|
endTimeInputField.inputField.interactable = interactable;
|
||||||
|
}
|
||||||
|
|
||||||
|
SetInputFieldInteractable(isOverridingDuration);
|
||||||
|
overrideToggle.AddListenerFunction(SetInputFieldInteractable);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public interface IHaveTimeDurationSubmodule
|
public interface IHaveTimeDurationSubmodule
|
||||||
{
|
{
|
||||||
public TimeDurationSubmodule timeDurationSubmodule { get; set; }
|
public TimeDurationSubmodule timeDurationSubmodule { get; set; }
|
||||||
@@ -17,11 +17,7 @@ namespace Ichni.RhythmGame
|
|||||||
public static ElementFolder GenerateElement(string name, Guid id, List<string> tags, bool isFirstGenerated, GameElement parentElement)
|
public static ElementFolder GenerateElement(string name, Guid id, List<string> tags, bool isFirstGenerated, GameElement parentElement)
|
||||||
{
|
{
|
||||||
ElementFolder elementFolder = Instantiate(EditorManager.instance.basePrefabs.elementFolder).GetComponent<ElementFolder>();
|
ElementFolder elementFolder = Instantiate(EditorManager.instance.basePrefabs.elementFolder).GetComponent<ElementFolder>();
|
||||||
|
|
||||||
elementFolder.Initialize(name, id, tags, isFirstGenerated, parentElement);
|
elementFolder.Initialize(name, id, tags, isFirstGenerated, parentElement);
|
||||||
|
|
||||||
//elementFolder.GenerateTab(parentElement);
|
|
||||||
|
|
||||||
return elementFolder;
|
return elementFolder;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +29,6 @@ namespace Ichni.RhythmGame
|
|||||||
submoduleList.Add(transformSubmodule);
|
submoduleList.Add(transformSubmodule);
|
||||||
submoduleList.Add(timeDurationSubmodule);
|
submoduleList.Add(timeDurationSubmodule);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -39,6 +39,8 @@ namespace Ichni.RhythmGame
|
|||||||
//存档类
|
//存档类
|
||||||
public BaseElement_BM matchedBM { get; set; }
|
public BaseElement_BM matchedBM { get; set; }
|
||||||
|
|
||||||
|
public Inspector inspector => EditorManager.instance.uiManager.inspector;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 首次初始化
|
/// 首次初始化
|
||||||
@@ -139,8 +141,6 @@ namespace Ichni.RhythmGame
|
|||||||
|
|
||||||
public abstract partial class GameElement
|
public abstract partial class GameElement
|
||||||
{
|
{
|
||||||
public Inspector inspector => EditorManager.instance.uiManager.inspector;
|
|
||||||
|
|
||||||
public virtual void SetUpInspector() //被点击时设置第一层Inspector
|
public virtual void SetUpInspector() //被点击时设置第一层Inspector
|
||||||
{
|
{
|
||||||
var container = inspector.GenerateContainer("Element Info");
|
var container = inspector.GenerateContainer("Element Info");
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Ichni.Editor;
|
||||||
using Ichni.RhythmGame.Beatmap;
|
using Ichni.RhythmGame.Beatmap;
|
||||||
using Lean.Pool;
|
using Lean.Pool;
|
||||||
using MoreMountains.Feedbacks;
|
using MoreMountains.Feedbacks;
|
||||||
@@ -28,5 +29,10 @@ namespace Ichni.RhythmGame
|
|||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void SetUpInspector()
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Ichni.RhythmGame
|
||||||
|
{
|
||||||
|
public partial class TimeEffectsCollection : GameElement, IHaveEffectSubmodule
|
||||||
|
{
|
||||||
|
public EffectSubmodule effectSubmodule { get; set; }
|
||||||
|
public float time;
|
||||||
|
|
||||||
|
public static TimeEffectsCollection CreateTimeEffectsCollection(float time)
|
||||||
|
{
|
||||||
|
TimeEffectsCollection timeEffectsCollection = Instantiate(EditorManager.instance.basePrefabs.emptyObject)
|
||||||
|
.AddComponent<TimeEffectsCollection>();
|
||||||
|
timeEffectsCollection.time = time;
|
||||||
|
return timeEffectsCollection;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void SetDefaultSubmodules()
|
||||||
|
{
|
||||||
|
effectSubmodule = new EffectSubmodule(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
effectSubmodule.effectCollection["Default"].ForEach(effect => effect.UpdateEffect(time));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public partial class TimeEffectsCollection
|
||||||
|
{
|
||||||
|
public override void SaveBM()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SetUpInspector()
|
||||||
|
{
|
||||||
|
var container = inspector.GenerateContainer("Time Effects Collection");
|
||||||
|
var timeInputField = inspector.GenerateInputField(this, container, "Time", nameof(time));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Beatmap
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user