Commit Graph

1651 Commits

Author SHA1 Message Date
VuNgocHaiC7 ba91bc6b6c code optimate v2 2026-04-26 02:11:31 +07:00
VuNgocHaiC7 ab36165a44 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/optimate 2026-04-25 18:05:53 +07:00
VuNgocHaiC7 efa4f9a00a fix code optimate for show char v1 2026-04-25 18:05:26 +07:00
namth 4a67b66192 Merge pull request 'tools/combine-action-so-auto-invert' (#389) from tools/combine-action-so-auto-invert into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/389
2026-04-25 08:01:43 +00:00
Tran Hai Nam 09abdad53f fix null proplem of m_nType 2026-04-25 14:48:22 +07:00
VuNgocHaiC7 f3fd0c4a88 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-25 13:49:00 +07:00
CuongNV a1531f1b32 Merge remote-tracking branch 'origin/develop' into feature/chat 2026-04-25 11:38:27 +07:00
NguyenVanDat b6db8ce972 force quit half when confirm log out 2026-04-25 11:12:01 +07:00
Tran Hai Nam f1acbaeceb Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-04-25 10:33:55 +07:00
Tran Hai Nam edc2dc4cf9 fix missing id in weapon sound 2026-04-25 10:33:19 +07:00
CuongNV 8f2b72839a Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-25 10:00:48 +07:00
Tran Hai Nam d43f50e826 Fix move sfx not stop 2026-04-24 17:49:20 +07:00
VuNgocHaiC7 229adf88a2 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/update-ui 2026-04-24 17:32:25 +07:00
VuNgocHaiC7 3aa1c4d7f3 update ui editbodychar.prefab 2026-04-24 17:32:04 +07:00
Tran Hai Nam d3a7983637 fix move sfx 2026-04-24 17:11:05 +07:00
CuongNV bc7f5be030 Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut 2026-04-24 16:27:50 +07:00
CuongNV 09b2a2b615 add set focus skill 2026-04-24 16:27:33 +07:00
vuong dinh hoang 58b0d9c8eb fix lost music background 2026-04-24 15:38:00 +07:00
Le Duc Anh dfb7874b88 travel on world map 2026-04-24 15:33:39 +07:00
Tran Hai Nam 43d2f7291a fix some sfx wrong path 2026-04-24 15:24:15 +07:00
Tran Hai Nam eadc742c8a add sfx for normal attack 2026-04-24 15:04:23 +07:00
vuong dinh hoang a83c12a2ef delay sound 2026-04-24 10:47:49 +07:00
Tran Hai Nam b0bae98a93 fix bug give up task 2026-04-23 16:44:43 +07: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
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
VuNgocHaiC7 026286ac46 fix conflig 2026-04-22 16:57:25 +07:00
CuongNV 100e734a0f Test preview chat for mobile 2026-04-22 16:32:58 +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
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
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 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