diff --git a/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab b/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab index 0d9f58ccf6..020f9578f3 100644 --- a/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab +++ b/Assets/ManagedResources/Prefabs/Map/UI_effect_TanSuo_BaoXiang.prefab @@ -5853,7 +5853,7 @@ ParticleSystem: --- !u!199 &1268033458787013196 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10809,7 +10809,7 @@ ParticleSystem: --- !u!199 &1267851676947475384 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15755,7 +15755,7 @@ ParticleSystem: --- !u!199 &1267873462690760768 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20999,7 +20999,7 @@ ParticleSystem: --- !u!199 &1269928761493631884 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25702,7 +25702,7 @@ ParticleSystem: --- !u!199 &1269860420958146492 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30880,7 +30880,7 @@ ParticleSystem: --- !u!199 &1269873801980561564 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35939,7 +35939,7 @@ ParticleSystem: --- !u!199 &1268160035125669336 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41058,7 +41058,7 @@ ParticleSystem: --- !u!199 &1269937134347307200 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46041,7 +46041,7 @@ ParticleSystem: --- !u!199 &1267983134385992986 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51083,7 +51083,7 @@ ParticleSystem: --- !u!199 &1267988878328010956 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55860,7 +55860,7 @@ ParticleSystem: --- !u!199 &1267878962959860024 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60630,7 +60630,7 @@ ParticleSystem: --- !u!199 &1268071594801518780 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -65675,7 +65675,7 @@ ParticleSystem: --- !u!199 &1269830349814642960 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70445,7 +70445,7 @@ ParticleSystem: --- !u!199 &1269867254553762534 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -75111,7 +75111,7 @@ ParticleSystem: --- !u!199 &1269910940489339946 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80075,7 +80075,7 @@ ParticleSystem: --- !u!199 &1268486547066797772 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84741,7 +84741,7 @@ ParticleSystem: --- !u!199 &1268064845456197890 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84817,7 +84817,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1172922562302074046 RectTransform: m_ObjectHideFlags: 0 @@ -89592,7 +89592,7 @@ ParticleSystem: --- !u!199 &1267809179568083962 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index 8a46f229a3..a2355c3c5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -634,9 +634,9 @@ RectTransform: m_Father: {fileID: 4857357098437888444} m_RootOrder: 3 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: 463, y: -3.2299805} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6847182392003597191 @@ -1637,9 +1637,9 @@ RectTransform: m_Father: {fileID: 4857357098437888444} m_RootOrder: 0 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: -11.000046, y: -3.2299805} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5170531116336250048 @@ -4797,9 +4797,9 @@ RectTransform: m_Father: {fileID: 4857357098437888444} m_RootOrder: 2 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: 305, y: -3.2299805} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &90780945073229523 @@ -7866,9 +7866,9 @@ RectTransform: m_Father: {fileID: 4857357098437888444} m_RootOrder: 1 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: 147.00003, y: -3.2299805} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2884500579313043773 @@ -17484,6 +17484,7 @@ GameObject: - component: {fileID: 4857357098437888444} - component: {fileID: 1089034360491623057} - component: {fileID: 1749042793203704506} + - component: {fileID: 4245532526293581343} m_Layer: 5 m_Name: btnList m_TagString: Untagged @@ -17551,6 +17552,29 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4245532526293581343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6394834183645261343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: -16 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: -32.9 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6650983710984529778 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f0d7cdf5aa..c237125aec 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -783,6 +783,8 @@ RedPointType = { People_Mirror = 10003, --人杰宝镜 Buddhist_Mirror = 10004, --佛禅宝镜 Taoist_Mirror = 10005 , --道玄宝镜 + + Vientiane = 10005 , --万象境 } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index af3e29ddc3..b4c9c56f42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -147,6 +147,7 @@ function CarbonTypePanelV2:BindEvent() this.backBtn, function() this:OnClose() + UIManager.OpenPanel(UIName.MainPanel) end ) @@ -165,17 +166,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 and data.redPointType then - BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) - end - end end --添加事件监听(用于子类重写) @@ -190,7 +180,19 @@ end --副本类型 1 综合 2 万象 function CarbonTypePanelV2:OnOpen() carbonType = PlayerManager.carbonType - LogBlue("carbonType1:"..carbonType) + 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 if carbonType == 1 then -- 清除一下选得副本类型 CarbonManager.difficulty = 0 @@ -212,6 +214,7 @@ end --界面打开时调用(用于子类重写) function CarbonTypePanelV2:OnShow(...) carbonType = PlayerManager.carbonType + LogBlue("carbonType2:"..carbonType) this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title) this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos @@ -447,7 +450,18 @@ function CarbonTypePanelV2:OnClose() end this.isPlayDoorAudio = false carbonType = 0 - UIManager.OpenPanel(UIName.MainPanel) + 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 + else + ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) + end + end end --界面销毁时调用(用于子类重写) @@ -458,18 +472,6 @@ function CarbonTypePanelV2:OnDestroy() end carbons = {} this.playerHead=nil - - 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 then - ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint")) - end - end end return CarbonTypePanelV2 \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index bded6ebcd4..a2b7863068 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -66,6 +66,9 @@ function this.InitMirrorData() end function this.CarbonRedCheck() + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.TRIAL) then + return false + end this.GetTimeTip() if this.freeTime > 0 then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 95044d1c58..79ddcd2f19 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -10,25 +10,21 @@ local type = { bg = "ui_fb_btn_jy", name = "人杰宝境", gameObject = "btnRoot/circle/root/renjiebaojing" , - redPointType = RedPointType.People_Mirror }, [2] = { bg = "ui_fb_btn_gh", name = "佛禅宝境", gameObject = "btnRoot/circle/root/fuochanbaojing" , - redPointType = RedPointType.People_Mirror }, [3] = { bg = "ui_fb_btn_sl", name = "妖灵宝境", gameObject = "btnRoot/circle/root/yaolingbaojing" , - redPointType = RedPointType.People_Mirror }, [4] = { bg = "ui_fb_btn_jq", name = "道玄宝境", gameObject = "btnRoot/circle/root/daoxuanbaojing" , - redPointType = RedPointType.People_Mirror }, } local NumConvertWeek = {[1]="一",[2]="二",[3]="三",[4]="四",[5]="五",[6]="六",[7]="日"} @@ -128,16 +124,21 @@ this.UpdateCarbonContent = function() local openFunctions = {} for k,v in pairs(type) do local go = Util.GetGameObject(this.gameObject, v.gameObject) - BindRedPointObject(v.redPointType, Util.GetGameObject(go, "redPoint")) go:GetComponent("Image").sprite = Util.LoadSprite(v.bg) Util.GetGameObject(go, "titileBg/Text"):GetComponent("Text").text =v.name local state = XuanYuanMirrorManager.GetMirrorState(k) == 1 if not state then local timeStr = this:GetOpenTime(k) Util.GetGameObject(go, "timeBg/Text"):GetComponent("Text").text = timeStr.."开启" + Util.GetGameObject(go, "redPoint").gameObject:SetActive(false) else openFunctions[k] = {} openFunctions[k].timeComp = Util.GetGameObject(go, "timeBg/Text"):GetComponent("Text") + if XuanYuanMirrorManager.CarbonRedCheck() then + Util.GetGameObject(go, "redPoint").gameObject:SetActive(true) + else + Util.GetGameObject(go, "redPoint").gameObject:SetActive(false) + end end Util.SetGray(go,not state) Util.AddOnceClick(go ,function() @@ -191,9 +192,6 @@ end --界面销毁时调用(用于子类重写) function this:OnDestroy() - for k,v in pairs(type) do - ClearRedPointObject(v.redPointType,Util.GetGameObject(self.gameObject, v.gameObject.."/redPoint")) - end SubUIManager.Close(this.UpView) if self.timer then self.timer:Stop() diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua index bc2d93e505..6c597fa09e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRewardSortPopup.lua @@ -75,20 +75,20 @@ function this.SetRankDataShow(msg) this.myRecord:SetActive(false) else this.myRecord:SetActive(true) - end - --我自己的排名展示 - for i = 1, #myDemonsItemList do - myDemonsItemList[i].gameObject:SetActive(false) - end - for i = 1, #myrewardConfig.Reward do - if myDemonsItemList[i] then - myDemonsItemList[i]:OnOpen(false, myrewardConfig.Reward[i], 0.8,false,false,false,sorting) - else - myDemonsItemList[i] = SubUIManager.Open(SubUIConfig.ItemView, this.myDemons.transform) - myDemonsItemList[i]:OnOpen(false, myrewardConfig.Reward[i], 0.8,false,false,false,sorting) + --我自己的排名展示 + for i = 1, #myDemonsItemList do + myDemonsItemList[i].gameObject:SetActive(false) end - myDemonsItemList[i].gameObject:SetActive(true) - end + for i = 1, #myrewardConfig.Reward do + if myDemonsItemList[i] then + myDemonsItemList[i]:OnOpen(false, myrewardConfig.Reward[i], 0.8,false,false,false,sorting) + else + myDemonsItemList[i] = SubUIManager.Open(SubUIConfig.ItemView, this.myDemons.transform) + myDemonsItemList[i]:OnOpen(false, myrewardConfig.Reward[i], 0.8,false,false,false,sorting) + end + myDemonsItemList[i].gameObject:SetActive(true) + end + end end --显示奖励 function this.ShowCurIndexRewardData() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index dba52198c8..b31e0e6736 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -874,6 +874,7 @@ function this.BindRedPoint() BindRedPointObject(RedPointType.LuckyTurn, this.luckyTurnRedPoint) BindRedPointObject(RedPointType.FindFairy, this.findFairyRedPoint) --BindRedPointObject(RedPointType.Achievement_Main, this.AchievementRedPoint) + BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld) BindRedPointObject(RedPointType.DynamicActivity, this.DynamicActivityRedPoint) end -- 绑定红点 @@ -910,6 +911,7 @@ function this.ClearRedPoint() ClearRedPointObject(RedPointType.LuckyTurn, this.luckyTurnRedPoint) ClearRedPointObject(RedPointType.FindFairy, this.findFairyRedPoint) --ClearRedPointObject(RedPointType.Achievement_Main, this.AchievementRedPoint) + ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld) ClearRedPointObject(RedPointType.DynamicActivity, this.DynamicActivityRedPoint) end @@ -1182,6 +1184,9 @@ function this.InitFuncShow(funcType) if funcType then if this.operateIcon[funcType] then local isOpen = ActTimeCtrlManager.SingleFuncState(funcType) + if funcType == FUNCTION_OPEN_TYPE.TRIAL then + isOpen = ActTimeCtrlManager.IsQualifiled(funcType) + end Util.SetColor(this.operateIcon[funcType].lock, Color.New(1, 1, 1, 0.59)) this.operateIcon[funcType].lock:SetActive(not isOpen) this.operateIcon[funcType].open:SetActive(isOpen) @@ -1190,6 +1195,9 @@ function this.InitFuncShow(funcType) else for i, v in pairs(this.operateIcon) do local isOpen = ActTimeCtrlManager.SingleFuncState(i) + if i == FUNCTION_OPEN_TYPE.TRIAL then + isOpen = ActTimeCtrlManager.IsQualifiled(i) + end v.lock:SetActive(not isOpen) Util.SetColor(v.lock, Color.New(1, 1, 1, 0.59)) v.open:SetActive(isOpen) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 6965c3a6f2..79912a3070 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -104,7 +104,8 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.HeroExplore, RedPointType.ExploreMain) RPData:SetParent(RedPointType.EpicExplore, RedPointType.ExploreMain) RPData:SetParent(RedPointType.LegendExplore, RedPointType.ExploreMain) - RPData:SetParent(RedPointType.People_Mirror, RedPointType.ExploreMain) + + RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane) RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat) -- 充值 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua index 7ac8b751c2..5b68c941bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua @@ -42,9 +42,10 @@ function SettingPanel:BindEvent() this.OnShowPanelData(i) end) else - Util.AddClick(tabBtns[i], function() - PopupTipPanel.ShowTip(Language[11902]) - end) + tabBtns[i]:SetActive(false) + -- Util.AddClick(tabBtns[i], function() + -- PopupTipPanel.ShowTip(Language[11902]) + -- end) end end this.settingInfo.BindEvent()