Merge branch '02.InformationSave' of http://192.168.31.100:8088/framework/xosmopluginlibrary into 02.InformationSave
# Conflicts: # Assets/02.InformationSave/package.json
This commit is contained in:
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "InformationSave.Editor",
|
||||
"rootNamespace": "",
|
||||
"references": [
|
||||
"GUID:798515657a60df04299a490c4f01f2b7"
|
||||
],
|
||||
"includePlatforms": [
|
||||
"Editor"
|
||||
],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"overrideReferences": false,
|
||||
"precompiledReferences": [],
|
||||
"autoReferenced": true,
|
||||
"defineConstraints": [],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 31bb7766059e37c42b8898e180dc877f
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1 +1 @@
|
||||
# 代码检查工具
|
||||
# 信息配置保存工具
|
||||
|
||||
@@ -89,7 +89,7 @@ namespace Stary.Evo.InformationSave
|
||||
if(scriptObjectSaveData == null)
|
||||
{
|
||||
scriptObjectSaveData = CheckAndCreateFoldersAndAsset();
|
||||
Debug.Log("创建了ScriptObjectSaveData文件");
|
||||
//Debug.Log("创建了ScriptObjectSaveData文件");
|
||||
}
|
||||
|
||||
if (scriptObjectSaveData.dic == null)
|
||||
@@ -151,7 +151,7 @@ namespace Stary.Evo.InformationSave
|
||||
AssetDatabase.CreateAsset(scriptableObject, "Assets/" + ResourcesFolderName + "/" + InformationSaveDataFolderName + "/" + ScriptObjectSaveDataFileName + ".asset");
|
||||
AssetDatabase.SaveAssets();
|
||||
AssetDatabase.Refresh();
|
||||
|
||||
Debug.Log("创建了: " + "Assets/" + ResourcesFolderName + "/" + InformationSaveDataFolderName + "/" + ScriptObjectSaveDataFileName + ".asset 资产");
|
||||
return scriptableObject;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "InformationSave.RunTime",
|
||||
"rootNamespace": "",
|
||||
"references": [],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"overrideReferences": false,
|
||||
"precompiledReferences": [],
|
||||
"autoReferenced": true,
|
||||
"defineConstraints": [],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 798515657a60df04299a490c4f01f2b7
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user