Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
5f1dde015e
|
|
@ -3768,7 +3768,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4009861031449356928}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ function PokemonSummonPanel:refreshBtnShow()
|
|||
end
|
||||
local d = RecruitManager.GetExpendData(type)
|
||||
if isFree then
|
||||
info.text=Language[11759]
|
||||
info.text=" "..Language[11759]
|
||||
else
|
||||
itemId = d[1]
|
||||
itemNum = d[2]
|
||||
|
|
|
|||
Loading…
Reference in New Issue