Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
a85e8e08d0
File diff suppressed because it is too large
Load Diff
|
@ -345,7 +345,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 26
|
m_FontSize: 26
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
|
|
@ -199,7 +199,7 @@ function LingMaiMiJingPanel:SetVeins()
|
||||||
rewardPre:SetActive(false)
|
rewardPre:SetActive(false)
|
||||||
obtain:SetActive(LingMaiMiJingManager.state == 1)
|
obtain:SetActive(LingMaiMiJingManager.state == 1)
|
||||||
|
|
||||||
local img = data.uid == PlayerManager.uid and "l_lmmj_lingmaixinxidi01" or "l_lmmj_lingmaixinxidi"
|
local img = data.uid == PlayerManager.uid and "UI_hz_lm_03" or "UI_hz_lm_03"
|
||||||
obtainImg.sprite = self.spLoader:LoadSprite(img)
|
obtainImg.sprite = self.spLoader:LoadSprite(img)
|
||||||
local configData = lodeConfig[self.data.lingmaiData[i].Id]
|
local configData = lodeConfig[self.data.lingmaiData[i].Id]
|
||||||
--nameImg.text = veinName[data.Quality]--self.spLoader:LoadSprite()
|
--nameImg.text = veinName[data.Quality]--self.spLoader:LoadSprite()
|
||||||
|
|
Loading…
Reference in New Issue