Commit Graph

2777 Commits

Author SHA1 Message Date
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
NguyenVanDat 777bda9cd9 inffo 2025-10-28 17:51:50 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +07:00
HungDK 915b11b387 Update login ui 2025-10-28 13:51:33 +07:00
hoangvd b776bfed31 Merge pull request 'feature/HostAttack_Hoang' (#38) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/38
2025-10-28 04:05:57 +00:00
NguyenVanDat 46eb3afe2b Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
#	Assets/Scenes/NPCRender.unity
2025-10-28 11:05:11 +07:00
NguyenVanDat 254df2c428 ForTest 2025-10-28 10:55:52 +07:00
NguyenVanDat aca798172c testfast 2025-10-28 10:31:28 +07:00
HungDK 0ae982ae80 Merge branch 'feature/inventories' into develop 2025-10-27 15:45:29 +07:00
HungDK 13d1283d6e Fix money and cash loader 2025-10-27 15:39:45 +07:00
hoangvd a734e79dfa Merge pull request 'feature/HostAttack_Hoang' (#36) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/36
2025-10-27 07:01:48 +00:00
NguyenVanDat d72d4cd967 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-10-27 13:41:59 +07:00
VDH 6b91faae68 npc 2025-10-27 11:47:33 +07:00
HungDK 0eed221f16 Fix merge conflict 2025-10-27 11:28:22 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH f537fc0551 npc 2025-10-27 10:23:44 +07:00
HungDK dd8858b8a5 Update icon mall 2025-10-27 09:39:27 +07:00
VDH 7fef48278f addressable ui 2025-10-25 17:28:46 +07:00
HungDK bd34b294f9 Add player currency 2025-10-25 17:07:54 +07:00
VDH f08f357aa8 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-25 13:56:32 +07:00
Le Duc Anh d71487a81e add a61 scene 2025-10-25 12:33:33 +07:00
Le Duc Anh 6a951cebdf load a61 scene 2025-10-25 12:32:56 +07:00
Le Duc Anh 61929d7b1a add new assets 2025-10-25 12:27:22 +07:00
Tungdv b4f2e78def fix: update logic move HP. 2025-10-24 18:53:46 +07:00