Commit Graph

217 Commits

Author SHA1 Message Date
Tran Hai Nam 6e5e86e68d Add gfx when chane skill 2026-05-11 16:24:53 +07:00
Tran Hai Nam dda7b1c0db Fix annimation not loop 2026-05-11 11:00:04 +07:00
Le Duc Anh 5bf93a9d56 enable GPU instancing for all npc materials. Optimize rendering 2026-05-10 18:30:47 +07:00
vuong dinh hoang 8a97acbcc9 add gfx 2026-05-07 09:57:42 +07:00
vuong dinh hoang 29dc93e1aa Merge branch 'develop' into feature/gfx-action 2026-05-06 18:10:32 +07:00
vuong dinh hoang 832d818af8 fix gfx levelup 2026-05-06 18:10:08 +07:00
Tran Hai Nam 764f228ad8 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-06 17:44:26 +07:00
Tran Hai Nam d0ce925ae0 fix Charater SO proplem 2026-05-06 17:43:11 +07:00
vuong dinh hoang 8ba1f5fa6c for TiT 2026-05-06 15:15:45 +07:00
vuong dinh hoang 1ce524d306 done state gfx 2026-05-06 11:34:58 +07:00
vuong dinh hoang 2b5379b14e Merge branch 'develop' into feature/gfx-action 2026-05-06 09:26:26 +07:00
vuong dinh hoang b022532be1 add vfx 2026-05-05 18:02:34 +07:00
Tran Hai Nam 1341d6ca65 fix mưa tên gfx. 2026-05-04 14:37:08 +07:00
Le Duc Anh a60057af16 push ho a dac 2026-04-29 16:04:15 +07:00
Tran Hai Nam aacbb7c604 fix debug lag in new tools 2026-04-25 15:00:42 +07:00
Tran Hai Nam 09abdad53f fix null proplem of m_nType 2026-04-25 14:48:22 +07:00
HungDK 95b8bf70c4 Merge branch 'develop' into fixbug/npc-dialog 2026-04-23 14:40:49 +07:00
HungDK b251897a5f Add sfx, bgm theme 2026-04-23 14:34:43 +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
Tran Hai Nam af5e72c289 add Combineaction 2026-04-22 16:19:29 +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
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