Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

Assets/AurynSky.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bfa59c6a89158994886db7fe3688a63a
+guid: ccbac87712d41504a86307236876c0b6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/AurynSky/ArenaPacks.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e8c5fb3e198399d4988b24d1e4c3aeaf
+guid: fbb3bbd04659f6a4ca8265a4753d78af
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/AurynSky/ArenaPacks/Forest Pack.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cd7f8cdbd988ceb4980c4f4531a63dfa
+guid: 65199b5ef9698b048b06aa4fb0a46e9f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/AurynSky/ArenaPacks/Forest Pack/Scripts.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 63112726efe1fb244be32ec87d43d2dc
+guid: 35e1d17084261ad448ac560045e6b535
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Data/Inventory/PlayerInventory.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c75d69c62bbc00bb4af4493737a2bb52d5212a295007ff7211aced4daac792f
-size 750
+oid sha256:4583835e60ade6fdf62d738ba16346ea0b0a272531ddc3f2ae77eb4a08015b0c
+size 972

Assets/Models.meta

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

Assets/Scenes/Networking Test Scenes/ClientLogin.unity

@@ -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.44657868, g: 0.49641263, b: 0.57481706, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -273,7 +273,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1630438944}
   - component: {fileID: 1630438943}
-  - component: {fileID: 1630438945}
   m_Layer: 0
   m_Name: ClientManager
   m_TagString: Untagged
@@ -296,7 +295,8 @@ MonoBehaviour:
   ServerIP: 127.0.0.1
   Port: 2222
   StartClientOnAwake: 1
-  DisplayName: Ellie
+  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
@@ -313,22 +313,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1630438945
-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: 4e6313fcffd0e2049b7d88847b61233d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  reader:
-    LogicChain:
-    - {fileID: 11400000, guid: 0b1bcd75cb7dade4fb598ee3412594c2, type: 2}
-    - {fileID: 11400000, guid: aa238796cf1886244951ec8c2fed1855, type: 2}
-    - {fileID: 11400000, guid: 41f4cb946475b2849a802a8297d81e25, type: 2}
-    - {fileID: 11400000, guid: 48f0ea7af28c10846b5b76ce70d06b60, type: 2}
-  Client: {fileID: 11400000, guid: 8dca4719b56d91143b236583a436c911, type: 2}

Assets/Scenes/Networking Test Scenes/ClientScene.unity

@@ -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.44657868, g: 0.49641263, b: 0.57481706, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -112,6 +112,18 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!114 &760546447 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5195354183157824118, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+    type: 3}
+  m_PrefabInstance: {fileID: 5195354181466942481}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 140e56929e1450a48b2f7716511bb327, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1254212986
 GameObject:
   m_ObjectHideFlags: 0
@@ -263,6 +275,18 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1804173232 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5195354183134146528, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+    type: 3}
+  m_PrefabInstance: {fileID: 5195354181466942481}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 36cc4df775c8e8b46a89972d8008d56d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1902492079
 GameObject:
   m_ObjectHideFlags: 0
@@ -449,13 +473,18 @@ PrefabInstance:
     - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.000038173177
+      value: 0.000038146973
       objectReference: {fileID: 0}
     - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
         type: 3}
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.0000627838
+      objectReference: {fileID: 0}
     - target: {fileID: 5195354183101525346, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
         type: 3}
       propertyPath: m_AspectRatio
@@ -471,5 +500,63 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 5195354183101525347, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5195354183101525347, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5195354183101525347, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 85.99994
+      objectReference: {fileID: 0}
+    - target: {fileID: 5195354183083441314, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 5195354181466942483}
+    - target: {fileID: 5195354183083441314, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnClick_Toggle
+      objectReference: {fileID: 0}
+    - target: {fileID: 5195354181250555043, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 5195354181466942483}
+    - target: {fileID: 5195354181250555043, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnClick_Play
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 5195354182462625307, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3}
+--- !u!1 &5195354181466942482 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
+    type: 3}
+  m_PrefabInstance: {fileID: 5195354181466942481}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5195354181466942483
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5195354181466942482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 65239890e888fd246a0b0985573deed6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Inventory: {fileID: 1804173232}
+  AnimationSpeed: 0.5
+  TrayUI: {fileID: 760546447}
+  Client: {fileID: 11400000, guid: 8dca4719b56d91143b236583a436c911, type: 2}

