Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-12-21 14:32:01 +08:00
commit dc8e1ac904
3 changed files with 12 additions and 12 deletions

View File

@ -4810,10 +4810,10 @@ RectTransform:
m_Father: {fileID: 8503549196898394800}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &535413429869230351
GameObject:
@ -20000,9 +20000,9 @@ RectTransform:
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 39.5, y: 635}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 39.5, y: -377}
m_SizeDelta: {x: 129.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &4961706857348061968
@ -37369,9 +37369,9 @@ RectTransform:
m_Father: {fileID: 3759887136319108211}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -171.5, y: 635}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -171.5, y: -377}
m_SizeDelta: {x: 129.5, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1358751446755459863

View File

@ -663,10 +663,10 @@ end
-- 获取当前需要显示的描述文字
function this.GetCurLevelTips()
LogError("GetCurLevelTips")
--LogError("GetCurLevelTips")
for id, config in ConfigPairs(LevelTipsConfig) do
LogError(id)
--LogError(id)
if config.Type == 1 then
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) <= 0 then
return config.Desc -- string.format("通关%s%s", mainLevelConfig[config.Parameter].Name, config.Desc)

View File

@ -352,7 +352,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData)
this.UI_Effect_appear:SetActive(false)
Sound_Recruit3 = SoundManager.PlaySound(SoundConfig.Sound_Recruit3)
if heroStaticData and testLiveGO then
if heroStaticData and not IsNull(testLiveGO) then
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
heroStaticData, testLiveGO = nil, nil
end