Commit Graph

2292 Commits

Author SHA1 Message Date
HungDK d70bfe7e07 Update DlgNPC.cs 2026-04-09 11:25:03 +07:00
HungDK 8972bccc01 Merge branch 'develop' into feature/update-ui 2026-04-09 10:54:03 +07:00
HungDK fc38b2199d Update select target to nearest everytimes 2026-04-09 10:53:36 +07:00
hainh 3996b705e8 Merge pull request 'feature/update-ui' (#314) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/314
2026-04-08 10:43:10 +00:00
VuNgocHaiC7 503fc49681 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-08 17:38:48 +07:00
VuNgocHaiC7 089a9764d8 fix coordinates for weapons 2026-04-08 17:38:25 +07:00
namth ae1777af60 Merge pull request 'fixbug/item-usage-performent' (#313) from fixbug/item-usage-performent into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/313
2026-04-08 10:01:55 +00:00
Chomper9981 3195322d14 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-08 17:00:41 +07:00
Chomper9981 8ad46acfaa fix performent issual of using medicine 2026-04-08 16:58:48 +07:00
namth 8652c389bd Merge pull request 'feature/hp-mp-button' (#312) from feature/hp-mp-button into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/312
2026-04-08 09:00:42 +00:00
Chomper9981 1bcae728db Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-08 16:00:01 +07:00
Chomper9981 c692179b67 Add Button for HPMP Usage 2026-04-08 15:58:51 +07:00
hoangvd 7942f09aea Merge pull request 'fix bug spawn a lot of fly gfx' (#311) from fix-bug/spawn-multiple-fly-gfx into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/311
2026-04-08 07:31:53 +00:00
VDH 445a024015 fix bug spawn a lot of fly gfx 2026-04-08 14:31:04 +07:00
hungdk e8c567a803 Merge pull request 'feature/update-ui' (#310) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/310
2026-04-08 07:11:42 +00:00
HungDK 7e24ee55f3 Merge branch 'develop' into feature/update-ui 2026-04-08 14:10:51 +07:00
HungDK a04fca3914 Add pickup nearest button 2026-04-08 14:08:47 +07:00
namth 01e2296263 Merge pull request 'fixbug/tasktrace-performent' (#309) from fixbug/tasktrace-performent into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/309
2026-04-08 06:48:13 +00:00
Chomper9981 6703bfb42e Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-08 13:47:00 +07:00
Chomper9981 93632c6639 fix perform proplem when load tasktrace 2026-04-08 13:44:12 +07:00
Le Duc Anh fa98c5b76c rotate weapon 2026-04-08 11:31:45 +07:00
hungdk 69b62f6b19 Merge pull request 'feature/update-ui' (#308) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/308
2026-04-08 04:13:09 +00:00
HungDK a83e6fa995 Merge branch 'develop' into feature/update-ui 2026-04-08 11:12:14 +07:00
HungDK 37e910f829 Update CECHostPlayer.cs 2026-04-08 11:11:49 +07:00
tungdv d00a796d94 Merge pull request 'Update zoom camera' (#307) from feature/HP_jump into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/307
2026-04-08 03:41:37 +00:00
Tungdv cfc274c8ca Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2026-04-08 10:40:44 +07:00
Tungdv f4c5393c37 fix: update zoom camera. 2026-04-08 10:40:07 +07:00
namth 4219788f4b Merge pull request 'feature/item-dataman' (#306) from feature/item-dataman into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/306
2026-04-08 03:18:50 +00:00
Chomper9981 7a98e7b6ae Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-08 10:17:21 +07:00
Chomper9981 7196130558 Modify Price desc. 2026-04-08 10:17:02 +07:00
cuongnv 1463f70cad Merge pull request 'feature/chat_01' (#305) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/305
2026-04-07 10:08:07 +00:00
CuongNV 954390a087 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-07 17:07:21 +07:00
CuongNV 4807e1a0fd add mini chat 2026-04-07 17:07:08 +07:00
cuongnv 78147d06c2 Merge pull request 'feature/chat_01' (#304) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/304
2026-04-07 10:02:51 +00:00
VuNgocHaiC7 c82692ddb8 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-07 17:02:40 +07:00
CuongNV 35f9d9ec07 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-07 17:02:02 +07:00
CuongNV 99d1650c2f add UI context 2026-04-07 17:01:37 +07:00
VuNgocHaiC7 a609ebda1c fix some UI 2026-04-07 17:00:48 +07:00
namth edc2e89c01 Merge pull request 'feature/anti-quickbar-spam' (#303) from feature/anti-quickbar-spam into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/303
2026-04-07 09:50:09 +00:00
Chomper9981 21eeae10cb Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-07 16:49:21 +07:00
Chomper9981 7d5f26435b Add anti spam quick bar 2026-04-07 16:48:54 +07:00
hungdk cf0e54ce1b Merge pull request 'feature/update-ui' (#302) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/302
2026-04-07 09:28:30 +00:00
HungDK 45502af3b2 Merge branch 'develop' into feature/update-ui 2026-04-07 16:27:26 +07:00
HungDK e5556bc5e6 Update CECMatter.cs 2026-04-07 16:26:08 +07:00
CuongNV 8488c2a8a4 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-07 15:31:57 +07:00
CuongNV 54331e8eef add UI and logic UI 2026-04-07 15:31:06 +07:00
anhld 4df7078679 Merge pull request 'show equipment when use player clone' (#301) from feature/show-equipment-host-navigate into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/301
2026-04-07 08:29:19 +00:00
Le Duc Anh ea6eff72ca show equipment when use player clone 2026-04-07 15:27:42 +07:00
namth 872667136c Merge pull request 'feature/emote-short-cut' (#300) from feature/emote-short-cut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/300
2026-04-07 08:11:41 +00:00
Chomper9981 149d2c6420 resolve conflict after merge. 2026-04-07 15:09:37 +07:00