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

Assets/Res/UI/SkillSelectPanel/SkillRoadWidget.prefab

@@ -252,8 +252,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 73.51247, y: -30.5809}
-  m_SizeDelta: {x: 495.4249, y: 82.7753}
+  m_AnchoredPosition: {x: 73.51247, y: -27.298}
+  m_SizeDelta: {x: 495.4249, y: 105.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8609369702727514854
 CanvasRenderer:
@@ -361,7 +361,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7888252337808105600
 CanvasRenderer:

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);
                     }
                 }
             }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadWidget.cs

@@ -35,7 +35,7 @@ namespace Fort23.Mono
 
             Text_SkillName.text = LanguageManager.Instance.Text(SkillConfig.name);
             Icon_SkillIcon.icon_name = SkillConfig.icon;
-            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(SkillConfig.PromoteLan),
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(SkillConfig.dec),
                 SkillConfig.effectValue);
 
             ActiveRoot.SetActive(PlayerManager.Instance.myHero.TaoismSkillId == SkillConfig.ID);