root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

dev_chengFeng
gaoxin 2020-08-22 21:04:09 +08:00
parent ba39d930b8 887329a458
commit a5441aa4f4
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab
View File

@ -19388,7 +19388,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072364868940015758}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -610, z: 0}
m_LocalPosition: {x: 0, y: -623.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4684054568920006905}

1
Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua
View File

@ -219,6 +219,7 @@ function Expert:ActivityRewardSingleShow(index,rewardData)
qianwangButton:SetActive(state == 10)
getFinishText:SetActive(state == 20)
getRewardProgress:SetActive(state == 10)
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0)
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 --进阶因为每个都不一样 特殊判断

3
Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
View File

@ -207,15 +207,16 @@ function this.HandExplore()
AdventureManager.GetAventureRewardRequest(1, 1, true, true, function(msg)
this.ShowReward(msg)
this.RefreshItemNum()
CheckRedPointStatus(RedPointType.Expert_FastExplore)
end)
end,nil,nil,nil,true)
else
AdventureManager.GetAventureRewardRequest(1, 1, true, true, function(msg)
this.ShowReward(msg)
this.RefreshItemNum()
CheckRedPointStatus(RedPointType.Expert_FastExplore)
end)
end
CheckRedPointStatus(RedPointType.Expert_FastExplore)
else
PopupTipPanel.ShowTip(Language[10060])
end