xuanyuan commit

Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab

@@ -4997,7 +4997,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6652774364023157594
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5014,7 +5014,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -82, y: -115.1}
+  m_AnchoredPosition: {x: -86.8, y: -41.9}
   m_SizeDelta: {x: 26, y: 26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5014086303867341461
@@ -31003,7 +31003,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2465961640174556827
 RectTransform:
   m_ObjectHideFlags: 0
@@ -31020,7 +31020,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -64.100006, y: -73}
+  m_AnchoredPosition: {x: -46.3, y: -53.9}
   m_SizeDelta: {x: 26, y: 26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6978111207548757775
@@ -31157,7 +31157,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2715306956263042468
 RectTransform:
   m_ObjectHideFlags: 0
@@ -31174,7 +31174,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -106.5, y: -74.29999}
+  m_AnchoredPosition: {x: -106.5, y: -119.7}
   m_SizeDelta: {x: 26, y: 26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &66220840080032785
@@ -31231,7 +31231,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2986970021626512112
 RectTransform:
   m_ObjectHideFlags: 0
@@ -31248,7 +31248,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -83.5, y: -86}
+  m_AnchoredPosition: {x: -30.1, y: -42.7}
   m_SizeDelta: {x: 26, y: 26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3261406090063144802

Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua

@@ -89,7 +89,7 @@ local type = {
             tipBg = "r_Dungeon_juqingdian",
             resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[66].Value),
             tip = string.format("<color=#BA9AC2>%s</color>",specialConfig[67].Value),
-            redPointType = -1
+            redPointType = RedPointType.People_Mirror
         },
         default = {id = -1,bg = "r_Dungeon_rendi_01"}
     }

Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua

@@ -65,6 +65,13 @@ function this.InitMirrorData()
     end  
 end
 
+function this.CarbonRedCheck()
+    this.GetTimeTip()
+    if this.freeTime > 0 then
+        return true
+    end
+    return false
+end
 function this.UpdateMirrorState(msg)
     if not msg.infos or #msg.infos < 1 then
         LogBlue("空")
@@ -233,6 +240,7 @@ function this.ExecuteFightBattle(id,type,func)
                     this.levelData[this.curType].passId = id
                     this.UpdateLevelState(this.curType)
                     PrivilegeManager.RefreshPrivilegeUsedTimes(XuanYuanMirrorManager.freeTimeId, 1)
+                    CheckRedPointStatus(RedPointType.People_Mirror)
                     if this.levelData[this.curType].state == 1 then 
                         UIManager.OpenPanel(UIName.XuanYuanMirrorPanelList,this.curType) 
                     else

Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua

@@ -16,19 +16,19 @@ local type = {
         bg = "ui_fb_btn_gh",
         name = "佛禅宝境",
         gameObject = "btnRoot/circle/root/fuochanbaojing" ,
-        redPointType = RedPointType.Buddhist_Mirror
+        redPointType = RedPointType.People_Mirror
     },
     [3] = {
         bg = "ui_fb_btn_sl",
         name = "妖灵宝境",
         gameObject = "btnRoot/circle/root/yaolingbaojing" ,
-        redPointType = RedPointType.Magic_Mirror
+        redPointType = RedPointType.People_Mirror
     },
     [4] = {
         bg = "ui_fb_btn_jq",
         name = "道玄宝境",
         gameObject = "btnRoot/circle/root/daoxuanbaojing" ,
-        redPointType = RedPointType.Taoist_Mirror
+        redPointType = RedPointType.People_Mirror
     },
 }
 local NumConvertWeek = {[1]="一",[2]="二",[3]="三",[4]="四",[5]="五",[6]="六",[7]="日"}
@@ -79,7 +79,7 @@ function this:RemoveListener()
 end
 
 function this:OnOpen()
-    this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
+    this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
 end
 
 --界面打开时调用（用于子类重写）

Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua

@@ -128,7 +128,7 @@ this.RefreshPanel = function()
 end
 
 function this:OnOpen(_type)
-    this.UpView:OnOpen({showType = UpViewOpenType.ShowRight, panelType = PanelType.Main})
+    this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
     curType = _type
     XuanYuanMirrorManager.curType = curType
 end
@@ -242,6 +242,7 @@ function this:SetLevelData(go, data)
                 end    
                 XuanYuanMirrorManager.ExecuteFightBattle(data.id,2,function()
                     PrivilegeManager.RefreshPrivilegeUsedTimes(XuanYuanMirrorManager.freeTimeId, 1) 
+                    CheckRedPointStatus(RedPointType.People_Mirror)
                     this:OnShow() 
                 end)
             elseif data.state == 1 then

Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua

@@ -104,7 +104,7 @@ 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.LuckyCat_GetReward, RedPointType.LuckyCat)
     -- 充值
@@ -387,6 +387,8 @@ function this.RegisterRedCheckFunc()
     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.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
 end