Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit 33c2d72

Browse files
zeroZshadowjamiebrynes7
authored andcommitted
Entity representation (#282)
* Refactor AdvancedEntityPipeline to use new entity representation workflow Update gitignore for worker inspector stuff * Update to latest pin * Update pin to develop * Changelog * Link up MobileClient prefabs * Move Entity prefabs out of Resources folder
1 parent 174cb13 commit 33c2d72

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

+227
-71
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ sysinfo.txt
3939
# Once a directory is ignored by git, nothing underneath it can ever be un-ignored.
4040
workers/unity/Assets/Generated/Source.meta
4141
workers/unity/Assets/Generated/Source/**/*.*
42+
workers/unity/Assets/Generated/Editor.meta
43+
workers/unity/Assets/Generated/Editor/**/*.*
4244

4345
workers/unity/Assets/Plugins/Improbable/
4446
workers/unity/Assets/Plugins/Improbable.meta
@@ -47,4 +49,4 @@ workers/unity/Assets/Plugins/Improbable.meta
4749
schema/from_gdk_packages
4850
_ReSharper.Caches
4951

50-
.shared-ci/
52+
.shared-ci/

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
## Unreleased
44

5+
### Changed
6+
7+
- Updated project to use Entity Representation assets. [#282](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/282)
8+
59
## `0.3.7` - 2020-06-22
610

711
### Changed
812

913
- Upgraded to GDK for Unity version `0.3.7`
14+
1015
## `0.3.6` - 2020-05-26
1116

1217
### Changed
@@ -25,6 +30,7 @@
2530
### Changed
2631

2732
- Upgraded to GDK for Unity version `0.3.5`
33+
2834
## Breaking Changes
2935

3036
- The FPS Starter Project now requires Unity 2019.3. [#263](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/263)
@@ -65,11 +71,13 @@
6571
### Changed
6672

6773
- Upgraded to GDK for Unity version `0.3.2`
74+
6875
## `0.3.1` - 2019-11-25
6976

7077
### Changed
7178

7279
- Upgraded to GDK for Unity version `0.3.1`
80+
7381
## `0.3.0` - 2019-11-11
7482

7583
### Breaking Changes

gdk.pinned

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
develop 46be8d892f3d1a1ddd62d202200c0c227a02ca4a
1+
develop da81d115c675dc6e2ad1226a149740974a260ba6

workers/unity/Assets/Config/DeploymentLauncherConfig.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@ MonoBehaviour:
2424
SnapshotPath: snapshots/cloud.snapshot
2525
LaunchJson: cloud_launch_large.json
2626
Region: 1
27+
Cluster:
28+
DeploymentLocationType: 0
2729
Tags:
2830
- dev_login
2931
SimulatedPlayerDeploymentConfigs:
3032
- Name: my_deployment_sim1
3133
SnapshotPath:
3234
LaunchJson: cloud_launch_large_sim_players.json
3335
Region: 1
36+
Cluster:
37+
DeploymentLocationType: 0
3438
Tags: []
3539
TargetDeploymentName: my_deployment
3640
FlagPrefix: fps
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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: f0598980a22146e5bb63df7b024cf2b0, type: 3}
13+
m_Name: ClientPrefabMapping
14+
m_EditorClassIdentifier:
15+
EntityRepresentationResolvers:
16+
- id: 0
17+
references:
18+
version: 1
19+
00000000:
20+
type: {class: OwningWorkerEntityResolver, ns: Improbable.Gdk.PlayerLifecycle.Representation.Types,
21+
asm: Improbable.Gdk.PlayerLifecycle}
22+
data:
23+
entityType: Player
24+
ownedPrefab: {fileID: 1627949407420470, guid: b6af319831f5fe74eb2e117f9173ff14,
25+
type: 3}
26+
unownedPrefab: {fileID: 1807652507279196, guid: fdfee44fbe3bb214693dc1e6ec7ef5b2,
27+
type: 3}
28+
requiredComponents:

workers/unity/Assets/Fps/Config/ClientPrefabMapping.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.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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: f0598980a22146e5bb63df7b024cf2b0, type: 3}
13+
m_Name: GamelogicPrefabMapping
14+
m_EditorClassIdentifier:
15+
EntityRepresentationResolvers:
16+
- id: 0
17+
references:
18+
version: 1
19+
00000000:
20+
type: {class: SimpleEntityResolver, ns: Improbable.Gdk.Core.Representation.Types,
21+
asm: Improbable.Gdk.Core}
22+
data:
23+
entityType: Player
24+
prefab: {fileID: 1777598867489458, guid: 2fde7fec7be0d62439e66cd3fa72e0c4,
25+
type: 3}
26+
requiredComponents:

workers/unity/Assets/Fps/Config/GamelogicPrefabMapping.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.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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: f0598980a22146e5bb63df7b024cf2b0, type: 3}
13+
m_Name: MobileClientPrefabMapping
14+
m_EditorClassIdentifier:
15+
EntityRepresentationResolvers:
16+
- id: 0
17+
references:
18+
version: 1
19+
00000000:
20+
type: {class: OwningWorkerEntityResolver, ns: Improbable.Gdk.PlayerLifecycle.Representation.Types,
21+
asm: Improbable.Gdk.PlayerLifecycle}
22+
data:
23+
entityType: Player
24+
ownedPrefab: {fileID: 1627949407420470, guid: 59c90f30dbf70d7469cc42d3dba698a7,
25+
type: 3}
26+
unownedPrefab: {fileID: 1807652507279196, guid: d75bb324f37f5714ea7f2f98e2f362c0,
27+
type: 3}
28+
requiredComponents:

workers/unity/Assets/Fps/Config/MobileClientPrefabMapping.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)