神应修改提交

dev_chengFeng
jiaoyangna 2021-08-30 18:09:06 +08:00
parent 1ea100ed83
commit 4801852d88
6 changed files with 29 additions and 16 deletions

View File

@ -1359,7 +1359,7 @@ MonoBehaviour:
m_Left: 0 m_Left: 0
m_Right: 0 m_Right: 0
m_Top: 0 m_Top: 0
m_Bottom: 0 m_Bottom: 30
m_ChildAlignment: 4 m_ChildAlignment: 4
m_Spacing: 0 m_Spacing: 0
m_ChildForceExpandWidth: 1 m_ChildForceExpandWidth: 1
@ -3749,7 +3749,7 @@ MonoBehaviour:
m_Left: 0 m_Left: 0
m_Right: 0 m_Right: 0
m_Top: 0 m_Top: 0
m_Bottom: 0 m_Bottom: 30
m_ChildAlignment: 4 m_ChildAlignment: 4
m_Spacing: 0 m_Spacing: 0
m_ChildForceExpandWidth: 1 m_ChildForceExpandWidth: 1

View File

@ -370,16 +370,14 @@ function this.InitSingleTreasureData(_singleData,_fourTotal,_treeLevel)
single.id=staticId single.id=staticId
single.idDyn=_singleData.id single.idDyn=_singleData.id
single.lv=_singleData.exp single.lv=_singleData.exp
LogGreen("single.lv:"..single.lv)
single.refineLv=_singleData.rebuildLevel single.refineLv=_singleData.rebuildLevel
LogGreen("single.refineLv:"..single.refineLv)
single.maxLv=currJewel.Max[1] single.maxLv=currJewel.Max[1]
single.maxRefineLv=currJewel.Max[2] single.maxRefineLv=currJewel.Max[2]
single.upHeroDid="" single.upHeroDid=""
single.maxTreeLv = currJewel.GodHoodMaxlv single.maxTreeLv = currJewel.GodHoodMaxlv
single.treeLv = _treeLevel single.treeLv = _treeLevel
single.treePool = currJewel.GodHoodPool
single.fourTotal = _fourTotal single.fourTotal = _fourTotal
LogGreen("_treeLevel:"..single.treeLv.." single.fourTotal:"..single.fourTotal)
local quantity=currJewel.Level local quantity=currJewel.Level
single.quantity=quantity single.quantity=quantity
single.frame=GetQuantityImageByquality(quantity) single.frame=GetQuantityImageByquality(quantity)

View File

@ -529,6 +529,15 @@ end
--计算战斗力 --计算战斗力
function this.CalculateWarForce(Did) function this.CalculateWarForce(Did)
local curTreasure = allTreasures[Did] local curTreasure = allTreasures[Did]
if not curTreasure then
curTreasure = MonsterCampManager.GetSingleTreasureByIdDyn(Did)
end
if not curTreasure then
curTreasure = ExpeditionManager.GetSingleTreasureByIdDyn(Did)
end
if not curTreasure then
GoodFriendManager.GetSingleTreasureByIdDyn(Did)
end
if curTreasure then if curTreasure then
return this.CalculateWarForceBase(curTreasure.id, curTreasure.lv, curTreasure.refineLv, curTreasure.treeLv) return this.CalculateWarForceBase(curTreasure.id, curTreasure.lv, curTreasure.refineLv, curTreasure.treeLv)
end end

View File

@ -188,14 +188,14 @@ end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_curEquipData,_nextEquipData,_position,isShowBtn) function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_curEquipData,_nextEquipData,_position,_isShowBtn)
openThisPanel = _openThisPanel openThisPanel = _openThisPanel
type = _type--1 穿戴 2 卸下 3 替换 4显示信息 type = _type--1 穿戴 2 卸下 3 替换 4显示信息
curHeroData = _curHeroData curHeroData = _curHeroData
equipData[1] = _curEquipData--lv equipData[1] = _curEquipData--lv
equipData[2] = _nextEquipData--refinelv equipData[2] = _nextEquipData--refinelv
position = _position--treelv position = _position--treelv
isShowBtn = isShowBtn isShowBtn = _isShowBtn
end end
function RoleEquipTreasureChangePopup:OnShow() function RoleEquipTreasureChangePopup:OnShow()
Log("openType:"..tostring(type)) Log("openType:"..tostring(type))
@ -393,9 +393,9 @@ function this.ShowEquipData(i)
this.SetPropertyShow1(refineInfo,this.RefinePropertyList[i],this.treasurePanel[i].RefineAttriGrid) this.SetPropertyShow1(refineInfo,this.RefinePropertyList[i],this.treasurePanel[i].RefineAttriGrid)
end end
--(神应属性) --(神应属性)
local treeInfo=SacredTreeManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv) local treeInfo=SacredTreeManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv or 0)
this.treasurePanel[i].TreeAttriNum.text = string.format("[神应等级:%s/%s]",equipData[i].treeLv,equipData[i].maxTreeLv) this.treasurePanel[i].TreeAttriNum.text = string.format("[神应等级:%s/%s]",equipData[i].treeLv,equipData[i].maxTreeLv)
if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or treeLv == 0 then if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or (equipData[i].treeLv < 1 and SacredTreeManager.CulAttri(equipData[1]) < 1) then
this.treasurePanel[i].TreeAttri:SetActive(false) this.treasurePanel[i].TreeAttri:SetActive(false)
else else
this.treasurePanel[i].TreeAttri:SetActive(true) this.treasurePanel[i].TreeAttri:SetActive(true)
@ -410,7 +410,7 @@ end
--神应专用 --神应专用
function this.SetPropertyShow2(_infos,_preList,_grid) function this.SetPropertyShow2(_infos,_preList,_grid)
local curTree = SacredTreeManager.CulAttri() local curTree = SacredTreeManager.CulAttri(equipData[1])
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0).PropertyUnlcokLevelForClient local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0).PropertyUnlcokLevelForClient
local dataCount=LengthOfTable(_infos) local dataCount=LengthOfTable(_infos)
local preCount=#_preList local preCount=#_preList

View File

@ -60,8 +60,13 @@ function this.GetUnLockNewProperty(trailWaves)
end end
--计算神应等级 --计算神应等级
function this.CulAttri() function this.CulAttri(dadta)
local wave = this.GetTowerLevel() local wave
if not dadta or EquipTreasureManager.GetSingleTreasureByIdDyn(dadta.idDyn) then
wave = this.GetTowerLevel()
else
wave = dadta.fourTotal or 0
end
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0) local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0)
local level = 0 local level = 0
for i = 1, #attriConfig.PropertyUnlcokLevels do for i = 1, #attriConfig.PropertyUnlcokLevels do
@ -118,9 +123,10 @@ function this.GetCurLvPropertyValue(_type, _id, _lv)
local index = info[1] local index = info[1]
local skillValue = {} local skillValue = {}
skillValue.currValue = info[2] skillValue.currValue = info[2]
if info[2] ~= 0 then proList[index] = skillValue
proList[index] = skillValue -- if info[2] ~= 0 then
end -- proList[index] = skillValue
-- end
end end
end end
end end

View File

@ -607,7 +607,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
end end
if data.treeLv > 0 then if data.treeLv > 0 then
self.middleDownLv.gameObject:SetActive(true) self.middleDownLv.gameObject:SetActive(true)
self.middleDownLvText.text =string.format("<color=#F7AA43>+%s</color>", data.treeLv) self.middleDownLvText.text =string.format("<color=#F7AA43>%s</color>", data.treeLv)
else else
self.middleDownLv.gameObject:SetActive(false) self.middleDownLv.gameObject:SetActive(false)
end end