Commit Graph

307 Commits

Author SHA1 Message Date
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 316d633525 Add overrides multi prefabs tool and clear missing scripts 2025-11-07 14:09:17 +07:00
HungDK 4f49a8f342 Merge branch 'feature/revive' into develop 2025-11-05 16:51:30 +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
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 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
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 814a151648 show dummy hit effect 2025-11-04 13:45:10 +07: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
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
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
MinhHai a8822700bb fix bug missing namespace after merge from develop 2025-11-03 17:36:42 +07:00
MinhHai c9cd71c3f9 Merge branch 'develop' into feature/convert-task-templ
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs.meta
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs.meta
#	Assets/PerfectWorld/Scripts/Task/TaskExpAnalyser.cs
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt.meta
#	Assets/Scenes/HoangTest.unity
2025-11-03 17:30:47 +07:00
MinhHai e21fbc4021 complete read properties of Task 2025-11-03 17:26:34 +07:00
Tungdv 25f717dc00 fix: update auto move HP. 2025-10-31 19:27:10 +07:00
tung.do@monkey.edu.vn 76d12a1140 fix: update auto move attack normal HP (fix move underground). 2025-10-31 02:20:50 +07:00
Tungdv 4be95aec7a fix: update logic auto move HP. 2025-10-30 19:41:39 +07:00
PCBrew 1c9d9b9ec2 UI health change fix bug 2025-10-30 18:50:02 +07:00
NguyenVanDat 8bc69c57ec Merge branch 'develop' into feature/else-player 2025-10-30 17:28:56 +07:00
NguyenVanDat f1520169ab fix attacxk animation 2025-10-30 12:24:50 +07:00
HungDK 33c845cd3b Merge branch 'develop' into feature/inventories 2025-10-30 10:10:16 +07:00
Nguyen Van Dat cb0f0c9229 Merge branch 'develop' into feature/else-player
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-10-29 21:26:02 +07:00
Tungdv 94b6927422 fix: update logic auto move to target of HP. 2025-10-29 19:14:52 +07:00
PCBrew 539c6d1b33 fix else player message 2025-10-29 18:34:04 +07:00
NguyenVanDat 51659d03cc fixx 2025-10-29 17:05:57 +07:00
HungDK cbfceab8ac Add sfx login 2025-10-29 17:02:43 +07:00
HungDK 0fb8b0d406 Update login UI 2025-10-29 17:02:18 +07:00
NguyenVanDat cc32356d10 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
2025-10-29 17:01:15 +07:00