From 7464b5b26b4aa0397960f5c3c230b595b5132304 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 21 八月 2018 21:37:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/Config/PriorBundle.txt | 204 +++++++++++++++++++++++++-------------------------
Assets/Resources/Config/PriorLanguage.txt | 2
Assets/Editor/Tool/TableTool.cs | 30 +++++++
ProjectSettings/GraphicsSettings.asset | 4
4 files changed, 134 insertions(+), 106 deletions(-)
diff --git a/Assets/Editor/Tool/TableTool.cs b/Assets/Editor/Tool/TableTool.cs
index 10249ea..709eedd 100644
--- a/Assets/Editor/Tool/TableTool.cs
+++ b/Assets/Editor/Tool/TableTool.cs
@@ -215,6 +215,10 @@
}
}
+ /// <summary>
+ /// 璇籺xt杞簩杩涘埗鏂囦欢
+ /// </summary>
+ /// <param name="fileInfo"></param>
private static void ReadTxtToBytes(FileInfo fileInfo)
{
string fileName = fileInfo.Name.Split('.')[0];
@@ -224,13 +228,35 @@
Directory.CreateDirectory(configOutPutPath);
}
- string filePath = configOutPutPath + "/" + fileName + ".txt";
+ string filePath = configOutPutPath + "/" + fileName + ".bytes";
if (File.Exists(filePath))
{
File.Delete(filePath);
}
+ FileStream fileStream = fileInfo.OpenRead();
+ StreamReader streamStream = new StreamReader(fileStream, Encoding.UTF8);
- File.Copy(fileInfo.FullName,filePath);
+ TripleDESCryptoServiceProvider des = new TripleDESCryptoServiceProvider();
+ des.Key = Convert.FromBase64String(ConfigManager.CustomKey);
+ des.IV = Convert.FromBase64String(ConfigManager.CustomIV);
+ des.Mode = System.Security.Cryptography.CipherMode.CBC;
+ des.Padding = System.Security.Cryptography.PaddingMode.PKCS7;
+
+ FileStream fs = new FileStream(filePath, FileMode.Create);
+ CryptoStream cs = new CryptoStream(fs, des.CreateEncryptor(), CryptoStreamMode.Write);
+ BinaryWriter bw = new BinaryWriter(cs);
+ try
+ {
+ bw.Write(streamStream.ReadToEnd());
+ bw.Flush();
+ bw.Close();
+ streamStream.Dispose();
+ streamStream.Close();
+ }
+ catch (IOException e)
+ {
+ DebugEx.Log(e.Message);
+ }
}
/// <summary>
diff --git a/Assets/Resources/Config/PriorBundle.txt b/Assets/Resources/Config/PriorBundle.txt
index aa59997..59e6296 100644
--- a/Assets/Resources/Config/PriorBundle.txt
+++ b/Assets/Resources/Config/PriorBundle.txt
@@ -12,104 +12,106 @@
9 Map113_Fyt 1
10 map128_fmt 1
11 Map119_Qlzf 1
-12 createrole 2
-13 prefab_race_a_fs 2
-14 prefab_race_a_zs 2
-15 prefab_race_P001 2
-16 prefab_race_n001 2
-17 prefab_race_M152 2
-18 prefab_race_L001 2
-19 prefab_race_L002 2
-20 prefab_race_L003 2
-21 prefab_race_N017 2
-22 prefab_race_N017a 2
-23 prefab_race_N999 2
-24 prefab_race_N002 2
-25 prefab_race_M003 2
-26 prefab_race_M001 2
-27 prefab_race_M709 2
-28 prefab_race_M004 2
-29 prefab_race_M005 2
-30 prefab_race_M006 2
-31 prefab_race_M007 2
-32 prefab_race_N034 2
-33 prefab_race_N012 2
-34 prefab_race_N003 2
-35 prefab_race_M131 2
-36 prefab_race_N010 2
-37 prefab_race_M128 2
-38 prefab_race_N013 2
-39 prefab_race_M126 2
-40 prefab_race_N015 2
-41 prefab_race_M008 2
-42 prefab_race_M704 2
-43 prefab_race_M703 2
-44 prefab_race_M012 2
-45 prefab_race_M011 2
-46 prefab_race_M013 2
-47 prefab_race_M014 2
-48 prefab_race_M135 2
-49 prefab_race_N011 2
-50 prefab_race_M129 2
-51 prefab_race_M132 2
-52 prefab_race_M015 2
-53 prefab_race_M017 2
-54 prefab_race_M018 2
-55 prefab_race_M016 2
-56 prefab_race_M700 2
-57 prefab_race_M701 2
-58 prefab_race_M021 2
-59 prefab_race_M063 2
-60 prefab_race_M064 2
-61 prefab_race_M065 2
-62 prefab_race_M097 2
-63 prefab_race_L004 2
-64 prefab_race_M104 2
-65 prefab_race_Sh01 2
-66 prefab_race_Sh02 2
-67 prefab_race_N031 2
-68 prefab_race_N032 2
-69 prefab_race_A_Zs00 2
-70 prefab_race_A_Fs00 2
-71 prefab_race_A_Zs00_Wq 2
-72 prefab_race_A_Fs00_Wq 2
-73 prefab_race_A_Zs00_fwq 2
-74 prefab_race_A_Fs00_fwq 2
-75 prefab_race_A_Zs01 2
-76 prefab_race_A_Fs01 2
-77 prefab_race_A_Zs01_Wq 2
-78 prefab_race_A_Fs01_Wq 2
-79 prefab_race_A_Zs01_fwq 2
-80 prefab_race_A_Fs01_fwq 2
-81 prefab_race_A_Zs02 2
-82 prefab_race_A_Fs02 2
-83 prefab_race_A_Zs02_Wq 2
-84 prefab_race_A_Fs02_Wq 2
-85 prefab_race_A_Zs02_fwq 2
-86 prefab_race_A_Fs02_fwq 2
-87 prefab_race_Zq04 2
-88 Prefab_Race_B_Cw06 2
-89 prefab_race_A_Zs99_Wq 2
-90 prefab_race_A_Fs99_Wq 2
-91 Prefab_Race_B_Cw09 2
-92 prefab_race_Zq05 2
-93 prefab_race_A_Zs_Cb01 2
-94 prefab_race_A_Fs_Cb01 2
-95 prefab_race_B_Cw02 2
-96 prefab_race_Zq01 2
-97 prefab_race_Zq00 2
-98 prefab_race_B_Cw01 2
-99 prefab_race_ranshaoquan 2
-100 boss1 3
-101 music1 3
-102 role1 3
-103 show1 3
-104 speak1 3
-105 ui1 3
-106 bossskill1 4
-107 cj 4
-108 common1 4
-109 debuff1 4
-110 dsskill1 4
-111 skill1 4
-112 ui1 4
\ No newline at end of file
+12 shared1 1
+13 createrole 2
+14 prefab_race_a_fs 2
+15 prefab_race_a_zs 2
+16 prefab_race_P001 2
+17 prefab_race_n001 2
+18 prefab_race_M152 2
+19 prefab_race_L001 2
+20 prefab_race_L002 2
+21 prefab_race_L003 2
+22 prefab_race_N017 2
+23 prefab_race_N017a 2
+24 prefab_race_N999 2
+25 prefab_race_N002 2
+26 prefab_race_M003 2
+27 prefab_race_M001 2
+28 prefab_race_M709 2
+29 prefab_race_M004 2
+30 prefab_race_M005 2
+31 prefab_race_M006 2
+32 prefab_race_M007 2
+33 prefab_race_N034 2
+34 prefab_race_N012 2
+35 prefab_race_N003 2
+36 prefab_race_M131 2
+37 prefab_race_N010 2
+38 prefab_race_M128 2
+39 prefab_race_N013 2
+40 prefab_race_M126 2
+41 prefab_race_N015 2
+42 prefab_race_M008 2
+43 prefab_race_M704 2
+44 prefab_race_M703 2
+45 prefab_race_M012 2
+46 prefab_race_M011 2
+47 prefab_race_M013 2
+48 prefab_race_M014 2
+49 prefab_race_M135 2
+50 prefab_race_N011 2
+51 prefab_race_M129 2
+52 prefab_race_M132 2
+53 prefab_race_M015 2
+54 prefab_race_M017 2
+55 prefab_race_M018 2
+56 prefab_race_M016 2
+57 prefab_race_M700 2
+58 prefab_race_M701 2
+59 prefab_race_M021 2
+60 prefab_race_M063 2
+61 prefab_race_M064 2
+62 prefab_race_M065 2
+63 prefab_race_M097 2
+64 prefab_race_L004 2
+65 prefab_race_M104 2
+66 prefab_race_Sh01 2
+67 prefab_race_Sh02 2
+68 prefab_race_N031 2
+69 prefab_race_N032 2
+70 prefab_race_A_Zs00 2
+71 prefab_race_A_Fs00 2
+72 prefab_race_A_Zs00_Wq 2
+73 prefab_race_A_Fs00_Wq 2
+74 prefab_race_A_Zs00_fwq 2
+75 prefab_race_A_Fs00_fwq 2
+76 prefab_race_A_Zs01 2
+77 prefab_race_A_Fs01 2
+78 prefab_race_A_Zs01_Wq 2
+79 prefab_race_A_Fs01_Wq 2
+80 prefab_race_A_Zs01_fwq 2
+81 prefab_race_A_Fs01_fwq 2
+82 prefab_race_A_Zs02 2
+83 prefab_race_A_Fs02 2
+84 prefab_race_A_Zs02_Wq 2
+85 prefab_race_A_Fs02_Wq 2
+86 prefab_race_A_Zs02_fwq 2
+87 prefab_race_A_Fs02_fwq 2
+88 prefab_race_Zq04 2
+89 Prefab_Race_B_Cw06 2
+90 prefab_race_A_Zs99_Wq 2
+91 prefab_race_A_Fs99_Wq 2
+92 Prefab_Race_B_Cw09 2
+93 prefab_race_Zq05 2
+94 prefab_race_A_Zs_Cb01 2
+95 prefab_race_A_Fs_Cb01 2
+96 prefab_race_B_Cw02 2
+97 prefab_race_Zq01 2
+98 prefab_race_Zq00 2
+99 prefab_race_B_Cw01 2
+100 prefab_race_ranshaoquan 2
+101 boss1 3
+102 music1 3
+103 role1 3
+104 show1 3
+105 speak1 3
+106 ui1 3
+107 bossskill1 4
+108 cj 4
+109 common1 4
+110 debuff1 4
+111 dsskill1 4
+112 skill1 4
+113 ui1 4
+114 shared 4
diff --git a/Assets/Resources/Config/PriorLanguage.txt b/Assets/Resources/Config/PriorLanguage.txt
index ee3ba7d..6534290 100644
--- a/Assets/Resources/Config/PriorLanguage.txt
+++ b/Assets/Resources/Config/PriorLanguage.txt
@@ -25,5 +25,5 @@
22
23
24 缃戠粶鏈摼鎺ワ紝鏃犳硶涓嬭浇
-25 鎮ㄥ凡缁忓畬鎴愪簡鎵�鏈夋父鎴忚祫婧愮殑涓嬭浇锛屾敹涓嬭繖浠借杽鍒╁惂銆�
+25 鎮ㄥ凡缁忓畬鎴愪簡鎵�鏈夋父鎴忚祫婧愮殑涓嬭浇锛屾敹涓嬭繖浠借杽绀煎惂銆�
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 2f828a9..97e731a 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -99,8 +99,8 @@
enableLPPV: 0
useDitherMaskForAlphaBlendedShadows: 0
m_Automatic: 0
- m_LightmapStripping: 0
- m_FogStripping: 0
+ m_LightmapStripping: 1
+ m_FogStripping: 1
m_InstancingStripping: 0
m_LightmapKeepPlain: 1
m_LightmapKeepDirCombined: 1
--
Gitblit v1.8.0