duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,777 Commits 13 Branches 0 Tags
c851c46292fa1faa5360310c8ca4b66efdc331ce
Commit Graph

2777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hungdk 44f5f1cf2c Merge pull request 'Fix unstable router, water and air route' (#359) from fixbug/npc-dialog into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/359
 2026-04-18 06:54:37 +00:00
HungDK 5bfe81facd Fix unstable router, water and air route 2026-04-18 13:51:02 +07:00
cuongnv f3544be841 Merge pull request 'feature/combo-skill-short-cut' (#358) from feature/combo-skill-short-cut into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/358
 2026-04-17 11:19:09 +00:00
CuongNV ee23c8e782 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-17 18:18:02 +07:00
CuongNV 5cf2abeff1 add set icon 2026-04-17 18:17:42 +07:00
CuongNV ad6875622c update assign combo to slot skill 2026-04-17 17:45:02 +07:00
Chomper9981 870ecaea72 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-17 16:58:30 +07:00
Chomper9981 a03405900f Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-17 16:58:09 +07:00
namth 96a7b2ebd0 Merge pull request 'Add sfx to skill trigger' (#357) from feature/skill-sfx into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/357
 2026-04-17 09:57:49 +00:00
Chomper9981 4a736cd058 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-17 16:57:08 +07:00
Chomper9981 7ac9721f3c Add sfx to skill trigger 2026-04-17 16:55:36 +07:00
namth 233a232aa5 Merge pull request 'Skip wound animation. add chanel logic to active it agaist.' (#356) from fixbug/fix-animation-stop-unexpectedly into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/356
 2026-04-17 08:44:29 +00:00
Chomper9981 c6c61f5a0c Skip wound animation. add chanel logic to active it agaist. 2026-04-17 15:42:26 +07:00
hainh e61d590171 Merge pull request 'feature/update-ui' (#355) from feature/update-ui into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/355
 2026-04-16 10:22:02 +00:00
VuNgocHaiC7 2c77a4788e update btn cheat tele NPC 2026-04-16 17:18:14 +07:00
VuNgocHaiC7 d825a775fc Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-16 17:08:02 +07:00
VuNgocHaiC7 6d1be1fc94 cheat tele NPC 2026-04-16 17:04:44 +07:00
namth 2884dac189 Merge pull request 'change combine action logic to dictionary' (#354) from feature/implement-a3dcombineaction into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/354
 2026-04-16 09:22:05 +00:00
Chomper9981 10c9a00e6a change combine action logic to dictionary 2026-04-16 16:21:10 +07:00
namth 26756001ae Merge pull request 'feature/implement-a3dcombineaction' (#353) from feature/implement-a3dcombineaction into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/353
 2026-04-16 09:00:22 +00:00
Chomper9981 813748be38 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-16 15:58:16 +07:00
Chomper9981 a2f6941df7 Add white tiger anim 2026-04-16 15:57:43 +07:00
hoangvd fae52c81d3 Merge pull request 'fix-bug/character-sound' (#352) from fix-bug/character-sound into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/352
 2026-04-16 08:56:27 +00:00
VDH 250b339bdf Merge branch 'develop' into fix-bug/character-sound 2026-04-16 15:55:26 +07:00
Le Duc Anh c58e03fe7c Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-16 15:53:10 +07:00
Le Duc Anh f40fdcca4b add sfx to addressable and fix their path names 2026-04-16 15:52:50 +07:00
VDH a0dda219a9 Merge branch 'develop' into fix-bug/character-sound 2026-04-16 15:48:16 +07:00
VDH dbe2315fa5 fix use skill the second can't hear sfx 2026-04-16 15:47:50 +07:00
namth e5a5c5ed30 Merge pull request 'feature/implement-a3dcombineaction' (#351) from feature/implement-a3dcombineaction into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/351
 2026-04-16 08:41:05 +00:00
Chomper9981 c2c546fee0 fix mage model 2026-04-16 15:40:43 +07:00
Chomper9981 f4662becb9 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-16 15:37:26 +07:00
Chomper9981 15331b4e90 fix ui after merge 2026-04-16 15:37:07 +07:00
namth decc616ee5 Merge pull request 'feature/implement-a3dcombineaction' (#350) from feature/implement-a3dcombineaction into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/350
 2026-04-16 08:33:35 +00:00
Chomper9981 aacd303e94 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-16 15:31:33 +07:00
Chomper9981 97bb1f97d4 Add A3DCombinedAction logic 2026-04-16 15:30:52 +07:00
NguyenVanDat c2707eff0a update combo 2026-04-16 15:05:33 +07:00
CuongNV 5b2feeb39f update log 2026-04-16 14:40:39 +07:00
cuongnv f1e3eec78f Merge pull request 'feature/chat_01' (#349) from feature/chat_01 into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/349
 2026-04-16 07:30:36 +00:00
CuongNV d489cfcd7b Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-16 14:29:26 +07:00
CuongNV 329f62a050 update prefab and logic draw name 2026-04-16 14:29:08 +07:00
cuongnv 0078c62ce4 Merge pull request 'feature/chat_01' (#348) from feature/chat_01 into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/348
 2026-04-16 03:13:15 +00:00
CuongNV 042fdeeba4 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-16 10:12:10 +07:00
CuongNV 0c84e82d03 update prefab 2026-04-16 10:11:07 +07:00
CuongNV d5f6d7d6ea update prefabs 2026-04-15 18:38:57 +07:00
CuongNV 78ceafb347 add + 2026-04-15 18:38:31 +07:00
CuongNV 8c72c3349c add code height name 2026-04-15 18:38:20 +07:00
hoangvd 69be7be7ff Merge pull request 'fix-bug/character-sound' (#347) from fix-bug/character-sound into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/347
 2026-04-15 10:35:55 +00:00
VDH 1cbfd46d04 Merge branch 'develop' into fix-bug/character-sound 2026-04-15 17:35:18 +07:00
VDH 8feefab707 adjust addressable 2026-04-15 17:35:01 +07:00
tungdv 108cb79480 Merge pull request 'Update HP move in scene a69.' (#346) from feature/HP_fix_move_in_a69 into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/346
 2026-04-15 10:23:11 +00:00