3000 Commits

Author SHA1 Message Date
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
MinhHai a8822700bb fix bug missing namespace after merge from develop 2025-11-03 17:36:42 +07:00
PCBrew 10c7ba598b convert continue :))) 2025-11-03 17:34:39 +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
MinhHai b904c00762 complete convert fixed data and decription 2025-11-01 19:21:48 +07:00
PCBrew 2dc4c9ae1c convert 2025-11-01 19:20:47 +07:00
NguyenVanDat e7e776da6c Merge branch 'develop' into feature/else-player 2025-11-01 09:52:33 +07:00
Tungdv 25f717dc00 fix: update auto move HP. 2025-10-31 19:27:10 +07:00
HungDK 606700f9a0 Update sprite 2025-10-31 18:18:14 +07:00
NguyenVanDat cbaa228446 them ty 2025-10-31 18:09:22 +07:00
NguyenVanDat 4316661cb2 skill convert processing 2025-10-31 17:50:04 +07:00
Le Duc Anh ec2d524824 add female sword 2025-10-31 14:42:41 +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
MinhHai c26cdcdc36 complete convert raw properties of FixedData 2025-10-30 17:33:44 +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
hoangvd 2d07f0dcb9 Merge pull request 'pjsetting' (#42) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/42
2025-10-30 02:45:41 +00:00
PCBrew 49518212c9 pjsetting 2025-10-30 09:45:24 +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
hoangvd 028a650879 Merge pull request 'feature/HostAttack_Hoang' (#41) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/41
2025-10-29 10:08:20 +00: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
HungDK e01ef4ea26 Add sound effect 2025-10-29 17:00:28 +07:00
NguyenVanDat 1dd66a2b83 pj setting 2025-10-29 16:41:07 +07:00
tungdv 8c3f9b437e Merge pull request 'EP normal attack' (#39) from feature/EP_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/39
2025-10-29 09:28:23 +00:00
Tungdv fbd3110d05 fix: update pos server for HP and add layer for terrain. 2025-10-29 16:25:42 +07:00
Tungdv 0d41cbfe44 Merge branch 'develop' into feature/EP_normal_attack
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
#	Assets/Prefabs/MonsterPrefab.prefab
#	Assets/Scenes/WorldRender.unity
#	Assets/Scenes/a61.unity.meta
#	Assets/Scripts/CECHostPlayer.cs
2025-10-29 15:48:29 +07:00
Tungdv f94162d9ba fix: update pos server HP. 2025-10-29 14:54:52 +07:00
NguyenVanDat 929f35bd3b st 2025-10-29 13:30:02 +07:00
Tungdv 4283029b1f fix: update auto move for HP. 2025-10-28 19:20:41 +07:00
NguyenVanDat 59e06cc5f3 fix bug 2025-10-28 17:56:33 +07:00