Commit Graph

177 Commits

Author SHA1 Message Date
Le Duc Anh ca8252a4e9 Merge remote-tracking branch 'origin/develop' into feature/convert-task-templ 2025-10-07 17:07:47 +07:00
Le Duc Anh 3804a68073 Merge branch 'feature/convert-task-templ' of https://git.brew.monster/Unity/perfect-world-unity into feature/convert-task-templ 2025-10-07 17:07:27 +07:00
Le Duc Anh e03560a67f upgrade Unity 2025-10-07 17:07:24 +07:00
anhld 4bd8c37e6b Delete Build.rar 2025-10-07 07:13:30 +00:00
Le Duc Anh 906ec4e92e Merge remote-tracking branch 'origin/develop' into feature/convert-task-templ 2025-10-07 10:38:14 +07:00
anhld 680d429f73 Merge pull request 'adjust st' (#19) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/19
2025-10-07 03:38:02 +00:00
NguyenVanDat ed29158a25 adjust st 2025-10-07 10:34:50 +07:00
Le Duc Anh 32e3627ffa Merge remote-tracking branch 'origin/develop' into feature/convert-task-templ 2025-10-07 10:16:29 +07:00
Le Duc Anh 840e36c084 upgrade unity version 2025-10-07 10:15:22 +07:00
anhld 74fe846688 Merge pull request 'Movement and NPC Monster' (#18) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/18
2025-10-07 02:40:49 +00:00
NguyenVanDat 7ebb4c602f Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-07 09:31:01 +07:00
Le Duc Anh 3c8947422e add data files 2025-10-07 09:21:44 +07:00
Le Duc Anh 0d0b8c7648 only get the first task for testing 2025-10-06 10:34:36 +07:00
Le Duc Anh 6de5e1dde7 add convert rules for struct 2025-10-02 15:56:53 +07:00
Le Duc Anh e111d04839 convert more structs 2025-10-02 15:56:27 +07:00
VDH 1c45b5c7e1 npc 2025-10-01 17:30:54 +07:00
Le Duc Anh 62c7417c74 change Logger to BMLogger 2025-10-01 15:14:38 +07:00
Le Duc Anh 1efca22cb8 convert TaskTempl 2025-10-01 15:12:40 +07:00
VDH 4198c2f968 npc move procvess 2025-10-01 15:07:18 +07:00
HungDK 5477333690 Merge branch 'develop' into feature/inventory 2025-09-30 14:17:05 +07:00
HungDK 5935c9d2bf Update CSNetwork.dll 2025-09-30 14:16:22 +07:00
HungDK 3c282006a9 Update build 2025-09-30 14:10:29 +07:00
datnv ab4d235fcd Merge pull request 'feature/quest_sytem' (#17) from feature/quest_sytem into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/17
2025-09-30 02:20:02 +00:00
NguyenVanDat d1c716914d temporary stop task 2025-09-30 09:19:11 +07:00
VDH 1b2de221b4 animation npc Process 2025-09-29 18:26:02 +07:00
HungDK c02f471fa6 Add select character ui 2025-09-29 16:10:45 +07:00
HungDK 7d48226549 Add login ui resource 2025-09-29 16:09:48 +07:00
HungDK 71bd4ae2b2 Update CSNetwork 2025-09-29 10:20:05 +07:00
hungdk ca193b1a5a Fix missing ivtr equipable item 2025-09-28 22:07:11 +07:00
VDH 586e2f834b npc animtion processing 2025-09-27 17:10:53 +07:00
NguyenVanDat 38ee1979c7 init tasks from data 2025-09-26 16:46:44 +07:00
VDH 7640efa9d7 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
2025-09-26 11:30:32 +07:00
NguyenVanDat 23abc55bb8 Merge branch 'develop' into feature/quest_sytem 2025-09-26 09:49:25 +07:00
NguyenVanDat 2bde66e602 add ecgame 2025-09-26 09:49:01 +07:00
NguyenVanDat ee1fb53efc handle confloct elementdataman 2025-09-26 09:19:18 +07:00
HungDK 514262d428 Merge branch 'feature/inventory' into develop 2025-09-25 17:43:50 +07:00
tungdv 740900fbb1 Merge pull request 'feature/elseplayer' (#16) from feature/elseplayer into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/16
2025-09-25 10:42:50 +00:00
HungDK fbe413e9c2 Disable inventory ui 2025-09-25 17:40:59 +07:00
VDH 78152af05d npc Process 2025-09-25 17:38:33 +07:00
Tungdv 9b564261a2 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:37:48 +07:00
NguyenVanDat d791b05e9c temporary fix task 2025-09-25 17:35:45 +07:00
Tungdv eb86bfd011 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:28:23 +07:00
NguyenVanDat bf93b282eb update network dll 2025-09-25 17:25:42 +07:00
NguyenVanDat dd73b4944a Merge branch 'develop' into feature/quest_sytem
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2025-09-25 17:20:07 +07:00
Tungdv e6f5492346 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:16:54 +07:00
Tungdv 59cf4c05fd feat: Add new camera on host player.
fix: Update animtion run and stand on elseplayer.
2025-09-25 17:05:49 +07:00
VDH a6070dad6a Merge remote-tracking branch 'origin/develop' into feature/movement 2025-09-25 16:21:19 +07:00
HungDK 83843ce63e Fix missing parameter 2025-09-25 15:27:41 +07:00
HungDK 4243bab53f Merge branch 'develop' into feature/inventory 2025-09-25 14:18:51 +07:00
HungDK 30c52c24fa Add icon sprite 2025-09-25 14:09:42 +07:00