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

..

AAssit.cs

complete read properties of Task

2025-11-03 17:26:34 +07:00

AAssit.cs.meta

elementdataman

2025-09-13 14:58:00 +07:00

elementdataman.cs

Merge remote-tracking branch 'origin/develop' into feature/skill-data

2025-11-04 15:29:57 +07:00

elementdataman.cs.meta

elementdataman

2025-09-13 14:58:00 +07:00

ElementDataManProvider.cs

change Logger to BMLogger

2025-10-01 15:14:38 +07:00

ElementDataManProvider.cs.meta

elementdataman

2025-09-13 14:58:00 +07:00

globaldataman.cs

Add buy cmd

2025-10-17 17:53:34 +07:00

globaldataman.cs.meta

Add globaldataman

2025-10-14 10:53:03 +07:00