Commit Graph

2140 Commits

Author SHA1 Message Date
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 513bed1283 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-22 10:38:49 +07: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 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
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 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
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
Tran Hai Nam 14066c41b1 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-21 11:27:52 +07:00
Tran Hai Nam 7aa7dddaab remove fallback log 2026-04-21 11:25:38 +07:00
HungDK da0dfbd001 Merge branch 'develop' into fixbug/npc-dialog 2026-04-21 10:55:36 +07:00
HungDK c9aef9d68d Fix clean request logout1 2026-04-21 10:53:17 +07:00
Chomper9981 d1bcefd953 update logic select skill 2026-04-21 10:52:00 +07:00
Le Duc Anh e8f4520ff4 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-21 10:41:11 +07:00
Le Duc Anh 6dafbf56ca remove sfx wav subfix. Update some NRE cases 2026-04-21 10:41:04 +07:00
CuongNV 81fa75ca95 fix combo skill 2026-04-20 19:33:37 +07:00
Le Duc Anh 8f921fda4f update world map 2026-04-20 17:08:04 +07:00
Tran Hai Nam 16001d78e8 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-20 16:58:18 +07:00
Tran Hai Nam 37c329fbb8 remove .wav 2026-04-20 16:53:24 +07:00
CuongNV 85417fe8ed Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-20 15:24:35 +07:00
CuongNV 088d7c4cb2 update prefabs matter 2026-04-20 15:23:43 +07:00
Chomper9981 a3c2f478ef Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 14:44:07 +07:00
CuongNV 6c468115a5 Merge remote-tracking branch 'origin/develop' into feature/chat_01 2026-04-20 14:37:52 +07:00
CuongNV d30a3d5e99 update code hide popup before 2026-04-20 14:37:28 +07:00
Chomper9981 2bf643fca9 fix equipment percent proplem 2026-04-20 14:21:27 +07:00
Chomper9981 cab1d5d962 fix ObjectCoord bug in TaskTrace 2026-04-20 14:20:33 +07:00
CuongNV 90e0961a47 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-20 14:12:57 +07:00
CuongNV 48548d23cc fix bug dont show icon skill 2026-04-20 14:12:28 +07:00
NguyenVanDat 6859486b32 update edit combo 2026-04-20 11:41:15 +07:00
CuongNV 6f81209da6 resize mini chat 2026-04-20 11:40:43 +07:00
VDH 8167f7887a fix skill 2026-04-20 11:28:41 +07:00
CuongNV 6c15eb0192 Merge branch 'develop' into feature/chat_01 2026-04-20 11:17:45 +07:00
CuongNV 3ea1518cc0 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-20 11:14:34 +07:00
CuongNV ef632e7f11 update icon combo 2026-04-20 11:11:23 +07:00
Chomper9981 fd7f7f85f8 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 10:17:43 +07:00
Chomper9981 db888586e5 fix anim double call proplem. fix kK idle anime 2026-04-20 10:17:25 +07:00
NguyenVanDat 47f16af3f6 check limit matter collider size 2026-04-20 09:45:40 +07:00
Chomper9981 e5a5140035 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-20 09:17:48 +07:00
Tungdv 12ecb7dcb4 fix: fix crash on mobile when enter world. 2026-04-18 17:40:33 +07:00
Le Duc Anh fd08797f4a update router 2026-04-18 16:45:13 +07:00