Przeglądaj źródła

Config直接生成到Bundles/Config目录

tanghai 6 lat temu
rodzic
commit
2a7b1c566a

+ 8 - 0
Unity/Assets/Bundles/Code.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 74f3c0d89734b0442bd2fd678368dccf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: code.unity3d
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Bundles/Config.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ff3acf49577de0f44b9e1e1afc6f131e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: config.unity3d
+  assetBundleVariant: 

+ 0 - 0
Unity/Assets/Res/Config/BuffConfig.txt → Unity/Assets/Bundles/Config/BuffConfig.txt


+ 0 - 0
Unity/Assets/Res/Config/BuffConfig.txt.meta → Unity/Assets/Bundles/Config/BuffConfig.txt.meta


+ 0 - 0
Unity/Assets/Res/Config/UnitConfig.txt → Unity/Assets/Bundles/Config/UnitConfig.txt


+ 0 - 0
Unity/Assets/Res/Config/UnitConfig.txt.meta → Unity/Assets/Bundles/Config/UnitConfig.txt.meta


+ 0 - 9
Unity/Assets/Bundles/Independent.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 237e3e5817a41f04885c3b9cfa95b8e3
-folderAsset: yes
-timeCreated: 1513821452
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 50
Unity/Assets/Bundles/Independent/Code.prefab

@@ -1,50 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &184536
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 425028}
-  - component: {fileID: 114000012985339954}
-  m_Layer: 0
-  m_Name: Code
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &425028
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184536}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114000012985339954
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184536}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 502d8cafd6a5a0447ab1db9a24cdcb10, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: Hotfix.dll
-    gameObject: {fileID: 4900000, guid: ae44b218243cfc347af99a6875e9e11c, type: 3}
-  - key: Hotfix.pdb
-    gameObject: {fileID: 4900000, guid: dd08ff64f788e7a4ba0f918632ff8d0f, type: 3}

+ 0 - 9
Unity/Assets/Bundles/Independent/Code.prefab.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 3b43dd0baf9d83c4894a9b47b019a45b
-timeCreated: 1474946800
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: code.unity3d
-  assetBundleVariant: 

+ 0 - 50
Unity/Assets/Bundles/Independent/Config.prefab

@@ -1,50 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &184536
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 425028}
-  - component: {fileID: 114000012985339954}
-  m_Layer: 0
-  m_Name: Config
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &425028
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184536}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114000012985339954
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184536}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 502d8cafd6a5a0447ab1db9a24cdcb10, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: BuffConfig
-    gameObject: {fileID: 4900000, guid: 0f3540faabf2b7e4c83e81cb7ba6a096, type: 3}
-  - key: UnitConfig
-    gameObject: {fileID: 4900000, guid: c245c7dda13b3ad43b2278925e922899, type: 3}

+ 0 - 9
Unity/Assets/Bundles/Independent/Config.prefab.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 59151e2fab0f8f645bac00178f4344ac
-timeCreated: 1474946800
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: config.unity3d
-  assetBundleVariant: 

+ 1 - 1
Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs

@@ -53,7 +53,7 @@ public class ExcelExporterEditor : EditorWindow
 	{
 		try
 		{
-			const string clientPath = "./Assets/Res/Config";
+			const string clientPath = "./Assets/Bundles/Config";
 
 			if (GUILayout.Button("导出客户端配置"))
 			{

+ 0 - 12
Unity/Assets/Model/Entity/Hotfix.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 215cac430b6981846af57c700e50a0bf
-timeCreated: 1519355490
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 2
Unity/Assets/Model/Module/Config/ConfigHelper.cs

@@ -9,8 +9,7 @@ namespace ETModel
 		{
 			try
 			{
-				GameObject config = (GameObject)Game.Scene.GetComponent<ResourcesComponent>().GetAsset("config.unity3d", "Config");
-				string configStr = config.Get<TextAsset>(key).text;
+				string configStr = ((TextAsset)Game.Scene.GetComponent<ResourcesComponent>().GetAsset("config.unity3d", key)).text;
 				return configStr;
 			}
 			catch (Exception e)

BIN
Unity/Assets/Res/Code/Hotfix.dll.bytes


+ 0 - 8
Unity/Assets/Res/Code/Hotfix.dll.bytes.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ae44b218243cfc347af99a6875e9e11c
-timeCreated: 1508122562
-licenseType: Free
-TextScriptImporter:
-  userData: 
-  assetBundleName: code.unity3d
-  assetBundleVariant: 

BIN
Unity/Assets/Res/Code/Hotfix.pdb.bytes


+ 0 - 8
Unity/Assets/Res/Code/Hotfix.pdb.bytes.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dd08ff64f788e7a4ba0f918632ff8d0f
-timeCreated: 1508122562
-licenseType: Free
-TextScriptImporter:
-  userData: 
-  assetBundleName: code.unity3d
-  assetBundleVariant: 

+ 0 - 9
Unity/Assets/Res/Config.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 2e50214f335e0e94c90746b289a9ef48
-folderAsset: yes
-timeCreated: 1505113690
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 3
Unity/Assets/Res/Code.meta → Unity/Assets/Resources/Config.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 4805d347ea85a2c4ab97f544d710a65d
+guid: 6660ff60f7ce1cb4d8b5ccd23c1e496e
 folderAsset: yes
-timeCreated: 1476778403
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 0 - 0
Unity/Assets/Res/Config/GlobalProto.txt → Unity/Assets/Resources/Config/GlobalProto.txt


+ 0 - 0
Unity/Assets/Res/Config/GlobalProto.txt.meta → Unity/Assets/Resources/Config/GlobalProto.txt.meta