change to TTT

CSserver/BattleRoom/Program.cs

@@ -10,7 +10,7 @@ namespace BattleRoom
     internal class Program
     {
 
-        const int port = 6006;                                                        // 端口号（用来监听客户端连接的）  
+        const int port = 16006;                                                        // 端口号（用来监听客户端连接的）  
 
         static void Main(string[] args)
         {
@@ -29,7 +29,7 @@ namespace BattleRoom
         /// </summary>
         async static void InitServerPeer()
         {
-            var port = 6005;                                                                // 连接本机的大厅服务端口            
+            var port = 16005;                                                                // 连接本机的大厅服务端口            
             var endPoint = new IPEndPoint(IPAddress.Loopback, port);
             //var endPoint = new IPEndPoint(IPAddress.Parse("192.168.10.17"), port);
             var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
@@ -48,7 +48,7 @@ namespace BattleRoom
 
         static void selfTest()
         {
-            var rdb = Redis.Ins.GetDatabase(0);
+            var rdb = Redis.Ins.GetDatabase(1);
             Debug.Assert(rdb.StringSet("test", "wanggang" + DateTime.Now.ToString("yyyyMMddHHmmss")), "Redis读写失败!");
         }
 

CSserver/BossServer/Program.cs

@@ -11,7 +11,7 @@ namespace BossServer
     class Program
     {
         static Socket SocketWatch = null;                                       // 创建一个和客户端通信的套接字 
-        const int port = 6002;                                                  // 端口号（用来监听的） 
+        const int port = 16002;                                                  // 端口号（用来监听的） 
 
         static void Main(string[] args)
         {
@@ -34,7 +34,7 @@ namespace BossServer
 
         static void selfTest()
         {
-            var rdb = Redis.Ins.GetDatabase(0);
+            var rdb = Redis.Ins.GetDatabase(1);
             Debug.Assert(rdb.StringSet("test", "wanggang" + DateTime.Now.ToString("yyyyMMddHHmmss")), "Redis读写失败!");
         }
 

CSserver/BossServer/server/Boss.cs

@@ -72,7 +72,7 @@ namespace BossServer.server
             this.CountDownSecs = Config.Ins.CountDownTimes;
             var roomName = Room.Instance.Name ?? "Room";
             var redis_key = MemKey_Game.BossFight_Damage_byDateHour_zset(Convert.ToInt32(ZoneId), Id, roomName);
-            var rdb = Redis.Ins.GetDatabase(0);
+            var rdb = Redis.Ins.GetDatabase(1);
             rdb.KeyDelete(redis_key);
             this.Peers = new Dictionary<int, Peer>();
             this.DamageQueue = Channel.CreateBounded<int>(100);

CSserver/BossServer/server/EmailProc.cs

@@ -93,7 +93,7 @@ namespace BossServer.server
         /// <param name="mail"></param>
         private static int InsertMail(int zoneid, string uid, Email mail)
         {
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             var key_id = MemKey_User.Mail_CurId_int(zoneid, uid);
             var key_queue = MemKey_User.Mail_Queue_hash(zoneid, uid);
             mail.insertts = (int)DateTime.Now.ToUnixTimeStamp();

CSserver/BossServer/server/Peer.cs

@@ -130,7 +130,7 @@ namespace BossServer.server
         {
             try
             {
-                var rdb = Redis.Ins.GetDatabase(0);
+                var rdb = Redis.Ins.GetDatabase(1);
                 if (Properties.TryGetValue(PropertyName.Name, out var name)
                     && Properties.TryGetValue(PropertyName.Zoneid, out var zoneid))
                 {

CSserver/DataTransfer/Program.cs

@@ -87,7 +87,7 @@ namespace DataTransfer
             float day = curday - 1;
             Console.WriteLine("当前天是：" + day);
 
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
 
             //int zoneid = 1;//暂时先这样
 
@@ -142,7 +142,7 @@ namespace DataTransfer
         public static void Userbaseparams_RedisToSql(string uid, int zoneid)
         {
             Console.WriteLine("玩家基础数值变化方法开始.........");
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             string key = MemKey_Statistics.UserBaseParams(uid, zoneid);
 
             if (mem.KeyExists(key))
@@ -192,7 +192,7 @@ namespace DataTransfer
         /// <param name="zoneid"></param>
         public static void TaskcompleteTsrecord_RedisToSql(string uid, int zoneid)
         {            
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             string key = MemKey_Statistics.SelfTaskDataCollect(uid, zoneid);
 
             if (mem.KeyExists(key))
@@ -235,7 +235,7 @@ namespace DataTransfer
         public static void Taskprogressrecord_RedisToSql(int zoneid)
         {
             Console.WriteLine("玩家任务进度方式开始......");
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             string key = MemKey_Statistics.TaskDataCollect(zoneid);
 
             if (mem.KeyExists(key))

CSserver/DataTransfer/tongji/DataToExcelText.cs

@@ -19,7 +19,7 @@ namespace DataTransfer.tongji
         public static void excelText(string memKey, int retain, int zoneid, float day)
         {
             //获取redis种的数据
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
 
             HashEntry[] ctxList = mem.HashGetAll(memKey);
             int length = ctxList.Length;

CSserver/DataTransfer/tongji/UserStatistics.cs

@@ -33,7 +33,7 @@ namespace DataTransfer.tongji
             float day = curday - 1;
             //float day = MathF.Floor((long)ts.TotalSeconds / 24 / 60 / 60);
             Console.WriteLine("当前时间day==.............."+ day);
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
 
             List<int> retainedlist = new List<int>();
             retainedlist.Add(1);
@@ -84,7 +84,7 @@ namespace DataTransfer.tongji
 
             List<string> loseUIdList = new List<string>();
 
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             if (!mem.KeyExists(dayKey) || !mem.KeyExists(lastDayKey))
             {
                 return loseUIdList;
@@ -112,7 +112,7 @@ namespace DataTransfer.tongji
         /// <param name="day"></param>
         public static void TargetCollect(List<string> loseUIdList,int type,int zoneid,float day)
         {
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
 
             foreach (string uid in loseUIdList)
             {              
@@ -219,7 +219,7 @@ namespace DataTransfer.tongji
             float day = MathF.Floor((long)ts.TotalSeconds / 24 / 60 / 60);
 
 
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             HashEntry[] ctxList = mem.HashGetAll(MemKey_Statistics.GamerunLoginUser(zoneid, day - 1));
             //int length = ctxList.Length;
 

CSserver/DataTransfer/tongji/loseUserDataTransfer.cs

@@ -24,7 +24,7 @@ namespace DataTransfer.tongji
         public static void excelText(string memKey,int retain,int zoneid,float day)
         {
             //获取redis种的数据
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
 
             HashEntry[] ctxList = mem.HashGetAll(memKey);
             int length = ctxList.Length;      

CSserver/MultiDup/Program.cs

@@ -9,11 +9,11 @@ namespace MultiDup
 {
     internal class Program
     {
-        const int serverport = 6005;                                            // 用于监听服务端连接的端口号
+        const int serverport = 16005;                                            // 用于监听服务端连接的端口号
 
         public static ServerPeer serverPeer = null;                             // 战斗server的连接
 
-        const int port = 6004;                                                  // 端口号（用来监听的） 
+        const int port = 16004;                                                  // 端口号（用来监听的） 
         static void Main(string[] args)
         {
             selfTest();
@@ -31,7 +31,7 @@ namespace MultiDup
 
         static void selfTest()
         {
-            var rdb = Redis.Ins.GetDatabase(0);
+            var rdb = Redis.Ins.GetDatabase(1);
             Debug.Assert(rdb.StringSet("test", "wanggang" + DateTime.Now.ToString("yyyyMMddHHmmss")), "Redis读写失败!");
         }
 

CSserver/StatisticsTransfer/tongji/TargetStatistics.cs

@@ -18,7 +18,7 @@ namespace StatisticsTransfer.tongji
         /// </summary>
         public static void TargetValToExecl()
         {
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
 
             int zoneid = 1;
             HashEntry[] ctxList = mem.HashGetAll(MemKey_Statistics.TargetStatistics(zoneid));
@@ -112,7 +112,7 @@ namespace StatisticsTransfer.tongji
         public static string TargetDesc(string type)
         {
             string[] sList = type.Split('-');
-            var mem = Redis.Ins.GetDatabase(0);
+            var mem = Redis.Ins.GetDatabase(1);
             string desc = "";
             switch (sList[0])
             {

CSserver/clientTest/Program_Chat.cs

@@ -81,7 +81,7 @@ namespace clientTest.chat
 
             callbacks.Add(eProtocalCommand.ScChatNewMsg, On_update);
             callbacks.Add(eProtocalCommand.ScChatLogin, On_LoginOver);
-            var n = 10;
+            var n = 1;
             var list = new Task[n];
             for (int i = 0; i < n; i++)
             {
@@ -122,11 +122,11 @@ namespace clientTest.chat
         static async Task send()
         {
 
-            var port = 6000;
+            var port = 16000;
 
-            var endPoint = new IPEndPoint(IPAddress.Parse("192.168.10.17"), port);
+          //  var endPoint = new IPEndPoint(IPAddress.Parse("192.168.10.17"), port);
             //var endPoint = new IPEndPoint(IPAddress.Loopback, port);
-            //var endPoint = new IPEndPoint(IPAddress.Parse("115.159.121.129"), port);
+            var endPoint = new IPEndPoint(IPAddress.Parse("115.159.121.129"), port);
 
             using (var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
             {

CSserver/csserver/Program.cs

@@ -16,7 +16,7 @@ namespace ChatServer
 {
     class Program
     {
-        const int port = 6000;                                                  // 端口号（用来监听的）
+        const int port = 16000;                                                  // 端口号（用来监听的）
         static Socket SocketWatch = null;                                       // 创建一个和客户端通信的套接字
         /// <summary>
         /// peer管理集合
@@ -75,7 +75,7 @@ namespace ChatServer
                 var msg = CS_ChatSendMsg.Parser.ParseFrom(data._data);
                 if (null != msg &&  msg.Msg.Trim().Length>0)
                 {
-                    var rdb = Redis.Ins.GetDatabase(0);
+                    var rdb = Redis.Ins.GetDatabase(1);
                     var sd = new SC_ChatNewMsg() { FromChannel = msg.ToChannel, SenderName = p.Name, Msg = msg.Msg, SenderUid = p.UID };
                     switch (msg.ToChannel)
                     {