Commit Graph

477 Commits

Author SHA1 Message Date
NguyenVanDat 2235beea6e Merge branch 'develop' into feature/update-message-box 2026-02-02 18:18:33 +07:00
NguyenVanDat a33ef33062 update box message 2026-02-02 17:59:33 +07:00
VuNgocHaiC7 f23d7126a7 fix CECHostPlayer 2026-02-02 16:19:02 +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 72f7989796 Declare CECTeamMan in game run 2026-02-02 09:15:08 +07:00
HungDK 0aa4d00c2a Port logic of based team data, logic 2026-02-02 09:14:41 +07:00
HungDK ecc3a888ca Add message process 2026-02-02 09:12:15 +07:00
Le Duc Anh d6e4daeda2 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-31 18:20:34 +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 ccbe1b4a0c update feature useitem 2026-01-29 17:08:58 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +07:00
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
Le Duc Anh 8f4fc62426 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-28 09:46:40 +07:00
VDH c22ca07a0f done skill combo 2026-01-27 18:04:32 +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
Chomper9981 4aa78566a4 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-23 09:32:13 +07:00
Chomper9981 46cfb747c6 add all item till level 20 through the quest for TIT(tien thu). fix the bug suite not count decoration data. 2026-01-23 09:31:55 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
HungDK 8cf5ba8fa9 Update init flow 2026-01-22 16:24:10 +07:00
HungDK 2244c8b73c Add create role ui 2026-01-21 19:16:49 +07:00
VDH 485488b804 fix bug 2026-01-21 18:06:24 +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
VDH f2382366c3 convert skill combo 2026-01-20 18:00:18 +07:00
NguyenVanDat 5c6a4bb628 Merge branch 'develop' into feature/embed-stone
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-20 16:53:56 +07:00
NguyenVanDat b14bb3db0f update command embed stone 2026-01-20 16:49:56 +07:00
Chomper9981 e903de108a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-20 16:32:36 +07:00
Chomper9981 273f353ddc add more item detail in inventory. Create some place holder for pet item so that those item can be shown 2026-01-20 16:31:57 +07:00
HungDK 9af1819cef Add return village skill client logic 2026-01-20 15:17:54 +07:00
Le Duc Anh 7ec025aa04 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-20 11:22:27 +07:00
Le Duc Anh 08f878eb68 load wing equip data 2026-01-20 11:22:02 +07:00
VDH 5d0f69ab34 done ui cap phep 2026-01-20 10:53:12 +07:00
VDH 1d43192fb1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-19 16:22:53 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
Tungdv 15f9bd2a86 Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-16 19:16:40 +07:00
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
VuNgocHaiC7 2f6e3c751d update quantity inc, dec, max 2026-01-16 17:28:55 +07:00
Chomper9981 1564586daa add default state for item creatation. 2026-01-16 16:33:30 +07:00
Chomper9981 c069cba784 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-16 13:36:31 +07:00