Assets/Scenes/Networking Test Scenes/ServerScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

Assets/Scripts/Components.meta

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

Assets/Scripts/Logic/BlockReader.cs

@@ -12,7 +12,7 @@ public class BlockReader
     #region Inspector Variables
     [SerializeField]
     [Tooltip("List of LogicBlocks which will affected this character")]
-    public List<LogicBlock> LogicChain;
+    public List<LogicBlock> LogicChain = new List<LogicBlock>();
     #endregion Inspector Variables
 
     #region Read-only Variables

Assets/Scripts/Logic/Blocks/CombinedBlock.cs

@@ -44,4 +44,38 @@ public class CombinedBlock : LogicBlock
         blockReader.Reset();
     }
 
+    public override void CopyToken(BlockToken token)
+    {
+        base.CopyToken(token);
+
+        blockReader = new BlockReader();
+
+        foreach (BlockToken subToken in ((CombinedToken)token).subBlocks)
+            blockReader.Add(subToken.ToLogicBlock());
+    }
+
+    public override BlockToken ToToken(BlockToken token = null)
+    {
+        if (token == null)
+            token = new CombinedToken(this);
+
+        CombinedToken retVal = (CombinedToken)base.ToToken(token);
+        retVal.subBlocks = new BlockToken[blockReader.LogicChain.Count];
+
+        for (int i = 0; i < retVal.subBlocks.Length; i++)
+            retVal.subBlocks[i] = blockReader.LogicChain[i].ToToken();
+
+        return retVal;
+    }
+
+}
+
+[System.Serializable]
+public class CombinedToken : BlockToken
+{
+    public BlockToken[] subBlocks;
+
+    public CombinedToken(LogicBlock block) : base(block)
+    {
+    }
 }

Assets/Scripts/LogicBlocks.meta

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

Assets/Scripts/NetworkOutput.cs

