From b73a3b34142a11e977792ee1ca4adf991dca161f Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Thu, 25 Apr 2019 13:36:21 +1000 Subject: [PATCH] removed testing scenes. Multiplayer works but is not polished. --- .../Server/Realtime/ClientList.asset | 4 +- Assets/Editor/SceneCameraEditor.cs | 5 +- .../ClientScene.unity | 0 .../ClientScene.unity.meta | 0 Assets/Scenes/Client Scenes/LoginScreen.unity | 314 ++++++++++++++++- .../Networking Test Scenes/ClientLogin.unity | 315 ----------------- .../ClientLogin.unity.meta | 7 - .../Networking Test Scenes/ServerScene.unity | 327 ------------------ .../ServerScene.unity.meta | 7 - Assets/Scenes/Server Scenes/Lobby.unity | 10 +- .../Server Scenes/ServerTestScene.unity | 53 +++ Assets/Scripts/Character.cs | 59 ++-- .../GameMode.meta} | 2 +- Assets/Scripts/GameMode/ColorGameMode.cs | 44 +++ Assets/Scripts/GameMode/ColorGameMode.cs.meta | 11 + Assets/Scripts/GameMode/GameMode.cs | 15 + Assets/Scripts/GameMode/GameMode.cs.meta | 11 + Assets/Scripts/Managers/GameManager.cs | 117 ++++++- .../Server/{ClientData.cs => ClientList.cs} | 9 +- ...{ClientData.cs.meta => ClientList.cs.meta} | 0 .../Scripts/Networking/Server/ServerObject.cs | 2 +- Assets/Scripts/PortalSetup.cs | 2 +- Assets/Scripts/UI/Client/LoginUIManager.cs | 12 + Assets/Scripts/UI/Lobby/LobbyUIController.cs | 2 +- Assets/Scripts/UI/ScoreBoard.cs | 2 +- Assets/Scripts/portalTesting.cs | 2 +- .../About/Editor/pg_AboutWindow.cs.meta | 3 +- .../ProGrids/Classes/pg_Constant.cs.meta | 3 +- .../ProCore/ProGrids/Classes/pg_Enum.cs.meta | 3 +- .../ProGrids/Classes/pg_IconUtility.cs.meta | 3 +- .../Classes/pg_IgnoreSnapAttribute.cs.meta | 3 +- .../ProCore/ProGrids/Editor/pg_Editor.cs.meta | 3 +- .../ProGrids/Editor/pg_GridRenderer.cs.meta | 3 +- .../Editor/pg_ParameterWindow.cs.meta | 3 +- .../ProGrids/Editor/pg_Preferences.cs.meta | 3 +- .../ProGrids/Editor/pg_ToggleContent.cs.meta | 3 +- .../ProGrids2_Button_Hover.png.meta | 26 +- .../ProGrids2_Button_Normal.png.meta | 24 +- .../ProGrids2_GUI_AngleVis_Off.png.meta | 24 +- .../ProGrids2_GUI_AngleVis_On.png.meta | 24 +- .../ProGrids2_GUI_Divider.png.meta | 24 +- .../ProGrids2_GUI_PGrid_3D_Off.png.meta | 24 +- .../ProGrids2_GUI_PGrid_3D_On.png.meta | 24 +- .../ProGrids2_GUI_PGrid_Lock_Off.png.meta | 24 +- .../ProGrids2_GUI_PGrid_Lock_On.png.meta | 24 +- .../ProGrids2_GUI_PGrid_X_Off.png.meta | 24 +- .../ProGrids2_GUI_PGrid_X_On.png.meta | 24 +- .../ProGrids2_GUI_PGrid_Y_Off.png.meta | 24 +- .../ProGrids2_GUI_PGrid_Y_On.png.meta | 24 +- .../ProGrids2_GUI_PGrid_Z_Off.png.meta | 24 +- .../ProGrids2_GUI_PGrid_Z_On.png.meta | 24 +- .../ProGrids2_GUI_PushToGrid_Normal.png.meta | 24 +- .../ProGrids2_GUI_PushToGrid_Pressed.png.meta | 24 +- .../ProGrids2_GUI_Snap_Off.png.meta | 24 +- .../ProGrids2_GUI_Snap_On.png.meta | 24 +- .../ProGrids2_GUI_Vis_Off.png.meta | 24 +- .../ProGrids2_GUI_Vis_On.png.meta | 24 +- .../ProGrids2_MenuExtendo_Close.png.meta | 26 +- .../ProGrids2_MenuExtendo_Open.png.meta | 26 +- .../MonoBehaviour/pg_IgnoreSnap.cs.meta | 3 +- .../ProGrids/Shader/pg_GridShader.shader.meta | 4 +- ProjectSettings/EditorBuildSettings.asset | 4 +- 62 files changed, 1048 insertions(+), 883 deletions(-) rename Assets/Scenes/{Networking Test Scenes => Client Scenes}/ClientScene.unity (100%) rename Assets/Scenes/{Networking Test Scenes => Client Scenes}/ClientScene.unity.meta (100%) delete mode 100644 Assets/Scenes/Networking Test Scenes/ClientLogin.unity delete mode 100644 Assets/Scenes/Networking Test Scenes/ClientLogin.unity.meta delete mode 100644 Assets/Scenes/Networking Test Scenes/ServerScene.unity delete mode 100644 Assets/Scenes/Networking Test Scenes/ServerScene.unity.meta rename Assets/{Scenes/Networking Test Scenes.meta => Scripts/GameMode.meta} (77%) create mode 100644 Assets/Scripts/GameMode/ColorGameMode.cs create mode 100644 Assets/Scripts/GameMode/ColorGameMode.cs.meta create mode 100644 Assets/Scripts/GameMode/GameMode.cs create mode 100644 Assets/Scripts/GameMode/GameMode.cs.meta rename Assets/Scripts/Networking/Server/{ClientData.cs => ClientList.cs} (95%) rename Assets/Scripts/Networking/Server/{ClientData.cs.meta => ClientList.cs.meta} (100%) diff --git a/Assets/Data/Networking/Server/Realtime/ClientList.asset b/Assets/Data/Networking/Server/Realtime/ClientList.asset index 4fb9f8e..d40bf31 100644 --- a/Assets/Data/Networking/Server/Realtime/ClientList.asset +++ b/Assets/Data/Networking/Server/Realtime/ClientList.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f155976e5e630ea823177f26a8061c85933c25ecdbba65eadca7013bf9dda20 -size 443 +oid sha256:dc1ec7c5075e33efd474f1ddf3c7218ba21681a156fb152c89f3fba581b02fea +size 499 diff --git a/Assets/Editor/SceneCameraEditor.cs b/Assets/Editor/SceneCameraEditor.cs index 9e1a4c5..2ba1686 100644 --- a/Assets/Editor/SceneCameraEditor.cs +++ b/Assets/Editor/SceneCameraEditor.cs @@ -16,9 +16,10 @@ public class SceneViewCameraTest Vector3 position = Camera.main.transform.position; Quaternion rotation = Camera.main.transform.rotation; - SceneView.lastActiveSceneView.size = 0.1f; + //SceneView.lastActiveSceneView.size = 0.1f; SceneView.lastActiveSceneView.rotation = rotation; SceneView.lastActiveSceneView.pivot = position; + SceneView.lastActiveSceneView.pivot += Camera.main.transform.forward * SceneView.lastActiveSceneView.size; SceneView.lastActiveSceneView.Repaint(); @@ -36,7 +37,7 @@ public class SceneViewCameraTest GameObject camera = Camera.main.gameObject; - Undo.RegisterCompleteObjectUndo(camera, "Snapped Camera to Scene View"); + Undo.RegisterCompleteObjectUndo(camera.transform, "Snapped Camera to Scene View"); camera.transform.position = SceneView.lastActiveSceneView.pivot; camera.transform.rotation = SceneView.lastActiveSceneView.rotation; diff --git a/Assets/Scenes/Networking Test Scenes/ClientScene.unity b/Assets/Scenes/Client Scenes/ClientScene.unity similarity index 100% rename from Assets/Scenes/Networking Test Scenes/ClientScene.unity rename to Assets/Scenes/Client Scenes/ClientScene.unity diff --git a/Assets/Scenes/Networking Test Scenes/ClientScene.unity.meta b/Assets/Scenes/Client Scenes/ClientScene.unity.meta similarity index 100% rename from Assets/Scenes/Networking Test Scenes/ClientScene.unity.meta rename to Assets/Scenes/Client Scenes/ClientScene.unity.meta diff --git a/Assets/Scenes/Client Scenes/LoginScreen.unity b/Assets/Scenes/Client Scenes/LoginScreen.unity index d78882f..c257dba 100644 --- a/Assets/Scenes/Client Scenes/LoginScreen.unity +++ b/Assets/Scenes/Client Scenes/LoginScreen.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1233,6 +1233,7 @@ RectTransform: m_Children: - {fileID: 1584683394} - {fileID: 425791971} + - {fileID: 867460041} m_Father: {fileID: 872212415} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1375,11 +1376,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -1475,6 +1476,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 742666697} m_CullTransparentMesh: 0 +--- !u!1 &767094814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 767094815} + - component: {fileID: 767094817} + - component: {fileID: 767094816} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &767094815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767094814} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1402432928} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &767094816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767094814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Go To Trough +--- !u!222 &767094817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767094814} + m_CullTransparentMesh: 0 --- !u!1 &822919925 GameObject: m_ObjectHideFlags: 0 @@ -1747,6 +1827,81 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &867460038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 867460041} + - component: {fileID: 867460040} + - component: {fileID: 867460039} + m_Layer: 0 + m_Name: Wait forPlayers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &867460039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867460038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &867460040 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867460038} + m_CullTransparentMesh: 0 +--- !u!224 &867460041 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867460038} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1402432928} + m_Father: {fileID: 649403256} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.001953125, y: 0.0022583008} + m_SizeDelta: {x: 0.19995117, y: 0.009979248} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &872212410 GameObject: m_ObjectHideFlags: 0 @@ -1787,6 +1942,8 @@ MonoBehaviour: DetailsTitle: Player Details DetailsObject: {fileID: 425791970} WaitTitle: Wait for Players + SceneToLoad: ClientScene + WaitObject: {fileID: 867460038} --- !u!114 &872212412 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2163,11 +2320,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2325,11 +2482,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2811,11 +2968,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -3058,11 +3215,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -3159,6 +3316,135 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377133505} m_CullTransparentMesh: 0 +--- !u!1 &1402432927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1402432928} + - component: {fileID: 1402432931} + - component: {fileID: 1402432930} + - component: {fileID: 1402432929} + m_Layer: 0 + m_Name: btn_Connect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1402432928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402432927} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 767094815} + m_Father: {fileID: 867460041} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 188.59998, y: -91} + m_SizeDelta: {x: 286.09998, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1402432929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402432927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1402432930} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 872212411} + m_MethodName: OnClick_Ready + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1402432930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402432927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93725497, g: 0.42352945, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1402432931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402432927} + m_CullTransparentMesh: 0 --- !u!1 &1409883284 GameObject: m_ObjectHideFlags: 0 @@ -3701,11 +3987,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 0 + m_havePropertiesChanged: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 + m_isInputParsingRequired: 1 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -3873,7 +4159,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1584683394 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Networking Test Scenes/ClientLogin.unity b/Assets/Scenes/Networking Test Scenes/ClientLogin.unity deleted file mode 100644 index 3ebec86..0000000 --- a/Assets/Scenes/Networking Test Scenes/ClientLogin.unity +++ /dev/null @@ -1,315 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_LightmapEditorSettings: - serializedVersion: 10 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &631914030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 631914032} - - component: {fileID: 631914031} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &631914031 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 631914030} - m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &631914032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 631914030} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &875866895 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 875866898} - - component: {fileID: 875866897} - - component: {fileID: 875866896} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &875866896 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 875866895} - m_Enabled: 1 ---- !u!20 &875866897 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 875866895} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &875866898 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 875866895} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - 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!1 &1630438942 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1630438944} - - component: {fileID: 1630438943} - m_Layer: 0 - m_Name: ClientManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1630438943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1630438942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba11049d7524f774eb34622bbf83084b, type: 3} - m_Name: - m_EditorClassIdentifier: - ServerIP: 127.0.0.1 - Port: 2222 - StartClientOnAwake: 1 - LevelToLoad: ClientScene - DisplayName: Josh - PlayerColor: {r: 0.8490566, g: 0.03604484, b: 0.41602722, a: 1} - Client: {fileID: 11400000, guid: 8dca4719b56d91143b236583a436c911, type: 2} ---- !u!4 &1630438944 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1630438942} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Networking Test Scenes/ClientLogin.unity.meta b/Assets/Scenes/Networking Test Scenes/ClientLogin.unity.meta deleted file mode 100644 index 70ee308..0000000 --- a/Assets/Scenes/Networking Test Scenes/ClientLogin.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5dfdfd16afd13c746a261404b00a2538 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Networking Test Scenes/ServerScene.unity b/Assets/Scenes/Networking Test Scenes/ServerScene.unity deleted file mode 100644 index ab0b5d1..0000000 --- a/Assets/Scenes/Networking Test Scenes/ServerScene.unity +++ /dev/null @@ -1,327 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_LightmapEditorSettings: - serializedVersion: 10 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &143416560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 143416563} - - component: {fileID: 143416562} - - component: {fileID: 143416561} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &143416561 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143416560} - m_Enabled: 1 ---- !u!20 &143416562 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143416560} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &143416563 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143416560} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - 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!1 &533897901 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 533897903} - - component: {fileID: 533897902} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &533897902 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 533897901} - m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &533897903 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 533897901} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &2055869448 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2055869450} - - component: {fileID: 2055869449} - - component: {fileID: 2055869451} - m_Layer: 0 - m_Name: ServerManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2055869449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2055869448} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 220b4889c8b3f7b4f84286ba8773e1b6, type: 3} - m_Name: - m_EditorClassIdentifier: - Port: 2222 - StartServerOnAwake: 1 - Server: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2} ---- !u!4 &2055869450 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2055869448} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.5589285, y: -2.3487442, z: 2.134001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2055869451 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2055869448} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77e0f9f175af31a4ba73a060da4829e5, type: 3} - m_Name: - m_EditorClassIdentifier: - server: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2} - reader: - LogicChain: [] diff --git a/Assets/Scenes/Networking Test Scenes/ServerScene.unity.meta b/Assets/Scenes/Networking Test Scenes/ServerScene.unity.meta deleted file mode 100644 index 365df61..0000000 --- a/Assets/Scenes/Networking Test Scenes/ServerScene.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 76a17602039943f4a8ea64c13c2d8050 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Server Scenes/Lobby.unity b/Assets/Scenes/Server Scenes/Lobby.unity index aa2dc23..dd412aa 100644 --- a/Assets/Scenes/Server Scenes/Lobby.unity +++ b/Assets/Scenes/Server Scenes/Lobby.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -144,7 +144,7 @@ RectTransform: m_Children: - {fileID: 623206018} m_Father: {fileID: 872212415} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -587,7 +587,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Clients: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} - SceneToStart: ColourCollideOne + SceneToStart: ServerTestScene IPText: {fileID: 910932172} Content: {fileID: 1584683394} ClientTag: {fileID: 263791918} @@ -669,8 +669,8 @@ RectTransform: m_Children: - {fileID: 165353639} - {fileID: 1377133506} - - {fileID: 90571881} - {fileID: 1584683394} + - {fileID: 90571881} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1239,7 +1239,7 @@ RectTransform: m_Children: - {fileID: 263791921} m_Father: {fileID: 872212415} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scenes/Server Scenes/ServerTestScene.unity b/Assets/Scenes/Server Scenes/ServerTestScene.unity index 87ea6c3..75fccd7 100644 --- a/Assets/Scenes/Server Scenes/ServerTestScene.unity +++ b/Assets/Scenes/Server Scenes/ServerTestScene.unity @@ -419,6 +419,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &308885819 stripped @@ -1770,6 +1775,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &1101212184 stripped @@ -1787,6 +1797,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1126605995} + - component: {fileID: 1126605996} + - component: {fileID: 1126605997} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -1808,6 +1820,37 @@ Transform: 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 @@ -1926,6 +1969,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &1437209178 stripped @@ -2556,6 +2604,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8101348915751558870, guid: d7698c69246c64044ab2a94628bf0291, + type: 3} + propertyPath: isSpawnable + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &2068018197 stripped diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index bb682f1..9168acc 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -10,9 +10,10 @@ public class Character : MonoBehaviour Animator characterAnimator; #region Inspector Fields + [SerializeField] [Tooltip("Will move to this block at start, else will try and find a block below")] - private Block CurrentBlock; + private Block _currentBlock; [SerializeField] [Tooltip("Layers to ignore when checking for blocks")] @@ -21,34 +22,48 @@ public class Character : MonoBehaviour [Tooltip("Current Inventory of the player")] public Inventory Inventory; + [SerializeField] + [Tooltip("Character to display")] + private string CharacterModel = "Bear"; + #endregion Inspector Fields + #region Read Only + public Block CurrentBlock { get { return _currentBlock; } } + #endregion Read Only + #region Unity Functions - private void Awake() + private void Start() { if (Inventory != null) Inventory = Inventory.Clone(Inventory); //If no starting block find one below it - if (CurrentBlock == null) - Block.isBlockAtPosition(transform.position + Vector3.down / 2, 1, ~Ignore, out CurrentBlock); + if (_currentBlock == null) + Block.isBlockAtPosition(transform.position + Vector3.down / 2, 1, ~Ignore, out _currentBlock); //move to starting block - //transform.position = CurrentBlock.VisualPosition; + transform.position = _currentBlock.VisualPosition; //get character string from player replace from "Bear" - GameObject prefab = Resources.Load("Bear") as GameObject; + GameObject prefab = Resources.Load(CharacterModel) as GameObject; GameObject Bear = Instantiate(prefab, this.gameObject.transform); characterAnimator = GetComponentInChildren(); } + + #endregion Unity Functions #region Class Implementation - public void Initialise() { } + public void Initialise(Block startingBlock, Inventory inventory, string Character) { + _currentBlock = startingBlock; + Inventory = inventory; + CharacterModel = Character; + } public Vector3 yValue(float time, float heightMultiplier) @@ -133,9 +148,9 @@ public class Character : MonoBehaviour public void Move(Direction direction, float speed) { //setting up variables - Vector3 position = CurrentBlock.position + direction.ToVector(transform); // position wanted + Vector3 position = _currentBlock.position + direction.ToVector(transform); // position wanted Block hit; //output of block detection - Block moveTo = CurrentBlock; //block we'll actually move to + Block moveTo = _currentBlock; //block we'll actually move to //if move is obstucted no where to move if (Block.isBlockAtPosition(position + Vector3.up, 1, ~Ignore)) @@ -145,13 +160,13 @@ public class Character : MonoBehaviour //If block at Position is walkable set it to moveTo if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)){ moveTo = hit; - CurrentBlock = moveTo; - StartCoroutine(MoveCoroutine(CurrentBlock, transform, speed, 0.3f)); } + _currentBlock = moveTo; + StartCoroutine(MoveCoroutine(_currentBlock, transform, speed, 0.3f)); } //else if block down one is walkable else if (Block.isBlockAtPosition(position + Vector3.down, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)){ moveTo = hit; - CurrentBlock = moveTo; - StartCoroutine(MoveDownCoroutine(CurrentBlock, transform, speed, 0.3f)); + _currentBlock = moveTo; + StartCoroutine(MoveDownCoroutine(_currentBlock, transform, speed, 0.3f)); } //set current block && move //CurrentBlock = moveTo; @@ -201,7 +216,7 @@ public class Character : MonoBehaviour public void Jump(Direction direction, float speed) { //if there is a block infront JumpUp else LongJump - if (Block.isBlockAtPosition(CurrentBlock.position + direction.ToVector(transform) + Vector3.up, 1, ~Ignore)) + if (Block.isBlockAtPosition(_currentBlock.position + direction.ToVector(transform) + Vector3.up, 1, ~Ignore)) JumpUp(direction, speed); else JumpLong(direction, speed); @@ -221,13 +236,13 @@ public class Character : MonoBehaviour //setting up variables Vector3 position; // position wanted Block hit; //output of block detection - Block moveTo = CurrentBlock; //block we'll actually move to + Block moveTo = _currentBlock; //block we'll actually move to //Check blocks in going up then move to the heighest walkable one for (int i = 0; i <= height; i++) { //next position up the tower - position = CurrentBlock.position + direction.ToVector(transform) + (Vector3.up * i); + position = _currentBlock.position + direction.ToVector(transform) + (Vector3.up * i); //if block is walkable set it to last known position if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) @@ -235,8 +250,8 @@ public class Character : MonoBehaviour } //set current block && move - CurrentBlock = moveTo; - StartCoroutine(JumpCoroutine(CurrentBlock, transform, speed, 0.5f)); + _currentBlock = moveTo; + StartCoroutine(JumpCoroutine(_currentBlock, transform, speed, 0.5f)); //transform.position = CurrentBlock.VisualPosition; } @@ -250,13 +265,13 @@ public class Character : MonoBehaviour //setting up variables Vector3 position; // position wanted Block hit; //output of block detection - Block moveTo = CurrentBlock; //block we'll actually move to + Block moveTo = _currentBlock; //block we'll actually move to //Check blocks in front until we hit an obstruction or went the distance for (int i = 1; i <= Distance; i++) { //Next position to MoveTo - position = CurrentBlock.position + (direction.ToVector(transform) * i); + position = _currentBlock.position + (direction.ToVector(transform) * i); //if jump is obstructed, stop and go to last known block if (Block.isBlockAtPosition(position + Vector3.up, 1, ~Ignore)) @@ -273,8 +288,8 @@ public class Character : MonoBehaviour }//end for //Set Current Block and move - CurrentBlock = moveTo; - StartCoroutine(JumpCoroutine(CurrentBlock, transform, speed, 0.5f)); + _currentBlock = moveTo; + StartCoroutine(JumpCoroutine(_currentBlock, transform, speed, 0.5f)); //transform.position = CurrentBlock.VisualPosition; } diff --git a/Assets/Scenes/Networking Test Scenes.meta b/Assets/Scripts/GameMode.meta similarity index 77% rename from Assets/Scenes/Networking Test Scenes.meta rename to Assets/Scripts/GameMode.meta index 0ab339f..ab37043 100644 --- a/Assets/Scenes/Networking Test Scenes.meta +++ b/Assets/Scripts/GameMode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b00be84ab0e5f043868ec15b234a082 +guid: 69b459538c1d9f941a2883ba49f95d85 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/GameMode/ColorGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode.cs new file mode 100644 index 0000000..6367f12 --- /dev/null +++ b/Assets/Scripts/GameMode/ColorGameMode.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Networking.Server; + +public class ColorGameMode : GameMode +{ + + public int MaxRound = 5; + + private int RoundCount = 0; + + + /// + /// Called once all players have finished their moves but before the Objective is checked + /// + public override void OnRoundFinished() + { + RoundCount++; + } + + /// + /// Checks if the Game is finished + /// + /// returns if game is finished + public override bool isGameOver() + { + return (RoundCount <= MaxRound); + } + + + /// + /// Called once per player after they have moved onto a block + /// + /// Character whic hmoved + /// Client of the character + /// Block moved onto + public override void OnPlayerFinishedMove(Character character,ClientData client, Block currentBlock) + { + + //Code for changing block color and updating player scores; + + } +} diff --git a/Assets/Scripts/GameMode/ColorGameMode.cs.meta b/Assets/Scripts/GameMode/ColorGameMode.cs.meta new file mode 100644 index 0000000..85128ce --- /dev/null +++ b/Assets/Scripts/GameMode/ColorGameMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 409aae8124657b749a57c1c665917371 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameMode/GameMode.cs b/Assets/Scripts/GameMode/GameMode.cs new file mode 100644 index 0000000..6cb5314 --- /dev/null +++ b/Assets/Scripts/GameMode/GameMode.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Networking.Server; + +public abstract class GameMode : MonoBehaviour +{ + + + public abstract void OnPlayerFinishedMove(Character character, ClientData client, Block currentBlock); + + public abstract bool isGameOver(); + + public abstract void OnRoundFinished(); +} diff --git a/Assets/Scripts/GameMode/GameMode.cs.meta b/Assets/Scripts/GameMode/GameMode.cs.meta new file mode 100644 index 0000000..ebba419 --- /dev/null +++ b/Assets/Scripts/GameMode/GameMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b79a34317fa8d04f9926242d2db0f96 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 1c6a75e..fde1885 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -2,12 +2,20 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; +using UnityEngine.Networking; using Networking.Server; +using Networking; public class GameManager : MonoBehaviour { #region Inspector Field + [Header("Settings")] + [SerializeField] + private float AnimationTime; + [SerializeField] + private GameMode CurrentGameMode; + [Header("References")] [SerializeField] @@ -15,34 +23,129 @@ public class GameManager : MonoBehaviour private Character characterPrefab; [SerializeField] - private ConnectionHandler ClientList; + private ServerObject server; + + [SerializeField] + private ClientList ClientList; + #endregion Inspector Field #region Private Variables - private Block[] SpawnBlocks; + private Dictionary playerData; #endregion Private Variables - public void Start() + public void Awake() { - SpawnBlocks = FindObjectsOfType().Where(p => p.isSpawnable).ToArray(); + RegisterHandlers(); + SpawnCharacters(); + } + private void Update() + { + server.ServerUpdate(); + } + private void RecieveLogicList(NetworkMessage msg) + { + LogicProtocols.LogicMsg logicMsg; + if (!msg.TryRead(out logicMsg)) + { + Debug.Log("Recieved unknown message"); + return; + } + + Debug.Log("Recieved function from " + msg.conn.connectionId); + + playerData[msg.conn.connectionId].blockReader.LogicChain = new List(logicMsg.elements); + playerData[msg.conn.connectionId].recievedList = true; + + if (playerData.All(p => p.Value.recievedList)) + StartRound(); + } + + private void StartRound() + { + Debug.Log("Starting Round"); + StartCoroutine(RoundRoutine()); } + private IEnumerator RoundRoutine() + { + + playerData.ForEach(p => p.Value.recievedList = false); + + while (playerData.Any(p => !p.Value.blockReader.Finished)) + { + + foreach (PlayerData player in playerData.Values) + { + if (!player.waiting) + { + player.waiting = player.blockReader.Read(player.character, AnimationTime); + } + } + + yield return new WaitForSeconds(AnimationTime); + + foreach(KeyValuePair player in playerData) + { + ClientData client = ClientList.ConnectedClients.First(p => p.ID == player.Key); + CurrentGameMode.OnPlayerFinishedMove(player.Value.character, client, player.Value.character.CurrentBlock); + } + + if (playerData.All(p => p.Value.waiting)) + { + playerData.ForEach(p => p.Value.waiting = false); + Debug.Log("Finished one move"); + } + } + + CurrentGameMode.OnRoundFinished(); + CurrentGameMode.isGameOver(); + + Debug.Log("Finished Moving"); + } + private void SpawnCharacters() { - foreach(ClientData client in ClientList) + playerData = new Dictionary(); + Block[] SpawnBlocks = FindObjectsOfType().Where(p => p.isSpawnable).ToArray(); + + + int spawnIndex = 0; + foreach (ClientData client in ClientList) { Character newChar = Instantiate(characterPrefab); - newChar.transform.position = SpawnBlocks[0].VisualPosition; + Block startingBlock = SpawnBlocks[(spawnIndex++ % ClientList.ConnectedClients.Count)]; + newChar.Initialise(startingBlock, client.Inventory, client.characterAnimal); + playerData.Add(client.ID, new PlayerData(newChar)); } + } + private void RegisterHandlers() + { + server.server.RegisterHandler(LogicProtocols.SendLogicList, RecieveLogicList); + } - } + + class PlayerData + { + public Character character; + public BlockReader blockReader; + public bool recievedList; + + public bool waiting; + + public PlayerData(Character character) + { + this.character = character; + blockReader = new BlockReader(); + } + } } diff --git a/Assets/Scripts/Networking/Server/ClientData.cs b/Assets/Scripts/Networking/Server/ClientList.cs similarity index 95% rename from Assets/Scripts/Networking/Server/ClientData.cs rename to Assets/Scripts/Networking/Server/ClientList.cs index 803bb2f..d8b7081 100644 --- a/Assets/Scripts/Networking/Server/ClientData.cs +++ b/Assets/Scripts/Networking/Server/ClientList.cs @@ -8,7 +8,7 @@ namespace Networking.Server { [CreateAssetMenu(menuName = "Major Project/Networking/ClientList", order = 150)] - public class ConnectionHandler : ScriptableObject, IEnumerable + public class ClientList : ScriptableObject, IEnumerable { @@ -166,7 +166,7 @@ namespace Networking.Server /// /// Clients character animal - needed for instantiation /// - public string characterAnimal; + public string characterAnimal = "Bear"; /// /// Clients number of collected items - for colelction level @@ -183,6 +183,11 @@ namespace Networking.Server /// public NetworkConnection conn; + /// + /// Current Logic elements held by player + /// + public Inventory Inventory; + } } diff --git a/Assets/Scripts/Networking/Server/ClientData.cs.meta b/Assets/Scripts/Networking/Server/ClientList.cs.meta similarity index 100% rename from Assets/Scripts/Networking/Server/ClientData.cs.meta rename to Assets/Scripts/Networking/Server/ClientList.cs.meta diff --git a/Assets/Scripts/Networking/Server/ServerObject.cs b/Assets/Scripts/Networking/Server/ServerObject.cs index 1baddd3..0470c15 100644 --- a/Assets/Scripts/Networking/Server/ServerObject.cs +++ b/Assets/Scripts/Networking/Server/ServerObject.cs @@ -17,7 +17,7 @@ namespace Networking.Server { [Header("References")] [SerializeField] - private ConnectionHandler LoginHandler; + private ClientList LoginHandler; #endregion Inspector Fields diff --git a/Assets/Scripts/PortalSetup.cs b/Assets/Scripts/PortalSetup.cs index 407f39f..11b185e 100644 --- a/Assets/Scripts/PortalSetup.cs +++ b/Assets/Scripts/PortalSetup.cs @@ -7,7 +7,7 @@ using Networking; public class PortalSetup : MonoBehaviour { - public ConnectionHandler clientDataList; + public ClientList clientDataList; public List ConnectedClients; public Color[] playerColours; public List validIndex; diff --git a/Assets/Scripts/UI/Client/LoginUIManager.cs b/Assets/Scripts/UI/Client/LoginUIManager.cs index 4bbd4ea..8641904 100644 --- a/Assets/Scripts/UI/Client/LoginUIManager.cs +++ b/Assets/Scripts/UI/Client/LoginUIManager.cs @@ -29,6 +29,10 @@ public class LoginUIManager : MonoBehaviour [Header("WaitForPlayers")] [SerializeField] private string WaitTitle = "Wait for Players"; + [SerializeField] + private string SceneToLoad; + [SerializeField] + private GameObject WaitObject; private string serverAddress; @@ -57,6 +61,8 @@ public class LoginUIManager : MonoBehaviour serverAddress = PlayerPrefs.GetString("LastUsedAddress", ""); serverPort = PlayerPrefs.GetInt("LastUsedPort", 2222); playerName = PlayerPrefs.GetString("LastUsedName"); + + OnLoginFail(); } #endregion Unity Functions @@ -74,6 +80,7 @@ public class LoginUIManager : MonoBehaviour { Title.text = WaitTitle; CloseAll(); + WaitObject.SetActive(true); } public void OnLoginFail() @@ -119,6 +126,11 @@ public class LoginUIManager : MonoBehaviour { this.playerName = playerName; } + + public void OnClick_Ready() + { + UnityEngine.SceneManagement.SceneManager.LoadScene(SceneToLoad); + } #endregion UI Functionality #region Helper Functions diff --git a/Assets/Scripts/UI/Lobby/LobbyUIController.cs b/Assets/Scripts/UI/Lobby/LobbyUIController.cs index a42baac..20ceab0 100644 --- a/Assets/Scripts/UI/Lobby/LobbyUIController.cs +++ b/Assets/Scripts/UI/Lobby/LobbyUIController.cs @@ -11,7 +11,7 @@ public class LobbyUIController : MonoBehaviour [SerializeField] - private ConnectionHandler Clients; + private ClientList Clients; [SerializeField] private string SceneToStart; diff --git a/Assets/Scripts/UI/ScoreBoard.cs b/Assets/Scripts/UI/ScoreBoard.cs index 52a57a4..e9ba616 100644 --- a/Assets/Scripts/UI/ScoreBoard.cs +++ b/Assets/Scripts/UI/ScoreBoard.cs @@ -8,7 +8,7 @@ using TMPro; public class ScoreBoard : MonoBehaviour { - public ConnectionHandler clientDataList; + public ClientList clientDataList; public List ConnectedClients; public bool endOfGame = false; public GameObject FirstPlaceName; diff --git a/Assets/Scripts/portalTesting.cs b/Assets/Scripts/portalTesting.cs index 1f48d37..2bf1e32 100644 --- a/Assets/Scripts/portalTesting.cs +++ b/Assets/Scripts/portalTesting.cs @@ -7,7 +7,7 @@ using Networking; public class portalTesting : MonoBehaviour { - public ConnectionHandler clientDataList; + public ClientList clientDataList; public List ConnectedClients; public PortalSetup ps; diff --git a/Assets/Third Party Assets/ProCore/ProGrids/About/Editor/pg_AboutWindow.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/About/Editor/pg_AboutWindow.cs.meta index f0d7a91..f262e52 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/About/Editor/pg_AboutWindow.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/About/Editor/pg_AboutWindow.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 397122f2e7afcb643bc5232d77a09e1c -timeCreated: 18446744011573954816 +guid: e0ff1c2333ff60f4f871adb5619b5d13 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Constant.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Constant.cs.meta index a7003c4..e6c6113 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Constant.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Constant.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 8b2cff15c28de0f4ba38eafc29cd64fa -timeCreated: 18446744011573954816 +guid: 54d4c6606112a5e4181faeba9afaa183 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Enum.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Enum.cs.meta index 088869e..9eb7d65 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Enum.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_Enum.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: d3b407d7cf143004f8e7f9de0969d275 -timeCreated: 18446744011573954816 +guid: baa881e0fcdb4d8438585ada50fb4348 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IconUtility.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IconUtility.cs.meta index 0edcf07..f3597d6 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IconUtility.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IconUtility.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 192dd82c3ebd3b647ae292174a2f36a6 -timeCreated: 18446744011573954816 +guid: 47da5f3f1c77e514c86ef5e500e61d6b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IgnoreSnapAttribute.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IgnoreSnapAttribute.cs.meta index 607fb37..5ed78fd 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IgnoreSnapAttribute.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Classes/pg_IgnoreSnapAttribute.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: a00a369d82c4f7f47ae4dc5c2be474b8 -timeCreated: 18446744011573954816 +guid: 04df489ad53048c42ab269675b702a10 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Editor.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Editor.cs.meta index 79bb392..1a04641 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Editor.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Editor.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 0ab80081d3e2f274ba76a692cdcfa8d9 -timeCreated: 18446744011573954816 +guid: 20af6e78e9fa64649b964bb6b6a4a6f9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_GridRenderer.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_GridRenderer.cs.meta index e495174..1540db2 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_GridRenderer.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_GridRenderer.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 6367e9291991f466897f892a41dd75ff -timeCreated: 18446744011573954816 +guid: ce372bd2aaa8c9648a5bcde194cb8b78 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ParameterWindow.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ParameterWindow.cs.meta index 26e06bb..463d755 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ParameterWindow.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ParameterWindow.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 361cb9f8460027f4a88a1b9610de18c0 -timeCreated: 18446744011573954816 +guid: 6c1ef3e076557524f9d5ee04a56a541f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Preferences.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Preferences.cs.meta index bb020f8..013dc86 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Preferences.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_Preferences.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 19a8719bbc0e11f46b9cd7b9debdfc12 -timeCreated: 18446744011573954816 +guid: 1f60a66e28cc96040bfd2a74b5855c65 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ToggleContent.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ToggleContent.cs.meta index 1609d2f..4fd7c5a 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ToggleContent.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Editor/pg_ToggleContent.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 66b1c4a9ec825c7458f935aae34d66b1 -timeCreated: 18446744011573954816 +guid: 4dd1eb4ad61b77848bae40f89503a084 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Hover.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Hover.png.meta index 8e76825..7e574fc 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Hover.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Hover.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 8281de412bbc46b40afdd068d9d2044f -timeCreated: 18446744011573954816 +guid: e0bbe3d9bd2733a4fa6f13effbe2a132 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,21 +45,24 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 64 resizeAlgorithm: 0 - textureFormat: 2 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Normal.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Normal.png.meta index d3d155d..7df2f0a 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Normal.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_Button_Normal.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 3c3493bf8d4a3e74c87521fe3146f305 -timeCreated: 18446744011573954816 +guid: 59b2da39ad4523348b08384bc00c1043 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_Off.png.meta index c1e24d5..034d131 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: f76e5096e35bd46738f38f63f9ab22ea -timeCreated: 18446744011573954816 +guid: f23702585cb22e947b86288eb4937575 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_On.png.meta index ad7b7ea..a7b75b5 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_AngleVis_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: e9803fa21775b4b3dacced048cb0ffdf -timeCreated: 18446744011573954816 +guid: 7cff25f6876a8864ab70e653eb8128e7 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Divider.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Divider.png.meta index 0e157c5..52b0733 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Divider.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Divider.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 0e7db4d5bd21647239f661f1b9310dce -timeCreated: 18446744011573954816 +guid: d8873bbab399c194281c0bfa5d06e581 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_Off.png.meta index 63d6d93..72b5f6c 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 7fd5b20cf2a654b2e870f7a1fc36880c -timeCreated: 18446744011573954816 +guid: a26cf030b1ccbeb4d9590bda65d32717 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_On.png.meta index 0c0cbc9..d31ac08 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_3D_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: b9070affd779543919170b8284170c7f -timeCreated: 18446744011573954816 +guid: 387590fbb0965864a8931f19bc31a7dd TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_Off.png.meta index ca0dd2b..f4025a0 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 4248dedb08feb441b93fb1b4a5ceac45 -timeCreated: 18446744011573954816 +guid: 57b8bf5469cb6bb43ae92f3aab02e95f TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_On.png.meta index 3a52b48..14086bb 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Lock_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 31dd4d304c9ea41a19bdff12d41f2442 -timeCreated: 18446744011573954816 +guid: 734139266f69b084f9688d6e6dc3f129 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_Off.png.meta index b718272..eb6fb8a 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 14ac2b994b9eeb14ebbf81c00d406878 -timeCreated: 18446744011573954816 +guid: e3af7c706a8775348b54463421372d71 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_On.png.meta index ab9ece3..1eca512 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_X_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 90c5e2cb906f2c0428a8236728c9cc70 -timeCreated: 18446744011573954816 +guid: 1b0a6d1eca44ac34fa65c4141a0badcb TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_Off.png.meta index 097442b..1a6252d 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 25ff53b61b5edf944ab6f902ec7ea13a -timeCreated: 18446744011573954816 +guid: 0614d2dbcaae7c74e86af9b03c928fec TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_On.png.meta index 6a70c93..65525f9 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Y_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 24792d4c158d93944b3e7603a9ccac2a -timeCreated: 18446744011573954816 +guid: 72bcdb86c6536654ea8a00e914b4d4af TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_Off.png.meta index ec0bab6..f83aa02 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: f68445c07f478394091e7b13189298cc -timeCreated: 18446744011573954816 +guid: 8ba432bd699a5b945b56b266a6818a34 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_On.png.meta index e7c193f..ed203c4 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PGrid_Z_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 887d21fd78df45749a9c59c9f4d39ba3 -timeCreated: 18446744011573954816 +guid: f056dbe0e37c34a4381625056a800f18 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Normal.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Normal.png.meta index 7dc8951..751fb92 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Normal.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Normal.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 0c98fb088f555430ca86cd7a4211b580 -timeCreated: 18446744011573954816 +guid: 2bbcd4539addb824cbf25d42d92cff64 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Pressed.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Pressed.png.meta index 037c17a..be0ed6d 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Pressed.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_PushToGrid_Pressed.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: e30dcbe67edf04243b67502d79861503 -timeCreated: 18446744011573954816 +guid: 583d17252d17da447a48d36544572d31 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_Off.png.meta index 917aeb6..1eeb888 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 91564349a1127d64cacbed97d125c1f6 -timeCreated: 18446744011573954816 +guid: 0fc6042903d1e9d4cb5bf71ee4d81841 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_On.png.meta index dad6262..0fd97cb 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Snap_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: d0b345e53b456764691f9db6fbfd48d4 -timeCreated: 18446744011573954816 +guid: 5b857142b04963f45824d3572337a3e7 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_Off.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_Off.png.meta index 0762f59..9c8b699 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_Off.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_Off.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 76ce1a75a7950114e8619c0810fbd115 -timeCreated: 18446744011573954816 +guid: b8d110952d8d71e4596296e8d0e17d80 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_On.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_On.png.meta index 5d80e99..09c0e93 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_On.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_GUI_Vis_On.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 590949d9d6facf84596b0d167ce152dd -timeCreated: 18446744011573954816 +guid: 8d2d68a2d21dedb4cb5f7ab99661efbe TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,18 +45,21 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Close.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Close.png.meta index d7ddef7..e2d88b2 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Close.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Close.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 289968f5abbae3543a47bb276d719fb4 -timeCreated: 18446744011573954816 +guid: d03a4a1b4708f2b40bc25ea4b0a3e785 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,21 +45,24 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 64 resizeAlgorithm: 0 - textureFormat: 2 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Open.png.meta b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Open.png.meta index a067fb7..bffc167 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Open.png.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/GUI/ProGridsToggles/ProGrids2_MenuExtendo_Open.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 -guid: 222514fd9bda9394e9658d2fe15f2090 -timeCreated: 18446744011573954816 +guid: c00e587d936e47e40ac7f3f6f2e1e482 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 4 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 0 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -44,21 +45,24 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 64 resizeAlgorithm: 0 - textureFormat: 2 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -70,7 +74,15 @@ TextureImporter: sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Third Party Assets/ProCore/ProGrids/MonoBehaviour/pg_IgnoreSnap.cs.meta b/Assets/Third Party Assets/ProCore/ProGrids/MonoBehaviour/pg_IgnoreSnap.cs.meta index cb48b83..d5a0349 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/MonoBehaviour/pg_IgnoreSnap.cs.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/MonoBehaviour/pg_IgnoreSnap.cs.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 31c962280094e7146b53cd8abdfa5957 -timeCreated: 18446744011573954816 +guid: 5b944e87832df7b47a4e6711a83f7380 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Third Party Assets/ProCore/ProGrids/Shader/pg_GridShader.shader.meta b/Assets/Third Party Assets/ProCore/ProGrids/Shader/pg_GridShader.shader.meta index efd8142..d313ce5 100644 --- a/Assets/Third Party Assets/ProCore/ProGrids/Shader/pg_GridShader.shader.meta +++ b/Assets/Third Party Assets/ProCore/ProGrids/Shader/pg_GridShader.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 4b9f3440d48c2f04c9c388365e070864 -timeCreated: 18446744011573954816 +guid: f683ec53541d02e4d8d86abd93b33844 ShaderImporter: externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 55a23c8..86053b4 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39c02e11312c9113c3d9e4d8a9150dfb1fce7255cf45a211aa1983c76677971e -size 1093 +oid sha256:3efc8aa953b42cdb6b56fd558a98a0a19da40d54605abb89122bb6f3755616d4 +size 1202