Commit Graph

1597 Commits

Author SHA1 Message Date
Chomper9981 b73de9553e update UI. add more developed feature into UI 2026-02-27 17:27:26 +07:00
Chomper9981 ee4fe6891b Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 17:34:50 +07:00
Chomper9981 07cee60bf1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 17:33:50 +07:00
Chomper9981 2b869e5285 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 17:33:31 +07:00
hungdk 4fb692811c Merge pull request 'feature/character_info' (#173) from feature/character_info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/173
2026-02-26 10:29:59 +00:00
Chomper9981 10e4cfa1d3 fix bug "dance" quest not working(workaround). Trigger action via action skill table. fix bug some matter object dont have collider(workaround) 2026-02-26 17:28:53 +07:00
HungDK dcd1aac3c7 Fixing missing msg handle 2026-02-26 17:28:37 +07:00
HungDK 9592a83a37 Merge branch 'develop' into feature/character_info 2026-02-26 17:05:23 +07:00
tungdv cef2e52442 Merge pull request 'add pet for "Tien Thu"' (#172) from feature/hp_pet into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/172
2026-02-26 09:41:24 +00:00
Tungdv 708f33bfe4 Merge branch 'develop' into feature/hp_pet
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-26 16:39:23 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
hoangvd c4454521de Merge pull request 'feature/skill-set-shortcut' (#171) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/171
2026-02-26 08:37:02 +00:00
VDH cfdd048415 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
#	Assets/PerfectWorld/Scripts/DebugCommandMenu.meta
2026-02-26 15:30:49 +07:00
VDH 58f7028abc save scene 2026-02-26 15:28:41 +07:00
VDH 1a80e1a6a6 save prefabb 2026-02-26 15:27:59 +07:00
VDH abcf251e77 fix micro bug 2026-02-26 15:27:18 +07:00
VDH 7ee3394834 done cast skill move linear 2026-02-26 15:01:46 +07:00
hainh b33e759106 Merge pull request 'feature/fix-ui' (#170) from feature/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/170
2026-02-26 07:34:46 +00:00
VuNgocHaiC7 374f12772d update dialogscripttable for dlgpethatch 2026-02-26 14:33:25 +07:00
VuNgocHaiC7 fbfeefd4b9 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui
# Conflicts:
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
2026-02-26 14:26:29 +07:00
VuNgocHaiC7 8df945151d update prefab DlgPetHatch 2026-02-26 14:24:30 +07:00
Chomper9981 abde960893 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 11:41:51 +07:00
Chomper9981 f844b7fdef fix bug player cant nav to far position(work around) 2026-02-26 11:41:06 +07:00
Le Duc Anh 3664b2d76a add model that missing collider 2026-02-26 11:27:49 +07:00
Chomper9981 febe5897b8 merge dev 2026-02-26 10:49:19 +07:00
Chomper9981 2215346ac1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-26 10:47:49 +07:00
HungDK 22a8254328 Merge branch 'develop' into feature/character_info 2026-02-26 09:21:28 +07:00
HungDK 76e5c44e39 Handle hide option panel 2026-02-26 09:18:57 +07:00
Le Duc Anh 0b90bd8aa2 add missing npc 2026-02-26 00:37:13 +07:00
anhld adfdfa34ba Merge pull request 'update litmodel colliders and fix addressable issues' (#169) from bugfix/addressable-issue into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/169
2026-02-25 13:48:02 +00:00
Le Duc Anh 29b9bee6f6 update litmodel colliders and fix addressable issues 2026-02-25 17:16:18 +07:00
namth 2859e34537 Merge pull request 'fixbug/task-bug-resolve' (#168) from fixbug/task-bug-resolve into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/168
2026-02-25 07:52:25 +00:00
Chomper9981 7ddd60e7e1 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-25 14:41:37 +07:00
Chomper9981 cad727b814 Fix the nav bug(work around). fix the major map quest's npc load proplem. 2026-02-25 14:41:15 +07:00
hungdk ec02a6474d Merge pull request 'feature/character_info' (#167) from feature/character_info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/167
2026-02-25 06:41:08 +00:00
HungDK 6db18f3013 Merge branch 'develop' into feature/character_info 2026-02-25 13:39:56 +07:00
HungDK 34dbaa4c0a Fixing select target and id duel 2026-02-25 13:38:33 +07:00
NguyenVanDat f403b24060 fix message box display in line 2026-02-25 11:12:12 +07:00
NguyenVanDat d1c802586e Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-25 10:50:13 +07:00
NguyenVanDat b4b2f9ac96 finish clear tessera 2026-02-25 10:26:49 +07:00
VDH 9d4dfbc6ba fix skill can't move linear 2026-02-24 18:45:24 +07:00
hungdk 08176cfe5d Merge pull request 'feature/character_info' (#166) from feature/character_info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/166
2026-02-24 10:06:30 +00:00
HungDK 1f1832fa6f Merge branch 'develop' into feature/character_info 2026-02-24 17:04:41 +07:00
HungDK 7996bed176 Fix PvP conflict 2026-02-24 16:59:51 +07:00
anhld 9d5d1505b4 Merge pull request 'DlgConsole for debug command' (#164) from feature/debug-cmd into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/164
2026-02-24 09:31:44 +00:00
Le Duc Anh 0f6f06af6b DlgConsole 2026-02-24 16:30:43 +07:00
namth 38f18bbc9f Merge pull request 'fixbug/task-bug-resolve' (#163) from fixbug/task-bug-resolve into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/163
2026-02-24 09:26:24 +00:00
Chomper9981 925b6c0477 Load item info for flysword. 2026-02-24 16:20:37 +07:00
HungDK cab2c0af45 Merge branch 'develop' into feature/character_info 2026-02-24 15:33:53 +07:00
Chomper9981 36bf74b527 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop 2026-02-24 15:27:33 +07:00