Commit Graph

294 Commits

Author SHA1 Message Date
VDH 7091fb8d41 Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2026-02-02 10:28:42 +07:00
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
HungDK 793eb7c030 Merge branch 'develop' into feature/character_info 2026-02-02 09:43:23 +07:00
VDH e91a491444 get description skill 2026-02-02 09:40:39 +07:00
HungDK 53d2de6a6c Fetch player, player's info in search panel 2026-02-02 09:25:11 +07:00
Tungdv ef894f6e49 fix: update logic pet. 2026-01-31 19:23:50 +07:00
VuNgocHaiC7 8f916ee88c use item but cooldown don't active 2026-01-29 13:58:15 +07:00
Tungdv ef07a39964 fix: update logic dlg pet. 2026-01-28 19:31:14 +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
Chomper9981 98f792deb4 Add more item to display. fix the bug when load percent data. 2026-01-22 10:18:43 +07:00
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +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
VDH 1624864487 Merge branch 'develop' into feature/skill-data 2026-01-15 13:33:42 +07:00
Chomper9981 785bcbbc26 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-14 18:27:12 +07:00
VDH a0d80146bd Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-14 18:14:58 +07:00
VDH 57b5195c36 done learn and upgrade skill 2026-01-14 18:00:30 +07:00
Chomper9981 dfc8afdf9d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-14 17:35:56 +07:00
Tungdv c9b5b003b9 Merge remote-tracking branch 'origin/develop' into feature/hp_swim 2026-01-14 16:48:43 +07:00
Tungdv 007c23599d fix: update logic anim fly HP. 2026-01-14 16:48:00 +07:00
Le Duc Anh b400cc5af3 load wing types 2026-01-14 16:36:25 +07:00
Chomper9981 5246829473 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-14 15:22:43 +07:00
Tungdv 425698dd79 fix: update pos camera in HP. 2026-01-13 18:34:59 +07:00
VDH f5a9227cc7 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Prefabs/BoostrapForTest.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 18:04:28 +07:00
Tungdv 986bb52897 fix: update fly hp 2026-01-13 16:24:58 +07:00
VDH 6066e851a4 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2026-01-13 11:04:28 +07:00
VDH 436df8d820 for tesst 2026-01-13 10:55:51 +07:00
Tungdv 8c9f1d401a Merge remote-tracking branch 'origin/develop' into feature/hp_swim 2026-01-12 19:23:59 +07:00
Tungdv 11eb224dc0 fix: update logic fly HP (Send cmd to server). 2026-01-12 19:23:09 +07:00
VDH 61f4660dba done flow learn skill 2026-01-12 19:07:37 +07:00
Chomper9981 89d1902a39 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-12 15:59:46 +07:00
Tungdv 6a8274db30 fix: update logic fly. 2026-01-10 16:38:15 +07:00
HungDK ac574933b7 Add automove system and its work for a61 only 2026-01-10 12:11:05 +07:00
Tungdv aaa9343b6e fix: update swim HP. 2026-01-09 17:06:53 +07:00
Tungdv 951022b164 fix: update logic swim HP. 2026-01-08 19:52:12 +07:00
Chomper9981 97b763f655 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-08 15:07:35 +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
Tungdv f9b9432f20 fix: update logic swim hp. 2026-01-06 19:04:58 +07:00
Tungdv f2acc5ca2e fix: update swim hp. 2026-01-05 18:44:57 +07:00
Tungdv a4316bfd7d fix: update logic swim hp. 2025-12-31 17:19:04 +07:00
Tungdv 8508ad873f fix: update logic swim. 2025-12-31 15:09:10 +07:00
NguyenVanDat 308c4c8b92 do logic host player mining 2025-12-26 11:47:55 +07:00
Tungdv b766229425 fix: update logic jump HP on ground. 2025-12-25 18:13:21 +07:00
Tungdv f03425d5d8 fix: update code logic jump (error in line 392 check normal) 2025-12-24 19:34:44 +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
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
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