Skip to content
This repository was archived by the owner on Dec 5, 2018. It is now read-only.

Commit 2f60b1a

Browse files
committed
updated source for new PiratesTutorial
1 parent 63b1f4e commit 2f60b1a

27 files changed

+105
-47
lines changed

workers/unity/Assets/EntityPrefabs/PirateShip.prefab

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ GameObject:
1010
- component: {fileID: 421518}
1111
- component: {fileID: 5458276}
1212
- component: {fileID: 114000014128938252}
13-
- component: {fileID: 114000014179605780}
1413
- component: {fileID: 114000012598071580}
14+
- component: {fileID: 114000014179605780}
15+
- component: {fileID: 114693494242983540}
1516
m_Layer: 0
1617
m_Name: PirateShip
1718
m_TagString: Untagged
@@ -344,7 +345,17 @@ MonoBehaviour:
344345
m_Name:
345346
m_EditorClassIdentifier:
346347
SinkingAnimation: {fileID: 111887891072063252}
347-
ShipWashVfx: {fileID: 0}
348+
--- !u!114 &114693494242983540
349+
MonoBehaviour:
350+
m_ObjectHideFlags: 1
351+
m_PrefabParentObject: {fileID: 0}
352+
m_PrefabInternal: {fileID: 100100000}
353+
m_GameObject: {fileID: 107220}
354+
m_Enabled: 1
355+
m_EditorHideFlags: 0
356+
m_Script: {fileID: 11500000, guid: 648c6ce45d49a5d40b33cf3c6fa4feeb, type: 3}
357+
m_Name:
358+
m_EditorClassIdentifier:
348359
--- !u!136 &136819055678707660
349360
CapsuleCollider:
350361
m_ObjectHideFlags: 1

workers/unity/Assets/EntityPrefabs/PlayerShip.prefab

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ GameObject:
3131
- component: {fileID: 82232867711984960}
3232
- component: {fileID: 82910947041501022}
3333
- component: {fileID: 11410120}
34-
- component: {fileID: 11441326}
35-
- component: {fileID: 114000011511276432}
36-
- component: {fileID: 11432558}
3734
- component: {fileID: 114595786743323458}
35+
- component: {fileID: 114000014020662416}
36+
- component: {fileID: 11432558}
3837
- component: {fileID: 114240029386091736}
3938
- component: {fileID: 11437332}
40-
- component: {fileID: 114000014020662416}
4139
- component: {fileID: 11492204}
42-
- component: {fileID: 114212193579419444}
40+
- component: {fileID: 11441326}
41+
- component: {fileID: 114000011511276432}
4342
- component: {fileID: 11426928}
44-
- component: {fileID: 114000013824945544}
43+
- component: {fileID: 114212193579419444}
44+
- component: {fileID: 114044228279781424}
4545
m_Layer: 0
4646
m_Name: PlayerShip
4747
m_TagString: Untagged
@@ -285,7 +285,6 @@ MonoBehaviour:
285285
m_Name:
286286
m_EditorClassIdentifier:
287287
SinkingAnimation: {fileID: 111238256083466764}
288-
ShipWashVfx: {fileID: 0}
289288
--- !u!114 &11432558
290289
MonoBehaviour:
291290
m_ObjectHideFlags: 1
@@ -568,26 +567,26 @@ MonoBehaviour:
568567
m_Script: {fileID: 11500000, guid: 4bd65058a0d21174fbeda699c27c4733, type: 3}
569568
m_Name:
570569
m_EditorClassIdentifier:
571-
--- !u!114 &114000013824945544
570+
--- !u!114 &114000014020662416
572571
MonoBehaviour:
573572
m_ObjectHideFlags: 1
574573
m_PrefabParentObject: {fileID: 0}
575574
m_PrefabInternal: {fileID: 100100000}
576575
m_GameObject: {fileID: 107220}
577576
m_Enabled: 1
578577
m_EditorHideFlags: 0
579-
m_Script: {fileID: 11500000, guid: ab317b2a3a7a4534283417773793ca8f, type: 3}
578+
m_Script: {fileID: 11500000, guid: a6fafd46819d7b64eb2eec65e1cb4b79, type: 3}
580579
m_Name:
581580
m_EditorClassIdentifier:
582-
--- !u!114 &114000014020662416
581+
--- !u!114 &114044228279781424
583582
MonoBehaviour:
584583
m_ObjectHideFlags: 1
585584
m_PrefabParentObject: {fileID: 0}
586585
m_PrefabInternal: {fileID: 100100000}
587586
m_GameObject: {fileID: 107220}
588587
m_Enabled: 1
589588
m_EditorHideFlags: 0
590-
m_Script: {fileID: 11500000, guid: a6fafd46819d7b64eb2eec65e1cb4b79, type: 3}
589+
m_Script: {fileID: 11500000, guid: 648c6ce45d49a5d40b33cf3c6fa4feeb, type: 3}
591590
m_Name:
592591
m_EditorClassIdentifier:
593592
--- !u!114 &114212193579419444

workers/unity/Assets/GameResources/Models/Cannonball.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ SphereCollider:
111111
m_IsTrigger: 1
112112
m_Enabled: 1
113113
serializedVersion: 2
114-
m_Radius: 12.5
114+
m_Radius: 20
115115
m_Center: {x: 0, y: 0, z: 0}
116116
--- !u!1001 &100100000
117117
Prefab:

workers/unity/Assets/Gamelogic/Core/SimulationSettings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,8 @@ public static class SimulationSettings
8383
// Camera
8484
public static readonly string CameraRootName = "Main Camera";
8585
public static readonly string CameraName = "Camera";
86+
87+
// Tags
88+
public static readonly string CannonballTag = "Cannonball";
8689
}
8790
}

workers/unity/Assets/Gamelogic/Creatures.meta

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

workers/unity/Assets/Gamelogic/Pirates/Behaviours/Creatures.meta renamed to workers/unity/Assets/Gamelogic/Creatures/Behaviours.meta

File renamed without changes.

workers/unity/Assets/Gamelogic/Pirates/Behaviours/Creatures/CentralAttractionSteeringInfluence.cs renamed to workers/unity/Assets/Gamelogic/Creatures/Behaviours/CentralAttractionSteeringInfluence.cs

File renamed without changes.

workers/unity/Assets/Gamelogic/Pirates/Behaviours/Creatures/CentralAttractionSteeringInfluence.cs.meta renamed to workers/unity/Assets/Gamelogic/Creatures/Behaviours/CentralAttractionSteeringInfluence.cs.meta

File renamed without changes.

workers/unity/Assets/Gamelogic/Pirates/Behaviours/Creatures/FlockingSteeringInfluence.cs renamed to workers/unity/Assets/Gamelogic/Creatures/Behaviours/FlockingSteeringInfluence.cs

File renamed without changes.

workers/unity/Assets/Gamelogic/Pirates/Behaviours/Creatures/FlockingSteeringInfluence.cs.meta renamed to workers/unity/Assets/Gamelogic/Creatures/Behaviours/FlockingSteeringInfluence.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)