Commit Graph

442 Commits

Author SHA1 Message Date
CuongNV ee6d880333 Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
#	Assets/Scripts/EC_GameRun.cs
2026-03-18 16:05:54 +07:00
CuongNV 4d462c119d add GameSession and logic handle chat 2026-03-18 15:56:53 +07:00
HungDK 6faf18dc5e Merge branch 'develop' into feature/friend 2026-03-18 14:48:27 +07:00
HungDK e4f674a750 Update friend delete, handle server sending 2026-03-18 14:38:54 +07:00
VDH 3259d297d8 Merge branch 'develop' into feature/ComboSkill
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-18 13:50:49 +07:00
VDH c6506ce6eb done combo includer normal attack and loop 2026-03-18 13:49:49 +07:00
Tungdv c800b48d52 Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
2026-03-18 12:54:34 +07:00
Tungdv 8cf3144761 fix: update world when teleport. 2026-03-18 11:44:46 +07:00
HungDK 2adc3ede59 Add logic update friend UI, friend status 2026-03-18 11:39:26 +07:00
Le Duc Anh bc7db7f58d get correct armor for elseplayer 2026-03-17 22:01:36 +07:00
hungdk f5a822f2e6 Merge pull request 'feature/friend' (#242) from feature/friend into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/242
2026-03-17 10:40:07 +00:00
HungDK ad505e37b9 Fixing metadata handle after getfriend re cause game dead 2026-03-17 13:59:12 +07:00
CuongNV f4e6fa8579 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-17 10:28:59 +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 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
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 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 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
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
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
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
MinhHai 850b44fd1d Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
2026-03-12 14:49:03 +07:00
MinhHai f8a8d3d9d4 DONE: save skill combo 2026-03-12 13:50:41 +07:00
VDH 230bb83e6f add more handle protocol 2026-03-11 16:05:54 +07:00
VDH 3fc7106e76 switch skill shortcut 2026-03-10 18:01:47 +07:00
VDH dbb1cac4a6 Merge branch 'develop' into feature/skillBehavior
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-03-09 17:53:02 +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 e08939e5c6 change game session 2026-03-09 16:57:56 +07:00
hungdk 0303dd3916 Merge pull request 'Add CreateGetOtherEquipDetailCmd and update player option UI prefab' (#208) from feature/character_info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/208
2026-03-09 07:56:11 +00:00
HungDK bc743a8e89 Add CreateGetOtherEquipDetailCmd and update player option UI prefab 2026-03-09 14:52:55 +07:00
Le Duc Anh 9a3355abd4 update terrain for a69 2026-03-09 10:52:03 +07:00
Le Duc Anh 91bbfb6679 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-03-09 10:03:29 +07:00
Le Duc Anh cfa6372001 add Bong Minh Dong a69 map 2026-03-07 20:11:25 +07:00