Commit Graph

364 Commits

Author SHA1 Message Date
HungDK 70104db9e2 Update EC_HPWork to create navigate work 2026-01-09 15:13:15 +07:00
HungDK 156e61c3d7 Add look up NPC info 2026-01-09 15:12:31 +07:00
HungDK 119b9129b4 Add EC_HPWorkNavigate converted 2026-01-09 15:08:53 +07:00
NguyenVanDat d0d7346a72 Merge branch 'develop' into feature/mine-processing
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-09 11:04:53 +07:00
VDH fb4b9b5d90 Merge branch 'develop' into feature/skill-data 2026-01-09 09:46:34 +07:00
NguyenVanDat 570455afce add escape button (changed a61) 2026-01-09 09:38:51 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +07:00
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +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
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +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
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
VDH 2d3c9a96ef fix bug can't use skill when player is far from target 2026-01-05 15:27:12 +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 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
Tungdv 9aa995d504 fix: fix bug auto move when click on screen. 2025-12-26 11:49:28 +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
VDH 2cd0306744 Merge branch 'develop' into feature/TaskThread
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/configuration.asset
2025-12-26 10:22:37 +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 a72cb120ff task addreasble 2025-12-25 16:35:28 +07:00
Le Duc Anh 238910f689 add GFX attack 2025-12-24 16:55:37 +07:00
HungDK 9e65e01b7c Reapply "Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop"
This reverts commit 2d6a15eb40.
2025-12-24 15:06:43 +07:00
HungDK 2d6a15eb40 Revert "Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop"
This reverts commit 59b66967e8, reversing
changes made to e62b2d9e3a.
2025-12-24 13:45:34 +07:00
VDH e5e3f35559 fix bug anim npc monster 2025-12-24 09:50:38 +07:00
VDH 4b75e854f3 Merge branch 'develop' into feature/loopanimation
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scenes/a61.unity
2025-12-23 17:55:21 +07:00
VDH 9dc80fe5f0 bo debug 2025-12-23 17:47:47 +07:00
VDH 824f713c37 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-23 17:33:14 +07:00
VDH 2b12799546 fix npc double 2025-12-23 17:33:09 +07:00
NguyenVanDat 650777dc26 Merge branch 'develop' into feature/do-emote-else-player 2025-12-23 16:47:17 +07:00
NguyenVanDat d3c3f1ff50 finished fix else player emote 2025-12-23 16:45:55 +07:00
HungDK 4b4c544898 Merge branch 'develop' into feature/life-skill 2025-12-23 14:27:14 +07:00
HungDK 6d5b905c61 Fix pickup money 2025-12-23 14:23:48 +07:00
HungDK ffb88a57ea Add pickup item, gather logic of movement, anim 2025-12-23 10:31:20 +07:00