 VungochaiC7
|
ab563a6dba
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/color-text
|
2025-12-15 13:38:34 +07:00 |
|
|
Le Duc Anh
|
9378866567
|
add 4 more player models
|
2025-12-15 00:12:16 +07:00 |
|
|
Tungdv
|
c43eac8599
|
Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-12-13 19:17:18 +07:00 |
|
|
Tungdv
|
d1d59c6d04
|
fix: fix bug move on ground.
|
2025-12-13 19:11:38 +07:00 |
|
|
VDH
|
fa177ec734
|
Merge branch 'develop' into feature/skill-data
|
2025-12-13 17:50:04 +07:00 |
|
|
Le Duc Anh
|
3984170c6f
|
remove NPC Disappeared events
|
2025-12-13 17:49:37 +07:00 |
|
|
VDH
|
60d0a52d4e
|
fix 2 struct
|
2025-12-13 17:49:34 +07:00 |
|
|
VDH
|
f20c5a123e
|
st
|
2025-12-13 16:54:52 +07:00 |
|
|
VDH
|
9b0c3b3dc0
|
fix
|
2025-12-13 15:30:53 +07:00 |
|
|
VDH
|
10fd731948
|
st
|
2025-12-13 10:43:00 +07:00 |
|
|
VDH
|
89c7b550f0
|
convert all skill in stub1
|
2025-12-12 18:06:48 +07:00 |
|
|
VungochaiC7
|
b4777baca3
|
Update Prefabs Inventory UI, add drag-and-drop equipment functionality.
|
2025-12-12 16:42:48 +07:00 |
|
|
VDH
|
504cdb11d6
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
# Assets/PerfectWorld/Scripts/World/CECWorld.cs
# Assets/Scenes/a61.unity
|
2025-12-11 14:14:54 +07:00 |
|
|
Chomper9981
|
a7dcbd4e69
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-12-11 10:01:53 +07:00 |
|
|
VDH
|
45f69c9f44
|
skill ui
|
2025-12-10 18:17:34 +07:00 |
|
|
Tungdv
|
5ebf4fb49b
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/Scripts/CECGameRun.cs
|
2025-12-10 17:21:20 +07:00 |
|
|
Tungdv
|
21f41ecae1
|
feat: add rotation cam.
|
2025-12-10 17:18:38 +07:00 |
|
|
Tungdv
|
ebdb99865d
|
fix: update move air.
|
2025-12-09 19:53:50 +07:00 |
|
|
VDH
|
972104970d
|
copnvert
|
2025-12-09 19:53:32 +07:00 |
|
|
Chomper9981
|
5d9dd1c3d9
|
Change some shop UI
|
2025-12-09 16:37:16 +07:00 |
|
|
Tungdv
|
ead70ecfea
|
fix: update move air.
|
2025-12-08 19:10:23 +07:00 |
|
|
VDH
|
c239660cd6
|
Merge branch 'develop' into feature/skill-data
|
2025-12-08 17:51:18 +07:00 |
|
|
VDH
|
2410af3078
|
done pos skill
|
2025-12-08 17:49:57 +07:00 |
|
|
VungochaiC7
|
aee25a18b5
|
update detail color text item
|
2025-12-08 17:45:12 +07:00 |
|
|
HungDK
|
6392baf369
|
Add ext description text
|
2025-12-08 16:15:01 +07:00 |
|
|
HungDK
|
892d0d3aef
|
Merge branch 'develop' into feature/npc-shop
|
2025-12-08 10:37:03 +07:00 |
|
|
HungDK
|
729bd4ce6e
|
Add button and correct refresh detail item pannel size
|
2025-12-08 10:26:44 +07:00 |
|
|
NguyenVanDat
|
659253c3d2
|
temporary add vfx for weapon attack
|
2025-12-08 10:23:00 +07:00 |
|
|
HungDK
|
421bcfd6a6
|
Update EC_InventoryUI.cs
|
2025-12-08 10:12:35 +07:00 |
|
|
NguyenVanDat
|
6be2ef9a39
|
Merge branch 'develop' into feature/vfx
|
2025-12-08 10:12:32 +07:00 |
|
|
NguyenVanDat
|
e973260dee
|
fix addressable release asset
|
2025-12-08 09:48:37 +07:00 |
|
|
HungDK
|
66dc12ef4a
|
Update item detail
|
2025-12-08 09:30:59 +07:00 |
|
|
HungDK
|
d2fd5b2f0a
|
Add missing id config of items description
|
2025-12-08 09:17:36 +07:00 |
|
|
Tungdv
|
4c863a8ee8
|
fix: update move fly and swim.
|
2025-12-06 18:49:21 +07:00 |
|
|
VDH
|
a48ac9baf8
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-12-06 16:41:34 +07:00 |
|
|
VDH
|
e19be27a1a
|
skill
|
2025-12-06 16:35:34 +07:00 |
|
|
Tungdv
|
09322bcf41
|
fix: delete log.
|
2025-12-06 14:44:34 +07:00 |
|
|
Tungdv
|
be85cf1d91
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-12-06 14:41:00 +07:00 |
|
|
Tungdv
|
c7c34b373c
|
fix: update data info for HP.
fix: update move fly and swim.
|
2025-12-06 14:14:55 +07:00 |
|
|
Tungdv
|
956fde82b4
|
feat: set ext prop for HP.
|
2025-12-05 21:59:35 +07:00 |
|
|
Tungdv
|
f330d9606c
|
fix: update logic jump move for HP.
|
2025-12-05 21:09:16 +07:00 |
|
|
VDH
|
80c40705d2
|
skill pos processing
|
2025-12-05 21:07:25 +07:00 |
|
|
NguyenVanDat
|
593d6374da
|
fix object attack facing to target
|
2025-12-05 14:21:47 +07:00 |
|
|
VDH
|
2d3f98bb2c
|
fix after merge
|
2025-12-05 10:16:08 +07:00 |
|
|
Tungdv
|
1d7181c1fc
|
fix: update logic jump move.
|
2025-12-04 20:06:02 +07:00 |
|
|
Tungdv
|
b5aeba251d
|
fix: update logic jump stand for HP.
|
2025-12-04 19:18:58 +07:00 |
|
|
VDH
|
3b5386840d
|
fix after merge
|
2025-12-04 18:12:17 +07:00 |
|
|
VDH
|
47f4033dff
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/A3DTerrain2.cs
# Assets/PerfectWorld/Scripts/Managers/CECManager.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
# Assets/PerfectWorld/Scripts/Managers/aabbcd.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Move/EC_CDR.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2025-12-04 17:58:10 +07:00 |
|
|
VDH
|
0529114779
|
done skill bless
|
2025-12-04 17:26:42 +07:00 |
|
|
HungDK
|
16094d04cf
|
Fixing wrong command to send to server
|
2025-12-04 15:09:20 +07:00 |
|