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

331 Commits

Author SHA1 Message Date
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
hoangvd fb2288c2a2 Merge pull request 'skill 1,2,3,4,5,6' (#52) from feature/skill-data into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/52
 2025-11-12 03:53:35 +00: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
HungDK ea53c30306 Merge branch 'feature/mall' into develop 2025-11-12 09:27:12 +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
VDH cbf626fa28 skill processing 2025-11-11 13:33:27 +07:00
NguyenVanDat b7bf20be75 show selecting vfx 2025-11-10 18:24:09 +07:00
HungDK f58d00a4ac Update shop categories 2025-11-10 16:13:31 +07:00
HungDK 32d0aeff3a Fix unexpect item order in each tab of mall 2025-11-10 10:52:05 +07:00
VDH eed08c2b13 bug skill data not received 2025-11-08 16:41:19 +07:00
VDH d4af8e33f9 convert for test done 2025-11-07 18:01:47 +07:00
NguyenVanDat e07be0d048 Merge branch 'develop' into feature/add-vfx 2025-11-07 17:38:19 +07:00
NguyenVanDat df07b1661d add gfx resource and vfx object base 2025-11-07 17:35:52 +07:00
HungDK 316d633525 Add overrides multi prefabs tool and clear missing scripts 2025-11-07 14:09:17 +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
HungDK 19b42000a0 Fix error update player distance to object 2025-11-05 16:37:32 +07:00
Le Duc Anh f338899f76 initial load all equipments 2025-11-05 16:08:51 +07:00
HungDK 07f7a36b08 Merge branch 'feature/revive' into develop 2025-11-05 09:38:45 +07:00
HungDK 14ed8ac2e9 Update else player revive on host client 2025-11-05 09:37:55 +07:00
HungDK 18c1465b1e Merge branch 'feature/revive' into develop 2025-11-04 15:38:07 +07:00
HungDK 61ce6be4fd Update EC_ManPlayer.cs 2025-11-04 15:36:43 +07:00
hoangvd 20e69d109b Merge pull request 'setup for esle player' (#46) from feature/HostAttack_Hoang into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/46
 2025-11-04 08:31:09 +00: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 28aff4cd75 Add work dead 2025-11-04 14:37:15 +07:00
HungDK 05d952860b Add revive handle on host and else player 2025-11-04 14:36:59 +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
VDH 4f3edae50d setup for esle player 2025-11-04 14:32:03 +07:00
HungDK 307f6d8b49 Add send revive cmd 2025-11-04 14:31:49 +07:00
HungDK 8278709a45 Add prefab and ui of revive system 2025-11-04 14:30:25 +07:00
NguyenVanDat acf01f0ba7 dummy fix showing weapon 2025-11-04 14:17:05 +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 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
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
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