Commit Graph

982 Commits

Author SHA1 Message Date
NguyenVanDat 287480c640 clear not use code 2025-12-23 16:53:24 +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
tungdv 0799126d65 Merge pull request 'add layer terrain in spawn.' (#93) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/93
2025-12-23 09:42:49 +00:00
Tungdv a56a08a32d fix: add layer terrain in spawn. 2025-12-23 16:41:19 +07:00
tungdv 59c54524ba Merge pull request 'revert code test jump' (#92) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/92
2025-12-23 09:26:31 +00:00
Tungdv 8f0db86196 Merge branch 'develop' into feature/HP_jump 2025-12-23 16:25:41 +07:00
Tungdv 98629962b4 fix: revert code test. 2025-12-23 16:23:59 +07:00
HungDK 94be062918 Merge branch 'develop' into feature/life-skill 2025-12-23 16:18:59 +07:00
tungdv 7cb2b7c2cb Merge pull request 'test fix jump HP on ground' (#91) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/91
2025-12-23 08:41:56 +00:00
Tungdv ec85ba4f51 fix: delete log. 2025-12-23 15:40:57 +07:00
Tungdv 63bdf4f045 Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2025-12-23 15:38:20 +07:00
Tungdv 165842c4f9 fix: test fix jump HP on ground. 2025-12-23 15:37:02 +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
Le Duc Anh f3290a2660 enable bloom 2025-12-22 22:41:55 +07:00
Le Duc Anh f3e1d2c7c5 add sword hit vfx 2025-12-22 22:40:00 +07:00
HungDK eb8980943c Add trace to gather matter and gathering matter 2025-12-22 18:06:20 +07:00
HungDK 1aaec5865d Update EC_ManMatter.cs 2025-12-22 17:55:10 +07:00
HungDK 9fcbdf7e5c Add check matter IsMatter 2025-12-22 17:54:49 +07:00
HungDK 6736a6d6c3 Add public bool IsInvisible 2025-12-22 17:54:20 +07:00
HungDK 7a98193ed3 Update CECPlayer.Task.cs 2025-12-22 17:53:59 +07:00
HungDK a4e9e85bed Add c2s_CmdGatherMaterial and struct cmd_gather_material 2025-12-22 17:53:48 +07:00
HungDK cb4e27c2b9 Add c2s_CmdGatherMaterial 2025-12-22 17:53:16 +07:00
HungDK 8c449041d4 Add ISMONEYTID 2025-12-22 17:52:59 +07:00
HungDK 2a74bd3592 Add GetMatter 2025-12-22 17:52:32 +07:00
HungDK da055c5ece Add c2s_CmdGatherMaterial 2025-12-22 17:51:08 +07:00
HungDK acc5a5af6e Add properties and disable duplicate raycast, add method to gather 2025-12-22 17:50:57 +07:00
HungDK fb6f3b3c13 Add CanTakeItem and FindMineTool method 2025-12-22 17:49:59 +07:00
MinhHai d74f86443a Merge remote-tracking branch 'origin/develop' into feature/pre-load-all-task-templ 2025-12-22 11:40:03 +07:00
MinhHai df6292a577 down size of Task SO, fix path name to load task 2025-12-22 11:38:43 +07:00
tungdv 0590bb12d7 Merge pull request 'remove commint fix jump HP.' (#90) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/90
2025-12-22 04:06:39 +00:00
Tungdv d698c0d3cf Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2025-12-22 11:02:22 +07:00
Tungdv 12b6861731 fix: revert commit fix jump. 2025-12-22 11:00:41 +07:00
NguyenVanDat 1dd0f89d60 Merge branch 'develop' into feature/do-emote-else-player 2025-12-22 09:19:31 +07:00
MinhHai a1297cba2d Merge remote-tracking branch 'origin/develop' into feature/pre-load-all-task-templ 2025-12-20 11:52:57 +07:00
MinhHai 6c9388325f complete cache task into SO 2025-12-20 11:52:13 +07:00
Le Duc Anh 039082a3f8 add npc 2025-12-19 15:54:16 +07:00
Le Duc Anh 2080acd1b1 add more npc models 2025-12-19 15:41:32 +07:00
MinhHai 807fbdf6b0 Merge remote-tracking branch 'origin/develop' into feature/pre-load-all-task-templ 2025-12-18 22:28:28 +07:00
MinhHai 9edb6682b8 complete cache 4 class_properties via ID 2025-12-18 22:27:05 +07:00
hoangvd 4e17bb259e Merge pull request 'npc douple fix' (#89) from feature/loopanimation into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/89
2025-12-18 10:24:07 +00:00
VDH eaaeaf6734 npc douple fix 2025-12-18 17:23:18 +07:00
NguyenVanDat 09e7482889 update else player emote 2025-12-18 15:34:04 +07:00
anhld 49f0ab3da6 Merge pull request 'Add npc models' (#88) from internal-testing-build into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/88
2025-12-17 14:02:50 +00:00
Le Duc Anh d15b0a2e30 Merge remote-tracking branch 'origin/develop' into internal-testing-build 2025-12-17 21:01:55 +07:00
Le Duc Anh 2d65447e30 add npc models 2025-12-17 21:00:58 +07:00
tungdv f4f56fdc07 Merge pull request 'fix bug HP jump on ground.' (#87) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/87
2025-12-17 13:54:36 +00:00
Tungdv 98e4ba6088 Merge branch 'develop' into feature/HP_jump
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
2025-12-17 20:53:30 +07:00