Commit Graph

15 Commits

Author SHA1 Message Date
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
NguyenVanDat 814a151648 show dummy hit effect 2025-11-04 13:45:10 +07:00
NguyenVanDat 4316661cb2 skill convert processing 2025-10-31 17:50:04 +07:00
NguyenVanDat 0d358f867d ui info hosst player and npc done 2025-10-28 17:22:03 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH c0d4478b38 name npc 2025-10-23 17:33:12 +07:00
HungDK e9c69ab511 Add buy cmd 2025-10-17 17:53:34 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK 190b2f522e Add GShopLoader 2025-10-14 10:53:16 +07:00
Le Duc Anh fab1fd0534 fix data type size 2025-10-11 09:56:30 +07:00
VDH 1b2de221b4 animation npc Process 2025-09-29 18:26:02 +07:00
VDH 78152af05d npc Process 2025-09-25 17:38:33 +07:00
Le Duc Anh 1cf373bb96 Add Monster Scene 2025-09-24 14:26:11 +07:00
VDH 0dd73da3c4 animation host done 2025-09-19 17:39:39 +07:00
Le Duc Anh fc3e8c4b82 elementdataman 2025-09-13 14:58:00 +07:00