 VDH
|
a825db4122
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/Scenes/a61.unity
|
2025-12-29 17:39:33 +07:00 |
|
|
VDH
|
cc1f4a9556
|
ui skill for tesst
|
2025-12-29 17:32:48 +07:00 |
|
|
Le Duc Anh
|
ea0245bf7b
|
vfx attack
|
2025-12-29 17:16:43 +07:00 |
|
|
HungDK
|
8e52589c07
|
Add interact with npc, attack btn
|
2025-12-29 16:56:21 +07:00 |
|
|
HungDK
|
53f96ff6a4
|
Merge branch 'develop' into feature/addressable-data
|
2025-12-29 11:19:17 +07:00 |
|
|
HungDK
|
ad67f50131
|
Bind button
|
2025-12-29 11:18:23 +07:00 |
|
|
HungDK
|
70f2707989
|
Integrate to player and npc
|
2025-12-29 11:17:46 +07:00 |
|
|
NguyenVanDat
|
266d751bb1
|
Merge branch 'develop' into feature/mine-processing
|
2025-12-29 09:26:26 +07:00 |
|
|
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 |
|
|
NguyenVanDat
|
668a2aacd1
|
Merge branch 'develop' into feature/mine-processing
|
2025-12-26 11:48:51 +07:00 |
|
|
NguyenVanDat
|
308c4c8b92
|
do logic host player mining
|
2025-12-26 11:47:55 +07:00 |
|
|
HungDK
|
f95e9813aa
|
Load addressable file update
|
2025-12-26 11:42:24 +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 |
|
|
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
|
325e1e25b6
|
Update Addressable manager
|
2025-12-25 16:41:11 +07:00 |
|
|
HungDK
|
06bbdbb42e
|
Rremove old load file by dir
|
2025-12-25 16:40:21 +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 |
|
|
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
|
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 |
|
|
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
|
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
|
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 |
|