3000 Commits

Author SHA1 Message Date
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
tungdv 740900fbb1 Merge pull request 'feature/elseplayer' (#16) from feature/elseplayer into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/16
2025-09-25 10:42:50 +00: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
HungDK 30c52c24fa Add icon sprite 2025-09-25 14:09:42 +07:00
HungDK ad076e3e6b Fix wrong file setting, generate multi sprites 2025-09-25 14:09:04 +07:00
HungDK 1d348f3ac6 Update load icon from multi sprite file, default icon slot 2025-09-25 14:07:38 +07:00
HungDK aa543dd715 Add datamap 2025-09-25 14:03:44 +07:00
VDH 82c5c721b1 npc man 2025-09-25 13:55:07 +07:00
HungDK b43b1c61c2 Add slide atlas tool 2025-09-24 18:17:49 +07:00
VDH 28b8857dc7 monster process 2025-09-24 18:07:22 +07:00
NguyenVanDat db489e6758 fix task data 2025-09-24 17:41:11 +07:00
NguyenVanDat eb86c5b779 Merge branch 'develop' into feature/quest_sytem 2025-09-24 16:28:57 +07:00
NguyenVanDat ba9ab810d6 Merge branch 'develop' into feature/quest_sytem
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/CECHostPlayer.cs
2025-09-24 14:41:24 +07:00
Le Duc Anh 1cf373bb96 Add Monster Scene 2025-09-24 14:26:11 +07:00
HungDK ec3a5bdfec Update item location 2025-09-24 09:29:01 +07:00
HungDK 960fd880b6 Update ui icon (placeholder) placed data 2025-09-24 09:28:40 +07:00
HungDK b05daed98c Revert "Add icon atlas and provider"
This reverts commit 508d2ad7e3.
2025-09-24 09:24:37 +07:00
hungdk 508d2ad7e3 Add icon atlas and provider 2025-09-24 08:57:39 +07:00
VDH eeaa84cc64 npc 2025-09-23 17:31:59 +07:00
Le Duc Anh 0728230c71 update csnetwork dll 2025-09-23 15:21:08 +07:00
hoangvd f9d83c9184 Merge pull request 'feature/movement' (#13) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/13
2025-09-23 07:15:07 +00:00
VDH 34c36072c6 for build add package 2025-09-23 14:14:03 +07:00
Tungdv aa81225c27 send request get all game data 2025-09-23 13:35:46 +07:00
hungdk 9999de54ec Refactor equipment ui data 2025-09-23 08:54:03 +07:00
HungDK cbff89b47a Update equip item, send - get work 2025-09-22 19:01:45 +07:00
Tungdv f7023afcb8 try to load task data 2025-09-22 18:36:19 +07:00
VDH f8d208be02 for build 2025-09-22 18:03:35 +07:00
VDH a995887904 done else player animation 2025-09-22 12:15:11 +07:00
hoangvd f4f6d0ab55 Merge pull request 'animation host done' (#12) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/12
2025-09-22 02:51:21 +00:00
VDH 0dd73da3c4 animation host done 2025-09-19 17:39:39 +07:00
HungDK 880c49607c Equip, unequip item base 2025-09-19 16:18:58 +07:00