Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Sveske Juice 2024-04-21 09:59:18 +02:00
commit 710a99d37c
6 changed files with 422 additions and 1222 deletions

File diff suppressed because one or more lines are too long

View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 7272563904334112500}
- component: {fileID: 4091335119320780364}
- component: {fileID: 3666968560236543700}
- component: {fileID: 4821768693059862511}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
@ -59,7 +60,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 5
m_FollowOffset: {x: 0, y: 3.45, z: -12}
m_FollowOffset: {x: 0, y: -10, z: -5}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -127,6 +128,23 @@ MonoBehaviour:
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &4821768693059862511
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 42389067316160559}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_FrequencyGain: 1
mNoiseOffsets: {x: 0, y: 0, z: 0}
--- !u!1 &1127111119625446846
GameObject:
m_ObjectHideFlags: 0
@ -186,7 +204,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400473914611959530}
serializedVersion: 2
m_LocalRotation: {x: -0.011396202, y: 0.98857015, z: -0.11032369, w: -0.10211719}
m_LocalRotation: {x: -0.048121, y: 0.83193743, z: 0.5479291, w: 0.07306359}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -265,7 +283,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2383950784329503899}
serializedVersion: 2
m_LocalRotation: {x: -0.008466786, y: 0.99132437, z: -0.08196477, w: -0.10240169}
m_LocalRotation: {x: -0.0501939, y: 0.8159028, z: 0.5715319, w: 0.07165539}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -344,7 +362,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3339643807228368672}
serializedVersion: 2
m_LocalRotation: {x: -0.014335659, y: 0.9849784, z: -0.13877982, w: -0.10174616}
m_LocalRotation: {x: -0.04599445, y: 0.84738916, z: 0.5237152, w: 0.074420586}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -410,6 +428,7 @@ GameObject:
- component: {fileID: 319057796056811885}
- component: {fileID: 8750647365585033897}
- component: {fileID: 7802919289816053573}
- component: {fileID: 626641444100001656}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
@ -457,7 +476,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 5
m_FollowOffset: {x: 0, y: 3.45, z: -12}
m_FollowOffset: {x: 0, y: -10, z: -5}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -525,6 +544,23 @@ MonoBehaviour:
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &626641444100001656
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4113191004488689832}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_FrequencyGain: 1
mNoiseOffsets: {x: 0, y: 0, z: 0}
--- !u!1 &5419760417237671588
GameObject:
m_ObjectHideFlags: 0
@ -586,8 +622,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6163557566655415017}
serializedVersion: 2
m_LocalRotation: {x: -0.02546724, y: 0.9636698, z: -0.2465418, w: -0.09954502}
m_LocalPosition: {x: 10.297432, y: 12.445195, z: 18.85268}
m_LocalRotation: {x: -0.0501939, y: 0.8159028, z: 0.5715319, w: 0.07165539}
m_LocalPosition: {x: 4.5844216, y: -19.255428, z: 6.807705}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -632,7 +668,7 @@ Camera:
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 1407
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -743,8 +779,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
cam: {fileID: 7435709693246867821}
scrollSpeed: 2.5
stopAfterTime: 15
scrollSpeed: 4
stopAfterTime: 7.5
curve:
serializedVersion: 2
m_Curve:
@ -800,10 +836,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2d4e884ed2ba0944bfe55454353bc2d, type: 3}
m_Name:
m_EditorClassIdentifier:
towerCam: {fileID: 0}
mainCamera: {fileID: 3255403189825384754}
layerMask:
serializedVersion: 2
m_Bits: 1024
m_Bits: 8
selectLayer:
serializedVersion: 2
m_Bits: 256
@ -819,6 +856,7 @@ GameObject:
- component: {fileID: 8859875002069123754}
- component: {fileID: 7675967992885322702}
- component: {fileID: 3265939409296851268}
- component: {fileID: 8260751108954245140}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
@ -866,7 +904,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 5
m_FollowOffset: {x: 0, y: 3.45, z: -12}
m_FollowOffset: {x: 0, y: -10, z: -5}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -934,6 +972,23 @@ MonoBehaviour:
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &8260751108954245140
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6734946956435011452}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_FrequencyGain: 1
mNoiseOffsets: {x: 0, y: 0, z: 0}
--- !u!1 &7435709693246867821
GameObject:
m_ObjectHideFlags: 0
@ -962,7 +1017,7 @@ Transform:
m_GameObject: {fileID: 7435709693246867821}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 8.5044365, y: 3.5927956, z: 10.26652}
m_LocalPosition: {x: 5.17995, y: -9.857204, z: 3.443367}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -1011,7 +1066,7 @@ MonoBehaviour:
m_Calls: []
m_LegacyBlendHint: 0
m_YAxis:
Value: 0.5
Value: 0
m_SpeedMode: 0
m_MaxSpeed: 0
m_AccelTime: 0.2
@ -1065,11 +1120,11 @@ MonoBehaviour:
m_BindingMode: 5
m_SplineCurvature: 0.2
m_Orbits:
- m_Height: 10
- m_Height: 20
m_Radius: 5
- m_Height: 3.45
- m_Height: 7.5
m_Radius: 12
- m_Height: -5
- m_Height: -10
m_Radius: 5
m_LegacyHeadingBias: 3.4028235e+38
m_Rigs:
@ -1090,10 +1145,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 5419760417237671588}
origin: {fileID: 7435709693246867821}
towerCamScript: {fileID: 0}
hideFadeSpeed: 7
showFadeSpeed: 2
sphereRadius: 2
maxSphereRayDistanceOffset: {x: 0, y: 3, z: 0}
sphereRadius: 3.5
sphereRange: 2.5
sphereOffset: {x: 0, y: 8, z: 0}
--- !u!114 &7757173428948913319
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1106,6 +1163,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 44d70cc20219cd84593f67d248eafe36, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Offset: {x: 0, y: 0, z: 0}
m_Offset: {x: 0, y: 0, z: -10}
m_ApplyAfter: 1
m_PreserveComposition: 0

