Merge branch '0功能/本周版本优化内容' into master_xma_local

dev_chengFeng
zhangqiang 2021-02-20 16:30:05 +08:00
commit dea3cea647
6 changed files with 8924 additions and 7625 deletions

File diff suppressed because it is too large Load Diff

View File

@ -542,11 +542,10 @@ SHOP_PAGE = {
RECHARGE = 1, -- 充值
GENERAL = 2, -- 杂货
COIN = 3, -- 代币
PLAY = 4, -- 玩法
EXCHANGE = 5, -- 兑换
ROAM = 6, -- 云游
-- SOULBOX = 7, -- 宝囊
YUANSHEN = 7, -- 元神
YUANSHEN = 4, -- 元神
PLAY = 5, -- 玩法
EXCHANGE = 6, -- 兑换
ROAM = 7, -- 云游
}
SHOP_TYPE = {
SOUL_CONTRACT_SHOP = 1, -- 契魂商店

View File

@ -17,6 +17,7 @@ function this.Initialize()
Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.OnLevelChange)
Game.GlobalEvent:AddEvent(GameEvent.HongMeng.HongMengGuide,this.HongMengGuideFun)
end
this.IsFirstOpenHarmonyBei = false
function this.HongMengGuideFun(OnOff)
--鸿蒙碑开启引导
print("鸿蒙碑开启引导")
@ -25,17 +26,17 @@ function this.HongMengGuideFun(OnOff)
UIManager.OpenPanel(UIName.MainPanel)
table.insert(_FuncGuideList, 101612)
this.CheckFuncGuide()
for i = 1, #HarmonyManager.hongmengGuards do
-- body
if HarmonyManager.hongmengGuards[i].heroId ~= "" then
-- body
local _heroData = HeroManager.GetSingleHeroData(HarmonyManager.hongmengGuards[i].heroId)
this.IsFirstOpenHarmonyBei = true
-- for i = 1, #HarmonyManager.hongmengGuards do
-- -- body
-- if HarmonyManager.hongmengGuards[i].heroId ~= "" then
-- -- body
-- local _heroData = HeroManager.GetSingleHeroData(HarmonyManager.hongmengGuards[i].heroId)
HeroManager.UpdateSingleHeroDatas(_heroData.dynamicId, 1, _heroData.star, 0, _heroData.upStarId)
-- HeroManager.UpdateSingleHeroDatas(_heroData.dynamicId, 1, _heroData.star, 0, _heroData.upStarId)
end
end
-- end
-- end
end
end

View File

@ -606,7 +606,7 @@ function this.RefreshUpTowerPoint()
if prop and BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= prop.LevelUp[1][2] then
-- body
if BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet) >= prop.LevelUp[2][2] then
print("true")
LogGreen("true")
return true
end
@ -620,6 +620,10 @@ function this.RefreshUpTowerPoint()
return false
end
--检测主城红点
function this.CheckRedPoinStatusUpTowerMainCityRed()
CheckRedPointStatus(RedPointType.HongMeng_UpTower)
end
--票战力
local oldPowerNum = 0
function this.SetOldPowerNum(did)

View File

@ -1245,6 +1245,9 @@ function this:OnShow()
--检测灵兽红点
PokemonManager.CheckRedPointStatusPokemonMainCityRed()
--检测鸿蒙碑红点
HarmonyManager.CheckRedPoinStatusUpTowerMainCityRed()
end

View File

@ -160,7 +160,20 @@ function this.HongMengIndication(buffer)
-- body UpdateHongMengDataHeroInfos
HarmonyManager.UpdateHongMengDataHeroInfos(msg.hongmengResonacnes)
end
if GuideManager.IsFirstOpenHarmonyBei then
GuideManager.IsFirstOpenHarmonyBei = false
for i = 1, #HarmonyManager.hongmengGuards do
-- body
if HarmonyManager.hongmengGuards[i].heroId ~= "" then
-- body
local _heroData = HeroManager.GetSingleHeroData(HarmonyManager.hongmengGuards[i].heroId)
HeroManager.UpdateSingleHeroDatas(_heroData.dynamicId, 1, _heroData.star, 0, _heroData.upStarId)
end
end
end
--鸿蒙数据有变化时更新英雄战力数据
for i = 1, #msg.hongmengGuards do
if msg.hongmengGuards[i].heroId~="" then
HeroManager.UpdateSingleHeroWarPower(msg.hongmengGuards[i].heroId)