diff --git a/Unity-19050-01_ForstCoronation/Assets/Emitter_Timeline.playable b/Unity-19050-01_ForstCoronation/Assets/Emitter_Timeline.playable new file mode 100644 index 0000000..c59abf2 --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Emitter_Timeline.playable @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: Emitter_Timeline + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: [] + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} diff --git a/Unity-19050-01_ForstCoronation/Assets/Emitter_Timeline.playable.meta b/Unity-19050-01_ForstCoronation/Assets/Emitter_Timeline.playable.meta new file mode 100644 index 0000000..935bf7c --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Emitter_Timeline.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff2f5916db5e470499b6e548d673a69a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-01_ForstCoronation/Assets/Materials.meta b/Unity-19050-01_ForstCoronation/Assets/Materials.meta new file mode 100644 index 0000000..4d9d827 --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75cd54dab51574e4e87a30e02cf5b2a1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity index 209cbfd..d0be22a 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity +++ b/Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.031310216, g: 0.040029608, b: 0.051402517, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -120,6 +120,183 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &150875471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 150875473} + - component: {fileID: 150875472} + m_Layer: 0 + m_Name: Timeline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!320 &150875472 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150875471} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: ff2f5916db5e470499b6e548d673a69a, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: [] + m_ExposedReferences: + m_References: [] +--- !u!4 &150875473 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150875471} + 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: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &159340525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 159340526} + - component: {fileID: 159340529} + - component: {fileID: 159340528} + - component: {fileID: 159340527} + m_Layer: 5 + m_Name: Vanish + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &159340526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159340525} + 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: 1859907172} + 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: -520} + m_SizeDelta: {x: 160, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &159340527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159340525} + 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: 159340528} + 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 +--- !u!114 &159340528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159340525} + 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 &159340529 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159340525} + m_CullTransparentMesh: 0 --- !u!1 &229411701 GameObject: m_ObjectHideFlags: 0 @@ -589,6 +766,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &769007110 +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 &775993667 GameObject: m_ObjectHideFlags: 0 @@ -602,7 +855,7 @@ GameObject: - component: {fileID: 775993670} - component: {fileID: 775993669} m_Layer: 5 - m_Name: Button + m_Name: Grow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -625,8 +878,8 @@ RectTransform: 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: 900, y: -500} - m_SizeDelta: {x: 160, y: 160} + m_AnchoredPosition: {x: 850, y: -420} + m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &775993669 MonoBehaviour: @@ -718,82 +971,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 775993667} m_CullTransparentMesh: 0 ---- !u!114 &1025858997 -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 &1111578216 GameObject: m_ObjectHideFlags: 0 @@ -849,9 +1026,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_ExecuteInEditor: 1 m_Bindings: - - {fileID: 1111578227} - - {fileID: 1111578222} - {fileID: 1111578217} + - {fileID: 1111578222} + - {fileID: 1111578227} m_VisualEffect: {fileID: 1111578220} --- !u!73398921 &1111578219 VFXRenderer: @@ -981,7 +1158,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 1111578220} - EventName: MouseUp + EventName: _MouseUp activation: 0 RaycastMousePosition: 0 --- !u!114 &1111578224 @@ -997,7 +1174,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 1111578220} - EventName: MouseDown + EventName: _MouseDown activation: 1 RaycastMousePosition: 0 --- !u!64 &1111578225 @@ -1054,6 +1231,8 @@ GameObject: - component: {fileID: 1324214448} - component: {fileID: 1324214446} - component: {fileID: 1324214447} + - component: {fileID: 1324214452} + - component: {fileID: 1324214451} m_Layer: 0 m_Name: Emitter m_TagString: Untagged @@ -1089,7 +1268,7 @@ MeshCollider: m_GameObject: {fileID: 1324214445} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Convex: 0 m_CookingOptions: 14 @@ -1154,6 +1333,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1324214451 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324214445} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!320 &1324214452 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324214445} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 0157cfd701771d34ebb3a5e92661d2c6, type: 2} + m_InitialState: 1 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: -3644013695599410999, guid: 0157cfd701771d34ebb3a5e92661d2c6, type: 2} + value: {fileID: 1324214451} + m_ExposedReferences: + m_References: [] --- !u!1001 &1326070362 PrefabInstance: m_ObjectHideFlags: 0 @@ -1356,6 +1573,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 775993668} + - {fileID: 159340526} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1409,6 +1627,83 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1859907171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1859907172} + - component: {fileID: 1859907174} + - component: {fileID: 1859907173} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1859907172 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1859907171} + 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: 159340526} + 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 &1859907173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1859907171} + 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: Vanish +--- !u!222 &1859907174 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1859907171} + m_CullTransparentMesh: 0 --- !u!1 &1937584649 GameObject: m_ObjectHideFlags: 0 @@ -1441,7 +1736,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} m_StaticLightingSkyUniqueID: 2 - m_SkySettings: {fileID: 1025858997} + m_SkySettings: {fileID: 769007110} m_SkySettingsFromProfile: {fileID: -3409118194237871670, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} --- !u!114 &1937584651 @@ -1543,7 +1838,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Button + m_Text: Grow --- !u!222 &2022895808 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs new file mode 100644 index 0000000..144d843 --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DebugUI : MonoBehaviour +{ + public bool debugMode = true; + public GameObject debugUI; + + Ray ray; + public RaycastHit hit = new RaycastHit(); + + // Start is called before the first frame update + void Start() + { + debugUI.SetActive(debugMode); + } + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.A)) + { + debugMode = !debugMode; + debugUI.SetActive(debugMode); + } + 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); + } + } + } +} diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs.meta b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs.meta new file mode 100644 index 0000000..b5120e0 --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3d9a54ec27de1e74484ba710356b1a50 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-01_ForstCoronation/Assets/Scripts/EmitterController.cs b/Unity-19050-01_ForstCoronation/Assets/Scripts/EmitterController.cs index 1102ea2..0fb180f 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Scripts/EmitterController.cs +++ b/Unity-19050-01_ForstCoronation/Assets/Scripts/EmitterController.cs @@ -74,7 +74,7 @@ public class EmitterController : MonoBehaviour private void OnMouseUp() { - vfx.SendEvent("MouseUp"); + //vfx.SendEvent("MouseUp"); vfx.SetBool("_mouseDown", false); } diff --git a/Unity-19050-01_ForstCoronation/Assets/Timelines.meta b/Unity-19050-01_ForstCoronation/Assets/Timelines.meta new file mode 100644 index 0000000..494b4b7 --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Timelines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1ad06bfd0dc4f4478a478f0e8406ce6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-01_ForstCoronation/Assets/Timelines/EmitterTimeline.playable b/Unity-19050-01_ForstCoronation/Assets/Timelines/EmitterTimeline.playable new file mode 100644 index 0000000..b141046 --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Timelines/EmitterTimeline.playable @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3644013695599410999 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 0 + m_InfiniteClipPostExtrapolation: 0 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 0} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!114 &11400000 +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: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: EmitterTimeline + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: -3644013695599410999} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 6155688970678202017} +--- !u!114 &6155688970678202017 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 2a16748d9461eae46a725db9776d5390, type: 3} + m_Name: Markers + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] diff --git a/Unity-19050-01_ForstCoronation/Assets/Timelines/EmitterTimeline.playable.meta b/Unity-19050-01_ForstCoronation/Assets/Timelines/EmitterTimeline.playable.meta new file mode 100644 index 0000000..7862e9a --- /dev/null +++ b/Unity-19050-01_ForstCoronation/Assets/Timelines/EmitterTimeline.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0157cfd701771d34ebb3a5e92661d2c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/frozenVFX.vfx b/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/frozenVFX.vfx index 961672e..74affb8 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/frozenVFX.vfx +++ b/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/frozenVFX.vfx @@ -117,7 +117,7 @@ MonoBehaviour: x: -548 y: -480 width: 2869 - height: 2865 + height: 2867 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1