Commit Graph

62 Commits

Author SHA1 Message Date
HungDK 1f7c20069c Merge branch 'develop' into feature/revive 2025-11-04 14:51:15 +07:00
HungDK 8278709a45 Add prefab and ui of revive system 2025-11-04 14:30:25 +07:00
NguyenVanDat 12617a8ea3 Merge branch 'develop' into feature/else-player
# Conflicts:
#	Assets/Scenes/a61.unity
2025-11-04 13:51:24 +07:00
NguyenVanDat 814a151648 show dummy hit effect 2025-11-04 13:45:10 +07:00
VDH 313a525700 fix bug 2025-11-04 11:31:10 +07:00
VDH 42399c1a70 for merge 2025-11-04 10:43:29 +07:00
tung.do@monkey.edu.vn d18d8b0b64 Merge branch 'develop' into feature/EP_normal_attack 2025-11-04 01:10:31 +07:00
Tungdv cfc13087e4 fix:
- fix anim elseplayer.
- fix auto move to target of HP.
- fix postion wrong went use joystick after auto move of HP.
2025-11-03 19:59:00 +07:00
PCBrew 5ee9a27ac8 fix bug 2025-11-03 18:56:26 +07:00
PCBrew 61775198c6 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-11-03 17:37:16 +07:00
Tungdv 4be95aec7a fix: update logic auto move HP. 2025-10-30 19:41:39 +07:00
PCBrew 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
HungDK 33c845cd3b Merge branch 'develop' into feature/inventories 2025-10-30 10:10:16 +07:00
HungDK 915b11b387 Update login ui 2025-10-28 13:51:33 +07:00
NguyenVanDat 46eb3afe2b Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/NPCRender.unity
2025-10-28 11:05:11 +07:00
NguyenVanDat aca798172c testfast 2025-10-28 10:31:28 +07:00
HungDK 0ae982ae80 Merge branch 'feature/inventories' into develop 2025-10-27 15:45:29 +07:00
HungDK 13d1283d6e Fix money and cash loader 2025-10-27 15:39:45 +07:00
NguyenVanDat d72d4cd967 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-10-27 13:41:59 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH 7fef48278f addressable ui 2025-10-25 17:28:46 +07:00
HungDK bd34b294f9 Add player currency 2025-10-25 17:07:54 +07:00
VDH 7c88068369 npc server name 2025-10-24 10:18:56 +07:00
VDH c0d4478b38 name npc 2025-10-23 17:33:12 +07:00
VDH 5f38710c4a npc and monster done 2025-10-22 13:42:55 +07:00
HungDK cabb293722 Update SelectCharacterUI.prefab 2025-10-21 18:50:38 +07:00
HungDK 82b8b3c705 Add role select button 2025-10-21 18:49:54 +07:00
HungDK 8a9449330f Update InventoryUI.prefab 2025-10-21 16:56:01 +07:00
HungDK f22fe3d70f Update MallUI.prefab 2025-10-17 17:54:39 +07:00
HungDK 28f67cc543 Update MallUI.prefab 2025-10-17 09:26:43 +07:00
HungDK efa0682057 Add shop ui prefabs 2025-10-16 10:24:55 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK f31db71ef1 Update InventoryUI.prefab 2025-10-14 10:52:14 +07:00
HungDK 7a000797ec Update place holder item drop object 2025-10-09 17:04:07 +07:00
Tungdv 2dee89793d fix: Update attack normal HP. 2025-10-09 16:57:07 +07:00
HungDK fd3a269886 Merge branch 'develop' into feature/inventory 2025-10-08 13:49:30 +07:00
NguyenVanDat 7ebb4c602f Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
2025-10-07 09:31:01 +07:00
HungDK 2950100ecd Update InventoryUI.prefab 2025-10-06 17:57:35 +07:00
HungDK 21a31f4746 Add player preview in inventory 2025-10-02 14:15:19 +07:00
HungDK adf0aa1edd Update InventoryUI.prefab 2025-10-02 08:49:29 +07:00
VDH 4198c2f968 npc move procvess 2025-10-01 15:07:18 +07:00
HungDK 86b30afc13 Update ivtr fashion ui 2025-10-01 09:51:03 +07:00
VDH 1b2de221b4 animation npc Process 2025-09-29 18:26:02 +07:00
HungDK c02f471fa6 Add select character ui 2025-09-29 16:10:45 +07:00
VDH 586e2f834b npc animtion processing 2025-09-27 17:10:53 +07:00
HungDK 4243bab53f Merge branch 'develop' into feature/inventory 2025-09-25 14:18:51 +07:00
HungDK ec3a5bdfec Update item location 2025-09-24 09:29:01 +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
HungDK 3b979ede0c Update equipment item order 2025-09-18 15:06:08 +07:00