七日活动换ui

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs

@@ -12,11 +12,12 @@ namespace UI.ActivityDay7
         public GTextField m_TimeStr;
         public GButton m_tip;
         public GProgressBar m_ExpProcess;
-        public GTextField m_Score;
         public GList m_DayList;
         public GList m_TaskList;
         public GLoader m_EndIndex;
         public GLoader m_StartIndex;
+        public GTextField m_Score;
+        public GTextField m_txtLevel;
         public const string URL = "ui://kupdwln7nyhm1";
         public const string PACKAGE_NAME = "ActivityDay7";
         public const string RES_NAME = "ActivityDay7UI";
@@ -69,11 +70,12 @@ namespace UI.ActivityDay7
             m_TimeStr = (GTextField)comp.GetChild("TimeStr");
             m_tip = (GButton)comp.GetChild("tip");
             m_ExpProcess = (GProgressBar)comp.GetChild("ExpProcess");
-            m_Score = (GTextField)comp.GetChild("Score");
             m_DayList = (GList)comp.GetChild("DayList");
             m_TaskList = (GList)comp.GetChild("TaskList");
             m_EndIndex = (GLoader)comp.GetChild("EndIndex");
             m_StartIndex = (GLoader)comp.GetChild("StartIndex");
+            m_Score = (GTextField)comp.GetChild("Score");
+            m_txtLevel = (GTextField)comp.GetChild("txtLevel");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,11 +84,12 @@ namespace UI.ActivityDay7
             m_TimeStr = null;
             m_tip = null;
             m_ExpProcess = null;
-            m_Score = null;
             m_DayList = null;
             m_TaskList = null;
             m_EndIndex = null;
             m_StartIndex = null;
+            m_Score = null;
+            m_txtLevel = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -239,7 +239,7 @@ namespace GFGGame
             var maxCfgID = maxCfg.id;
             var maxScore = maxCfg.score;
             var pos = _ui.m_StartIndex.position;
-            var endY = _ui.m_EndIndex.position.y;
+            var endX = _ui.m_EndIndex.position.x;
             _ui.m_ExpProcess.max = maxScore;
             //循环设置UI
             foreach (var cfg in activity7DaysCfgs)
@@ -250,8 +250,8 @@ namespace GFGGame
                 components.Add(target);
                 _ui.target.AddChild(target);
                 // 根据 maxScore  cfgScore pos.y endY 设置target 位置 x，z不变，y根据比例设置 
-                var y = pos.y + (endY - pos.y) * cfgScore / maxScore;
-                target.SetPosition(pos.x, y, pos.z);
+                var x = pos.x + (endX - pos.x) * cfgScore / maxScore;
+                target.SetPosition(x, pos.y, pos.z);
                 item.m_Score.text = cfgScore.ToString();
                 var cfgBonusArr = cfg.bonusArr;
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
@@ -284,8 +284,8 @@ namespace GFGGame
                 var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
                 item.m_c2.selectedIndex = state ? 1 : 0;
                 RedDotController.Instance.SetComRedDot(item.target,
-                    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID));
-                UI_ExpProcessItem.ProxyEnd();
+                    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID),"",-90);
+                UI_ExpProcessItem.ProxyEnd();   
             });
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -708,7 +708,8 @@ namespace GFGGame
             refDodgeStar = true;
 
             _comFosterBottom.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _comFosterBottom.m_btnRule.data = 300015;
+            _comFosterBottom.m_btnRule.data = 300021;
+
             if (CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 1;