Commit Graph

564 Commits

Author SHA1 Message Date
Chomper9981 281690316a Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:53:46 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +07:00
HungDK d962c70801 fix bug fly gfx don't be destroyed 2026-03-23 16:26:40 +07:00
VuNgocHaiC7 aec0394e79 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-18 17:45:39 +07:00
VuNgocHaiC7 e51674279d fix code for some dlg include one click item and fix detail info, value money 2026-03-18 17:43:25 +07:00
HungDK 2adc3ede59 Add logic update friend UI, friend status 2026-03-18 11:39:26 +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
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
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
VDH 5014d8947c else player cast skill play gfx 2026-03-13 16:03:47 +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 9788d29219 fix: update logic show wing and sword. 2026-03-13 10:40:04 +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 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
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 b5f89bb703 remove old skill cycle logic 2026-03-12 17:08:54 +07:00
VDH 2b2120ec58 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-12 14:27:42 +07:00
VuNgocHaiC7 b0d1ec8926 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-teamate 2026-03-11 17:38:17 +07:00
VuNgocHaiC7 c0b879d804 update dlg DlgFriendList.prefab 2026-03-11 17:36:16 +07:00
VDH 5feb313867 Merge branch 'develop' into feature/skillBehavior 2026-03-11 16:08:01 +07:00
VDH 230bb83e6f add more handle protocol 2026-03-11 16:05:54 +07:00
Tungdv 28c152109d fix: remove "return" logic. 2026-03-11 16:05:21 +07:00
Tungdv 748874fa84 fix: fix auto move to target when swim. 2026-03-11 15:41:39 +07:00
VDH 18b32f6d5f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/skillBehavior 2026-03-11 11:09:40 +07:00
VDH 3fc7106e76 switch skill shortcut 2026-03-10 18:01:47 +07:00
Chomper9981 2c432b0686 fix some wing proplem 2026-03-10 17:14:18 +07:00
Tungdv ebd44a40fc feat: add move fly and swim when attack to target. 2026-03-10 15:54:04 +07:00
Tungdv 94c20c4bdd Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
#	Assets/Scripts/CECPlayer_Inventory.cs
2026-03-10 14:47:49 +07:00
VDH fbcb3dc5e5 comment log 2026-03-10 14:00:49 +07:00
VDH 574fc0c8c6 fix bug flash move skill 2026-03-09 17:50:32 +07:00
CuongNV b744546442 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-09 16:58:49 +07:00
CuongNV 530dab31ef add player name for chat in EC_Friend 2026-03-09 16:57:38 +07:00
VDH 5228f357f1 done phap su gfx 2026-03-07 14:33:50 +07:00
CuongNV 4da68f5721 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-07 10:37:26 +07:00
VDH 811712deae Merge branch 'develop' into feature/skillBehavior 2026-03-07 09:55:03 +07:00
VDH a184aa0ed5 fix use skill buff 2026-03-07 09:54:02 +07:00
MinhHai 7e5fd02e1f Merge remote-tracking branch 'origin/develop' into feature/update-logout-logic 2026-03-06 17:33:37 +07:00
Tungdv 2e03de644d fix: update fly with sword and wing. 2026-03-06 17:33:20 +07:00
MinhHai 56e385ab88 DONE: logout full and logout half login 2026-03-06 17:33:14 +07:00