hoangvd
|
4e17bb259e
|
Merge pull request 'npc douple fix' (#89) from feature/loopanimation into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/89
|
2025-12-18 10:24:07 +00:00 |
|
VDH
|
eaaeaf6734
|
npc douple fix
|
2025-12-18 17:23:18 +07:00 |
|
anhld
|
49f0ab3da6
|
Merge pull request 'Add npc models' (#88) from internal-testing-build into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/88
|
2025-12-17 14:02:50 +00:00 |
|
Le Duc Anh
|
d15b0a2e30
|
Merge remote-tracking branch 'origin/develop' into internal-testing-build
|
2025-12-17 21:01:55 +07:00 |
|
Le Duc Anh
|
2d65447e30
|
add npc models
|
2025-12-17 21:00:58 +07:00 |
|
tungdv
|
f4f56fdc07
|
Merge pull request 'fix bug HP jump on ground.' (#87) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/87
|
2025-12-17 13:54:36 +00:00 |
|
Tungdv
|
98e4ba6088
|
Merge branch 'develop' into feature/HP_jump
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkStand.cs
|
2025-12-17 20:53:30 +07:00 |
|
Tungdv
|
aad6933021
|
fix: fix bug jump on ground.
|
2025-12-17 20:49:38 +07:00 |
|
anhld
|
e71338200f
|
Merge pull request 'internal-testing-build' (#86) from internal-testing-build into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/86
|
2025-12-17 11:10:43 +00:00 |
|
Le Duc Anh
|
107c5a3631
|
add VFX
|
2025-12-17 18:07:46 +07:00 |
|
Le Duc Anh
|
93d0cbd634
|
show UI task
|
2025-12-17 17:32:01 +07:00 |
|
NguyenVanDat
|
818b1589d4
|
Merge branch 'develop' into feature/task-emote
|
2025-12-17 17:31:15 +07:00 |
|
NguyenVanDat
|
58b3c3640a
|
update log
|
2025-12-17 17:30:27 +07:00 |
|
hoangvd
|
aef206900f
|
Merge pull request 'feature/skill-data' (#85) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/85
|
2025-12-17 10:22:53 +00:00 |
|
VDH
|
04cbdb4934
|
Merge branch 'develop' into feature/skill-data
|
2025-12-17 17:18:28 +07:00 |
|
VDH
|
ab7051b2ca
|
done fix anim npc and hostplayer attack anim
|
2025-12-17 17:17:16 +07:00 |
|
NguyenVanDat
|
1bc54fa74a
|
fix pose action
|
2025-12-17 17:16:55 +07:00 |
|
Le Duc Anh
|
949e815680
|
Merge remote-tracking branch 'origin/develop' into internal-testing-build
|
2025-12-17 15:51:49 +07:00 |
|
Le Duc Anh
|
7f145625fd
|
temporary stop loading the data files
|
2025-12-17 15:50:26 +07:00 |
|
HungDK
|
664fd9c41d
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-12-17 15:07:01 +07:00 |
|
HungDK
|
82d40516cb
|
Fix incorrect ui value symbol display
|
2025-12-17 15:06:57 +07:00 |
|
NguyenVanDat
|
220d1792a3
|
Merge branch 'develop' into feature/task-emote
|
2025-12-17 14:41:00 +07:00 |
|
NguyenVanDat
|
44302acb53
|
Merge branch 'implement_task_UI' into feature/task-emote
|
2025-12-17 14:40:33 +07:00 |
|
Le Duc Anh
|
2b84911a68
|
optimize loading
|
2025-12-17 14:20:23 +07:00 |
|
NguyenVanDat
|
c118781f85
|
add logic to wave hand button
|
2025-12-17 14:18:10 +07:00 |
|
NguyenVanDat
|
074c4e9bc3
|
remove not use log
|
2025-12-17 14:06:12 +07:00 |
|
Le Duc Anh
|
a7186f3d37
|
move tasks file to persistent path
|
2025-12-17 13:53:51 +07:00 |
|
HungDK
|
823479d3fb
|
Add raycast to collect matter
|
2025-12-17 12:36:50 +07:00 |
|
tungdv
|
c15f7f4e36
|
Merge pull request 'fix: update icon jump btn.' (#83) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/83
|
2025-12-17 05:07:40 +00:00 |
|
Tungdv
|
e2ca56054c
|
fix: update icon jump btn.
|
2025-12-17 12:07:09 +07:00 |
|
NguyenVanDat
|
7caea6cc3d
|
add action button
|
2025-12-17 11:50:26 +07:00 |
|
NguyenVanDat
|
b7e8533ebf
|
Merge branch 'develop' into feature/task-emote
|
2025-12-17 11:45:21 +07:00 |
|
HungDK
|
9effcf2673
|
Add task btn
|
2025-12-17 11:41:40 +07:00 |
|
NguyenVanDat
|
a7c22eb396
|
Merge branch 'develop' into feature/task-emote
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-12-17 11:41:25 +07:00 |
|
NguyenVanDat
|
c91b2347cf
|
add emote icon
|
2025-12-17 11:38:01 +07:00 |
|
HungDK
|
585f92225e
|
Merge branch 'develop' into implement_task_UI
|
2025-12-17 11:37:07 +07:00 |
|
MinhHai
|
8dee1d3541
|
fix DlgTask prefab: change name
|
2025-12-17 11:23:10 +07:00 |
|
NguyenVanDat
|
52537d511c
|
Merge branch 'implement_task_UI' into feature/task-emote
|
2025-12-17 11:20:27 +07:00 |
|
HungDK
|
fa7b374442
|
Add task icon, correct show logic, dlg ui feature
|
2025-12-17 11:07:50 +07:00 |
|
MinhHai
|
2aed1dd794
|
Merge branch 'implement_task_UI' of https://git.brew.monster/Unity/perfect-world-unity into implement_task_UI
|
2025-12-17 10:49:35 +07:00 |
|
MinhHai
|
c15108fcf5
|
cache TaskTempl Data into SO
|
2025-12-17 10:49:19 +07:00 |
|
tungdv
|
6c0d3d80db
|
Merge pull request 'add button jump' (#82) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/82
|
2025-12-17 03:45:02 +00:00 |
|
Tungdv
|
f13f739a5a
|
fix: update button jump in scene a61.
|
2025-12-17 10:43:47 +07:00 |
|
Tungdv
|
eda56b6850
|
Merge remote-tracking branch 'origin/develop' into feature/HP_jump
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-12-17 10:41:27 +07:00 |
|
Tungdv
|
97bf433381
|
fix: update logic move on ground.
feat: add btn jump.
|
2025-12-17 10:40:29 +07:00 |
|
HungDK
|
e2324c634d
|
Add gametime
|
2025-12-17 10:01:03 +07:00 |
|
NguyenVanDat
|
07b6009568
|
Merge branch 'develop' into feature/task-emote
|
2025-12-17 09:44:36 +07:00 |
|
Le Duc Anh
|
7edb881cb3
|
add matte morel
|
2025-12-16 20:13:56 +07:00 |
|
Le Duc Anh
|
84e32e56b3
|
add protocol
|
2025-12-16 19:35:42 +07:00 |
|
NguyenVanDat
|
d8c4bd5e4c
|
Merge branch 'implement_task_UI' into feature/task-emote
|
2025-12-16 18:28:53 +07:00 |
|