CuongNV
|
ab64409964
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-27 10:23:12 +07:00 |
|
VDH
|
688f722610
|
Merge branch 'develop' into feature/refactor-SkillUI
|
2026-03-26 09:50:10 +07:00 |
|
CuongNV
|
2fee354738
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-26 09:46:34 +07:00 |
|
Chomper9981
|
8da1e7c9fc
|
add delay for animation
|
2026-03-25 14:19:22 +07:00 |
|
Chomper9981
|
31abea6e9b
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui
|
2026-03-25 11:20:20 +07:00 |
|
Chomper9981
|
0dfff3a4ae
|
Add animation for skill
|
2026-03-25 11:19:48 +07:00 |
|
HungDK
|
2ef8ec179a
|
Update shop and inventory
|
2026-03-25 10:35:58 +07:00 |
|
HungDK
|
5f97ad0bc8
|
Update prevent inappropriate word
|
2026-03-25 10:31:49 +07:00 |
|
HungDK
|
445ff4ae62
|
Fix dead and revive error before enter world
|
2026-03-25 10:31:24 +07:00 |
|
VuNgocHaiC7
|
11600180d4
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
|
2026-03-24 16:13:00 +07:00 |
|
VuNgocHaiC7
|
5b52e17ef4
|
update money when buy item and manufacturing, pethatch, petrec
|
2026-03-24 16:11:43 +07:00 |
|
VDH
|
b4f5cf9a55
|
Merge branch 'develop' into feature/refactor-SkillUI
|
2026-03-24 16:01:48 +07:00 |
|
CuongNV
|
81f674ae10
|
add show update error in chat
|
2026-03-24 15:53:37 +07:00 |
|
CuongNV
|
17b30ff68d
|
add filter show UI
|
2026-03-24 15:02:26 +07:00 |
|
CuongNV
|
d21236aec7
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-24 14:34:49 +07:00 |
|
CuongNV
|
7c9a163861
|
add update UI filter
|
2026-03-24 12:27:44 +07:00 |
|
CuongNV
|
19820fcf2a
|
Add filter ui chat
|
2026-03-24 10:58:19 +07:00 |
|
Chomper9981
|
281690316a
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-task-trace
|
2026-03-24 10:53:46 +07:00 |
|
Chomper9981
|
1f0da3b665
|
Add UI for Buff Icons. Refactor the UI Image Picture
|
2026-03-24 10:53:05 +07:00 |
|
VDH
|
b315814856
|
Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2026-03-24 09:45:26 +07:00 |
|
VuNgocHaiC7
|
de0fc2b0ee
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
|
2026-03-23 18:00:14 +07:00 |
|
VuNgocHaiC7
|
1004d64457
|
fix again some UI and update money when buy item
|
2026-03-23 17:59:11 +07:00 |
|
HungDK
|
d962c70801
|
fix bug fly gfx don't be destroyed
|
2026-03-23 16:26:40 +07:00 |
|
NguyenVanDat
|
83f339bd70
|
upate filter logic
|
2026-03-23 15:51:22 +07:00 |
|
NguyenVanDat
|
93519b7f2e
|
add tool test badword
|
2026-03-23 11:03:47 +07:00 |
|
NguyenVanDat
|
b034c0b19e
|
Merge branch 'develop' into feature/world-filter
|
2026-03-23 10:50:32 +07:00 |
|
NguyenVanDat
|
f87dcbd7f8
|
add badword filter version 1
|
2026-03-23 10:46:10 +07:00 |
|
VuNgocHaiC7
|
0ff167624b
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
|
2026-03-20 16:47:23 +07:00 |
|
VuNgocHaiC7
|
65afe04918
|
update money in inventory when pickup money and button confirm dlgAwarld for item_info setActive false
|
2026-03-20 16:47:14 +07:00 |
|
Chomper9981
|
ee75334b1d
|
fix task trace position
|
2026-03-20 16:16:17 +07:00 |
|
Le Duc Anh
|
f627c5e6a7
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop
|
2026-03-20 15:08:41 +07:00 |
|
Le Duc Anh
|
ca49c2b1c5
|
camera controller option 2
|
2026-03-20 15:07:59 +07:00 |
|
Tungdv
|
b6defe44c6
|
Merge branch 'develop' into feature/elseplayer
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
|
2026-03-20 14:49:48 +07:00 |
|
Tungdv
|
3a8507c15b
|
fix: update rotation camera.
|
2026-03-20 14:40:50 +07:00 |
|
Chomper9981
|
eef47bd6b4
|
fix null proplem in quickBar
|
2026-03-20 14:16:04 +07:00 |
|
VDH
|
ac6c4d1fc4
|
update tool cheat
|
2026-03-20 14:00:45 +07:00 |
|
namth
|
b0e3aa4b43
|
Merge pull request 'feature/task-trace-ui' (#261) from feature/task-trace-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/261
|
2026-03-20 03:07:06 +00:00 |
|
VuNgocHaiC7
|
f290d44d13
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/friend_ui
|
2026-03-19 17:54:21 +07:00 |
|
Chomper9981
|
8e4117e139
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-03-19 17:53:54 +07:00 |
|
VuNgocHaiC7
|
f9dbdc1c3c
|
fix ui for dlg FriendList
|
2026-03-19 17:50:49 +07:00 |
|
Chomper9981
|
bb107503ab
|
Change UI for TaskTrace. Add side bar for MainUI
|
2026-03-19 17:48:02 +07:00 |
|
CuongNV
|
06b4cd91ca
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2026-03-19 16:53:59 +07:00 |
|
CuongNV
|
221c6ad364
|
change prefab chatsystem and update logic button channel
|
2026-03-19 16:52:49 +07:00 |
|
VDH
|
ae02046fc7
|
Merge branch 'develop' into feature/refactor-SkillUI
|
2026-03-19 16:01:05 +07:00 |
|
VDH
|
92852a28a0
|
add log for build
|
2026-03-19 16:00:31 +07:00 |
|
CuongNV
|
c484ade69b
|
add prefix for chat
|
2026-03-19 15:24:13 +07:00 |
|
CuongNV
|
664e5b2f74
|
Merge remote-tracking branch 'origin/develop' into feature/chat
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-19 14:24:21 +07:00 |
|
CuongNV
|
e2735a73f3
|
add scene bootstrap new prefab chat
|
2026-03-19 14:23:10 +07:00 |
|
cuongnv
|
4192582aad
|
Merge pull request 'Change UI Chat' (#256) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/256
|
2026-03-19 07:19:07 +00:00 |
|
VDH
|
dd36dde176
|
Merge branch 'develop' into feature/refactor-SkillUI
# Conflicts:
# Assets/PerfectWorld/Scene/Bootstrap.unity
|
2026-03-19 13:57:04 +07:00 |
|