duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
623 Commits 13 Branches 0 Tags
f2eee71c9eff13bfb6e730670a51dc6b7a50ea7a
Commit Graph

204 Commits

Author SHA1 Message Date
Le Duc Anh 95f2386397 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-21 16:04:56 +07:00
Le Duc Anh 30e636267c udpate matter flow 2025-11-21 16:01:11 +07:00
NguyenVanDat d80f7f4f07 Merge branch 'develop' into feature/refactor-game-run 2025-11-21 11:50:36 +07:00
NguyenVanDat 8f5673c68e refactor game run and fix game flow 2025-11-21 11:48:39 +07:00
Tungdv 939b714ced Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
#	Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
#	Assets/PerfectWorld/Scripts/Task/TaskInterface.cs
#	Assets/PerfectWorld/Scripts/Task/TaskProcess.cs
 2025-11-21 11:45:16 +07:00
MinhHai 0bcacf1599 Merge remote-tracking branch 'origin/develop' into implement_task_UI 2025-11-21 11:31:09 +07:00
MinhHai e1bfd720e3 update logic receive Command.TASK_VER_DATA 2025-11-21 11:29:34 +07:00
Tungdv 17edc61e60 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-20 18:37:00 +07:00
Le Duc Anh ca31090872 move all stuff into a61 scene 2025-11-20 15:33:30 +07:00
HungDK a35cd6d0e7 Update EC_Invtr 2025-11-20 13:47:10 +07:00
hungdk 5dd011df46 Refactor and fixing ref 2025-11-20 02:18:48 +07:00
Tungdv 0324dc909e fix: update logic select option dlg NPC. 2025-11-19 19:12:24 +07:00
anhld 7610493367 Merge pull request 'Add all sword man armors. Load armor and weapon on game init.' (#56) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/56
 2025-11-18 05:01:10 +00:00
Tungdv fa1bd3d076 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
 2025-11-17 14:50:24 +07:00
Le Duc Anh d2c9a12929 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-15 17:05:07 +07:00
Le Duc Anh 9f664ffd9f add all human male armor 2025-11-15 17:00:59 +07:00
NguyenVanDat 16fadfe2a4 fix play animation 2025-11-15 13:54:29 +07:00
NguyenVanDat fe73a9b979 handle conflict 2025-11-13 17:53:31 +07:00
NguyenVanDat f7d0ee6b43 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
 2025-11-13 17:22:47 +07:00
NguyenVanDat c6f24993b5 show selecting vfx and elase player enter vfx 2025-11-13 17:12:41 +07:00
Le Duc Anh ba9c97d3f6 fix the conflicts 2025-11-13 16:43:59 +07:00
Le Duc Anh 648d51ff3a Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-13 16:22:36 +07:00
Le Duc Anh c4a56218d8 load player model 2025-11-13 16:12:12 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
 2025-11-12 19:39:19 +07:00
NguyenVanDat 142fabf108 Merge branch 'develop' into feature/add-vfx 
# Conflicts:
#	Assets/PerfectWorld/Prefab/GameController.prefab
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/PlayerVisual.cs
 2025-11-12 11:03:25 +07:00
NguyenVanDat 629d419c57 WIP logic show vfx select target and level up 2025-11-12 10:21:09 +07:00
VDH ecbdf4c803 done skill 2025-11-11 17:12:51 +07:00
VDH e01c923e16 ref 2025-11-11 14:13:14 +07:00
VDH 40f17dadab Merge remote-tracking branch 'origin/develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-11 13:44:45 +07:00
Tungdv ec4bb785b8 fix: update logic show dialog. 2025-11-10 19:50:39 +07:00
Tungdv f643998dda ifx: update logic show dialog npc. 2025-11-08 18:51:00 +07:00
VDH d4af8e33f9 convert for test done 2025-11-07 18:01:47 +07:00
NguyenVanDat df07b1661d add gfx resource and vfx object base 2025-11-07 17:35:52 +07:00
VDH 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00
VDH 0ad91a5e1d InitAllSkillsOfCurProf done 2025-11-05 17:55:50 +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
Le Duc Anh f338899f76 initial load all equipments 2025-11-05 16:08:51 +07:00
HungDK 14ed8ac2e9 Update else player revive on host client 2025-11-05 09:37:55 +07:00
HungDK 61ce6be4fd Update EC_ManPlayer.cs 2025-11-04 15:36:43 +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 53da747d56 Request and play anim revive 2025-11-04 14:36:40 +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 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
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
Tungdv 25f717dc00 fix: update auto move HP. 2025-10-31 19:27:10 +07:00
Tungdv 4be95aec7a fix: update logic auto move HP. 2025-10-30 19:41:39 +07:00