Commit Graph

161 Commits

Author SHA1 Message Date
Tungdv ff1e2dd89e fix: update normal atk. 2025-10-08 19:32:05 +07:00
tung.do@monkey.edu.vn ddcc5c22d1 fix: Update normal attack. 2025-10-08 01:34:03 +07:00
Tungdv ee618bc38e fix: update attack normal. 2025-10-07 18:13:30 +07:00
Tungdv 9c2b5b87f3 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Packages/manifest.json
2025-10-07 14:15:17 +07:00
Tungdv f66d9c694b fix: update struct a3dmatrix. 2025-10-07 14:11:28 +07:00
NguyenVanDat ed29158a25 adjust st 2025-10-07 10:34:50 +07: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
tung.do@monkey.edu.vn 597b9e1877 fix: Update normal atk. 2025-10-07 00:25:55 +07:00
Tungdv 7818ec70e3 fix: update normal attack. 2025-10-06 18:32:32 +07:00
Tungdv 83816419ae Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
2025-10-06 17:36:58 +07:00
Tungdv 38cb41ec5b fix: update struct a3dvecter. 2025-10-06 17:34:45 +07:00
tung.do@monkey.edu.vn a6778f7ddf fix: update unity version and update struct A3D. 2025-10-06 02:02:52 +07:00
Tungdv 78e7d1babb feat: add struct for normal atk. 2025-10-03 19:10:14 +07:00
Tungdv 98ff6a50a8 fix: Update logic normal attack. 2025-10-01 17:42:43 +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
Tungdv 4bad286d20 feat: add logic and struct class for normal atk. 2025-09-30 17:49:49 +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
Tungdv 8b2b181ee2 Merge branch 'develop' into feature/elseplayer 2025-09-30 09:14:41 +07:00
Tungdv 834c7c775a feat: add funtion normal atk. 2025-09-30 09:11:54 +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
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