diff --git a/Assets/ManagedResources/Audio/GameAudioMixer.mixer b/Assets/ManagedResources/Audio/GameAudioMixer.mixer index 41a13ec8b8..b43bee8b99 100644 --- a/Assets/ManagedResources/Audio/GameAudioMixer.mixer +++ b/Assets/ManagedResources/Audio/GameAudioMixer.mixer @@ -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 diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 index 98ad670e3b..de181495e2 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_04.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 index 58222b0cc2..b05d03861d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_05.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 index a6c661c088..acaec575c8 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_normal_effect_06.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Cancel.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Cancel.mp3 index f48c4eb6cb..8ab1c28d35 100644 Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Cancel.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Cancel.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 index 6e9b54a775..862d89d71a 100644 Binary files a/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_CommonClick.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_01.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_01.mp3 index 8c115d118f..67d2e6b92c 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_01.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_02.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_02.mp3 index 9bfe069be6..8b836bf987 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_02.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_02.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_03.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_03.mp3 index 4a898fea51..ee8c15ce42 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_03.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_03.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_04.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_04.mp3 index 7564351883..81a604ea06 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_04.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_04.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_05.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_05.mp3 index b835aff87f..fcaecdbffc 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_05.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_05.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_06.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_06.mp3 index 869985c3b5..c3562b74b2 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_06.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_06.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_07.mp3 b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_07.mp3 index 43190f9b4f..f3d91cc234 100644 Binary files a/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_07.mp3 and b/Assets/ManagedResources/Audio/UI/footstep/Footsteps_Run_07.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/special/UI_029_01.mp3 b/Assets/ManagedResources/Audio/UI/special/UI_029_01.mp3 index cc0366a241..47f6032f1d 100644 Binary files a/Assets/ManagedResources/Audio/UI/special/UI_029_01.mp3 and b/Assets/ManagedResources/Audio/UI/special/UI_029_01.mp3 differ diff --git a/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab b/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab index 020f9578f3..9bb0587b9e 100644 --- a/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab +++ b/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 74f4dd3829..948993f823 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 52c6372dfb..a523056315 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -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 \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index a0481119c8..4a98d2818f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ff90df806a..7589b522d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index 4f48242662..bc471c7762 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -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