Commit Graph

687 Commits

Author SHA1 Message Date
VDH ddb50c3c4c st 2025-11-25 14:42:44 +07:00
VDH 8acf91dcb3 conflict 2025-11-25 14:28:04 +07:00
VDH 2fdb44d36d adjust 2025-11-25 13:45:04 +07:00
VDH 41005a7244 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 12:10:49 +07:00
VDH d092605651 done skill don't move after cast 2025-11-25 12:10:43 +07:00
HungDK a164af248c Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-25 12:09:21 +07:00
HungDK 5d83363ce3 Update Joystick.cs 2025-11-25 12:08:22 +07:00
MinhHai f5a4be42ad Fix rotation of weapon 细刀初始 2025-11-25 11:55:36 +07:00
tungdv ff0ecca2a8 Merge pull request 'fix: double click to attack enemy.' (#73) from feature/develop_demo into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/73
2025-11-25 04:10:07 +00:00
Tungdv b16df9f4c2 fix: double click to attack enemy. 2025-11-25 11:09:23 +07:00
Le Duc Anh fc9a75f70a rotate weapon in the code 2025-11-24 22:35:51 +07:00
Le Duc Anh 300085365d udpate some weapon rotation 2025-11-24 22:26:57 +07:00
NguyenVanDat ae391ad0c5 make walk run is true as default 2025-11-24 17:05:04 +07:00
NguyenVanDat e7d61b4694 fix character animation 2025-11-24 16:50:13 +07:00
NguyenVanDat a809a98e27 fix work stand and character animation 2025-11-24 16:46:11 +07:00
NguyenVanDat 7b7db4cc7d Merge branch 'develop' into bugfix/fix-character-animation 2025-11-24 16:09:19 +07:00
NguyenVanDat 5864ce132b fix bug: after finished attack player do not play idle animation 2025-11-24 16:08:20 +07:00
anhld bd6cea8664 Update README.md 2025-11-24 08:41:45 +00:00
anhld 6ecfbf480b Merge pull request 'Load female mage armors' (#72) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/72
2025-11-24 08:40:06 +00:00
Le Duc Anh c494258ffd add female mage armors 2025-11-24 15:37:31 +07:00
Le Duc Anh 466e39d67c Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-24 14:27:45 +07:00
hoangvd d5f062920b Merge pull request 'feature/skill-data' (#71) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/71
2025-11-24 07:26:24 +00:00
hoangvd 590ec18309 Merge pull request 'done 3 vfx' (#70) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/70
2025-11-24 07:25:04 +00:00
VDH 4c1a4bd3c4 Merge remote-tracking branch 'origin/develop' into feature/skill-data 2025-11-24 14:23:25 +07:00
VDH 887b7d755c done 3 vfx 2025-11-24 14:22:02 +07:00
HungDK 15f2224d64 Merge branch 'feature/joystick-fix' into develop 2025-11-24 14:11:48 +07:00
hoangvd 0e29f18638 Merge pull request 'st' (#69) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/69
2025-11-24 07:05:07 +00:00
VDH f68115eddf st 2025-11-24 14:04:27 +07:00
hoangvd 428d5959cc Merge pull request 'feature/skill-data' (#68) from feature/skill-data into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/68
2025-11-24 07:03:50 +00:00
VDH 2f9acd3e69 done skill 2025-11-24 12:08:59 +07:00
HungDK da65d37674 Fix monster health ui, hud 2025-11-24 12:01:34 +07:00
VDH 9418884c28 fix skill after merge 2025-11-24 11:36:21 +07:00
VDH f8a43f86b4 fix after merge 2025-11-24 11:17:54 +07:00
VDH 6b7537ca3e fix bug mege 2025-11-24 11:10:38 +07:00
VDH 1e34f48215 fix merge 2025-11-24 11:09:11 +07:00
Le Duc Anh 22348242a4 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-24 10:40:10 +07:00
VDH ae94300b0f st 2025-11-24 10:21:08 +07:00
HungDK 9735d6f9e6 Fixing joystick 2025-11-24 10:20:40 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2025-11-24 10:16:07 +07:00
MinhHai 1b5617ef5d Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-11-22 18:59:56 +07:00
MinhHai beb12c8723 update logic NotifyServer of class TaskClient 2025-11-22 18:58:40 +07:00
tungdv ec9ab1d87d Merge pull request 'update prefab dlgnpc.' (#67) from feature/hp_interact_npc into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/67
2025-11-22 10:48:12 +00:00
Tungdv 59976a4be5 fix: update dlgnpc. 2025-11-22 17:47:15 +07:00
VDH f43f8a6e58 done spawn vfx 2025-11-22 11:21:50 +07:00
Le Duc Anh 32f9216a42 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-22 10:05:47 +07:00
MinhHai 7ba8ca49ba fix EC_Game: get GameRun, cache TaskData before playmode 2025-11-22 10:04:50 +07:00
Le Duc Anh edff7723d8 Load the elementdata for Android 2025-11-21 23:22:07 +07:00
tungdv f2eee71c9e Merge pull request 'Update select task in dlgnpc.' (#66) from feature/hp_interact_npc into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/66
2025-11-21 10:18:53 +00:00
Tungdv 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
MinhHai aa797c8865 Merge branch 'implement_task_UI' into develop 2025-11-21 17:07:01 +07:00