Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/minimap implementation #98

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Feature/minimap implementation #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c28421
Full implementation
ehcamero Feb 28, 2022
2469fd2
Conflict checked
ehcamero Feb 28, 2022
043f86d
Conflict on Entity resolved
ehcamero Feb 28, 2022
9ccd5f4
Apply fix PR's comments
ehcamero Mar 6, 2022
fbb1ba7
Trying to run texture maps and player indicator
ehcamero Mar 6, 2022
9700e90
Fixing player position
ehcamero Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 120 additions & 61 deletions UnityClient/Assets/Resources/Prefabs/UI/Map UI.prefab
View file
Open in desktop

Large diffs are not rendered by default.

1,026 changes: 979 additions & 47 deletions UnityClient/Assets/Resources/Prefabs/UI/Windows/Minimap.prefab
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions UnityClient/Assets/Resources/Prefabs/UI/Windows/NpcBox.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -15}
m_SizeDelta: {x: 350, y: 30}
m_AnchoredPosition: {x: 169, y: -23}
m_SizeDelta: {x: 322, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2308426755591862037
CanvasRenderer:
Expand Down Expand Up @@ -366,11 +366,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7131267588176943532, guid: b45d9b48ba3242e4b82fe58cd4dc1dd1, type: 3}
propertyPath: m_Size
value: 0.9226513
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7131267589075313545, guid: b45d9b48ba3242e4b82fe58cd4dc1dd1, type: 3}
propertyPath: m_SizeDelta.y
value: 30
value: 46
objectReference: {fileID: 0}
- target: {fileID: 7131267589075313545, guid: b45d9b48ba3242e4b82fe58cd4dc1dd1, type: 3}
propertyPath: m_AnchoredPosition.y
Expand Down
2 changes: 1 addition & 1 deletion UnityClient/Assets/Scenes/Login/LoginController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void Start() {

NetworkClient = FindObjectOfType<NetworkClient>();

NetworkClient.ChangeServer("127.0.0.1", 6900);
NetworkClient.ChangeServer("192.168.0.3", 6900);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert this

NetworkClient.HookPacket(AC.ACCEPT_LOGIN3.HEADER, this.OnLoginResponse);
usernameField.text = "danilo3";
}
Expand Down
2 changes: 2 additions & 0 deletions UnityClient/Assets/Scenes/Map/MapController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class MapController : MonoBehaviour {
[SerializeField] private Light worldLight;

public MapUiController UIController;
public GameEventUI MiniMapController;

private NetworkClient NetworkClient;
private GameManager GameManager;
Expand All @@ -23,6 +24,7 @@ private async void Awake() {
}

UIController = FindObjectOfType<MapUiController>();
MiniMapController = FindObjectOfType<GameEventUI>();
NetworkClient = FindObjectOfType<NetworkClient>();
GameManager = FindObjectOfType<GameManager>();
EntityManager = FindObjectOfType<EntityManager>();
Expand Down
54 changes: 0 additions & 54 deletions UnityClient/Assets/Scripts/Components/UI/Minimap.cs
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions UnityClient/Assets/Scripts/Components/UI/Minimap.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading