四灵第二次修改提交
parent
56af6f1a11
commit
a12c9330c7
|
@ -10005,8 +10005,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 3.61, y: -2.07}
|
m_AnchoredPosition: {x: 3.895, y: -11.8}
|
||||||
m_SizeDelta: {x: 220.48, y: 68.14}
|
m_SizeDelta: {x: 227.74, y: 88.56}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8648946191202129169
|
--- !u!222 &8648946191202129169
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -10036,7 +10036,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
|
m_Sprite: {fileID: 21300000, guid: e1d78aa0a727c9046bbb92cdb973574a, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
|
@ -179158,7 +179158,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 62.205017, y: 61.974976}
|
m_AnchoredPosition: {x: 50.75, y: 61.974976}
|
||||||
m_SizeDelta: {x: 26, y: 26}
|
m_SizeDelta: {x: 26, y: 26}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4726073875329451098
|
--- !u!222 &4726073875329451098
|
||||||
|
|
|
@ -7067,7 +7067,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -274, y: -4.7999}
|
m_AnchoredPosition: {x: -274, y: 7}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &7567570191903525415
|
--- !u!1 &7567570191903525415
|
||||||
|
@ -7623,7 +7623,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -274, y: -4.7999}
|
m_AnchoredPosition: {x: -274, y: 7}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &8021680628916541492
|
--- !u!1 &8021680628916541492
|
||||||
|
|
|
@ -1057,6 +1057,7 @@ JumpType = {
|
||||||
XuanYuanMirror=74 , --车迟斗法
|
XuanYuanMirror=74 , --车迟斗法
|
||||||
CompoundHero = 78,--神将合成、置换
|
CompoundHero = 78,--神将合成、置换
|
||||||
Pokemon = 79,--灵兽山
|
Pokemon = 79,--灵兽山
|
||||||
|
FourElementTrail = 83,--四灵试炼
|
||||||
SacredTree = 84,--建木神树
|
SacredTree = 84,--建木神树
|
||||||
JumpServerHightLadder = 82,--灵兽山
|
JumpServerHightLadder = 82,--灵兽山
|
||||||
HongMengZhen = 86,-- 鸿蒙阵
|
HongMengZhen = 86,-- 鸿蒙阵
|
||||||
|
|
|
@ -115,11 +115,26 @@ function this:SortHeros(data)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:SortHeros1(data)
|
function this:SortHeros1(data)
|
||||||
for i = 1 ,#data do
|
local tempData = MonsterCampManager.GetFriendHelpHero(curType)
|
||||||
if data[i].hero.warPower > heightPower then
|
if tempData then
|
||||||
data[i].sortId = 0
|
for i = 1 ,#data do
|
||||||
else
|
if data[i].hero.dynamicId == tempData.hero.dynamicId then
|
||||||
data[i].sortId = 1
|
data[i].sortId = 2
|
||||||
|
else
|
||||||
|
if data[i].hero.warPower > heightPower then
|
||||||
|
data[i].sortId = 0
|
||||||
|
else
|
||||||
|
data[i].sortId = 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
for i = 1 ,#data do
|
||||||
|
if data[i].hero.warPower > heightPower then
|
||||||
|
data[i].sortId = 0
|
||||||
|
else
|
||||||
|
data[i].sortId = 1
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
table.sort(data,function(a,b)
|
table.sort(data,function(a,b)
|
||||||
|
|
|
@ -70,8 +70,9 @@ function FourElementMonsterCampPanel:BindEvent()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.addBtn, function ()
|
Util.AddClick(this.addBtn, function ()
|
||||||
if buyTimes < 0 then
|
if buyTimes < 1 then
|
||||||
PopupTipPanel.ShowTip("今日已无购买次数")
|
PopupTipPanel.ShowTip("今日已无购买次数")
|
||||||
|
return
|
||||||
else
|
else
|
||||||
if BagManager.GetItemCountById(itemId) < costNum then
|
if BagManager.GetItemCountById(itemId) < costNum then
|
||||||
PopupTipPanel.ShowTip(string.format(Language[10343], itemConfig[itemId].Name))
|
PopupTipPanel.ShowTip(string.format(Language[10343], itemConfig[itemId].Name))
|
||||||
|
|
|
@ -486,9 +486,9 @@ function this.SetFriendHelpHero(helpFightList,trailType)
|
||||||
end
|
end
|
||||||
if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then
|
if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then
|
||||||
FormationManager.RefreshFormation(
|
FormationManager.RefreshFormation(
|
||||||
this.root.curFormationIndex,
|
trailType + 2000,
|
||||||
this.root.choosedList,
|
newteam,
|
||||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
FormationManager.formationList[trailType + 2000].teamPokemonInfos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if helpFightList then
|
if helpFightList then
|
||||||
|
@ -594,6 +594,11 @@ function this.GetSingleHeroData(did)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
for _,v in pairs(this.friendHelpHero) do
|
||||||
|
if v and v.hero and v.hero.dynamicId == did then
|
||||||
|
return v.hero
|
||||||
|
end
|
||||||
|
end
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -759,6 +759,14 @@ local jumpDic = {
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
|
[JumpType.FourElementTrail] = function(data)
|
||||||
|
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then
|
||||||
|
UIManager.OpenPanel(UIName.MonsterCampMainPanel)
|
||||||
|
else
|
||||||
|
PopupTipPanel.ShowTip("四灵试炼暂未开启")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function this.JumpActivity(data,skipfactor)
|
function this.JumpActivity(data,skipfactor)
|
||||||
|
|
|
@ -84,6 +84,18 @@ function RoleInfoLayout:InitComponent()
|
||||||
lvUpShowProList[5]:SetActive(false)
|
lvUpShowProList[5]:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function RoleInfoLayout:OnPointerUp(Pointgo,data)--抬起
|
||||||
|
if self.isPressed then
|
||||||
|
self.isPressed = false
|
||||||
|
self:RefreshBottom(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--点击或长按处理升级处理
|
||||||
|
function RoleInfoLayout:OnPointerDown(Pointgo,data)--按下
|
||||||
|
self.isPressed = true
|
||||||
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function RoleInfoLayout:BindEvent()
|
function RoleInfoLayout:BindEvent()
|
||||||
--升级
|
--升级
|
||||||
|
|
|
@ -7,7 +7,7 @@ local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetti
|
||||||
local orginLayer = 0
|
local orginLayer = 0
|
||||||
local curTreeLevel = 0
|
local curTreeLevel = 0
|
||||||
local length = 0
|
local length = 0
|
||||||
|
local t = 3 --用来区分长按和点击的临界值
|
||||||
function SacredTreePanel:InitComponent()
|
function SacredTreePanel:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
--button
|
--button
|
||||||
|
@ -27,8 +27,94 @@ function SacredTreePanel:InitComponent()
|
||||||
self.attriNum = Util.GetGameObject(self.transform, "attriBtn/num"):GetComponent("Text")
|
self.attriNum = Util.GetGameObject(self.transform, "attriBtn/num"):GetComponent("Text")
|
||||||
|
|
||||||
self.UI_effect_RecruitPanel_particle = Util.GetGameObject(self.transform, "UI_effect_RecruitPanel_particle")
|
self.UI_effect_RecruitPanel_particle = Util.GetGameObject(self.transform, "UI_effect_RecruitPanel_particle")
|
||||||
|
|
||||||
|
self.trigger = Util.GetEventTriggerListener(self.upgradeBtn.donImg)
|
||||||
|
self.OnPointerDo = function(go, data)
|
||||||
|
self:OnPointerDown(go, data, i)
|
||||||
|
end
|
||||||
|
self.OnPointerUp = function(go, data)
|
||||||
|
self:OnPointerUp(go,data)
|
||||||
|
end
|
||||||
|
-- self.trigger.onPointerDown = self.trigger.onPointerDown + self.OnPointerDo
|
||||||
|
-- self.trigger.onPointerUp = self.trigger.onPointerUp + self.OnPointerUp
|
||||||
|
-- self.itemNum = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- function SacredTreePanel:OnPointerDown()
|
||||||
|
-- if curTreeLevel >= length then
|
||||||
|
-- PopupTipPanel.ShowTip("神树已达最大等级~")
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- if self.itemNum < treeLevelConfig[curTreeLevel].LvupCost[2] then
|
||||||
|
-- PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name))
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- self.isPressed = true
|
||||||
|
-- end
|
||||||
|
|
||||||
|
-- function SacredTreePanel:OnPointerUp()
|
||||||
|
-- if self.isPressed then
|
||||||
|
-- self.isPressed = false
|
||||||
|
-- self:RefreshBottom(true)
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
|
||||||
|
-- function SacredTreePanel:OnUpdate()
|
||||||
|
-- if self.isPressed then
|
||||||
|
-- if self.numCount > t then
|
||||||
|
-- self.isShortPress = false
|
||||||
|
-- self:Refresh(false)
|
||||||
|
-- self.numCount = 0
|
||||||
|
-- else
|
||||||
|
-- self.isShortPress = true
|
||||||
|
-- end
|
||||||
|
-- self.numCount = self.numCount + 1
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
|
||||||
|
-- function SacredTreePanel:Refresh(isSend)
|
||||||
|
-- if isSend then
|
||||||
|
-- self.isPressed = false
|
||||||
|
-- self.isShortPress = false
|
||||||
|
-- self.numCount = 0
|
||||||
|
-- if self.num < 1 then
|
||||||
|
-- self.num = 1
|
||||||
|
-- end
|
||||||
|
-- self:RequestDonate(self.num)
|
||||||
|
-- else
|
||||||
|
-- self.num = self.num + 1
|
||||||
|
-- self.itemNum = self.itemNum - 1
|
||||||
|
-- if self.itemNum < treeLevelConfig[curTreeLevel].LvupCost[2] then
|
||||||
|
-- self.isPressed = false
|
||||||
|
-- self:Refresh(true)
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- if curTreeLevel == 0 then
|
||||||
|
-- PopupTipPanel.ShowTip("成功解锁神树~")
|
||||||
|
-- end
|
||||||
|
-- local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
-- SacredTreeManager.OnPowerChange(oldPower)
|
||||||
|
-- if curTreeLevel >= length then
|
||||||
|
-- self.isPressed = false
|
||||||
|
-- self:Refresh(true)
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- self:OnShow()
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
|
||||||
|
-- function SacredTreePanel:RequestDonate(num)
|
||||||
|
-- if num <= 0 then
|
||||||
|
-- PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name))
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- NetManager.UpgradeGodTreeRequest(function ()
|
||||||
|
-- self.num = 0
|
||||||
|
-- self:OnShow()
|
||||||
|
-- end)
|
||||||
|
-- self.num = 0
|
||||||
|
-- end
|
||||||
|
|
||||||
function SacredTreePanel:BindEvent()
|
function SacredTreePanel:BindEvent()
|
||||||
Util.AddClick(self.backBtn, function()
|
Util.AddClick(self.backBtn, function()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
|
|
|
@ -74,7 +74,10 @@ function ElementalResonanceView:GetElementalType(curFormation, type)
|
||||||
|
|
||||||
if (type == 1) then
|
if (type == 1) then
|
||||||
for i, v in pairs(curFormation) do
|
for i, v in pairs(curFormation) do
|
||||||
self.heroPropertyType = HeroManager.GetSingleHeroData(v.heroId).heroConfig.PropertyName
|
|
||||||
|
local data = HeroManager.GetSingleHeroData(v.heroId)
|
||||||
|
self.heroPropertyType = data.heroConfig.PropertyName
|
||||||
|
LogGreen("data.heroConfig.PropertyName:"..tostring(data.heroConfig.PropertyName))
|
||||||
table.insert(elementPropertyList, self.heroPropertyType)
|
table.insert(elementPropertyList, self.heroPropertyType)
|
||||||
end
|
end
|
||||||
self.dataTable.title = Language[12021]
|
self.dataTable.title = Language[12021]
|
||||||
|
|
|
@ -86,12 +86,7 @@ end
|
||||||
function FourTrailSingleHelpHero:SetIcon1(heroData,player)
|
function FourTrailSingleHelpHero:SetIcon1(heroData,player)
|
||||||
local tempData = MonsterCampManager.GetFriendHelpHero(self.curType)
|
local tempData = MonsterCampManager.GetFriendHelpHero(self.curType)
|
||||||
self.btn:GetComponent("Button").enabled = true
|
self.btn:GetComponent("Button").enabled = true
|
||||||
if self.heifhtPower < heroData.warPower then
|
if tempData and heroData.dynamicId == tempData.hero.dynamicId then
|
||||||
self.select.sprite = self.spLoader:LoadSprite("s_silingshilian_zhanliguogao_zh")
|
|
||||||
self.select:SetNativeSize()
|
|
||||||
self.selectText.text = ""
|
|
||||||
self.btn:GetComponent("Button").enabled = false
|
|
||||||
elseif tempData and heroData.dynamicId == tempData.hero.dynamicId then
|
|
||||||
if tempData.player and tempData.player.state == 1 then
|
if tempData.player and tempData.player.state == 1 then
|
||||||
self.select.sprite = self.spLoader:LoadSprite("s_silingshilian_yishiyong_zh")
|
self.select.sprite = self.spLoader:LoadSprite("s_silingshilian_yishiyong_zh")
|
||||||
self.select:SetNativeSize()
|
self.select:SetNativeSize()
|
||||||
|
@ -124,6 +119,11 @@ function FourTrailSingleHelpHero:SetIcon1(heroData,player)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
elseif self.heifhtPower < heroData.warPower then
|
||||||
|
self.select.sprite = self.spLoader:LoadSprite("s_silingshilian_zhanliguogao_zh")
|
||||||
|
self.select:SetNativeSize()
|
||||||
|
self.selectText.text = ""
|
||||||
|
self.btn:GetComponent("Button").enabled = false
|
||||||
else
|
else
|
||||||
self.select.sprite = self.spLoader:LoadSprite("r_hero_button_001")
|
self.select.sprite = self.spLoader:LoadSprite("r_hero_button_001")
|
||||||
self.select:SetNativeSize()
|
self.select:SetNativeSize()
|
||||||
|
|
|
@ -608,7 +608,11 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
||||||
end
|
end
|
||||||
if data.treeLv > 0 and data.upHeroDid ~= "" and tostring(data.upHeroDid) ~= tostring(0) then
|
if data.treeLv > 0 and data.upHeroDid ~= "" and tostring(data.upHeroDid) ~= tostring(0) then
|
||||||
self.middleDownLv.gameObject:SetActive(true)
|
self.middleDownLv.gameObject:SetActive(true)
|
||||||
self.middleDownLvText.text =string.format("<color=#FFFFFF>%s</color>", data.treeLv)
|
local lv = data.treeLv
|
||||||
|
if data.treeLv > data.maxTreeLv then
|
||||||
|
lv = data.maxTreeLv
|
||||||
|
end
|
||||||
|
self.middleDownLvText.text =string.format("<color=#FFFFFF>%s</color>", lv)
|
||||||
else
|
else
|
||||||
self.middleDownLv.gameObject:SetActive(false)
|
self.middleDownLv.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue