Merge remote-tracking branch 'origin/master'

Assets/Res/Config/GameConstantConfig.json

@@ -50,7 +50,8 @@
         0.023148,
         0.023148
       ],
-      "daolvfavoratePara": 200
+      "daolvfavoratePara": 200,
+      "offlineexpMaxTime": 86400
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -204,6 +204,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///最大离线修为存储时间(秒)
+		/// </summary>
+#if !COMBAT_SERVER
+		public int offlineexpMaxTime;
+#else
+		public int offlineexpMaxTime{ set; get; }
+#endif
+		
+
 	}
 
 }