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

Assets/Res/Config/LanguageChineseConfig.json

@@ -40218,15 +40218,15 @@
     },
     {
       "ID": 10795,
-      "txt": "0"
+      "txt": "甲级"
     },
     {
       "ID": 10796,
-      "txt": "0"
+      "txt": "乙级"
     },
     {
       "ID": 10797,
-      "txt": "0"
+      "txt": "丙级"
     },
     {
       "ID": 10798,

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

@@ -54,11 +54,13 @@ 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+"  safeArea:x"+ safeArea.x+"  safeArea:y"+safeArea.y+"  "+safeArea.width+"   "+safeArea.height+"  "+Screen.width+"  "+Screen.height);
+            
+            // Debug.Log(safeArea.size+"安全区域:" + safeArea.xMin + "  " + safeArea.yMin+"  "+ safeArea.xMax+"  "+ safeArea.yMax+
+            //                   "  ratio:"+ ratio+"  safeArea:x"+ safeArea.x+"  safeArea:y"+safeArea.y+"  "+safeArea.width+"   "+safeArea.height+"  "+Screen.width+"  "+Screen.height);
             if (anchorPointType == AnchorPointType.Up)
             {
-                if (safeArea.yMin > 0)
+                float v = Screen.height - safeArea.height;
+                if (v > 0)
                 {
                     if (offsetX > 0)
                     {
@@ -68,7 +70,7 @@ namespace Utility.UIAdapter
                     else
                     {
                         myRectTransform.anchoredPosition =
-                            new Vector2(anchoredPosition.x , anchoredPosition.y- safeArea.yMin * ratio);
+                            new Vector2(anchoredPosition.x , anchoredPosition.y- v * ratio);
                     }
                 }
             }