janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

added Team Lists

Browse Source
This commit is contained in:
DerTyp187
2021-11-29 11:18:27 +01:00
parent c56f1d4a49
commit 76cf463d23
14 changed files with 1204 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefabs/Manager.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 32096dbfa0802674589493ea60da7068
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

68
Assets/Prefabs/Manager/LobbyManager.prefab Normal file
View File

@@ -0,0 +1,68 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7129514368576730101
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7129514368576730100}
- component: {fileID: 7129514368576730103}
- component: {fileID: 7129514368576730102}
m_Layer: 0
m_Name: LobbyManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7129514368576730100
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7129514368576730101}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7129514368576730103
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7129514368576730101}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b6183dbb3c561ed44803ffda1c859dc9, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
LobbyPlayers: []
lobbyTitle:
--- !u!114 &7129514368576730102
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7129514368576730101}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneId: 0
serverOnly: 0
visible: 0
m_AssetId:
hasSpawned: 0

7
Assets/Prefabs/Manager/LobbyManager.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: af2b86e6ca1c8404a857e6bfa4294f3c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Prefabs/NetManager.prefab → Assets/Prefabs/Manager/NetManager.prefab
View File

0
Assets/Prefabs/NetManager.prefab.meta → Assets/Prefabs/Manager/NetManager.prefab.meta
View File

48
Assets/Prefabs/Manager/TeamManager.prefab Normal file
View File

@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7587534621021785474
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4539561019408977365}
- component: {fileID: 389256256808104179}
m_Layer: 0
m_Name: TeamManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4539561019408977365
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7587534621021785474}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 367.13614, y: 171.75735, z: 1.6763184}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &389256256808104179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7587534621021785474}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cc117181a5e845145888b1c152bcb4ad, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1

7
Assets/Prefabs/Manager/TeamManager.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e4af683be73288d44b419fb6216d8a2a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Scenes/HomeScene.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1838,7 +1838,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1361029237
RectTransform:
m_ObjectHideFlags: 0
@@ -2203,7 +2203,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1813956224
RectTransform:
m_ObjectHideFlags: 0

1375
Assets/Scenes/Lobby.unity
View File

File diff suppressed because it is too large Load Diff

3
Assets/Scripts/GameManager/TeamManager.cs
View File

@@ -1,8 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Mirror;
public class TeamManager : MonoBehaviour
public class TeamManager : NetworkBehaviour
{
public List<Team> Teams = new List<Team>();

19
Assets/Scripts/HomeMenu/Lobby/LobbyPlayer.cs
View File

@@ -9,19 +9,31 @@ public class LobbyPlayer : NetworkBehaviour
[SerializeField] private TextMeshProUGUI usernameText;
[SerializeField] private TextMeshProUGUI rdyText;
[SerializeField] private Button team1Btn;
[SerializeField] private Button team2Btn;
[SyncVar(hook = "DisplayPlayerName")]
[SerializeField] public string username;
[SyncVar(hook = "ChangeReadyState")]
[SerializeField] bool ready = false;
[SyncVar]
[SerializeField] int teamId = 0;
Lobby lobby;
public override void OnStartClient()
{
lobby = GameObject.Find("LobbyManager").GetComponent<Lobby>();
lobby.RegisterPlayer(this);
gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team1").transform;
if(teamId == 0)
{
gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team1").transform;
}else if(teamId == 1)
{
gameObject.transform.parent = GameObject.FindGameObjectWithTag("Team2").transform;
}
}
public void Start()
@@ -48,6 +60,11 @@ public class LobbyPlayer : NetworkBehaviour
ready = !ready;
}
[Command]
public void SelectTeam(int _teamId)
{
teamId = _teamId;
}
public void DisplayPlayerName(string oldName, string newName)
{
Debug.Log("Player changed name from " + oldName + " to " + newName);