Commit Graph

2164 Commits

Author SHA1 Message Date
Le Duc Anh aa75c1260a generate textures 2026-04-03 23:24:42 +07:00
namth a43eef3e17 Merge pull request 'fixbug/fix-minor-bug' (#281) from fixbug/fix-minor-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/281
2026-04-01 11:08:26 +00:00
Chomper9981 7a9b2a29e1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-01 18:03:19 +07:00
Chomper9981 dc7831d537 Merge 4 2026-04-01 18:01:11 +07:00
Chomper9981 85ef52b897 Merge 3 2026-04-01 18:00:44 +07:00
Chomper9981 291f9a094b Merge 2 2026-04-01 18:00:13 +07:00
Chomper9981 4144077219 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-01 17:59:31 +07:00
Chomper9981 4fd2efa588 Fix some minor bug. Add some addreasable and UI component 2026-04-01 17:41:42 +07:00
hungdk 65dfdbd8f5 Merge pull request 'feature/update-ui' (#280) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/280
2026-04-01 10:04:19 +00:00
HungDK ac3e3b57ce Add selling item to NPC feature 2026-04-01 17:00:11 +07:00
VuNgocHaiC7 f8adf0aa0b Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-01 16:41:38 +07:00
VuNgocHaiC7 ff4d06a537 fix ui DlgInstall.prefab 2026-04-01 16:41:18 +07:00
hoangvd 48998922c7 Merge pull request 'feature/move-after-cast-skill' (#279) from feature/move-after-cast-skill into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/279
2026-04-01 09:27:03 +00:00
VDH 5fd08c948b fix remove gfx 2026-04-01 16:26:29 +07:00
VuNgocHaiC7 543aca0c48 Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-01 15:30:22 +07:00
VuNgocHaiC7 d8262d9ba9 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-01 15:19:14 +07:00
VuNgocHaiC7 242b42769b update UI sell for DialogNPCShop.prefab 2026-04-01 15:19:02 +07:00
HungDK 27c4cce1a4 Update DlgPetHatch.prefab 2026-04-01 15:06:40 +07:00
VDH c6c6845835 Merge branch 'develop' into feature/move-after-cast-skill 2026-04-01 15:05:22 +07:00
VDH 25a6e9f11c add more command 2026-04-01 14:51:42 +07:00
Le Duc Anh 2df983193e Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-01 14:46:50 +07:00
Le Duc Anh df4613baac update litmodel as addressable world map 2026-04-01 13:45:18 +07:00
HungDK 215253a622 Update DialogNPCShop.prefab 2026-04-01 13:41:54 +07:00
NguyenVanDat 30719abdc7 add asset 2026-04-01 11:05:09 +07:00
Le Duc Anh 0cb65b1298 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-01 09:25:41 +07:00
VuNgocHaiC7 c0c04f41f5 Merge branch 'feature/update-ui' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-03-31 17:55:04 +07:00
VuNgocHaiC7 c883cf4d73 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-03-31 17:53:41 +07:00
VuNgocHaiC7 bc9c11de13 fix ui DialogNPCShop.prefab 2026-03-31 17:51:52 +07:00
Le Duc Anh c7d35dd410 world map 2026-03-31 17:36:50 +07:00
HungDK 92c08682c6 Merge remote-tracking branch 'origin/feature/update-ui' into feature/UI-NPC 2026-03-31 17:18:40 +07:00
CuongNV c8d55d01a9 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-31 17:14:43 +07:00
CuongNV 4bce9e7fb2 update code change color 2026-03-31 17:14:13 +07:00
HungDK 68aa225c1b Update ui uninstall 2026-03-31 16:47:42 +07:00
HungDK 9174bd7149 Update create role 2026-03-31 15:54:59 +07:00
CuongNV 26257b22a3 fix show UI 2026-03-31 15:09:11 +07:00
CuongNV 86f01e58e6 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-03-31 14:46:34 +07:00
CuongNV 7f17d7f289 add Whisper chat 2026-03-31 14:46:09 +07:00
namth 5965ffca32 Merge pull request 'fixbug/fix-quest-bug' (#278) from fixbug/fix-quest-bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/278
2026-03-31 07:02:30 +00:00
Chomper9981 1db16de356 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-03-31 14:00:56 +07:00
Chomper9981 b8a7770f92 Fix bug not teleport when end "Gap mat tien nu" quest. Add Belizer fly to this quest location 2026-03-31 14:00:32 +07:00
HungDK 09aee26174 Update DialogNPC.prefab 2026-03-31 10:19:28 +07:00
HungDK 897d711c45 Correcting exit option of NPC and add icon represent of of option 2026-03-31 10:19:17 +07:00
HungDK e27861e86b Add NPC UI resource 2026-03-31 10:11:54 +07:00
CuongNV c653f7ff62 Merge remote-tracking branch 'origin/develop' into feature/chat_01
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2026-03-31 09:40:10 +07:00
NguyenVanDat 35693f672d update login flow 2026-03-31 09:05:07 +07:00
CuongNV 753bd65847 Active player 2026-03-30 17:37:35 +07:00
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
CuongNV f16df18a26 fixed editor pooling 2026-03-30 16:04:51 +07:00