 NguyenVanDat
|
e7d61b4694
|
fix character animation
|
2025-11-24 16:50:13 +07:00 |
|
|
NguyenVanDat
|
a809a98e27
|
fix work stand and character animation
|
2025-11-24 16:46:11 +07:00 |
|
|
VDH
|
f68115eddf
|
st
|
2025-11-24 14:04:27 +07:00 |
|
|
VDH
|
3450fd015f
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Config.meta
# Assets/PerfectWorld/Editor.meta
# Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scenes/a61.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.Task.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECPlayer_Inventory.cs
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2025-11-24 10:16:07 +07:00 |
|
|
VDH
|
f43f8a6e58
|
done spawn vfx
|
2025-11-22 11:21:50 +07:00 |
|
|
Le Duc Anh
|
95f2386397
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-21 16:04:56 +07:00 |
|
|
Le Duc Anh
|
30e636267c
|
udpate matter flow
|
2025-11-21 16:01:11 +07:00 |
|
|
NguyenVanDat
|
d80f7f4f07
|
Merge branch 'develop' into feature/refactor-game-run
|
2025-11-21 11:50:36 +07:00 |
|
|
NguyenVanDat
|
8f5673c68e
|
refactor game run and fix game flow
|
2025-11-21 11:48:39 +07:00 |
|
|
Tungdv
|
939b714ced
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
# Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
# Assets/PerfectWorld/Scripts/Task/TaskInterface.cs
# Assets/PerfectWorld/Scripts/Task/TaskProcess.cs
|
2025-11-21 11:45:16 +07:00 |
|
|
MinhHai
|
0bcacf1599
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
|
2025-11-21 11:31:09 +07:00 |
|
|
MinhHai
|
e1bfd720e3
|
update logic receive Command.TASK_VER_DATA
|
2025-11-21 11:29:34 +07:00 |
|
|
VDH
|
c37ec4d136
|
Push hoang current work
|
2025-11-21 10:18:08 +07:00 |
|
|
Tungdv
|
17edc61e60
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-20 18:37:00 +07:00 |
|
|
Le Duc Anh
|
ca31090872
|
move all stuff into a61 scene
|
2025-11-20 15:33:30 +07:00 |
|
|
HungDK
|
a35cd6d0e7
|
Update EC_Invtr
|
2025-11-20 13:47:10 +07:00 |
|
|
hungdk
|
5dd011df46
|
Refactor and fixing ref
|
2025-11-20 02:18:48 +07:00 |
|
|
Tungdv
|
0324dc909e
|
fix: update logic select option dlg NPC.
|
2025-11-19 19:12:24 +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 |
|
|
VDH
|
8ee2477681
|
get config
|
2025-11-18 18:54:56 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
VDH
|
752d2cd69e
|
fix player don't play stand animation when cast skill
|
2025-11-12 15:24:36 +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 |
|
|
NguyenVanDat
|
629d419c57
|
WIP logic show vfx select target and level up
|
2025-11-12 10:21:09 +07:00 |
|
|
VDH
|
ecbdf4c803
|
done skill
|
2025-11-11 17:12:51 +07:00 |
|
|
VDH
|
e01c923e16
|
ref
|
2025-11-11 14:13:14 +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 |
|
|
Tungdv
|
ec4bb785b8
|
fix: update logic show dialog.
|
2025-11-10 19:50:39 +07:00 |
|
|
Tungdv
|
f643998dda
|
ifx: update logic show dialog npc.
|
2025-11-08 18:51:00 +07:00 |
|
|
VDH
|
d4af8e33f9
|
convert for test done
|
2025-11-07 18:01:47 +07:00 |
|
|
NguyenVanDat
|
df07b1661d
|
add gfx resource and vfx object base
|
2025-11-07 17:35:52 +07:00 |
|
|
VDH
|
38a2c0d46f
|
covnert continue
|
2025-11-06 17:29:02 +07:00 |
|