 hainh
|
6d19cbbcf4
|
Merge pull request 'feature/update-ui' (#384) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/384
|
2026-04-23 09:50:34 +00:00 |
|
|
VuNgocHaiC7
|
5e1bf78bc9
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui
|
2026-04-23 16:49:32 +07:00 |
|
|
VuNgocHaiC7
|
329da335d9
|
fix when click role char then appear model char of it
|
2026-04-23 16:49:15 +07:00 |
|
|
namth
|
8a9fb6831e
|
Merge pull request 'fix bug give up task' (#383) from fixbug/fix-abandon-quest into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/383
|
2026-04-23 09:46:23 +00:00 |
|
|
Tran Hai Nam
|
b0bae98a93
|
fix bug give up task
|
2026-04-23 16:44:43 +07:00 |
|
|
hungdk
|
2d056ff40e
|
Merge pull request 'fixbug/npc-dialog' (#382) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/382
|
2026-04-23 07:41:32 +00:00 |
|
|
HungDK
|
95b8bf70c4
|
Merge branch 'develop' into fixbug/npc-dialog
|
2026-04-23 14:40:49 +07:00 |
|
|
HungDK
|
960af989d5
|
Update theme sfx
|
2026-04-23 14:37:21 +07:00 |
|
|
HungDK
|
b251897a5f
|
Add sfx, bgm theme
|
2026-04-23 14:34:43 +07:00 |
|
|
NguyenVanDat
|
2b67726f45
|
update logic attack too far
|
2026-04-23 14:28:35 +07:00 |
|
|
namth
|
81d9187ac8
|
Merge pull request 'fixbug/animation-loop' (#381) from fixbug/animation-loop into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/381
|
2026-04-22 10:08:57 +00:00 |
|
|
Tran Hai Nam
|
2b8c4f8124
|
fix bug after merge
|
2026-04-22 17:07:14 +07:00 |
|
|
hainh
|
292bed1cae
|
Merge pull request 'feature/update-ui' (#380) from feature/update-ui into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/380
|
2026-04-22 09:58:13 +00:00 |
|
|
VuNgocHaiC7
|
026286ac46
|
fix conflig
|
2026-04-22 16:57:25 +07:00 |
|
|
VuNgocHaiC7
|
100f93c2d8
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs
|
2026-04-22 16:27:08 +07:00 |
|
|
Tran Hai Nam
|
912518d2c9
|
1Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui
|
2026-04-22 16:25:34 +07:00 |
|
|
VuNgocHaiC7
|
690cdd29f1
|
fix change of textTotalSP and fix bug PW 174
|
2026-04-22 16:21:32 +07:00 |
|
|
Tran Hai Nam
|
af5e72c289
|
add Combineaction
|
2026-04-22 16:19:29 +07:00 |
|
|
cuongnv
|
b49899d413
|
Merge pull request 'update text chat in player prefab' (#379) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/379
|
2026-04-22 09:19:11 +00:00 |
|
|
Tran Hai Nam
|
f5dba37813
|
Add loop behavior via code to player animation
|
2026-04-22 15:58:28 +07:00 |
|
|
vuong dinh hoang
|
606c1ebfd5
|
remove logger
|
2026-04-22 15:46:11 +07:00 |
|
|
vuong dinh hoang
|
07b4134905
|
fix bug move to select character scene then enter world again then player can't learn new skills
|
2026-04-22 15:34:26 +07:00 |
|
|
CuongNV
|
da1a3cbac7
|
update text chat in player prefab
|
2026-04-22 14:11:18 +07:00 |
|
|
hoangvd
|
4ed178bb3c
|
Merge pull request 'hotfix/Can't-Learn-and-Upgrade-Skill' (#378) from hotfix/Can't-Learn-and-Upgrade-Skill into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/378
|
2026-04-22 06:57:15 +00:00 |
|
|
vuong dinh hoang
|
444609b50a
|
for build tool
|
2026-04-22 13:54:04 +07:00 |
|
|
VuNgocHaiC7
|
bd6d987b55
|
update change money for each service
|
2026-04-22 12:44:22 +07:00 |
|
|
vuong dinh hoang
|
a176f264dc
|
Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill
|
2026-04-22 10:50:00 +07:00 |
|
|
vuong dinh hoang
|
d6f87f6fdd
|
add music bg and embience
|
2026-04-22 10:49:18 +07:00 |
|
|
cuongnv
|
b8cb304b66
|
Merge pull request 'feature/combo-skill-short-cut' (#377) from feature/combo-skill-short-cut into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/377
|
2026-04-22 03:41:10 +00:00 |
|
|
CuongNV
|
513bed1283
|
Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut
|
2026-04-22 10:38:49 +07:00 |
|
|
hungdk
|
52ec6bc101
|
Merge pull request 'fixbug/npc-dialog' (#376) from fixbug/npc-dialog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/376
|
2026-04-22 03:38:27 +00:00 |
|
|
CuongNV
|
410e4522f9
|
update focus frame
|
2026-04-22 10:38:14 +07:00 |
|
|
HungDK
|
f1c06bfa19
|
Merge branch 'develop' into fixbug/npc-dialog
|
2026-04-22 10:37:40 +07:00 |
|
|
HungDK
|
3e3509ea99
|
Fix moving nonstop while auto routing
|
2026-04-22 10:37:25 +07:00 |
|
|
vuong dinh hoang
|
e0cbc4c302
|
Merge branch 'develop' into hotfix/Can't-Learn-and-Upgrade-Skill
# Conflicts:
# Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
# Assets/AddressableAssetsData/AddressableAssetSettings.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/music_BundledAssetGroupSchema.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/music_BundledAssetGroupSchema.asset.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas/music_ContentUpdateGroupSchema.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/music_ContentUpdateGroupSchema.asset.meta
# Assets/AddressableAssetsData/AssetGroups/music.asset
# Assets/AddressableAssetsData/AssetGroups/music.asset.meta
|
2026-04-21 17:35:08 +07:00 |
|
|
Le Duc Anh
|
fb07759606
|
add a temporary background music system. To be replaced later.
|
2026-04-21 17:32:01 +07:00 |
|
|
vuong dinh hoang
|
071ea098d7
|
add music
|
2026-04-21 17:11:00 +07:00 |
|
|
tungdv
|
3bdd0e0c78
|
Merge pull request 'fix bug auto move for EP' (#375) from feature/EP_fix_bug into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/375
|
2026-04-21 09:40:03 +00:00 |
|
|
Tungdv
|
aabbe085a3
|
Merge branch 'develop' into feature/EP_fix_bug
|
2026-04-21 16:38:51 +07:00 |
|
|
Tungdv
|
eb52277197
|
fix: fix bug move for EP.
|
2026-04-21 16:38:09 +07:00 |
|
|
namth
|
8077a26138
|
Merge pull request 'feature/item-percent-info' (#374) from feature/item-percent-info into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/374
|
2026-04-21 08:00:50 +00:00 |
|
|
Tran Hai Nam
|
aac787e2e0
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui
|
2026-04-21 15:00:20 +07:00 |
|
|
Tran Hai Nam
|
2f4b6d77da
|
Add %data for equipment
|
2026-04-21 14:57:43 +07:00 |
|
|
cuongnv
|
95dece9f43
|
Merge pull request 'feature/chat_01' (#373) from feature/chat_01 into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/373
|
2026-04-21 07:46:04 +00:00 |
|
|
CuongNV
|
bb363c521e
|
Merge remote-tracking branch 'origin/develop' into feature/chat_01
|
2026-04-21 14:44:27 +07:00 |
|
|
CuongNV
|
7dd3975ba6
|
update tool change prefabs
|
2026-04-21 14:43:26 +07:00 |
|
|
hoangvd
|
85fea3ab3e
|
Merge pull request 'remove debug' (#372) from hotfix/remove-debuglog into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/372
|
2026-04-21 07:39:12 +00:00 |
|
|
Tran Hai Nam
|
23d131b7f9
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui
|
2026-04-21 14:04:54 +07:00 |
|
|
vuong dinh hoang
|
284a77e4d2
|
remove debug
|
2026-04-21 11:43:07 +07:00 |
|
|
Le Duc Anh
|
3c380b67a8
|
add missing models
|
2026-04-21 11:29:24 +07:00 |
|