Commit Graph

1240 Commits

Author SHA1 Message Date
HungDK d4a571be87 Merge remote-tracking branch 'origin/develop' into feature/produce-equipment 2026-01-16 18:31:41 +07:00
HungDK ef362d6017 Merge branch 'develop' into feature/produce-equipment 2026-01-16 17:40:20 +07:00
VuNgocHaiC7 185cc451e5 Merge branch 'feature/produce-equipment' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment 2026-01-16 17:29:09 +07:00
VuNgocHaiC7 2f6e3c751d update quantity inc, dec, max 2026-01-16 17:28:55 +07:00
HungDK 3aca254fd4 Fix wrong cmd method name 2026-01-16 17:24:01 +07:00
namth 295f46c9e2 Merge pull request 'feature/item-data-man' (#124) from feature/item-data-man into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/124
2026-01-16 09:35:49 +00: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
hoangvd 97695562ef Merge pull request 'feature/skill-data' (#121) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/121
2026-01-15 06:46:39 +00:00
VDH 1624864487 Merge branch 'develop' into feature/skill-data 2026-01-15 13:33:42 +07:00
VDH 5462a3a79f save merge dev 2026-01-15 11:40:02 +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
namth 2866d490f5 Merge pull request 'feature/item-data-man' (#108) from feature/item-data-man into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/108
2026-01-14 11:32:24 +00: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
tungdv e9ea0dc959 Merge pull request 'update logic anim fly HP' (#120) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/120
2026-01-14 11:23:22 +00:00
VDH a0d80146bd Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/Scenes/a61.unity
2026-01-14 18:14:58 +07:00
VDH 8b2a00930b save prefab 2026-01-14 18:14:17 +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
Chomper9981 9167c63229 remove Lingq code 2026-01-14 17:34:27 +07:00
Chomper9981 b26e76b92f fix cant choose npc in first section 2026-01-14 17:30:37 +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 5372840708 break through 2026-01-14 16:46:39 +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
VuNgocHaiC7 1e19c94fb8 update UI DlgProduce 2026-01-14 15:15:54 +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 791c918cdb Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-14 14:08:26 +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
NguyenVanDat e2b4ff4dec fix item amout gain for quest 2026-01-14 11:09:17 +07:00
tungdv 4d1cf5703d Merge pull request 'add point cam in HP.' (#119) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/119
2026-01-13 11:36:32 +00: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
VDH 511a833967 send to server learn skill 2026-01-13 17:58:20 +07:00
MinhHai 8285d1b68a add FreeLook Camera become prefab 2026-01-13 17:27:44 +07:00
MinhHai 847be2e3ce Merge remote-tracking branch 'origin/feature/hp_swim' into feature/refactor-UI 2026-01-13 16:29:40 +07:00
tungdv 5b3b7db7c9 Merge pull request 'update logic fly for HP' (#118) from feature/hp_swim into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/118
2026-01-13 09:28:47 +00:00
Tungdv affdc14627 Merge remote-tracking branch 'origin/develop' into feature/hp_swim 2026-01-13 16:26:10 +07:00
Tungdv 986bb52897 fix: update fly hp 2026-01-13 16:24:58 +07:00
MinhHai ebec0738f6 update DlgNPC: add pressed visual for btn 2026-01-13 16:20:04 +07:00
MinhHai 0ddf9bbe6b update Render feature: remove custom bloom feature 2026-01-13 15:52:06 +07:00
MinhHai a6b26627a2 update UI: move all window into same canvas 2026-01-13 15:36:56 +07:00
MinhHai 111ddf05a8 change SpeedX : 300 -> 60 2026-01-13 14:35:42 +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