From 0285acbb43a820a86d7047833224f378de2a64a3 Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Thu, 25 Apr 2019 13:42:07 +1000 Subject: [PATCH] updated prefabs --- Assets/Prefabs/GameManager.prefab | 65 +++++++++ Assets/Prefabs/GameManager.prefab.meta | 7 + .../Server Scenes/ServerTestScene.unity | 132 +++++++++--------- Assets/Scripts/Components.meta | 8 ++ 4 files changed, 149 insertions(+), 63 deletions(-) create mode 100644 Assets/Prefabs/GameManager.prefab create mode 100644 Assets/Prefabs/GameManager.prefab.meta create mode 100644 Assets/Scripts/Components.meta diff --git a/Assets/Prefabs/GameManager.prefab b/Assets/Prefabs/GameManager.prefab new file mode 100644 index 0000000..7e67977 --- /dev/null +++ b/Assets/Prefabs/GameManager.prefab @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1698745550996942700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1698745550996942701} + - component: {fileID: 1698745550996942698} + - component: {fileID: 1698745550996942699} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1698745550996942701 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698745550996942700} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0356328, y: -1.4375196, z: -0.7047038} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1698745550996942698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698745550996942700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a22c943adbcdf7f4d8c3b5dee307012d, type: 3} + m_Name: + m_EditorClassIdentifier: + AnimationTime: 1 + CurrentGameMode: {fileID: 1698745550996942699} + characterPrefab: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + server: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2} + ClientList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} +--- !u!114 &1698745550996942699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698745550996942700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 409aae8124657b749a57c1c665917371, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxRound: 5 diff --git a/Assets/Prefabs/GameManager.prefab.meta b/Assets/Prefabs/GameManager.prefab.meta new file mode 100644 index 0000000..100e98f --- /dev/null +++ b/Assets/Prefabs/GameManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a199dd5d5f6e9ad48966d0d0a8961305 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Server Scenes/ServerTestScene.unity b/Assets/Scenes/Server Scenes/ServerTestScene.unity index 75fccd7..b6fd71e 100644 --- a/Assets/Scenes/Server Scenes/ServerTestScene.unity +++ b/Assets/Scenes/Server Scenes/ServerTestScene.unity @@ -1788,69 +1788,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1101212183} m_PrefabAsset: {fileID: 0} ---- !u!1 &1126605994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1126605995} - - component: {fileID: 1126605996} - - component: {fileID: 1126605997} - m_Layer: 0 - m_Name: GameManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1126605995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1126605994} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.0356328, y: -1.4375196, z: -0.7047038} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1126605996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1126605994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a22c943adbcdf7f4d8c3b5dee307012d, type: 3} - m_Name: - m_EditorClassIdentifier: - AnimationTime: 1 - CurrentGameMode: {fileID: 1126605997} - characterPrefab: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - server: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2} - ClientList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} ---- !u!114 &1126605997 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1126605994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 409aae8124657b749a57c1c665917371, type: 3} - m_Name: - m_EditorClassIdentifier: - MaxRound: 5 --- !u!1001 &1424436106 PrefabInstance: m_ObjectHideFlags: 0 @@ -2772,3 +2709,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2140681812} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1698745552051899334 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1698745550996942700, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_Name + value: GameManager + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.0356328 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.4375196 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.7047038 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} diff --git a/Assets/Scripts/Components.meta b/Assets/Scripts/Components.meta new file mode 100644 index 0000000..5a95b09 --- /dev/null +++ b/Assets/Scripts/Components.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d7394d70ec233849a60a26da5f23b75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: