duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
317 Commits 13 Branches 0 Tags
68d0cc4748e4b48bcbf9bce4bbbebe9b34e613c5
Commit Graph

317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hoangvd 46ccb7d16e Merge pull request 'npc and monster done' (#32) from feature/HostAttack_Hoang into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/32
 2025-10-22 06:48:47 +00:00
VDH 5f38710c4a npc and monster done 2025-10-22 13:42:55 +07:00
hoangvd e95d5c660d Merge pull request 'feature/HostAttack_Hoang' (#31) from feature/HostAttack_Hoang into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/31
 2025-10-22 02:30:09 +00:00
VDH eaf07bd223 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-22 09:26:38 +07:00
tungdv ac2e48f3cc Merge pull request 'feat: Add logic EP normal attack' (#30) from feature/EP_normal_attack into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/30
 2025-10-21 12:14:12 +00: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
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
hoangvd fa6db3e0ca Merge pull request 'feature/HostAttack_Hoang' (#29) from feature/HostAttack_Hoang into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/29
 2025-10-20 09:38:27 +00: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 9a0c3e3780 remove missing scripts. 2025-10-18 10:54:09 +07:00
hoangvd c6a46032a0 Merge pull request 'feature/HostAttack_Hoang' (#28) from feature/HostAttack_Hoang into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/28
 2025-10-18 03:27:53 +00: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 755638c5f8 st 2025-10-16 16:29:02 +07:00
VDH 8eafdb2ed2 npc die done 2025-10-16 16:28:29 +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
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
anhld 92352e14d9 Merge pull request 'bugfix/decompresing' (#27) from bugfix/decompresing into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/27
 2025-10-15 11:47:27 +00: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
NguyenVanDat c67d0e5c4c modify decompress algo 2025-10-15 16:01:48 +07:00
Le Duc Anh 793c8a370f add comments 2025-10-15 10:06:10 +07:00
Le Duc Anh 712c7211c1 add comments 2025-10-15 09:43:58 +07:00
Le Duc Anh 8552a7d99e Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-10-15 09:18:31 +07:00
Le Duc Anh 897ef1b093 atempt to fix decompress 2025-10-15 09:17:47 +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
VDH dce34489ed Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-14 17:13:58 +07:00
NguyenVanDat 664f114e53 log 2025-10-14 17:10:18 +07:00
VDH 4f06139b2e fix bug animation wound npc 2025-10-14 14:57:19 +07:00
HungDK 06957a037c Remove duplicate component 2025-10-14 11:46:58 +07:00
HungDK 929913003a Fix merge conflix 2025-10-14 11:24:10 +07:00
HungDK c62b05d10e Update CECHostPlayer.cs 2025-10-14 11:17:46 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK 3695dd2262 Add gshop data 2025-10-14 10:53:35 +07:00
HungDK 190b2f522e Add GShopLoader 2025-10-14 10:53:16 +07:00