Merge Player Trading into Main

Assets/SuperMultiplayerShooter/Scripts/CharacterSelector.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using PubnubApi;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -17,6 +18,9 @@ public class CharacterSelector : MonoBehaviour
         public Connector connector;
         public SampleMainMenu mainMenu;
 
+        private Pubnub pubnub { get { return PNManager.pubnubInstance.pubnub; } }
+
+
         void Start()
         {
             DataCarrier.characters = characters;
@@ -43,7 +47,7 @@ public void Refresh()
         }
 
         // Character selection:
-        public void SelectCharacter(CharacterData data)
+        public async void SelectCharacter(CharacterData data)
         {
             // Close the character selection panel:
             mainMenu.characterSelectionPanel.SetActive(false);
@@ -58,6 +62,27 @@ public void SelectCharacter(CharacterData data)
             }
 
             mainMenu.characterIconPresenter.sprite = data.icon;
+
+            //Update local metadata
+            var metadata = PNManager.pubnubInstance.CachedPlayers[pubnub.GetCurrentUserId()].Custom;
+            if (metadata != null)
+            {
+                if (metadata.ContainsKey("chosen_character"))
+                {
+                    metadata["chosen_character"] = DataCarrier.chosenCharacter;
+                }
+
+                //First time saving a new hat.
+                else
+                {
+                    metadata.Add("chosen_character", DataCarrier.chosenCharacter);
+                }
+
+                PNManager.pubnubInstance.CachedPlayers[pubnub.GetCurrentUserId()].Custom = metadata;
+
+                //Store the new update in the metadata
+                await PNManager.pubnubInstance.UpdateUserMetadata(pubnub.GetCurrentUserId(), PNManager.pubnubInstance.CachedPlayers[pubnub.GetCurrentUserId()].Name, metadata);
+            }
         }
     }
 }

Assets/SuperMultiplayerShooter/Scripts/Connector.cs

