Commit Graph

482 Commits

Author SHA1 Message Date
NguyenVanDat b7bf20be75 show selecting vfx 2025-11-10 18:24:09 +07:00
NguyenVanDat e07be0d048 Merge branch 'develop' into feature/add-vfx 2025-11-07 17:38:19 +07:00
NguyenVanDat df07b1661d add gfx resource and vfx object base 2025-11-07 17:35:52 +07:00
HungDK 6b2737f779 Fix missing setting, package 2025-11-07 17:00:31 +07:00
HungDK bf4986afb2 Update a61.unity 2025-11-07 14:09:29 +07:00
HungDK 316d633525 Add overrides multi prefabs tool and clear missing scripts 2025-11-07 14:09:17 +07:00
HungDK 8d310277d9 Update prefab, fixing missing script prefabs 2025-11-07 14:06:27 +07:00
HungDK 8b8e9b55be Update collision 2025-11-07 11:10:03 +07:00
HungDK 5a689ef090 Update a61.unity 2025-11-06 16:55:11 +07:00
HungDK fae786f9e9 Add generated mesh of collider 2025-11-06 16:54:40 +07:00
HungDK f924f4f0d7 Add extruded mesh collider tool 2025-11-06 16:53:36 +07:00
HungDK 4f49a8f342 Merge branch 'feature/revive' into develop 2025-11-05 16:51:30 +07:00
HungDK 0798b25db3 Update a61.unity 2025-11-05 16:45:56 +07:00
HungDK 691b27b69f Fix duplicate init else player, duplicate model 2025-11-05 16:38:23 +07:00
HungDK 19b42000a0 Fix error update player distance to object 2025-11-05 16:37:32 +07:00
anhld d77ab085b9 Merge pull request 'initial load all equipments' (#47) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/47
2025-11-05 09:09:57 +00:00
Le Duc Anh f338899f76 initial load all equipments 2025-11-05 16:08:51 +07:00
HungDK 07f7a36b08 Merge branch 'feature/revive' into develop 2025-11-05 09:38:45 +07:00
HungDK 14ed8ac2e9 Update else player revive on host client 2025-11-05 09:37:55 +07:00
HungDK 18c1465b1e Merge branch 'feature/revive' into develop 2025-11-04 15:38:07 +07:00
HungDK 61ce6be4fd Update EC_ManPlayer.cs 2025-11-04 15:36:43 +07:00
hoangvd 20e69d109b Merge pull request 'setup for esle player' (#46) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/46
2025-11-04 08:31:09 +00:00
HungDK 9e825620cd Fix GameController position in scene 2025-11-04 15:11:50 +07:00
HungDK 2793515e31 Update NPCRender.unity 2025-11-04 15:09:25 +07:00
HungDK 1f7c20069c Merge branch 'develop' into feature/revive 2025-11-04 14:51:15 +07:00
HungDK 28aff4cd75 Add work dead 2025-11-04 14:37:15 +07:00
HungDK 05d952860b Add revive handle on host and else player 2025-11-04 14:36:59 +07:00
HungDK 53da747d56 Request and play anim revive 2025-11-04 14:36:40 +07:00
HungDK bc7693aceb Add revive data structure of revive 2025-11-04 14:32:23 +07:00
VDH 4f3edae50d setup for esle player 2025-11-04 14:32:03 +07:00
HungDK 307f6d8b49 Add send revive cmd 2025-11-04 14:31:49 +07:00
HungDK 8278709a45 Add prefab and ui of revive system 2025-11-04 14:30:25 +07:00
datnv a1a072716f Merge pull request 'feature/else-player' (#45) from feature/else-player into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/45
2025-11-04 07:19:17 +00:00
NguyenVanDat acf01f0ba7 dummy fix showing weapon 2025-11-04 14:17:05 +07:00
NguyenVanDat 12617a8ea3 Merge branch 'develop' into feature/else-player
# Conflicts:
#	Assets/Scenes/a61.unity
2025-11-04 13:51:24 +07:00
NguyenVanDat f797bb08cf assign test vfx prefab 2025-11-04 13:47:51 +07:00
NguyenVanDat 814a151648 show dummy hit effect 2025-11-04 13:45:10 +07:00
hoangvd c34ee77ce5 Merge pull request 'feature/HostAttack_Hoang' (#44) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/44
2025-11-04 04:34:28 +00:00
VDH 313a525700 fix bug 2025-11-04 11:31:10 +07:00
VDH 1eb39b8319 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
#	Assets/Prefabs/HostPlayer.prefab
#	Assets/Prefabs/MonsterPrefab.prefab
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2025-11-04 10:51:06 +07:00
VDH 42399c1a70 for merge 2025-11-04 10:43:29 +07:00
Tungdv 73d3917bbe fix: delete log. 2025-11-04 10:09:27 +07:00
PCBrew 8d761b6d3d attack animatin with weapon type 2025-11-04 09:36:23 +07:00
NguyenVanDat 19a1ecfb70 Merge branch 'develop' into feature/else-player 2025-11-04 09:07:39 +07:00
tungdv eb40985335 Merge pull request 'fix: update auto move attack normal for HP and update anim for elseplayer.' (#43) from feature/EP_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/43
2025-11-03 18:17:18 +00:00
tung.do@monkey.edu.vn d18d8b0b64 Merge branch 'develop' into feature/EP_normal_attack 2025-11-04 01:10:31 +07:00
Tungdv cfc13087e4 fix:
- fix anim elseplayer.
- fix auto move to target of HP.
- fix postion wrong went use joystick after auto move of HP.
2025-11-03 19:59:00 +07:00
PCBrew 5ee9a27ac8 fix bug 2025-11-03 18:56:26 +07:00
MinhHai 7c3bc44bd7 Merge branch 'feature/convert-task-templ' into develop 2025-11-03 18:34:36 +07:00
PCBrew 61775198c6 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-11-03 17:37:16 +07:00