Commit Graph

286 Commits

Author SHA1 Message Date
HungDK c9aef9d68d Fix clean request logout1 2026-04-21 10:53:17 +07:00
Chomper9981 0a909af027 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-13 14:47:37 +07:00
Chomper9981 f083c400a0 Add BubbleText Logic 2026-04-13 14:44:16 +07:00
CuongNV 9919ebc8c0 fix bug chat system 2026-04-13 13:48:16 +07:00
CuongNV c3bc869457 add new chat mini 2026-04-09 14:52:37 +07:00
CuongNV a99496e401 add logic show emoji 2026-04-09 11:56:36 +07:00
CuongNV 46e6d7c3b2 add ui emoji 2026-04-08 15:43:36 +07:00
CuongNV 99d1650c2f add UI context 2026-04-07 17:01:37 +07:00
CuongNV b7a6573894 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-06 17:50:53 +07:00
CuongNV 4e1e74c5ad fix bug fomat info 2026-04-06 17:50:20 +07:00
HungDK 7d303c3fca Update ui, split item, handle split, change button text 2026-04-06 17:15:40 +07:00
CuongNV 2f083c870d add chat world 2026-04-06 15:23:59 +07:00
CuongNV d3b4e25c9a Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-02 11:43:01 +07:00
HungDK ac3e3b57ce Add selling item to NPC feature 2026-04-01 17:00:11 +07:00
CuongNV 56923e1b40 update logic chatsystem 2026-04-01 16:50:38 +07:00
CuongNV 9e81951f12 remove log and change ErrorChatHandler 2026-04-01 10:41:22 +07:00
CuongNV 26257b22a3 fix show UI 2026-03-31 15:09:11 +07:00
CuongNV 2fee354738 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-26 09:46:34 +07:00
HungDK 2ef8ec179a Update shop and inventory 2026-03-25 10:35:58 +07:00
VuNgocHaiC7 11600180d4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
2026-03-24 16:13:00 +07:00
CuongNV 81f674ae10 add show update error in chat 2026-03-24 15:53:37 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +07:00
VuNgocHaiC7 1004d64457 fix again some UI and update money when buy item 2026-03-23 17:59:11 +07:00
VuNgocHaiC7 f290d44d13 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-19 17:54:21 +07:00
VuNgocHaiC7 f9dbdc1c3c fix ui for dlg FriendList 2026-03-19 17:50:49 +07:00
CuongNV e2735a73f3 add scene bootstrap new prefab chat 2026-03-19 14:23:10 +07:00
CuongNV 5708f72910 Change UI Chat 2026-03-19 13:41:38 +07:00
CuongNV aa9007e1ba fix show UI 2026-03-19 09:28:55 +07:00
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
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 eae2eb16d5 Merge branch 'develop' into feature/friend 2026-03-17 17:38:59 +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 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
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