@@ -267,7 +267,7 @@ public void JoinCustomGame(PNRoomInfo room){
         //  changes (e.g. they go offline) on the same channel but there are other ways to implement a lobby and
         //  room system with PubNub.  Alternatively you could use PubNub's message history
         //  to store a created room, then others could read a channel's history to decide which room to join.
-        public async Task<bool> CreateCustomGame(int selectedMap, int maxPlayers, bool allowBots)
+        public async Task<bool> CreateCustomGame(int selectedMap, int maxPlayers, bool allowBots, int gameLength)
         {
             if (pubnub != null)
             {
@@ -282,6 +282,7 @@ public async Task<bool> CreateCustomGame(int selectedMap, int maxPlayers, bool a
                 metaData["started"] = 0;
                 metaData["map"] = selectedMap;
                 metaData["customAllowBots"] = allowBots ? 1 : 0;
+                metaData["gameLength"] = gameLength * 60; //Match Duration will be set in seconds
                 string channelName = PubNubUtilities.chanGlobal;
                 PNResult<PNSetStateResult> setPresenceStateResponse = await pubnub.SetPresenceState()
                     .Channels(new string[] { channelName })
@@ -625,6 +626,7 @@ private async Task<bool> UserIsOnlineOrStateChange(string uuid)
                         int map = System.Convert.ToInt32(userState["map"]);
                         int maxPlayers = System.Convert.ToInt32(userState["maxPlayers"]);
                         bool allowBots = (System.Convert.ToInt32(userState["customAllowBots"]) == 1);
+                        GAME_LENGTH_MAKE_ME_CONFIGURABLE = System.Convert.ToInt32(userState["gameLength"]);
                         string ownerId = (string)userState["ownerId"];
                         bool inProgress = System.Convert.ToInt32(userState["inProgress"]) == 1;
                         PNRoomInfo roomInfo = new PNRoomInfo(uuid, name, map, maxPlayers, allowBots, roomCounter, GAME_LENGTH_MAKE_ME_CONFIGURABLE);
@@ -1057,7 +1059,6 @@ public void PlayerSelected(string action, string id)
 
         /// <summary>
         /// Returns the language of the user
-        /// TODO: Will be replaced by getting the metadata of the user.
         /// </summary>
         /// <returns></returns>
         public string GetUserLanguage()

Assets/SuperMultiplayerShooter/Scripts/CosmeticsSystem/CharacterCustomizer.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
+using PubnubApi;
 using PubNubUnityShowcase;
 using UnityEngine;
 
@@ -23,6 +25,8 @@ public class CharacterCustomizer : MonoBehaviour
         List<InventorySlot> curSlots = new List<InventorySlot>();   // the current instatiated slots
         PlayerController preview;                                   // the instantiated player prefab for preview
 
+        private Pubnub pubnub { get { return PNManager.pubnubInstance.pubnub; } }
+
         // Start is called before the first frame update
         void Start()
         {
@@ -103,7 +107,7 @@ public void RefreshSlots(){
         /// <summary>
         /// Equips an item from the database:
         /// </summary>
-        public void Equip(CosmeticItemData item){
+        public async void Equip(CosmeticItemData item){
 
             switch (item.itemType){
                 case CosmeticType.Hat:
@@ -117,6 +121,27 @@ public void Equip(CosmeticItemData item){
             // Refresh the player preview:
             Cosmetics c = new Cosmetics(DataCarrier.chosenHat);
             playerPrefabController.cosmeticsManager.Refresh(c);
+
+            //Update metadata
+            var metadata = PNManager.pubnubInstance.CachedPlayers[pubnub.GetCurrentUserId()].Custom;
+            if(metadata != null)
+            {
+                if(metadata.ContainsKey("chosen_hat")) 
+                {
+                    metadata["chosen_hat"] = DataCarrier.chosenHat;
+                }
+
+                //First time saving a new hat.
+                else
+                {
+                    metadata.Add("chosen_hat", DataCarrier.chosenHat);
+                }
+
+                PNManager.pubnubInstance.CachedPlayers[pubnub.GetCurrentUserId()].Custom = metadata;
+
+                //Store the new update in the metadata
+                await PNManager.pubnubInstance.UpdateUserMetadata(pubnub.GetCurrentUserId(), PNManager.pubnubInstance.CachedPlayers[pubnub.GetCurrentUserId()].Name, metadata);
+            }           
         }
     }
 }

Assets/SuperMultiplayerShooter/Scripts/FriendsList/FriendsList.cs

@@ -79,7 +79,6 @@ private async void OnPnMessage(PNMessageResult<object> result)
                     if(acceptFriend != null)
                     {
                         acceptFriend.tradeButton.gameObject.SetActive(true);
-                        acceptFriend.tradeButton.interactable = false; //To be removed once trading is fully integrated.
                         acceptFriend.acceptButton.gameObject.SetActive(false);
                         acceptFriend.removeButton.name = "remove"; // Used to determine whether or not to remove from friend groups
                         acceptFriend.gameObject.GetComponent<Image>().color = Color.white; // change color to show accepted friend.

Assets/SuperMultiplayerShooter/Scripts/FriendsList/FriendsListItem.cs

@@ -1,5 +1,6 @@
 using PubnubApi;
 using PubNubUnityShowcase;
+using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
@@ -30,9 +31,9 @@ public void Set(string uuid, string name)
             userId = uuid;
             onlineStatus.color = Color.gray;
             messageButton.onClick.AddListener(() => OnMessageClick());
-            //tradeBtn.onClick.AddListener(() => OnTradeClick()); To update when trade is implemented.
             acceptButton.onClick.AddListener(async () => await OnAcceptFriendClick());
             removeButton.onClick.AddListener(async () => await OnRemoveClick());
+            tradeButton.onClick.AddListener(() => OnTradeClick());
         }
 
         /// <summary>
@@ -45,9 +46,11 @@ public void OnMessageClick()
         /// <summary>
         /// Called when the user clicks the trade button
         /// </summary>
-        public void OnTradeClick()
+        public async void OnTradeClick()
         {
-            //TODO, once player trading is integrated.
+            var cts = new CancellationTokenSource();
+            var viewData = await TradingService.Instance.GetViewDataInitiator(userId, cts.Token);
+            var view = TradingService.Instance.OpenView(viewData, cts.Token);
         }
         /// <summary>
         /// Remove friend

Assets/SuperMultiplayerShooter/Scripts/Leaderboard.cs

@@ -74,8 +74,7 @@ private async Task<bool> PublishMessage(string text, string channel)
     /// <param name="result"></param>
     private void OnPnMessage(PNMessageResult<object> result)
     {
-        // Enable the button once we have established connection to PubNub, todo it is better to use a status listener here. 
-        // Leaderboard Updates
+        // Enable the button once we have established connection to PubNub 
         if (result.Channel.Equals(PubNubUtilities.chanLeaderboardSub))
         {
             Dictionary<string, object> msg = JsonConvert.DeserializeObject<Dictionary<string, object>>(result.Message.ToString());// as Dictionary<string, object>;

Assets/SuperMultiplayerShooter/Scripts/Lobby Browser System/LobbyBrowserUI.cs

@@ -23,6 +23,7 @@ public class LobbyBrowserUI : MonoBehaviour
         public Text mapNameText;
         public SelectorUI mapSelector;
         public SelectorUI playerNumberSelector;
+        public SelectorUI gameLengthSelector;
         public Toggle enableBotsOption;
 
         [Header("Joined Screen:")]
@@ -133,7 +134,7 @@ public void Leave()
             }
         }
         public async void Create(){
-            await Connector.instance.CreateCustomGame(mapSelector.curSelected, playerNumberSelector.items[playerNumberSelector.curSelected].value, enableBotsOption.isOn);
+            await Connector.instance.CreateCustomGame(mapSelector.curSelected, playerNumberSelector.items[playerNumberSelector.curSelected].value, enableBotsOption.isOn, gameLengthSelector.items[gameLengthSelector.curSelected].value);
         }
         public void StartGame(){
             Connector.instance.StartCustomGame();

Assets/SuperMultiplayerShooter/Scripts/PNManager.cs

@@ -37,6 +37,8 @@ public class PNManager : PNManagerBehaviour
     public PNPresenceEvent onPubNubPresence;  
     public delegate void PNObjectEvent(PNObjectEventResult result); // Receive app context (metadata) updates
     public PNObjectEvent onPubNubObject;
+    public delegate void PNStatusEvent(PNStatus status); // Receive status updates
+    public PNStatusEvent onPubNubStatus;
     public delegate void PubNubReady(); //  PubNub is initialized, ok to call PubNub object
     public PubNubReady onPubNubReady;
 
@@ -95,6 +97,7 @@ public async Task InitializePubNub()
         pnListener.onSignal += OnPnSignal;
         pnListener.onObject += OnPnObject;
         pnListener.onPresence += OnPnPresence;
+        pnListener.onStatus += OnPnStatus;
         await SubscribeToStaticChannels();
         try { onPubNubReady(); } catch (System.Exception) { }
     }
@@ -168,6 +171,17 @@ private void OnPnObject(Pubnub pn, PNObjectEventResult result)
         catch (System.Exception) { }
     }
 
+    // Handler for PubNub Status event.
+    private void OnPnStatus(Pubnub pn, PNStatus status)
+    {
+        //  Notify other listeners
+        try
+        {
+            onPubNubStatus(status);
+        }
+        catch (System.Exception) { }
+    }
+
     protected virtual new void OnDestroy()
     {
         //  Don't want the default destroy behaviour
@@ -251,6 +265,9 @@ public async Task<bool> GetUserMetadata(string Uuid)
             customData["hats"] = JsonConvert.SerializeObject(Connector.instance.GenerateRandomHats());
             customData["language"] = LocalizationSettings.SelectedLocale.Identifier.Code;
             customData["60fps"] = false;
+            customData["chosen_hat"] = DataCarrier.chosenHat;
+            customData["chosen_character"] = DataCarrier.chosenCharacter;
+
             // Update
             await UpdateUserMetadata(pubnub.GetCurrentUserId(), pubnub.GetCurrentUserId(), customData);
         }
@@ -331,13 +348,6 @@ public async Task<bool> UpdateUserMetadata(string uuid, string name, Dictionary<
                 Custom = setUuidMetadataResult.Custom,
                 Updated = setUuidMetadataResult.Updated
             };
-
-            //Update hat inventory.
-            if (setUuidMetadataResult.Custom != null && setUuidMetadataResult.Custom.ContainsKey("hats"))
-            {
-                List<int> availableHats = JsonConvert.DeserializeObject<List<int>>(setUuidMetadataResult.Custom["hats"].ToString());
-                Connector.instance.UpdateAvailableHats(availableHats);
-            }
 
             //Existing player
             if (PNManager.pubnubInstance.CachedPlayers.ContainsKey(setUuidMetadataResult.Uuid))