VDH
|
5ae2e1c333
|
fix not addresable
|
2025-12-26 10:15:12 +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 |
|
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 |
|
tungdv
|
0799126d65
|
Merge pull request 'add layer terrain in spawn.' (#93) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/93
|
2025-12-23 09:42:49 +00:00 |
|
Tungdv
|
a56a08a32d
|
fix: add layer terrain in spawn.
|
2025-12-23 16:41:19 +07:00 |
|
tungdv
|
59c54524ba
|
Merge pull request 'revert code test jump' (#92) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/92
|
2025-12-23 09:26:31 +00:00 |
|
Tungdv
|
8f0db86196
|
Merge branch 'develop' into feature/HP_jump
|
2025-12-23 16:25:41 +07:00 |
|
Tungdv
|
98629962b4
|
fix: revert code test.
|
2025-12-23 16:23:59 +07:00 |
|
HungDK
|
94be062918
|
Merge branch 'develop' into feature/life-skill
|
2025-12-23 16:18:59 +07:00 |
|
tungdv
|
7cb2b7c2cb
|
Merge pull request 'test fix jump HP on ground' (#91) from feature/HP_jump into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/91
|
2025-12-23 08:41:56 +00:00 |
|
Tungdv
|
ec85ba4f51
|
fix: delete log.
|
2025-12-23 15:40:57 +07:00 |
|
Tungdv
|
63bdf4f045
|
Merge remote-tracking branch 'origin/develop' into feature/HP_jump
|
2025-12-23 15:38:20 +07:00 |
|
Tungdv
|
165842c4f9
|
fix: test fix jump HP on ground.
|
2025-12-23 15:37:02 +07:00 |
|
HungDK
|
4b4c544898
|
Merge branch 'develop' into feature/life-skill
|
2025-12-23 14:27:14 +07:00 |
|
HungDK
|
6d5b905c61
|
Fix pickup money
|
2025-12-23 14:23:48 +07:00 |
|
VDH
|
76e66cafdb
|
debug
|
2025-12-23 14:19:04 +07:00 |
|
HungDK
|
ffb88a57ea
|
Add pickup item, gather logic of movement, anim
|
2025-12-23 10:31:20 +07:00 |
|
Le Duc Anh
|
f3290a2660
|
enable bloom
|
2025-12-22 22:41:55 +07:00 |
|
Le Duc Anh
|
f3e1d2c7c5
|
add sword hit vfx
|
2025-12-22 22:40:00 +07:00 |
|