diff --git a/Assets/Prefabs/Characters/Pirate (Blue).prefab b/Assets/Prefabs/Characters/Pirate (Blue).prefab index 0c72fb2..232ac97 100644 --- a/Assets/Prefabs/Characters/Pirate (Blue).prefab +++ b/Assets/Prefabs/Characters/Pirate (Blue).prefab @@ -629,7 +629,6 @@ MonoBehaviour: m_EditorClassIdentifier: playerState: 0 animator: {fileID: 5526766409186502679} - playerCountCanvasPrefab: {fileID: 9029553984926861784} playerCountCanvas: {fileID: 5728752331380905399} --- !u!1 &4818123989977612668 GameObject: @@ -1616,6 +1615,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: playerPawn + value: + objectReference: {fileID: 905786489} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} --- !u!224 &3729843840315893126 stripped @@ -1628,14 +1631,9 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} m_PrefabInstance: {fileID: 4537709141704337870} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9029553984926861784} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12325a6692b2349b5992ec00a2cf8162, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &9029553984926861784 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4879164135252893718, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - m_PrefabInstance: {fileID: 4537709141704337870} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Characters/Pirate (Green).prefab b/Assets/Prefabs/Characters/Pirate (Green).prefab index bf55643..55bed00 100644 --- a/Assets/Prefabs/Characters/Pirate (Green).prefab +++ b/Assets/Prefabs/Characters/Pirate (Green).prefab @@ -629,7 +629,6 @@ MonoBehaviour: m_EditorClassIdentifier: playerState: 0 animator: {fileID: 5274388487207906813} - playerCountCanvasPrefab: {fileID: 6862258105288866118} playerCountCanvas: {fileID: 7923051124467737897} --- !u!1 &5059623752267150313 GameObject: @@ -1648,6 +1647,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: playerPawn + value: + objectReference: {fileID: 2411043470597465747} - target: {fileID: 8752947010238866161, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_Color.b value: 0.1882353 @@ -1667,17 +1670,12 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} m_PrefabInstance: {fileID: 2057554100330600784} m_PrefabAsset: {fileID: 0} ---- !u!1 &6862258105288866118 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4879164135252893718, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - m_PrefabInstance: {fileID: 2057554100330600784} - m_PrefabAsset: {fileID: 0} --- !u!114 &7923051124467737897 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} m_PrefabInstance: {fileID: 2057554100330600784} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6862258105288866118} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12325a6692b2349b5992ec00a2cf8162, type: 3} diff --git a/Assets/Prefabs/Characters/Pirate (Grey).prefab b/Assets/Prefabs/Characters/Pirate (Grey).prefab index 09c586e..115b091 100644 --- a/Assets/Prefabs/Characters/Pirate (Grey).prefab +++ b/Assets/Prefabs/Characters/Pirate (Grey).prefab @@ -201,7 +201,6 @@ MonoBehaviour: m_EditorClassIdentifier: playerState: 0 animator: {fileID: 232863433340697214} - playerCountCanvasPrefab: {fileID: 2911420982173280738} playerCountCanvas: {fileID: 1920934309388072333} --- !u!136 &1627116187348267135 CapsuleCollider: @@ -1648,6 +1647,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: playerPawn + value: + objectReference: {fileID: 5261245861010270014} - target: {fileID: 8752947010238866161, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_Color.b value: 0.7294118 @@ -1667,17 +1670,12 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} m_PrefabInstance: {fileID: 7769048123306772980} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2911420982173280738} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12325a6692b2349b5992ec00a2cf8162, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2911420982173280738 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4879164135252893718, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - m_PrefabInstance: {fileID: 7769048123306772980} - m_PrefabAsset: {fileID: 0} --- !u!224 &7416033585674372540 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} diff --git a/Assets/Prefabs/Characters/Pirate (Red).prefab b/Assets/Prefabs/Characters/Pirate (Red).prefab index 9e9ca51..baafce9 100644 --- a/Assets/Prefabs/Characters/Pirate (Red).prefab +++ b/Assets/Prefabs/Characters/Pirate (Red).prefab @@ -1258,7 +1258,6 @@ MonoBehaviour: m_EditorClassIdentifier: playerState: 0 animator: {fileID: 7800412279828783518} - playerCountCanvasPrefab: {fileID: 4593694095142779203} playerCountCanvas: {fileID: 941219433310479660} --- !u!1 &7074820051352815849 GameObject: @@ -1524,26 +1523,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7767047851774264951} m_Modifications: - - target: {fileID: 65645560966781747, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 65645560966781747, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 65645560966781747, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 65645560966781747, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 65645560966781747, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1580,18 +1559,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1644,22 +1611,10 @@ PrefabInstance: propertyPath: m_Name value: Canvas - World objectReference: {fileID: 0} - - target: {fileID: 4879164135252893718, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8752947010238866161, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_Color.b - value: 0.19607843 - objectReference: {fileID: 0} - - target: {fileID: 8752947010238866161, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_Color.g - value: 0.17254902 - objectReference: {fileID: 0} - - target: {fileID: 8752947010238866161, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - propertyPath: m_Color.r - value: 0.46666667 - objectReference: {fileID: 0} + - target: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} + propertyPath: playerPawn + value: + objectReference: {fileID: 896294592} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} --- !u!114 &941219433310479660 stripped @@ -1667,17 +1622,12 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8176763997504289913, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} m_PrefabInstance: {fileID: 8968445451050703189} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4593694095142779203} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12325a6692b2349b5992ec00a2cf8162, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &4593694095142779203 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4879164135252893718, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} - m_PrefabInstance: {fileID: 8968445451050703189} - m_PrefabAsset: {fileID: 0} --- !u!224 &8164022016059970845 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 953143927943285832, guid: a925361762f504380a8aa4d7eb87b32c, type: 3} diff --git a/Assets/Prefabs/UI/Canvas - World.prefab b/Assets/Prefabs/UI/Canvas - World.prefab index a31cacd..80901ba 100644 --- a/Assets/Prefabs/UI/Canvas - World.prefab +++ b/Assets/Prefabs/UI/Canvas - World.prefab @@ -61,7 +61,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.42352942, b: 0.75686276, a: 1} + m_Color: {r: 0.46666667, g: 0.17254902, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -167,13 +167,16 @@ GameObject: - component: {fileID: 1334714064113256010} - component: {fileID: 2739169735767897497} - component: {fileID: 8176763997504289913} + - component: {fileID: 6073611459596533328} + - component: {fileID: 1708578341718423809} + - component: {fileID: 6293990703772930473} m_Layer: 5 m_Name: Canvas - World m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &953143927943285832 RectTransform: m_ObjectHideFlags: 0 @@ -270,6 +273,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerCountText: {fileID: 5414082930131347236} + playerPawn: {fileID: 0} + indicatorBtn: {fileID: 1708578341718423809} +--- !u!222 &6073611459596533328 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4879164135252893718} + m_CullTransparentMesh: 1 +--- !u!114 &1708578341718423809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4879164135252893718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6293990703772930473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4879164135252893718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8183529856602442984 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Player Count/PlayerCountCanvas.cs b/Assets/Scripts/UI/Player Count/PlayerCountCanvas.cs index 19bdf73..d19e569 100644 --- a/Assets/Scripts/UI/Player Count/PlayerCountCanvas.cs +++ b/Assets/Scripts/UI/Player Count/PlayerCountCanvas.cs @@ -1,10 +1,25 @@ using TMPro; using UnityEngine; +using UnityEngine.UI; public class PlayerCountCanvas : MonoBehaviour { Transform cam; [SerializeField] private TMP_Text playerCountText; + [SerializeField] private PlayerPawn playerPawn; + [SerializeField] private Button indicatorBtn; + + private GameplayManager gameplayManager; + + private void OnEnable() + { + indicatorBtn.onClick.AddListener(() => OnClickPlayer()); + } + + private void OnDisable() + { + indicatorBtn.onClick.RemoveListener(() => OnClickPlayer()); + } void Start() { @@ -18,4 +33,13 @@ public class PlayerCountCanvas : MonoBehaviour { playerCountText.text = count.ToString(); } + + public void OnClickPlayer() + { + // quick fix: Character selection too hard based on view + gameplayManager = gameplayManager ?? InterfaceManager.Instance.GetInterfaceInstance(); + if (gameplayManager.GameManager.CurrentGameState == GameState.IsPaused || playerPawn.IsBotPlayer || !playerPawn.CanSelectPlayer) return; + + gameplayManager.OnPawnSelected(playerPawn); + } } \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2e5cd33..d430789 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -48,8 +48,8 @@ PlayerSettings: m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 1920 + defaultScreenHeightWeb: 1080 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 unsupportedMSAAFallback: 0