Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/GameConstantConfig.json

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

Assets/Scripts/Core/UI/UTool/UIAdapter/UIAdapterForSafeArea.cs

@@ -54,6 +54,7 @@ namespace Utility.UIAdapter
             var safeArea = Screen.safeArea;
             float ratio = _canvasScaler.referenceResolution.y * _canvasScaler.matchWidthOrHeight / Screen.height -
                           _canvasScaler.referenceResolution.x * (_canvasScaler.matchWidthOrHeight - 1) / Screen.width;
+            Debug.Log("安全区域:" + safeArea.xMin + "  " + safeArea.yMin+"  "+ safeArea.xMax+"  "+ safeArea.yMax+"  ratio:"+ ratio);
             if (anchorPointType == AnchorPointType.Up)
             {
                 if (safeArea.yMin > 0)

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
+		
+
 	}
 
 }