Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
40378ced12
|
|
@ -93,7 +93,7 @@ AudioMixerSnapshotController:
|
|||
cd318a70a881cfa4786d89d22553b9bc: -20
|
||||
6023bf70993f48344b6ce9a8ab6e9c7c: 0
|
||||
530c728060ac72748914c35aa7061ff3: 0
|
||||
ab009a90b34c0ff4a8b59c4672f44d3a: 0.67
|
||||
ab009a90b34c0ff4a8b59c4672f44d3a: 0.48
|
||||
b7969f9025520864fa43ec375c45fdfa: 0.135
|
||||
c46735a0a081d594a8ad0e915faa1e21: -20
|
||||
455637a07e9fb194e8e2d4ba3960f047: 0
|
||||
|
|
@ -109,7 +109,7 @@ AudioMixerSnapshotController:
|
|||
463d7fe003ff11f41bdbf2c7ab486744: -955
|
||||
c868f1f06623b934daa3ad6bbc4487db: -5856
|
||||
0fd27df00cebb464faa9230e0d83f30d: 6000
|
||||
29810201664bd51459a350ca1b28c4a4: 11242.799
|
||||
29810201664bd51459a350ca1b28c4a4: 17891
|
||||
2e0a5b01e25e97e40adda17dcdc70623: 3.07
|
||||
d651f521d1601984b9682a4b91165bc6: 0
|
||||
e05ad82142928624882b52abbc613253: -40.900005
|
||||
|
|
@ -210,7 +210,7 @@ AudioMixerSnapshotController:
|
|||
7781546611684eb469f6deba6c726e83: 1124
|
||||
6a218d6613daca74fba793d8d055e415: -4.560346
|
||||
d6350f7613ed9d74ebaee028d6bed8ea: 0.3
|
||||
da0314860ba7115489fffa194b4e89a3: 15359
|
||||
da0314860ba7115489fffa194b4e89a3: 17950
|
||||
f53e59866f866244193117b49e1449d7: 0.672
|
||||
8450eb86b7cad57438bfe7ac94268360: 0.1
|
||||
28f46c86c25fae44f830812ff89014f0: 20
|
||||
|
|
@ -289,7 +289,7 @@ AudioMixerSnapshotController:
|
|||
b15b8dea0da50604f96b80fbfd2d2899: 0.3
|
||||
020d8deae576cb44eba1bde7e2884b6c: 0.1
|
||||
2a9faefa7b8ffb8459869dd398a2d7f9: 10
|
||||
a946e30b20c0fe54687e20e3289bb7f9: 0.6300003
|
||||
a946e30b20c0fe54687e20e3289bb7f9: 0.44
|
||||
e3d64b0b3b69c4644ba00d681034d4d0: 0
|
||||
e0484b0b2b4dc2146afd120b85edf385: -20
|
||||
8be2762be3f0f8541a054efea48e3514: 0
|
||||
|
|
@ -325,7 +325,7 @@ AudioMixerSnapshotController:
|
|||
839424ec0aa4d1c499a7aae1bc653606: 1
|
||||
1bdfa7ec923e7cb4083d4e0b82576888: 0.027
|
||||
2bb5aafcb083c3944bf690c65d84e70d: 7
|
||||
4f7da50dac20b7c4fa85088f16add9dc: 5
|
||||
4f7da50dac20b7c4fa85088f16add9dc: 2
|
||||
abd9211d35d3af54da7f92ec6bcec406: -60
|
||||
c07aa51deaf06104d87ce4e8c14a903b: 0.8
|
||||
2250a33dd8757ba408443e8bca3e7780: 2
|
||||
|
|
@ -361,7 +361,7 @@ AudioMixerSnapshotController:
|
|||
73ffc90f389903b4baa63469b529465e: 0.942
|
||||
3ab1be1f86666554ba507f6d6bb81409: 11.5
|
||||
6846a02ff7862cd4d88bf0a222b0298f: 0
|
||||
85a7f35fa38ca2b459a9dd053396ce75: 2.2
|
||||
85a7f35fa38ca2b459a9dd053396ce75: 1.7
|
||||
5492f77f044cdad48b9ffc32c7041212: 3.43
|
||||
308c2d7fffca55948a61c7445c76e65a: 13088
|
||||
d19c008fb1687854a89dab7b48da037e: -10
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1078,7 +1078,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1171607939981861262
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -60780,7 +60780,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1171661857805907844
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -84891,7 +84891,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1171534602725036704
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -454,8 +454,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -6.0999756, y: -509.8}
|
||||
m_SizeDelta: {x: -428.2, y: 684.5}
|
||||
m_AnchoredPosition: {x: 0, y: -509.8}
|
||||
m_SizeDelta: {x: -300, y: 684.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1066462919
|
||||
MonoBehaviour:
|
||||
|
|
@ -2915,7 +2915,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1328281160499532570}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2.9121184, y: 2.9121184, z: 2.9121184}
|
||||
m_LocalScale: {x: 2, y: 2, z: 2}
|
||||
m_Children:
|
||||
- {fileID: 760474955983389260}
|
||||
m_Father: {fileID: 3470195748214042733}
|
||||
|
|
|
|||
|
|
@ -5081,7 +5081,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: 0.000057485686, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &5729675956691850897
|
||||
|
|
@ -17098,7 +17098,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
|
|
@ -19668,7 +19668,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: 0.000028742843, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000030517578, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &4796361513380277662
|
||||
|
|
|
|||
|
|
@ -639,7 +639,7 @@ function this.ExperyUpLvActivityIsShowRedPoint()
|
|||
if activeData and activeData.mission then
|
||||
for i = 1, #activeData.mission do
|
||||
local curConfigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,activeData.mission[i].missionId)
|
||||
if curConfigData and activeData.mission[i].state == 0 and activeData.value >= curConfigData.Values[2][1] then
|
||||
if curConfigData and activeData.mission[i].state == 0 and activeData.value >= curConfigData.Values[2][1] and activeData.mission[i].progress>0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -807,14 +807,15 @@ function this.CheckEliteCarbonRedpot(carbonId)
|
|||
end
|
||||
|
||||
-- 红点检测方法
|
||||
function this.CarbonRedCheck(redType)
|
||||
function this. CarbonRedCheck(redType)
|
||||
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
|
||||
return false
|
||||
end
|
||||
--日常
|
||||
if redType == RedPointType.HeroExplore then
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
|
||||
for k,v in pairs(this.GetDailyCarbons(0)) do
|
||||
if v and v.state then
|
||||
return true
|
||||
end
|
||||
if redType == RedPointType.HeroExplore then
|
||||
for k,v in pairs(this.GetDailyCarbons(0)) do
|
||||
if v and v.state then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
|
|
@ -825,22 +826,20 @@ function this.CarbonRedCheck(redType)
|
|||
-- else
|
||||
-- return false
|
||||
-- end
|
||||
-- --大闹天宫
|
||||
-- elseif redType == RedPointType.OrdinaryExplore then
|
||||
-- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
|
||||
|
||||
-- else
|
||||
-- return false
|
||||
-- end
|
||||
--大闹天宫
|
||||
elseif redType == RedPointType.OrdinaryExplore then
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
|
||||
return TreasureOfHeavenManger.RedPoint()
|
||||
end
|
||||
return false
|
||||
--车迟斗法
|
||||
elseif redType == RedPointType.LegendExplore then
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
|
||||
and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
|
||||
or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ local this = CarbonTypePanelV2
|
|||
local hasFresh = false
|
||||
local orginLayer = 0
|
||||
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||
local redPointTypeList = {}
|
||||
local type = {
|
||||
[1] = {
|
||||
title = "r_Dungeon_tonghefuben",
|
||||
|
|
@ -178,20 +179,6 @@ function CarbonTypePanelV2:BindEvent()
|
|||
UIManager.OpenPanel(UIName.VipPanelV2)
|
||||
end
|
||||
)
|
||||
|
||||
for k,v in ipairs(carbons) do
|
||||
local data
|
||||
if not type[PlayerManager.carbonType][k] then
|
||||
data = type[PlayerManager.carbonType].default
|
||||
else
|
||||
data = type[PlayerManager.carbonType][k]
|
||||
end
|
||||
if data.redPointType == -1 or not data.redPointType then
|
||||
Util.GetGameObject(v, "redPoint"):SetActive(false)
|
||||
else
|
||||
BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -228,6 +215,29 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function CarbonTypePanelV2:OnShow(...)
|
||||
if not redPointTypeList then
|
||||
redPointTypeList= {}
|
||||
end
|
||||
for k,v in pairs(carbons) do
|
||||
if redPointTypeList[Util.GetGameObject(v, "redPoint")] then
|
||||
ClearRedPointObject(redPointTypeList[Util.GetGameObject(v, "redPoint")],Util.GetGameObject(v, "redPoint"))
|
||||
redPointTypeList[Util.GetGameObject(v, "redPoint")] = -1
|
||||
end
|
||||
end
|
||||
for k,v in ipairs(carbons) do
|
||||
local data
|
||||
if not type[PlayerManager.carbonType][k] then
|
||||
data = type[PlayerManager.carbonType].default
|
||||
else
|
||||
data = type[PlayerManager.carbonType][k]
|
||||
end
|
||||
if data.redPointType == -1 or not data.redPointType then
|
||||
Util.GetGameObject(v, "redPoint"):SetActive(false)
|
||||
else
|
||||
BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
|
||||
redPointTypeList[Util.GetGameObject(v, "redPoint")] = data.redPointType
|
||||
end
|
||||
end
|
||||
carbonType = PlayerManager.carbonType
|
||||
|
||||
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
|
||||
|
|
@ -499,8 +509,10 @@ function CarbonTypePanelV2:OnDestroy()
|
|||
if data.redPointType == -1 or not data.redPointType then
|
||||
else
|
||||
ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
|
||||
redPointTypeList[Util.GetGameObject(v, "redPoint")] = -1
|
||||
end
|
||||
end
|
||||
redPointTypeList = {}
|
||||
end
|
||||
|
||||
return CarbonTypePanelV2
|
||||
|
|
@ -109,6 +109,7 @@ function this:BindEvent()
|
|||
|
||||
for i = 1, #msg.drop.Hero do
|
||||
HeroManager.UpdateHeroDatas(msg.drop.Hero[i])
|
||||
ExpeditionManager.InitHeroHpValue(msg.drop.Hero[i].id)
|
||||
end
|
||||
curSelectHero = HeroManager.GetSingleHeroData(msg.drop.Hero[1].id)
|
||||
this.ShowCurrPosHeroReplace(curIndex)
|
||||
|
|
|
|||
|
|
@ -61,7 +61,10 @@ end
|
|||
|
||||
function EightDayGiftPanel:Refresh()
|
||||
rewardData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.EightDayGift)
|
||||
curDay = math.ceil((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
|
||||
curDay = math.ceil((CalculateSecondsNowTo_N_OClock(5) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
|
||||
-- LogYellow((CalculateSecondsNowTo_N_OClock(5) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
|
||||
-- LogGreen((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
|
||||
|
||||
if curDay>8 then
|
||||
curDay = 8
|
||||
end
|
||||
|
|
@ -255,7 +258,7 @@ function EightDayGiftPanel:SetRemainTime(day,i)
|
|||
end
|
||||
if not self.localTimer then
|
||||
self.localTimer = Timer.New(function ()
|
||||
local t = CalculateSecondsNowTo_N_OClock(24)
|
||||
local t = CalculateSecondsNowTo_N_OClock(5)
|
||||
if t-1 < 0 then
|
||||
Timer.New(function()
|
||||
poolManager:UnLoadLive(bgName, Live)
|
||||
|
|
|
|||
|
|
@ -219,14 +219,7 @@ function Expert:ActivityRewardSingleShow(index,rewardData)
|
|||
qianwangButton:SetActive(state == 10)
|
||||
getFinishText:SetActive(state == 20)
|
||||
getRewardProgress:SetActive(state == 10)
|
||||
|
||||
--活动特殊处理
|
||||
if numExChange[activeIndext] == ActivityTypeDef.UpLvAct then
|
||||
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive((state == 0) and rewardData.progress>0)
|
||||
else
|
||||
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0)
|
||||
end
|
||||
|
||||
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0)
|
||||
if numExChange[activeIndext] == ActivityTypeDef.UpStarExper or numExChange[activeIndext] == ActivityTypeDef.Talisman
|
||||
or numExChange[activeIndext] == ActivityTypeDef.SoulPrint or numExChange[activeIndext] == ActivityTypeDef.EquipExper
|
||||
or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then --进阶因为每个都不一样 特殊判断
|
||||
|
|
|
|||
|
|
@ -193,16 +193,16 @@ end
|
|||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function ExpertPanel:OnShow()
|
||||
LogGreen("defaultIndex 1 "..defaultIndex)
|
||||
-- LogGreen("defaultIndex 1 "..defaultIndex)
|
||||
if defaultIndex > 0 then
|
||||
self:SetOpenActiveBtn()
|
||||
else
|
||||
defaultIndex = self:SetOpenActiveBtn()
|
||||
|
||||
LogGreen("defaultIndex 2 "..defaultIndex)
|
||||
-- LogGreen("defaultIndex 2 "..defaultIndex)
|
||||
defaultIndex = self:GetPriorityIndex(defaultIndex)
|
||||
|
||||
LogGreen("defaultIndex 3 "..defaultIndex)
|
||||
-- LogGreen("defaultIndex 3 "..defaultIndex)
|
||||
end
|
||||
self:RefreshActivityShow()
|
||||
if defaultIndex > 0 then
|
||||
|
|
@ -571,7 +571,7 @@ function ExpertPanel:SetOpenActiveBtn()
|
|||
--end
|
||||
--所有达人
|
||||
for i, v in pairs(numExChange) do
|
||||
LogGreen("v "..v)
|
||||
-- LogGreen("v "..v)
|
||||
local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v)
|
||||
if curActiveData then
|
||||
if defaultIndex == 0 or defaultIndex > i then
|
||||
|
|
|
|||
|
|
@ -432,6 +432,22 @@ function this.AllFormationDeleCurHeroId(heroDid)
|
|||
end
|
||||
end
|
||||
end
|
||||
-- 归元时检测无尽 和 大闹天宫阵容是否需要下阵
|
||||
function this.ResolvDownBattleCurHeroId(heroDid)
|
||||
for i, team in pairs(this.formationList) do
|
||||
local removeIndex
|
||||
if i == FormationTypeDef.EXPEDITION or i == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||
for j = 1, #team.teamHeroInfos do
|
||||
if team.teamHeroInfos[j] and team.teamHeroInfos[j].heroId == heroDid then
|
||||
removeIndex = j
|
||||
end
|
||||
end
|
||||
if removeIndex then
|
||||
table.remove( team.teamHeroInfos, removeIndex)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- 获取当前光环的加成数据 type 编队类型
|
||||
function this.GetCurFormationElementAdd(teamHeroInfos)
|
||||
|
|
|
|||
|
|
@ -14,9 +14,14 @@ this.damage = 0
|
|||
this.drop = nil--当场战斗掉落
|
||||
this.shopGoodId = 10031--公会副本挑战价格
|
||||
local refreshedBoss = {}
|
||||
|
||||
local endBossId = 0
|
||||
function this.Initialize()
|
||||
for _, configInfo in ConfigPairs(guildCheckpointConfig) do
|
||||
table.insert(allChapterConfigData,configInfo)
|
||||
if configInfo.Id > endBossId then
|
||||
endBossId = configInfo.Id
|
||||
end
|
||||
end
|
||||
end
|
||||
function this.GetAllConFigData()
|
||||
|
|
@ -40,7 +45,7 @@ function this.GetGuildChallengeInfoRequest(fun)
|
|||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
||||
end
|
||||
-- LogPink("curBoss "..curBoss.." blood "..blood.." canSweep "..canSweep.." buffCount "..buffCount.." buffTime "..buffTime.." sweepDamage "..sweepDamage)
|
||||
-- LogPink("curBoss "..curBoss.." blood "..blood.." canSweep "..canSweep.." buffCount "..buffCount.." buffTime "..buffTime.." sweepDamage "..msg.sweepDamage)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscriptBuff)
|
||||
end)
|
||||
|
|
@ -73,7 +78,7 @@ end
|
|||
local oldBossId = 0
|
||||
function this.RefreshGuildTranscriptInfo(msg)
|
||||
oldBossId = curBoss
|
||||
LogGreen("msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill)
|
||||
-- LogGreen("msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill)
|
||||
curBoss = msg.curBoss--当前bossId
|
||||
blood = msg.blood--剩余血量万分比
|
||||
isKill = msg.isKill--是否击杀
|
||||
|
|
@ -90,10 +95,12 @@ function this.RefreshGuildTranscriptInfo(msg)
|
|||
isKill = 1
|
||||
if not refreshedBoss[oldBossId] then
|
||||
refreshedBoss[oldBossId] = oldBossId
|
||||
LogPink("msg.refreshedBoss "..oldBossId)
|
||||
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
||||
-- LogPink("msg.refreshedBoss "..oldBossId)
|
||||
if endBossId ~= oldBossId then
|
||||
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
||||
end
|
||||
end
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||
|
|
@ -147,6 +154,9 @@ function this.GetCurBoss()
|
|||
return curBoss
|
||||
end
|
||||
function this.GetBlood()
|
||||
if blood < 0 then
|
||||
blood = 10000
|
||||
end
|
||||
return blood
|
||||
end
|
||||
function this.GetCanSweep()
|
||||
|
|
|
|||
|
|
@ -164,9 +164,9 @@ end
|
|||
|
||||
function this.SetHeroFormationList(heroDid,teamId,isAddOrDel)
|
||||
if heroDatas[heroDid] then
|
||||
LogRed("this.heroResolveLicence[teamId]:"..tostring(this.heroResolveLicence[teamId]))
|
||||
-- LogRed("this.heroResolveLicence[teamId]:"..tostring(this.heroResolveLicence[teamId]))
|
||||
if isAddOrDel and this.heroResolveLicence[teamId] then
|
||||
LogRed("添加了")
|
||||
-- LogRed("添加了")
|
||||
heroDatas[heroDid].formationList[teamId] = teamId
|
||||
else
|
||||
heroDatas[heroDid].formationList[teamId] = nil
|
||||
|
|
@ -2910,6 +2910,7 @@ function this.ResetHero(dynamicloadId)
|
|||
heroDatas[dynamicloadId].lv = 1
|
||||
heroDatas[dynamicloadId].breakId = 0
|
||||
end
|
||||
FormationManager.ResolvDownBattleCurHeroId(dynamicloadId)
|
||||
end
|
||||
--神将合成
|
||||
function this.ByCompoundHeroGetAllHeros()
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ end
|
|||
--添加事件监听(用于子类重写)
|
||||
function TrialMapPanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.TrialMap.OnPowerValueChanged, this.OnPowerValueChange)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
|
||||
-- Game.GlobalEvent:AddEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.InitBuffInfo)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero)
|
||||
|
|
@ -131,7 +131,7 @@ end
|
|||
--移除事件监听(用于子类重写)
|
||||
function TrialMapPanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.TrialMap.OnPowerValueChanged, this.OnPowerValueChange)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
|
||||
-- Game.GlobalEvent:RemoveEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.InitBuffInfo)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero)
|
||||
|
|
@ -339,12 +339,12 @@ function this.InitTrialMission()
|
|||
|
||||
end
|
||||
|
||||
-- 刷新临时背包数据
|
||||
function this.OnTempBagChanged()
|
||||
if CarbonManager.difficulty == 2 then
|
||||
this.RefreshBombNum()
|
||||
end
|
||||
end
|
||||
-- -- 刷新临时背包数据
|
||||
-- function this.OnTempBagChanged()
|
||||
-- if CarbonManager.difficulty == 2 then
|
||||
-- this.RefreshBombNum()
|
||||
-- end
|
||||
-- end
|
||||
|
||||
-- 刷新砸炸弹、回春散数量
|
||||
function this.RefreshBombNum()
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ local allMissionDailyBoxItemPres = {}
|
|||
local myGo
|
||||
function this:InitComponent(gameObject)
|
||||
myGo = gameObject
|
||||
--this.grid = Util.GetGameObject(gameObject, "infoOb/rect/grid")
|
||||
--for i = 1, 9 do
|
||||
-- allMissionDailyPres[i] = Util.GetGameObject(gameObject, "infoOb/rect/grid/dayMissionPre ("..i..")")
|
||||
-- allMissionDailyItemPres[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(allMissionDailyPres[i].transform, "itemRect/itemGrid").transform)
|
||||
--end
|
||||
this.rectMask=Util.GetGameObject(gameObject,"rect"):GetComponent("Image")
|
||||
this.rewardPre = Util.GetGameObject(gameObject, "rewardPre")
|
||||
local v = Util.GetGameObject(gameObject, "rect"):GetComponent("RectTransform").rect
|
||||
|
|
@ -101,12 +96,10 @@ function this.OnShowData()
|
|||
curDailyMissionBoxData = {}
|
||||
for i, v in pairs(TaskManager.GetTypeTaskList(TaskTypeDef.DayTask)) do
|
||||
if v.missionId < 10000 then
|
||||
--if this.GetCurIsOpen(dailyTasksConfig[v.missionId].OpenLevel) then
|
||||
if dailyTasksConfig[v.missionId].OpenLevel or ActTimeCtrlManager.SingleFuncState(dailyTasksConfig[v.missionId].OpenLevel) then
|
||||
table.insert(curDailyMissionData,v)
|
||||
end
|
||||
else
|
||||
--if this.GetCurIsOpen(dailyTasksConfig[v.missionId].OpenLevel) then
|
||||
if dailyTasksConfig[v.missionId].OpenLevel or ActTimeCtrlManager.SingleFuncState(dailyTasksConfig[v.missionId].OpenLevel) then
|
||||
table.insert(curDailyMissionBoxData,v)
|
||||
end
|
||||
|
|
@ -120,66 +113,50 @@ function this.OnShowData()
|
|||
end
|
||||
end)
|
||||
local AllData = TaskManager.GetTypeTaskList(TaskTypeDef.Achievement)
|
||||
--LogError(" ``````````` "..LengthOfTable(AllData))
|
||||
this.ScrollView:SetData(curDailyMissionData, function (index, go)
|
||||
--this.SingleDataShow(go, curDailyMissionData[index])
|
||||
this.SingleMissionDatasDataShow(go,curDailyMissionData[index])
|
||||
end)
|
||||
--this.SetDailyMission(curDailyMissionData)
|
||||
this.SetDailyMissionBox(curDailyMissionBoxData)
|
||||
end
|
||||
function this.SetDailyMission(_missionDatas)
|
||||
for i = 1, math.max(#_missionDatas, #allMissionDailyPres) do
|
||||
local go = allMissionDailyPres[i]
|
||||
if not go then
|
||||
go = newObject(allMissionDailyPres[1])
|
||||
go.transform:SetParent(this.grid.transform)
|
||||
go.name = "dayMissionPre ("..i..")"
|
||||
go.transform.localScale = Vector3.one
|
||||
go.transform.localPosition = Vector3.zero
|
||||
allMissionDailyPres[i] = go
|
||||
Util.ClearChild(Util.GetGameObject(allMissionDailyPres[i].transform, "itemRect/itemGrid").transform)
|
||||
local goItemPres = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(allMissionDailyPres[i].transform, "itemRect/itemGrid").transform)
|
||||
--goItemPres.transform:SetParent(allMissionDailyPres[i].transform)
|
||||
goItemPres.transform.localScale = Vector3.one
|
||||
goItemPres.transform.localPosition = Vector3.zero
|
||||
allMissionDailyItemPres[i] = goItemPres
|
||||
end
|
||||
go.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
for i = 1, #_missionDatas do
|
||||
allMissionDailyPres[i]:SetActive(true)
|
||||
this.SingleMissionDatasDataShow(allMissionDailyPres[i],allMissionDailyItemPres[i],_missionDatas[i])
|
||||
end
|
||||
end
|
||||
function this.SingleMissionDatasDataShow(_go,_missionData)
|
||||
local missionData = _missionData
|
||||
local missionConfigData = dailyTasksConfig[missionData.missionId]
|
||||
local reward = {}
|
||||
if missionConfigData and #missionConfigData.Reward then
|
||||
for i = 1, #missionConfigData.Reward do
|
||||
table.insert(reward,{reward = {missionConfigData.Reward[i][1],missionConfigData.Reward[i][2]},type = 1})
|
||||
end
|
||||
end
|
||||
if missionConfigData and #missionConfigData.MazePoint then
|
||||
for i = 1, #missionConfigData.MazePoint do
|
||||
table.insert(reward,{reward = {missionConfigData.MazePoint[i][1],missionConfigData.MazePoint[i][2]},type = 2})
|
||||
end
|
||||
end
|
||||
_go:SetActive(true)
|
||||
local titleText = Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text")
|
||||
titleText.text =string.format(missionConfigData.Desc,missionConfigData.Values[2][1])
|
||||
local itemGroup = Util.GetGameObject(_go, "content")
|
||||
--滚动条复用重设itemview
|
||||
if this.NoviceItemList[_go] then
|
||||
for i = 1, 4 do
|
||||
this.NoviceItemList[_go][i].gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #missionConfigData.Reward do
|
||||
if this.NoviceItemList[_go][i] then
|
||||
this.NoviceItemList[_go][i]:OnOpen(false, {missionConfigData.Reward[i][1],missionConfigData.Reward[i][2]}, 0.9,false,false,false,sortingOrder)
|
||||
this.NoviceItemList[_go][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
else
|
||||
this.NoviceItemList[_go]={}
|
||||
for i = 1, 4 do
|
||||
if not this.NoviceItemList[_go] then
|
||||
this.NoviceItemList[_go] = {}
|
||||
end
|
||||
for i = 1, #reward do
|
||||
if not this.NoviceItemList[_go][i] then
|
||||
this.NoviceItemList[_go][i] = SubUIManager.Open(SubUIConfig.ItemView, itemGroup.transform)
|
||||
this.NoviceItemList[_go][i].gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #missionConfigData.Reward do
|
||||
this.NoviceItemList[_go][i]:OnOpen(false, {missionConfigData.Reward[i][1],missionConfigData.Reward[i][2]}, 0.9,false,false,false,sortingOrder)
|
||||
this.NoviceItemList[_go][i].gameObject:SetActive(false)
|
||||
|
||||
end
|
||||
local show
|
||||
for i = 1, #reward do
|
||||
show = false
|
||||
if (reward[i].type == 2 and ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SUNLONG))
|
||||
or reward[i].type == 1 then
|
||||
show = true
|
||||
end
|
||||
if show then
|
||||
this.NoviceItemList[_go][i]:OnOpen(false, reward[i].reward, 0.9,false,false,false,sortingOrder)
|
||||
this.NoviceItemList[_go][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -172,9 +172,21 @@ function this:SetRedPoint()
|
|||
this.finalTrailBtnRed:SetActive(QinglongSerectTreasureManager.GetSerectTreasureTrailSingleRedPot(2))
|
||||
end
|
||||
|
||||
local state = {
|
||||
[1] = 0,
|
||||
[0] = 1,
|
||||
[2] = 2,
|
||||
}
|
||||
--任务列表
|
||||
function this:showTaskList(type)
|
||||
local rewardData = QinglongSerectTreasureManager.GetQinglongTaskData(type)
|
||||
table.sort(rewardData,function(a,b)
|
||||
if state[a.state] == state[b.state] then
|
||||
return a.id > b.id
|
||||
else
|
||||
return a.state > b.state
|
||||
end
|
||||
end)
|
||||
this.ScrollView:SetData(rewardData,function(index, rewardItem)
|
||||
this:SingleTask(rewardItem, rewardData[index])
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ function this.PlayerInfoRequest(func)
|
|||
Log(Language[11425]..type)
|
||||
end
|
||||
LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
|
||||
LogGreen("GetPlayerInfoResponse.treasureLevel:"..msg.treasureLevel)
|
||||
-- LogGreen("GetPlayerInfoResponse.treasureLevel:"..msg.treasureLevel)
|
||||
QinglongSerectTreasureManager.SetLevel(msg.treasureLevel)
|
||||
if func then
|
||||
func(msg)
|
||||
|
|
|
|||
|
|
@ -62,13 +62,13 @@ function this.ResetLocalData()
|
|||
func()
|
||||
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5))
|
||||
end
|
||||
LogPink("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime)
|
||||
-- LogPink("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime)
|
||||
if PlayerPrefs.GetInt(text) < curTime then
|
||||
func()
|
||||
PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400)
|
||||
end
|
||||
LogGreen("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime)
|
||||
LogPurple(PlayerPrefs.GetInt(PlayerManager.uid.."Trial"))
|
||||
-- LogGreen("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime)
|
||||
-- LogPurple(PlayerPrefs.GetInt(PlayerManager.uid.."Trial"))
|
||||
end
|
||||
|
||||
function this.OnGoldChange()
|
||||
|
|
@ -177,6 +177,11 @@ function this.BcakUpdateUserExp(_msg)
|
|||
TapDBManager.SetLevel(this.level)
|
||||
--发送埋点数据
|
||||
CustomEventManager.SendCustomEvents(FBSDKCustomEventType.RoleLv,this.level)
|
||||
CheckRedPointStatus(RedPointType.OrdinaryExplore)
|
||||
CheckRedPointStatus(RedPointType.HeroExplore)
|
||||
CheckRedPointStatus(RedPointType.LegendExplore)
|
||||
CheckRedPointStatus(RedPointType.People_Mirror)
|
||||
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerLvChange)
|
||||
if this.userLevelData and this.userLevelData[this.level] then
|
||||
|
|
@ -203,6 +208,10 @@ function this.PromoteLevel(exp)
|
|||
--Log("¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥ 玩家升级增加经验"..this.userLevelData[this.level].AddEnergy.." "..BagManager.GetItemCountById(2))
|
||||
--FightManager.SetAndGetSingleFightState3(this.level)
|
||||
RedPointManager.SetExploreRedPoint({ level = this.level })
|
||||
CheckRedPointStatus(RedPointType.OrdinaryExplore)
|
||||
CheckRedPointStatus(RedPointType.HeroExplore)
|
||||
CheckRedPointStatus(RedPointType.LegendExplore)
|
||||
CheckRedPointStatus(RedPointType.People_Mirror)
|
||||
end
|
||||
this.maxEnergy = this.userLevelData[this.level].MaxEnergy
|
||||
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ function this.InitRedPointAllRelate()
|
|||
-- 成就
|
||||
RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain)
|
||||
--大闹天宫 天宫秘宝
|
||||
RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore)
|
||||
--RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore)
|
||||
end
|
||||
|
||||
-- 注册红点检测方法
|
||||
|
|
@ -396,9 +396,10 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
|
||||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)
|
||||
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING)
|
||||
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY)
|
||||
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck)
|
||||
|
||||
--万象境副本
|
||||
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
|
||||
|
|
|
|||
|
|
@ -316,10 +316,13 @@ function RewardItemPopup:SetItemShow(drop)
|
|||
isPopGetSSR = false
|
||||
callList:Pop()()
|
||||
end, 0.05):Start()
|
||||
end
|
||||
if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 then
|
||||
HeroManager.DetectionOpenFiveStarActivity(curItemData.configData.Star)
|
||||
end
|
||||
if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 and showHero then
|
||||
isPopGetSSR = true
|
||||
isOpenGeiSSRAvtivity = curItemData.configData.Star
|
||||
isOpenGeiSSRAvtivity = curItemData.configData.Star
|
||||
UIManager.OpenPanel(UIName.DropGetSSRHeroShopPanel,curItemData.backData, func)
|
||||
elseif curItemData.configData and curItemData.itemType==1 and
|
||||
(curItemData.configData.ItemType == ItemType.Title or curItemData.configData.ItemType == ItemType.Ride or
|
||||
|
|
@ -396,6 +399,9 @@ function RewardItemPopup:SetItemShowMax(drop)
|
|||
callList:Pop()()
|
||||
end
|
||||
end
|
||||
if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 then
|
||||
HeroManager.DetectionOpenFiveStarActivity(curItemData.configData.Star)
|
||||
end
|
||||
if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 and showHero then--五星英雄
|
||||
isPopGetSSR = true
|
||||
isOpenGeiSSRAvtivity = curItemData.configData.Star
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ function this:BindEvent()
|
|||
curHeroHp=10000
|
||||
end
|
||||
MapTrialManager.SetHeroHp({curHeroHp},selectHeroDid)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
|
||||
end)
|
||||
end)
|
||||
--购买道具按钮
|
||||
|
|
|
|||
|
|
@ -223,6 +223,7 @@ function QuickCommonPurchasePart:OnConfirmBtnClicked()
|
|||
end
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP, purChaseTypeIdDef[self.context.type], self.buyCountValue, function()
|
||||
self.mainPanel:ClosePanel()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -72,16 +72,12 @@ function this.RedPointState(singleRewardData,TreasrueState)
|
|||
end
|
||||
|
||||
function this.RedPoint()
|
||||
local data={}
|
||||
for i, v in ConfigPairs(ConfigData) do
|
||||
table.insert(data, v)
|
||||
end
|
||||
for i =1, #this.rewardStateData do
|
||||
local curTreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
|
||||
if this.curScore >= ConfigData[this.rewardStateData[i].id].Integral then
|
||||
if this.rewardStateData[i].state==0 and curTreasrueState==1 or
|
||||
this.rewardStateData[i].state==1 and curTreasrueState==1 or
|
||||
this.rewardStateData[i].state==0 and curTreasrueState==0 then
|
||||
if (this.rewardStateData[i].state==0 and curTreasrueState==1) or
|
||||
(this.rewardStateData[i].state==1 and curTreasrueState==1) or
|
||||
(this.rewardStateData[i].state==0 and curTreasrueState==0) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue