diff --git a/Assets/Scenes/namnesti_novy.unity b/Assets/Scenes/namnesti_novy.unity
index 82bb6a3e4d260494116b516c595708079cacb809..d4c0dbbc46c4c7655637daf2bc6f87e87922f2d0 100644
--- a/Assets/Scenes/namnesti_novy.unity
+++ b/Assets/Scenes/namnesti_novy.unity
@@ -151,7 +151,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 35
+ m_RootOrder: 38
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3806098
GameObject:
@@ -683,7 +683,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 9
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &39363087
PrefabInstance:
@@ -752,6 +752,22 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: c30a969fe5f59a84893e223361f0535e, type: 2}
+ - target: {fileID: 6162275508259798824, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
+ propertyPath: m_Carve
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6162275508259798824, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
+ propertyPath: m_CarveOnlyStationary
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6162275508259798824, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
+ propertyPath: m_Extents.x
+ value: 0.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6162275508259798824, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
+ propertyPath: m_Extents.z
+ value: 0.3
+ objectReference: {fileID: 0}
- target: {fileID: 6416116648409564257, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
@@ -920,6 +936,36 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a641e6842beaa0f4d98eea8f2892caa0, type: 3}
+--- !u!1 &45838722
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 45838723}
+ m_Layer: 0
+ m_Name: Gate (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &45838723
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 45838722}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -13.21, y: 0, z: 8.75}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1548213306}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &55036006
GameObject:
m_ObjectHideFlags: 0
@@ -1030,7 +1076,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 14
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &65396992
GameObject:
@@ -1416,7 +1462,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalPosition.x
- value: 3.365
+ value: 9.073593
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalPosition.y
@@ -1424,7 +1470,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalPosition.z
- value: 8.449
+ value: -0.06901822
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalRotation.x
@@ -1432,7 +1478,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalRotation.y
- value: -0.99324113
+ value: -0.17525356
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalRotation.z
@@ -1440,7 +1486,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.11606967
+ value: -0.9845233
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_RootOrder
@@ -1452,7 +1498,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -166.669
+ value: -339.813
objectReference: {fileID: 0}
- target: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -1490,6 +1536,26 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: ad9d0d510f7660a4ebc59bf3d90e5b8c, type: 2}
+ - target: {fileID: 5133758118873206151, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ propertyPath: m_AABB.m_Center.y
+ value: 0.0057353377
+ objectReference: {fileID: 0}
+ - target: {fileID: 5133758118873206151, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ propertyPath: m_AABB.m_Center.z
+ value: 0.7722232
+ objectReference: {fileID: 0}
+ - target: {fileID: 5133758118873206151, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ propertyPath: m_AABB.m_Extent.x
+ value: 0.29844278
+ objectReference: {fileID: 0}
+ - target: {fileID: 5133758118873206151, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ propertyPath: m_AABB.m_Extent.y
+ value: 0.2760139
+ objectReference: {fileID: 0}
+ - target: {fileID: 5133758118873206151, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ propertyPath: m_AABB.m_Extent.z
+ value: 0.6902495
+ objectReference: {fileID: 0}
- target: {fileID: 5265281910970722160, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
propertyPath: m_IsActive
value: 0
@@ -1508,6 +1574,62 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+--- !u!1 &102566095 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 24441532706149228, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ m_PrefabInstance: {fileID: 102566094}
+ m_PrefabAsset: {fileID: 0}
+--- !u!195 &102566096
+NavMeshAgent:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 102566095}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 0.39
+ m_Speed: 2.25
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 240
+ m_StoppingDistance: 0.2
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 2
+ m_BaseOffset: 0
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+--- !u!114 &102566097
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 102566095}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d9248720ca1d2204793198cd9597e6da, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ PathPoints:
+ - {fileID: 594298928}
+ - {fileID: 2126010380}
+ - {fileID: 2278427}
+ - {fileID: 1014936556}
+ PathDelays:
+ - 10
+ Agent: {fileID: 102566096}
+ Animator: {fileID: 102566098}
+ GoodEnough: 0.5
+ pathIndex: 0
+ stopped: 0
+--- !u!95 &102566098 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 24441532706149229, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ m_PrefabInstance: {fileID: 102566094}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &103959069
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2550,7 +2672,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 24
+ m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &215150460
PrefabInstance:
@@ -2723,7 +2845,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 30
+ m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &227677302
GameObject:
@@ -3028,7 +3150,7 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
+ Gate: {fileID: 330257935}
Home: {fileID: 908471262}
Agent: {fileID: 229481755}
Animator: {fileID: 229481754}
@@ -3979,7 +4101,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 21
+ m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &269976713
GameObject:
@@ -4528,6 +4650,36 @@ Animator:
m_CorrespondingSourceObject: {fileID: 9094244029417688281, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
m_PrefabInstance: {fileID: 1709088859}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &330257934
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 330257935}
+ m_Layer: 0
+ m_Name: Gate (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &330257935
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 330257934}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -13.21, y: 0, z: 11.42}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1548213306}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &333936093
GameObject:
m_ObjectHideFlags: 0
@@ -4619,6 +4771,36 @@ Transform:
m_Father: {fileID: 356118354}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: -73.334, z: 0}
+--- !u!1 &352170653
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 352170654}
+ m_Layer: 0
+ m_Name: Home (7)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &352170654
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 352170653}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 75.47, y: 0, z: -0.79}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1548213306}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &354605921
GameObject:
m_ObjectHideFlags: 0
@@ -4938,7 +5120,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 33
+ m_RootOrder: 36
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &376185939
GameObject:
@@ -5004,7 +5186,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 11
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &391495754 stripped
GameObject:
@@ -5713,7 +5895,7 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
+ Gate: {fileID: 330257935}
Home: {fileID: 1542491002}
Agent: {fileID: 461134412}
Animator: {fileID: 461134411}
@@ -6713,7 +6895,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 27
+ m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &565616592
GameObject:
@@ -7296,8 +7478,8 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
- Home: {fileID: 1705546303}
+ Gate: {fileID: 330257935}
+ Home: {fileID: 352170654}
Agent: {fileID: 577206775}
Animator: {fileID: 577206774}
path: []
@@ -7366,6 +7548,36 @@ Transform:
m_CorrespondingSourceObject: {fileID: 387110876638858546, guid: 948ecf50772840644918d1c043c1f083, type: 3}
m_PrefabInstance: {fileID: 583503377}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &594298927
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 594298928}
+ m_Layer: 0
+ m_Name: WitchStuff
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &594298928
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 594298927}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 19.37, y: 0, z: 26.74}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1548213306}
+ m_RootOrder: 40
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &598460103
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7768,7 +7980,7 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
+ Gate: {fileID: 330257935}
Home: {fileID: 1705546303}
Agent: {fileID: 617443483}
Animator: {fileID: 617443482}
@@ -8496,7 +8708,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 13
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &756841737 stripped
Transform:
@@ -8960,6 +9172,65 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+--- !u!1 &804646747 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 24441532706149228, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ m_PrefabInstance: {fileID: 804646746}
+ m_PrefabAsset: {fileID: 0}
+--- !u!195 &804646748
+NavMeshAgent:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 804646747}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 0.39
+ m_Speed: 2.25
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 240
+ m_StoppingDistance: 0.2
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 2
+ m_BaseOffset: 0
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+--- !u!114 &804646749
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 804646747}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e1eb1764bbfc8e1449b7394c04320184, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Stalls:
+ - {fileID: 1115774378}
+ - {fileID: 16174562}
+ - {fileID: 1426839385}
+ - {fileID: 1865752865}
+ - {fileID: 386186640}
+ - {fileID: 750214016}
+ Gate: {fileID: 1499560247}
+ Home: {fileID: 352170654}
+ Agent: {fileID: 804646748}
+ Animator: {fileID: 804646750}
+ path: []
+ pathIndex: 0
+ stopped: 0
+ leavingTown: 0
+--- !u!95 &804646750 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 24441532706149229, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ m_PrefabInstance: {fileID: 804646746}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &805242380
GameObject:
m_ObjectHideFlags: 0
@@ -10999,7 +11270,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 1
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &859463452
GameObject:
@@ -11372,7 +11643,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &915619602
PrefabInstance:
@@ -12308,7 +12579,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 28
+ m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1016115686
GameObject:
@@ -12889,7 +13160,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 36
+ m_RootOrder: 39
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1061168214
GameObject:
@@ -13464,7 +13735,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 723d9bd6b0a37004eb78c39f04cbc69f, type: 3}
---- !u!1 &1089343892
+--- !u!1 &1088905336
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -13472,30 +13743,29 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1089343893}
+ - component: {fileID: 1088905337}
m_Layer: 0
- m_Name: PresentingBeggar
+ m_Name: Church
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &1089343893
+ m_IsActive: 1
+--- !u!4 &1088905337
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1089343892}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_GameObject: {fileID: 1088905336}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 39.37, y: 0, z: 7.387}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 790598295}
- m_Father: {fileID: 376185940}
- m_RootOrder: 4
+ m_Children: []
+ m_Father: {fileID: 1548213306}
+ m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1088905336
+--- !u!1 &1089104444
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -13503,29 +13773,29 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1088905337}
+ - component: {fileID: 1089104445}
m_Layer: 0
- m_Name: Church
+ m_Name: Home (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1088905337
+--- !u!4 &1089104445
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1088905336}
+ m_GameObject: {fileID: 1089104444}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 39.37, y: 0, z: 7.387}
+ m_LocalPosition: {x: 46.192, y: 0, z: -6.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 18
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1089104444
+--- !u!1 &1089343892
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -13533,27 +13803,28 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1089104445}
+ - component: {fileID: 1089343893}
m_Layer: 0
- m_Name: Home (4)
+ m_Name: PresentingBeggar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1089104445
+ m_IsActive: 0
+--- !u!4 &1089343893
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1089104444}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 46.192, y: 0, z: -6.4}
+ m_GameObject: {fileID: 1089343892}
+ 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: 1548213306}
- m_RootOrder: 5
+ m_Children:
+ - {fileID: 790598295}
+ m_Father: {fileID: 376185940}
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1098076130
GameObject:
@@ -13948,7 +14219,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 8
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1123092871
PrefabInstance:
@@ -14040,7 +14311,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 19
+ m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1135966734
PrefabInstance:
@@ -14723,7 +14994,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 26
+ m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1206103409
GameObject:
@@ -15222,6 +15493,65 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+--- !u!1 &1218236023 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 24441532706149228, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ m_PrefabInstance: {fileID: 1218236022}
+ m_PrefabAsset: {fileID: 0}
+--- !u!195 &1218236024
+NavMeshAgent:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1218236023}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 0.39
+ m_Speed: 2.25
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 240
+ m_StoppingDistance: 0.2
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 2
+ m_BaseOffset: 0
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+--- !u!114 &1218236025
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1218236023}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e1eb1764bbfc8e1449b7394c04320184, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Stalls:
+ - {fileID: 1115774378}
+ - {fileID: 16174562}
+ - {fileID: 1426839385}
+ - {fileID: 386186640}
+ - {fileID: 1865752865}
+ - {fileID: 750214016}
+ Gate: {fileID: 1499560247}
+ Home: {fileID: 1705546303}
+ Agent: {fileID: 1218236024}
+ Animator: {fileID: 1218236026}
+ path: []
+ pathIndex: 0
+ stopped: 0
+ leavingTown: 0
+--- !u!95 &1218236026 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 24441532706149229, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
+ m_PrefabInstance: {fileID: 1218236022}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1221285915
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15596,36 +15926,6 @@ Transform:
m_Father: {fileID: 276821346}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -90, y: 0, z: -131.276}
---- !u!1 &1282491778
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1282491779}
- m_Layer: 0
- m_Name: Target3
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1282491779
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1282491778}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 11.05, y: 0.34, z: 2.19}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1548213306}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1294480040 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 800802756830366166, guid: 84e85694b308fad4097910c0f75e78a6, type: 3}
@@ -15677,7 +15977,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 25
+ m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1309194043
GameObject:
@@ -16246,7 +16546,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 16
+ m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1373041679 stripped
GameObject:
@@ -16634,7 +16934,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 22
+ m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1417913796
GameObject:
@@ -16861,7 +17161,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 10
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1426931223
GameObject:
@@ -16927,7 +17227,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 2
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1445960435
GameObject:
@@ -17896,7 +18196,7 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
+ Gate: {fileID: 45838723}
Home: {fileID: 858926251}
Agent: {fileID: 1521648516}
Animator: {fileID: 1521648515}
@@ -17932,7 +18232,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 31
+ m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1531774675
GameObject:
@@ -18064,7 +18364,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1544539153 stripped
Transform:
@@ -18099,6 +18399,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1499560247}
+ - {fileID: 45838723}
+ - {fileID: 330257935}
- {fileID: 858926251}
- {fileID: 1434306566}
- {fileID: 908471262}
@@ -18106,6 +18408,7 @@ Transform:
- {fileID: 1089104445}
- {fileID: 1705546303}
- {fileID: 1623790325}
+ - {fileID: 352170654}
- {fileID: 1115774378}
- {fileID: 16174562}
- {fileID: 1426839385}
@@ -18135,6 +18438,7 @@ Transform:
- {fileID: 1915355300}
- {fileID: 2278427}
- {fileID: 1053321829}
+ - {fileID: 594298928}
m_Father: {fileID: 65396993}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -19114,7 +19418,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1629874610
GameObject:
@@ -19906,7 +20210,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1709088859
PrefabInstance:
@@ -20299,7 +20603,7 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
+ Gate: {fileID: 45838723}
Home: {fileID: 1623790325}
Agent: {fileID: 1726588299}
Animator: {fileID: 1726588298}
@@ -20528,7 +20832,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 17
+ m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1755881874 stripped
Transform:
@@ -20953,7 +21257,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 15
+ m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1828450829
GameObject:
@@ -21185,7 +21489,7 @@ MonoBehaviour:
- {fileID: 386186640}
- {fileID: 1865752865}
- {fileID: 750214016}
- Gate: {fileID: 1499560247}
+ Gate: {fileID: 45838723}
Home: {fileID: 1089104445}
Agent: {fileID: 1854961598}
Animator: {fileID: 1854961597}
@@ -21240,7 +21544,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 12
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1866374455
GameObject:
@@ -23015,7 +23319,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 34
+ m_RootOrder: 37
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1929207109
PrefabInstance:
@@ -23675,7 +23979,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 20
+ m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1953354742
PrefabInstance:
@@ -24617,7 +24921,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 29
+ m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2075508276
PrefabInstance:
@@ -26448,7 +26752,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 23
+ m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2126010379
GameObject:
@@ -26474,11 +26778,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2126010379}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 17.29, y: 0, z: 4.02}
+ m_LocalPosition: {x: 17.64, y: 0, z: 4.02}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1548213306}
- m_RootOrder: 32
+ m_RootOrder: 35
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2143177429
GameObject:
diff --git a/Assets/Scripts/AI/ShopperNPC.cs b/Assets/Scripts/AI/ShopperNPC.cs
index 8df420f91c3f5ee4a6832fb0d0b4810488fe0214..2afd12f9483b82730698932a5ad33eee8f65a8f6 100644
--- a/Assets/Scripts/AI/ShopperNPC.cs
+++ b/Assets/Scripts/AI/ShopperNPC.cs
@@ -17,10 +17,13 @@ namespace Nudle.Scripts.AI
[SerializeField]
private Vector3[] path;
+
[SerializeField]
private int pathIndex;
+
[SerializeField]
private bool stopped;
+
[SerializeField]
private bool leavingTown;
@@ -73,6 +76,11 @@ namespace Nudle.Scripts.AI
leavingTown = false;
return Util.FisherYatesShuffle(Stalls, stallCount).Select(tf => tf.position).Union(new Vector3[] { Home.position }).ToArray();
}
+ if (leavingTown)
+ {
+ leavingTown = false;
+ return new Vector3[] { Home.position };
+ }
leavingTown = true;
return new Vector3[] { Gate.position };
}