Commit 50c9115f authored by Ben W's avatar Ben W
Browse files

Fixes for building

parent 5317a4a8
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &781682221960479748
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 781682221960479747}
- component: {fileID: 781682221960479746}
- component: {fileID: 781682221960479749}
m_Layer: 0
m_Name: PlayerInstance
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &781682221960479747
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781682221960479748}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6, y: 4.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &781682221960479746
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781682221960479748}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 22612dd00db1a934d98a644271cfd403, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
Name: User
_isAlive: 0
_playerPrefab: {fileID: 5347128353891683361, guid: d91522362299a6a4eae34e79a6009a5c, type: 3}
--- !u!114 &781682221960479749
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781682221960479748}
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
fileFormatVersion: 2
guid: 9c0aac4f185dd3248baf5d7110e27f69
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -399,6 +399,7 @@ GameObject:
- component: {fileID: 287204406}
- component: {fileID: 287204405}
- component: {fileID: 287204404}
- component: {fileID: 287204407}
m_Layer: 0
m_Name: Map
m_TagString: Untagged
......@@ -469,6 +470,19 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &287204407
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 287204403}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 70.002, y: 0.002, z: 70.002}
m_Center: {x: 5, y: 0, z: 5}
--- !u!1 &483941379
GameObject:
m_ObjectHideFlags: 0
......
using System;
#if UNITY_EDITOR
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
......@@ -9,7 +10,7 @@ using UnityEngine;
public static class Debug
{
#if UNITY_EDITOR
public static void Log(object message, UnityEngine.Object context = null)
{
var stackTrace = new StackTrace().GetFrame(1);
......@@ -60,11 +61,5 @@ public static class Debug
public static string Format(string fmt, params object[] args) => string.Format(CultureInfo.InvariantCulture.NumberFormat, fmt, args);
#else
public static void Log(object message, UnityEngine.Object context = null) => Debug.Log(message, context);
public static void LogWarning(object message, UnityEngine.Object context = null) => Debug.LogWarning(message, context);
public static void LogError(object message, UnityEngine.Object context = null) => Debug.LogError(message, context);
#endif
}
#endif
\ No newline at end of file
......@@ -19,12 +19,14 @@ public class MainMenuManager : MonoBehaviour
public void Connect()
{
Debug.Log("Connecting to " + _inputField.text);
NetworkManager.ConnectIP = _inputField.text;
SceneManager.LoadScene(1);
}
public void Host()
{
Debug.Log("Hosting");
NetworkManager.IsServer = true;
SceneManager.LoadScene(1);
}
......
......@@ -8,7 +8,6 @@ using DarkRift.Client.Unity;
using DarkRift.Client;
using System;
using DarkRift.Server;
using System.Diagnostics;
class NetworkManager : MonoBehaviour
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment