Commit Graph

736 Commits

Author SHA1 Message Date
NguyenVanDat 570455afce add escape button (changed a61) 2026-01-09 09:38:51 +07:00
NguyenVanDat ec6ba435cb Merge branch 'develop' into feature/mine-processing 2026-01-07 16:25:09 +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 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 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
Le Duc Anh ea0245bf7b vfx attack 2025-12-29 17:16:43 +07:00
HungDK 8e52589c07 Add interact with npc, attack btn 2025-12-29 16:56:21 +07:00
HungDK 53f96ff6a4 Merge branch 'develop' into feature/addressable-data 2025-12-29 11:19:17 +07:00
HungDK ad67f50131 Bind button 2025-12-29 11:18:23 +07:00
HungDK 70f2707989 Integrate to player and npc 2025-12-29 11:17:46 +07:00
NguyenVanDat 266d751bb1 Merge branch 'develop' into feature/mine-processing 2025-12-29 09:26:26 +07:00
HungDK ea2ad61ffb Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-26 11:50:10 +07:00
Tungdv 9aa995d504 fix: fix bug auto move when click on screen. 2025-12-26 11:49:28 +07:00
HungDK 3b25abbc8b Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-26 11:49:23 +07:00
NguyenVanDat 668a2aacd1 Merge branch 'develop' into feature/mine-processing 2025-12-26 11:48:51 +07:00
NguyenVanDat 308c4c8b92 do logic host player mining 2025-12-26 11:47:55 +07:00
HungDK f95e9813aa Load addressable file update 2025-12-26 11:42:24 +07:00
VDH 2cd0306744 Merge branch 'develop' into feature/TaskThread
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/configuration.asset
2025-12-26 10:22:37 +07:00
VDH 31bea39877 st 2025-12-26 10:16:25 +07:00
VDH 5ae2e1c333 fix not addresable 2025-12-26 10:15:12 +07:00
HungDK ce2d81a43f Change load addressable script 2025-12-26 10:10:17 +07:00
Tungdv 9926f8956c Merge branch 'develop' into feature/HP_jump 2025-12-25 18:15:49 +07:00
Tungdv b766229425 fix: update logic jump HP on ground. 2025-12-25 18:13:21 +07:00
VDH 6226f68cae task addresable 2025-12-25 17:50:40 +07:00
VDH 7370ac2865 Merge branch 'develop' into feature/TaskThread
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/configuration.asset
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
2025-12-25 16:50:18 +07:00
HungDK 325e1e25b6 Update Addressable manager 2025-12-25 16:41:11 +07:00
HungDK 06bbdbb42e Rremove old load file by dir 2025-12-25 16:40:21 +07:00
VDH a72cb120ff task addreasble 2025-12-25 16:35:28 +07:00
Le Duc Anh c0541f562d use Stream instead of FileStream 2025-12-25 10:50:39 +07:00
Le Duc Anh 9dc74c7346 change function name 2025-12-25 10:08:27 +07:00