diff --git a/ProjectNLD/Assets/Code/Scripts/HotUpdate/Editor/HotUpadeEditorHelper.cs b/ProjectNLD/Assets/Code/Scripts/HotUpdate/Editor/HotUpadeEditorHelper.cs index 6ee9e73b48b..f65d94f7fec 100644 --- a/ProjectNLD/Assets/Code/Scripts/HotUpdate/Editor/HotUpadeEditorHelper.cs +++ b/ProjectNLD/Assets/Code/Scripts/HotUpdate/Editor/HotUpadeEditorHelper.cs @@ -22,7 +22,7 @@ public static class HotUpadeEditorHelper [MenuItem("Tools/热更新/转移热更dll")] public static void CopyHotUpdateDll() { - VersionControlSystem.Checkout(HOT_UPDATE_DLLS_DIR); + // VersionControlSystem.Checkout(HOT_UPDATE_DLLS_DIR); var assemblies = SettingsUtil.HotUpdateAssemblyNamesExcludePreserved; var dir = new DirectoryInfo(Application.dataPath + HOT_UPDATE_DLL_PATH + EditorUserBuildSettings.activeBuildTarget); var files = dir.GetFiles(); @@ -44,7 +44,7 @@ public static class HotUpadeEditorHelper [MenuItem("Tools/热更新/转移补充元数据dll")] public static void CopyMetaDataDll() { - VersionControlSystem.Checkout(HOT_UPDATE_DLLS_DIR); + // VersionControlSystem.Checkout(HOT_UPDATE_DLLS_DIR); List assemblies = GetMetaDataDllList(); var dir = new DirectoryInfo(Application.dataPath + META_DATA_DLL_PATH + EditorUserBuildSettings.activeBuildTarget); var files = dir.GetFiles(); diff --git a/ProjectNLD/Assets/Editor/AnimCompressor/LTCompressor.cs b/ProjectNLD/Assets/Editor/AnimCompressor/LTCompressor.cs index 7d39cfd2f56..f28eaf900b1 100644 --- a/ProjectNLD/Assets/Editor/AnimCompressor/LTCompressor.cs +++ b/ProjectNLD/Assets/Editor/AnimCompressor/LTCompressor.cs @@ -40,7 +40,7 @@ public class LTCompressor return; } // 检出 - VersionControlSystem.Checkout(assetPath); + // VersionControlSystem.Checkout(assetPath); _CompressAnim(loadController); } diff --git a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs index 5082844418b..6806609ef99 100644 --- a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs +++ b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs @@ -338,7 +338,7 @@ class BuildLauncher bool ignoreHotUpdate, bool needClearCached = false) { - VersionControlSystem.GetLast(); + // VersionControlSystem.GetLast(); SetEnableHotUpdate(!ignoreHotUpdate); var contentBuildSucceeded = BuildAddressables(buildTarget, profileName, version, workSpace, ignoreHotUpdate, needClearCached); diff --git a/ProjectNLD/Assets/Editor/Common/BuildWindow.cs b/ProjectNLD/Assets/Editor/Common/BuildWindow.cs index 540370d9079..01a87b7542b 100644 --- a/ProjectNLD/Assets/Editor/Common/BuildWindow.cs +++ b/ProjectNLD/Assets/Editor/Common/BuildWindow.cs @@ -111,7 +111,7 @@ public class BuildWindow : OdinEditorWindow needClearCache); } - VersionControlSystem.Revert("Assets/AddressableAssetsData/AssetGroups"); + // VersionControlSystem.Revert("Assets/AddressableAssetsData/AssetGroups"); } [PropertySpace(50)] diff --git a/ProjectNLD/Assets/Editor/LevelEditor/LevelEditorWindow.cs b/ProjectNLD/Assets/Editor/LevelEditor/LevelEditorWindow.cs index ec5992858b7..f83a0698e32 100644 --- a/ProjectNLD/Assets/Editor/LevelEditor/LevelEditorWindow.cs +++ b/ProjectNLD/Assets/Editor/LevelEditor/LevelEditorWindow.cs @@ -102,7 +102,7 @@ public class LevelEditorWindow : OdinEditorWindow { CheckCorrectLevel(); var configFilePath = string.Format(Constants.LEVEL_CONFIG_FORMAT_PATH, currentLevelData.id); - VersionControlSystem.Checkout(configFilePath); + // VersionControlSystem.Checkout(configFilePath); JsonHelper.SaveJson(configFilePath, currentLevelData); UpdateLevelList(currentLevelData); CustomPopUpWindow.PopUp($"保存关卡数据成功:{configFilePath}"); @@ -212,7 +212,7 @@ public class LevelEditorWindow : OdinEditorWindow private void SaveLevelList() { var configFilePath = string.Format(Constants.LEVEL_LIST_PATH); - VersionControlSystem.Checkout(configFilePath); + // VersionControlSystem.Checkout(configFilePath); JsonHelper.SaveJson(configFilePath, LevelList); } diff --git a/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs b/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs index ed2f3e0eb1c..2c8447251bf 100644 --- a/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs +++ b/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs @@ -93,10 +93,10 @@ public class MapEditorUtils prefabFilePath, InteractionMode.UserAction); var configFilePath = string.Format(Constants.MAP_CONFIG_FORMAT_PATH, map.GetMapFileName()); - if (File.Exists(configFilePath)) - { - VersionControlSystem.Checkout(configFilePath); - } + // if (File.Exists(configFilePath)) + // { + // VersionControlSystem.Checkout(configFilePath); + // } Framework.JsonHelper.SaveJson(configFilePath, map.MapData); if (File.Exists(prefabFilePath) && File.Exists(configFilePath)) diff --git a/ProjectNLD/Assets/Editor/MapEditor/MapEditorWindow.cs b/ProjectNLD/Assets/Editor/MapEditor/MapEditorWindow.cs index 72adf0480e0..795b2617437 100644 --- a/ProjectNLD/Assets/Editor/MapEditor/MapEditorWindow.cs +++ b/ProjectNLD/Assets/Editor/MapEditor/MapEditorWindow.cs @@ -752,7 +752,7 @@ namespace MapEditor private void SaveMapList() { var configFilePath = string.Format(Constants.MAP_CONFIG_FORMAT_PATH, "MapList"); - VersionControlSystem.Checkout(configFilePath); + // VersionControlSystem.Checkout(configFilePath); JsonHelper.SaveJson(configFilePath, MapList); } diff --git a/ProjectNLD/Assets/Editor/MapEditor/TerrainTypeConfigWindow.cs b/ProjectNLD/Assets/Editor/MapEditor/TerrainTypeConfigWindow.cs index e8afbcec46f..dfa00286a4a 100644 --- a/ProjectNLD/Assets/Editor/MapEditor/TerrainTypeConfigWindow.cs +++ b/ProjectNLD/Assets/Editor/MapEditor/TerrainTypeConfigWindow.cs @@ -21,7 +21,7 @@ namespace MapEditor [Button("保存")] private void Save() { - VersionControlSystem.Checkout(Constants.TERRAIN_TYPE_CONFIG_PATH); + // VersionControlSystem.Checkout(Constants.TERRAIN_TYPE_CONFIG_PATH); TerrainTypeConfig.Save(terrainTypeProperties); CustomPopUpWindow.PopUp($"保存地块属性成功"); } diff --git a/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimOverrideHandle.cs b/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimOverrideHandle.cs index 89c328b10ad..4a1dbf308c9 100644 --- a/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimOverrideHandle.cs +++ b/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimOverrideHandle.cs @@ -17,7 +17,7 @@ public class AnimOverrideHandle // 先进行checkout var path = AssetDatabase.GetAssetPath(asset); - VersionControlSystem.Checkout(path); + // VersionControlSystem.Checkout(path); // 再进行设置 // 找到工程内所有clips @@ -91,8 +91,8 @@ public class AnimOverrideHandle } // 先进行checkout - var path = AssetDatabase.GetAssetPath(asset); - VersionControlSystem.Checkout(path); + // var path = AssetDatabase.GetAssetPath(asset); + // VersionControlSystem.Checkout(path); // 再进行设置 // 找到工程内所有clips diff --git a/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimatorInfoExporter.cs b/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimatorInfoExporter.cs index 82ce8f5f040..7ea29d1fcf1 100644 --- a/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimatorInfoExporter.cs +++ b/ProjectNLD/Assets/Editor/SkillEditor/Ext/AnimatorInfoExporter.cs @@ -18,7 +18,7 @@ namespace SkillEditor { Directory.CreateDirectory(saveFolderPath); } - VersionControlSystem.Checkout(saveFolderPath); + // VersionControlSystem.Checkout(saveFolderPath); // 通过配置表读取所有角色 var characterList = EditorTableManager.instance.tables.CharacterAttri.DataList; diff --git a/ProjectNLD/Assets/Editor/SkillEditor/Ext/CharacterBuilder.cs b/ProjectNLD/Assets/Editor/SkillEditor/Ext/CharacterBuilder.cs index 1a3f6d20e3b..ca7ab26ab71 100644 --- a/ProjectNLD/Assets/Editor/SkillEditor/Ext/CharacterBuilder.cs +++ b/ProjectNLD/Assets/Editor/SkillEditor/Ext/CharacterBuilder.cs @@ -64,7 +64,7 @@ namespace SkillEditor private bool _CheckModelImportSetting(string fbxPath) { // 先checkout资源 - VersionControlSystem.Checkout(fbxPath); + // VersionControlSystem.Checkout(fbxPath); // 获取import var importer = AssetImporter.GetAtPath(fbxPath) as ModelImporter; diff --git a/ProjectNLD/Assets/Editor/Story/Utils/ClipAutoCutter.cs b/ProjectNLD/Assets/Editor/Story/Utils/ClipAutoCutter.cs index a876bca070d..680135f9fc5 100644 --- a/ProjectNLD/Assets/Editor/Story/Utils/ClipAutoCutter.cs +++ b/ProjectNLD/Assets/Editor/Story/Utils/ClipAutoCutter.cs @@ -25,7 +25,7 @@ namespace Gameplay.Story.Cmp.Utils private static void _Process(string fbxPath, List startFrames, List loopFrames, List endFrames) { - VersionControlSystem.Checkout(fbxPath); + // VersionControlSystem.Checkout(fbxPath); var impoter = AssetImporter.GetAtPath(fbxPath) as ModelImporter; if (impoter == null) { diff --git a/ProjectNLD/Assets/Editor/Story/Utils/TimelineUtils.cs b/ProjectNLD/Assets/Editor/Story/Utils/TimelineUtils.cs index 1e906753dfb..36b0dbc2e18 100644 --- a/ProjectNLD/Assets/Editor/Story/Utils/TimelineUtils.cs +++ b/ProjectNLD/Assets/Editor/Story/Utils/TimelineUtils.cs @@ -57,7 +57,7 @@ namespace Gameplay.Story.Cmp.Utils if (System.IO.File.Exists(fullPath)) { // 先进行checkout - VersionControlSystem.Checkout(savePath); + // VersionControlSystem.Checkout(savePath); AssetDatabase.DeleteAsset(savePath); AssetDatabase.Refresh(); diff --git a/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigTools.cs b/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigTools.cs index aefee813f33..beb28cf6dd7 100644 --- a/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigTools.cs +++ b/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigTools.cs @@ -37,8 +37,8 @@ public static class ConfigTools EditorUtility.DisplayProgressBar("配置工具", "正在导出配置到【Client】", 0); try { - VersionControlSystem.Checkout(Application.dataPath + "/Code/Scripts/Gameplay/DataTable"); - VersionControlSystem.Checkout(Application.dataPath + "/Config/Data"); + // VersionControlSystem.Checkout(Application.dataPath + "/Code/Scripts/Gameplay/DataTable"); + // VersionControlSystem.Checkout(Application.dataPath + "/Config/Data"); #if UNITY_EDITOR_WIN var dirInfo = new DirectoryInfo(CONFIG_DIR); EditorUtil.StartProcess(dirInfo.FullName + CMD_PARAM, Application.dataPath, CONFIG_DIR); diff --git a/ProjectNLD/Assets/Editor/Tools/AutoSetPerforce/AutoSetPerforce.cs b/ProjectNLD/Assets/Editor/Tools/AutoSetPerforce/AutoSetPerforce.cs index b4233464412..991df539284 100644 --- a/ProjectNLD/Assets/Editor/Tools/AutoSetPerforce/AutoSetPerforce.cs +++ b/ProjectNLD/Assets/Editor/Tools/AutoSetPerforce/AutoSetPerforce.cs @@ -1,38 +1,38 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEditor; -using UnityEditor.VersionControl; - -public class AutoSetPerforce -{ - - private static string[] needCheckOutPath = { - "Assets/Code/Scripts/Gameplay/DataTable", - "Assets/Config/Data", - }; - - [MenuItem("Tools/AutoCheckOut")] - public static void AutoCheckOut() - { - _CheckPerforce(); - } - - private static void _CheckPerforce() - { - // 检测文件 - for (var i = 0; i < needCheckOutPath.Length; ++i) - { - var path = needCheckOutPath[i]; - _CheckOutFile(path); - } - } - - private static void _CheckOutFile(string path) - { - if (VersionControlUtils.IsPathVersioned(path)) - { - Provider.Checkout(path, CheckoutMode.Both); - } - } -} +// using System.Collections; +// using System.Collections.Generic; +// using UnityEngine; +// using UnityEditor; +// using UnityEditor.VersionControl; +// +// public class AutoSetPerforce +// { +// +// private static string[] needCheckOutPath = { +// "Assets/Code/Scripts/Gameplay/DataTable", +// "Assets/Config/Data", +// }; +// +// [MenuItem("Tools/AutoCheckOut")] +// public static void AutoCheckOut() +// { +// _CheckPerforce(); +// } +// +// private static void _CheckPerforce() +// { +// // 检测文件 +// for (var i = 0; i < needCheckOutPath.Length; ++i) +// { +// var path = needCheckOutPath[i]; +// _CheckOutFile(path); +// } +// } +// +// private static void _CheckOutFile(string path) +// { +// if (VersionControlUtils.IsPathVersioned(path)) +// { +// Provider.Checkout(path, CheckoutMode.Both); +// } +// } +// } diff --git a/ProjectNLD/Assets/Editor/Tools/Proto/ProtoTools.cs b/ProjectNLD/Assets/Editor/Tools/Proto/ProtoTools.cs index 7fdc468639d..6f1207eaa6d 100644 --- a/ProjectNLD/Assets/Editor/Tools/Proto/ProtoTools.cs +++ b/ProjectNLD/Assets/Editor/Tools/Proto/ProtoTools.cs @@ -33,7 +33,7 @@ public static class ProtoTools string [] csProto = new string[] { "client.proto", "message_id.proto", "common.proto"}; - VersionControlSystem.Checkout(outputDir); + // VersionControlSystem.Checkout(outputDir); for (int i = 0; i < csProto.Length; i ++) { @@ -231,7 +231,7 @@ public static class ProtoTools string codePath = Application.dataPath + $"/Code/Scripts/Gameplay/Net/Messages/MSG_{msgID}.cs"; if(!File.Exists(codePath)) { - VersionControlSystem.Checkout(Application.dataPath + "/Code/Scripts/Gameplay/Net/Messages"); + // VersionControlSystem.Checkout(Application.dataPath + "/Code/Scripts/Gameplay/Net/Messages"); string content = TmpContent.Replace("_MSG_NAME_", msgID); DateTime currentDateTime = DateTime.Now; @@ -258,7 +258,7 @@ public static class ProtoTools string codeMessagePool = Application.dataPath + "/Code/Scripts/Gameplay/Net/Client/NetManager.cs"; - VersionControlSystem.Checkout(codeMessagePool); + // VersionControlSystem.Checkout(codeMessagePool); EditorUtil.ReplaceContentByTag(codeMessagePool, "MESSAGE_START", "MESSAGE_END", messagePoolStr); } } \ No newline at end of file diff --git a/ProjectNLD/Assets/Editor/Tools/UIComponentTool/GetUIPath.cs b/ProjectNLD/Assets/Editor/Tools/UIComponentTool/GetUIPath.cs index 04af230c42a..acddeab3d5f 100644 --- a/ProjectNLD/Assets/Editor/Tools/UIComponentTool/GetUIPath.cs +++ b/ProjectNLD/Assets/Editor/Tools/UIComponentTool/GetUIPath.cs @@ -149,8 +149,8 @@ public class GetUIPath :Editor //写入绑定文件 if (File.Exists(dataFileName)) { - var bindName = _genFilePath + _selectGo.name + "Binder.cs"; - VersionControlSystem.Checkout(bindName); + // var bindName = _genFilePath + _selectGo.name + "Binder.cs"; + // VersionControlSystem.Checkout(bindName); File.Delete(dataFileName); }