|
@@ -1,13 +1,12 @@
|
|
|
using System.IO;
|
|
|
using MySql.Data.MySqlClient;
|
|
|
using StackExchange.Redis;
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
public class Config
|
|
|
{
|
|
|
-
|
|
|
- public const bool GameOnline = true;
|
|
|
|
|
|
-
|
|
|
+ public const bool GameOnline = true;
|
|
|
|
|
|
public ConfigurationOptions redis;
|
|
|
|
|
@@ -15,7 +14,7 @@ public class Config
|
|
|
|
|
|
public string mongo => GameOnline ? "mongodb://localhost:27017" : "mongodb://localhost:27017";
|
|
|
|
|
|
-
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 结束倒计时
|
|
|
/// </summary>
|
|
@@ -42,11 +41,7 @@ public class Config
|
|
|
{
|
|
|
get
|
|
|
{
|
|
|
-<<<<<<< HEAD
|
|
|
var dir = "/data/stat_out/";
|
|
|
-=======
|
|
|
- var dir = "/data/stat_out/";
|
|
|
->>>>>>> 统计数据转存部分增加对客户端上报日志的转存代码.
|
|
|
VerifyFolder(dir);
|
|
|
return dir;
|
|
|
}
|