 VDH
|
ddb50c3c4c
|
st
|
2025-11-25 14:42:44 +07:00 |
|
|
VDH
|
8acf91dcb3
|
conflict
|
2025-11-25 14:28:04 +07:00 |
|
|
VDH
|
d092605651
|
done skill don't move after cast
|
2025-11-25 12:10:43 +07:00 |
|
|
NguyenVanDat
|
ae391ad0c5
|
make walk run is true as default
|
2025-11-24 17:05:04 +07:00 |
|
|
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 |
|
|
Le Duc Anh
|
466e39d67c
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-24 14:27:45 +07:00 |
|
|
hoangvd
|
590ec18309
|
Merge pull request 'done 3 vfx' (#70) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/70
|
2025-11-24 07:25:04 +00:00 |
|
|
VDH
|
887b7d755c
|
done 3 vfx
|
2025-11-24 14:22:02 +07:00 |
|
|
HungDK
|
15f2224d64
|
Merge branch 'feature/joystick-fix' into develop
|
2025-11-24 14:11:48 +07:00 |
|
|
VDH
|
f68115eddf
|
st
|
2025-11-24 14:04:27 +07:00 |
|
|
HungDK
|
da65d37674
|
Fix monster health ui, hud
|
2025-11-24 12:01:34 +07:00 |
|
|
VDH
|
9418884c28
|
fix skill after merge
|
2025-11-24 11:36:21 +07:00 |
|
|
Le Duc Anh
|
22348242a4
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-24 10:40:10 +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 |
|
|
MinhHai
|
1b5617ef5d
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-11-22 18:59:56 +07:00 |
|
|
MinhHai
|
beb12c8723
|
update logic NotifyServer of class TaskClient
|
2025-11-22 18:58:40 +07:00 |
|
|
Tungdv
|
59976a4be5
|
fix: update dlgnpc.
|
2025-11-22 17:47:15 +07:00 |
|
|
VDH
|
f43f8a6e58
|
done spawn vfx
|
2025-11-22 11:21:50 +07:00 |
|
|
Le Duc Anh
|
32f9216a42
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-22 10:05:47 +07:00 |
|
|
MinhHai
|
7ba8ca49ba
|
fix EC_Game: get GameRun, cache TaskData before playmode
|
2025-11-22 10:04:50 +07:00 |
|
|
Le Duc Anh
|
edff7723d8
|
Load the elementdata for Android
|
2025-11-21 23:22:07 +07:00 |
|
|
Tungdv
|
9129784de0
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-21 17:07:50 +07:00 |
|
|
MinhHai
|
aa797c8865
|
Merge branch 'implement_task_UI' into develop
|
2025-11-21 17:07:01 +07:00 |
|
|
Tungdv
|
45ad9bc162
|
fix: Update logic select task in dlgnpc.
|
2025-11-21 17:03:39 +07:00 |
|
|
MinhHai
|
62482e5a9e
|
avoid Init EC_GameRun at EC_Game
|
2025-11-21 16:39:21 +07:00 |
|
|
Le Duc Anh
|
f46b917dd8
|
fix the missing addressable objects
|
2025-11-21 16:18:19 +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 |
|
|
Tungdv
|
1951047c61
|
fix: update logic button back and close in dlgnpc.
|
2025-11-21 11:37:07 +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 |
|
|
Tungdv
|
ceec82ffc5
|
fix: update logic select option in dlgnpc.
|
2025-11-20 18:18:06 +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 |
|
|
Le Duc Anh
|
c2e8829c85
|
PC build
|
2025-11-19 16:15:03 +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 |
|
|
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 |
|