四灵试炼 修改提交
parent
02f1888f3f
commit
3f24f4cd86
|
@ -98,7 +98,7 @@ end
|
||||||
|
|
||||||
function GeneralBigPopup:OnShow()
|
function GeneralBigPopup:OnShow()
|
||||||
contentPrefabs[this.popupKey].gameObject:SetActive(true)
|
contentPrefabs[this.popupKey].gameObject:SetActive(true)
|
||||||
contentScripts[this.popupKey].view:OnShow(this, unpack(this.args))--1、传入自己 2、传入不定参
|
contentScripts[this.popupKey].view:OnShow(this,this.args)--1、传入自己 2、传入不定参
|
||||||
end
|
end
|
||||||
|
|
||||||
function GeneralBigPopup:OnClose()
|
function GeneralBigPopup:OnClose()
|
||||||
|
|
|
@ -35,10 +35,10 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,data)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
local args = {...}
|
local args = data
|
||||||
activityId = args[1]
|
activityId = args[1]
|
||||||
activityType = args[2]
|
activityType = args[2]
|
||||||
local rewardTabs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRankingReward,"ActivityId",activityId)
|
local rewardTabs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRankingReward,"ActivityId",activityId)
|
||||||
|
|
|
@ -50,13 +50,16 @@ function this:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:BtnClick(i)
|
function this:BtnClick(i)
|
||||||
|
|
||||||
if curIndex == i then
|
if curIndex == i then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
curIndex = i
|
||||||
|
LogGreen("curIndex:"..curIndex)
|
||||||
this.selectBtn.transform:SetParent(tabs[i].transform)
|
this.selectBtn.transform:SetParent(tabs[i].transform)
|
||||||
this.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero
|
this.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||||
this.selectBtn.transform:SetAsFirstSibling()
|
this.selectBtn.transform:SetAsFirstSibling()
|
||||||
curIndex = i
|
|
||||||
for k,v in pairs(itemList) do
|
for k,v in pairs(itemList) do
|
||||||
v.gameObject:SetActive(false)
|
v.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
|
@ -69,14 +72,15 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
local args = {...}
|
local args = _Data
|
||||||
waveId = args[1]
|
waveId = args[1]
|
||||||
curType = args[2]
|
curType = args[2]
|
||||||
friendHelpHeros = args[3]
|
friendHelpHeros = args[3]
|
||||||
myHeros = args[4]
|
myHeros = args[4]
|
||||||
|
LogGreen("myHeros:"..#myHeros)
|
||||||
this:SetMyHeightPower()
|
this:SetMyHeightPower()
|
||||||
this.titleText.text = FourElementName[curType]
|
this.titleText.text = FourElementName[curType]
|
||||||
rate = tonumber(string.format("%.2f",ConfigManager.GetConfigData(ConfigName.CampTowerSetting,1).HelpFightMax / 10000))
|
rate = tonumber(string.format("%.2f",ConfigManager.GetConfigData(ConfigName.CampTowerSetting,1).HelpFightMax / 10000))
|
||||||
|
@ -152,7 +156,7 @@ end
|
||||||
|
|
||||||
function this:SetMyHeightPower()
|
function this:SetMyHeightPower()
|
||||||
heightPower = 0
|
heightPower = 0
|
||||||
if not myHeros or #myHeros < 0 then
|
if not myHeros or #myHeros < 1 then
|
||||||
heightPower = 0
|
heightPower = 0
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -27,11 +27,11 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
parent.BG:SetActive(false)
|
parent.BG:SetActive(false)
|
||||||
local args = {...}
|
local args = _Data
|
||||||
local curHeroData = args[1]
|
local curHeroData = args[1]
|
||||||
if not curHeroData or not HeroConfig[curHeroData.heroConfig.Id] or #HeroConfig[curHeroData.heroConfig.Id].RankupConsumeMaterial < 1 then
|
if not curHeroData or not HeroConfig[curHeroData.heroConfig.Id] or #HeroConfig[curHeroData.heroConfig.Id].RankupConsumeMaterial < 1 then
|
||||||
parent:ClosePanel()
|
parent:ClosePanel()
|
||||||
|
|
|
@ -48,10 +48,10 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
local args = {...}
|
local args = _Data
|
||||||
local helpType = args[1]
|
local helpType = args[1]
|
||||||
local str = ConfigManager.TryGetConfigData(ConfigName.QAConfig,helpType).content
|
local str = ConfigManager.TryGetConfigData(ConfigName.QAConfig,helpType).content
|
||||||
str = string.gsub(str,"{","<color=#D48A07>")
|
str = string.gsub(str,"{","<color=#D48A07>")
|
||||||
|
|
|
@ -70,10 +70,10 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
self.parent=_parent
|
self.parent=_parent
|
||||||
self.sortingOrder = _parent.sortingOrder
|
self.sortingOrder = _parent.sortingOrder
|
||||||
local args = {...}
|
local args = _Data
|
||||||
NetManager.ChoiceWishHeroRequest(nil,function ()
|
NetManager.ChoiceWishHeroRequest(nil,function ()
|
||||||
if args[1] then
|
if args[1] then
|
||||||
self.curSelect = args[1]
|
self.curSelect = args[1]
|
||||||
|
|
|
@ -26,11 +26,11 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
parent.BG:SetActive(false)
|
parent.BG:SetActive(false)
|
||||||
local args = {...}
|
local args = _Data
|
||||||
local data = args[1]
|
local data = args[1]
|
||||||
for i = 1, #data do
|
for i = 1, #data do
|
||||||
if not attriList[i] then
|
if not attriList[i] then
|
||||||
|
|
|
@ -58,11 +58,11 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||||
local _args = {...}
|
local _args = _Data
|
||||||
data = _args[1]
|
data = _args[1]
|
||||||
func = _args[2]
|
func = _args[2]
|
||||||
self.heroList = HeroManager.GetHeroDataByPropertyAndProfession(data.FitList[1],data.FitList[2],1)
|
self.heroList = HeroManager.GetHeroDataByPropertyAndProfession(data.FitList[1],data.FitList[2],1)
|
||||||
|
|
|
@ -30,10 +30,10 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,_Data)
|
||||||
self.parent=_parent
|
self.parent=_parent
|
||||||
self.sortingOrder = _parent.sortingOrder
|
self.sortingOrder = _parent.sortingOrder
|
||||||
local args = {...}
|
local args = _Data
|
||||||
self.actData = args[1]
|
self.actData = args[1]
|
||||||
self.timeText.text = string.format("概率有效期:%s ~ %s",os.date("%Y-%m-%d", self.actData.startTime),os.date("%Y-%m-%d", self.actData.endTime))
|
self.timeText.text = string.format("概率有效期:%s ~ %s",os.date("%Y-%m-%d", self.actData.startTime),os.date("%Y-%m-%d", self.actData.endTime))
|
||||||
this:Refresh(true,true)
|
this:Refresh(true,true)
|
||||||
|
|
|
@ -51,13 +51,13 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,data)
|
||||||
|
|
||||||
itemList={}
|
itemList={}
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||||
_args = {...}
|
_args = data
|
||||||
ActData = _args[1]
|
ActData = _args[1]
|
||||||
func = _args[2]
|
func = _args[2]
|
||||||
this.titleText.text = Language[10760]
|
this.titleText.text = Language[10760]
|
||||||
|
|
|
@ -44,13 +44,13 @@ end
|
||||||
function this:RemoveListener()
|
function this:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnShow(_parent,...)
|
function this:OnShow(_parent,data)
|
||||||
|
|
||||||
itemList={}
|
itemList={}
|
||||||
parent=_parent
|
parent=_parent
|
||||||
sortingOrder = _parent.sortingOrder
|
sortingOrder = _parent.sortingOrder
|
||||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||||
_args = {...}
|
_args = data
|
||||||
ActData = _args[1]
|
ActData = _args[1]
|
||||||
func = _args[2]
|
func = _args[2]
|
||||||
this.titleText.text = Language[10763]
|
this.titleText.text = Language[10763]
|
||||||
|
|
Loading…
Reference in New Issue