diff --git a/Assets/GWConquest/Scripts/Battle.cs b/Assets/GWConquest/Scripts/Battle.cs index 003559e..e8add39 100644 --- a/Assets/GWConquest/Scripts/Battle.cs +++ b/Assets/GWConquest/Scripts/Battle.cs @@ -1,8 +1,8 @@ using UnityEngine; using System.Collections.Generic; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; using Unity.Collections; diff --git a/Assets/GWConquest/Scripts/BattleFlank.cs b/Assets/GWConquest/Scripts/BattleFlank.cs index a332425..cbc8b8f 100644 --- a/Assets/GWConquest/Scripts/BattleFlank.cs +++ b/Assets/GWConquest/Scripts/BattleFlank.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Photon.Bolt; + using Unity.Netcode; namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/BattleLog.cs b/Assets/GWConquest/Scripts/BattleLog.cs index 578eb68..d7d23f6 100644 --- a/Assets/GWConquest/Scripts/BattleLog.cs +++ b/Assets/GWConquest/Scripts/BattleLog.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Photon.Bolt; + using System; namespace GWConquest diff --git a/Assets/GWConquest/Scripts/BoltEntityCache.cs b/Assets/GWConquest/Scripts/BoltEntityCache.cs index 182b07e..46c95ab 100644 --- a/Assets/GWConquest/Scripts/BoltEntityCache.cs +++ b/Assets/GWConquest/Scripts/BoltEntityCache.cs @@ -1,4 +1,4 @@ -using Photon.Bolt; + using UnityEngine; using System.Collections.Generic; diff --git a/Assets/GWConquest/Scripts/BoltList.cs b/Assets/GWConquest/Scripts/BoltList.cs index a49bb99..0a50f95 100644 --- a/Assets/GWConquest/Scripts/BoltList.cs +++ b/Assets/GWConquest/Scripts/BoltList.cs @@ -1,4 +1,4 @@ -using Photon.Bolt; + using System; using System.Collections; using System.Collections.Generic; diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index 3123a7b..c67427f 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -1,8 +1,8 @@ using UnityEngine; using System.Collections.Generic; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; using Unity.Collections; diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs b/Assets/GWConquest/Scripts/DistrictFactory.cs index 937ddb8..d443dfc 100644 --- a/Assets/GWConquest/Scripts/DistrictFactory.cs +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs @@ -1,8 +1,8 @@ using UnityEngine; using System.Collections.Generic; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; using System; diff --git a/Assets/GWConquest/Scripts/DistrictUpgrade.cs b/Assets/GWConquest/Scripts/DistrictUpgrade.cs index b9dcbe3..ef6a785 100644 --- a/Assets/GWConquest/Scripts/DistrictUpgrade.cs +++ b/Assets/GWConquest/Scripts/DistrictUpgrade.cs @@ -1,4 +1,4 @@ -using Photon.Bolt.Utils; + using System; using System.Collections.Generic; using UnityEngine; diff --git a/Assets/GWConquest/Scripts/EntityList.cs b/Assets/GWConquest/Scripts/EntityList.cs index 7af08b3..71abcd8 100644 --- a/Assets/GWConquest/Scripts/EntityList.cs +++ b/Assets/GWConquest/Scripts/EntityList.cs @@ -1,5 +1,5 @@ using UdpKit; -using Photon.Bolt; + using System.Collections.Generic; using System.Linq; using System.Collections; diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs index 99aac40..463e5ef 100644 --- a/Assets/GWConquest/Scripts/Formation.cs +++ b/Assets/GWConquest/Scripts/Formation.cs @@ -3,8 +3,8 @@ using System.Linq; using System; using System.Collections.Generic; using System.Collections; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; namespace GWConquest diff --git a/Assets/GWConquest/Scripts/GWBoltBehaviour.cs b/Assets/GWConquest/Scripts/GWBoltBehaviour.cs index 2028186..4ad020b 100644 --- a/Assets/GWConquest/Scripts/GWBoltBehaviour.cs +++ b/Assets/GWConquest/Scripts/GWBoltBehaviour.cs @@ -1,4 +1,4 @@ -using Photon.Bolt; + namespace GWConquest { public abstract class GWBoltBehaviour : EntityBehaviour where T : class, IState diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index 1c3d3fd..31b84d6 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/Inventory.cs b/Assets/GWConquest/Scripts/Inventory.cs index 2ebd752..7dc2a5a 100644 --- a/Assets/GWConquest/Scripts/Inventory.cs +++ b/Assets/GWConquest/Scripts/Inventory.cs @@ -1,6 +1,6 @@ using UdpKit; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using System; using System.Linq; using System.Collections.Generic; diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index 02c4dee..c23141d 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; using Unity.Collections; diff --git a/Assets/GWConquest/Scripts/PlanetConnection.cs b/Assets/GWConquest/Scripts/PlanetConnection.cs index e29196c..6ea4f4a 100644 --- a/Assets/GWConquest/Scripts/PlanetConnection.cs +++ b/Assets/GWConquest/Scripts/PlanetConnection.cs @@ -1,8 +1,8 @@ using UnityEngine; using System.Linq; using System.Collections.Generic; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/PlanetPlacement.cs b/Assets/GWConquest/Scripts/PlanetPlacement.cs index 993a934..fa2238c 100644 --- a/Assets/GWConquest/Scripts/PlanetPlacement.cs +++ b/Assets/GWConquest/Scripts/PlanetPlacement.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest diff --git a/Assets/GWConquest/Scripts/PlanetRegistry.cs b/Assets/GWConquest/Scripts/PlanetRegistry.cs index e2a59db..7f098fc 100644 --- a/Assets/GWConquest/Scripts/PlanetRegistry.cs +++ b/Assets/GWConquest/Scripts/PlanetRegistry.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { @@ -262,7 +262,7 @@ namespace GWConquest catch(System.Exception ex) { Debug.LogWarningFormat("Failed to parse structure types: {0}", structureTypes); - BoltLog.Exception(ex); + Debug.LogException(ex); return null; } } diff --git a/Assets/GWConquest/Scripts/Player.cs b/Assets/GWConquest/Scripts/Player.cs index d04df3f..d4b3ee0 100644 --- a/Assets/GWConquest/Scripts/Player.cs +++ b/Assets/GWConquest/Scripts/Player.cs @@ -1,8 +1,8 @@ using UnityEngine; using System.Collections.Generic; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; using Unity.Collections; diff --git a/Assets/GWConquest/Scripts/SpawnAIUnits.cs b/Assets/GWConquest/Scripts/SpawnAIUnits.cs index 2f98713..24e79f2 100644 --- a/Assets/GWConquest/Scripts/SpawnAIUnits.cs +++ b/Assets/GWConquest/Scripts/SpawnAIUnits.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs index 731d03c..315bf3e 100644 --- a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs +++ b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs @@ -2,8 +2,8 @@ using UnityEngine; using UnityEngine.UI; using System.Collections.Generic; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { public class BattleArmyPanel : MonoBehaviour { diff --git a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs index 48aa090..6b834b0 100644 --- a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs @@ -1,8 +1,8 @@ using UnityEngine; using UnityEngine.UI; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs index 7be2f71..1b88b98 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs @@ -2,8 +2,8 @@ using UnityEngine; using UnityEngine.UI; using System.Linq; using System.Collections.Generic; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs index b8b8b13..ada1b3f 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs @@ -1,8 +1,8 @@ using UnityEngine; using UnityEngine.UI; using System.Collections; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { public class BattleUnitIcon : DragDropElement { diff --git a/Assets/GWConquest/Scripts/UI/FormationIcon.cs b/Assets/GWConquest/Scripts/UI/FormationIcon.cs index 734fb51..2457e34 100644 --- a/Assets/GWConquest/Scripts/UI/FormationIcon.cs +++ b/Assets/GWConquest/Scripts/UI/FormationIcon.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { public class FormationIcon : DragDropElement, IUpdatable diff --git a/Assets/GWConquest/Scripts/UI/FormationUI.cs b/Assets/GWConquest/Scripts/UI/FormationUI.cs index 415e430..d929689 100644 --- a/Assets/GWConquest/Scripts/UI/FormationUI.cs +++ b/Assets/GWConquest/Scripts/UI/FormationUI.cs @@ -2,8 +2,8 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/GarrisonUI.cs b/Assets/GWConquest/Scripts/UI/GarrisonUI.cs index 8e5c167..d283ae9 100644 --- a/Assets/GWConquest/Scripts/UI/GarrisonUI.cs +++ b/Assets/GWConquest/Scripts/UI/GarrisonUI.cs @@ -2,8 +2,8 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/IngameUI.cs b/Assets/GWConquest/Scripts/UI/IngameUI.cs index 812fe14..03707af 100644 --- a/Assets/GWConquest/Scripts/UI/IngameUI.cs +++ b/Assets/GWConquest/Scripts/UI/IngameUI.cs @@ -2,8 +2,8 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/ItemMoveTooltip.cs b/Assets/GWConquest/Scripts/UI/ItemMoveTooltip.cs index 83c82d2..3c87a6e 100644 --- a/Assets/GWConquest/Scripts/UI/ItemMoveTooltip.cs +++ b/Assets/GWConquest/Scripts/UI/ItemMoveTooltip.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; namespace GWConquest diff --git a/Assets/GWConquest/Scripts/UI/MainMenu.cs b/Assets/GWConquest/Scripts/UI/MainMenu.cs index 82d23d9..a614cb5 100644 --- a/Assets/GWConquest/Scripts/UI/MainMenu.cs +++ b/Assets/GWConquest/Scripts/UI/MainMenu.cs @@ -1,5 +1,5 @@ -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Photon.Bolt.Matchmaking; using System; using UdpKit; diff --git a/Assets/GWConquest/Scripts/UI/PauseMenu.cs b/Assets/GWConquest/Scripts/UI/PauseMenu.cs index c76ac86..c6775f7 100644 --- a/Assets/GWConquest/Scripts/UI/PauseMenu.cs +++ b/Assets/GWConquest/Scripts/UI/PauseMenu.cs @@ -1,4 +1,4 @@ -using Photon.Bolt; + using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs index 3ead4f4..aae7642 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -using Photon.Bolt.Utils; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/ProductionMenu.cs b/Assets/GWConquest/Scripts/UI/ProductionMenu.cs index ebdd36a..ba495f0 100644 --- a/Assets/GWConquest/Scripts/UI/ProductionMenu.cs +++ b/Assets/GWConquest/Scripts/UI/ProductionMenu.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -using Photon.Bolt; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/SelectFactionMenu.cs b/Assets/GWConquest/Scripts/UI/SelectFactionMenu.cs index 43e1dad..2bc7f48 100644 --- a/Assets/GWConquest/Scripts/UI/SelectFactionMenu.cs +++ b/Assets/GWConquest/Scripts/UI/SelectFactionMenu.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Photon.Bolt.Utils; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/TransportUI.cs b/Assets/GWConquest/Scripts/UI/TransportUI.cs index 572a189..d3b5334 100644 --- a/Assets/GWConquest/Scripts/UI/TransportUI.cs +++ b/Assets/GWConquest/Scripts/UI/TransportUI.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; using System.Linq; -using Photon.Bolt.Utils; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/TransportUIItemIcon.cs b/Assets/GWConquest/Scripts/UI/TransportUIItemIcon.cs index 8642795..5e4b05d 100644 --- a/Assets/GWConquest/Scripts/UI/TransportUIItemIcon.cs +++ b/Assets/GWConquest/Scripts/UI/TransportUIItemIcon.cs @@ -1,6 +1,6 @@ using UnityEngine.UI; using UnityEngine; -using Photon.Bolt.Utils; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs b/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs index 361f2cc..69ed051 100644 --- a/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs +++ b/Assets/GWConquest/Scripts/UI/TransportUIUnitIcon.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.UI; -using Photon.Bolt; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs index 2e1e371..a77f2ee 100644 --- a/Assets/GWConquest/Scripts/Unit.cs +++ b/Assets/GWConquest/Scripts/Unit.cs @@ -1,7 +1,7 @@ using System.Linq; using UnityEngine; -using Photon.Bolt; -using Photon.Bolt.Utils; + + using Unity.Netcode; namespace GWConquest diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs index 1e43a67..af9755c 100644 --- a/Assets/GWConquest/Scripts/UnitClass.cs +++ b/Assets/GWConquest/Scripts/UnitClass.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using Photon.Bolt.Utils; + namespace GWConquest { diff --git a/Assets/GWConquest/Scripts/Zone.cs b/Assets/GWConquest/Scripts/Zone.cs index 06e5053..ff6fbb9 100644 --- a/Assets/GWConquest/Scripts/Zone.cs +++ b/Assets/GWConquest/Scripts/Zone.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using UnityEngine; using System.Linq; -using Photon.Bolt; -using Photon.Bolt.Utils; + + namespace GWConquest {