Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-08-03 17:07:35 +08:00
commit ffdb4c9666
13 changed files with 69 additions and 69 deletions

View File

@ -1457,15 +1457,18 @@ function SetSoulEffect(quality,root)
local effect = Util.GetGameObject(root,"UI_Effect_Kuang_JinSe")
local effect1 = Util.GetGameObject(root,"UI_Effect_jinkuang_Fang")
local effect2 = Util.GetGameObject(root,"UI_Effect_jinkuang_Yuan")
if quality >= 7 then
effect1.gameObject:SetActive(true)
effect2.gameObject:SetActive(true)
effect.gameObject:SetActive(false)
else
effect1.gameObject:SetActive(false)
effect2.gameObject:SetActive(false)
effect.gameObject:SetActive(true)
end
-- if quality >= 7 then
-- effect1.gameObject:SetActive(true)
-- effect2.gameObject:SetActive(true)
-- effect.gameObject:SetActive(false)
-- else
-- effect1.gameObject:SetActive(false)
-- effect2.gameObject:SetActive(false)
-- effect.gameObject:SetActive(true)
-- end
effect1.gameObject:SetActive(false)
effect2.gameObject:SetActive(false)
effect.gameObject:SetActive(true)
end
--- 本方法适用滚动条中 生成item的使用 主要适用每条滚动条item数量不定的滚动条中

View File

@ -501,7 +501,7 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- 试炼副本才有的字段
if msg.essenceValue then
LogPink(Language[10294] .. msg.essenceValue)
-- LogPink(Language[10294] .. msg.essenceValue)
-- 判断是否可寻路标志
if msg.essenceValue >= 100 then
@ -511,7 +511,7 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
end
-- -1添加Boss点 -2添加传送门点
if MapTrialManager.powerValue >= 100 or MapTrialManager.powerValue == -1 or MapTrialManager.powerValue == -2 then
LogPink(Language[10295])
-- LogPink(Language[10295])
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointAdd, MapTrialManager.cell.cellId, MapTrialManager.cell.pointId)
end
MapTrialManager.UpdatePowerValue(msg.essenceValue)

View File

@ -47,10 +47,10 @@ function GuildCarDelayLootRecordPopup:OnShow()
local timeStr = os.date("%Y%m%d",carChallengeItem.carChallengeItem[i].time)
if not curallLootRecordData[timeStr] then
curallLootRecordData[timeStr] = {}
LogError("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
-- LogError("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i])
else
LogError("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
-- LogError("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i])
end
end

View File

@ -111,18 +111,18 @@ function this.InitData(msg)
end
Log(Language[11191] .. this.totalTime)
-- 复活剩余时间]
if msg.reviveTime then
this.deadTime = msg.reviveTime
--Log("死亡剩余时间 " .. this.deadTime)
-- -- 复活剩余时间]
-- if msg.reviveTime then
-- this.deadTime = msg.reviveTime
-- --Log("死亡剩余时间 " .. this.deadTime)
end
-- end
-- 死亡次数
if msg.dieCount then
this.deadCount = msg.dieCount
--Log("在地图里死亡" .. this.deadCount.. "次")
end
-- -- 死亡次数
-- if msg.dieCount then
-- this.deadCount = msg.dieCount
-- --Log("在地图里死亡" .. this.deadCount.. "次")
-- end
local time = msg.leftTime
@ -267,7 +267,7 @@ function this.DeletePos(mapPointId)
for i, v in pairs(MapManager.mapPointList) do
if v then
if v == mapPointId then
Log(Language[11193] .. v .. Language[11194] .. i)
-- Log(Language[11193] .. v .. Language[11194] .. i)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, i)
end
end
@ -483,9 +483,6 @@ end
function this.MapUpdateEvent(pos, func)
NetManager.MapUpdateEvent(pos, function (eventId)
--Log("event.eventId "..eventId)
--Log("point.pos2 "..pos)
-- 试炼召唤Boss需要向服务器同步一次发送-1000 此时不赋值
if pos ~= -1000 then
MapManager.curTriggerPos = pos

View File

@ -610,12 +610,11 @@ function this.TrialChangeFloor(nextMapId, msg)
end
SwitchPanel.OpenPanel(UIName.MapPanel)
MapTrialManager.isChangeLevel = false
if not MapTrialManager.IsFinalLevel() then
if MapTrialManager.curTowerLevel<10000 then
MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 1
end
--设置 进入下一层后领取全部奖励
MissionManager.GetAllRewardTrigger()
LogGreen(MapTrialManager.selectHeroDid)
end)
end

View File

@ -69,7 +69,6 @@ function this:BindEvent()
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
--更新精气值
LogGreen(Language[12222]..msg.essenceValue)
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event导致召唤boss特效播放两次直接把精气值付上就好了
MapTrialManager.powerValue = msg.essenceValue
--召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then

View File

@ -233,7 +233,6 @@ function this.UpdatePowerValue()
end
function this.PlayEffect()
Log(Language[11254])
if MapTrialManager.powerValue == -1 or MapTrialManager.powerValue == 0 then
this.UpdatePowerValue()
else
@ -585,7 +584,6 @@ function this.KillAllBitch()
for i = 1, #pointData do
local mapPointId = pointData[i][1]
if mapPointId then
Log(Language[11266] .. mapPointId)
MapManager.DeletePos(mapPointId)
end
end

View File

@ -397,7 +397,6 @@ function this.OnAddPoint(pos, pointId)
-- LogPink("pointId "..pointId)
if pos and not this.EventPoint[pos] then
local u, v = Map_Pos2UV(pos)
LogPink(u.." "..v)
this.GenEventPoint(u, v, pointId)
-- 在MapManager中添加新增的地图点
-- 如果增加的点是一个需要亮的点
@ -422,10 +421,8 @@ function this.OnAddPoint(pos, pointId)
end
function this.OnRemovePoint(mapPointPos)
Log("removePoint:"..mapPointPos)
local u, v = Map_Pos2UV(mapPointPos) -- 当前位置坐标
local mapPointId = MapManager.mapPointList[mapPointPos]
Log(Language[11323] .. mapPointId)
if MapPointConfig[mapPointId].Style == 8 then
TileMapView.GetTileData(u, v).val = 0
else

View File

@ -395,9 +395,7 @@ function this.MapOutRequest(outType, func, nextMapId)
PlayerManager.curMapId = 0
MapManager.curMapId = 0
MapManager.isInMap = false
-- MapTrialManager.UpdatePowerValue(0)
MapTrialManager.SetBossState(0)
--SubmitExtraData({ type = SDKSubMitType.TYPE_EXIT_COPY })
end)
end

View File

@ -92,8 +92,8 @@ end
function QianKunBox:OnShow(sortingOrder)
Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer)
orginLayer = sortingOrder
-- Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer)
-- orginLayer = sortingOrder
self.gameObject:SetActive(true)
self:refreshMagicNum()

View File

@ -39,6 +39,8 @@ function this:BindEvent()
elseif MapTrialManager.curTowerLevel>10000 then
PopupTipPanel.ShowTip("奖励层不可使用炸弹~")
return
elseif usedNum>=5 then
PopupTipPanel.ShowTip("炸弹使用已达最大次数~")
else
NetManager.RequestUseBomb(function (msg)--请求使用炸弹
parent:ClosePanel()
@ -102,7 +104,7 @@ function this.RefreshPanel()
item:OnOpen(false, {itemId,1}, 1.2,false,false,false,sortingOrder)
item:Reset({itemId,1},ItemType.NoType,{nil,false,nil,false})
this.num.text=Language[11657]..itemNum
this.leftTime.text=Language[11656]..trialSetting[1].PrivilegeReward[2]-usedNum
this.leftTime.text=Language[11656]..(usedNum>=5 and 0 or (trialSetting[1].PrivilegeReward[2]-usedNum))
end
return this

View File

@ -51,11 +51,7 @@ function RoleTalentPopup:GetTalentDataShow()
upStarSkillDataList = {}
if heroConfig.OpenPassiveSkillRules then
for i = 1, #heroConfig.OpenPassiveSkillRules do
--LogError("i "..i)
if heroConfig.OpenPassiveSkillRules[i][1] == 1 then--突破
local singSkillData = {}
singSkillData.passiveSkillConfig = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]]
singSkillData.OpenPassiveSkillRules = heroConfig.OpenPassiveSkillRules[i]
local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11864]
local curBreakId = heroConfig.OpenPassiveSkillRules[i][2]
if breakId >= curBreakId then
@ -72,16 +68,22 @@ function RoleTalentPopup:GetTalentDataShow()
end
end
else--升星
local singSkillData = {}
singSkillData.passiveSkillConfig = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]]
singSkillData.OpenPassiveSkillRules = heroConfig.OpenPassiveSkillRules[i]
singSkillData.titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11865]
if upStarId >= heroConfig.OpenPassiveSkillRules[i][2] then
singSkillData.isOpen = true
local curUpStarId = heroConfig.OpenPassiveSkillRules[i][2]
local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11865]
local _passiveSkillId = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Id
if upStarId >= curUpStarId then
if upStarSkillDataList[curUpStarId] then
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. "  <color=#66FF00>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
else
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#66FF00>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
end
else
singSkillData.isOpen = false
if upStarSkillDataList[curUpStarId] then
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =upStarSkillDataList[curUpStarId].str .. " <color=#B9AC97>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
else
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#B9AC97>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
end
end
table.insert(upStarSkillDataList,singSkillData)
end
end
end
@ -106,8 +108,12 @@ function RoleTalentPopup:GetTalentDataShow()
go.gameObject:SetActive(true)
go:GetComponent("Text").text = breakSkillDataList2[i].str
end
for i = 1, math.max(#upStarSkillDataList, #self.upStarSkillGoList) do
local upStarSkillDataList2 = {}
for i, v in pairs(upStarSkillDataList) do
table.insert(upStarSkillDataList2,v)
end
table.sort(upStarSkillDataList2, function(a,b) return a.index<b.index end)
for i = 1, math.max(#upStarSkillDataList2, #self.upStarSkillGoList) do
local go = self.upStarSkillGoList[i]
if not go then
go = newObject(self.upStarSkillTextPre)
@ -118,22 +124,17 @@ function RoleTalentPopup:GetTalentDataShow()
end
go.gameObject:SetActive(false)
end
for i = 1, #upStarSkillDataList do
for i = 1, #upStarSkillDataList2 do
local go = self.upStarSkillGoList[i]
go.gameObject:SetActive(true)
local kongStr = ""
if passiveSkillLogicConfig[upStarSkillDataList[i].passiveSkillConfig.Id].Judge == 1 then
if passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1 then
kongStr = "   "
else
kongStr = ""
end
if upStarSkillDataList[i].isOpen then
go:GetComponent("Text").text = kongStr.."<color=#66FF00>"..upStarSkillDataList[i].titleStr..upStarSkillDataList[i].passiveSkillConfig.Desc.."</color>"
else
go:GetComponent("Text").text = kongStr.."<color=#B9AC97>"..upStarSkillDataList[i].titleStr..upStarSkillDataList[i].passiveSkillConfig.Desc.."</color>"
end
Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList[i].passiveSkillConfig.Id].Judge == 1)
Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1)
go:GetComponent("Text").text = kongStr .. upStarSkillDataList2[i].str
end
end

