Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-09-25 23:15:11 +08:00
commit 49d55c763e
2 changed files with 7 additions and 7 deletions

View File

@ -5209,7 +5209,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -50.99997, y: 0.9000244}
m_SizeDelta: {x: 1280, y: 1989}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2619629757197424516
CanvasRenderer:
@ -5249,8 +5249,8 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 123123
--- !u!114 &2235408757113167137
@ -5810,7 +5810,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -51, y: 42.900024}
m_SizeDelta: {x: 1280, y: 1989}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7118147138191719039
CanvasRenderer:
@ -5850,8 +5850,8 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 123123
--- !u!114 &2622007375406860705

View File

@ -184,7 +184,7 @@ function Expert:WarPowerRewardTabsChangState()
if expertRewardTabs.mission[i].state == 0 then
if numExChange[activeIndext] == ActivityTypeDef.UpStarExper or numExChange[activeIndext] == ActivityTypeDef.Talisman
or numExChange[activeIndext] == ActivityTypeDef.SoulPrint or numExChange[activeIndext] == ActivityTypeDef.EquipExper
or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then--进阶因为每个都不一样 特殊判断
or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper or numExChange[activeIndext] == ActivityTypeDef.ExpeditionExper then--进阶因为每个都不一样 特殊判断
if expertRewardTabs.mission[i].progress < value then
expertRewardTabs.mission[i].state = 10
else