Commit Graph

84 Commits

Author SHA1 Message Date
MinhHai d160df064d Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
2026-02-09 14:44:12 +07:00
VDH b3e5f2ae61 done skill ui execute 2026-02-05 17:26:58 +07:00
MinhHai 5dd3dcf48d WIP: add logic and UI 2026-02-04 15:17:39 +07:00
VDH eca33817e8 done ui info 2026-02-03 15:01:57 +07:00
VDH e57899226d infoskill done data 2026-02-02 18:16:11 +07:00
VDH f233ebe58b fix 2026-02-02 10:42:50 +07:00
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 57c2f5fb9f FIX after merge 2026-02-02 10:23:49 +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
VDH e91a491444 get description skill 2026-02-02 09:40:39 +07:00
HungDK 00296336f9 Show dialog "Win_ArrangeTeam" 2026-02-02 09:15:39 +07:00
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
VDH e2e63b83f2 convert ui code 2026-01-29 19:24:42 +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
VuNgocHaiC7 8d1965653c update UI of DlgProduce and DlgInstall, chage iconTask 2026-01-29 17:39:16 +07:00
VuNgocHaiC7 ccbe1b4a0c update feature useitem 2026-01-29 17:08:58 +07:00
VuNgocHaiC7 d69fed7aea fix conflig use item 2026-01-29 14:23:24 +07:00
VuNgocHaiC7 2dea3a8f02 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
2026-01-29 14:04:49 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +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
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
VDH c22ca07a0f done skill combo 2026-01-27 18:04:32 +07:00
HungDK c748d9c39e Merge branch 'develop' into feature/character_info 2026-01-27 17:57:39 +07:00
HungDK 312edda4aa Fix get character name logic 2026-01-27 17:41:33 +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
VDH 3de0850a2b push convert flow use skill combo 2026-01-23 18:01:15 +07:00
VuNgocHaiC7 ca84a98d31 completed task icon head NPC 2026-01-23 14:10:56 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
VDH 1cdeb28367 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Skills/ElementSkill.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-21 17:51:54 +07:00
VDH 53190f3f61 convert skill bombo 2026-01-21 17:40:10 +07:00
VuNgocHaiC7 2bb18644dd Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-21 14:13:23 +07:00
VuNgocHaiC7 0ca50d5475 update feature icon task on head NPC ( not yet completed ) 2026-01-21 14:12:23 +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 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
VDH 57b5195c36 done learn and upgrade skill 2026-01-14 18:00:30 +07:00
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
VDH 436df8d820 for tesst 2026-01-13 10:55:51 +07:00
VDH 61f4660dba done flow learn skill 2026-01-12 19:07:37 +07:00
VDH 59f70616e9 ui upgrade processing 2026-01-09 18:15:09 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +07:00
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +07:00
VDH 5471c68071 Merge branch 'develop' into feature/skill-data 2026-01-07 09:32:28 +07:00
VDH 4aeae053b9 for test 2026-01-06 19:36:22 +07:00
HungDK e5c09167fb Fix unstable reach site task completion 2026-01-06 16:59:14 +07:00
VDH 9fed589a9e cool down skill ui 2026-01-06 13:35:43 +07:00
VDH 7e83b578fe coool down ui 2026-01-05 18:25:27 +07:00
VDH 2d3c9a96ef fix bug can't use skill when player is far from target 2026-01-05 15:27:12 +07:00