From 848af16d80124361571619d4d9c24b2f6eef539a Mon Sep 17 00:00:00 2001 From: chenbin Date: Tue, 20 Oct 2020 23:24:28 +0800 Subject: [PATCH] mm --- Assets/CoolapeFrame/Editor/Tools/ECLUpgradeBindingServer.cs | 2 +- Assets/CoolapeFrameData/verControl/.resModifyDate.v | 2 +- Assets/trCRM/serversCfg/servers.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/CoolapeFrame/Editor/Tools/ECLUpgradeBindingServer.cs b/Assets/CoolapeFrame/Editor/Tools/ECLUpgradeBindingServer.cs index 664845b..1f9a778 100644 --- a/Assets/CoolapeFrame/Editor/Tools/ECLUpgradeBindingServer.cs +++ b/Assets/CoolapeFrame/Editor/Tools/ECLUpgradeBindingServer.cs @@ -379,7 +379,7 @@ public class ECLUpgradeBindingServer : EditorWindow string str = JSON.JsonEncode(content); Debug.Log(str); string path = Path.Combine(Application.dataPath, CLPathCfg.self.basePath, "serversCfg/servers.json"); - File.WriteAllText(path, str, Encoding.UTF8); + File.WriteAllText(path, str); ThreadEx.exec(new System.Threading.ParameterizedThreadStart(doUploadServers), path); } diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index 53b2147..6a3a14a 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -358,7 +358,7 @@ /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000 -/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132475935750000000 +/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132476807790000000 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000 diff --git a/Assets/trCRM/serversCfg/servers.json b/Assets/trCRM/serversCfg/servers.json index 53d91cc..40e4b88 100644 --- a/Assets/trCRM/serversCfg/servers.json +++ b/Assets/trCRM/serversCfg/servers.json @@ -1 +1 @@ -{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"c2c7458896a8b515b477bd7599e3c630", "port":29004, "androidVer":"ad9dd269839fc36b47bbdd34d82c108c", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"ad9dd269839fc36b47bbdd34d82c108c", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}} \ No newline at end of file +{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"c2c7458896a8b515b477bd7599e3c630", "port":29004, "androidVer":"ad9dd269839fc36b47bbdd34d82c108c", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"ad9dd269839fc36b47bbdd34d82c108c", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}} \ No newline at end of file