Commit Graph

977 Commits

Author SHA1 Message Date
NguyenVanDat 570455afce add escape button (changed a61) 2026-01-09 09:38:51 +07:00
Le Duc Anh 67908e80fc update 长击刀极品 2026-01-08 00:21:07 +07:00
HungDK c73164518a Update 短斧.prefab 2026-01-07 17:55:24 +07:00
HungDK cbcfeec18f Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-07 17:36:24 +07:00
HungDK c058f70fb3 Update layer water 2026-01-07 17:31:25 +07:00
VuNgocHaiC7 681b3c43ed Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update-in-game 2026-01-07 17:28:59 +07:00
VuNgocHaiC7 ab0f406323 update mesh collider model v1 2026-01-07 17:04:16 +07:00
NguyenVanDat 80d98804fc fix mining process slider 2026-01-07 16:40:16 +07:00
NguyenVanDat ec6ba435cb Merge branch 'develop' into feature/mine-processing 2026-01-07 16:25:09 +07:00
HungDK c390fad7ee Add model, vfx to task lv8 2026-01-07 16:01:49 +07:00
HungDK b2eb812236 Add log missing matter 2026-01-07 16:00:59 +07:00
NguyenVanDat 97804a8b01 else player mining 2026-01-07 14:33:20 +07:00
VDH 5471c68071 Merge branch 'develop' into feature/skill-data 2026-01-07 09:32:28 +07:00
TungDV d4883f39dc Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-06 22:35:23 +07:00
VDH 4aeae053b9 for test 2026-01-06 19:36:22 +07:00
Tungdv f9b9432f20 fix: update logic swim hp. 2026-01-06 19:04:58 +07:00
HungDK e5c09167fb Fix unstable reach site task completion 2026-01-06 16:59:14 +07:00
VDH 9fed589a9e cool down skill ui 2026-01-06 13:35:43 +07:00
Tungdv f2acc5ca2e fix: update swim hp. 2026-01-05 18:44:57 +07:00
VDH 7e83b578fe coool down ui 2026-01-05 18:25:27 +07:00
HungDK c5e753bba3 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-05 16:37:29 +07:00
HungDK 6eb046ec29 Fix reach site notify task 2026-01-05 16:37:25 +07:00
VDH fe3eacbc91 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-05 15:30:29 +07:00
VDH 2d3c9a96ef fix bug can't use skill when player is far from target 2026-01-05 15:27:12 +07:00
HungDK a933d34a20 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-05 13:32:11 +07:00
HungDK 03d41fea9a Fix null exception of task dlg 2026-01-05 13:31:02 +07:00
NguyenVanDat ce03f2d38a update process bar 2026-01-05 11:31:22 +07:00
NguyenVanDat 397cb6b98f deactive process as default 2026-01-05 09:40:01 +07:00
NguyenVanDat 22742363ce Merge branch 'develop' into feature/mine-processing 2026-01-05 09:31:38 +07:00
NguyenVanDat 38348f8e10 add and show mining progress run with real time 2026-01-05 09:27:00 +07:00
Tungdv e2d640b508 fix: update logic swim (error in get dir == vector3.zero when swim). 2026-01-02 14:10:57 +07:00
Tungdv a4316bfd7d fix: update logic swim hp. 2025-12-31 17:19:04 +07:00
Tungdv 8508ad873f fix: update logic swim. 2025-12-31 15:09:10 +07:00
VDH f6f9cb343f st 2025-12-31 10:08:23 +07:00
VDH 1aeaebff8f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-31 10:07:22 +07:00
VDH 5eecc21688 st 2025-12-31 10:04:38 +07:00
VuNgocHaiC7 26e299bbea fix broken prefabs 2025-12-30 22:05:40 +07:00
VuNgocHaiC7 6df923ae08 update anim monster and npc 2025-12-30 17:12:47 +07:00
VuNgocHaiC7 857b72dcae update animation monster and npc 2025-12-30 17:09:27 +07:00
HungDK e616f17e3f Update task ui 2025-12-30 11:12:03 +07:00
HungDK 6f9382e338 Update a61.unity 2025-12-30 09:39:55 +07:00
VDH c8db1da837 adjust a little bit 2025-12-29 17:52:05 +07:00
VDH a825db4122 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2025-12-29 17:39:33 +07:00
VDH cc1f4a9556 ui skill for tesst 2025-12-29 17:32:48 +07:00
HungDK 746f37508f Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-29 17:23:49 +07:00
HungDK a16b5ec110 Update a61.unity 2025-12-29 17:23:32 +07:00
Le Duc Anh ea0245bf7b vfx attack 2025-12-29 17:16:43 +07:00
HungDK e6aeaad00f Bind attack, interact btn 2025-12-29 16:56:42 +07:00
HungDK 8e52589c07 Add interact with npc, attack btn 2025-12-29 16:56:21 +07:00
HungDK f012c44f13 Add swap target button 2025-12-29 11:24:13 +07:00