Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
commit
40351af4da
|
@ -37,8 +37,9 @@ function TianShuMiJuanMainPanel:InitComponent()
|
||||||
self.bg = Util.GetGameObject(self.gameObject,"bg/Bg"):GetComponent("Image")
|
self.bg = Util.GetGameObject(self.gameObject,"bg/Bg"):GetComponent("Image")
|
||||||
self.title = Util.GetGameObject(self.gameObject,"bg/title"):GetComponent("Image")
|
self.title = Util.GetGameObject(self.gameObject,"bg/title"):GetComponent("Image")
|
||||||
self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack")
|
self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack")
|
||||||
self.shai = Util.GetGameObject(self.gameObject,"bg/shai")
|
self.shai = Util.GetGameObject(self.gameObject,"shai")
|
||||||
self.shaiText = Util.GetGameObject(self.shai,"Text"):GetComponent("Text")
|
self.shaiText = Util.GetGameObject(self.shai,"Text"):GetComponent("Text")
|
||||||
|
SetTextVerTial(self.shaiText,Vector3.New(0,0,0),nil,nil,10)
|
||||||
self.fetterItem = Util.GetGameObject(self.gameObject,"fetterItem")
|
self.fetterItem = Util.GetGameObject(self.gameObject,"fetterItem")
|
||||||
local grid = Util.GetGameObject(self.gameObject,"bg/fetterGrid")
|
local grid = Util.GetGameObject(self.gameObject,"bg/fetterGrid")
|
||||||
local v21 = grid.transform.rect
|
local v21 = grid.transform.rect
|
||||||
|
|
|
@ -45,7 +45,7 @@ function this.CreatSingleConfigData(configData)
|
||||||
for i = 1, #data.activePara do
|
for i = 1, #data.activePara do
|
||||||
local config = propertyConfig[data.activePara[i][1]]
|
local config = propertyConfig[data.activePara[i][1]]
|
||||||
local value= GetEquipPropertyFormatStr(config.Style,data.activePara[i][2])
|
local value= GetEquipPropertyFormatStr(config.Style,data.activePara[i][2])
|
||||||
data.activeParaTip = data.activeParaTip..config.Info.."+"..value .. " "
|
data.activeParaTip = data.activeParaTip..GetLanguageStrById(config.Info).."+"..value .. " "
|
||||||
end
|
end
|
||||||
data.activeParaTip = rtrim(data.activeParaTip)
|
data.activeParaTip = rtrim(data.activeParaTip)
|
||||||
data.activeForce = configData.ActiveForce
|
data.activeForce = configData.ActiveForce
|
||||||
|
|
Loading…
Reference in New Issue