Commit Graph

2849 Commits

Author SHA1 Message Date
CuongNV cc2dd8c27d Merge remote-tracking branch 'origin/develop' into feature/CheckSkill_Cuong 2026-05-20 14:18:05 +07:00
CuongNV 34c5094480 fix InventoryUI bug seen throught 2026-05-20 14:17:47 +07:00
cuongnv 146a8e4e8a Merge pull request 'feature/CheckSkill_Cuong' (#454) from feature/CheckSkill_Cuong into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/454
2026-05-20 07:05:11 +00:00
CuongNV fb9be6b392 Merge remote-tracking branch 'origin/develop' into feature/CheckSkill_Cuong 2026-05-20 14:03:59 +07:00
CuongNV 3e545f026d fix pos textname for NPC 2026-05-20 14:01:38 +07:00
hungdk 1a57da5c76 Merge pull request 'feature/ivtr-operation' (#453) from feature/ivtr-operation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/453
2026-05-20 03:14:44 +00:00
HungDK 9cd6539cc8 Merge branch 'develop' into feature/ivtr-operation 2026-05-20 10:09:46 +07:00
HungDK e1ca2dd8e3 Add optimize path 2026-05-20 10:09:16 +07:00
CuongNV c0c995bbbb Merge remote-tracking branch 'origin/develop' into feature/CheckSkill_Cuong 2026-05-20 09:52:42 +07:00
namth 7301f9897c Merge pull request 'feature/anim-test-scene' (#452) from feature/anim-test-scene into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/452
2026-05-19 11:04:52 +00:00
Tran Hai Nam ea9297bc91 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-19 18:03:57 +07:00
Tran Hai Nam 13bf8214a7 fix bug tien nu trieu hoan 2026-05-19 18:03:25 +07:00
HungDK f852300414 Fix route map smoothness 2026-05-19 18:01:53 +07:00
CuongNV e2c24283cc fix pos name text of matter 2026-05-19 17:28:14 +07:00
hungdk 16bd713dd6 Merge pull request 'Fix stop taken joystick value when player dead' (#451) from feature/ivtr-operation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/451
2026-05-19 09:19:44 +00:00
namth 58eb90af19 Merge pull request 'feature/anim-test-scene' (#450) from feature/anim-test-scene into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/450
2026-05-19 08:27:57 +00:00
Tran Hai Nam 510ea8d462 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-19 15:27:08 +07:00
Tran Hai Nam 6fb8e22355 Fix some bug 2026-05-19 15:25:59 +07:00
HungDK e4cf76d8ed Fix stop taken joystick value when player dead 2026-05-19 14:10:11 +07:00
hungdk 8650e9483a Merge pull request 'feature/ivtr-operation' (#449) from feature/ivtr-operation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/449
2026-05-19 06:49:57 +00:00
HungDK 8a7829e038 Fix merge conflict 2026-05-19 13:47:54 +07:00
HungDK 5d12039fd3 Merge branch 'develop' into feature/ivtr-operation 2026-05-19 13:41:41 +07:00
HungDK 69575c9489 Add quick sort item feature 2026-05-19 11:26:11 +07:00
HungDK 5376b6ad8c Add item auto slot operation and update ui 2026-05-19 11:11:01 +07:00
Tran Hai Nam 9baa8207b0 Add scene 2026-05-19 10:47:21 +07:00
Tran Hai Nam 2a7f9602db Add anim test scene 2026-05-19 10:46:26 +07:00
hoangvd 91ca5329ce Merge pull request 'add channeling gfx' (#448) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/448
2026-05-19 02:52:50 +00:00
vuong dinh hoang 10a6c47fba add channeling gfx 2026-05-19 09:45:16 +07:00
hainh a16376f6c1 Merge pull request 'hit box for dlgsetting' (#447) from feature/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/447
2026-05-18 10:33:37 +00:00
VuNgocHaiC7 74f457a1f1 hit box for dlgsetting 2026-05-18 17:32:45 +07:00
tungdv b6ee6809f2 Merge pull request 'Update setting shadow and prefabs character' (#446) from feature/dlg_setting into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/446
2026-05-18 09:28:05 +00:00
Tungdv fa36d03a32 Merge remote-tracking branch 'origin/develop' into feature/dlg_setting 2026-05-18 16:26:37 +07:00
cuongnv 96222636d6 Merge pull request 'update prefabs' (#445) from feature/CheckSkill_Cuong into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/445
2026-05-18 09:26:05 +00:00
CuongNV 91fdc736e4 update prefabs 2026-05-18 16:20:01 +07:00
cuongnv 37b4b4d3f6 Merge pull request 'feature/CheckSkill_Cuong' (#444) from feature/CheckSkill_Cuong into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/444
2026-05-18 09:16:34 +00:00
CuongNV b77b3faef1 Merge remote-tracking branch 'origin/develop' into feature/CheckSkill_Cuong 2026-05-18 16:15:47 +07:00
hoangvd 1dd195bb80 Merge pull request 'add vfx' (#443) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/443
2026-05-18 09:13:53 +00:00
vuong dinh hoang 0f018b8195 add vfx 2026-05-18 16:13:23 +07:00
CuongNV 0337dba0cf Merge remote-tracking branch 'origin/develop' into feature/CheckSkill_Cuong 2026-05-18 16:11:53 +07:00
CuongNV a26ec4acc3 fix show model in inventory 2026-05-18 16:10:23 +07:00
Tungdv ff53478d7a Merge remote-tracking branch 'origin/develop' into feature/dlg_setting 2026-05-18 16:05:03 +07:00
Tungdv 862efaab29 fix: Update turn on/of shadow and update pos HH_feijian in model character. 2026-05-18 16:04:42 +07:00
Le Duc Anh b8fe00cba7 refactor world scene 2026-05-18 15:20:57 +07:00
cuongnv 69a00f234b Merge pull request 'feature/CheckSkill_Cuong' (#442) from feature/CheckSkill_Cuong into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/442
2026-05-18 07:26:39 +00:00
CuongNV b5b25c3b09 Merge remote-tracking branch 'origin/develop' into feature/CheckSkill_Cuong 2026-05-18 14:25:30 +07:00
CuongNV 4c730583b3 fix logic set pos camera in intentory 2026-05-18 14:25:08 +07:00
hoangvd 3b22eb339a Merge pull request 'addd more vfx' (#441) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/441
2026-05-18 06:51:30 +00:00
vuong dinh hoang c8ec7052ec addd more vfx 2026-05-18 13:50:07 +07:00
namth 4275016709 Merge pull request 'feature/chanting-gfx-logic' (#440) from feature/chanting-gfx-logic into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/440
2026-05-17 08:59:51 +00:00
Tran Hai Nam e5540e4ff1 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-17 15:49:56 +07:00