diff --git a/Assets/Art/PhysicsMaterials.meta b/Assets/Art/PhysicsMaterials.meta new file mode 100644 index 0000000..d08ebb5 --- /dev/null +++ b/Assets/Art/PhysicsMaterials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b1283a693d657e4c9163198fe0ef778 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/PhysicsMaterials/Slippery.physicMaterial b/Assets/Art/PhysicsMaterials/Slippery.physicMaterial new file mode 100644 index 0000000..f369fe6 --- /dev/null +++ b/Assets/Art/PhysicsMaterials/Slippery.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slippery + dynamicFriction: 0.1 + staticFriction: 0.1 + bounciness: 0 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/Art/PhysicsMaterials/Slippery.physicMaterial.meta b/Assets/Art/PhysicsMaterials/Slippery.physicMaterial.meta new file mode 100644 index 0000000..dea3d6c --- /dev/null +++ b/Assets/Art/PhysicsMaterials/Slippery.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e921a276490461f68b7636e722e348ad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI.meta b/Assets/Prefabs/UI.meta new file mode 100644 index 0000000..fff884f --- /dev/null +++ b/Assets/Prefabs/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 122c52b407c4e9feaab056dae095da8a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/OffOnButton.prefab b/Assets/Prefabs/UI/OffOnButton.prefab new file mode 100644 index 0000000..d49a0ac --- /dev/null +++ b/Assets/Prefabs/UI/OffOnButton.prefab @@ -0,0 +1,261 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2889684530159900560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2889684530159900559} + - component: {fileID: 2889684530159900557} + - component: {fileID: 2889684530159900558} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2889684530159900559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684530159900560} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2889684530202346687} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2889684530159900557 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684530159900560} + m_CullTransparentMesh: 1 +--- !u!114 &2889684530159900558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684530159900560} + 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: 0.6132076, g: 0.6132076, b: 0.6132076, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!1 &2889684530202346560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2889684530202346687} + m_Layer: 5 + m_Name: OffOnButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2889684530202346687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684530202346560} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2889684530159900559} + - {fileID: 2889684531668071709} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2889684531668071710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2889684531668071709} + - component: {fileID: 2889684531668071708} + - component: {fileID: 2889684531668071706} + - component: {fileID: 2889684531668071707} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2889684531668071709 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684531668071710} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2889684530202346687} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2889684531668071708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684531668071710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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.78431374, g: 0.78431374, b: 0.78431374, 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 2889684531668071710} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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!222 &2889684531668071706 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684531668071710} + m_CullTransparentMesh: 1 +--- !u!114 &2889684531668071707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2889684531668071710} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/UI/OffOnButton.prefab.meta b/Assets/Prefabs/UI/OffOnButton.prefab.meta new file mode 100644 index 0000000..6baa955 --- /dev/null +++ b/Assets/Prefabs/UI/OffOnButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1a71d711ccdae9b24b1c742fe524a251 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Setting.prefab b/Assets/Prefabs/UI/Setting.prefab new file mode 100644 index 0000000..9bda7ca --- /dev/null +++ b/Assets/Prefabs/UI/Setting.prefab @@ -0,0 +1,373 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2484427322418460425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5499987208310914279} + - component: {fileID: 4409060989583898508} + - component: {fileID: 5667576968382475598} + m_Layer: 5 + m_Name: InputBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5499987208310914279 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484427322418460425} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8792794548872375712} + m_Father: {fileID: 8792794549598290751} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4409060989583898508 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484427322418460425} + m_CullTransparentMesh: 1 +--- !u!114 &5667576968382475598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484427322418460425} + 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: 0.53333336} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, 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!1 &8792794547780811514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8792794547780811517} + - component: {fileID: 1747432082488274545} + - component: {fileID: 7141983824768689474} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8792794547780811517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794547780811514} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8792794549598290751} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1747432082488274545 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794547780811514} + m_CullTransparentMesh: 1 +--- !u!114 &7141983824768689474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794547780811514} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 90 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0 + m_Text: sss +--- !u!1 &8792794548872375713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8792794548872375712} + - component: {fileID: 8792794548872375714} + - component: {fileID: 8792794548872375715} + - component: {fileID: 2100011291384272807} + m_Layer: 5 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8792794548872375712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794548872375713} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5499987208310914279} + 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: 0, y: 0} + m_SizeDelta: {x: 157, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8792794548872375714 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794548872375713} + m_CullTransparentMesh: 1 +--- !u!114 &8792794548872375715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794548872375713} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 90 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &2100011291384272807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794548872375713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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.78431374, g: 0.78431374, b: 0.78431374, 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: 8792794548872375715} + m_TextComponent: {fileID: 8792794548872375715} + m_Placeholder: {fileID: 0} + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_CharacterValidation: 0 + m_CharacterLimit: 0 + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: Value + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 +--- !u!1 &8792794549598290748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8792794549598290751} + - component: {fileID: 8792794549598290750} + m_Layer: 5 + m_Name: Setting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8792794549598290751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794549598290748} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8792794547780811517} + - {fileID: 5499987208310914279} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8792794549598290750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8792794549598290748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 diff --git a/Assets/Prefabs/UI/Setting.prefab.meta b/Assets/Prefabs/UI/Setting.prefab.meta new file mode 100644 index 0000000..39e55cb --- /dev/null +++ b/Assets/Prefabs/UI/Setting.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b51546afd6372d4a1bfbf253091b93ce +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 413d55d..7de2d2a 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -134,7 +134,9 @@ GameObject: - component: {fileID: 64111947} - component: {fileID: 64111950} - component: {fileID: 64111949} - m_Layer: 0 + - component: {fileID: 64111952} + - component: {fileID: 64111951} + m_Layer: 1 m_Name: PlayerMesh m_TagString: Untagged m_Icon: {fileID: 0} @@ -148,13 +150,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 64111946} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1598801574} - m_RootOrder: 0 + m_Father: {fileID: 2081021611} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &64111949 MeshRenderer: @@ -206,6 +208,40 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 64111946} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &64111951 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64111946} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!135 &64111952 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64111946} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &71293190 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4939475549778071213, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + m_PrefabInstance: {fileID: 1570161760} + m_PrefabAsset: {fileID: 0} --- !u!1 &140493639 GameObject: m_ObjectHideFlags: 0 @@ -254,12 +290,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -718,7 +754,7 @@ MeshCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403408899} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: e921a276490461f68b7636e722e348ad, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 @@ -879,7 +915,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 53 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -959,7 +995,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: @@ -1012,6 +1048,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 403408903} + - {fileID: 1570161761} - {fileID: 1812643758} - {fileID: 1034047663} - {fileID: 1300595677} @@ -1165,11 +1202,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 957688348} - - component: {fileID: 957688350} - - component: {fileID: 957688352} - - component: {fileID: 957688351} m_Layer: 5 - m_Name: Mask + m_Name: Minimap m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1188,7 +1222,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 708970786} - - {fileID: 1126765733} + - {fileID: 1232638192} m_Father: {fileID: 140493643} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1197,57 +1231,6 @@ RectTransform: m_AnchoredPosition: {x: -250, y: -250} m_SizeDelta: {x: 450, y: 450} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &957688350 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 957688347} - m_CullTransparentMesh: 1 ---- !u!114 &957688351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 957688347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &957688352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 957688347} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: caa9cf96bc69712eab2d6cec2dcb9d23, type: 3} - m_Type: 0 - 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!1001 &1034047662 PrefabInstance: m_ObjectHideFlags: 0 @@ -1257,7 +1240,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} propertyPath: m_LocalScale.x @@ -1406,6 +1389,60 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} m_PrefabInstance: {fileID: 1034047662} m_PrefabAsset: {fileID: 0} +--- !u!1 &1034047664 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -38671577561963956, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} + m_PrefabInstance: {fileID: 1034047662} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1034047665 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 704173061141481013, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} + m_PrefabInstance: {fileID: 1034047662} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1034047666 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5993065337975905401, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} + m_PrefabInstance: {fileID: 1034047662} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1034047667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034047664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de2b51221f21dcd68904622ab8c728c5, type: 3} + m_Name: + m_EditorClassIdentifier: + _angleOffset: -147 +--- !u!114 &1034047668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034047665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de2b51221f21dcd68904622ab8c728c5, type: 3} + m_Name: + m_EditorClassIdentifier: + _angleOffset: 71 +--- !u!114 &1034047669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034047666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de2b51221f21dcd68904622ab8c728c5, type: 3} + m_Name: + m_EditorClassIdentifier: + _angleOffset: -50 --- !u!1 &1041277472 GameObject: m_ObjectHideFlags: 0 @@ -1533,8 +1570,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 957688348} - m_RootOrder: 1 + m_Father: {fileID: 1232638192} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1555,7 +1592,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1576,6 +1613,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1126765732} m_CullTransparentMesh: 1 +--- !u!1 &1224549599 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: dde32c5bd5c1be19f809647423b28b5f, type: 3} + m_PrefabInstance: {fileID: 1034047662} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1224549600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224549599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5caa58e4c97a2b52a5faf6ef40096ad, type: 3} + m_Name: + m_EditorClassIdentifier: + _hourHand: {fileID: 1034047669} + _minuteHand: {fileID: 1034047668} + _secondHand: {fileID: 1034047667} + _clockControllMode: 0 + _hour: 0 + _minute: 0 + _second: 0 + _milisecond: 0 + _clockAcceleration: 1 +--- !u!65 &1224549601 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224549599} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.05, y: 0.23, z: 0.23} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1232638191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1232638192} + - component: {fileID: 1232638195} + - component: {fileID: 1232638194} + - component: {fileID: 1232638193} + m_Layer: 5 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1232638192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232638191} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1126765733} + m_Father: {fileID: 957688348} + m_RootOrder: 1 + 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 &1232638193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232638191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1232638194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232638191} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: caa9cf96bc69712eab2d6cec2dcb9d23, type: 3} + m_Type: 0 + 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 &1232638195 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232638191} + m_CullTransparentMesh: 1 --- !u!1 &1300595676 GameObject: m_ObjectHideFlags: 0 @@ -1609,13 +1776,148 @@ Transform: - {fileID: 1041277473} - {fileID: 2024647622} m_Father: {fileID: 752580634} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1387873680 stripped Transform: m_CorrespondingSourceObject: {fileID: 617644567145130725, guid: f81f791408137217fbb145de45b153b8, type: 3} m_PrefabInstance: {fileID: 617644567924830069} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1570161760 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 752580634} + m_Modifications: + - target: {fileID: 4939475549778071211, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: _isOnByDefault + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071211, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: _maxRayDistance + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071211, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: _controlledByMouse + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071211, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: _maxReflectionCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalPosition.x + value: 5.16 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalPosition.y + value: 2.78 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalPosition.z + value: -14.37 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7209746 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalRotation.y + value: 0.6929615 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 87.73 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475549778071213, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_Name + value: ReflectingLaserGun (1) + objectReference: {fileID: 0} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: fab7ba49bb6951716a0b8ee58c26f74d, type: 2} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_Parameters.colorGradient.key0.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_Parameters.colorGradient.key0.g + value: 0.009995077 + objectReference: {fileID: 0} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_Parameters.colorGradient.key0.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4939475550726660905, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].value + value: 0.18124962 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} +--- !u!4 &1570161761 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4939475549778071212, guid: 5fc2dc9f043daeac0a2c789b785ded93, type: 3} + m_PrefabInstance: {fileID: 1570161760} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1570161763 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71293190} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &1570161764 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71293190} + m_Material: {fileID: 13400000, guid: e921a276490461f68b7636e722e348ad, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1598801573 GameObject: m_ObjectHideFlags: 0 @@ -1646,7 +1948,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 64111947} - {fileID: 1946936042} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1664,7 +1965,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _camera: {fileID: 668718510} - _rotatingObj: {fileID: 2081021611} _mouseSensitivity: 1 _movementSpeed: 10 --- !u!54 &1598801576 @@ -1675,13 +1975,13 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1598801573} serializedVersion: 2 - m_Mass: 0.0000001 + m_Mass: 1 m_Drag: 0 - m_AngularDrag: 0 + m_AngularDrag: 0.05 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 0 + m_Constraints: 126 m_CollisionDetection: 0 --- !u!1 &1805344329 GameObject: @@ -1785,7 +2085,7 @@ Transform: - {fileID: 1873512376} - {fileID: 758476693} m_Father: {fileID: 752580634} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1873512375 PrefabInstance: @@ -1880,7 +2180,7 @@ Transform: - {fileID: 668718511} - {fileID: 806874515} m_Father: {fileID: 1598801574} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1957692605 GameObject: @@ -1911,7 +2211,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.8485325, b: 0.43867922, a: 1} - m_Intensity: 0.2 + m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -1974,7 +2274,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 752580634} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &2024647621 GameObject: @@ -2102,6 +2402,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 570601469} + - {fileID: 64111947} m_Father: {fileID: 668718511} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/ClockController.cs b/Assets/Scripts/ClockController.cs deleted file mode 100644 index 6ae72b4..0000000 --- a/Assets/Scripts/ClockController.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ClockController : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/ClockTask.meta b/Assets/Scripts/ClockTask.meta new file mode 100644 index 0000000..e9ec0ac --- /dev/null +++ b/Assets/Scripts/ClockTask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3317262dcfedef9bf904b9a012ad0df8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ClockTask/ClockControlMode.cs b/Assets/Scripts/ClockTask/ClockControlMode.cs new file mode 100644 index 0000000..6d06abd --- /dev/null +++ b/Assets/Scripts/ClockTask/ClockControlMode.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// The different types in which the clock can operate. +/// +public enum ClockControlMode +{ + /// + /// The clock will show the current time. + /// + CurrentTime, + + /// + /// The clock will show a custom time. + /// + CustomTime, + + /// + /// The clock will show move from the currently shown time, according to the acceleration. Can result in moving backwards. + /// + Acceleration, +} diff --git a/Assets/Scripts/ClockTask/ClockControlMode.cs.meta b/Assets/Scripts/ClockTask/ClockControlMode.cs.meta new file mode 100644 index 0000000..440fbc4 --- /dev/null +++ b/Assets/Scripts/ClockTask/ClockControlMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2e548b92891d2b249998d63b89b6588 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ClockTask/ClockController.cs b/Assets/Scripts/ClockTask/ClockController.cs new file mode 100644 index 0000000..6151523 --- /dev/null +++ b/Assets/Scripts/ClockTask/ClockController.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEngine; + +public class ClockController : MonoBehaviour +{ + + [SerializeField] + ClockHandController _hourHand; + [SerializeField] + ClockHandController _minuteHand; + [SerializeField] + ClockHandController _secondHand; + + [Space] + [SerializeField] + ClockControlMode _clockControllMode = ClockControlMode.CurrentTime; + + [Space] + [InspectorLabel("Clock Time")] + [SerializeField, Range(0, 11)] + private int _hour; + [SerializeField, Range(0, 59)] + private int _minute; + [SerializeField, Range(0, 59)] + private int _second; + [SerializeField, Range(0, 999)] + private int _milisecond; + + private DateTime _shownTime; + + + [SerializeField] + private float _clockAcceleration = 1f; + + + // Update is called once per frame + void Update() + { + GetNextTime(); + SetTime(_shownTime); + } + + // Set _shownTime to a new value, according to the current clock control mode + private void GetNextTime() + { + switch (_clockControllMode) + { + case ClockControlMode.CurrentTime: + _shownTime = DateTime.Now; + UpdateTimeValues(); + break; + case ClockControlMode.CustomTime: + _shownTime = new DateTime(_shownTime.Year, _shownTime.Month, _shownTime.Day, _hour, _minute, _second, _milisecond); + break; + case ClockControlMode.Acceleration: + _shownTime += new TimeSpan(0,0,0,0, (int)(Time.deltaTime * 1000 * _clockAcceleration)); + UpdateTimeValues(); + break; + } + } + + + /// + /// Update the time values of the inspector variables during non-custom control modes, for a cool effect of changing values in the inspector + /// + private void UpdateTimeValues() + { + _hour = _shownTime.Hour; + _minute = _shownTime.Minute; + _second = _shownTime.Second; + _milisecond = _shownTime.Millisecond; + } + + + /// + /// Set the clock hands to a given time + /// + private void SetTime(DateTime time) + { + float hourAngle = time.Hour * 30f + time.Minute * 0.5f; + float minuteAngle = time.Minute * 6f + time.Second * 0.1f; + float secondAngle = time.Second * 6f + time.Millisecond * 0.006f; + + _hourHand.SetAngle(hourAngle); + _minuteHand.SetAngle(minuteAngle); + _secondHand.SetAngle(secondAngle); + } + + +} diff --git a/Assets/Scripts/ClockController.cs.meta b/Assets/Scripts/ClockTask/ClockController.cs.meta similarity index 100% rename from Assets/Scripts/ClockController.cs.meta rename to Assets/Scripts/ClockTask/ClockController.cs.meta diff --git a/Assets/Scripts/ClockTask/ClockHandController.cs b/Assets/Scripts/ClockTask/ClockHandController.cs new file mode 100644 index 0000000..7939b74 --- /dev/null +++ b/Assets/Scripts/ClockTask/ClockHandController.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ClockHandController : MonoBehaviour +{ + + // offset the angle of the hand, to make the starting position be at the top of the clock + [SerializeField] + private float _angleOffset; + + /// + /// The angle of the hand, in degrees, starting from the top of the clock, going clockwise. + /// + public void SetAngle(float angle) + { + float angleToSet = _angleOffset; // this takes into account the base offset of the hand + angleToSet -= angle; // and this makes it go clockwise + + transform.localRotation = Quaternion.Euler(angleToSet, 0, 0); + } +} diff --git a/Assets/Scripts/ClockTask/ClockHandController.cs.meta b/Assets/Scripts/ClockTask/ClockHandController.cs.meta new file mode 100644 index 0000000..0721e38 --- /dev/null +++ b/Assets/Scripts/ClockTask/ClockHandController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de2b51221f21dcd68904622ab8c728c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LaserTask.meta b/Assets/Scripts/LaserTask.meta new file mode 100644 index 0000000..521114b --- /dev/null +++ b/Assets/Scripts/LaserTask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d905aa6a0b4751d14ba62b08a0559d22 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LaserTask/ReflectingLaserController.cs b/Assets/Scripts/LaserTask/ReflectingLaserController.cs new file mode 100644 index 0000000..410bfc1 --- /dev/null +++ b/Assets/Scripts/LaserTask/ReflectingLaserController.cs @@ -0,0 +1,169 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Animations; + +public class ReflectingLaserController : MonoBehaviour +{ + [SerializeField] + private LineRenderer _lineRenderer; + + /// + /// The max amount of reflections the laser can make, before disappearing. + /// + [Space] + [SerializeField] + private int _maxReflectionCount = 10; + + /// + /// The max distance the laser can travel, before disappearing. + /// + [SerializeField] + private float _maxRayDistance = 20f; + + + /// + /// Indicates, if the laser should be on by default + /// + [SerializeField] + private bool _isOnByDefault = false; + + + /// + /// Indicates, if the laser should respond to mouse input. + /// + [SerializeField] + private bool _controlledByMouse = true; + + /// + /// Indicates if the laser has moved since last frame. + /// + private bool _hasMoved = true; + + #region last position and rotation of the laser gun + private Vector3 _lastPosition = Vector3.zero; + private Quaternion _lastRotation = Quaternion.identity; + + #endregion + + private bool IsLaserEnabled + { + get { return _lineRenderer.enabled; } + set { _lineRenderer.enabled = value; } + } + + + // Update is called once per frame + void Update() + { + HandleLaserStatus(); + + CheckIfLaserHasMoved(); + + if (IsLaserEnabled && _hasMoved) + { + FireLaser(); + } + + } + + /// + /// Check if the laser gun has moved since last update, to avoid unnecesary calculations. + /// + private void CheckIfLaserHasMoved() + { + if (_lastPosition != transform.position || _lastRotation != transform.rotation) + { + _hasMoved = true; + _lastPosition = transform.position; + _lastRotation = transform.rotation; + } + } + + /// + /// Fire a beam from the line renderer, and calculate its reflections. + /// + private void FireLaser() + { + if (_hasMoved) + { + int positionCount = _maxReflectionCount + 2; // +2 for the start and end point + float distanceLeft = _maxRayDistance; + _lineRenderer.positionCount = positionCount; + + _lineRenderer.SetPosition(0, _lineRenderer.transform.position); + Vector3 rayDirection = _lineRenderer.transform.forward; + + + for (int i = 1; i < positionCount; i++) + { + Vector3 startPos = _lineRenderer.GetPosition(i - 1); + bool obstacleHit = Physics.Raycast(startPos, rayDirection, out RaycastHit hit, distanceLeft); + if (i + 1 < positionCount) // no need to calculate the next reflection, if the ray has run out of them + { + + if (obstacleHit) + { + distanceLeft -= hit.distance; + rayDirection = Vector3.Reflect(rayDirection, hit.normal); + _lineRenderer.SetPosition(i, hit.point); + } + else + { + _lineRenderer.SetPosition(i, startPos + rayDirection * distanceLeft); + + _lineRenderer.positionCount = i + 1; + distanceLeft = 0; + break; + } + } + } + _hasMoved = false; + } + } + + + /// + /// Controlls the firing state of the laser. + /// + private void HandleLaserStatus() + { + + if (_controlledByMouse) + { + // If _isOnByDefault is false, fire the laser only on pressed mouse button. + // If _isOnByDefault is true, fire the laser only on released mouse button. + bool targetValueOnPressed = true; // the value to which the laser is set to, when the button is pressed down. Swapped when _isOnByDefault is true. + if (_isOnByDefault) + { + targetValueOnPressed = false; + } + if (Input.GetMouseButton(0)) + { + ToggleLaser(targetValueOnPressed); + } + else + { + ToggleLaser(!targetValueOnPressed); + } + } + else + { + ToggleLaser(_isOnByDefault); + } + + } + + /// + /// Turn the laser on or off. This name is not the best description, but it feels more natural. + /// + private void ToggleLaser(bool targetState) + { + if (IsLaserEnabled != targetState) + { + IsLaserEnabled = targetState; + } + } + + +} diff --git a/Assets/Scripts/ReflectingLaserController.cs.meta b/Assets/Scripts/LaserTask/ReflectingLaserController.cs.meta similarity index 100% rename from Assets/Scripts/ReflectingLaserController.cs.meta rename to Assets/Scripts/LaserTask/ReflectingLaserController.cs.meta diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index c9c0f9e..b12ac6d 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -5,10 +5,8 @@ public class PlayerController : MonoBehaviour { - [SerializeField] + [SerializeField, Tooltip("Main camera, used for rotation")] private Camera _camera; - [SerializeField] - private Transform _rotatingObj; [SerializeField, Range(0, 1f)] private float _mouseSensitivity = 0.3f; @@ -18,29 +16,37 @@ public class PlayerController : MonoBehaviour private Vector2 _lastCursorPos = -Vector2.one; - Vector2 _cameraRotation = Vector2.zero; + private Vector2 _currCameraRotation = Vector2.zero; // Update is called once per frame void Update() { - HandleMouseInput(); HandleMovement(); + + // On ESC, quit the application. TODO: Move into a separate script. if (Input.GetKeyDown(KeyCode.Escape)) { #if UNITY_EDITOR EditorApplication.isPlaying = false; #endif + Application.Quit(); } } + + /// + /// Move the camera when moving the mouse. + /// + /// + /// Currently not great, but cursor locking seems to be broken on linux, so I'm leaving it like this for now. + /// private void HandleMouseInput() { if (_lastCursorPos == -Vector2.one) { _lastCursorPos = Input.mousePosition; - } Vector2 currCursorPos = Input.mousePosition; if (_lastCursorPos != currCursorPos) @@ -48,12 +54,12 @@ private void HandleMouseInput() Vector2 delta = Input.GetAxis("Mouse X") * Vector2.right + Input.GetAxis("Mouse Y") * Vector2.up; delta *= Time.deltaTime * _mouseSensitivity; delta *= 360f; - _cameraRotation += delta; + _currCameraRotation += delta; - _cameraRotation.y = Mathf.Clamp(_cameraRotation.y, -90f, 90f); + _currCameraRotation.y = Mathf.Clamp(_currCameraRotation.y, -90f, 90f); // Rotate the camera and the player on both x and y axis separately, allowing for simple 2D movement implementation - _camera.transform.eulerAngles = new Vector3(-_cameraRotation.y, _cameraRotation.x, 0); + _camera.transform.eulerAngles = new Vector3(-_currCameraRotation.y, _currCameraRotation.x, 0); _lastCursorPos = currCursorPos; @@ -66,22 +72,22 @@ private void HandleMovement() Vector3 movement = Vector3.zero; if (Input.GetKey(KeyCode.W)) { - movement += (_rotatingObj.forward); + movement += _camera.transform.forward; } if (Input.GetKey(KeyCode.S)) { - movement += (-_rotatingObj.forward); + movement += -_camera.transform.forward; } if (Input.GetKey(KeyCode.A)) { - movement += (-_rotatingObj.right); + movement += -_camera.transform.right; } if (Input.GetKey(KeyCode.D)) { - movement += (_rotatingObj.right); + movement += _camera.transform.right; } movement.y = 0; - movement = movement.normalized * _movementSpeed * Time.deltaTime; + movement = movement.normalized * (_movementSpeed * Time.deltaTime); transform.Translate(movement); } diff --git a/Assets/Scripts/ReflectingLaserController.cs b/Assets/Scripts/ReflectingLaserController.cs deleted file mode 100644 index a532d6a..0000000 --- a/Assets/Scripts/ReflectingLaserController.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Animations; - -public class ReflectingLaserController : MonoBehaviour -{ - [SerializeField] - private LineRenderer _lineRenderer; - - [SerializeField] - private int _maxReflectionCount = 10; - [SerializeField] - private float _maxRayDistance = 20f; - - private bool _hasMoved = true; - - private Vector3 _lastPosition = Vector3.zero; - private Quaternion _lastRotation = Quaternion.identity; - - // Update is called once per frame - void Update() - { - if (_lastPosition != transform.position || _lastRotation != transform.rotation) - { - _hasMoved = true; - _lastPosition = transform.position; - _lastRotation = transform.rotation; - } - - if (_hasMoved) - { - int positionCount = _maxReflectionCount + 2; - float distanceLeft = _maxRayDistance; - _lineRenderer.positionCount = positionCount; // Add 2 to count the beginning and end - - _lineRenderer.SetPosition(0, _lineRenderer.transform.position); - Vector3 rayDirection = _lineRenderer.transform.forward; - for (int i = 1; i < positionCount; i++) - { - Vector3 startPos = _lineRenderer.GetPosition(i - 1); - bool obstacleHit = Physics.Raycast(startPos, rayDirection, out RaycastHit hit, distanceLeft); - if (obstacleHit) - { - distanceLeft -= hit.distance; - rayDirection = Vector3.Reflect(rayDirection, hit.normal); - _lineRenderer.SetPosition(i, hit.point); - } - else - { - _lineRenderer.SetPosition(i, startPos + rayDirection * distanceLeft); - - _lineRenderer.positionCount = i + 1; - distanceLeft = 0; - break; - } - } - _hasMoved = false; - } - } -} diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 99e2650..c9969d5 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 12} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 75 + controlID: 47406 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -47,8 +47,8 @@ MonoBehaviour: serializedVersion: 2 x: 363 y: 82 - width: 1102 - height: 533 + width: 1101 + height: 597 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1102 - height: 512 - m_Scale: {x: 0.47407407, y: 0.47407407} - m_Translation: {x: 551, y: 256} + width: 1101 + height: 576 + m_Scale: {x: 0.53333336, y: 0.53333336} + m_Translation: {x: 550.5, y: 288} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1162.2656 + x: -1032.1875 y: -540 - width: 2324.5312 + width: 2064.375 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.47407407 - m_LastWindowPixelSize: {x: 1102, y: 533} + m_defaultScale: 0.53333336 + m_LastWindowPixelSize: {x: 1101, y: 597} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1467 + width: 1466 height: 934 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 76 + controlID: 47407 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1467 - height: 554 + width: 1466 + height: 618 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 51 + controlID: 47347 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,7 +185,7 @@ MonoBehaviour: x: 0 y: 0 width: 363 - height: 554 + height: 618 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -216,7 +216,7 @@ MonoBehaviour: x: 0 y: 82 width: 362 - height: 533 + height: 597 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8cf9ffff28faffff3efaffff38fbffffb4590000ea590000ee590000325a00004a5a00005e5a0000 + m_ExpandedIDs: b028feff2e37feff76bbfeff7ebbfeff86bbfeff8ebbfeff96bbfeffb616ffffdc16ffff1c17ffff441affff9e2cffff147effffe27efffffe7fffff6880ffffe888ffff0e89ffff4e8affff1a8bffff1c95ffff7895ffff84a8ffff84b7fffff4d4ffff8ef9ffff2afaffff40faffff3afbffffb4590000ea590000ee590000fe5900000c5a0000325a00004a5a00005e5a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -267,8 +267,8 @@ MonoBehaviour: serializedVersion: 2 x: 363 y: 0 - width: 1104 - height: 554 + width: 1103 + height: 618 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -300,7 +300,7 @@ MonoBehaviour: x: 363 y: 82 width: 1101 - height: 533 + height: 597 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -502,9 +502,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -1.3195343, y: 7.1894064, z: 0.95698786} + m_Target: {x: -1.3142467, y: 16.914062, z: -7.6208324} speed: 2 - m_Value: {x: -1.3195343, y: 7.1894064, z: 0.95698786} + m_Value: {x: -1.3142467, y: 16.914062, z: -7.6208324} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -551,13 +551,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.31448913, y: 0.3192809, z: -0.113235705, w: -0.886768} + m_Target: {x: 0.29412976, y: -0.040136576, z: 0.012364787, w: 0.9548671} speed: 2 - m_Value: {x: -0.31448546, y: 0.31927717, z: -0.11323438, w: -0.8867576} + m_Value: {x: 0.29412282, y: -0.04013563, z: 0.012364496, w: 0.9548446} m_Size: - m_Target: 6.4805326 + m_Target: 0.46835804 speed: 2 - m_Value: 6.4805326 + m_Value: 0.46835804 m_Ortho: m_Target: 0 speed: 2 @@ -583,6 +583,31 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 618 + width: 1466 + height: 316 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 47408 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -598,18 +623,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 554 - width: 1467 - height: 380 + y: 0 + width: 624 + height: 316 m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} - m_ActualView: {fileID: 10} + m_ActualView: {fileID: 11} m_Panes: - - {fileID: 10} - {fileID: 11} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &10 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -630,9 +654,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 636 - width: 1466 - height: 359 + y: 700 + width: 623 + height: 295 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -650,22 +674,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Art/Materials + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Art/Materials + - Assets m_LastFoldersGridSize: -1 m_LastProjectPath: /home/octia/AllData/Projects/RayCastAndClockTest/RaycastTest/RaycastTest m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 845b0000 - m_LastClickedID: 23428 - m_ExpandedIDs: 000000004c5b0000545b000000ca9a3bffffff7f + m_SelectedIDs: 525b0000 + m_LastClickedID: 23378 + m_ExpandedIDs: 00000000525b0000585b00005a5b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -681,7 +705,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -693,7 +717,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004c5b0000 + m_ExpandedIDs: 00000000525b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -749,7 +773,33 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &11 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 624 + y: 0 + width: 842 + height: 316 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -769,15 +819,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 624 + y: 700 + width: 840 + height: 295 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &12 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -792,18 +842,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1467 + x: 1466 y: 0 - width: 453 + width: 454 height: 934 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -823,9 +873,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1467 + x: 1466 y: 82 - width: 452 + width: 453 height: 913 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 53945e5..900c3d8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: height: 984 m_ShowMode: 4 m_Title: Hierarchy - m_RootView: {fileID: 6} + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 @@ -33,22 +33,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 - y: 30 + y: 0 width: 1920 - height: 934 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 31 + height: 984 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -58,23 +61,19 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1466 + x: 0 y: 0 - width: 454 - height: 934 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -84,23 +83,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 363 - height: 554 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 + y: 964 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -110,24 +104,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 6} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 - y: 554 - width: 1466 - height: 380 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} - m_Panes: - - {fileID: 12} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + y: 30 + width: 1920 + height: 934 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 20 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,25 +129,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 984 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 + width: 1466 + height: 934 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 21 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,19 +154,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 8} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: + width: 1466 + height: 554 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 22 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,18 +179,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 964 - width: 1920 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} + y: 0 + width: 363 + height: 554 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -208,22 +205,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 5} + m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 363 y: 0 - width: 1466 - height: 934 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 32 + width: 1103 + height: 554 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 14} + - {fileID: 12} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -233,22 +232,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 11} + m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 0 + y: 554 width: 1466 - height: 554 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 33 + height: 380 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,22 +260,21 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 363 + x: 1466 y: 0 - width: 1103 - height: 554 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + width: 454 + height: 934 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} - - {fileID: 16} - m_Selected: 1 + - {fileID: 17} + m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: @@ -285,179 +285,90 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 636 - width: 1465 - height: 359 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/octia/AllData/Projects/RayCastAndClockTest/RaycastTest/RaycastTest - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: d05b0000 - m_LastClickedID: 23504 - m_ExpandedIDs: 00000000c05b000000ca9a3bffffff7f - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000c05b0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1466 + x: 363 y: 82 - width: 453 - height: 913 + width: 1101 + height: 533 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &14 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 1 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1101 + height: 512 + m_Scale: {x: 0.47407407, y: 0.47407407} + m_Translation: {x: 550.5, y: 256} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1161.2109 + y: -540 + width: 2322.4219 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.47407407 + m_LastWindowPixelSize: {x: 1101, y: 533} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -490,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8887ffff4cf4ffff90f9ffff3afbffffd4590000505a0000045b0000 + m_ExpandedIDs: 3afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -506,7 +417,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -514,7 +425,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -739,9 +650,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -8.079505, y: -4.190448, z: 7.0996017} + m_Target: {x: -1.3142467, y: 16.914062, z: -7.6208324} speed: 2 - m_Value: {x: -8.079505, y: -4.190448, z: 7.0996017} + m_Value: {x: -1.3195343, y: 7.1894064, z: 0.95698786} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -788,13 +699,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.16615549, y: 0.47339246, z: -0.091439754, w: -0.86019546} + m_Target: {x: 0.29412976, y: -0.040136576, z: 0.012364787, w: 0.9548671} speed: 2 - m_Value: {x: -0.1700242, y: 0.47297487, z: -0.093568854, w: -0.8594367} + m_Value: {x: -0.31448913, y: 0.3192809, z: -0.113235705, w: -0.88676804} m_Size: - m_Target: 7.8612337 + m_Target: 0.46835804 speed: 2 - m_Value: 7.5227118 + m_Value: 6.4805326 m_Ortho: m_Target: 0 speed: 2 @@ -819,7 +730,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -828,90 +739,138 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 363 - y: 82 - width: 1101 - height: 533 + x: 0 + y: 636 + width: 1465 + height: 359 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1101 - height: 512 - m_Scale: {x: 0.47407407, y: 0.47407407} - m_Translation: {x: 550.5, y: 256} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1161.2109 - y: -540 - width: 2322.4219 - height: 1080 - m_MinimalGUI: 1 - m_defaultScale: 0.47407407 - m_LastWindowPixelSize: {x: 1101, y: 533} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &17 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Prefabs/Objects + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Prefabs/Objects + m_LastFoldersGridSize: -1 + m_LastProjectPath: /home/octia/AllData/Projects/RayCastAndClockTest/RaycastTest/RaycastTest + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: c05b0000 + m_LastClickedID: 23488 + m_ExpandedIDs: 000000007e5b0000865b000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000007e5b0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -939,3 +898,44 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1466 + y: 82 + width: 453 + height: 913 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0}