Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
a7c7bd26ff
|
|
@ -294,7 +294,7 @@ function this.AutoCompound(_position)
|
||||||
str = str .. Language[10433]..bagPosEquips[i] - curPosEquips[i]
|
str = str .. Language[10433]..bagPosEquips[i] - curPosEquips[i]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if isNoGold then
|
if isNoGold and #curRewards <= 0 then
|
||||||
PopupTipPanel.ShowTip(Language[10431])
|
PopupTipPanel.ShowTip(Language[10431])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue