Skip to content

Commit ef28757

Browse files
committed
Merge remote-tracking branch 'treivize/feature/npc-pathway-movement' into main
2 parents 53b7aff + 08e9fbd commit ef28757

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+596
-179
lines changed

UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,20 @@ MonoBehaviour:
183183
_getHitEffectSO: {fileID: 11400000, guid: efe1f84589f6f1f47a7a10a1a215e843, type: 2}
184184
_mainMeshRenderer: {fileID: 7464116941563462636}
185185
_droppableRewardSO: {fileID: 11400000, guid: 6158158d6ef9a3d47827f7851295bcef, type: 2}
186+
--- !u!114 &4729545407786248701
187+
MonoBehaviour:
188+
m_ObjectHideFlags: 0
189+
m_CorrespondingSourceObject: {fileID: 0}
190+
m_PrefabInstance: {fileID: 0}
191+
m_PrefabAsset: {fileID: 0}
192+
m_GameObject: {fileID: 8687264390989375961}
193+
m_Enabled: 1
194+
m_EditorHideFlags: 0
195+
m_Script: {fileID: 11500000, guid: ac26da34fd58af544a84bf1977bcc424, type: 3}
196+
m_Name:
197+
m_EditorClassIdentifier:
198+
_npcMovementConfig: {fileID: 11400000, guid: ae318779135f76f4d8c1213cf19d2312, type: 2}
199+
_channel: {fileID: 0}
186200
--- !u!1001 &2135821800440209491
187201
PrefabInstance:
188202
m_ObjectHideFlags: 0

UOP1_Project/Assets/Prefabs/Gameplay/Pathway/Pathway.prefab

Lines changed: 0 additions & 53 deletions
This file was deleted.
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: a65678f74cbc33e45bf1e019ca88652e, type: 3}
13-
m_Name: RoamingAroundSpawningPositionAction
12+
m_Script: {fileID: 11500000, guid: 76542500a512494489526e9bcfd3a1b8, type: 3}
13+
m_Name: NPCNotMoving
1414
m_EditorClassIdentifier:
15-
_roamingSpeed: 1
16-
_roamingDistance: 10
15+
_stopDuration: 0
16+
_speed: 0
17+
_waypoints: []
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 76542500a512494489526e9bcfd3a1b8, type: 3}
13+
m_Name: NPCPathwayConfig
14+
m_EditorClassIdentifier:
15+
_stopDuration: 0.5
16+
_speed: 1
17+
_lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
18+
_textSize: 20
19+
_textColor: {r: 1, g: 1, b: 1, a: 1}
20+
_probeRadius: 5
21+
DisplayProbes: 0
22+
ToggledNavMeshDisplay: 1
23+
RealTimeEnabled: 1
24+
Waypoints:
25+
- waypoint: {x: -12.400441, y: 0.2169903, z: 14.62578}
26+
corners:
27+
- {x: -12.400441, y: 0.2169903, z: 14.62578}
28+
- {x: -10.209248, y: 0.033730388, z: -9.870466}
29+
- waypoint: {x: -10.209248, y: 0.033730388, z: -9.870466}
30+
corners:
31+
- {x: -10.209248, y: 0.033730388, z: -9.870466}
32+
- {x: -4.5, y: 0.033730388, z: -9}
33+
- {x: -0.8999996, y: 0.033730388, z: -8.5}
34+
- {x: 11.389833, y: 0.18379807, z: 0.2561388}
35+
- waypoint: {x: 11.389833, y: 0.18379807, z: 0.2561388}
36+
corners:
37+
- {x: 11.389833, y: 0.18379807, z: 0.2561388}
38+
- {x: 7.3375273, y: 0.2178752, z: 16.793528}
39+
- waypoint: {x: 7.3375273, y: 0.2178752, z: 16.793528}
40+
corners:
41+
- {x: 7.3375273, y: 0.2178752, z: 16.793528}
42+
- {x: -12.400441, y: 0.2169903, z: 14.62578}

UOP1_Project/Assets/Prefabs/Gameplay/Pathway/Pathway.prefab.meta renamed to UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfig.asset.meta

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 2724eed9fc9a3904b9edc8180dace7f2, type: 3}
13+
m_Name: RoamingAroundCenter
14+
m_EditorClassIdentifier:
15+
_fromSpawningPoint: 1
16+
_customCenter: {x: 0, y: 0, z: 0}
17+
_radius: 0
18+
_speed: 0
19+
_stopDuration: 0

UOP1_Project/Assets/Scripts/Pathway.meta renamed to UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCRoamingAroundCenter.asset.meta

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 0c96b3d50eb64e741a7219a67ca93bdf, type: 3}
13+
m_Name: SlimeCritterEventChannel
14+
m_EditorClassIdentifier:
15+
description:

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/SlimeCritterEventChannel.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)