Commit Graph

237 Commits

Author SHA1 Message Date
hungdk bb936abd8f Merge pull request 'feature/skill-data' (#129) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/129
2026-01-20 08:20:04 +00:00
VDH 5d0f69ab34 done ui cap phep 2026-01-20 10:53:12 +07:00
VuNgocHaiC7 6266fab039 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-19 18:03:35 +07:00
VuNgocHaiC7 ac3d77c3e2 update detail item of dlgProduce.prefab 2026-01-19 18:02:50 +07:00
VDH 1d43192fb1 Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
2026-01-19 16:22:53 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +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
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
VDH 5fc98befea skill ui Process 2026-01-16 18:01:33 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
VuNgocHaiC7 2f6e3c751d update quantity inc, dec, max 2026-01-16 17:28:55 +07:00
Chomper9981 1564586daa add default state for item creatation. 2026-01-16 16:33:30 +07:00
Chomper9981 c069cba784 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-16 13:36:31 +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
VuNgocHaiC7 54a178ec75 update detail and status produce items 2026-01-15 17:03:29 +07:00
HungDK dd96ccd0ed Add request server to produce item 2026-01-15 15:05:22 +07:00
VDH 1624864487 Merge branch 'develop' into feature/skill-data 2026-01-15 13:33:42 +07:00
VuNgocHaiC7 39079f9804 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-15 00:25:41 +07:00
VuNgocHaiC7 4bc9a18f01 update load data for UI but Tab Btn not active 2026-01-15 00:25:19 +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 b26e76b92f fix cant choose npc in first section 2026-01-14 17:30:37 +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
VuNgocHaiC7 16e4b2117f Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-14 15:04:13 +07:00
Le Duc Anh 614ba545b0 switch to 3CGame server 2026-01-14 14:08:15 +07:00
HungDK 0cc744ad74 Add log data 2026-01-14 13:47:26 +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
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +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
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
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
HungDK ac574933b7 Add automove system and its work for a61 only 2026-01-10 12:11:05 +07:00
VDH 59f70616e9 ui upgrade processing 2026-01-09 18:15:09 +07:00
Tungdv f446e7ca5f Merge branch 'develop' into feature/hp_swim
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs
#	Assets/Scenes/a61.unity
2026-01-09 17:14:03 +07:00
Tungdv aaa9343b6e fix: update swim HP. 2026-01-09 17:06:53 +07:00
HungDK 37a9659216 Bind event to ui, refactor later 2026-01-09 15:19:29 +07:00
NguyenVanDat d0d7346a72 Merge branch 'develop' into feature/mine-processing
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-09 11:04:53 +07:00
NguyenVanDat 88213f7649 finish mining task 2026-01-09 11:01:03 +07:00
NguyenVanDat 570455afce add escape button (changed a61) 2026-01-09 09:38:51 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +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
VDH 0884ae338f convert skill 2026-01-07 18:30:57 +07:00
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +07:00
VDH 5471c68071 Merge branch 'develop' into feature/skill-data 2026-01-07 09:32:28 +07:00