 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
|
542780ed10
|
restore text
|
2025-11-19 10:31:25 +07: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 |
|
|
VDH
|
8ee2477681
|
get config
|
2025-11-18 18:54:56 +07:00 |
|
|
Tungdv
|
4633e8278c
|
fix: update logic send cmd accept task.
|
2025-11-18 16:40:04 +07:00 |
|
|
Tungdv
|
42845aef94
|
fix: update logic init CECGameUIMan.
|
2025-11-18 14:33:13 +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 |
|
|
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 |
|
|
Tungdv
|
afa9f882a9
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-17 19:06:14 +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 |
|
|
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 |
|
|
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
|
621c833793
|
11/13
|
2025-11-13 18:57:24 +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
|
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 |
|
|
VDH
|
62575718f6
|
server cast skill player processing
|
2025-11-12 17:59:50 +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 |
|
|
MinhHai
|
58ae3d64b2
|
add partial of CECGameRun: Task
|
2025-11-12 16:52:28 +07:00 |
|
|
VDH
|
752d2cd69e
|
fix player don't play stand animation when cast skill
|
2025-11-12 15:24:36 +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 |
|
|
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 |
|
|
NguyenVanDat
|
d3bd3f7403
|
remove not use code
|
2025-11-12 10:23:33 +07:00 |
|
|
NguyenVanDat
|
629d419c57
|
WIP logic show vfx select target and level up
|
2025-11-12 10:21:09 +07:00 |
|
|
Tungdv
|
fabb286473
|
fix: update logic show dialog npc.
|
2025-11-11 19:04:49 +07:00 |
|
|
MinhHai
|
451555a1ba
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2025-11-11 18:35:33 +07:00 |
|
|
VDH
|
ecbdf4c803
|
done skill
|
2025-11-11 17:12:51 +07:00 |
|
|
Le Duc Anh
|
9d8e219f3c
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-11 15:59:38 +07:00 |
|
|
VDH
|
e01c923e16
|
ref
|
2025-11-11 14:13:14 +07:00 |
|
|
VDH
|
a13e931bc1
|
fix bug after merge
|
2025-11-11 13:44:55 +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 |
|