Merge branch 'main' of ssh://192.168.0.8:29418/XianJing into hy_test

Assets/Editor/AssetBundle/CheckResWindowInfo.cs

@@ -83,28 +83,3 @@ public class CheckResWindowInfo : ScriptableObject
     }
 }
 
-[CreateAssetMenuAttribute(fileName = "ResInfo", menuName = "EditorConfig/创建检测资源更新配置文件ResInfo")]
-public class ResInfo : ScriptableObject
-{
-    public string Name = "Test";
-
-    public string CN_Name = "测试服";
-
-    public string OldPath = "C:/Users/Administrator/Desktop/My/项目/0";
-
-    public string NewPath = "./StreamingAssets/AssetsAndroid";
-
-    public string OutputPath = "C:/Users/Administrator/Desktop/My/项目/1";
-
-    public string VersionFileName = "Version";
-
-    public string mainfestFileName = "mainfest";
-
-    public string ResVersion = "0.1.0.0";
-
-    public List<string> IgnoreFiles;
-
-    public int ChangeNum;
-    public bool IsIgnore = true;
-    public BuildLanguage Language = BuildLanguage.cn;
-}

Assets/Editor/AssetBundle/Gn_0_1_Android.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Gn_0_1_Android
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Gn_0_1_Android

Assets/Editor/AssetBundle/Gn_0_1_Ios.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Gn_0_1_Ios
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Gn_0_1_Ios

Assets/Editor/AssetBundle/Gn_Zhuan_Android.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Gn_Zhuan_Android
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Gn_Zhuan_Android

Assets/Editor/AssetBundle/Gn_Zhuan_Ios.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Gn_Zhuan_Ios
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Gn_Zhuan_Ios

Assets/Editor/AssetBundle/HY_Ios_en.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: HY_Ios_en
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: HY_Ios_en

Assets/Editor/AssetBundle/Hy_Android.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Hy_Android
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Hy_Android

Assets/Editor/AssetBundle/Hy_Android_en.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Hy_Android_en
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Hy_Android_en

Assets/Editor/AssetBundle/Hy_Ios.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Hy_Ios
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Hy_Ios

Assets/Editor/AssetBundle/Hy_Test_en.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: Hy_Test_en
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Hy_Test_en

Assets/Editor/AssetBundle/ResInfo.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+
+[CreateAssetMenuAttribute(fileName = "ResInfo", menuName = "EditorConfig/创建检测资源更新配置文件ResInfo")]
+public class ResInfo : ScriptableObject
+{
+    public string Name = "Test";
+
+    public string CN_Name = "测试服";
+
+    public string OldPath = "C:/Users/Administrator/Desktop/My/项目/0";
+
+    public string NewPath = "./StreamingAssets/AssetsAndroid";
+
+    public string OutputPath = "C:/Users/Administrator/Desktop/My/项目/1";
+
+    public string VersionFileName = "Version";
+
+    public string mainfestFileName = "mainfest";
+
+    public string ResVersion = "0.1.0.0";
+
+    public List<string> IgnoreFiles;
+
+    public int ChangeNum;
+    public bool IsIgnore = true;
+    public BuildLanguage Language = BuildLanguage.cn;
+}

Assets/Editor/AssetBundle/ResInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 418e20e24f927b0488ef53e722321384
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/hy_Test.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
   m_Name: hy_Test
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Hy_Test