diff --git a/.gitmodules b/.gitmodules index 272e503..5f0ed89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,13 +21,20 @@ path = Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc url = https://github.com/UltraCombos/com.ultracombos.osc.git branch = master +[submodule "Unity-19050-01_ForstCoronation/Packages/KlakSpout"] + path = Unity-19050-01_ForstCoronation/Packages/KlakSpout + url = https://github.com/UltraCombos/KlakSpout + branch = upm [submodule "_Package/com.ultracombos.osc"] path = _Package/com.ultracombos.osc url = https://github.com/UltraCombos/com.ultracombos.osc [submodule "_Package/com.ultracombos.tuio"] path = _Package/com.ultracombos.tuio url = https://github.com/UltraCombos/com.ultracombos.tuio -[submodule "_Package/KlakSpout"] - path = _Package/KlakSpout - url = https://github.com/keijiro/KlakSpout - branch = upm +[submodule "_Package/jp.keijiro.klak.spout"] + path = _Package/jp.keijiro.klak.spout + url = "https://github.com/keijiro/KlakSpout#upm" +[submodule "_Package/com.ultracombos.configuration"] + path = _Package/com.ultracombos.configuration + url = https://github.com/UltraCombos/com.ultracombos.configuration.git + branch = master diff --git a/Unity-19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat b/Unity-19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat index 53aa16b..c1afbf2 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat +++ b/Unity-19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat @@ -13,7 +13,7 @@ Material: m_ShaderKeywords: m_LightmapFlags: 1 m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: MotionVector: User @@ -82,6 +82,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_389513AD_Texture_1: + m_Texture: {fileID: 2800000, guid: 958cfbda296458c4faf115404e562d73, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SampleTexture2D_983A7761_Texture_1: m_Texture: {fileID: 2800000, guid: fbfffb30efcdb1543aeb718469e1e665, type: 3} m_Scale: {x: 1, y: 1} @@ -115,7 +119,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - Vector1_30AC6A9E: 6 + - Vector1_30AC6A9E: -0.32 - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity index 0f8f989..14867b7 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &154044455 MeshCollider: m_ObjectHideFlags: 0 @@ -208,7 +208,7 @@ Transform: m_GameObject: {fileID: 154044454} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -3.08} - m_LocalScale: {x: 2, y: 1, z: 2} + m_LocalScale: {x: 1.5, y: 1, z: 1.5} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -245,7 +245,7 @@ RectTransform: m_Children: - {fileID: 1859907172} m_Father: {fileID: 1473451374} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -295,17 +295,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1111578220} - m_MethodName: SendEvent - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: MouseUp - m_BoolArgument: 0 - m_CallState: 2 - m_Target: {fileID: 1482770260} m_MethodName: switchStat m_Mode: 1 @@ -626,7 +615,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 590248846} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.55, y: 6.62, z: -4.99} + m_LocalPosition: {x: -0.21, y: 6.62, z: -4.99} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -745,82 +734,6 @@ MonoBehaviour: m_EditorClassIdentifier: _sourceTexture: {fileID: 0} _alphaSupport: 1 ---- !u!114 &633193832 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - sunSize: - m_OverrideState: 0 - m_Value: 0.04 - min: 0 - max: 1 - sunSizeConvergence: - m_OverrideState: 0 - m_Value: 5 - min: 1 - max: 10 - atmosphereThickness: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 5 - skyTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - groundColor: - m_OverrideState: 0 - m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 - enableSunDisk: - m_OverrideState: 0 - m_Value: 1 --- !u!1 &706372899 GameObject: m_ObjectHideFlags: 0 @@ -913,146 +826,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &775993667 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 775993668} - - component: {fileID: 775993671} - - component: {fileID: 775993670} - - component: {fileID: 775993669} - m_Layer: 5 - m_Name: Grow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &775993668 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 775993667} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2022895806} - m_Father: {fileID: 1473451374} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 850, y: -420} - m_SizeDelta: {x: 160, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &775993669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 775993667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.3186632, g: 0.71655226, b: 0.8773585, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 775993670} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1111578220} - m_MethodName: SendEvent - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: MouseDown - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1482770260} - m_MethodName: enterGrow - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &775993670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 775993667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &775993671 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 775993667} - m_CullTransparentMesh: 0 --- !u!1 &1111578216 GameObject: m_ObjectHideFlags: 0 @@ -1070,7 +843,6 @@ GameObject: - component: {fileID: 1111578225} - component: {fileID: 1111578224} - component: {fileID: 1111578223} - - component: {fileID: 1111578226} - component: {fileID: 1111578227} m_Layer: 0 m_Name: frozenVFX @@ -1108,9 +880,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_ExecuteInEditor: 1 m_Bindings: - - {fileID: 1111578227} - {fileID: 1111578217} - {fileID: 1111578222} + - {fileID: 1111578227} m_VisualEffect: {fileID: 1111578220} --- !u!73398921 &1111578219 VFXRenderer: @@ -1131,7 +903,6 @@ VFXRenderer: m_Materials: - {fileID: 0} - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1176,7 +947,7 @@ VisualEffect: - m_Value: {x: 0.94, y: 0, z: 0} m_Name: _Emitter m_Overridden: 1 - - m_Value: {x: -4.39, y: 0, z: -5.12} + - m_Value: {x: -3.32, y: 0, z: -5.12} m_Name: _Target m_Overridden: 1 - m_Value: {x: 2.46, y: 0, z: -5.01} @@ -1273,18 +1044,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1111578226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1111578216} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a68e2dc3e3b971e44a78a9b57bc67337, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1111578227 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1440,17 +1199,22 @@ PrefabInstance: - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: blobFilters.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} @@ -1461,11 +1225,11 @@ PrefabInstance: type: 3} propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1111578220} + objectReference: {fileID: 1482770260} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SendEvent + value: switchStat objectReference: {fileID: 0} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} @@ -1475,13 +1239,38 @@ PrefabInstance: - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: MouseDown + value: objectReference: {fileID: 0} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: blobFilters.Array.data[0] value: objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1482770260} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: switchStat + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: customRoi.height @@ -1579,8 +1368,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1661572663} - - {fileID: 775993668} - {fileID: 159340526} m_Father: {fileID: 0} m_RootOrder: 8 @@ -1626,8 +1413,10 @@ MonoBehaviour: target: {fileID: 2032731583} emitter: {fileID: 1324214445} button: {fileID: 1859907171} - growingSpeed: 0.006 stat: + growingSpeed: 0.015 + fadeSpeed: 0 + smooth: 0 --- !u!4 &1482770261 Transform: m_ObjectHideFlags: 0 @@ -1642,83 +1431,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1661572662 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1661572663} - - component: {fileID: 1661572665} - - component: {fileID: 1661572664} - m_Layer: 5 - m_Name: Stat - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1661572663 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1661572662} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1473451374} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 850, y: -350} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1661572664 +--- !u!114 &1611372839 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1661572662} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: New Text ---- !u!222 &1661572665 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1661572662} - m_CullTransparentMesh: 0 + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + sunSize: + m_OverrideState: 0 + m_Value: 0.04 + min: 0 + max: 1 + sunSizeConvergence: + m_OverrideState: 0 + m_Value: 5 + min: 1 + max: 10 + atmosphereThickness: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 5 + skyTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + groundColor: + m_OverrideState: 0 + m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 + enableSunDisk: + m_OverrideState: 0 + m_Value: 1 --- !u!1 &1743590121 GameObject: m_ObjectHideFlags: 0 @@ -1913,6 +1701,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1840994726 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1056807493977812, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_Name + value: ConfigurationServer + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6143453941a05b54582f835773a10d58, type: 3} --- !u!1 &1859907171 GameObject: m_ObjectHideFlags: 0 @@ -2022,7 +1867,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 633193832} + m_SkySettings: {fileID: 1611372839} m_SkySettingsFromProfile: {fileID: -3409118194237871670, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} --- !u!114 &1937584651 @@ -2056,83 +1901,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2022895805 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2022895806} - - component: {fileID: 2022895808} - - component: {fileID: 2022895807} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2022895806 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022895805} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 775993668} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2022895807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022895805} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Grow ---- !u!222 &2022895808 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022895805} - m_CullTransparentMesh: 0 --- !u!1 &2032731583 GameObject: m_ObjectHideFlags: 0 @@ -2219,7 +1987,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2032731583} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.39, y: 0, z: -5.12} + m_LocalPosition: {x: -3.32, y: 0, z: -5.12} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_Children: [] m_Father: {fileID: 0} diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset index 988954d..ee62d9a 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset @@ -350,7 +350,7 @@ MonoBehaviour: m_AdvancedMode: 0 intensity: m_OverrideState: 1 - m_Value: 0.421 + m_Value: 0.281 min: 0 max: 1 scatter: diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs index 5bca678..0b13202 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Experimental.VFX; using UnityEngine.UI; +using UltraCombos.Configuration; public class DebugUI : MonoBehaviour { @@ -13,9 +14,20 @@ public class DebugUI : MonoBehaviour public GameObject target; public GameObject emitter; public GameObject button; - public float growingSpeed; public string stat = "wait"; + [Config] + [Range(0f, 0.02f)] + public float growingSpeed; + + [Config] + [Range(10, 30)] + public float fadeSpeed; + + [Config] + [Range(0f, 0.5f)] + public float smooth; + float spawn_t; float total_t; float lerp_val; @@ -35,6 +47,7 @@ public class DebugUI : MonoBehaviour // Update is called once per frame void Update() { + updateVFX(); if (Input.GetKeyDown(KeyCode.A)) { debugMode = !debugMode; @@ -62,7 +75,7 @@ public class DebugUI : MonoBehaviour { lerp_val = 1; stat = "completed"; - vfx.SendEvent("Completed"); + StartCoroutine("sendCompleted"); setButtonInteractable(true); button.GetComponent().text = stat; Debug.Log(stat); @@ -85,30 +98,15 @@ public class DebugUI : MonoBehaviour lerp_val = Mathf.Clamp(lerp_val, 0, 1); vfx.SetFloat("_LerpVal", lerp_val); - Vector3 base_pos = baseEmitter.GetComponent().position; Vector3 target_pos = target.GetComponent().position; - emitter.GetComponent().position = Vector3.Lerp(base_pos, target_pos, lerp_val); - /* - if (debugMode && Input.GetMouseButtonDown(0)) - { - ray = Camera.main.ScreenPointToRay(Input.mousePosition); - - GameObject selected_obj = null; - - if (Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out hit, 200.0f)) - { - selected_obj = hit.collider.gameObject; - Debug.Log("hit!!" + selected_obj.name); - } + } - if(selected_obj != null) - { - selected_obj.GetComponent().material.color = new Color(255, 100, 100); - } - } - */ + IEnumerator sendCompleted() + { + yield return new WaitForSeconds(0.5f); + vfx.SendEvent("Completed"); } public void switchStat() @@ -131,7 +129,7 @@ public class DebugUI : MonoBehaviour spawn_t = total_t; stat = "growing"; vfx.SendEvent("MouseDown"); - vfx.SetBool("growing", true); + vfx.SetBool("isGrowing", true); Debug.Log(stat); } @@ -141,7 +139,7 @@ public class DebugUI : MonoBehaviour vfx.SetBool("isEnteringVanish", true); stat = "vanishing"; vfx.SendEvent("MouseUp"); - vfx.SetBool("growing", false); + vfx.SetBool("isGrowing", false); Debug.Log(stat); } @@ -154,9 +152,12 @@ public class DebugUI : MonoBehaviour private void setButtonInteractable(bool _stat) { - //GameObject g = GameObject.Find("Grow"); - //GameObject v = GameObject.Find("Vanish"); - //g.GetComponent