 anhld
|
35ab182862
|
Merge pull request 'load npc/monster' (#63) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/63
|
2025-11-19 06:38:52 +00:00 |
|
|
Le Duc Anh
|
b400ad1e68
|
load npc/monster
|
2025-11-19 13:38:20 +07:00 |
|
|
NguyenVanDat
|
e5fdb874c1
|
dummy change SelectGfx prefab
|
2025-11-19 11:50:23 +07:00 |
|
|
NguyenVanDat
|
e8a76c0c58
|
fix character animation config name
|
2025-11-19 10:42:24 +07:00 |
|
|
VDH
|
a30427e3f5
|
Merge remote-tracking branch 'origin/bugfix/fix-character-animation' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECHostPlayer_Inventory.cs
|
2025-11-19 10:35:54 +07:00 |
|
|
Le Duc Anh
|
45024b5761
|
turn off default equipments if needed
|
2025-11-18 22:04:56 +07:00 |
|
|
Tungdv
|
bb28c8505d
|
fix: update logic select option in dlg npc.
|
2025-11-18 19:01:03 +07:00 |
|
|
VDH
|
8ee2477681
|
get config
|
2025-11-18 18:54:56 +07:00 |
|
|
Tungdv
|
6f3a509534
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
|
2025-11-18 16:46:24 +07:00 |
|
|
Tungdv
|
4633e8278c
|
fix: update logic send cmd accept task.
|
2025-11-18 16:40:04 +07:00 |
|
|
Le Duc Anh
|
ba1e532e6d
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-18 16:36:32 +07:00 |
|
|
Le Duc Anh
|
3174cd28d1
|
send npc accept task cmd
|
2025-11-18 16:36:15 +07:00 |
|
|
Tungdv
|
afa9f882a9
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-17 19:06:14 +07:00 |
|
|
Tungdv
|
86c304f43a
|
fix: update logic select option dialog npc.
|
2025-11-17 18:52:07 +07:00 |
|
|
NguyenVanDat
|
e59127a425
|
catch message start and stop attack
|
2025-11-17 18:24:12 +07: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 |
|
|
VDH
|
690a8dd9de
|
Merge branch 'develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-14 11:32:54 +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 |
|
|
MinhHai
|
bb01bbb6f1
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-12 16:57:45 +07:00 |
|
|
MinhHai
|
2c3c44de4e
|
update Task: complete read task templ, log task name and description on UI, add sprites asset
|
2025-11-12 16:56:35 +07:00 |
|
|
VDH
|
752d2cd69e
|
fix player don't play stand animation when cast skill
|
2025-11-12 15:24:36 +07:00 |
|
|
NguyenVanDat
|
cfeebf3a15
|
Merge branch 'develop' into feature/add-vfx
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2025-11-12 11:04:43 +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 |
|
|
VDH
|
6d98f3d30f
|
skill 1,2,3,4,5,6
|
2025-11-12 10:52:37 +07:00 |
|
|
NguyenVanDat
|
629d419c57
|
WIP logic show vfx select target and level up
|
2025-11-12 10:21:09 +07:00 |
|
|
MinhHai
|
451555a1ba
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2025-11-11 18:35:33 +07:00 |
|
|
VDH
|
ecbdf4c803
|
done skill
|
2025-11-11 17:12:51 +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 |
|
|
VDH
|
cbf626fa28
|
skill processing
|
2025-11-11 13:33:27 +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
|
eed08c2b13
|
bug skill data not received
|
2025-11-08 16:41:19 +07:00 |
|
|
Tungdv
|
920317683b
|
fix: update logic show dialog npc.
|
2025-11-07 18:32:49 +07:00 |
|
|
VDH
|
d4af8e33f9
|
convert for test done
|
2025-11-07 18:01:47 +07:00 |
|
|
VDH
|
38a2c0d46f
|
covnert continue
|
2025-11-06 17:29:02 +07:00 |
|
|
MinhHai
|
10c5c0e306
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
|
2025-11-06 14:09:25 +07:00 |
|
|
MinhHai
|
82b9539f03
|
add data for task
|
2025-11-06 14:09:13 +07:00 |
|
|
Tungdv
|
60cd4236c1
|
feat: add manager dialog npc.
|
2025-11-05 18:13:46 +07:00 |
|
|
HungDK
|
14ed8ac2e9
|
Update else player revive on host client
|
2025-11-05 09:37:55 +07:00 |
|
|
Tungdv
|
9bf15bfb6f
|
feat: - add logic interact NPC.
|
2025-11-04 18:29:25 +07:00 |
|
|
VDH
|
eaf1a4ba2d
|
Merge remote-tracking branch 'origin/develop' into feature/skill-data
# Conflicts:
# .idea/.idea.perfect-world-unity/.idea/workspace.xml
# Assets/AddressableAssetsData.meta
# Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
# Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta
# Assets/AddressableAssetsData/AddressableAssetSettings.asset
# Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
# Assets/AddressableAssetsData/AssetGroupTemplates.meta
# Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
# Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
# Assets/AddressableAssetsData/AssetGroups.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset.meta
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset
# Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset.meta
# Assets/AddressableAssetsData/AssetGroups/models.asset
# Assets/AddressableAssetsData/AssetGroups/models.asset.meta
# Assets/AddressableAssetsData/DataBuilders.meta
# Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
# Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
# Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
# Assets/AddressableAssetsData/DefaultObject.asset
# Assets/AddressableAssetsData/DefaultObject.asset.meta
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-04 15:29:57 +07:00 |
|
|
HungDK
|
1f7c20069c
|
Merge branch 'develop' into feature/revive
|
2025-11-04 14:51:15 +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 |
|
|
HungDK
|
307f6d8b49
|
Add send revive cmd
|
2025-11-04 14:31:49 +07:00 |
|
|
NguyenVanDat
|
19a1ecfb70
|
Merge branch 'develop' into feature/else-player
|
2025-11-04 09:07:39 +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
|
10c7ba598b
|
convert continue :)))
|
2025-11-03 17:34:39 +07:00 |
|