Commit Graph

765 Commits

Author SHA1 Message Date
CuongNV cfd4cabb1d remove all log chat 2026-05-31 11:14:13 +07:00
CuongNV 4c168cd37f Merge remote-tracking branch 'origin/develop' into feature/Daylight_2
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2026-05-29 10:04:23 +07:00
Vũ Ngọc Hải a5e66f1bb6 unlock UI npc and fix scroll view inventory 2026-05-28 16:54:43 +07:00
CuongNV 4e5c7aceff Merge branch 'develop' into feature/chat_rule_Cuong
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/models.asset
2026-05-28 10:11:57 +07:00
HungDK c829ddeaea Merge branch 'develop' into feature/storage 2026-05-27 11:48:25 +07:00
HungDK 80a3a48abe Add storage password logic, ui 2026-05-27 10:55:35 +07:00
Le Duc Anh 35c9bad469 Merge branch 'develop' into feature/Addessable_CDN 2026-05-27 10:09:58 +07:00
Le Duc Anh be95b0b7a8 Merge branch 'develop' into feature/select-last-role 2026-05-27 10:08:58 +07:00
Le Duc Anh a12a94ca41 Merge branch 'feature/select-last-role' into feature/Addessable_CDN 2026-05-27 10:07:40 +07:00
HungDK e7cecb98f9 Deposit, withdraw account money handler 2026-05-27 09:25:12 +07:00
NguyenVanDat df3f4c2839 update logic select last role 2026-05-26 10:39:47 +07:00
HungDK e3a32c8780 Merge branch 'develop' into feature/storage 2026-05-21 17:56:21 +07:00
HungDK 74e1bdc1d4 Add bring ui to front function 2026-05-21 17:40:58 +07:00
HungDK f99b0dae9c Enable storage npc service 2026-05-21 17:40:25 +07:00
HungDK f2ab96750b Add various quantity input ui for every needed feature 2026-05-21 17:39:47 +07:00
CuongNV 3dc0255eae fix bug class run before addressable remote 2026-05-21 17:18:28 +07:00
vuong dinh hoang 7bd8061374 remove cmt 2026-05-20 15:44:21 +07:00
vuong dinh hoang cf2f6625ff remove log 2026-05-20 15:43:43 +07:00
vuong dinh hoang b487e24d8a fix action 2026-05-20 15:08:09 +07:00
VuNgocHaiC7 3c7736bcec Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-05-20 14:37:02 +07:00
VuNgocHaiC7 1c53da5ce8 fix some ui 2026-05-20 14:36:50 +07:00
CuongNV eb933661e8 Merge remote-tracking branch 'origin/develop' into feature/Addessable_CDN 2026-05-20 14:10:04 +07:00
CuongNV 3e545f026d fix pos textname for NPC 2026-05-20 14:01:38 +07:00
Tran Hai Nam 510ea8d462 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-19 15:27:08 +07:00
Tran Hai Nam 2a7f9602db Add anim test scene 2026-05-19 10:46:26 +07:00
CuongNV a26ec4acc3 fix show model in inventory 2026-05-18 16:10:23 +07:00
CuongNV 4c730583b3 fix logic set pos camera in intentory 2026-05-18 14:25:08 +07:00
Le Duc Anh e622d2b1da Merge remote-tracking branch 'origin/feature/dlg_setting' into feature/graphic-options 2026-05-16 10:27:20 +07:00
Tungdv a174ff42f9 fix: Update UI dlg setting. 2026-05-15 20:23:46 +07:00
VuNgocHaiC7 0bc9614efe update slider controller 2026-05-15 17:01:02 +07:00
VuNgocHaiC7 05c6224499 fix bug 2026-05-15 14:53:04 +07:00
VuNgocHaiC7 b5f982df14 Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui 2026-05-15 14:43:52 +07:00
VuNgocHaiC7 97db0b3fa0 update prefab DlgSetting 2026-05-15 14:43:39 +07:00
Le Duc Anh ac8631e5b8 Merge remote-tracking branch 'origin/develop' into feature/graphic-options 2026-05-15 14:01:58 +07:00
Tungdv 7e819fed80 Merge branch 'develop' into feature/dlg_setting
# Conflicts:
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
2026-05-15 11:39:20 +07:00
Le Duc Anh 9e998f9cbc fix mnini map npc process 2026-05-15 11:26:43 +07:00
CuongNV 63aab4887b Merge remote-tracking branch 'origin/develop' into feature/Addessable_CDN
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/MiniMap/CDlgMiniMap.cs
2026-05-15 11:26:01 +07:00
vuong dinh hoang 20ee8dd4ad adjujst 2026-05-15 11:09:23 +07:00
NguyenVanDat f9798d6280 Merge branch 'develop' into feature/disconnect-login-message 2026-05-15 09:32:56 +07:00
NguyenVanDat b05991c73e prevent login without internet 2026-05-15 09:32:31 +07:00
VuNgocHaiC7 9b522b99dc DlgSetting prefab 2026-05-14 22:35:41 +07:00
Tungdv 884368e612 feat: add setting config. 2026-05-13 19:45:41 +07:00
Le Duc Anh dd04b59395 Add NPC icon to mini map 2026-05-13 17:50:42 +07:00
CuongNV b242bf46d3 Merge remote-tracking branch 'origin/develop' into feature/Addessable_CDN 2026-05-13 10:48:39 +07:00
CuongNV 258679dd7c Add logic update time and show time in minimap 2026-05-13 10:15:29 +07:00
vuong dinh hoang 08d837cdbd Merge branch 'develop' into feature/gfx-action 2026-05-12 16:57:03 +07:00
vuong dinh hoang f8512de72e deal damage overtime 2026-05-12 16:56:22 +07:00
VuNgocHaiC7 5ce32ab5a4 fix logout when disconnect 2026-05-11 17:50:25 +07:00
Tran Hai Nam 2602ab0ea3 ADd buff icon for npc and else player 2026-05-08 17:39:14 +07:00
CuongNV 02971cbb08 fix reset camera show face when logout 2026-05-07 17:29:15 +07:00