duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,978 Commits 13 Branches 0 Tags
8fcdcddc4cb16036d4fba447df06d33d38a71e24
Commit Graph

2978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hoangvd 8fcdcddc4c Merge pull request 'feature/gfx-action' (#476) from feature/gfx-action into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/476
 2026-05-30 08:46:18 +00:00
vuong dinh hoang ad788a1f3e fix gfx 2026-05-30 15:45:40 +07:00
vuong dinh hoang 745c034c2a fix gfx 2026-05-30 15:44:54 +07:00
hoangvd 6f931db92d Merge pull request 'feature/gfx-action' (#475) from feature/gfx-action into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/475
 2026-05-29 11:01:31 +00:00
vuong dinh hoang c4156a4d6e fix follow feed back 2026-05-29 18:00:26 +07:00
vuong dinh hoang 91c544e013 add gfx 2026-05-29 11:21:58 +07:00
vuong dinh hoang 05106a8669 Merge branch 'develop' into feature/gfx-action 
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
 2026-05-29 11:06:44 +07:00
vuong dinh hoang d3650ef53a update show skill tool 2026-05-29 11:05:10 +07:00
vuong dinh hoang 7cf9403523 add gfx 2026-05-29 11:03:50 +07:00
vuong dinh hoang b05ac06b7e update Nam' low tech tool 2026-05-29 10:16:30 +07:00
cuongnv aabbd166ba Merge pull request 'feature/Daylight_2' (#474) from feature/Daylight_2 into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/474
 2026-05-29 03:12:11 +00: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
CuongNV a681d15e26 update light 2026-05-29 10:02:52 +07:00
vuong dinh hoang 1f86beee24 tool remove gfx in combineaction SO data 2026-05-29 10:02:16 +07:00
CuongNV 4662e1a089 update setting 2026-05-29 09:52:02 +07:00
CuongNV af17d6d97e change addressable to local 2026-05-29 09:51:46 +07:00
CuongNV 130ead5f56 Merge branch 'feature/chat_rule_Cuong' into feature/Daylight_2 
# Conflicts:
#	Assets/PerfectWorld/Scripts/World/CECSunMoon.cs
 2026-05-29 08:51:17 +07:00
hoangvd 6dfbdb7658 Merge pull request 'fix ontarget but aoe skill' (#473) from feature/gfx-action into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/473
 2026-05-28 10:56:35 +00:00
vuong dinh hoang c8bca5cb18 fix ontarget but aoe skill 2026-05-28 17:55:56 +07:00
CuongNV 42f0cded84 add new code controller color night 2026-05-28 17:47:13 +07:00
NguyenVanDat cb6c6f5fa7 add label for addressable 2026-05-28 17:37:24 +07:00
hainh dfda059258 Merge pull request 'feature/review-npc' (#472) from feature/review-npc into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/472
 2026-05-28 10:00:56 +00:00
Vũ Ngọc Hải d0dbf7f46e Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/review-npc 2026-05-28 16:56:58 +07:00
Vũ Ngọc Hải a5e66f1bb6 unlock UI npc and fix scroll view inventory 2026-05-28 16:54:43 +07:00
hoangvd 0d1ce5e957 Merge pull request 'feature/add-SO-to-Prefab' (#471) from feature/add-SO-to-Prefab into develop 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/471
 2026-05-28 09:30:10 +00:00
vuong dinh hoang 7a8af285b3 add gfx 2026-05-28 16:26:06 +07:00
vuong dinh hoang 630ff8e097 Merge branch 'feature/gfx-action' into feature/add-SO-to-Prefab 2026-05-28 14:18:28 +07:00
vuong dinh hoang 6275683c71 add gfx 2026-05-28 14:09:20 +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
Tran Hai Nam ccba0e1991 Merge branch 'feature/add-SO-to-Prefab' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-05-27 18:08:24 +07:00
NguyenVanDat d7f971d8b5 Update file setup for addressable remote 2026-05-27 17:48:15 +07:00
Tran Hai Nam 9a361247ef Add NPC animation behavior 2026-05-27 17:47:58 +07:00
vuong dinh hoang 9ea65fb20f add animancer 2026-05-27 17:06:09 +07:00
Tran Hai Nam 94b6ef8200 Merge branch 'feature/add-SO-to-Prefab' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-05-27 15:34:18 +07:00
vuong dinh hoang 03147ae054 setup npc 2026-05-27 15:25:58 +07:00
Tran Hai Nam 72e6cc1059 fix skill panel 2026-05-27 14:49:22 +07:00
Tran Hai Nam 7cdcabb29c Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into fix-ui 2026-05-27 14:47:09 +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
Tran Hai Nam aaaf589ef7 Add more precise life time manager for gfx 2026-05-27 12:24:15 +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
Tran Hai Nam ef5689055e Add requirement for play skill 
Merge from develop
 2026-05-27 12:16:38 +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 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