duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,869 Commits 13 Branches 0 Tags
fdc6579c7eaad5f2c0755c2833bc00a8e33fe7fe
Commit Graph

94 Commits

Author SHA1 Message Date
VDH 5014d8947c else player cast skill play gfx 2026-03-13 16:03:47 +07:00
Tungdv e6c2981ebb Merge remote-tracking branch 'origin/develop' into feature/elseplayer 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
 2026-03-13 11:27:06 +07:00
Tungdv 9788d29219 fix: update logic show wing and sword. 2026-03-13 10:40:04 +07:00
Le Duc Anh dd3755c6e0 Equip data change 2026-03-13 10:32:47 +07:00
Le Duc Anh 5b31865962 WIP:show equipment for else player 2026-03-13 00:21:52 +07:00
Tungdv 65c0b00011 fix: update logic show wing and sword fly. 2026-03-12 19:27:19 +07:00
Tungdv f5be092c15 fix: update init data EP. 2026-03-12 16:51:30 +07:00
VDH 230bb83e6f add more handle protocol 2026-03-11 16:05:54 +07:00
Tungdv 94c20c4bdd Merge remote-tracking branch 'origin/develop' into feature/hp_pet 
# Conflicts:
#	Assets/Scripts/CECPlayer_Inventory.cs
 2026-03-10 14:47:49 +07:00
Tungdv 2e03de644d fix: update fly with sword and wing. 2026-03-06 17:33:20 +07:00
Chomper9981 d70e2ba5ad Add feature change shape for player("Than thu") 2026-03-05 16:46:55 +07:00
Tungdv 708f33bfe4 Merge branch 'develop' into feature/hp_pet 
# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-26 16:39:23 +07:00
Tungdv 72ef982527 fix: update UI Dialog Pet List. 2026-02-26 15:57:36 +07:00
HungDK cab2c0af45 Merge branch 'develop' into feature/character_info 2026-02-24 15:33:53 +07:00
NguyenVanDat 2d85773f0e REFACTOR CECHostPlayer 
separate class to partial class
 2026-02-24 10:57:12 +07:00
HungDK 750e7b4ff8 Handle logic of Duel 2026-02-09 18:07:37 +07:00
Tungdv 7a96c7e252 Merge remote-tracking branch 'origin/develop' into feature/hp_pet 
# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
 2026-02-05 17:29:54 +07:00
Tungdv cda4e1343a fix: update logic rider pet. 2026-02-04 19:27:01 +07:00
Tungdv 53f8829413 fix: update show pet rider. 2026-02-03 19:26:41 +07:00
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-02-02 10:28:42 +07:00
HungDK 53d2de6a6c Fetch player, player's info in search panel 2026-02-02 09:25:11 +07:00
Tungdv 8b4fb251de fix: update logic show pet. 2026-01-30 19:35:19 +07:00
Tungdv ef07a39964 fix: update logic dlg pet. 2026-01-28 19:31:14 +07:00
Tungdv 4c51d6bf19 fix: update logic dlg pet. 2026-01-27 19:47:15 +07:00
VDH 3de0850a2b push convert flow use skill combo 2026-01-23 18:01:15 +07:00
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
NguyenVanDat 97804a8b01 else player mining 2026-01-07 14:33:20 +07:00
VDH 824f713c37 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-23 17:33:14 +07:00
VDH 2b12799546 fix npc double 2025-12-23 17:33:09 +07:00
NguyenVanDat 287480c640 clear not use code 2025-12-23 16:53:24 +07:00
NguyenVanDat d3c3f1ff50 finished fix else player emote 2025-12-23 16:45:55 +07:00
NguyenVanDat 09e7482889 update else player emote 2025-12-18 15:34:04 +07:00
NguyenVanDat 1bc54fa74a fix pose action 2025-12-17 17:16:55 +07:00
NguyenVanDat a786ee236e Merge branch 'develop' into implement_task_UI 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/EC_GPDataType.cs
 2025-12-16 11:59:08 +07:00
NguyenVanDat c454eba988 add auto team 2025-12-10 13:55:52 +07:00
NguyenVanDat c8a21a5a33 add auto team 2025-12-09 18:13:30 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
VDH 47f4033dff Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs
#	Assets/PerfectWorld/Scripts/Managers/CECManager.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
#	Assets/PerfectWorld/Scripts/Managers/aabbcd.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
#	Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
 2025-12-04 17:58:10 +07:00
NguyenVanDat 8f47a03680 fix jump animation 2025-12-04 14:50:14 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
Le Duc Anh 28bdab60d8 load else player 2025-11-25 18:52:32 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
VDH a30427e3f5 Merge remote-tracking branch 'origin/bugfix/fix-character-animation' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECHostPlayer_Inventory.cs
 2025-11-19 10:35:54 +07:00
Le Duc Anh 45024b5761 turn off default equipments if needed 2025-11-18 22:04:56 +07:00
VDH 8ee2477681 get config 2025-11-18 18:54:56 +07:00
VDH 690a8dd9de Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-14 11:32:54 +07:00
NguyenVanDat fe73a9b979 handle conflict 2025-11-13 17:53:31 +07:00
NguyenVanDat f7d0ee6b43 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
 2025-11-13 17:22:47 +07:00
NguyenVanDat c6f24993b5 show selecting vfx and elase player enter vfx 2025-11-13 17:12:41 +07:00
Le Duc Anh ba9c97d3f6 fix the conflicts 2025-11-13 16:43:59 +07:00