ktyl
/
lucid-super-dream
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added some temporary crosshairs from opengameart, plus a little bit of movement tweaking

This commit is contained in:
Dom Harris 2021-01-04 17:07:57 +00:00
parent 8986a351e7
commit b919be0309
8 changed files with 1705 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Images.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a626c4196d1da4a9197aabfe96a37078
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Images/crosshairs64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

1680
Assets/Images/crosshairs64.png.meta Normal file
View File

File diff suppressed because it is too large Load Diff

1
Assets/Player/LookAtUIObject.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using DG.Tweening;
using UnityEngine;
public class LookAtUIObject : MonoBehaviour

4
Assets/Player/MoveCrosshair.cs
View File

@ -55,9 +55,13 @@ public class MoveCrosshair : MonoBehaviour
switch (context.control.device)
{
case Gamepad _:
Cursor.lockState = CursorLockMode.None;
Cursor.visible = true;
_currentInput = value;
break;
case Mouse _:
Cursor.lockState = CursorLockMode.Confined;
Cursor.visible = false;
_currentInput =Vector2.zero;
transform.position = value;
break;

116
Assets/Scenes/Chief's Sandbox.unity
View File

@ -181,7 +181,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 5716787406560419972, guid: 8fd3c31c95b6f42ddbe7f923aa74992e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -292,112 +292,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &831508165
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 831508166}
- component: {fileID: 831508167}
m_Layer: 0
m_Name: DollyCart
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &831508166
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831508165}
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: 1421772845}
- {fileID: 1173812008}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &831508167
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 831508165}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 99a9c787e5d1bbf48a389834c4a9641c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Path: {fileID: 1138962391}
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 2
m_Position: 0
--- !u!1 &1138962389
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1138962390}
- component: {fileID: 1138962391}
m_Layer: 0
m_Name: Path
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1138962390
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1138962389}
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: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1138962391
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1138962389}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d37e5385efd7064cb1d54c94960acae, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Resolution: 30
m_Appearance:
pathColor: {r: 0, g: 1, b: 0, a: 1}
inactivePathColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
width: 0.2
m_Looped: 0
m_Waypoints:
- position: {x: 0, y: 0, z: 0}
tangent: {x: 0, y: 0, z: 1}
roll: 0
- position: {x: 0, y: 0, z: 7.462495}
tangent: {x: 0, y: 1.2831616, z: 1}
roll: 0
--- !u!1 &1173812004
GameObject:
m_ObjectHideFlags: 0
@ -493,8 +387,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1639649351}
m_Father: {fileID: 831508166}
m_RootOrder: 1
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1173812009
MonoBehaviour:
@ -610,8 +504,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 831508166}
m_RootOrder: 0
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1421772847
MonoBehaviour:

1
Packages/manifest.json
View File

@ -1,5 +1,6 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.burst": "1.4.3",
"com.unity.cinemachine": "2.6.3",
"com.unity.collab-proxy": "1.3.9",

6
Packages/packages-lock.json
View File

@ -1,5 +1,11 @@
{
"dependencies": {
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.burst": {
"version": "1.4.3",
"depth": 0,