Commit Graph

2311 Commits

Author SHA1 Message Date
Tungdv b69975eaf3 Merge branch 'develop' into feature/EP_normal_attack 2025-10-22 14:49:58 +07:00
Tungdv 10b0b1825f fix: remove "dynamic". 2025-10-22 14:45:31 +07:00
VDH 5f38710c4a npc and monster done 2025-10-22 13:42:55 +07:00
VDH eaf07bd223 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-22 09:26:38 +07:00
Tungdv 776ac0fa5d feat: add logic else player action normal attack. 2025-10-21 19:12:23 +07:00
HungDK 168da10d1a Update LoginScene.unity 2025-10-21 18:50:44 +07:00
HungDK cabb293722 Update SelectCharacterUI.prefab 2025-10-21 18:50:38 +07:00
HungDK 64e5450d37 Update LoginScreenUI.cs 2025-10-21 18:50:33 +07:00
HungDK 82b8b3c705 Add role select button 2025-10-21 18:49:54 +07:00
VDH 02df4f3c6f monster attack 2025-10-21 18:34:45 +07:00
HungDK 9842d9960c Update EC_InventoryUI.cs 2025-10-21 16:56:15 +07:00
HungDK 8a9449330f Update InventoryUI.prefab 2025-10-21 16:56:01 +07:00
HungDK d522849dba Add equipment item data handler 2025-10-21 16:55:57 +07:00
HungDK bad4451ffc Add textfomatter to apply color, drop down 2025-10-21 16:55:22 +07:00
Tungdv 3a05b94366 Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HostPlayer.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_Object.cs
#	Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
#	Assets/PerfectWorld/Scripts/NPC/CECMonster.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
#	Assets/PerfectWorld/Scripts/UI/pickupItem.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_Utility.cs
#	Assets/Scripts/GameController.cs
#	Assets/Scripts/InitializePlayer.cs
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-20 16:58:20 +07:00
VDH 87fdebe6f4 anim 2025-10-20 16:37:36 +07:00
Tungdv beb9d0f322 fix: update logic worktrace 2025-10-20 16:37:08 +07:00
VDH 8f4d8f84af Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-20 14:15:12 +07:00
VDH 3be97c2381 add monster package 2025-10-20 14:14:51 +07:00
Le Duc Anh a768fe6918 add all anims in animancer component 2025-10-20 14:14:41 +07:00
VDH 9a744151ee 2010 2025-10-20 09:50:23 +07:00
Le Duc Anh b08f6c9de5 initial host skill 2025-10-20 09:37:18 +07:00
HungDK 9d5545199d Merge branch 'develop' into feature/inventory 2025-10-18 14:45:23 +07:00
HungDK c5122eb9f9 Add pickup money 2025-10-18 14:42:53 +07:00
HungDK f3ee7cb7fc Add buy item 2025-10-18 14:42:41 +07:00
Le Duc Anh 9a0c3e3780 remove missing scripts. 2025-10-18 10:54:09 +07:00
HungDK f22fe3d70f Update MallUI.prefab 2025-10-17 17:54:39 +07:00
HungDK e9c69ab511 Add buy cmd 2025-10-17 17:53:34 +07:00
VDH 9b51d2aa61 monster attack animation 2025-10-17 17:52:36 +07:00
HungDK 28f67cc543 Update MallUI.prefab 2025-10-17 09:26:43 +07:00
Tungdv 8ea53ac651 fix: update logic check bush. 2025-10-16 18:35:15 +07:00
HungDK 94e3ba12b3 Add load icon, image, detail 2025-10-16 17:49:30 +07:00
HungDK fe774c634b Add shop icon, image 2025-10-16 17:47:12 +07:00
HungDK 1472034110 Update quality 2025-10-16 17:45:58 +07:00
HungDK 5f56c117d7 Add tool convert multi dds file 2025-10-16 17:45:39 +07:00
VDH e9048c035b bug animation dont clear pre- animation 2025-10-16 17:41:05 +07:00
VDH 8eafdb2ed2 npc die done 2025-10-16 16:28:29 +07:00
Le Duc Anh 20ce61da3e inital skill 2025-10-16 11:17:25 +07:00
VDH 77a0825340 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-16 10:53:41 +07:00
VDH 32e42d2db8 npc leave after die 2025-10-16 10:53:05 +07:00
Le Duc Anh ed1a00932e reset the history pointer 2025-10-16 10:50:59 +07:00
HungDK 1beb754cd2 Add local data loader shop 2025-10-16 10:25:49 +07:00
HungDK c1583f2e37 test shop ui 2025-10-16 10:25:20 +07:00
HungDK efa0682057 Add shop ui prefabs 2025-10-16 10:24:55 +07:00
HungDK 9258f9e605 Add main font text 2025-10-16 10:24:21 +07:00
VDH 36b17caa5a Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/NetworkManager.cs
2025-10-16 09:10:39 +07:00
VDH 432004b5b4 npcdie 2025-10-16 09:10:20 +07:00
NguyenVanDat 668f808883 fix the buffer issue 2025-10-15 18:45:26 +07:00
NguyenVanDat d757c3137b add decrypted buffer 2025-10-15 18:27:16 +07:00
Tungdv de76d2dec0 fix: update struct in logic terrain. 2025-10-15 18:14:53 +07:00