diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
index 1d2c84c2af..eab50afb16 100644
--- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
@@ -5265,7 +5265,7 @@ ParticleSystem:
--- !u!199 &5734484363214883009
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -9967,7 +9967,7 @@ ParticleSystem:
--- !u!199 &6547328438741576690
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -14613,7 +14613,7 @@ ParticleSystem:
--- !u!199 &4611267319823558948
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -19954,7 +19954,7 @@ ParticleSystem:
--- !u!199 &8159218852725627657
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -20300,7 +20300,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 3.61, y: -2.95}
+ m_AnchoredPosition: {x: 3.61, y: 6}
m_SizeDelta: {x: 184.68, y: 55.89}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &857682402620420529
@@ -25260,7 +25260,7 @@ ParticleSystem:
--- !u!199 &1045483648553265223
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -29963,7 +29963,7 @@ ParticleSystem:
--- !u!199 &2162722188982416306
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -34611,7 +34611,7 @@ ParticleSystem:
--- !u!199 &5681840723083468755
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -34800,8 +34800,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -5.2413, y: -156}
- m_SizeDelta: {x: 235.53, y: 76.14}
+ m_AnchoredPosition: {x: -5.2413, y: -157.5}
+ m_SizeDelta: {x: 235.5, y: 96.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3038910061454878525
CanvasRenderer:
@@ -39619,7 +39619,7 @@ ParticleSystem:
--- !u!199 &1957131221044891308
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -45621,7 +45621,7 @@ ParticleSystem:
--- !u!199 &1848008278461600587
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -50513,7 +50513,7 @@ ParticleSystem:
--- !u!199 &8813895173049014071
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -51280,8 +51280,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 3.895, y: -6.7}
- m_SizeDelta: {x: 227.74, y: 70}
+ m_AnchoredPosition: {x: 3.895, y: 0.0001173}
+ m_SizeDelta: {x: 227.7, y: 96.521}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8648946191202129169
CanvasRenderer:
@@ -56080,7 +56080,7 @@ ParticleSystem:
--- !u!199 &975914199617613705
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -60896,7 +60896,7 @@ ParticleSystem:
--- !u!199 &2711723539881680691
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -61360,7 +61360,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: -170.1, y: 233.1}
+ m_AnchoredPosition: {x: -170.1, y: 233.09998}
m_SizeDelta: {x: 100, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &78255257289157533
@@ -61923,7 +61923,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 97, y: 12}
+ m_AnchoredPosition: {x: 97, y: 20.95}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4187349440277832370
@@ -66755,7 +66755,7 @@ ParticleSystem:
--- !u!199 &2814029908569204628
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -73225,7 +73225,7 @@ ParticleSystem:
--- !u!199 &1289604591845830872
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -74924,16 +74924,6 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 0.7
objectReference: {fileID: 0}
- - target: {fileID: 2320518946443230269, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2321463155908299441, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
@@ -74949,11 +74939,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6241126370479470043, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 756b2ea62e..4585ffd203 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -690,7 +690,7 @@ RedPointType = {
RightUp2 = 122,--主界面右上角伸缩条
challengeCopy=123,--挑战副本
-
+ godsWayTower =124, --封神之路,多队塔
----礼包相关------
Operating = 201, --运营(主界面礼包)
diff --git a/Assets/ManagedResources/~Lua/Common/Managers.lua b/Assets/ManagedResources/~Lua/Common/Managers.lua
index 9f69a8b895..baffa9f9e0 100644
--- a/Assets/ManagedResources/~Lua/Common/Managers.lua
+++ b/Assets/ManagedResources/~Lua/Common/Managers.lua
@@ -232,10 +232,11 @@ local ManagerNames = {
"Explore/ExploreManager",
--魂印管理
"GodPrint/GodPrintManager",
- --!!!!红点管理(尽量放在最后)!!!!--
- "Player/RedpotManager",
--封神多队塔管理
"WorldArena/GodsWayTowerManager",
+ --!!!!红点管理(尽量放在最后)!!!!--
+ "Player/RedpotManager",
+
}
return ManagerNames
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
index 6b54e39ec6..0cb3c4d12a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
@@ -79,7 +79,7 @@ local carbonData = {
objName = "other",
nameImg = "f_fuben_fubenming_08",
btnPos = Vector2(8,100),
- redPointType = RedPointType.Trial,
+ redPointType = RedPointType.godsWayTower,
effect1 = "Fx_XuanYuanBaoJing",
effect2 = "Fx_XuanYuanBaoJing_S",
},
@@ -232,7 +232,7 @@ function CarbonsPanel:TipShow(_go,_value)
self.timeList[_value.id] = {}
self.timeList[_value.id].TextObj = timeText
self.timeList[_value.id].Text = "剩余时间:"
- self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 - 300
+ self.timeList[_value.id].time =ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 - 300
elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS then--挑战副本
time:SetActive(false)
self.timeList[_value.id] = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua
index fce55969fe..f228976fce 100644
--- a/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua
@@ -49,10 +49,12 @@ function GodsWayListPanel:OnShow(...)
local freeTxt=Util.GetGameObject(self.itemList[i], "sweepTxt"):GetComponent("Text")
local buyTxt=Util.GetGameObject(self.itemList[i], "buyTxt"):GetComponent("Text")
local btn=Util.GetGameObject(self.itemList[i], "btn")
+ local redpoint=Util.GetGameObject(self.itemList[i], "redPoint")
local config=ConfigManager.GetConfigData(ConfigName.DuoDuiTowerConfig,i)
local freeTime,buyTime=GodsWayTowerManager.GetTimeTip(i)
freeTxt.text="今日可扫荡次数:"..freeTime
buyTxt.text="今日可购买扫荡次数:"..buyTime
+ redpoint:SetActive(freeTime>0 and CheckFunctionOpen(138+i) )
if data then
if data.floor<=0 then
floorTxt.text="第".."1".."层"
diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
index e0154e99eb..4421b896b4 100644
--- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
@@ -310,6 +310,7 @@ end
function GodsWayTowerPanel:OnClose()
ClearRedPointObject(redTrailType[curType],this.btnHelpFightRed)
MonsterCampManager.CurOffsetIndex = -1
+ CheckRedPointStatus(RedPointType.godsWayTower)
end
--界面销毁时调用(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
index 3949ad576f..5dff35ba91 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
@@ -105,7 +105,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.EpicExplore, RedPointType.ExploreMain)--心魔试炼
RPData:SetParent(RedPointType.FightLevel, RedPointType.ExploreMain)--山河社稷图
RPData:SetParent(RedPointType.challengeCopy, RedPointType.ExploreMain)--挑战副本
-
+ RPData:SetParent(RedPointType.godsWayTower, RedPointType.ExploreMain)--挑战副本
RPData:SetParent(RedPointType.LegendExplore, RedPointType.Guild)--车迟斗法
RPData:SetParent(RedPointType.HeartDemon,RedPointType.EpicExplore)
RPData:SetParent(RedPointType.PersonTrail,RedPointType.EpicExplore)
@@ -699,6 +699,7 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.MingWangPri,DynamicActivityManager.CheckMingWangRed)
RPData:AddCheckFunc(RedPointType.song10Wan,ActivityGiftManager.GetSong10WanRedPoint)
RPData:AddCheckFunc(RedPointType.tuijianzhenrong,CommonActPageManager.CheckTuiJianZhenRongRedpoint)
+ RPData:AddCheckFunc(RedPointType.godsWayTower,GodsWayTowerManager.CheckRedPointStatus)
end
-- 向红点绑定物体
diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua
index 21d505d031..44e3b3fd67 100644
--- a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua
@@ -183,6 +183,24 @@ end
-- return 0
-- end
+--检测红点状态
+function this.CheckRedPointStatus()
+ local towers=ConfigManager.GetConfig(ConfigName.DuoDuiTowerConfig)
+ if towers then
+ for i, v in ConfigPairs(towers) do
+ local isOpen=CheckFunctionOpen(i+138)
+ if isOpen then
+ local freeTime= PrivilegeManager.GetPrivilegeRemainValue(v.PrivilegeType)
+ if freeTime>0 then
+ return true
+ end
+ end
+ end
+ end
+ return false
+
+end
+
function this.SetTowerFloorByType(_type, _num)
if towerInfos[_type] then
towerInfos[_type].floor=towerInfos[_type].floor + _num
diff --git a/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua b/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
index 383de2eeeb..1a10635c17 100644
--- a/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
+++ b/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
@@ -269,10 +269,10 @@ function GodsWaySingleSingleWave:SetIcon()
self.fightBtnNum.gameObject:SetActive(false)
self.fightBtnRed:SetActive(true)
self.fightBtnText.text = string.format("%s","17232A","免费扫荡")
- self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
+ --self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
Util.SetGray(self.fight,false)
else
- self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
+ --self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
self.fightBtnIcon.gameObject:SetActive(true)
self.fightBtnNum.gameObject:SetActive(true)
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
@@ -297,7 +297,7 @@ function GodsWaySingleSingleWave:SetIcon()
--设置挑战fight
self.fightBtnIcon.gameObject:SetActive(false)
self.fightBtnNum.gameObject:SetActive(false)
- self.fightBtnMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_shouchong_anniu")
+ --self.fightBtnMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_shouchong_anniu")
self.fightBtnText.text = string.format("%s","17232A","挑战")
else
self.fight.gameObject:SetActive(false)