duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,156 Commits 13 Branches 0 Tags
ecd948c2f1f6f7672d4cbd99fc8baeb8ece6b33e
Commit Graph

1156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tungdv ecd948c2f1 Merge pull request 'update layer water in prefab.' (#116) from feature/hp_swim into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/116
 2026-01-09 10:38:18 +00:00
Tungdv 5f12ace1bd fix: update layer water in prefab. 2026-01-09 17:37:48 +07:00
tungdv 4dfa0f3c1b Merge pull request 'update layer water.' (#115) from feature/hp_swim into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/115
 2026-01-09 10:33:47 +00:00
Tungdv 5a8501ea6d fix: update layer water. 2026-01-09 17:32:14 +07:00
tungdv 16bf6d68a3 Merge pull request 'update logic swim HP.' (#114) from feature/hp_swim into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/114
 2026-01-09 10:18:01 +00:00
Tungdv 8996f6d6c0 Merge remote-tracking branch 'origin/develop' into feature/hp_swim 2026-01-09 17:14:51 +07:00
Tungdv f446e7ca5f Merge branch 'develop' into feature/hp_swim 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs
#	Assets/Scenes/a61.unity
 2026-01-09 17:14:03 +07:00
VuNgocHaiC7 9ad08da326 add file GeneratedCollider.meta 2026-01-09 17:12:38 +07:00
Tungdv aaa9343b6e fix: update swim HP. 2026-01-09 17:06:53 +07:00
hainh 541cc4fa0f Merge pull request 'feature/attach_mesh' (#113) from feature/attach_mesh into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/113
 2026-01-09 09:28:18 +00:00
VuNgocHaiC7 5f1e737e02 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/attach_mesh 2026-01-09 16:25:48 +07:00
VuNgocHaiC7 ea15f7ec78 update mesh prefabs 2026-01-09 16:25:36 +07:00
Le Duc Anh 69962b348c Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-09 16:16:40 +07:00
Le Duc Anh d692cea6d5 add armor and weapon vfx 2026-01-09 16:16:36 +07:00
hainh dbd4e2848a Merge pull request 'feature/attach_mesh' (#112) from feature/attach_mesh into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/112
 2026-01-09 08:33:29 +00:00
VuNgocHaiC7 c75e1d5805 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/attach_mesh 2026-01-09 15:32:18 +07:00
VuNgocHaiC7 cb028bf991 update file mesh 2026-01-09 15:32:07 +07:00
HungDK 8e33d0e360 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-09 15:19:32 +07:00
HungDK 37a9659216 Bind event to ui, refactor later 2026-01-09 15:19:29 +07:00
HungDK c00a68d068 Add navigate work, event 2026-01-09 15:17:50 +07:00
hainh 12825dfce8 Merge pull request 'feature/attach_mesh' (#111) from feature/attach_mesh into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/111
 2026-01-09 08:17:36 +00:00
HungDK 57fa8ff8fa Add auto move, navigate when click target link 2026-01-09 15:15:25 +07:00
VuNgocHaiC7 71000a34bb Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/attach_mesh 2026-01-09 15:15:21 +07:00
VuNgocHaiC7 ab5840eb88 attach mesh for bridge prefab 2026-01-09 15:15:10 +07:00
HungDK 70104db9e2 Update EC_HPWork to create navigate work 2026-01-09 15:13:15 +07:00
HungDK 156e61c3d7 Add look up NPC info 2026-01-09 15:12:31 +07:00
HungDK de05bf76af Load coordinate data for every maps 2026-01-09 15:11:42 +07:00
MinhHai 971a7377fb Merge remote-tracking branch 'origin/develop' into feature/implement-cmd-c2s-GoTo 2026-01-09 15:10:17 +07:00
HungDK 2e27de4887 Update ATaskTemplMan add get task npc info 2026-01-09 15:09:26 +07:00
HungDK 119b9129b4 Add EC_HPWorkNavigate converted 2026-01-09 15:08:53 +07:00
HungDK 825be182e2 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2026-01-09 15:06:25 +07:00
HungDK e4326455d0 Add navigate, force navigate and coordinate data to addressable 2026-01-09 15:05:55 +07:00
MinhHai 396aadfd72 Merge remote-tracking branch 'origin/develop' into feature/implement-cmd-c2s-GoTo 2026-01-09 15:01:52 +07:00
MinhHai 219c87f469 add new pack: Editor Attributes, complete GoTo cmd 2026-01-09 15:01:29 +07:00
hainh b2d224eb45 Merge pull request 'attach mesh flying island prefab' (#110) from feature/attach_mesh into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/110
 2026-01-09 07:59:38 +00:00
VuNgocHaiC7 58d23f64f6 attach mesh flying island prefab 2026-01-09 14:57:48 +07:00
NguyenVanDat b9bf09f31a make NPCRender prefab 2026-01-09 11:11:39 +07:00
NguyenVanDat ab45ae8214 add escape button 2026-01-09 11:10:07 +07:00
NguyenVanDat d0d7346a72 Merge branch 'develop' into feature/mine-processing 
# Conflicts:
#	Assets/Scenes/a61.unity
 2026-01-09 11:04:53 +07:00
NguyenVanDat 88213f7649 finish mining task 2026-01-09 11:01:03 +07:00
hoangvd 30e8dd341f Merge pull request 'feature/skill-data' (#109) from feature/skill-data into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/109
 2026-01-09 03:00:46 +00:00
VDH fb4b9b5d90 Merge branch 'develop' into feature/skill-data 2026-01-09 09:46:34 +07:00
NguyenVanDat 570455afce add escape button (changed a61) 2026-01-09 09:38:51 +07:00
Tungdv 951022b164 fix: update logic swim HP. 2026-01-08 19:52:12 +07:00
VDH 892b273ea5 done ui load name and icon 2026-01-08 18:43:10 +07:00
Le Duc Anh 057825c1d9 enable depth texture/opaque texture 2026-01-08 15:17:45 +07:00
Le Duc Anh d31149e69c update water shader 2026-01-08 15:09:53 +07:00
hainh 27db6e7249 Merge pull request 'Update UI DlgAward.prefab' (#107) from feature/ui_Prefabs into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/107
 2026-01-08 07:43:15 +00:00
VuNgocHaiC7 868f61ebb1 Update UI DlgAward.prefab 2026-01-08 14:41:38 +07:00
Le Duc Anh 67908e80fc update 长击刀极品 2026-01-08 00:21:07 +07:00