lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix layer mask detection

Browse Source
This commit is contained in:
Vova
2023-12-11 14:48:07 +02:00
parent 4e0787287b
commit bf088009f6
2 changed files with 16 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/City_new.unity
+5 -157
View File
@@ -1946,74 +1946,6 @@ MonoBehaviour:
m_LightCookieSize: {x: 1, y: 1} m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0} m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0 m_SoftShadowQuality: 0
--- !u!1001 &345504585
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1381062366}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalPosition.x
value: -67.67999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.04955578
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalPosition.z
value: 17.767944
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
propertyPath: m_Name
value: tinnyHouse
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e5e06c221ebaf5048842c3bc4beae092, type: 3}
--- !u!1 &349281312 --- !u!1 &349281312
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2439,7 +2371,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &416748197 --- !u!4 &416748197
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2449,7 +2381,7 @@ Transform:
m_GameObject: {fileID: 416748196} m_GameObject: {fileID: 416748196}
serializedVersion: 2 serializedVersion: 2
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_LocalPosition: {x: 0, y: 14.62, z: 0}
m_LocalScale: {x: 142.77245, y: 142.77245, z: 142.77245} m_LocalScale: {x: 142.77245, y: 142.77245, z: 142.77245}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -2882,76 +2814,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 518643050} m_GameObject: {fileID: 518643050}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1001 &525723898
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1381062366}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalPosition.x
value: -84.09999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.049571037
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalPosition.z
value: 2.1600037
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
propertyPath: m_Name
value: house
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 65702495048144492, guid: f0d20e893ef930a4ca8364b321722883, type: 3}
- {fileID: -8700617353114198275, guid: f0d20e893ef930a4ca8364b321722883, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f0d20e893ef930a4ca8364b321722883, type: 3}
--- !u!1 &535029578 --- !u!1 &535029578
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3627,7 +3489,7 @@ Transform:
m_GameObject: {fileID: 629452253} m_GameObject: {fileID: 629452253}
serializedVersion: 2 serializedVersion: 2
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_LocalPosition: {x: 0, y: 22, z: 0}
m_LocalScale: {x: 144.20016, y: 144.20016, z: 144.20016} m_LocalScale: {x: 144.20016, y: 144.20016, z: 144.20016}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -3785,12 +3647,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 640512231} m_GameObject: {fileID: 640512231}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!4 &647232442 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f0d20e893ef930a4ca8364b321722883,
type: 3}
m_PrefabInstance: {fileID: 525723898}
m_PrefabAsset: {fileID: 0}
--- !u!1 &661798880 --- !u!1 &661798880
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4047,7 +3903,7 @@ PrefabInstance:
- target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.727 value: 21.7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad,
type: 3} type: 3}
@@ -4142,7 +3998,7 @@ PrefabInstance:
- target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 15.52 value: 15.53
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad,
type: 3} type: 3}
@@ -5535,12 +5391,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 953289704} m_GameObject: {fileID: 953289704}
m_Mesh: {fileID: 6966450866789282503, guid: b012bf224421b074fbc3ee5693d35ddc, type: 3} m_Mesh: {fileID: 6966450866789282503, guid: b012bf224421b074fbc3ee5693d35ddc, type: 3}
--- !u!4 &954751829 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e5e06c221ebaf5048842c3bc4beae092,
type: 3}
m_PrefabInstance: {fileID: 345504585}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1003929998 --- !u!1 &1003929998
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -6650,8 +6500,6 @@ Transform:
- {fileID: 2057527361} - {fileID: 2057527361}
- {fileID: 2134327493} - {fileID: 2134327493}
- {fileID: 1198886761} - {fileID: 1198886761}
- {fileID: 647232442}
- {fileID: 954751829}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1397853140 --- !u!1 &1397853140
Assets/Scripts/Managers/InGameMouseHandler.cs
+11 -11
View File
@@ -3,12 +3,12 @@ using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
public class InGameMouseHandler:UnityEngine.Object public class InGameMouseHandler : UnityEngine.Object
{ {
private LayerMask _selectableLayerMask; private LayerMask _selectableLayerMask;
private LayerMask _walkableLayerMask; private LayerMask _walkableLayerMask;
private WaypointVisual _waypointVisual; private WaypointVisual _waypointVisual;
private Ray _ray; private Ray _ray;
@@ -21,11 +21,11 @@ public class InGameMouseHandler:UnityEngine.Object
public InGameMouseHandler(Camera camera) public InGameMouseHandler(Camera camera)
{ {
_camera = camera; _camera = camera;
_selectableLayerMask =LayerMask.NameToLayer("Selectable"); _selectableLayerMask = LayerMask.GetMask("Selectable");
_walkableLayerMask = LayerMask.NameToLayer("Walking"); _walkableLayerMask = LayerMask.GetMask("Walking");
var waypointPrefab = Resources.Load("WayPointSign", typeof(WaypointVisual)) as WaypointVisual; var waypointPrefab = Resources.Load("WayPointSign", typeof(WaypointVisual)) as WaypointVisual;
_waypointVisual =Instantiate(waypointPrefab); _waypointVisual = Instantiate(waypointPrefab);
GameManager.Instance.Input.PlayerAction.PointClick.performed += ClickToMove; GameManager.Instance.Input.PlayerAction.PointClick.performed += ClickToMove;
} }
@@ -58,10 +58,10 @@ public class InGameMouseHandler:UnityEngine.Object
public void Update() public void Update()
{ {
_ray = _camera.ScreenPointToRay(Mouse.current.position.ReadValue()); _ray = _camera.ScreenPointToRay(Mouse.current.position.ReadValue());
if(EventSystem.current.IsPointerOverGameObject()) //if(EventSystem.current.IsPointerOverGameObject())
{ //{
return; // return;
} //}
//hide rounded menu //hide rounded menu
if (Physics.Raycast(_ray, out var mouseRaycastHit, 100f, _selectableLayerMask)) if (Physics.Raycast(_ray, out var mouseRaycastHit, 100f, _selectableLayerMask))
{ {