Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
liujiaqi 2021-02-26 17:26:39 +08:00
commit 59cfcff035
2 changed files with 13 additions and 13 deletions

View File

@ -68102,8 +68102,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: 1, y: 20}
m_SizeDelta: {x: 229.5, y: 64.4}
m_AnchoredPosition: {x: 1, y: 26.5}
m_SizeDelta: {x: 444.5, y: 159.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &503054044669883281
CanvasRenderer:
@ -68137,13 +68137,13 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 4
m_MaxSize: 51
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6311\u6218\u5173\u5361\u5FEB\u901F\u5347\u7EA7"
@ -108751,8 +108751,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: 4, y: 1.2000008}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.7, y: 0.6}
m_SizeDelta: {x: -49.8, y: -12.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4748739538567504529
CanvasRenderer:
@ -108786,8 +108786,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -135904,8 +135904,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: 2, y: -2.2999992}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 1.5, y: 0.25}
m_SizeDelta: {x: -53.6, y: -10.23}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8810281463935800839
CanvasRenderer:
@ -135939,7 +135939,7 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4

View File

@ -109,7 +109,7 @@ function FightPointPassMainPanel:InitComponent()
this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight")
this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text")
LanguageFontSizeFilter(this.fightText, 50)
-- 你要变强
this.btnGetForce = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnIWantMilk")
this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)