Commit Graph

238 Commits

Author SHA1 Message Date
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 10:28:42 +07:00
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 09:55:39 +07:00
HungDK 793eb7c030 Merge branch 'develop' into feature/character_info 2026-02-02 09:43:23 +07:00
HungDK b6a54a1b89 Add prefab ui and asign to ui manager scriptable object 2026-02-02 09:23:55 +07:00
Le Duc Anh ccd6564772 update game UI 2026-02-01 15:02:43 +07:00
Le Duc Anh d6e4daeda2 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-31 18:20:34 +07:00
Le Duc Anh 3a2772c739 finish minimap v1 2026-01-31 18:18:36 +07:00
Le Duc Anh f40abb2132 update host player pos 2026-01-30 17:21:15 +07:00
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
HungDK 030a42031b Add teamate ui 2026-01-30 09:34:27 +07:00
Le Duc Anh ea8e6a79f1 update mini map 2026-01-29 19:25:53 +07:00
Chomper9981 0821e2f741 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-29 17:49:03 +07:00
Chomper9981 5aff603a47 Add task trace Feature. Modify task UI. 2026-01-29 17:42:34 +07:00
Le Duc Anh c31adee89f use sprites for minimap 2026-01-28 19:33:09 +07:00
VDH a3b5a72b9c Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
2026-01-28 16:47:35 +07:00
Le Duc Anh b8d54ab6f7 Merge branch 'feature/mini-map' of https://git.brew.monster/Unity/perfect-world-unity into feature/mini-map 2026-01-28 09:55:19 +07:00
Le Duc Anh b21190fda8 update minimap textures 2026-01-28 09:52:20 +07:00
Le Duc Anh 8f4fc62426 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-28 09:46:40 +07:00
HungDK c748d9c39e Merge branch 'develop' into feature/character_info 2026-01-27 17:57:39 +07:00
HungDK 111a346c43 Update UIManager.prefab 2026-01-27 17:57:01 +07:00
HungDK 3be987855f Add ui resource and prefap 2026-01-27 17:37:30 +07:00
HungDK 76bb956061 Add button, event to open dlg character 2026-01-27 17:36:36 +07:00
VDH 7d9f75de18 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-23 18:08:51 +07:00
Chomper9981 366a1a8cec Change Task UI tree. (Add color, add tree space) 2026-01-23 17:38:31 +07:00
VDH 658b8404aa save prefab 2026-01-21 17:42:22 +07:00
Le Duc Anh aec46e91d3 WIP: show mini map textures 2026-01-20 23:59:28 +07:00
Le Duc Anh 0906634e3b minimap prefab 2026-01-20 17:02:38 +07:00
VDH 5d0f69ab34 done ui cap phep 2026-01-20 10:53:12 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
VDH 7cb64013c2 save prefab 2026-01-16 18:37:32 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
VDH 5462a3a79f save merge dev 2026-01-15 11:40:02 +07:00
VDH a0d80146bd Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-14 18:14:58 +07:00
VDH 8b2a00930b save prefab 2026-01-14 18:14:17 +07:00
Tungdv 425698dd79 fix: update pos camera in HP. 2026-01-13 18:34:59 +07:00
VDH f5a9227cc7 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Prefabs/BoostrapForTest.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 18:04:28 +07:00
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
MinhHai 8285d1b68a add FreeLook Camera become prefab 2026-01-13 17:27:44 +07:00
MinhHai a6b26627a2 update UI: move all window into same canvas 2026-01-13 15:36:56 +07:00
MinhHai 111ddf05a8 change SpeedX : 300 -> 60 2026-01-13 14:35:42 +07:00
VDH 6066e851a4 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 11:04:28 +07:00
VDH 363e61c1eb save prefab 2026-01-13 11:01:07 +07:00
VDH 61f4660dba done flow learn skill 2026-01-12 19:07:37 +07:00
MinhHai 219c87f469 add new pack: Editor Attributes, complete GoTo cmd 2026-01-09 15:01:29 +07:00
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +07:00
VDH 7e83b578fe coool down ui 2026-01-05 18:25:27 +07:00
VDH fe3eacbc91 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-05 15:30:29 +07:00
VDH 2d3c9a96ef fix bug can't use skill when player is far from target 2026-01-05 15:27:12 +07:00
NguyenVanDat ce03f2d38a update process bar 2026-01-05 11:31:22 +07:00
NguyenVanDat 397cb6b98f deactive process as default 2026-01-05 09:40:01 +07:00