View File

@ -1,36 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &311150812831036480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9219944243733533106}
m_Layer: 0
m_Name: Waypoint (2)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9219944243733533106
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 311150812831036480}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.5, y: 0, z: 6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4296081756590912317}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &330280530189297080
GameObject:
m_ObjectHideFlags: 0
@ -56,7 +25,7 @@ Transform:
m_GameObject: {fileID: 330280530189297080}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.29, y: 0, z: -3.3000002}
m_LocalPosition: {x: -1.29, y: 0.76, z: -3.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -87,38 +56,7 @@ Transform:
m_GameObject: {fileID: 525977634642021262}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.54, y: 0, z: -1.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4296081756590912317}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1011035237841735433
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5658485176317920753}
m_Layer: 0
m_Name: Waypoint (1)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5658485176317920753
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1011035237841735433}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.5, y: -1.5, z: 6}
m_LocalPosition: {x: -3.54, y: 0.76, z: -1.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -149,7 +87,7 @@ Transform:
m_GameObject: {fileID: 1543659589121210415}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.54, y: 0, z: 3.4499998}
m_LocalPosition: {x: -3.54, y: 0.76, z: 3.4499998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -180,7 +118,7 @@ Transform:
m_GameObject: {fileID: 3487098836263653193}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.29, y: 0, z: 3.4499998}
m_LocalPosition: {x: -1.29, y: 0.76, z: 3.4499998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -211,38 +149,7 @@ Transform:
m_GameObject: {fileID: 3489449738675045651}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.21, y: 0, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4296081756590912317}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4002409157264193385
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2414366300202147928}
m_Layer: 0
m_Name: Waypoint (3)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2414366300202147928
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4002409157264193385}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.25, y: 0, z: 8}
m_LocalPosition: {x: 4.21, y: 0.76, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -273,7 +180,7 @@ Transform:
m_GameObject: {fileID: 4144679491042648141}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.96, y: 0, z: 2.1999998}
m_LocalPosition: {x: 1.96, y: 0.76, z: 2.1999998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -304,38 +211,7 @@ Transform:
m_GameObject: {fileID: 5208674519481351762}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.5, y: 0, z: 7.45}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4296081756590912317}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6706417959384855726
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3866773132503831712}
m_Layer: 0
m_Name: Waypoint (4)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3866773132503831712
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6706417959384855726}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.5, y: 0, z: 9}
m_LocalPosition: {x: -6.5, y: 0.76, z: 7.45}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -366,7 +242,7 @@ Transform:
m_GameObject: {fileID: 6768891002692047968}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.96, y: 0, z: -3.3000002}
m_LocalPosition: {x: 1.96, y: 0.76, z: -3.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -397,7 +273,7 @@ Transform:
m_GameObject: {fileID: 7332061776314564640}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.21, y: 0, z: -0.25}
m_LocalPosition: {x: 4.21, y: 0.76, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -428,7 +304,7 @@ Transform:
m_GameObject: {fileID: 7365176094828002273}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.21, y: 0, z: 2.1999998}
m_LocalPosition: {x: 4.21, y: 0.76, z: 2.1999998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -475,11 +351,6 @@ Transform:
- {fileID: 8118687754024032127}
- {fileID: 987596884297488772}
- {fileID: 1755882387827754636}
- {fileID: 2362150636653055245}
- {fileID: 5658485176317920753}
- {fileID: 9219944243733533106}
- {fileID: 2414366300202147928}
- {fileID: 3866773132503831712}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6310148398334093979
@ -494,13 +365,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3}
m_Name:
m_EditorClassIdentifier:
WaypointRadiusTolerence: 0.01
WaypointRadiusTolerence: 0.1
Waypoints:
- {fileID: 2362150636653055245}
- {fileID: 5658485176317920753}
- {fileID: 9219944243733533106}
- {fileID: 2414366300202147928}
- {fileID: 3866773132503831712}
- {fileID: 8103158125141006786}
- {fileID: 5664078251046624944}
- {fileID: 2371292727203336024}
- {fileID: 5984414381206481626}
- {fileID: 4385823141841843282}
- {fileID: 4518157500397519598}
- {fileID: 6457795451717270032}
- {fileID: 1105341062220460822}
- {fileID: 8118687754024032127}
- {fileID: 987596884297488772}
- {fileID: 1755882387827754636}
--- !u!1 &7525883537600548486
GameObject:
m_ObjectHideFlags: 0
@ -526,38 +403,7 @@ Transform:
m_GameObject: {fileID: 7525883537600548486}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.5, y: 0, z: -1.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4296081756590912317}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7789031812741254991
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2362150636653055245}
m_Layer: 0
m_Name: Waypoint
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2362150636653055245
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7789031812741254991}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.5, y: 0, z: -7.25}
m_LocalPosition: {x: -6.5, y: 0.76, z: -1.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []

View File

@ -29,18 +29,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2880784203372593049}
- {fileID: 2112609190714215028}
- {fileID: 636086281215121674}
- {fileID: 5179355799010253008}
- {fileID: 381980946232919517}
- {fileID: 9063986181337726499}
- {fileID: 3787763904814071501}
- {fileID: 6300183897556542389}
- {fileID: 176731242052501642}
- {fileID: 6420523799539329286}
- {fileID: 866733683227094387}
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4274405463174037481
@ -56,356 +45,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
WaypointRadiusTolerence: 0.01
Waypoints:
- {fileID: 2880784203372593049}
- {fileID: 2112609190714215028}
- {fileID: 636086281215121674}
- {fileID: 5179355799010253008}
- {fileID: 381980946232919517}
- {fileID: 9063986181337726499}
- {fileID: 3787763904814071501}
- {fileID: 6300183897556542389}
- {fileID: 176731242052501642}
- {fileID: 6420523799539329286}
- {fileID: 866733683227094387}
--- !u!1 &2434556274776937257
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3787763904814071501}
m_Layer: 0
m_Name: Waypoint (6)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3787763904814071501
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2434556274776937257}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.96, y: 0, z: -3.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3183573803339317124
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 176731242052501642}
m_Layer: 0
m_Name: Waypoint (8)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &176731242052501642
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3183573803339317124}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.21, y: 0, z: 2.1999998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3829752861535499688
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6300183897556542389}
m_Layer: 0
m_Name: Waypoint (7)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6300183897556542389
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3829752861535499688}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.96, y: 0, z: 2.1999998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4728010249358284801
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 866733683227094387}
m_Layer: 0
m_Name: Waypoint (10)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &866733683227094387
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4728010249358284801}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.21, y: 0, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5221219058282095094
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 636086281215121674}
m_Layer: 0
m_Name: Waypoint (2)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &636086281215121674
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5221219058282095094}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.54, y: 0, z: -1.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5542648080559813128
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2112609190714215028}
m_Layer: 0
m_Name: Waypoint (1)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2112609190714215028
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5542648080559813128}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.5, y: 0, z: -1.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6822228406633326492
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2880784203372593049}
m_Layer: 0
m_Name: Waypoint
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2880784203372593049
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6822228406633326492}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.5, y: 0, z: 7.45}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7100819614979339836
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9063986181337726499}
m_Layer: 0
m_Name: Waypoint (5)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9063986181337726499
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7100819614979339836}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.29, y: 0, z: -3.3000002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7841365917061606553
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6420523799539329286}
m_Layer: 0
m_Name: Waypoint (9)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6420523799539329286
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7841365917061606553}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.21, y: 0, z: -0.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8300784543807529236
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 381980946232919517}
m_Layer: 0
m_Name: Waypoint (4)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &381980946232919517
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8300784543807529236}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.29, y: 0, z: 3.4499998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8674514851609690199
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5179355799010253008}
m_Layer: 0
m_Name: Waypoint (3)
m_TagString: Untagged
m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5179355799010253008
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8674514851609690199}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.54, y: 0, z: 3.4499998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3065217788553285465}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Waypoints: []

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@ using UnityUtils;
public class WaypointPath : MonoBehaviour
{
[SerializeField] private float WaypointRadiusTolerence = 0.01f;
[SerializeField] private float WaypointRadiusTolerence = 0.1f;
[SerializeField] public List<Transform> Waypoints;
[SerializeField] public List<WaypointEntityData> activeEntities = new();
@ -53,7 +53,6 @@ public class WaypointPath : MonoBehaviour
float minDist = Math.Min(dist, data.MoveSpeed * Time.deltaTime);
data.Entity.position += normTargetDir * minDist;
Debug.Log(data.FeetOffset);
data.Entity.position = data.Entity.position.With(y: data.FeetOffset);
}
}