Merge branch '0功能/本周版本优化内容' into master_xma_local

dev_chengFeng
jiaoyangna 2021-01-22 18:16:02 +08:00
commit dd70f63590
3 changed files with 18 additions and 10 deletions

View File

@ -5000,7 +5000,7 @@ ParticleSystem:
--- !u!199 &199737128564699664
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9685,7 +9685,7 @@ ParticleSystem:
--- !u!199 &199374924954381556
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14388,7 +14388,7 @@ ParticleSystem:
--- !u!199 &199968943646283500
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -16923,7 +16923,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "1\u6B21\u53EC\u5524"
m_Text: "1\u6B21\u62DB\u52DF"
LanguageIndex: 11457
--- !u!1 &1162713524981311877
GameObject:
@ -26759,7 +26759,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "1\u6B21\u53EC\u5524"
m_Text: "1\u6B21\u62DB\u52DF"
LanguageIndex: 11457
--- !u!1 &6632779228149324906
GameObject:
@ -27432,7 +27432,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "1\u6B21\u53EC\u5524"
m_Text: "1\u6B21\u62DB\u52DF"
LanguageIndex: 11457
--- !u!1 &6908353925056820887
GameObject:
@ -30979,7 +30979,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "1\u6B21\u53EC\u5524"
m_Text: "1\u6B21\u62DB\u52DF"
LanguageIndex: 11457
--- !u!1 &9137442875967148372
GameObject:

View File

@ -1,17 +1,25 @@
require("Base/BasePanel")
LoadingPanel = Inherit(BasePanel)
local this = LoadingPanel
local sprites = {"loding1"}
--初始化组件(用于子类重写)
function LoadingPanel:InitComponent()
Log("LoadingPanel:InitComponent")
this.Slider = Util.GetGameObject(self.gameObject, "Slider"):GetComponent("Slider")
this.Tip = Util.GetGameObject(self.gameObject, "Slider/Image/LoadingText"):GetComponent("Text")
this.SliderText = Util.GetGameObject(self.gameObject, "Slider/Fill Area/Fill/Image/Text"):GetComponent("Text")
this.bg = Util.GetGameObject(self.gameObject, "bg1"):GetComponent("Image")
screenAdapte(Util.GetGameObject(self.gameObject, "bg1"))
screenAdapte(Util.GetGameObject(self.gameObject, "bg2"))
end
function LoadingPanel:OnOpen()
local index = 0
math.randomseed(os.time())
index = math.random(1, #sprites)
this.bg.sprite = Util.LoadSprite(sprites[index])
end
local callList = {}
local curIndex = 0
local lerp = 0
@ -30,7 +38,7 @@ end
function LoadingPanel.AddStep(func)
table.insert(callList, func)
maxIndex = maxIndex + 1
end
end
function LoadingPanel.OnStep()
lerp = 0

View File

@ -181,7 +181,7 @@ function this.UpdatePanelData()
local d=RecruitManager.GetExpendData(m.type)
redPot:SetActive(isFree)
if isFree then --若1按钮有免费次数 后面逻辑不走了
info.text=Language[11759]
info.text="免费召唤"
else
itemId=d[1]
itemNum=d[2]