Commit Graph

91 Commits

Author SHA1 Message Date
HungDK 5477333690 Merge branch 'develop' into feature/inventory 2025-09-30 14:17:05 +07:00
hungdk ca193b1a5a Fix missing ivtr equipable item 2025-09-28 22:07:11 +07:00
NguyenVanDat 38ee1979c7 init tasks from data 2025-09-26 16:46:44 +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
Tungdv eb86bfd011 Merge branch 'develop' into feature/elseplayer 2025-09-25 17:28:23 +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
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 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
HungDK b43b1c61c2 Add slide atlas tool 2025-09-24 18:17:49 +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 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 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
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
VDH 53013d7887 aniamtion processs 2025-09-18 18:07:23 +07:00
Le Duc Anh 1b7183f99e add data type to get_data_ptr 2025-09-18 10:38:02 +07:00
HungDK 9c5f569ac2 Merge branch 'develop' into feature/inventory 2025-09-18 10:11:15 +07:00
Le Duc Anh d36280ed55 add config map 2025-09-18 09:55:04 +07:00
hungdk cf2f0dc40d Update EC_InventoryUI.cs 2025-09-18 00:55:35 +07:00
Le Duc Anh a6d1075571 add player action config into dataman 2025-09-17 17:13:34 +07:00
VDH a9aa67cc2d add animation tool 2025-09-16 18:07:13 +07:00
VDH 6e3ecada59 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
2025-09-16 15:37:00 +07:00
VDH 2f109d039f edit tool 2025-09-16 15:34:48 +07:00
HungDK 24540e150d Fixing func calling order 2025-09-16 15:33:15 +07:00
HungDK 3f148c3f0f Merge branch 'feature/inventory' into develop 2025-09-16 11:04:46 +07:00
HungDK d896833754 Remove useless code 2025-09-16 10:58:02 +07:00
HungDK 2b3af4037a Add ui, font 2025-09-15 20:17:49 +07:00
VDH 68eb9bd928 change state move and idle 2025-09-15 18:01:08 +07:00
hungdk e2c272b3d5 Change encoding method 2025-09-15 16:14:33 +07:00
hungdk dac52cb35e Change file name 2025-09-15 16:12:01 +07:00
tung.do@monkey.edu.vn 3b6c2bb4a3 fix: update logic show exist elseplayer (load word before spawn character). 2025-09-14 02:13:09 +07:00
tung.do@monkey.edu.vn a1bae06cba Merge branch 'develop' into feature/elseplayer
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/GameController.cs
2025-09-14 01:15:24 +07:00
tung.do@monkey.edu.vn 48fef1008d fix: show exist elseplayer 2025-09-14 00:47:52 +07:00