Commit Graph

197 Commits

Author SHA1 Message Date
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
CuongNV 7dd3975ba6 update tool change prefabs 2026-04-21 14:43:26 +07:00
Le Duc Anh 3c380b67a8 add missing models 2026-04-21 11:29:24 +07:00
CuongNV 088d7c4cb2 update prefabs matter 2026-04-20 15:23:43 +07:00
Chomper9981 db888586e5 fix anim double call proplem. fix kK idle anime 2026-04-20 10:17:25 +07:00
Chomper9981 7ac9721f3c Add sfx to skill trigger 2026-04-17 16:55:36 +07:00
Chomper9981 813748be38 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-16 15:58:16 +07:00
Chomper9981 a2f6941df7 Add white tiger anim 2026-04-16 15:57:43 +07:00
Le Duc Anh c58e03fe7c Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-16 15:53:10 +07:00
Le Duc Anh f40fdcca4b add sfx to addressable and fix their path names 2026-04-16 15:52:50 +07:00
Chomper9981 c2c546fee0 fix mage model 2026-04-16 15:40:43 +07:00
Chomper9981 15331b4e90 fix ui after merge 2026-04-16 15:37:07 +07:00
Chomper9981 97bb1f97d4 Add A3DCombinedAction logic 2026-04-16 15:30:52 +07:00
Le Duc Anh d97bde89f4 update models 2026-04-13 17:33:06 +07:00
HungDK c70b752c19 Merge branch 'develop' into fixbug/npc-dialog 2026-04-13 16:31:23 +07:00
Le Duc Anh 8f1b34a790 add missing model 3D 2026-04-13 15:55:57 +07:00
Chomper9981 a9c3be19f1 fix after merge 2026-04-13 15:16:28 +07:00
HungDK 7b66b5e37c Add model, vfx to task lv8 2026-04-13 14:46:06 +07:00
Le Duc Anh 701e06c1e8 add missing monster model 2026-04-13 11:41:00 +07:00
Le Duc Anh ccc13db1e7 add model relate to level 19 tasks 2026-04-12 21:38:34 +07:00
Le Duc Anh 7e563d6c65 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-11 16:05:57 +07:00
Le Duc Anh 0309e0674b update a69 colliders 2026-04-11 16:04:09 +07:00
VDH 5da2b32919 Merge branch 'develop' into fix-bug/spawn-multiple-fly-gfx 2026-04-10 16:36:25 +07:00
VDH ea56a82b5c done gfx sound 2026-04-10 16:35:07 +07:00
anhld 08e5fc1d68 Merge pull request 'Show preview for character when create new char' (#327) from feature/show-preview-create-char-screen into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/327
2026-04-10 08:44:46 +00:00
Le Duc Anh 1a1c26cf03 Show preview for character when create new char 2026-04-10 15:35:58 +07:00
VuNgocHaiC7 d6d248a78f Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/coordinates_weapon 2026-04-10 14:46:54 +07:00
VuNgocHaiC7 2a0b40f227 fix prefabs weapons 2026-04-10 14:46:12 +07:00
Chomper9981 617ec486b5 Fix some UI element 2026-04-09 16:29:13 +07:00
Le Duc Anh 4017df3037 update animation for npc12 2026-04-09 14:28:25 +07:00
Le Duc Anh 168c4c6191 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-09 14:27:16 +07:00
VuNgocHaiC7 089a9764d8 fix coordinates for weapons 2026-04-08 17:38:25 +07:00
Le Duc Anh 4022224936 loop walking animation with long weapon 2026-04-08 15:09:14 +07:00
Le Duc Anh fa98c5b76c rotate weapon 2026-04-08 11:31:45 +07:00
Chomper9981 131fb322f2 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-06 13:39:58 +07:00
Chomper9981 ff03d7d0eb Add Animation phoenix fly in the lv 10 quest. 2026-04-06 13:39:39 +07:00
Le Duc Anh 8e2c565583 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into develop 2026-04-03 16:33:49 +07:00
Le Duc Anh 20c1a7cfc4 add char preview in login screen 2026-04-03 16:33:30 +07:00
Chomper9981 c53ba56b82 Add VM GFX,. Add some UI for skillUI 2026-04-02 15:26:16 +07:00
Chomper9981 dc7831d537 Merge 4 2026-04-01 18:01:11 +07:00
Chomper9981 85ef52b897 Merge 3 2026-04-01 18:00:44 +07:00
Chomper9981 291f9a094b Merge 2 2026-04-01 18:00:13 +07:00
Chomper9981 4144077219 Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-04-01 17:59:31 +07:00
Chomper9981 4fd2efa588 Fix some minor bug. Add some addreasable and UI component 2026-04-01 17:41:42 +07:00
Le Duc Anh 220158635e modify a69 collider bursh 2026-03-30 14:51:07 +07:00
Le Duc Anh b29aec673b update a 69 model 2026-03-30 14:12:18 +07:00
Le Duc Anh 4337001a2c add Tien Thu equipments 2026-03-19 15:46:52 +07:00
Le Duc Anh bd2fe1d4f3 add hair model TiT 2026-03-18 17:19:37 +07:00