duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
598 Commits 13 Branches 0 Tags
5dd011df46518290203db2ec8d572ba344d80dfd
Commit Graph

393 Commits

Author SHA1 Message Date
hungdk 5dd011df46 Refactor and fixing ref 2025-11-20 02:18:48 +07:00
anhld 35ab182862 Merge pull request 'load npc/monster' (#63) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/63
 2025-11-19 06:38:52 +00:00
Le Duc Anh b400ad1e68 load npc/monster 2025-11-19 13:38:20 +07:00
NguyenVanDat 4e236c1c32 Merge branch 'develop' into bugfix/fix-character-animation 2025-11-19 11:51:34 +07:00
NguyenVanDat e5fdb874c1 dummy change SelectGfx prefab 2025-11-19 11:50:23 +07:00
Le Duc Anh b1fb758ce3 disable default equipments 2025-11-19 11:04:21 +07:00
NguyenVanDat e8a76c0c58 fix character animation config name 2025-11-19 10:42:24 +07:00
Le Duc Anh 45024b5761 turn off default equipments if needed 2025-11-18 22:04:56 +07: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
MinhHai c2cbd6919c Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-18 14:20:16 +07: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
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 fdb9ebed34 fix: update code for merge dev. 2025-11-17 19:10:44 +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
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
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
MinhHai 7798c1a909 show npc name on UI 2025-11-14 18:08:46 +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
Le Duc Anh ba9c97d3f6 fix the conflicts 2025-11-13 16:43:59 +07:00
Le Duc Anh 648d51ff3a Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-13 16:22:36 +07:00
Le Duc Anh c4a56218d8 load player model 2025-11-13 16:12:12 +07:00
NguyenVanDat daeabf3aca Merge remote-tracking branch 'origin/develop' into feature/add-vfx 2025-11-13 09:13:15 +07:00
tung.do@monkey.edu.vn 8bf8f3716c fix: update text dlgnpc and fix bug merge. 2025-11-13 01:51:06 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
 2025-11-12 19:39:19 +07:00
NguyenVanDat 28efdb79ec update hover vfx 2025-11-12 18:27:46 +07:00
Tungdv 020058d9da fix: update logic show dialog NPC. 2025-11-12 17:20:15 +07:00
MinhHai 271bb0d787 fix conflict 2025-11-12 17:14:39 +07:00
MinhHai bb01bbb6f1 Merge remote-tracking branch 'origin/develop' into implement_task_UI 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-12 16:57:45 +07:00
MinhHai 2c3c44de4e update Task: complete read task templ, log task name and description on UI, add sprites asset 2025-11-12 16:56:35 +07:00
NguyenVanDat f1e15cdc2d apply final level up vfx 2025-11-12 14:05:00 +07:00
NguyenVanDat cfeebf3a15 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2025-11-12 11:04:43 +07:00
NguyenVanDat 142fabf108 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Prefab/GameController.prefab
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/PlayerVisual.cs
 2025-11-12 11:03:25 +07:00
hoangvd fb2288c2a2 Merge pull request 'skill 1,2,3,4,5,6' (#52) from feature/skill-data into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/52
 2025-11-12 03:53:35 +00:00
VDH 6d98f3d30f skill 1,2,3,4,5,6 2025-11-12 10:52:37 +07:00
anhld b3bac397e4 Merge pull request 'develop' (#51) from develop into feature/load-all-equipments 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/51
 2025-11-12 03:23:37 +00:00