View File

@ -228,9 +228,12 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
--魂印
elseif _itemData.configData.ItemType == ItemType.HunYin then
if effectLayer > 0 then
self.UI_Effect_jinkuang_Fang:SetActive(_itemData.configData.Quantity == 7)
self.UI_Effect_jinkuang_Yuan:SetActive(_itemData.configData.Quantity == 7)
self.UI_Effect_Kuang_JinSe:SetActive(not (_itemData.configData.Quantity == 7))
-- self.UI_Effect_jinkuang_Fang:SetActive(_itemData.configData.Quantity == 7)
-- self.UI_Effect_jinkuang_Yuan:SetActive(_itemData.configData.Quantity == 7)
-- self.UI_Effect_Kuang_JinSe:SetActive(not (_itemData.configData.Quantity == 7))
self.UI_Effect_jinkuang_Fang:SetActive(false)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_Effect_Kuang_JinSe:SetActive(true)
end
self.iconGo:SetActive(false)
self.circleFrameBg:SetActive(true)
@ -485,9 +488,12 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0)
end)
elseif itemDataConFig.ItemType == ItemType.HunYin then
self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7)
self.UI_Effect_jinkuang_Yuan:SetActive(itemConfig[itemSId].Quantity>=7)
self.UI_Effect_Kuang_JinSe:SetActive(not (itemConfig[itemSId].Quantity>=7))
-- self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7)
-- self.UI_Effect_jinkuang_Yuan:SetActive(itemConfig[itemSId].Quantity>=7)
-- self.UI_Effect_Kuang_JinSe:SetActive(not (itemConfig[itemSId].Quantity>=7))
self.UI_Effect_jinkuang_Fang:SetActive(false)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_Effect_Kuang_JinSe:SetActive(true)
self.num:SetActive(true)
self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.iconGo:SetActive(false)