Merge branch '02.InformationSave' into master1
# Conflicts: # .gitlab-ci.yml # Assets/01.CodeChecker.meta # Assets/01.CodeChecker/Editor.meta # Assets/01.CodeChecker/Editor/UnityRoslyn.meta # Assets/02.InformationSave/Editor/InformationSave.Editor.asmdef.meta # Assets/02.InformationSave/RunTime/InformationSave.RunTime.asmdef.meta # Assets/03.FiniteStateMachine/README.md # Assets/03.FiniteStateMachine/RunTime/Abstract/IState.cs.meta # Assets/03.FiniteStateMachine/RunTime/Base/FSMController.cs.meta # Assets/03.FiniteStateMachine/RunTime/Use/FSMInitialize.cs.meta # Assets/03.FiniteStateMachine/RunTime/Use/FSMManager.cs.meta # Assets/03.FiniteStateMachine/package.json # Assets/04.AudioCore/README.md # Assets/04.AudioCore/RunTime/Abstract/IAudio.cs # Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta # Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs # Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta # Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs # Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs.meta # Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs # Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs.meta # Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs # Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs.meta # Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs # Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs.meta # Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs # Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs.meta # Assets/04.AudioCore/package.json # Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs.meta # Assets/05.TableTextConversion/Editor/EditorFrameworkUtils.cs.meta # Assets/05.TableTextConversion/Editor/Excel.meta # Assets/05.TableTextConversion/README.md # Assets/05.TableTextConversion/RunTime/Abstract.meta # Assets/05.TableTextConversion/RunTime/Base.meta # Assets/05.TableTextConversion/RunTime/Test.cs.meta # Assets/05.TableTextConversion/RunTime/Use.meta # Assets/05.TableTextConversion/package.json # Assets/Plugins.meta
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,13 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Abstract.meta
|
||||
guid: 3f4958b2707b1874fb59e045842881b7
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
========
|
||||
guid: 31bb7766059e37c42b8898e180dc877f
|
||||
AssemblyDefinitionImporter:
|
||||
>>>>>>>> 02.InformationSave:Assets/02.InformationSave/Editor/InformationSave.Editor.asmdef.meta
|
||||
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,13 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Base.meta
|
||||
guid: f458924b47972e344ab95e73c17cec83
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
========
|
||||
guid: 798515657a60df04299a490c4f01f2b7
|
||||
AssemblyDefinitionImporter:
|
||||
>>>>>>>> 02.InformationSave:Assets/02.InformationSave/RunTime/InformationSave.RunTime.asmdef.meta
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "com.staryevo.informationsave",
|
||||
"displayName": "02.InformationSave",
|
||||
"version": "1.0.0",
|
||||
"displayName": "01.InformationSave",
|
||||
"description": "位置配置工具",
|
||||
"unity": "2021.3",
|
||||
"unityRelease": "30f1",
|
||||
@@ -9,8 +9,12 @@
|
||||
"unity",
|
||||
"scirpt"
|
||||
],
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "http://192.168.31.100:8088/framework/xosmopluginlibrary.git#02.InformationSave"
|
||||
},
|
||||
"author": {
|
||||
"name": "01.InformationSave",
|
||||
"name": "staryEvo",
|
||||
"url": "https://www.unity3d.com"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user