 CuongNV
|
c653f7ff62
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
# Conflicts:
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2026-03-31 09:40:10 +07:00 |
|
|
NguyenVanDat
|
35693f672d
|
update login flow
|
2026-03-31 09:05:07 +07:00 |
|
|
CuongNV
|
753bd65847
|
Active player
|
2026-03-30 17:37:35 +07:00 |
|
|
hoangvd
|
64cd2809f3
|
Merge pull request 'feature/move-after-cast-skill' (#277) from feature/move-after-cast-skill into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/277
|
2026-03-30 10:17:39 +00:00 |
|
|
VDH
|
503034bc26
|
Merge branch 'develop' into feature/move-after-cast-skill
|
2026-03-30 17:14:40 +07:00 |
|
|
VDH
|
014452258d
|
fix use skill can't move imidiately
|
2026-03-30 17:14:05 +07:00 |
|
|
CuongNV
|
f16df18a26
|
fixed editor pooling
|
2026-03-30 16:04:51 +07:00 |
|
|
CuongNV
|
6b3910a7cc
|
update font for text
|
2026-03-30 15:22:11 +07:00 |
|
|
CuongNV
|
1082803547
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-30 15:15:16 +07:00 |
|
|
CuongNV
|
358f78877f
|
clear chat when login out and optimal list chat
|
2026-03-30 15:14:50 +07:00 |
|
|
Le Duc Anh
|
220158635e
|
modify a69 collider bursh
|
2026-03-30 14:51:07 +07:00 |
|
|
Le Duc Anh
|
5668ffeec9
|
update a69 terrain
|
2026-03-30 14:13:10 +07:00 |
|
|
Le Duc Anh
|
b29aec673b
|
update a 69 model
|
2026-03-30 14:12:18 +07:00 |
|
|
CuongNV
|
1957f29ec2
|
change size height prefab_ChatSystemUI
|
2026-03-30 10:41:20 +07:00 |
|
|
CuongNV
|
c069469625
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-30 10:22:36 +07:00 |
|
|
Le Duc Anh
|
cc1bac5af4
|
obfuscate package
|
2026-03-30 10:16:17 +07:00 |
|
|
CuongNV
|
b8153be6c2
|
add chatSystem_flow
|
2026-03-27 11:39:31 +07:00 |
|
|
CuongNV
|
ab64409964
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-27 10:23:12 +07:00 |
|
|
CuongNV
|
ac07a96de4
|
add chat info player
|
2026-03-27 10:04:22 +07:00 |
|
|
HungDK
|
072d4e2177
|
Show 1 warning first then 10m each
|
2026-03-27 09:10:25 +07:00 |
|
|
HungDK
|
05adae4f21
|
Add health warning message
|
2026-03-27 09:10:20 +07:00 |
|
|
hoangvd
|
6fe87fe3cf
|
Merge pull request 'feature/refactor-SkillUI' (#276) from feature/refactor-SkillUI into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/276
|
2026-03-26 02:51:05 +00: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 |
|
|
namth
|
bd79aa8c82
|
Merge pull request 'feature/skill-animation' (#275) from feature/skill-animation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/275
|
2026-03-25 07:20:17 +00:00 |
|
|
Chomper9981
|
edca5e6bf3
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui
|
2026-03-25 14:19:38 +07:00 |
|
|
Chomper9981
|
8da1e7c9fc
|
add delay for animation
|
2026-03-25 14:19:22 +07:00 |
|
|
namth
|
2d0725a0ce
|
Merge pull request 'feature/skill-animation' (#274) from feature/skill-animation into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/274
|
2026-03-25 04:21:27 +00: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 |
|
|
hainh
|
f3e57850b6
|
Merge pull request 'update UIManager.prefab' (#273) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/273
|
2026-03-24 09:36:25 +00:00 |
|
|
VuNgocHaiC7
|
d666bbae1e
|
update UIManager.prefab
|
2026-03-24 16:34:51 +07:00 |
|
|
hainh
|
2012330242
|
Merge pull request 'feature/friend_ui' (#272) from feature/friend_ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/272
|
2026-03-24 09:15:09 +00: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
|
5d677cad1a
|
Revert "add rule AI"
This reverts commit ed9910f365.
|
2026-03-24 14:36:22 +07:00 |
|
|
CuongNV
|
d21236aec7
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-03-24 14:34:49 +07:00 |
|
|
namth
|
7e53b4ff7e
|
Merge pull request 'fixbug/fix-ui' (#271) from fixbug/fix-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/271
|
2026-03-24 07:26:37 +00:00 |
|
|
Chomper9981
|
2d2fb70b8c
|
Fix UI
|
2026-03-24 14:24:27 +07:00 |
|
|
Chomper9981
|
f9220e3f05
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui
|
2026-03-24 14:20:00 +07:00 |
|
|
Chomper9981
|
344ea4a131
|
Remove Resolve Dependency
|
2026-03-24 14:19:05 +07:00 |
|
|
CuongNV
|
ed9910f365
|
add rule AI
|
2026-03-24 12:28:56 +07:00 |
|
|
CuongNV
|
7c9a163861
|
add update UI filter
|
2026-03-24 12:27:44 +07:00 |
|
|
namth
|
5c31e3b92c
|
Merge pull request 'fix UI Bug aftermearge' (#270) from feature/buff-icons into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/270
|
2026-03-24 04:32:34 +00:00 |
|