duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
392 Commits 13 Branches 0 Tags
2d07f0dcb9194f88df288f350689656d22efcfff
Commit Graph

152 Commits

Author SHA1 Message Date
NguyenVanDat 51659d03cc fixx 2025-10-29 17:05:57 +07:00
NguyenVanDat cc32356d10 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-10-29 17:01:15 +07:00
Tungdv 0d41cbfe44 Merge branch 'develop' into feature/EP_normal_attack 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
#	Assets/Prefabs/MonsterPrefab.prefab
#	Assets/Scenes/WorldRender.unity
#	Assets/Scenes/a61.unity.meta
#	Assets/Scripts/CECHostPlayer.cs
 2025-10-29 15:48:29 +07:00
Tungdv 4283029b1f fix: update auto move for HP. 2025-10-28 19:20:41 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +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 0eed221f16 Fix merge conflict 2025-10-27 11:28:22 +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
HungDK 845f957fa9 Update EC_IvtrEquip.cs 2025-10-23 10:49:56 +07:00
HungDK 9f4603a4bf Update EC_InventoryUI.cs 2025-10-23 10:49:49 +07:00
Tungdv 68d0cc4748 fix: update show anim attack for else player. 2025-10-22 17:14:36 +07:00
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
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 d522849dba Add equipment item data handler 2025-10-21 16:55:57 +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 3be97c2381 add monster package 2025-10-20 14:14:51 +07:00
VDH 9a744151ee 2010 2025-10-20 09:50:23 +07:00
VDH 9b51d2aa61 monster attack animation 2025-10-17 17:52:36 +07:00
Tungdv 8ea53ac651 fix: update logic check bush. 2025-10-16 18:35:15 +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
VDH 32e42d2db8 npc leave after die 2025-10-16 10:53:05 +07:00
VDH 432004b5b4 npcdie 2025-10-16 09:10:20 +07:00
Tungdv de76d2dec0 fix: update struct in logic terrain. 2025-10-15 18:14:53 +07:00
Tungdv 79a3450e9d feat: update logic Get Terrain. 2025-10-14 18:46:20 +07:00
Tungdv 001a16cf32 fix: update namespace. 
feat: add new logic EC_World.
 2025-10-14 18:34:16 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK a591d0b868 Fix data type wrong convert 2025-10-14 10:51:36 +07:00
HungDK 1ed01cd4c5 Clear useless log 2025-10-14 10:51:11 +07:00
VDH 7b73223b55 npc get animation wound and text damage 2025-10-13 18:11:35 +07:00
VDH 7bc5c65229 animation attack done 2025-10-13 16:58:06 +07:00
VDH 4a701aaa16 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-10-13 09:11:16 +07:00
VDH bd344fcff5 player animation 2025-10-11 16:09:00 +07:00
Tungdv 442035c587 fix: fix bug send data attack normal to server. 2025-10-11 15:52:12 +07:00
VDH 042b248368 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs.meta
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs.meta
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/Move/CECPlayer.cs
 2025-10-11 10:09:59 +07:00
VDH dd38edcdd5 change name file 2025-10-11 10:08:24 +07:00
VDH bcba39d951 reset 2025-10-11 10:02:52 +07:00
Tungdv 3af8d968f1 fix: Update atk normal. 2025-10-10 19:02:57 +07:00
VDH a7666f9aa1 organize folder 2025-10-10 15:10:36 +07:00