From 2a7b1c566a4e6f13565fe4d2e4e757d1fee888ce Mon Sep 17 00:00:00 2001 From: tanghai Date: Sat, 15 Feb 2020 23:05:27 +0800 Subject: [PATCH] =?UTF-8?q?Config=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=88=B0Bundles/Config=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Unity/Assets/Bundles/Code.meta | 8 +++ Unity/Assets/Bundles/Config.meta | 8 +++ .../{Res => Bundles}/Config/BuffConfig.txt | 0 .../Config/BuffConfig.txt.meta | 0 .../{Res => Bundles}/Config/UnitConfig.txt | 0 .../Config/UnitConfig.txt.meta | 0 Unity/Assets/Bundles/Independent.meta | 9 ---- Unity/Assets/Bundles/Independent/Code.prefab | 50 ------------------ .../Bundles/Independent/Code.prefab.meta | 9 ---- .../Assets/Bundles/Independent/Config.prefab | 50 ------------------ .../Bundles/Independent/Config.prefab.meta | 9 ---- .../ExcelExporterEditor.cs | 2 +- Unity/Assets/Model/Entity/Hotfix.cs.meta | 12 ----- .../Model/Module/Config/ConfigHelper.cs | 3 +- Unity/Assets/Res/Code/Hotfix.dll.bytes | Bin 4608 -> 0 bytes Unity/Assets/Res/Code/Hotfix.dll.bytes.meta | 8 --- Unity/Assets/Res/Code/Hotfix.pdb.bytes | Bin 612 -> 0 bytes Unity/Assets/Res/Code/Hotfix.pdb.bytes.meta | 8 --- Unity/Assets/Res/Config.meta | 9 ---- .../{Res/Code.meta => Resources/Config.meta} | 5 +- .../{Res => Resources}/Config/GlobalProto.txt | 0 .../Config/GlobalProto.txt.meta | 0 22 files changed, 20 insertions(+), 170 deletions(-) create mode 100644 Unity/Assets/Bundles/Code.meta create mode 100644 Unity/Assets/Bundles/Config.meta rename Unity/Assets/{Res => Bundles}/Config/BuffConfig.txt (100%) rename Unity/Assets/{Res => Bundles}/Config/BuffConfig.txt.meta (100%) rename Unity/Assets/{Res => Bundles}/Config/UnitConfig.txt (100%) rename Unity/Assets/{Res => Bundles}/Config/UnitConfig.txt.meta (100%) delete mode 100644 Unity/Assets/Bundles/Independent.meta delete mode 100644 Unity/Assets/Bundles/Independent/Code.prefab delete mode 100644 Unity/Assets/Bundles/Independent/Code.prefab.meta delete mode 100644 Unity/Assets/Bundles/Independent/Config.prefab delete mode 100644 Unity/Assets/Bundles/Independent/Config.prefab.meta delete mode 100644 Unity/Assets/Model/Entity/Hotfix.cs.meta delete mode 100644 Unity/Assets/Res/Code/Hotfix.dll.bytes delete mode 100644 Unity/Assets/Res/Code/Hotfix.dll.bytes.meta delete mode 100644 Unity/Assets/Res/Code/Hotfix.pdb.bytes delete mode 100644 Unity/Assets/Res/Code/Hotfix.pdb.bytes.meta delete mode 100644 Unity/Assets/Res/Config.meta rename Unity/Assets/{Res/Code.meta => Resources/Config.meta} (58%) rename Unity/Assets/{Res => Resources}/Config/GlobalProto.txt (100%) rename Unity/Assets/{Res => Resources}/Config/GlobalProto.txt.meta (100%) diff --git a/Unity/Assets/Bundles/Code.meta b/Unity/Assets/Bundles/Code.meta new file mode 100644 index 00000000..cb8cda0f --- /dev/null +++ b/Unity/Assets/Bundles/Code.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74f3c0d89734b0442bd2fd678368dccf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: code.unity3d + assetBundleVariant: diff --git a/Unity/Assets/Bundles/Config.meta b/Unity/Assets/Bundles/Config.meta new file mode 100644 index 00000000..3820586a --- /dev/null +++ b/Unity/Assets/Bundles/Config.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff3acf49577de0f44b9e1e1afc6f131e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: config.unity3d + assetBundleVariant: diff --git a/Unity/Assets/Res/Config/BuffConfig.txt b/Unity/Assets/Bundles/Config/BuffConfig.txt similarity index 100% rename from Unity/Assets/Res/Config/BuffConfig.txt rename to Unity/Assets/Bundles/Config/BuffConfig.txt diff --git a/Unity/Assets/Res/Config/BuffConfig.txt.meta b/Unity/Assets/Bundles/Config/BuffConfig.txt.meta similarity index 100% rename from Unity/Assets/Res/Config/BuffConfig.txt.meta rename to Unity/Assets/Bundles/Config/BuffConfig.txt.meta diff --git a/Unity/Assets/Res/Config/UnitConfig.txt b/Unity/Assets/Bundles/Config/UnitConfig.txt similarity index 100% rename from Unity/Assets/Res/Config/UnitConfig.txt rename to Unity/Assets/Bundles/Config/UnitConfig.txt diff --git a/Unity/Assets/Res/Config/UnitConfig.txt.meta b/Unity/Assets/Bundles/Config/UnitConfig.txt.meta similarity index 100% rename from Unity/Assets/Res/Config/UnitConfig.txt.meta rename to Unity/Assets/Bundles/Config/UnitConfig.txt.meta diff --git a/Unity/Assets/Bundles/Independent.meta b/Unity/Assets/Bundles/Independent.meta deleted file mode 100644 index b4243290..00000000 --- a/Unity/Assets/Bundles/Independent.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 237e3e5817a41f04885c3b9cfa95b8e3 -folderAsset: yes -timeCreated: 1513821452 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Bundles/Independent/Code.prefab b/Unity/Assets/Bundles/Independent/Code.prefab deleted file mode 100644 index 365e3e08..00000000 --- a/Unity/Assets/Bundles/Independent/Code.prefab +++ /dev/null @@ -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} diff --git a/Unity/Assets/Bundles/Independent/Code.prefab.meta b/Unity/Assets/Bundles/Independent/Code.prefab.meta deleted file mode 100644 index 844349ec..00000000 --- a/Unity/Assets/Bundles/Independent/Code.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3b43dd0baf9d83c4894a9b47b019a45b -timeCreated: 1474946800 -licenseType: Pro -NativeFormatImporter: - mainObjectFileID: 0 - userData: - assetBundleName: code.unity3d - assetBundleVariant: diff --git a/Unity/Assets/Bundles/Independent/Config.prefab b/Unity/Assets/Bundles/Independent/Config.prefab deleted file mode 100644 index 8aa61535..00000000 --- a/Unity/Assets/Bundles/Independent/Config.prefab +++ /dev/null @@ -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} diff --git a/Unity/Assets/Bundles/Independent/Config.prefab.meta b/Unity/Assets/Bundles/Independent/Config.prefab.meta deleted file mode 100644 index 7c583dc9..00000000 --- a/Unity/Assets/Bundles/Independent/Config.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 59151e2fab0f8f645bac00178f4344ac -timeCreated: 1474946800 -licenseType: Pro -NativeFormatImporter: - mainObjectFileID: 0 - userData: - assetBundleName: config.unity3d - assetBundleVariant: diff --git a/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs b/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs index 30fac9d1..ff3f7535 100644 --- a/Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs +++ b/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("导出客户端配置")) { diff --git a/Unity/Assets/Model/Entity/Hotfix.cs.meta b/Unity/Assets/Model/Entity/Hotfix.cs.meta deleted file mode 100644 index 0a0d5d44..00000000 --- a/Unity/Assets/Model/Entity/Hotfix.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 215cac430b6981846af57c700e50a0bf -timeCreated: 1519355490 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Model/Module/Config/ConfigHelper.cs b/Unity/Assets/Model/Module/Config/ConfigHelper.cs index 103739eb..5711a582 100644 --- a/Unity/Assets/Model/Module/Config/ConfigHelper.cs +++ b/Unity/Assets/Model/Module/Config/ConfigHelper.cs @@ -9,8 +9,7 @@ namespace ETModel { try { - GameObject config = (GameObject)Game.Scene.GetComponent().GetAsset("config.unity3d", "Config"); - string configStr = config.Get(key).text; + string configStr = ((TextAsset)Game.Scene.GetComponent().GetAsset("config.unity3d", key)).text; return configStr; } catch (Exception e) diff --git a/Unity/Assets/Res/Code/Hotfix.dll.bytes b/Unity/Assets/Res/Code/Hotfix.dll.bytes deleted file mode 100644 index fde6ecb5222c81874ed88a54eff7aff2b8ac71a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeHKU2GiH6+Sb&Yi~A*iA};!nwAMknz*>b8ruYyCamo>IK+;Z?Ak@t5YNtDZwAlK zEHksQU8>6bt13wFfW#9bAb3DX5D7$R%Ogmrq{;&?RIOySFO>jQJVFuSJ9lPw*D<9C z@dDzm=iKvu&pG$kQ+GU02_j13yKsT%EP8G^3BMYwLfm!LAG_$)P3Lx>RVL5vE}gV| zt?s#1&!}mp;W%!fm4)Ut9L;jH{B%*PxfP*r-J01Oxh{+oO)3fcOKRe-c(gUTTHCB- zi8A1HgxtUNqSx@{@DXj3xEjXI431y6RY35$B`Eh0tMXr~k4R>rJp#YejO37eWXEK) z%@b__vE=~K4Nd0PKs2Isn_3$5L>sLKVmSc4wg~_-nd?R4gFUZ%zGp%#W6J^IL^+_g zmP7QqCu|prQZx@C`;vL1k6MmsG{)opPh3|tj!mT$eW)RvP9lYw-=IB9iNw9I&+K%O zeuff063n=mNyaxbju12Sv#ZquTP5;BY?0jQc7REjtJJ3JOiKfT~Tt(gX{Ep~D^lOY41J81*K5M+23d_G|rby?3 zb9wjNGIJ!4ehqXEMcXrKyJc2JgSm3c45fLB=~HEZE(_~=DM+Zx^}#)&lQ`F$rH?OM)T5w!fOS$q zV?S?Gf&L46MN$u6(F;E+-QSccib^lF$&&P1Bs&VbB%N=QrRe=gHVavb{?#Vqqe1~U zhAKVAQ_$pWqFz;@Zom$@5->ykfZLEKb4Db*jruTAD~R|Y-6uIKlvWSZ6A}KdlE)rn zeb%{^wo80h#F@p6?3MU_RDD>{X)~n(FQsn4A5m5rqXF}hV zY;l-szUg|lRhFJY4-{I`jB`qO)`De}Z83%eeI&ppDK`Q^c~NdutITilrptE=GYCg- zaf`xicvi4d5MIsleam%PvN5+-w`?N-^SH2$Wr_JM`SFGmSTzh?t3y<_Z1`zOePJ&k zMDTRvB5WEjg?-4IaDxSFS+CeO9TUNl>n#>MH*if?($mPoW5=!|oIsYQKMb9<*GpR^ z-Y9D;>PBJv1W;Uv5tH+!BU8fnjjG67K9Vy}3XgmdoY=^fv20|=_65USTyGn3WVYqT zLPY9j;Cd9MsOK%C>bQPjnSRWQYORNJBD|vTPFbe#qp8N($i;1{$JywudG*PtR6JxA z*SlHXjg^V!Eu14vT!cj7#m;$sqisL>;GLfhUo(38!r^=GSi12UN@|LdPH3d0fOL0D zxT9l7&pxH6w{u6&&()sZE|C2o(G8(XbaW4QXsXgZoM!EwaS5k7wFFpQ>GbQrnVY?G zaP9Z2PwUF+gBOL-o}(Ve*2=rNBKx#>FZF4&!sE4mh_4>}`n0iz9W*>~$PtaeGweRC z&?wuMc~q>F+(qFWDjz&(44FgM_YV&YitG);JCu^Tt+;5_;R##NlzT%ajHHkWQcNq+ z)8i+6T9?$ze&reUW3Ds4Y>GNBveHS}V2^$^vgeORxQBiG-{t~fDr-O%+EmFI(xqw;W>Uw&H@Klu2*)ZjZ?td~*BxV^); z7E|l{__-ExPmH-<-nOR<%L$KbA>_Fxr5E*(EkhMk2peoSg7c9{M8Q&!ItI~Q5dUaTErd2u#8^Y2c zyk2;$>4?u&;IZPonELu-4$3?W@Z})DhSq1>%9Hcu|EIV%BdCWD%^Ip}BTDW6 d+QIaP_H9)_3;$>Qd-&M@w!Hq}=Q~n?F937wg7yFa diff --git a/Unity/Assets/Res/Code/Hotfix.dll.bytes.meta b/Unity/Assets/Res/Code/Hotfix.dll.bytes.meta deleted file mode 100644 index 5b84ef3d..00000000 --- a/Unity/Assets/Res/Code/Hotfix.dll.bytes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ae44b218243cfc347af99a6875e9e11c -timeCreated: 1508122562 -licenseType: Free -TextScriptImporter: - userData: - assetBundleName: code.unity3d - assetBundleVariant: diff --git a/Unity/Assets/Res/Code/Hotfix.pdb.bytes b/Unity/Assets/Res/Code/Hotfix.pdb.bytes deleted file mode 100644 index d2ad6f459a1a96a3fc4cee2e6d17e4fff76cd428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmZPXO|-fcQ>1`5?m-Rd#L^UvBCT(87K!aP6H^y41_SgCXmmH#Fql{*^&4l zw}Sv911H>V5D^B3H)0b1<5mgywtvs}Ol~$w_>mN7e~kUI;Dlg?1OAJd7BaBAhWO^E zq~LnL*#qjWpNy@9~n%Ia4E3T@#xx`_P^!})y zA4*>Y@VEJF0eOLulbMl0iiwGjL5m5P7R*2dBU3$CN(3mS%*4cxDkTciB@dL+Vq!vQ R5CDm40!8_lnAkxk0022&TATm? diff --git a/Unity/Assets/Res/Code/Hotfix.pdb.bytes.meta b/Unity/Assets/Res/Code/Hotfix.pdb.bytes.meta deleted file mode 100644 index 3896932c..00000000 --- a/Unity/Assets/Res/Code/Hotfix.pdb.bytes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd08ff64f788e7a4ba0f918632ff8d0f -timeCreated: 1508122562 -licenseType: Free -TextScriptImporter: - userData: - assetBundleName: code.unity3d - assetBundleVariant: diff --git a/Unity/Assets/Res/Config.meta b/Unity/Assets/Res/Config.meta deleted file mode 100644 index fc40e6a6..00000000 --- a/Unity/Assets/Res/Config.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2e50214f335e0e94c90746b289a9ef48 -folderAsset: yes -timeCreated: 1505113690 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Res/Code.meta b/Unity/Assets/Resources/Config.meta similarity index 58% rename from Unity/Assets/Res/Code.meta rename to Unity/Assets/Resources/Config.meta index a64c7141..0e5e33f2 100644 --- a/Unity/Assets/Res/Code.meta +++ b/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: diff --git a/Unity/Assets/Res/Config/GlobalProto.txt b/Unity/Assets/Resources/Config/GlobalProto.txt similarity index 100% rename from Unity/Assets/Res/Config/GlobalProto.txt rename to Unity/Assets/Resources/Config/GlobalProto.txt diff --git a/Unity/Assets/Res/Config/GlobalProto.txt.meta b/Unity/Assets/Resources/Config/GlobalProto.txt.meta similarity index 100% rename from Unity/Assets/Res/Config/GlobalProto.txt.meta rename to Unity/Assets/Resources/Config/GlobalProto.txt.meta -- GitLab