diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
index f9afae631e..13509b3d8e 100644
--- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab
@@ -681,7 +681,7 @@ 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: 10, y: -223}
+ m_AnchoredPosition: {x: 10, y: -240}
m_SizeDelta: {x: 800, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1576026678
@@ -719,15 +719,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: 100
+ m_Left: 200
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
- m_CellSize: {x: 310, y: 50}
- m_Spacing: {x: 0, y: 0}
+ m_CellSize: {x: 500, y: 50}
+ m_Spacing: {x: 0, y: 15}
m_Constraint: 1
m_ConstraintCount: 2
--- !u!1 &1772367822
@@ -9213,7 +9213,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: -14}
m_SizeDelta: {x: -1080, y: -1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2436302329669646138
@@ -29886,7 +29886,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 257.96985}
+ m_AnchoredPosition: {x: 0, y: 295}
m_SizeDelta: {x: 0, y: 1000}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6255775225375428200
@@ -29960,7 +29960,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: -385.8, y: 594.4}
+ m_AnchoredPosition: {x: -385.8, y: 633}
m_SizeDelta: {x: 218, y: 197.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!1 &8151654997041769984
diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab
index 72ae0ca0e0..baee1c929d 100644
--- a/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/SpecailTrainingInfoPopup.prefab
@@ -3666,8 +3666,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 755.1, y: 35}
- m_SizeDelta: {x: 289.8, y: 71.36}
+ m_AnchoredPosition: {x: 761.59, y: 35}
+ m_SizeDelta: {x: 302.79, y: 71.36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6072846989514163292
MonoBehaviour:
@@ -4545,8 +4545,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 3.5499878}
- m_SizeDelta: {x: 0, y: -7.11}
+ m_AnchoredPosition: {x: 0, y: -0.0024414062}
+ m_SizeDelta: {x: 0, y: -0.0050659}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6674535295987898764
CanvasRenderer:
@@ -5068,7 +5068,7 @@ MonoBehaviour:
m_Padding:
m_Left: 18
m_Right: 0
- m_Top: -19
+ m_Top: 20
m_Bottom: 20
m_ChildAlignment: 0
m_Spacing: 10
@@ -5322,7 +5322,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &6674535296620648426
RectTransform:
m_ObjectHideFlags: 0
@@ -5343,10 +5343,10 @@ RectTransform:
m_Father: {fileID: 6674535296452004501}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 428.1, y: 0}
- m_SizeDelta: {x: 820.2, y: 0}
+ m_SizeDelta: {x: 820.2, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4351621426385855029
MonoBehaviour:
@@ -6121,7 +6121,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 186.38, y: -25.63}
+ m_AnchoredPosition: {x: 217.05994, y: -54.54998}
m_SizeDelta: {x: 117.56, y: 117.66}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6674535297044802550
@@ -6269,8 +6269,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: 529, y: 4.4799995}
- m_SizeDelta: {x: 286.61, y: 80.35}
+ m_AnchoredPosition: {x: 529, y: -9.3625}
+ m_SizeDelta: {x: 311.45, y: 108.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6674535297057631882
CanvasRenderer:
@@ -6504,7 +6504,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 56.32, y: -26.08}
+ m_AnchoredPosition: {x: 87, y: -55}
m_SizeDelta: {x: 119.77, y: 116.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6674535297342162025
@@ -6731,10 +6731,10 @@ RectTransform:
m_Father: {fileID: 6674535296229178769}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 670.3, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 535.15, y: 22}
+ m_SizeDelta: {x: 670.3, y: 82}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6674535297518341898
CanvasRenderer:
@@ -7360,7 +7360,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 100, y: 0}
+ m_SizeDelta: {x: 924.9, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &2003090693943887253
MonoBehaviour:
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index 353161e040..37f03c6eca 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -13268,7 +13268,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
- m_Alignment: 3
+ m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@@ -29768,7 +29768,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &3901352447422915093
RectTransform:
m_ObjectHideFlags: 0
@@ -31341,9 +31341,9 @@ RectTransform:
m_Father: {fileID: 1809071907531257790}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 455.3, y: -38.5}
m_SizeDelta: {x: 121.1, y: 47.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9177978474580410301
@@ -35586,9 +35586,9 @@ RectTransform:
m_Father: {fileID: 1809071907531257790}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 130.15, y: -38.5}
m_SizeDelta: {x: 77.2, y: 77.2}
m_Pivot: {x: 0.50000006, y: 0.5}
--- !u!222 &1227710513702406657
@@ -38850,9 +38850,9 @@ RectTransform:
m_Father: {fileID: 1809071907531257790}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 540.85, y: -38.5}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6250921150712004374
@@ -50206,9 +50206,9 @@ RectTransform:
m_Father: {fileID: 1809071907531257790}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 656.14996, y: -38.5}
m_SizeDelta: {x: 180.6, y: 41.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4206192505371203363
@@ -52360,9 +52360,9 @@ RectTransform:
m_Father: {fileID: 1809071907531257790}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 168.74998, y: -38.5}
m_SizeDelta: {x: 226, y: 77.24}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6753592357789196717
@@ -65737,7 +65737,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &8315664656186209665
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
index 8069176322..7dca03bf7d 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
@@ -105,12 +105,12 @@ function this:OnOpen(...)
LogError("urSkillData.needStar==" .. curSkillData.needStar)
if curSkillData.needStar == 15 then
--this.hintTxt.text=" ".."飞升3解锁"
- des1 = "" .. Language[12243] .. "" .. des1
+ des1 = "" .. Language[12243] .. "" .." " .. des1
elseif curSkillData.needStar == 13 then
- des1 = "" .. Language[12244] .. "" .. des1
+ des1 = "" .. Language[12244] .. "".." " .. des1
else
--this.hintTxt.text=" "..
- des1 = "" .. NumToSimplenessFont[curSkillData.needStar] .. Language[12245] .. "" .. des1
+ des1 = "" .. NumToSimplenessFont[curSkillData.needStar] .." ".. Language[12245] .. "".." " .. des1
end
--des1=""
end