Commit Graph

177 Commits

Author SHA1 Message Date
NguyenVanDat a1c92565dc finish edit combo 2026-04-14 12:22:02 +07:00
NguyenVanDat e53cd4043f Merge branch 'develop' into feature/create-skill-combo 2026-04-14 09:16:21 +07:00
NguyenVanDat 49b79a588e update logic create new combo 2026-04-14 09:11:00 +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
NguyenVanDat 006a2d1bb2 Merge branch 'develop' into feature/create-skill-combo 2026-04-13 10:14:49 +07:00
NguyenVanDat a1f1632422 finish edit current combo 2026-04-13 10:12:11 +07:00
VDH b9d64b5a07 show why can't learn skill or upgrade 2026-04-10 17:24:51 +07:00
NguyenVanDat b00588dc3a Merge branch 'develop' into feature/create-skill-combo 2026-04-10 09:35:22 +07:00
NguyenVanDat 9eb53ef562 show skill icon and asign skill 2026-04-10 09:33:02 +07:00
Chomper9981 617ec486b5 Fix some UI element 2026-04-09 16:29:13 +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
NguyenVanDat fd970c3123 Merge branch 'develop' into feature/create-skill-combo 2026-04-09 09:14:29 +07:00
NguyenVanDat 918af2a06b update logic skill slot 2026-04-08 17:35:01 +07:00
Chomper9981 8ad46acfaa fix performent issual of using medicine 2026-04-08 16:58:48 +07:00
Chomper9981 c692179b67 Add Button for HPMP Usage 2026-04-08 15:58:51 +07:00
Chomper9981 93632c6639 fix perform proplem when load tasktrace 2026-04-08 13:44:12 +07:00
NguyenVanDat 36fc625977 add skill slot widget 2026-04-08 09:19:54 +07:00
Chomper9981 9c36d08ad7 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature/emote-short-cut 2026-04-07 14:55:57 +07:00
Chomper9981 3238c10d31 Add action assign feature 2026-04-07 14:52:34 +07:00
NguyenVanDat 564c7b40c5 refactor short cut action 2026-04-07 09:33:44 +07:00
Chomper9981 bb4b349930 Add tasktrace task following behavior 2026-04-06 17:30:39 +07:00
CuongNV 22ad4ebaca update emoji for chat 2026-04-06 13:47:47 +07:00
CuongNV bae949626e add new Image Emoji 2026-04-06 11:23:05 +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 2fee354738 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-26 09:46:34 +07:00
Chomper9981 0dfff3a4ae Add animation for skill 2026-03-25 11:19:48 +07:00
CuongNV d21236aec7 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-24 14:34:49 +07:00
CuongNV 19820fcf2a Add filter ui chat 2026-03-24 10:58:19 +07:00
Chomper9981 1f0da3b665 Add UI for Buff Icons. Refactor the UI Image Picture 2026-03-24 10:53:05 +07:00
Chomper9981 eef47bd6b4 fix null proplem in quickBar 2026-03-20 14:16:04 +07:00
VDH ae02046fc7 Merge branch 'develop' into feature/refactor-SkillUI 2026-03-19 16:01:05 +07:00
VDH 92852a28a0 add log for build 2026-03-19 16:00:31 +07:00
cuongnv 4192582aad Merge pull request 'Change UI Chat' (#256) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/256
2026-03-19 07:19:07 +00:00
Chomper9981 4cf015f8e5 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-19 13:52:46 +07:00
Chomper9981 9dd504d92e Change some UI, UX relate to Assign Skill 2026-03-19 13:52:26 +07:00
CuongNV 5708f72910 Change UI Chat 2026-03-19 13:41:38 +07:00
MinhHai 147a3f0745 fix MiniMap: add into Main HUD 2026-03-19 10:24:11 +07:00
Chomper9981 34bd53b3a3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-18 18:02:14 +07:00
Chomper9981 3a3bdfa7b3 Cache skill change data and save skill change data to server 2026-03-18 17:59:36 +07:00
VDH dc589a8e8d Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
#	Assets/PerfectWorld/Scene/Bootstrap.unity
2026-03-18 17:39:04 +07:00
VDH f28efd552f cheat UI 2026-03-18 17:19:10 +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 d0eed02f47 Add code UI and prefab chat system 2026-03-18 15:55:24 +07:00
Chomper9981 81f0824e1d Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-03-18 13:41:25 +07:00
Chomper9981 7f6395522f Modify skill quickbar 2026-03-18 13:40:27 +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