Commit Graph

2941 Commits

Author SHA1 Message Date
CuongNV 4e5c7aceff Merge branch 'develop' into feature/chat_rule_Cuong
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/models.asset
2026-05-28 10:11:57 +07:00
NguyenVanDat d7f971d8b5 Update file setup for addressable remote 2026-05-27 17:48:15 +07:00
vuong dinh hoang 01098d913c Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into develop 2026-05-27 14:11:37 +07:00
vuong dinh hoang fba6061757 remove missing scripts 2026-05-27 14:11:10 +07:00
hungdk c087d8c12b Merge pull request 'feature/storage' (#469) from feature/storage into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/469
2026-05-27 05:16:52 +00: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 27cc75e3b3 Merge remote-tracking branch 'origin/develop' into feature/prepare-world-map 2026-05-27 10:25:54 +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
Le Duc Anh bcd9dade25 auto select last role 2026-05-27 10:06:47 +07:00
Le Duc Anh 5d302458e2 WIP NPC models and animation, CombinedActionSO 2026-05-27 10:00:52 +07:00
hungdk f93f7ac300 Merge pull request 'Account storage feature' (#467) from feature/storage into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/467
2026-05-27 02:51:08 +00:00
HungDK a8d3994226 Merge branch 'develop' into feature/storage 2026-05-27 09:28:29 +07:00
HungDK ea57bbd9df Add missing push 2026-05-27 09:25:53 +07:00
HungDK e7cecb98f9 Deposit, withdraw account money handler 2026-05-27 09:25:12 +07:00
HungDK 5a85e9fd90 Add ui of account storage, prefab 2026-05-27 09:23:59 +07:00
HungDK 7067f40a61 Add logic of account storage 2026-05-27 09:23:10 +07:00
Le Duc Anh e009e6d2f8 Merge branch 'feature/prepare-world-map' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature/prepare-world-map 2026-05-26 16:25:24 +07:00
Le Duc Anh 9590902fac WIP npc models 2026-05-26 16:11:24 +07:00
Le Duc Anh 83153a3207 WIP NPC CombinedActionSO 2026-05-26 16:06:32 +07:00
NguyenVanDat df3f4c2839 update logic select last role 2026-05-26 10:39:47 +07:00
CuongNV 470113b8fe Revert "bnmb"
This reverts commit 5d1a386148.
2026-05-25 10:36:26 +07:00
CuongNV 5d1a386148 bnmb 2026-05-25 10:35:44 +07:00
CuongNV 9aee39c47f add docs for ai agent 2026-05-25 10:33:40 +07:00
hoangvd fa322512db Merge pull request 'feature/gfx-action' (#466) from feature/gfx-action into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/466
2026-05-25 02:49:12 +00:00
vuong dinh hoang 25a58241c3 add gfx 22/5 2026-05-25 09:18:50 +07:00
vuong dinh hoang 4d20d561cf add gfx 2026-05-25 09:12:56 +07:00
CuongNV 8cbc777764 add debug 2026-05-22 18:42:19 +07:00
vuong dinh hoang c9f6a3c4a7 Merge branch 'develop' into feature/gfx-action 2026-05-22 09:40:08 +07:00
vuong dinh hoang ea332f7745 add gfx 2026-05-22 09:39:43 +07:00
Tungdv cb552b4f36 fix: update move for HP. 2026-05-21 20:17:34 +07:00
hungdk 3cfb66aaaf Merge pull request 'feature/storage' (#465) from feature/storage into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/465
2026-05-21 10:56:57 +00:00
HungDK e3a32c8780 Merge branch 'develop' into feature/storage 2026-05-21 17:56:21 +07:00
HungDK a4559f5d5f Add ui to uimanager, scriptable object 2026-05-21 17:45:03 +07:00
HungDK 8896d26b50 Add send storage request 2026-05-21 17:44:22 +07:00
CuongNV 5d4cc73cc8 add loadscene 2026-05-21 17:42:02 +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
HungDK b903258b22 Add storage metadata 2026-05-21 17:35:52 +07:00
HungDK f51191f721 Add handle storage msg 2026-05-21 17:35:15 +07:00
HungDK c26ab4b1f7 Add logic of storage and its ui prefab 2026-05-21 17:32:22 +07:00
CuongNV 3dc0255eae fix bug class run before addressable remote 2026-05-21 17:18:28 +07:00
NguyenVanDat 5affac9cbd fix download addressable remote in mobile 2026-05-21 16:55:42 +07:00
vuong dinh hoang 0a3288b72d Merge branch 'develop' into feature/gfx-action 2026-05-21 15:10:55 +07:00
vuong dinh hoang a1c9ad5040 adjust gfx 2026-05-21 15:10:16 +07:00
namth 954769ea7a Merge pull request 'feature/anim-test-scene' (#463) from feature/anim-test-scene into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/463
2026-05-21 04:15:01 +00:00
Tran Hai Nam ef03ea712c Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into fix-ui 2026-05-21 11:14:00 +07:00