Commit Graph

2101 Commits

Author SHA1 Message Date
hoangvd 64cd2809f3 Merge pull request 'feature/move-after-cast-skill' (#277) from feature/move-after-cast-skill into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/277
2026-03-30 10:17:39 +00:00
VDH 503034bc26 Merge branch 'develop' into feature/move-after-cast-skill 2026-03-30 17:14:40 +07:00
VDH 014452258d fix use skill can't move imidiately 2026-03-30 17:14:05 +07:00
Le Duc Anh 220158635e modify a69 collider bursh 2026-03-30 14:51:07 +07:00
Le Duc Anh 5668ffeec9 update a69 terrain 2026-03-30 14:13:10 +07:00
Le Duc Anh b29aec673b update a 69 model 2026-03-30 14:12:18 +07:00
Le Duc Anh cc1bac5af4 obfuscate package 2026-03-30 10:16:17 +07:00
HungDK 072d4e2177 Show 1 warning first then 10m each 2026-03-27 09:10:25 +07:00
HungDK 05adae4f21 Add health warning message 2026-03-27 09:10:20 +07:00
hoangvd 6fe87fe3cf Merge pull request 'feature/refactor-SkillUI' (#276) from feature/refactor-SkillUI into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/276
2026-03-26 02:51:05 +00:00
VDH 688f722610 Merge branch 'develop' into feature/refactor-SkillUI 2026-03-26 09:50:10 +07:00
namth bd79aa8c82 Merge pull request 'feature/skill-animation' (#275) from feature/skill-animation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/275
2026-03-25 07:20:17 +00:00
Chomper9981 edca5e6bf3 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-25 14:19:38 +07:00
Chomper9981 8da1e7c9fc add delay for animation 2026-03-25 14:19:22 +07:00
namth 2d0725a0ce Merge pull request 'feature/skill-animation' (#274) from feature/skill-animation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/274
2026-03-25 04:21:27 +00:00
Chomper9981 31abea6e9b Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-25 11:20:20 +07:00
Chomper9981 0dfff3a4ae Add animation for skill 2026-03-25 11:19:48 +07:00
HungDK 2ef8ec179a Update shop and inventory 2026-03-25 10:35:58 +07:00
HungDK 5f97ad0bc8 Update prevent inappropriate word 2026-03-25 10:31:49 +07:00
HungDK 445ff4ae62 Fix dead and revive error before enter world 2026-03-25 10:31:24 +07:00
hainh f3e57850b6 Merge pull request 'update UIManager.prefab' (#273) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/273
2026-03-24 09:36:25 +00:00
VuNgocHaiC7 d666bbae1e update UIManager.prefab 2026-03-24 16:34:51 +07:00
hainh 2012330242 Merge pull request 'feature/friend_ui' (#272) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/272
2026-03-24 09:15:09 +00: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
VuNgocHaiC7 5b52e17ef4 update money when buy item and manufacturing, pethatch, petrec 2026-03-24 16:11:43 +07:00
VDH b4f5cf9a55 Merge branch 'develop' into feature/refactor-SkillUI 2026-03-24 16:01:48 +07:00
namth 7e53b4ff7e Merge pull request 'fixbug/fix-ui' (#271) from fixbug/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/271
2026-03-24 07:26:37 +00:00
Chomper9981 2d2fb70b8c Fix UI 2026-03-24 14:24:27 +07:00
Chomper9981 f9220e3f05 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-24 14:20:00 +07:00
Chomper9981 344ea4a131 Remove Resolve Dependency 2026-03-24 14:19:05 +07:00
namth 5c31e3b92c Merge pull request 'fix UI Bug aftermearge' (#270) from feature/buff-icons into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/270
2026-03-24 04:32:34 +00:00
Chomper9981 10b915f0e0 fix UI Bug aftermearge 2026-03-24 11:25:01 +07:00
namth 142d9c810c Merge pull request 'feature/buff-icons' (#269) from feature/buff-icons into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/269
2026-03-24 04:09:01 +00:00
Chomper9981 1f9d5395a9 Merge branch 'release/re-alpha-version' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:55:19 +07:00
Chomper9981 afb0cef6c8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace 2026-03-24 10:54:01 +07:00
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
VDH b315814856 Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2026-03-24 09:45:26 +07:00
Le Duc Anh 4899cf9e96 WIP: re-alpha-version 2026-03-23 19:35:43 +07:00
Le Duc Anh d2a11e50d8 WIP: re-alpha-version 2026-03-23 19:30:20 +07:00
VuNgocHaiC7 de0fc2b0ee Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui 2026-03-23 18:00:14 +07:00
VuNgocHaiC7 1004d64457 fix again some UI and update money when buy item 2026-03-23 17:59:11 +07:00
HungDK d962c70801 fix bug fly gfx don't be destroyed 2026-03-23 16:26:40 +07:00
cuongnv 813f415147 Merge pull request 'feature/chat' (#267) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/267
2026-03-23 09:11:02 +00:00
CuongNV 1035289271 fix show misc for chat 2026-03-23 16:10:28 +07:00
CuongNV 015d06c16c add filter chat 2026-03-23 16:01:58 +07:00
CuongNV 5a2408629d Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-23 15:52:09 +07:00
NguyenVanDat 83f339bd70 upate filter logic 2026-03-23 15:51:22 +07:00
NguyenVanDat 93519b7f2e add tool test badword 2026-03-23 11:03:47 +07:00
CuongNV 09b4fa9467 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-03-23 10:54:09 +07:00