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

dev_chengFeng
jiaoyangna 2021-03-05 14:01:03 +08:00
commit d1f18c39b3
3 changed files with 18 additions and 15 deletions

View File

@ -820,10 +820,10 @@ RectTransform:
m_Father: {fileID: 5073002665743333441}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -112.98001, y: -59.05}
m_SizeDelta: {x: 260, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222139857334499600
CanvasRenderer:
@ -1419,8 +1419,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.99, y: -335.51}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: -1.99, y: -364.88004}
m_SizeDelta: {x: 755.3, y: 88.74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1622020682388613000
CanvasRenderer:
@ -1454,14 +1454,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u66F4\u9AD8\u54C1\u8D28\u7684\u5B9D\u7269\u53EF\u63D0\u5347"
LanguageIndex: 0
@ -1499,7 +1499,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: 3.84, y: -0.0000058413}
m_AnchoredPosition: {x: 120, y: -0.0000058413}
m_SizeDelta: {x: 50, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &152011556248132221
@ -2123,10 +2123,10 @@ RectTransform:
m_Father: {fileID: 5073002665743333441}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 212.97998, y: -59.05}
m_SizeDelta: {x: 260, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1526903336700493124
CanvasRenderer:
@ -2483,7 +2483,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: 218.8, y: 8.6}
m_AnchoredPosition: {x: 326, y: 8.6}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.6427968, y: 0.7175935}
--- !u!222 &2798314743829266872

View File

@ -172,6 +172,7 @@ function this.ShowPokemonInfo()
isMaterial = 0
local upLvConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Quality",pokemonConFig.Quality,"Level",curPokemonData.lv)
isLvEnd = curPokemonData.lv >= pokemonConFig.MaxLevel
Util.GetGameObject(this.noUpLvText,"Image"):GetComponent("Image").sprite = Util.LoadSprite("r_hero_qingbao-zuigaodengji_zh")
this.noUpLvText:SetActive(isLvEnd)
this.upLvItemParent:SetActive(not isLvEnd)
this.upLvBtn:SetActive(not isLvEnd)

View File

@ -77,6 +77,8 @@ function this.OnShowData()
if curPokemonData.star < spiritAnimal[curPokemonData.id].MaxStar then
nextUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1)
end
Util.GetGameObject(this.noUpStarText,"Image"):GetComponent("Image").sprite = Util.LoadSprite("r_hero_qingbao-xingji_zh")
if not nextUpStarConfig then
this.upStar:SetActive(false)
this.noUpStarText:SetActive(true)