Commit Graph

252 Commits

Author SHA1 Message Date
NguyenVanDat a64b5ab79f Merge branch 'develop' into feature/embed-stone 2026-01-26 11:05:56 +07:00
NguyenVanDat b64b08ab06 show gold need to embed stone 2026-01-26 09:51:10 +07:00
Chomper9981 035f313e00 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-23 17:38:52 +07:00
Chomper9981 366a1a8cec Change Task UI tree. (Add color, add tree space) 2026-01-23 17:38:31 +07:00
VuNgocHaiC7 3b0068cfc6 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-23 14:13:19 +07:00
VuNgocHaiC7 ca84a98d31 completed task icon head NPC 2026-01-23 14:10:56 +07:00
HungDK 7640bbadc2 Merge branch 'develop' into feature/creating-role 2026-01-22 16:37:59 +07:00
HungDK 8e29de3d13 Add create role complete callback 2026-01-22 16:19:44 +07:00
HungDK db1656973b Add s_bShowMale auto asign gender by prof 2026-01-22 16:15:59 +07:00
HungDK 82c33c5d6e Add OnCreateCharacterComplete update ui, data 2026-01-22 10:07:37 +07:00
HungDK 2244c8b73c Add create role ui 2026-01-21 19:16:49 +07:00
VuNgocHaiC7 de36b370d6 complete UI DlgInstall.prefab 2026-01-21 17:37:35 +07:00
VuNgocHaiC7 312d03f3e5 update ui DlgInstall.prefab 2026-01-21 16:40:25 +07:00
VuNgocHaiC7 2bb18644dd Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-21 14:13:23 +07:00
VuNgocHaiC7 0ca50d5475 update feature icon task on head NPC ( not yet completed ) 2026-01-21 14:12:23 +07:00
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