mirror of
				https://github.com/DerTyp7/defrain-shooter-unity.git
				synced 2025-10-29 20:52:10 +01:00 
			
		
		
		
	Switching Teams with btns
This commit is contained in:
		| @@ -5302,6 +5302,340 @@ CanvasRenderer: | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1061761769} | ||||
|   m_CullTransparentMesh: 1 | ||||
| --- !u!1 &1484761827 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 1484761828} | ||||
|   - component: {fileID: 1484761830} | ||||
|   - component: {fileID: 1484761829} | ||||
|   m_Layer: 5 | ||||
|   m_Name: MenuBtn (1) | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!224 &1484761828 | ||||
| RectTransform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1484761827} | ||||
|   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_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 1801785840} | ||||
|   m_RootOrder: 1 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   m_AnchorMin: {x: 0, y: 0} | ||||
|   m_AnchorMax: {x: 0, y: 0} | ||||
|   m_AnchoredPosition: {x: 0, y: 0} | ||||
|   m_SizeDelta: {x: 358, y: 50} | ||||
|   m_Pivot: {x: 0.5, y: 0.5} | ||||
| --- !u!114 &1484761829 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1484761827} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Material: {fileID: 0} | ||||
|   m_Color: {r: 1, g: 1, b: 1, a: 0.392} | ||||
|   m_RaycastTarget: 1 | ||||
|   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||||
|   m_Maskable: 1 | ||||
|   m_OnCullStateChanged: | ||||
|     m_PersistentCalls: | ||||
|       m_Calls: [] | ||||
|   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 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 | ||||
|   m_PixelsPerUnitMultiplier: 1 | ||||
| --- !u!222 &1484761830 | ||||
| CanvasRenderer: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1484761827} | ||||
|   m_CullTransparentMesh: 1 | ||||
| --- !u!1 &1486293455 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 1486293456} | ||||
|   - component: {fileID: 1486293458} | ||||
|   - component: {fileID: 1486293457} | ||||
|   m_Layer: 5 | ||||
|   m_Name: MenuBtn | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!224 &1486293456 | ||||
| RectTransform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1486293455} | ||||
|   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_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 1801785840} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   m_AnchorMin: {x: 0, y: 0} | ||||
|   m_AnchorMax: {x: 0, y: 0} | ||||
|   m_AnchoredPosition: {x: 0, y: 0} | ||||
|   m_SizeDelta: {x: 358, y: 50} | ||||
|   m_Pivot: {x: 0.5, y: 0.5} | ||||
| --- !u!114 &1486293457 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1486293455} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Material: {fileID: 0} | ||||
|   m_Color: {r: 1, g: 1, b: 1, a: 0.392} | ||||
|   m_RaycastTarget: 1 | ||||
|   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||||
|   m_Maskable: 1 | ||||
|   m_OnCullStateChanged: | ||||
|     m_PersistentCalls: | ||||
|       m_Calls: [] | ||||
|   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 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 | ||||
|   m_PixelsPerUnitMultiplier: 1 | ||||
| --- !u!222 &1486293458 | ||||
| CanvasRenderer: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1486293455} | ||||
|   m_CullTransparentMesh: 1 | ||||
| --- !u!1 &1799293905 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 1799293906} | ||||
|   - component: {fileID: 1799293908} | ||||
|   - component: {fileID: 1799293907} | ||||
|   m_Layer: 5 | ||||
|   m_Name: MenuBtn (2) | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!224 &1799293906 | ||||
| RectTransform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1799293905} | ||||
|   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_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 1801785840} | ||||
|   m_RootOrder: 2 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   m_AnchorMin: {x: 0, y: 0} | ||||
|   m_AnchorMax: {x: 0, y: 0} | ||||
|   m_AnchoredPosition: {x: 0, y: 0} | ||||
|   m_SizeDelta: {x: 358, y: 50} | ||||
|   m_Pivot: {x: 0.5, y: 0.5} | ||||
| --- !u!114 &1799293907 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1799293905} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Material: {fileID: 0} | ||||
|   m_Color: {r: 1, g: 1, b: 1, a: 0.392} | ||||
|   m_RaycastTarget: 1 | ||||
|   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||||
|   m_Maskable: 1 | ||||
|   m_OnCullStateChanged: | ||||
|     m_PersistentCalls: | ||||
|       m_Calls: [] | ||||
|   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 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 | ||||
|   m_PixelsPerUnitMultiplier: 1 | ||||
| --- !u!222 &1799293908 | ||||
| CanvasRenderer: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1799293905} | ||||
|   m_CullTransparentMesh: 1 | ||||
| --- !u!1 &1801785839 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 1801785840} | ||||
|   - component: {fileID: 1801785843} | ||||
|   - component: {fileID: 1801785842} | ||||
|   - component: {fileID: 1801785841} | ||||
|   m_Layer: 5 | ||||
|   m_Name: Menu | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!224 &1801785840 | ||||
| RectTransform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1801785839} | ||||
|   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_ConstrainProportionsScale: 0 | ||||
|   m_Children: | ||||
|   - {fileID: 1486293456} | ||||
|   - {fileID: 1484761828} | ||||
|   - {fileID: 1799293906} | ||||
|   m_Father: {fileID: 2056883663} | ||||
|   m_RootOrder: 1 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   m_AnchorMin: {x: 0, y: 0.5} | ||||
|   m_AnchorMax: {x: 0, y: 0.5} | ||||
|   m_AnchoredPosition: {x: 179, y: 0} | ||||
|   m_SizeDelta: {x: 358, y: 277.5} | ||||
|   m_Pivot: {x: 0.5, y: 0.5} | ||||
| --- !u!114 &1801785841 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1801785839} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Padding: | ||||
|     m_Left: 0 | ||||
|     m_Right: 0 | ||||
|     m_Top: 0 | ||||
|     m_Bottom: 0 | ||||
|   m_ChildAlignment: 0 | ||||
|   m_Spacing: -125 | ||||
|   m_ChildForceExpandWidth: 1 | ||||
|   m_ChildForceExpandHeight: 1 | ||||
|   m_ChildControlWidth: 0 | ||||
|   m_ChildControlHeight: 0 | ||||
|   m_ChildScaleWidth: 0 | ||||
|   m_ChildScaleHeight: 0 | ||||
|   m_ReverseArrangement: 0 | ||||
| --- !u!114 &1801785842 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1801785839} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Material: {fileID: 0} | ||||
|   m_Color: {r: 1, g: 1, b: 1, a: 0.392} | ||||
|   m_RaycastTarget: 1 | ||||
|   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||||
|   m_Maskable: 1 | ||||
|   m_OnCullStateChanged: | ||||
|     m_PersistentCalls: | ||||
|       m_Calls: [] | ||||
|   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 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 | ||||
|   m_PixelsPerUnitMultiplier: 1 | ||||
| --- !u!222 &1801785843 | ||||
| CanvasRenderer: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1801785839} | ||||
|   m_CullTransparentMesh: 1 | ||||
| --- !u!1 &2056883659 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -5378,7 +5712,7 @@ Canvas: | ||||
|   m_OverrideSorting: 0 | ||||
|   m_OverridePixelPerfect: 0 | ||||
|   m_SortingBucketNormalizedSize: 0 | ||||
|   m_AdditionalShaderChannelsFlag: 0 | ||||
|   m_AdditionalShaderChannelsFlag: 25 | ||||
|   m_SortingLayerID: 0 | ||||
|   m_SortingOrder: 0 | ||||
|   m_TargetDisplay: 0 | ||||
| @@ -5395,6 +5729,7 @@ RectTransform: | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: | ||||
|   - {fileID: 854561050} | ||||
|   - {fileID: 1801785840} | ||||
|   m_Father: {fileID: 0} | ||||
|   m_RootOrder: 3 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   | ||||
| @@ -38,7 +38,7 @@ RenderSettings: | ||||
|   m_ReflectionIntensity: 1 | ||||
|   m_CustomReflection: {fileID: 0} | ||||
|   m_Sun: {fileID: 0} | ||||
|   m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} | ||||
|   m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} | ||||
|   m_UseRadianceAmbientProbe: 0 | ||||
| --- !u!157 &3 | ||||
| LightmapSettings: | ||||
| @@ -615,7 +615,7 @@ GameObject: | ||||
|   - component: {fileID: 393718072} | ||||
|   - component: {fileID: 393718071} | ||||
|   m_Layer: 5 | ||||
|   m_Name: Button | ||||
|   m_Name: Team2Btn | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
| @@ -1448,7 +1448,7 @@ GameObject: | ||||
|   - component: {fileID: 1441578312} | ||||
|   - component: {fileID: 1441578311} | ||||
|   m_Layer: 5 | ||||
|   m_Name: Button | ||||
|   m_Name: Team1Btn | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
| @@ -5,10 +5,19 @@ using Mirror; | ||||
|  | ||||
| public class TeamManager : NetworkBehaviour | ||||
| { | ||||
|  | ||||
|     [SerializeField] | ||||
|     public List<Team> Teams = new List<Team>(); | ||||
|     int teamIdCount = 0; | ||||
|  | ||||
|     public void Start() | ||||
|     { | ||||
|         //Create Speactator Team with index 0 | ||||
|         Team specTeam = new Team("Spectators", 0, -1); | ||||
|         | ||||
|         Teams.Add(specTeam); | ||||
|  | ||||
|     } | ||||
|  | ||||
|     public Team AddTeam(string name = "Team")  | ||||
|     { | ||||
|         Team team = new Team(name, teamIdCount, -1); | ||||
|   | ||||
| @@ -18,7 +18,7 @@ public class LobbyPlayer : NetworkBehaviour | ||||
|     [SyncVar(hook = "ChangeReadyState")] | ||||
|     [SerializeField] bool ready = false; | ||||
|  | ||||
|     [SyncVar] | ||||
|     [SyncVar(hook = "ChangeDisplayTeam")] | ||||
|     [SerializeField] int teamId = 0; | ||||
|  | ||||
|     Lobby lobby; | ||||
| @@ -26,14 +26,6 @@ public class LobbyPlayer : NetworkBehaviour | ||||
|     { | ||||
|         lobby = GameObject.Find("LobbyManager").GetComponent<Lobby>(); | ||||
|         lobby.RegisterPlayer(this); | ||||
|  | ||||
|         if(teamId == 0) | ||||
|         { | ||||
|             gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team1").transform; | ||||
|         }else if(teamId == 1) | ||||
|         { | ||||
|             gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team2").transform; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     public void Start() | ||||
| @@ -45,6 +37,10 @@ public class LobbyPlayer : NetworkBehaviour | ||||
|             rdyBtn.onClick.AddListener(CmdChangeReady); | ||||
|             CmdSendName(vs.username); | ||||
|             lobby.SetTitle(this, "Game Of\n" + username); | ||||
|             team1Btn = GameObject.Find("Team1Btn").GetComponent<Button>(); | ||||
|             team2Btn = GameObject.Find("Team2Btn").GetComponent<Button>(); | ||||
|             team1Btn.onClick.AddListener(delegate { SelectTeam(1); }); | ||||
|             team2Btn.onClick.AddListener(delegate { SelectTeam(2); }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @@ -83,4 +79,15 @@ public class LobbyPlayer : NetworkBehaviour | ||||
|         } | ||||
|          | ||||
|     } | ||||
|      | ||||
|     public void ChangeDisplayTeam(int oldTeamId, int newTeamId) | ||||
|     { | ||||
|         if(newTeamId == 1) | ||||
|         { | ||||
|             gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team1List").transform; | ||||
|         }else if(newTeamId == 2) | ||||
|         { | ||||
|             gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team2List").transform; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
							
								
								
									
										8
									
								
								Assets/UI.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								Assets/UI.meta
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| fileFormatVersion: 2 | ||||
| guid: c84dd6fea7b1a564dac024e85dee0f66 | ||||
| folderAsset: yes | ||||
| DefaultImporter: | ||||
|   externalObjects: {} | ||||
|   userData:  | ||||
|   assetBundleName:  | ||||
|   assetBundleVariant:  | ||||
							
								
								
									
										8
									
								
								Assets/UI/Home.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								Assets/UI/Home.meta
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| fileFormatVersion: 2 | ||||
| guid: 887196b8fb0b9eb4d9672b1ca0861e34 | ||||
| folderAsset: yes | ||||
| DefaultImporter: | ||||
|   externalObjects: {} | ||||
|   userData:  | ||||
|   assetBundleName:  | ||||
|   assetBundleVariant:  | ||||
| @@ -15,6 +15,6 @@ EditorBuildSettings: | ||||
|     path: Assets/Scenes/TestScene.unity | ||||
|     guid: 9fc0d4010bbf28b4594072e72b8655ab | ||||
|   - enabled: 1 | ||||
|     path: Assets/Scenes/oldLobby.unity | ||||
|     path: Assets/Scenes/Lobby.unity | ||||
|     guid: 33f487c6a0f179a4cb0f9cd2f080aca8 | ||||
|   m_configObjects: {} | ||||
|   | ||||
| @@ -15,13 +15,13 @@ EditorUserSettings: | ||||
|       value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a | ||||
|       flags: 0 | ||||
|     RecentlyUsedSceneGuid-3: | ||||
|       value: 5509515f50510b0e0f570f74427a0e444e4e417e78787f337b2a4a35bab16039 | ||||
|       value: 5053560200055e0c5e0d0a2342735a44144e4d7e792a7764752f4a32e1b5313e | ||||
|       flags: 0 | ||||
|     RecentlyUsedSceneGuid-4: | ||||
|       value: 500252525d020a0d0c5e0a73477a5e441515482c752b22622b794563e3e33560 | ||||
|       flags: 0 | ||||
|     RecentlyUsedSceneGuid-5: | ||||
|       value: 5053560200055e0c5e0d0a2342735a44144e4d7e792a7764752f4a32e1b5313e | ||||
|       value: 5509515f50510b0e0f570f74427a0e444e4e417e78787f337b2a4a35bab16039 | ||||
|       flags: 0 | ||||
|     RecentlyUsedScenePath-0: | ||||
|       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d | ||||
|   | ||||
| @@ -226,7 +226,7 @@ MonoBehaviour: | ||||
|       scrollPos: {x: 0, y: 0} | ||||
|       m_SelectedIDs:  | ||||
|       m_LastClickedID: 0 | ||||
|       m_ExpandedIDs: de2dfffff2f0ffffb8f1ffff2cf2ffff2afbffff | ||||
|       m_ExpandedIDs: 2afbffff | ||||
|       m_RenameOverlay: | ||||
|         m_UserAcceptedRename: 0 | ||||
|         m_Name:  | ||||
| @@ -269,8 +269,8 @@ MonoBehaviour: | ||||
|     y: 0 | ||||
|     width: 1250 | ||||
|     height: 564 | ||||
|   m_MinSize: {x: 202, y: 221} | ||||
|   m_MaxSize: {x: 4002, y: 4021} | ||||
|   m_MinSize: {x: 200, y: 200} | ||||
|   m_MaxSize: {x: 4000, y: 4000} | ||||
|   m_ActualView: {fileID: 2} | ||||
|   m_Panes: | ||||
|   - {fileID: 8} | ||||
| @@ -513,9 +513,9 @@ MonoBehaviour: | ||||
|   m_PlayAudio: 0 | ||||
|   m_AudioPlay: 0 | ||||
|   m_Position: | ||||
|     m_Target: {x: 5.9049864, y: -0.38029554, z: 64.182884} | ||||
|     m_Target: {x: 3.3064752, y: 0.14717147, z: 56.074486} | ||||
|     speed: 2 | ||||
|     m_Value: {x: 5.9049864, y: -0.38029554, z: 64.182884} | ||||
|     m_Value: {x: 3.3064752, y: 0.14717147, z: 56.074486} | ||||
|   m_RenderMode: 0 | ||||
|   m_CameraMode: | ||||
|     drawMode: 0 | ||||
| @@ -566,9 +566,9 @@ MonoBehaviour: | ||||
|     speed: 2 | ||||
|     m_Value: {x: 0, y: 0, z: 0, w: 1} | ||||
|   m_Size: | ||||
|     m_Target: 5.407539 | ||||
|     m_Target: 4.568827 | ||||
|     speed: 2 | ||||
|     m_Value: 5.407539 | ||||
|     m_Value: 4.568827 | ||||
|   m_Ortho: | ||||
|     m_Target: 1 | ||||
|     speed: 2 | ||||
| @@ -674,9 +674,9 @@ MonoBehaviour: | ||||
|     m_IsLocked: 0 | ||||
|   m_FolderTreeState: | ||||
|     scrollPos: {x: 0, y: 0} | ||||
|     m_SelectedIDs: 9e600000 | ||||
|     m_LastClickedID: 24734 | ||||
|     m_ExpandedIDs: 000000005c6000005e60000060600000626000006460000000ca9a3b | ||||
|     m_SelectedIDs: 685f0000 | ||||
|     m_LastClickedID: 24424 | ||||
|     m_ExpandedIDs: 00000000f85e0000fa5e0000fc5e0000fe5e0000005f000000ca9a3b | ||||
|     m_RenameOverlay: | ||||
|       m_UserAcceptedRename: 0 | ||||
|       m_Name:  | ||||
| @@ -704,7 +704,7 @@ MonoBehaviour: | ||||
|     scrollPos: {x: 0, y: 0} | ||||
|     m_SelectedIDs:  | ||||
|     m_LastClickedID: 0 | ||||
|     m_ExpandedIDs: 000000005c6000005e600000606000006260000064600000 | ||||
|     m_ExpandedIDs: 00000000f85e0000fa5e0000fc5e0000fe5e0000005f0000 | ||||
|     m_RenameOverlay: | ||||
|       m_UserAcceptedRename: 0 | ||||
|       m_Name:  | ||||
|   | ||||
| @@ -19,7 +19,7 @@ MonoBehaviour: | ||||
|     width: 1920 | ||||
|     height: 989 | ||||
|   m_ShowMode: 4 | ||||
|   m_Title: Hierarchy | ||||
|   m_Title: Project | ||||
|   m_RootView: {fileID: 2} | ||||
|   m_MinSize: {x: 875, y: 300} | ||||
|   m_MaxSize: {x: 10000, y: 10000} | ||||
| @@ -119,7 +119,7 @@ MonoBehaviour: | ||||
|   m_MinSize: {x: 300, y: 200} | ||||
|   m_MaxSize: {x: 24288, y: 16192} | ||||
|   vertical: 0 | ||||
|   controlID: 27121 | ||||
|   controlID: 185 | ||||
| --- !u!114 &6 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 52 | ||||
| @@ -144,7 +144,7 @@ MonoBehaviour: | ||||
|   m_MinSize: {x: 200, y: 200} | ||||
|   m_MaxSize: {x: 16192, y: 16192} | ||||
|   vertical: 1 | ||||
|   controlID: 27122 | ||||
|   controlID: 186 | ||||
| --- !u!114 &7 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 52 | ||||
| @@ -169,7 +169,7 @@ MonoBehaviour: | ||||
|   m_MinSize: {x: 200, y: 100} | ||||
|   m_MaxSize: {x: 16192, y: 8096} | ||||
|   vertical: 0 | ||||
|   controlID: 27123 | ||||
|   controlID: 238 | ||||
| --- !u!114 &8 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 52 | ||||
| @@ -206,7 +206,7 @@ MonoBehaviour: | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} | ||||
|   m_Name: SceneView | ||||
|   m_Name: GameView | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Children: [] | ||||
|   m_Position: | ||||
| @@ -215,14 +215,14 @@ MonoBehaviour: | ||||
|     y: 0 | ||||
|     width: 1250 | ||||
|     height: 564 | ||||
|   m_MinSize: {x: 202, y: 221} | ||||
|   m_MaxSize: {x: 4002, y: 4021} | ||||
|   m_ActualView: {fileID: 14} | ||||
|   m_MinSize: {x: 200, y: 200} | ||||
|   m_MaxSize: {x: 4000, y: 4000} | ||||
|   m_ActualView: {fileID: 12} | ||||
|   m_Panes: | ||||
|   - {fileID: 14} | ||||
|   - {fileID: 12} | ||||
|   m_Selected: 0 | ||||
|   m_LastSelected: 1 | ||||
|   m_Selected: 1 | ||||
|   m_LastSelected: 0 | ||||
| --- !u!114 &10 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 52 | ||||
| @@ -337,7 +337,7 @@ MonoBehaviour: | ||||
|     m_HSlider: 0 | ||||
|     m_VSlider: 0 | ||||
|     m_IgnoreScrollWheelUntilClicked: 0 | ||||
|     m_EnableMouseInput: 0 | ||||
|     m_EnableMouseInput: 1 | ||||
|     m_EnableSliderZoomHorizontal: 0 | ||||
|     m_EnableSliderZoomVertical: 0 | ||||
|     m_UniformScale: 1 | ||||
| @@ -399,9 +399,9 @@ MonoBehaviour: | ||||
|   m_SceneHierarchy: | ||||
|     m_TreeViewState: | ||||
|       scrollPos: {x: 0, y: 0} | ||||
|       m_SelectedIDs:  | ||||
|       m_SelectedIDs: a40d0000 | ||||
|       m_LastClickedID: 0 | ||||
|       m_ExpandedIDs: de2dfffff2f0ffffb8f1ffff2cf2ffff2afbffff | ||||
|       m_ExpandedIDs: 80d3ffff26f5ffff2afbffffc25e0000 | ||||
|       m_RenameOverlay: | ||||
|         m_UserAcceptedRename: 0 | ||||
|         m_Name:  | ||||
| @@ -661,9 +661,9 @@ MonoBehaviour: | ||||
|   m_PlayAudio: 0 | ||||
|   m_AudioPlay: 0 | ||||
|   m_Position: | ||||
|     m_Target: {x: 3.3064752, y: 0.14717147, z: 56.074486} | ||||
|     m_Target: {x: -1.4526107, y: 2.736337, z: 75.25916} | ||||
|     speed: 2 | ||||
|     m_Value: {x: 3.3064752, y: 0.14717147, z: 56.074486} | ||||
|     m_Value: {x: -1.4526107, y: 2.736337, z: 75.25916} | ||||
|   m_RenderMode: 0 | ||||
|   m_CameraMode: | ||||
|     drawMode: 0 | ||||
| @@ -714,9 +714,9 @@ MonoBehaviour: | ||||
|     speed: 2 | ||||
|     m_Value: {x: 0, y: 0, z: 0, w: 1} | ||||
|   m_Size: | ||||
|     m_Target: 4.568827 | ||||
|     m_Target: 6.4150777 | ||||
|     speed: 2 | ||||
|     m_Value: 4.568827 | ||||
|     m_Value: 6.4150777 | ||||
|   m_Ortho: | ||||
|     m_Target: 1 | ||||
|     speed: 2 | ||||
| @@ -782,22 +782,22 @@ MonoBehaviour: | ||||
|     m_SkipHidden: 0 | ||||
|     m_SearchArea: 1 | ||||
|     m_Folders: | ||||
|     - Assets/Images | ||||
|     - Assets/Scripts/HomeMenu/Lobby | ||||
|     m_Globs: [] | ||||
|     m_OriginalText:  | ||||
|   m_ViewMode: 1 | ||||
|   m_StartGridSize: 64 | ||||
|   m_LastFolders: | ||||
|   - Assets/Images | ||||
|   - Assets/Scripts/HomeMenu/Lobby | ||||
|   m_LastFoldersGridSize: -1 | ||||
|   m_LastProjectPath: M:\Programs\Unity\PROJECTS\defrain | ||||
|   m_LockTracker: | ||||
|     m_IsLocked: 0 | ||||
|   m_FolderTreeState: | ||||
|     scrollPos: {x: 0, y: 0} | ||||
|     m_SelectedIDs: 9e600000 | ||||
|     m_LastClickedID: 24734 | ||||
|     m_ExpandedIDs: 000000005c6000005e60000060600000626000006460000000ca9a3b | ||||
|     scrollPos: {x: 0, y: 6} | ||||
|     m_SelectedIDs: 825f0000 | ||||
|     m_LastClickedID: 24450 | ||||
|     m_ExpandedIDs: 00000000f85e0000fc5e0000fe5e0000005f000000ca9a3b | ||||
|     m_RenameOverlay: | ||||
|       m_UserAcceptedRename: 0 | ||||
|       m_Name:  | ||||
| @@ -825,7 +825,7 @@ MonoBehaviour: | ||||
|     scrollPos: {x: 0, y: 0} | ||||
|     m_SelectedIDs:  | ||||
|     m_LastClickedID: 0 | ||||
|     m_ExpandedIDs: 000000005c6000005e60000060600000626000006460000000ca9a3b | ||||
|     m_ExpandedIDs: 00000000f85e0000fa5e0000fc5e0000fe5e0000005f000000ca9a3b | ||||
|     m_RenameOverlay: | ||||
|       m_UserAcceptedRename: 0 | ||||
|       m_Name:  | ||||
| @@ -852,7 +852,7 @@ MonoBehaviour: | ||||
|   m_ListAreaState: | ||||
|     m_SelectedInstanceIDs:  | ||||
|     m_LastClickedInstanceID: 0 | ||||
|     m_HadKeyboardFocusLastEvent: 0 | ||||
|     m_HadKeyboardFocusLastEvent: 1 | ||||
|     m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e6000003665000000000000 | ||||
|     m_RenameOverlay: | ||||
|       m_UserAcceptedRename: 0 | ||||
| @@ -902,9 +902,9 @@ MonoBehaviour: | ||||
|   m_Pos: | ||||
|     serializedVersion: 2 | ||||
|     x: 0 | ||||
|     y: 507.2 | ||||
|     width: 1221 | ||||
|     height: 268 | ||||
|     y: 637 | ||||
|     width: 1526 | ||||
|     height: 354 | ||||
|   m_ViewDataDictionary: {fileID: 0} | ||||
|   m_OverlayCanvas: | ||||
|     m_LastAppliedPresetName: Default | ||||
| @@ -944,7 +944,7 @@ MonoBehaviour: | ||||
|     m_ControlHash: -371814159 | ||||
|     m_PrefName: Preview_InspectorPreview | ||||
|   m_LastInspectedObjectInstanceID: -1 | ||||
|   m_LastVerticalScrollValue: 216 | ||||
|   m_LastVerticalScrollValue: 0 | ||||
|   m_GlobalObjectId:  | ||||
|   m_InspectorMode: 0 | ||||
|   m_LockTracker: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 DerTyp187
					DerTyp187