@@ -7,8 +7,7 @@ using Networking;
 
 public class NetworkOutput : MonoBehaviour
 {
-
-    public BlockReader reader;
+    public LogicTrayUI Tray;
 
     [SerializeField]
     protected ClientObject Client;
@@ -16,7 +15,7 @@ public class NetworkOutput : MonoBehaviour
     [ContextMenu("Send list")]
     public void SendList()
     {
-        LogicProtocols.LogicMsg msg = new LogicProtocols.LogicMsg(reader.LogicChain.ToArray());
+        LogicProtocols.LogicMsg msg = new LogicProtocols.LogicMsg(Tray.reader.LogicChain.ToArray());
 
         Debug.Log("sending on " + LogicProtocols.SendLogicList);
         Client.client.SendByChannel(LogicProtocols.SendLogicList, msg,TransportConfigure.ReliableFragmented);

Assets/Scripts/Networking/Client/ClientLoginManager.cs

@@ -24,6 +24,10 @@ namespace Networking.Client
         [Tooltip("Try and connect on Play")]
         private bool StartClientOnAwake;
 
+        [SerializeField]
+        [Tooltip("Scene to load on connection")]
+        private string LevelToLoad;
+
         [Header("Player Settings")]
         [SerializeField]
         [Tooltip("Player Name")]
@@ -87,6 +91,7 @@ namespace Networking.Client
         {
             Debug.Log("Log in successful");
             Client.UpdatePlayerDetails(DisplayName, PlayerColor);
+            UnityEngine.SceneManagement.SceneManager.LoadScene(LevelToLoad);
         }
 
         public void LoginFail(NetworkMessage msg)

Assets/Scripts/UI/LocalUIManager.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LocalUIManager : PlayerUIManager
+{
+
+    protected BlockInput characterInput;
+
+    protected override void Awake()
+    {
+        TrayUI.SetBlockReader(characterInput.blockReader);
+    }
+
+    public override void OnClick_Play()
+    {
+        OnClick_Hide();
+        characterInput.ReadAll();
+    }
+}

Assets/Scripts/UI/LocalUIManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a8750d0e7b23a844bb1b7f37c1a8d34
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/LogicTrayUI.cs

@@ -17,7 +17,7 @@ public class LogicTrayUI : LogicElementHolder
     private Transform content;
 
     [SerializeField]
-    protected BlockReader reader;
+    public BlockReader reader;
 
     #region Unity Functions
     public void Start()
@@ -53,6 +53,9 @@ public class LogicTrayUI : LogicElementHolder
     [ContextMenu("Update Display")]
     public void UpdateDisplay()
     {
+        if (reader == null)
+            return;
+
         //Destroy all children
         int destroyedCount = content.childCount; //we need to know how many were destroyed since unity doesn't actually destroy anything until the end of the frame
         foreach (Transform child in content)

Assets/Scripts/UI/NetworkedUIManager.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Networking;
+using Networking.Client;
+
+public class NetworkedUIManager : PlayerUIManager
+{
+    [SerializeField]
+    private ClientObject Client;
+
+    private BlockReader reader;
+
+    protected override void Awake()
+    {
+        base.Awake();
+        reader = new BlockReader();
+        TrayUI.SetBlockReader(reader);
+    }
+
+    public override void OnClick_Play()
+    {
+        OnClick_Hide();
+        LogicProtocols.LogicMsg msg = new LogicProtocols.LogicMsg(reader.LogicChain.ToArray());
+
+        Debug.Log("sending on " + LogicProtocols.SendLogicList);
+        Client.client.SendByChannel(LogicProtocols.SendLogicList, msg, TransportConfigure.ReliableFragmented);
+    }
+
+}

Assets/Scripts/UI/NetworkedUIManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 65239890e888fd246a0b0985573deed6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/PlayerUIManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class PlayerUIManager : MonoBehaviour
+public abstract class PlayerUIManager : MonoBehaviour
 {
 
     [SerializeField]
@@ -12,25 +12,18 @@ public class PlayerUIManager : MonoBehaviour
     private float AnimationSpeed = 0.5f;
 
     [SerializeField]
-    private BlockInput characterInput;
-
-    [SerializeField]
-    private LogicTrayUI TrayUI;
+    protected LogicTrayUI TrayUI;
 
     private Vector3 ShowPosition;
     private Vector3 HidePosition;
     private RectTransform inventoryRect { get { return Inventory.transform as RectTransform; } }
 
-    private void Awake()
+    protected virtual void Awake()
     {
-
-
         ShowPosition = new Vector3(0, -inventoryRect.rect.height / 2, 0);
         HidePosition = new Vector3(0, inventoryRect.rect.height/2, 0);
 
-
-        inventoryRect.anchoredPosition = HidePosition;
-        TrayUI.SetBlockReader(characterInput.blockReader);
+        inventoryRect.anchoredPosition = HidePosition;       
     }
 
     [ContextMenu("Show")]
@@ -63,11 +56,7 @@ public class PlayerUIManager : MonoBehaviour
         }
     }
 
-    public void OnClick_Play() {
-
-        OnClick_Hide();
-        characterInput.ReadAll();
-    }
+    public abstract void OnClick_Play();
 
     private IEnumerator LerpPosition(RectTransform rt, Vector3 endPosition, float time)
     {

Assets/Third Party Assets.meta

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

Assets/Third Party Assets/AurynSky.meta

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

Assets/Third Party Assets/AurynSky/ArenaPacks.meta

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

Assets/Third Party Assets/AurynSky/ArenaPacks/Forest Pack.meta

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