Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
c7a290e605
|
@ -93,7 +93,7 @@ AudioMixerSnapshotController:
|
||||||
cd318a70a881cfa4786d89d22553b9bc: -20
|
cd318a70a881cfa4786d89d22553b9bc: -20
|
||||||
6023bf70993f48344b6ce9a8ab6e9c7c: 0
|
6023bf70993f48344b6ce9a8ab6e9c7c: 0
|
||||||
530c728060ac72748914c35aa7061ff3: 0
|
530c728060ac72748914c35aa7061ff3: 0
|
||||||
ab009a90b34c0ff4a8b59c4672f44d3a: 0.67
|
ab009a90b34c0ff4a8b59c4672f44d3a: 0.48
|
||||||
b7969f9025520864fa43ec375c45fdfa: 0.135
|
b7969f9025520864fa43ec375c45fdfa: 0.135
|
||||||
c46735a0a081d594a8ad0e915faa1e21: -20
|
c46735a0a081d594a8ad0e915faa1e21: -20
|
||||||
455637a07e9fb194e8e2d4ba3960f047: 0
|
455637a07e9fb194e8e2d4ba3960f047: 0
|
||||||
|
@ -109,7 +109,7 @@ AudioMixerSnapshotController:
|
||||||
463d7fe003ff11f41bdbf2c7ab486744: -955
|
463d7fe003ff11f41bdbf2c7ab486744: -955
|
||||||
c868f1f06623b934daa3ad6bbc4487db: -5856
|
c868f1f06623b934daa3ad6bbc4487db: -5856
|
||||||
0fd27df00cebb464faa9230e0d83f30d: 6000
|
0fd27df00cebb464faa9230e0d83f30d: 6000
|
||||||
29810201664bd51459a350ca1b28c4a4: 11242.799
|
29810201664bd51459a350ca1b28c4a4: 17891
|
||||||
2e0a5b01e25e97e40adda17dcdc70623: 3.07
|
2e0a5b01e25e97e40adda17dcdc70623: 3.07
|
||||||
d651f521d1601984b9682a4b91165bc6: 0
|
d651f521d1601984b9682a4b91165bc6: 0
|
||||||
e05ad82142928624882b52abbc613253: -40.900005
|
e05ad82142928624882b52abbc613253: -40.900005
|
||||||
|
@ -210,7 +210,7 @@ AudioMixerSnapshotController:
|
||||||
7781546611684eb469f6deba6c726e83: 1124
|
7781546611684eb469f6deba6c726e83: 1124
|
||||||
6a218d6613daca74fba793d8d055e415: -4.560346
|
6a218d6613daca74fba793d8d055e415: -4.560346
|
||||||
d6350f7613ed9d74ebaee028d6bed8ea: 0.3
|
d6350f7613ed9d74ebaee028d6bed8ea: 0.3
|
||||||
da0314860ba7115489fffa194b4e89a3: 15359
|
da0314860ba7115489fffa194b4e89a3: 17950
|
||||||
f53e59866f866244193117b49e1449d7: 0.672
|
f53e59866f866244193117b49e1449d7: 0.672
|
||||||
8450eb86b7cad57438bfe7ac94268360: 0.1
|
8450eb86b7cad57438bfe7ac94268360: 0.1
|
||||||
28f46c86c25fae44f830812ff89014f0: 20
|
28f46c86c25fae44f830812ff89014f0: 20
|
||||||
|
@ -289,7 +289,7 @@ AudioMixerSnapshotController:
|
||||||
b15b8dea0da50604f96b80fbfd2d2899: 0.3
|
b15b8dea0da50604f96b80fbfd2d2899: 0.3
|
||||||
020d8deae576cb44eba1bde7e2884b6c: 0.1
|
020d8deae576cb44eba1bde7e2884b6c: 0.1
|
||||||
2a9faefa7b8ffb8459869dd398a2d7f9: 10
|
2a9faefa7b8ffb8459869dd398a2d7f9: 10
|
||||||
a946e30b20c0fe54687e20e3289bb7f9: 0.6300003
|
a946e30b20c0fe54687e20e3289bb7f9: 0.44
|
||||||
e3d64b0b3b69c4644ba00d681034d4d0: 0
|
e3d64b0b3b69c4644ba00d681034d4d0: 0
|
||||||
e0484b0b2b4dc2146afd120b85edf385: -20
|
e0484b0b2b4dc2146afd120b85edf385: -20
|
||||||
8be2762be3f0f8541a054efea48e3514: 0
|
8be2762be3f0f8541a054efea48e3514: 0
|
||||||
|
@ -325,7 +325,7 @@ AudioMixerSnapshotController:
|
||||||
839424ec0aa4d1c499a7aae1bc653606: 1
|
839424ec0aa4d1c499a7aae1bc653606: 1
|
||||||
1bdfa7ec923e7cb4083d4e0b82576888: 0.027
|
1bdfa7ec923e7cb4083d4e0b82576888: 0.027
|
||||||
2bb5aafcb083c3944bf690c65d84e70d: 7
|
2bb5aafcb083c3944bf690c65d84e70d: 7
|
||||||
4f7da50dac20b7c4fa85088f16add9dc: 5
|
4f7da50dac20b7c4fa85088f16add9dc: 2
|
||||||
abd9211d35d3af54da7f92ec6bcec406: -60
|
abd9211d35d3af54da7f92ec6bcec406: -60
|
||||||
c07aa51deaf06104d87ce4e8c14a903b: 0.8
|
c07aa51deaf06104d87ce4e8c14a903b: 0.8
|
||||||
2250a33dd8757ba408443e8bca3e7780: 2
|
2250a33dd8757ba408443e8bca3e7780: 2
|
||||||
|
@ -361,7 +361,7 @@ AudioMixerSnapshotController:
|
||||||
73ffc90f389903b4baa63469b529465e: 0.942
|
73ffc90f389903b4baa63469b529465e: 0.942
|
||||||
3ab1be1f86666554ba507f6d6bb81409: 11.5
|
3ab1be1f86666554ba507f6d6bb81409: 11.5
|
||||||
6846a02ff7862cd4d88bf0a222b0298f: 0
|
6846a02ff7862cd4d88bf0a222b0298f: 0
|
||||||
85a7f35fa38ca2b459a9dd053396ce75: 2.2
|
85a7f35fa38ca2b459a9dd053396ce75: 1.7
|
||||||
5492f77f044cdad48b9ffc32c7041212: 3.43
|
5492f77f044cdad48b9ffc32c7041212: 3.43
|
||||||
308c2d7fffca55948a61c7445c76e65a: 13088
|
308c2d7fffca55948a61c7445c76e65a: 13088
|
||||||
d19c008fb1687854a89dab7b48da037e: -10
|
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.
|
@ -1078,7 +1078,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1171607939981861262
|
--- !u!224 &1171607939981861262
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -60780,7 +60780,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1171661857805907844
|
--- !u!224 &1171661857805907844
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -84891,7 +84891,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1171534602725036704
|
--- !u!224 &1171534602725036704
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -807,14 +807,15 @@ function this.CheckEliteCarbonRedpot(carbonId)
|
||||||
end
|
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 redType == RedPointType.HeroExplore then
|
||||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
|
for k,v in pairs(this.GetDailyCarbons(0)) do
|
||||||
for k,v in pairs(this.GetDailyCarbons(0)) do
|
if v and v.state then
|
||||||
if v and v.state then
|
return true
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
@ -825,22 +826,20 @@ function this.CarbonRedCheck(redType)
|
||||||
-- else
|
-- else
|
||||||
-- return false
|
-- return false
|
||||||
-- end
|
-- end
|
||||||
-- --大闹天宫
|
--大闹天宫
|
||||||
-- elseif redType == RedPointType.OrdinaryExplore then
|
elseif redType == RedPointType.OrdinaryExplore then
|
||||||
-- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
|
||||||
|
return TreasureOfHeavenManger.RedPoint()
|
||||||
-- else
|
end
|
||||||
-- return false
|
return false
|
||||||
-- end
|
|
||||||
--车迟斗法
|
--车迟斗法
|
||||||
elseif redType == RedPointType.LegendExplore then
|
elseif redType == RedPointType.LegendExplore then
|
||||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
|
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
|
||||||
and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
|
and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
|
||||||
or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
|
or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
|
||||||
return true
|
return true
|
||||||
else
|
|
||||||
return false
|
|
||||||
end
|
end
|
||||||
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ local this = CarbonTypePanelV2
|
||||||
local hasFresh = false
|
local hasFresh = false
|
||||||
local orginLayer = 0
|
local orginLayer = 0
|
||||||
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||||
|
local redPointTypeList = {}
|
||||||
local type = {
|
local type = {
|
||||||
[1] = {
|
[1] = {
|
||||||
title = "r_Dungeon_tonghefuben",
|
title = "r_Dungeon_tonghefuben",
|
||||||
|
@ -178,20 +179,6 @@ function CarbonTypePanelV2:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.VipPanelV2)
|
UIManager.OpenPanel(UIName.VipPanelV2)
|
||||||
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"))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -228,6 +215,29 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function CarbonTypePanelV2:OnShow(...)
|
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
|
carbonType = PlayerManager.carbonType
|
||||||
|
|
||||||
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
|
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
|
if data.redPointType == -1 or not data.redPointType then
|
||||||
else
|
else
|
||||||
ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
|
ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
|
||||||
|
redPointTypeList[Util.GetGameObject(v, "redPoint")] = -1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
redPointTypeList = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
return CarbonTypePanelV2
|
return CarbonTypePanelV2
|
|
@ -177,6 +177,11 @@ function this.BcakUpdateUserExp(_msg)
|
||||||
TapDBManager.SetLevel(this.level)
|
TapDBManager.SetLevel(this.level)
|
||||||
--发送埋点数据
|
--发送埋点数据
|
||||||
CustomEventManager.SendCustomEvents(FBSDKCustomEventType.RoleLv,this.level)
|
CustomEventManager.SendCustomEvents(FBSDKCustomEventType.RoleLv,this.level)
|
||||||
|
CheckRedPointStatus(RedPointType.OrdinaryExplore)
|
||||||
|
CheckRedPointStatus(RedPointType.HeroExplore)
|
||||||
|
CheckRedPointStatus(RedPointType.LegendExplore)
|
||||||
|
CheckRedPointStatus(RedPointType.People_Mirror)
|
||||||
|
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerLvChange)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerLvChange)
|
||||||
if this.userLevelData and this.userLevelData[this.level] then
|
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))
|
--Log("¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥ 玩家升级增加经验"..this.userLevelData[this.level].AddEnergy.." "..BagManager.GetItemCountById(2))
|
||||||
--FightManager.SetAndGetSingleFightState3(this.level)
|
--FightManager.SetAndGetSingleFightState3(this.level)
|
||||||
RedPointManager.SetExploreRedPoint({ level = this.level })
|
RedPointManager.SetExploreRedPoint({ level = this.level })
|
||||||
|
CheckRedPointStatus(RedPointType.OrdinaryExplore)
|
||||||
|
CheckRedPointStatus(RedPointType.HeroExplore)
|
||||||
|
CheckRedPointStatus(RedPointType.LegendExplore)
|
||||||
|
CheckRedPointStatus(RedPointType.People_Mirror)
|
||||||
end
|
end
|
||||||
this.maxEnergy = this.userLevelData[this.level].MaxEnergy
|
this.maxEnergy = this.userLevelData[this.level].MaxEnergy
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,7 @@ function this.InitRedPointAllRelate()
|
||||||
-- 成就
|
-- 成就
|
||||||
RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain)
|
RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain)
|
||||||
--大闹天宫 天宫秘宝
|
--大闹天宫 天宫秘宝
|
||||||
RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore)
|
--RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 注册红点检测方法
|
-- 注册红点检测方法
|
||||||
|
@ -396,9 +396,10 @@ function this.RegisterRedCheckFunc()
|
||||||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
|
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
|
||||||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
||||||
|
|
||||||
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)
|
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING)
|
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY)
|
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck)
|
||||||
|
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck)
|
||||||
|
|
||||||
--万象境副本
|
--万象境副本
|
||||||
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
|
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
|
||||||
|
|
|
@ -72,16 +72,12 @@ function this.RedPointState(singleRewardData,TreasrueState)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.RedPoint()
|
function this.RedPoint()
|
||||||
local data={}
|
|
||||||
for i, v in ConfigPairs(ConfigData) do
|
|
||||||
table.insert(data, v)
|
|
||||||
end
|
|
||||||
for i =1, #this.rewardStateData do
|
for i =1, #this.rewardStateData do
|
||||||
local curTreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
|
local curTreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106)
|
||||||
if this.curScore >= ConfigData[this.rewardStateData[i].id].Integral then
|
if this.curScore >= ConfigData[this.rewardStateData[i].id].Integral then
|
||||||
if this.rewardStateData[i].state==0 and curTreasrueState==1 or
|
if (this.rewardStateData[i].state==0 and curTreasrueState==1) or
|
||||||
this.rewardStateData[i].state==1 and curTreasrueState==1 or
|
(this.rewardStateData[i].state==1 and curTreasrueState==1) or
|
||||||
this.rewardStateData[i].state==0 and curTreasrueState==0 then
|
(this.rewardStateData[i].state==0 and curTreasrueState==0) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue