特训BUG
parent
65139fbbe0
commit
71140a84d7
|
|
@ -270,7 +270,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -80}
|
||||
m_SizeDelta: {x: 171.71, y: 50.8}
|
||||
m_SizeDelta: {x: 200, y: 50.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &149716123
|
||||
CanvasRenderer:
|
||||
|
|
@ -896,7 +896,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 12.88501, y: -58.38}
|
||||
m_AnchoredPosition: {x: 12.884998, y: -58.38}
|
||||
m_SizeDelta: {x: 119.77, y: 116.76}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &983025033
|
||||
|
|
@ -2735,7 +2735,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 35.593323, y: -31}
|
||||
m_AnchoredPosition: {x: 35.593327, y: -31}
|
||||
m_SizeDelta: {x: 40, y: 46}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6232666570923579936
|
||||
|
|
@ -6755,7 +6755,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 99.140015, y: -108.14}
|
||||
m_AnchoredPosition: {x: 99.14, y: -108.14}
|
||||
m_SizeDelta: {x: 90.28, y: 90.28}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6674535297652902540
|
||||
|
|
|
|||
|
|
@ -2214,7 +2214,7 @@ RectTransform:
|
|||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -2940,10 +2940,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6050226354036967767}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 1.8000488, y: 0.5999985}
|
||||
m_SizeDelta: {x: 117.88, y: 32.19}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -60, y: -25}
|
||||
m_SizeDelta: {x: 117.880005, y: 32.190002}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &7225143497615663008
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -2874,6 +2874,25 @@ ExpeditionNodeType = {
|
|||
[55] = "法术",
|
||||
[56] = "礼物",
|
||||
}
|
||||
ItemBaseTypeName = {
|
||||
|
||||
[1] = "特殊道具",
|
||||
[2] = "碎片",
|
||||
[3] = "妖魂",
|
||||
[4] = "装备",
|
||||
[5] = "宝器",
|
||||
[6] = "霸气",
|
||||
[7] = "材料",
|
||||
[8] = "法宝碎片",
|
||||
[9] = "命石",
|
||||
[10] = "神印",
|
||||
[11] = "奥义卡",
|
||||
[12] = "法宝",
|
||||
[13] = "神石",
|
||||
[14] = "主角礼物",
|
||||
[15] = "英雄礼物",
|
||||
|
||||
}
|
||||
--- 奖池预览类型
|
||||
PRE_REWARD_POOL_TYPE = {
|
||||
RECRUIT = 1,--钻石
|
||||
|
|
|
|||
|
|
@ -90,9 +90,9 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local mySelfCondition= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/mySelfCondition"):GetComponent("Text")
|
||||
local trainingIcon= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/trainingIcon")
|
||||
-- local isOpen=self._curHerodata.star>=tData.MyselfCondition and curLevel>=tData.Level
|
||||
local lastLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",tData.Level-1)
|
||||
local isOpen= self._curHerodata.star>=tData.MyselfCondition and curLevel>=tData.Level
|
||||
if curLevel ==1 then
|
||||
local lastLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",tData.Level-1==0 and 1 or tData.Level-1)
|
||||
local isOpen= self._curHerodata.star>=lastLevelData.MyselfCondition and curLevel>=tData.Level
|
||||
if curLevel ==1 and tData.Level==1 then
|
||||
isOpen=true
|
||||
end
|
||||
if tData.Level>1 then
|
||||
|
|
@ -137,6 +137,8 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local ActiveButton = Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/ActiveBtn")
|
||||
|
||||
local TrainingSetting=ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",tData.TrainSettingID,"Level",tData.Level)
|
||||
local lastLevelTrainingSetting=ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",tData.TrainSettingID,"Level",(tData.Level-1)==0 and 1 or tData.Level-1)
|
||||
|
||||
for i = 1, 3 do
|
||||
if not singleAttList[i] then
|
||||
local t={}
|
||||
|
|
@ -154,7 +156,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local Button = Util.GetGameObject( singleAttList[i][1],"Button")
|
||||
Util.AddOnceClick(Button,function()
|
||||
if not CheckFunctionOpen(FUNCTION_OPEN_TYPE.TrainBuild) then
|
||||
PopupTipPanel.ShowTip("功能未开启")
|
||||
PopupTipPanel.ShowTip("特训建筑功能未开启")
|
||||
return
|
||||
end
|
||||
if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TrainBuild)) then
|
||||
|
|
@ -235,7 +237,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
end
|
||||
local activeIsOpen=false
|
||||
|
||||
if (tData.Level-curLevel==1) and (self._curHerodata.HeroTraining.attackExp>=TrainingSetting.TrainExp1 and self._curHerodata.HeroTraining.defenseExp>=TrainingSetting.TrainExp2 and self._curHerodata.HeroTraining.hpExp>=TrainingSetting.TrainExp3 )and HeroManager.CheckTrainingCanLevelUp(self._curHerodata,self.curLevelData) then
|
||||
if (tData.Level-curLevel==1) and (self._curHerodata.HeroTraining.attackExp>=lastLevelTrainingSetting.TrainExp1 and self._curHerodata.HeroTraining.defenseExp>=lastLevelTrainingSetting.TrainExp2 and self._curHerodata.HeroTraining.hpExp>=lastLevelTrainingSetting.TrainExp3 )and self._curHerodata.star>=lastLevelData.MyselfCondition and HeroManager.CheckTrainingCanLevelUp(self._curHerodata,self.curLevelData) then
|
||||
activeIsOpen=true
|
||||
else
|
||||
activeIsOpen=false
|
||||
|
|
@ -279,7 +281,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local tip2=Util.GetGameObject( SkillContent,"IconBG/Tip2")
|
||||
tip:GetComponent("Text").text="特训"..NumToChinese [tData.Level].."级开启"
|
||||
Util.AddOnceClick(skillBtn,function()
|
||||
if curLevel==tData.Level and (TrainingSetting.TrainExp1>self._curHerodata.HeroTraining.attackExp or TrainingSetting.TrainExp2>self._curHerodata.HeroTraining.defenseExp or TrainingSetting.TrainExp3>self._curHerodata.HeroTraining.hpExp )then
|
||||
if curLevel<=tData.Level and (TrainingSetting.TrainExp1>self._curHerodata.HeroTraining.attackExp or TrainingSetting.TrainExp2>self._curHerodata.HeroTraining.defenseExp or TrainingSetting.TrainExp3>self._curHerodata.HeroTraining.hpExp )then
|
||||
PopupTipPanel.ShowTip(Language[12268])
|
||||
return
|
||||
end
|
||||
|
|
@ -323,10 +325,10 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
Chose:SetActive(false)
|
||||
tip2:SetActive(true)
|
||||
else
|
||||
Chose:SetActive(true)
|
||||
tip2:SetActive(false)
|
||||
end
|
||||
else
|
||||
Chose:SetActive(true)
|
||||
tip2:SetActive(false)
|
||||
end
|
||||
else
|
||||
if CheckListIsContainValue1(self._curHerodata.HeroTraining.unlockIds,tData.Id) then
|
||||
Chose:SetActive(false)
|
||||
tip2:SetActive(true)
|
||||
|
|
@ -343,8 +345,12 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
for i=1,#tData.NeedItem1 do
|
||||
tmpData[i]={}
|
||||
tmpData[i].data=tData.NeedItem1[i]
|
||||
tmpData[i].type=1---Item 栏位
|
||||
tmpData[i].Name= ItemTypeName[tData.NeedItem1[i][1]]
|
||||
tmpData[i].type=1---Item 栏位
|
||||
if tData.NeedItem1[i][1]== 56 then
|
||||
tmpData[i].Name= ItemBaseTypeName[tData.NeedItem1[i][2]]
|
||||
else
|
||||
tmpData[i].Name= ItemTypeName[tData.NeedItem1[i][1]]
|
||||
end
|
||||
end
|
||||
local index=#tmpData
|
||||
for i=index+1,index+#tData.NeedHero do
|
||||
|
|
@ -388,6 +394,10 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local Btn=Util.GetGameObject(singleSkillList[i],"frame")
|
||||
|
||||
Util.AddOnceClick(Btn, function()
|
||||
if curLevel<=tData.Level and (TrainingSetting.TrainExp1>self._curHerodata.HeroTraining.attackExp or TrainingSetting.TrainExp2>self._curHerodata.HeroTraining.defenseExp or TrainingSetting.TrainExp3>self._curHerodata.HeroTraining.hpExp )then
|
||||
PopupTipPanel.ShowTip(Language[12268])
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.TrainingItemListPanel,curData,
|
||||
function(selectItems,selectHeroOrItems)
|
||||
itemIcon.gameObject:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -207,8 +207,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
|||
lvGo:GetComponent("Text").text = heroData.lv
|
||||
icon.sprite = this.spLoader:LoadSprite(heroData.icon)
|
||||
proIcon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId))
|
||||
formationMask:SetActive((heroData.isFormation ~= "" and heroData.isFormation ~= Language[10410]) or heroData.lockState == 1)
|
||||
formationImage:SetActive(heroData.isFormation ~= "" )
|
||||
formationMask:SetActive((heroData.isFormation ~=nil and heroData.isFormation ~= "" and heroData.isFormation ~= Language[10410]) or heroData.lockState == 1)
|
||||
formationImage:SetActive(heroData.isFormation ~=nil and heroData.isFormation ~= "" )
|
||||
lockImage:SetActive( heroData.lockState == 1)
|
||||
--noumenon:SetActive( heroData.id == curHeroData.id )
|
||||
name.text = SubString2(GetLanguageStrById(heroData.heroConfig.ReadingName),8)
|
||||
|
|
|
|||
Loading…
Reference in New Issue