Commit Graph

1037 Commits

Author SHA1 Message Date
HungDK ea2ad61ffb Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-26 11:50:10 +07:00
Tungdv 9aa995d504 fix: fix bug auto move when click on screen. 2025-12-26 11:49:28 +07:00
HungDK 3b25abbc8b Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-26 11:49:23 +07:00
HungDK f95e9813aa Load addressable file update 2025-12-26 11:42:24 +07:00
HungDK e9042d2da9 Move file to addressable, add to group 2025-12-26 11:41:49 +07:00
hoangvd 6dd01ddbe6 Merge pull request 'feature/TaskThread' (#97) from feature/TaskThread into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/97
2025-12-26 03:25:58 +00:00
VDH 3a74b3c802 set addresable again 2025-12-26 10:23:42 +07:00
VDH 2cd0306744 Merge branch 'develop' into feature/TaskThread
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/configuration.asset
2025-12-26 10:22:37 +07:00
VDH 31bea39877 st 2025-12-26 10:16:25 +07:00
VDH 5ae2e1c333 fix not addresable 2025-12-26 10:15:12 +07:00
HungDK ce2d81a43f Change load addressable script 2025-12-26 10:10:17 +07:00
HungDK dd3134971d Add config text file to addressable group 2025-12-26 10:09:23 +07:00
HungDK 91213335d7 Move config text file to addressable 2025-12-26 10:08:51 +07:00
tungdv b3f67c4caf Merge pull request 'update logic jump HP on ground.' (#96) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/96
2025-12-25 11:16:54 +00:00
Tungdv 9926f8956c Merge branch 'develop' into feature/HP_jump 2025-12-25 18:15:49 +07:00
Tungdv b766229425 fix: update logic jump HP on ground. 2025-12-25 18:13:21 +07:00
VDH 6226f68cae task addresable 2025-12-25 17:50:40 +07:00
VDH 7370ac2865 Merge branch 'develop' into feature/TaskThread
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/configuration.asset
#	Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
2025-12-25 16:50:18 +07:00
HungDK df55d27c1c Add elements and shop data addressable 2025-12-25 16:41:50 +07:00
HungDK 325e1e25b6 Update Addressable manager 2025-12-25 16:41:11 +07:00
HungDK c432556ec8 Update MallUI.prefab 2025-12-25 16:40:27 +07:00
HungDK 06bbdbb42e Rremove old load file by dir 2025-12-25 16:40:21 +07:00
HungDK bd3e443d04 Change and move data file to correct directory 2025-12-25 16:39:43 +07:00
VDH a72cb120ff task addreasble 2025-12-25 16:35:28 +07:00
Le Duc Anh c0541f562d use Stream instead of FileStream 2025-12-25 10:50:39 +07:00
Le Duc Anh 9dc74c7346 change function name 2025-12-25 10:08:27 +07:00
Le Duc Anh 3bf8e3f841 change function name 2025-12-25 10:08:03 +07:00
Le Duc Anh d4a181f379 load text asset 2025-12-25 10:06:21 +07:00
Le Duc Anh cd3c9d8f48 configuration asset group 2025-12-25 09:15:58 +07:00
Tungdv f03425d5d8 fix: update code logic jump (error in line 392 check normal) 2025-12-24 19:34:44 +07:00
Le Duc Anh ba30b37c06 #if UNITY_EDITOR 2025-12-24 18:05:54 +07:00
Le Duc Anh 266b48ba8a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-24 16:56:01 +07:00
Le Duc Anh 238910f689 add GFX attack 2025-12-24 16:55:37 +07:00
tungdv 0650f5fa4b Merge pull request 'update logic move on ground.' (#95) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/95
2025-12-24 09:55:02 +00:00
Tungdv b7ab7bc8c4 Merge remote-tracking branch 'origin/develop' into feature/HP_jump 2025-12-24 16:53:33 +07:00
Tungdv f9750f7791 fix: update logic move on ground. 2025-12-24 16:53:14 +07:00
HungDK 9e65e01b7c Reapply "Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop"
This reverts commit 2d6a15eb40.
2025-12-24 15:06:43 +07:00
HungDK 2d6a15eb40 Revert "Merge pull request 'Update Prefabs Inventory UI, add drag-and-drop equipment functionality.' (#77) from feature/color-text into develop"
This reverts commit 59b66967e8, reversing
changes made to e62b2d9e3a.
2025-12-24 13:45:34 +07:00
hoangvd 07295118d3 Merge pull request 'feature/loopanimation' (#94) from feature/loopanimation into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/94
2025-12-24 02:52:48 +00:00
VDH e5e3f35559 fix bug anim npc monster 2025-12-24 09:50:38 +07:00
VDH 4b75e854f3 Merge branch 'develop' into feature/loopanimation
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scenes/a61.unity
2025-12-23 17:55:21 +07:00
VDH 9dc80fe5f0 bo debug 2025-12-23 17:47:47 +07:00
VDH 824f713c37 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-23 17:33:14 +07:00
VDH 2b12799546 fix npc double 2025-12-23 17:33:09 +07:00
MinhHai 99a883f60a remove TaskTask from a61 2025-12-23 17:02:32 +07:00
MinhHai 321cf6505f Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-12-23 17:00:36 +07:00
MinhHai 22b675ece7 fix cache task: add [Serializable] for structs 2025-12-23 16:55:27 +07:00
NguyenVanDat 287480c640 clear not use code 2025-12-23 16:53:24 +07:00
NguyenVanDat 650777dc26 Merge branch 'develop' into feature/do-emote-else-player 2025-12-23 16:47:17 +07:00
NguyenVanDat d3c3f1ff50 finished fix else player emote 2025-12-23 16:45:55 +07:00