Skip to content

Commit 356a8fa

Browse files
ciro-unityciro-unity
committed
Merge branch 'main' into worldbuilding
# Conflicts: # UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity
2 parents 7354f9b + 627e894 commit 356a8fa

File tree

10 files changed

+5827
-167
lines changed

10 files changed

+5827
-167
lines changed

‎UOP1_Project/Assets/Cutscenes/SlimeCutscene.playable

Lines changed: 4126 additions & 128 deletions
Large diffs are not rendered by default.

‎UOP1_Project/Assets/Prefabs/Cutscenes/SlimeCritterCutscene.prefab

Lines changed: 1526 additions & 39 deletions
Large diffs are not rendered by default.

‎UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Farms.prefab

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,12 @@ PrefabInstance:
430430
propertyPath: m_Name
431431
value: Gluecose_FarmAttack (2)
432432
objectReference: {fileID: 0}
433+
- target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
434+
type: 3}
435+
propertyPath: _npcMovementConfig
436+
value:
437+
objectReference: {fileID: 11400000, guid: 5932c32c5fadc7d4dbfcfe18641a14c4,
438+
type: 2}
433439
m_RemovedComponents: []
434440
m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
435441
--- !u!4 &8040769609122690780 stripped
@@ -580,6 +586,12 @@ PrefabInstance:
580586
propertyPath: m_Name
581587
value: Gluecose_FarmAttack
582588
objectReference: {fileID: 0}
589+
- target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
590+
type: 3}
591+
propertyPath: _npcMovementConfig
592+
value:
593+
objectReference: {fileID: 11400000, guid: fa5d257c17e2c2a49bcaad7e13ade621,
594+
type: 2}
583595
m_RemovedComponents: []
584596
m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
585597
--- !u!4 &8040769610452317586 stripped
@@ -655,6 +667,12 @@ PrefabInstance:
655667
propertyPath: m_Name
656668
value: Gluecose_FarmAttack (1)
657669
objectReference: {fileID: 0}
670+
- target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
671+
type: 3}
672+
propertyPath: _npcMovementConfig
673+
value:
674+
objectReference: {fileID: 11400000, guid: 07e3efd786897254797f8bee4f445e27,
675+
type: 2}
658676
m_RemovedComponents: []
659677
m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
660678
--- !u!4 &8040769610564248312 stripped

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig.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.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter1PathwayConfig.asset

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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: SlimeCritter1PathwayConfig
14+
m_EditorClassIdentifier:
15+
_stopDuration: 0.5
16+
_speed: 1
17+
Waypoints:
18+
- waypoint: {x: 37.06861, y: 2.7186172, z: -155.6937}
19+
corners:
20+
- {x: 37.06861, y: 2.7709734, z: -155.6937}
21+
- {x: 32.7, y: 3.1866074, z: -158.2}
22+
- {x: 26.902933, y: 3.1366043, z: -161.16402}
23+
- waypoint: {x: 26.902933, y: 3.0997455, z: -161.16402}
24+
corners:
25+
- {x: 26.902933, y: 3.1366043, z: -161.16402}
26+
- {x: 23.4, y: 2.9866066, z: -156.5}
27+
- {x: 20.815067, y: 2.4063218, z: -153.82915}
28+
- waypoint: {x: 20.815067, y: 2.3792727, z: -153.82915}
29+
corners:
30+
- {x: 20.815067, y: 2.4063218, z: -153.82915}
31+
- {x: 25.6, y: 2.6366043, z: -151}
32+
- {x: 26.1, y: 2.6366043, z: -150.70001}
33+
- {x: 31.454504, y: 2.4686396, z: -147.35999}
34+
- waypoint: {x: 31.454504, y: 2.4480815, z: -147.35999}
35+
corners:
36+
- {x: 31.454504, y: 2.4686396, z: -147.35999}
37+
- {x: 37.06861, y: 2.7709734, z: -155.6937}
38+
_lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
39+
_textSize: 20
40+
_textColor: {r: 1, g: 1, b: 1, a: 1}
41+
_probeRadius: 5
42+
DisplayProbes: 0
43+
ToggledNavMeshDisplay: 1
44+
RealTimeEnabled: 1

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter1PathwayConfig.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.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter2PathwayConfig.asset

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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: SlimeCritter2PathwayConfig
14+
m_EditorClassIdentifier:
15+
_stopDuration: 0.5
16+
_speed: 1
17+
Waypoints:
18+
- waypoint: {x: 48.933567, y: 1.8827523, z: -144.23233}
19+
corners:
20+
- {x: 48.933567, y: 1.9529065, z: -144.23233}
21+
- {x: 43.39123, y: 2.5115952, z: -152.35359}
22+
- waypoint: {x: 43.39123, y: 2.4610677, z: -152.35359}
23+
corners:
24+
- {x: 43.39123, y: 2.5115952, z: -152.35359}
25+
- {x: 29.334278, y: 0.6070535, z: -126.35725}
26+
- waypoint: {x: 29.334278, y: 0.5846013, z: -126.35725}
27+
corners:
28+
- {x: 29.334278, y: 0.6070535, z: -126.35725}
29+
- {x: 13.463667, y: -1.1200124, z: -137.81865}
30+
- waypoint: {x: 13.463667, y: -1.1738727, z: -137.81865}
31+
corners:
32+
- {x: 13.463667, y: -1.1200124, z: -137.81865}
33+
- {x: 48.933567, y: 1.9529065, z: -144.23233}
34+
_lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
35+
_textSize: 20
36+
_textColor: {r: 1, g: 1, b: 1, a: 1}
37+
_probeRadius: 5
38+
DisplayProbes: 0
39+
ToggledNavMeshDisplay: 1
40+
RealTimeEnabled: 1

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter2PathwayConfig.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.

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter3PathwayConfig 1.asset

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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: SlimeCritter3PathwayConfig 1
14+
m_EditorClassIdentifier:
15+
_stopDuration: 0.5
16+
_speed: 1
17+
Waypoints:
18+
- waypoint: {x: 55.830315, y: 2.2067142, z: -125.9238}
19+
corners:
20+
- {x: 55.830315, y: 2.2432482, z: -125.9238}
21+
- {x: 48.529545, y: 1.9230813, z: -139.04124}
22+
- waypoint: {x: 48.529545, y: 1.8736537, z: -139.04124}
23+
corners:
24+
- {x: 48.529545, y: 1.9230813, z: -139.04124}
25+
- {x: 44.915432, y: 1.9276586, z: -120.25296}
26+
- waypoint: {x: 44.915432, y: 1.8812014, z: -120.25296}
27+
corners:
28+
- {x: 44.915432, y: 1.9276586, z: -120.25296}
29+
- {x: 36.647392, y: 2.333554, z: -129.73154}
30+
- waypoint: {x: 36.647392, y: 2.3152366, z: -129.73154}
31+
corners:
32+
- {x: 36.647392, y: 2.333554, z: -129.73154}
33+
- {x: 51.2, y: 2.2866058, z: -128}
34+
- {x: 55.830315, y: 2.2432482, z: -125.9238}
35+
_lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
36+
_textSize: 20
37+
_textColor: {r: 1, g: 1, b: 1, a: 1}
38+
_probeRadius: 5
39+
DisplayProbes: 0
40+
ToggledNavMeshDisplay: 1
41+
RealTimeEnabled: 1

‎UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter3PathwayConfig 1.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)