 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 |
|
|
NguyenVanDat
|
16fadfe2a4
|
fix play animation
|
2025-11-15 13:54:29 +07:00 |
|
|
NguyenVanDat
|
faaa843ef3
|
play animation with fade time
|
2025-11-14 16:05:52 +07:00 |
|
|
NguyenVanDat
|
5eb6670b80
|
fix loop animation
|
2025-11-14 09:51:35 +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 |
|
|
anhld
|
2de7d597b2
|
Merge pull request 'feature/load-all-equipments' (#54) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/54
|
2025-11-13 09:44:25 +00: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 |
|
|
Le Duc Anh
|
4315a318d4
|
new character and weapon prefabs
|
2025-11-13 09:31:26 +07:00 |
|
|
NguyenVanDat
|
f067943ca5
|
Merge branch 'develop' into feature/add-vfx
|
2025-11-13 09:24:47 +07:00 |
|
|
NguyenVanDat
|
ba784b7f77
|
add standalone TASK_CLIENT
|
2025-11-13 09:24:19 +07:00 |
|
|
NguyenVanDat
|
daeabf3aca
|
Merge remote-tracking branch 'origin/develop' into feature/add-vfx
|
2025-11-13 09:13:15 +07:00 |
|
|
NguyenVanDat
|
2534e3f6c5
|
add task test
|
2025-11-13 09:12:38 +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 |
|
|
MinhHai
|
58ae3d64b2
|
add partial of CECGameRun: Task
|
2025-11-12 16:52:28 +07:00 |
|
|
NguyenVanDat
|
f1e15cdc2d
|
apply final level up vfx
|
2025-11-12 14:05:00 +07:00 |
|
|
datnv
|
4918b77070
|
Merge pull request 'feature/add-vfx' (#53) from feature/add-vfx into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/53
|
2025-11-12 04:07:52 +00: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 |
|
|
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 |
|
|
NguyenVanDat
|
875b9ad866
|
add vfx
|
2025-11-12 10:17:44 +07:00 |
|
|
HungDK
|
ea53c30306
|
Merge branch 'feature/mall' into develop
|
2025-11-12 09:27:12 +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 |
|
|
hoangvd
|
115a7d5991
|
Merge pull request 'done skill' (#50) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/50
|
2025-11-11 10:14:26 +00: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 |
|
|
Le Duc Anh
|
9be43da2ae
|
load equipment skin
|
2025-11-11 15:59:26 +07:00 |
|
|
hoangvd
|
a236ee0506
|
Merge pull request 'ref' (#49) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/49
|
2025-11-11 07:14:17 +00:00 |
|
|
VDH
|
e01c923e16
|
ref
|
2025-11-11 14:13:14 +07:00 |
|
|
hoangvd
|
936d3d5e7a
|
Merge pull request 'feature/skill-data' (#48) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/48
|
2025-11-11 06:45:26 +00: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 |
|
|
VDH
|
cbf626fa28
|
skill processing
|
2025-11-11 13:33:27 +07:00 |
|
|
Le Duc Anh
|
2974373390
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-11 10:30:06 +07:00 |
|