duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
505 Commits 13 Branches 0 Tags
752d2cd69ef18db5ef53c48cf4e36c3ca6707fad
Commit Graph

81 Commits

Author SHA1 Message Date
VDH 752d2cd69e fix player don't play stand animation when cast skill 2025-11-12 15:24:36 +07:00
VDH 6d98f3d30f skill 1,2,3,4,5,6 2025-11-12 10:52:37 +07:00
VDH ecbdf4c803 done skill 2025-11-11 17:12:51 +07:00
VDH 40f17dadab Merge remote-tracking branch 'origin/develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-11 13:44:45 +07:00
VDH cbf626fa28 skill processing 2025-11-11 13:33:27 +07:00
VDH eed08c2b13 bug skill data not received 2025-11-08 16:41:19 +07:00
VDH d4af8e33f9 convert for test done 2025-11-07 18:01:47 +07:00
VDH 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00
HungDK 14ed8ac2e9 Update else player revive on host client 2025-11-05 09:37:55 +07:00
VDH eaf1a4ba2d Merge remote-tracking branch 'origin/develop' into feature/skill-data 
# Conflicts:
#	.idea/.idea.perfect-world-unity/.idea/workspace.xml
#	Assets/AddressableAssetsData.meta
#	Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
#	Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
#	Assets/AddressableAssetsData/AssetGroupTemplates.meta
#	Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
#	Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
#	Assets/AddressableAssetsData/AssetGroups.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/models.asset
#	Assets/AddressableAssetsData/AssetGroups/models.asset.meta
#	Assets/AddressableAssetsData/DataBuilders.meta
#	Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
#	Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
#	Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
#	Assets/AddressableAssetsData/DefaultObject.asset
#	Assets/AddressableAssetsData/DefaultObject.asset.meta
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-04 15:29:57 +07:00
HungDK 1f7c20069c Merge branch 'develop' into feature/revive 2025-11-04 14:51:15 +07:00
HungDK 53da747d56 Request and play anim revive 2025-11-04 14:36:40 +07:00
HungDK bc7693aceb Add revive data structure of revive 2025-11-04 14:32:23 +07:00
HungDK 307f6d8b49 Add send revive cmd 2025-11-04 14:31:49 +07:00
NguyenVanDat 19a1ecfb70 Merge branch 'develop' into feature/else-player 2025-11-04 09:07:39 +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 10c7ba598b convert continue :))) 2025-11-03 17:34:39 +07:00
NguyenVanDat 4316661cb2 skill convert processing 2025-10-31 17:50:04 +07:00
Nguyen Van Dat cb0f0c9229 Merge branch 'develop' into feature/else-player 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-10-29 21:26:02 +07:00
PCBrew 539c6d1b33 fix else player message 2025-10-29 18:34:04 +07:00
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
NguyenVanDat aca798172c testfast 2025-10-28 10:31:28 +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
VDH 6b91faae68 npc 2025-10-27 11:47:33 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH f537fc0551 npc 2025-10-27 10:23:44 +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
Tungdv ef50c760fa fix: Update move HP. 2025-10-23 19:05:03 +07:00
VDH c0d4478b38 name npc 2025-10-23 17:33:12 +07:00
Le Duc Anh 9fa1c93e27 addressable intial commit 2025-10-22 16:34:56 +07:00
Tungdv 776ac0fa5d feat: add logic else player action normal attack. 2025-10-21 19:12:23 +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
VDH 3be97c2381 add monster package 2025-10-20 14:14:51 +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 e9c69ab511 Add buy cmd 2025-10-17 17:53:34 +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