Commit Graph

111 Commits

Author SHA1 Message Date
VDH 7aaed6d0d3 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
#	Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 09:55:39 +07:00
Le Duc Anh d6e4daeda2 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-31 18:20:34 +07:00
VDH 0de2995ab6 done ui action 2026-01-30 11:37:10 +07:00
VDH e2e63b83f2 convert ui code 2026-01-29 19:24:42 +07:00
VuNgocHaiC7 ccbe1b4a0c update feature useitem 2026-01-29 17:08:58 +07:00
Le Duc Anh c31adee89f use sprites for minimap 2026-01-28 19:33:09 +07:00
VDH 6dbc543188 done create new skill combo 2026-01-28 16:40:29 +07:00
Le Duc Anh b8d54ab6f7 Merge branch 'feature/mini-map' of https://git.brew.monster/Unity/perfect-world-unity into feature/mini-map 2026-01-28 09:55:19 +07:00
Le Duc Anh b21190fda8 update minimap textures 2026-01-28 09:52:20 +07:00
Le Duc Anh 8f4fc62426 Merge remote-tracking branch 'origin/develop' into feature/mini-map 2026-01-28 09:46:40 +07:00
VDH 7d9f75de18 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-23 18:08:51 +07:00
Chomper9981 46cfb747c6 add all item till level 20 through the quest for TIT(tien thu). fix the bug suite not count decoration data. 2026-01-23 09:31:55 +07:00
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
Le Duc Anh 75f45a85ef WIP: minmap 2026-01-22 14:58:14 +07:00
Chomper9981 98f792deb4 Add more item to display. fix the bug when load percent data. 2026-01-22 10:18:43 +07:00
VDH 1cdeb28367 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Skills/ElementSkill.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-21 17:51:54 +07:00
VDH 53190f3f61 convert skill bombo 2026-01-21 17:40:10 +07:00
Le Duc Anh 270ff4facb WIP: Mini map UI 2026-01-21 14:19:20 +07:00
Chomper9981 e903de108a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-20 16:32:36 +07:00
Chomper9981 273f353ddc add more item detail in inventory. Create some place holder for pet item so that those item can be shown 2026-01-20 16:31:57 +07:00
VDH 1d43192fb1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-19 16:22:53 +07:00
Chomper9981 093c257f74 Load more ItemType 2026-01-19 16:16:51 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
Tungdv 8b951d7f49 fix:
- update loop anim
- update time count in cmd cache.
2026-01-17 13:41:28 +07:00
Tungdv 15f9bd2a86 Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-01-16 19:16:40 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
Chomper9981 e37fbefad4 Add Suite ("Noi dung bo trang bi") to show with item in inventory. Rename some Variant that have confuse name in hostplayer. 2026-01-16 13:35:51 +07:00
Tungdv 017d26b64f feat: add command cache. 2026-01-15 19:22:30 +07:00
Chomper9981 22bf1bddcb add armor dialog for quest "chao hoi" 2026-01-12 15:52:09 +07:00
Chomper9981 a9157bac7c Merge branch 'develop' into update-in-game 2026-01-12 10:03:39 +07:00
Chomper9981 4c7217929d Complete add feature "Load weapon data" and show it in the "Quest Chao Hoi Lay Item" 2026-01-08 15:02:20 +07:00
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +07:00
Chomper9981 b00af6cb70 add some data to UI 2025-12-30 17:32:22 +07:00
Chomper9981 7909a09617 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2025-12-30 10:21:49 +07:00
Chomper9981 e504a077c1 Add itemdataman basic 2025-12-30 10:19:18 +07:00
VDH cc1f4a9556 ui skill for tesst 2025-12-29 17:32:48 +07:00
HungDK 325e1e25b6 Update Addressable manager 2025-12-25 16:41:11 +07:00
Le Duc Anh c0541f562d use Stream instead of FileStream 2025-12-25 10:50:39 +07:00
Le Duc Anh ba30b37c06 #if UNITY_EDITOR 2025-12-24 18:05:54 +07:00
VDH 76e66cafdb debug 2025-12-23 14:19:04 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
VDH 8f8e7f010c continue with bless skill 2025-12-02 13:50:44 +07:00
Le Duc Anh 466e39d67c Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-24 14:27:45 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-11-24 10:16:07 +07:00
Le Duc Anh edff7723d8 Load the elementdata for Android 2025-11-21 23:22:07 +07:00
Tungdv 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
Le Duc Anh c2e8829c85 PC build 2025-11-19 16:15:03 +07:00