Commit Graph

1283 Commits

Author SHA1 Message Date
HungDK eae2eb16d5 Merge branch 'develop' into feature/friend 2026-03-17 17:38:59 +07:00
HungDK ad505e37b9 Fixing metadata handle after getfriend re cause game dead 2026-03-17 13:59:12 +07:00
NguyenVanDat 13a08c97b3 end service when close DlgNpc 2026-03-17 11:16:11 +07:00
CuongNV f4e6fa8579 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-17 10:28:59 +07:00
VDH 4bb8306661 Merge branch 'develop' into feature/skillBehavior 2026-03-17 10:24:49 +07:00
VDH 0f55a32f97 adjust skill find the issue cause logic handle remove gfx faild 2026-03-17 10:24:30 +07:00
NguyenVanDat a960d7a5df finished refactor message box 2026-03-17 10:22:03 +07:00
CuongNV 3166c91471 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-17 10:21:23 +07:00
CuongNV 2c5aeb1d08 add LoginScreenUI 2026-03-17 10:21:03 +07:00
CuongNV a40d126d63 add AUI_ConvertChatString 2026-03-16 17:44:16 +07:00
HungDK 2870a5e309 Merge branch 'develop' into feature/friend 2026-03-16 17:40:12 +07:00
HungDK 5dfab238fa Update UnityGameSession.cs 2026-03-16 17:39:30 +07:00
HungDK 8655b96353 Handle getfriend_re so the game didnt died and add friend request handle 2026-03-16 17:39:25 +07:00
VDH 31176c1ad6 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
2026-03-16 16:43:30 +07:00
VDH 69e1b36dc6 done remove buff speed gfx 2026-03-16 16:40:04 +07:00
CuongNV 5ae3fc4252 fix RefreshVisible 2026-03-16 15:11:53 +07:00
Chomper9981 91b5c6fb51 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-16 14:46:41 +07:00
Chomper9981 db65447df2 Fix bug about elseplayer cast skill. 2026-03-16 14:46:16 +07:00
CuongNV f58b6381d8 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-16 11:28:14 +07:00
CuongNV 37bc21271b add handlr input 2026-03-16 11:25:31 +07:00
Le Duc Anh 6effe9c706 get other player equipment 2026-03-13 20:20:22 +07:00
VDH fdc6579c7e Merge branch 'develop' into feature/skillBehavior 2026-03-13 16:07:51 +07:00
VDH 5014d8947c else player cast skill play gfx 2026-03-13 16:03:47 +07:00
NguyenVanDat ab5eb93265 fix npc dialogue 2026-03-13 14:09:46 +07:00
NguyenVanDat 56c0098a26 fix npc close 2026-03-13 12:18:52 +07:00
Tungdv e6c2981ebb Merge remote-tracking branch 'origin/develop' into feature/elseplayer
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
2026-03-13 11:27:06 +07:00
Tungdv 144badd924 fix: update logic show wing and sword. 2026-03-13 10:54:46 +07:00
Tungdv 9788d29219 fix: update logic show wing and sword. 2026-03-13 10:40:04 +07:00
Chomper9981 67acf39b7a fix not open skill UI when click on empty quick bar slot 2026-03-13 10:38:51 +07:00
Chomper9981 34e5b569ed Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-13 10:36:48 +07:00
anhld 87e3695171 Merge pull request 'Equip data change' (#229) from feature/wings-flysword into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/229
2026-03-13 03:33:37 +00:00
Le Duc Anh dd3755c6e0 Equip data change 2026-03-13 10:32:47 +07:00
CuongNV 67b6d6f388 add chat on top player local 2026-03-13 09:57:56 +07:00
anhld fa92a237e7 Merge pull request 'Fly sword and else player equipment' (#228) from feature/wings-flysword into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/228
2026-03-12 17:22:56 +00:00
Le Duc Anh 5b31865962 WIP:show equipment for else player 2026-03-13 00:21:52 +07:00
Le Duc Anh dc0092eab0 add equip dat 2026-03-12 21:24:20 +07:00
Le Duc Anh 4ebf4cf169 update equipement data 2026-03-12 21:14:07 +07:00
HungDK 2015dbf73e Add PROTOCOL_ADDFRIEND and enable add friend request 2026-03-12 20:58:29 +07:00
Tungdv 65c0b00011 fix: update logic show wing and sword fly. 2026-03-12 19:27:19 +07:00
Le Duc Anh 67220287db move EDITOR scripts to proper tag 2026-03-12 18:11:00 +07:00
CuongNV 72310e9a42 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-12 17:29:11 +07:00
CuongNV e32ff4631b add UI chat 2026-03-12 17:26:24 +07:00
Chomper9981 ee9855ccb3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-12 17:15:38 +07:00
VuNgocHaiC7 6243736c70 update clone code for DlgPetList 2026-03-12 17:13:31 +07:00
Chomper9981 c9ad4fe2a8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-12 17:12:26 +07:00
Chomper9981 b5f89bb703 remove old skill cycle logic 2026-03-12 17:08:54 +07:00
Tungdv e2c8dd4d44 Merge remote-tracking branch 'origin/develop' into feature/elseplayer 2026-03-12 16:51:45 +07:00
Tungdv f5be092c15 fix: update init data EP. 2026-03-12 16:51:30 +07:00
VuNgocHaiC7 74d02c8fe4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-12 16:12:00 +07:00
VuNgocHaiC7 772af07696 fix code for UI dlgTeamList 2026-03-12 16:11:09 +07:00