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

3000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
anhld d2001c1d16 Merge pull request 'use default equipments for players' (#60) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/60
 2025-11-18 15:27:31 +00:00
Le Duc Anh f907e404c4 use default equipments if needed 2025-11-18 22:26:40 +07:00
Le Duc Anh 45024b5761 turn off default equipments if needed 2025-11-18 22:04:56 +07:00
Tungdv bb28c8505d fix: update logic select option in dlg npc. 2025-11-18 19:01:03 +07:00
VDH 8ee2477681 get config 2025-11-18 18:54:56 +07:00
Tungdv 6f3a509534 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
 2025-11-18 16:46:24 +07:00
Tungdv 4633e8278c fix: update logic send cmd accept task. 2025-11-18 16:40:04 +07:00
anhld 60f1f2a686 Merge pull request 'c2s_CmdNPCSevAcceptTask' (#59) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/59
 2025-11-18 09:37:12 +00:00
Le Duc Anh ba1e532e6d Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-18 16:36:32 +07:00
Le Duc Anh 3174cd28d1 send npc accept task cmd 2025-11-18 16:36:15 +07:00
tungdv 46052e60d2 Merge pull request 'Update logic init CECGameUIMan.' (#58) from feature/hp_interact_npc into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/58
 2025-11-18 07:37:03 +00:00
Tungdv c56542a347 Merge remote-tracking branch 'origin/implement_task_UI' into feature/hp_interact_npc 2025-11-18 14:34:58 +07:00
Tungdv 42845aef94 fix: update logic init CECGameUIMan. 2025-11-18 14:33:13 +07:00
MinhHai c2cbd6919c Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-18 14:20:16 +07:00
tungdv 2b709e5734 Merge pull request 'Add base UI manger and dlg manager' (#57) from feature/hp_interact_npc into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/57
 2025-11-18 07:15:54 +00:00
Tungdv 2094f5d36d Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
 2025-11-18 14:14:47 +07:00
Tungdv c90e50eed9 feat: add base uimanger and dlg manager. 2025-11-18 14:10:29 +07:00
anhld 7610493367 Merge pull request 'Add all sword man armors. Load armor and weapon on game init.' (#56) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/56
 2025-11-18 05:01:10 +00:00
VDH de738b8f16 Merge branch 'feature/skillui' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
 2025-11-18 09:44:10 +07:00
MinhHai d992dcbc5f Merge remote-tracking branch 'origin/feature/hp_interact_npc_merge' into implement_task_UI 2025-11-17 19:14:26 +07:00
tungdv 097b29b2cf Merge pull request 'fix: add logic hp_interact_npc' (#55) from feature/hp_interact_npc_merge into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/55
 2025-11-17 12:13:00 +00:00
Tungdv fdb9ebed34 fix: update code for merge dev. 2025-11-17 19:10:44 +07:00
HungDK af6a20f403 Add skill ui 2025-11-17 19:10:02 +07:00
MinhHai 884a0274af fix Search Task feature 2025-11-17 19:07:15 +07:00
MinhHai 3826311391 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-17 19:06:35 +07:00
Tungdv afa9f882a9 Merge branch 'develop' into feature/hp_interact_npc 2025-11-17 19:06:14 +07:00
Tungdv 86c304f43a fix: update logic select option dialog npc. 2025-11-17 18:52:07 +07:00
NguyenVanDat e59127a425 catch message start and stop attack 2025-11-17 18:24:12 +07:00
VDH 1d5025ab46 ui and flow gfx 2025-11-17 18:04:31 +07:00
Tungdv fa1bd3d076 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
 2025-11-17 14:50:24 +07:00
Tungdv 1325a8df63 fix: update logic select option interact npc. 2025-11-17 14:31:20 +07:00
MinhHai 39092a47d5 update logic search task 2025-11-16 16:46:39 +07:00
MinhHai a8ac3a1188 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-16 16:45:48 +07:00
MinhHai 75e897d315 update visual for prefab UI 2025-11-16 16:45:34 +07:00
VDH e7d0da9bb9 load gfx done 2025-11-15 17:33:10 +07:00
Le Duc Anh d2c9a12929 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-15 17:05:07 +07:00
Le Duc Anh 9f664ffd9f add all human male armor 2025-11-15 17:00:59 +07:00
NguyenVanDat 16fadfe2a4 fix play animation 2025-11-15 13:54:29 +07:00
VDH f86cce30e9 11/14 2025-11-14 19:03:42 +07:00
MinhHai 7798c1a909 show npc name on UI 2025-11-14 18:08:46 +07:00
NguyenVanDat faaa843ef3 play animation with fade time 2025-11-14 16:05:52 +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
VDH ba0ed76ab7 convert processing 2025-11-14 10:37:08 +07:00
NguyenVanDat 5eb6670b80 fix loop animation 2025-11-14 09:51:35 +07:00
VDH 621c833793 11/13 2025-11-13 18:57:24 +07:00
Tungdv e46fcf2ee5 fix: update show text mission in dlgnpc. 2025-11-13 18:14:49 +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
anhld 2de7d597b2 Merge pull request 'feature/load-all-equipments' (#54) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/54
 2025-11-13 09:44:25 +00:00