feat 七日活动修改

FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -34,7 +34,7 @@
       <item/>
       <item/>
     </list>
-    <loader id="n14_jttb" name="StartIndex" xy="134,808" size="159,98"/>
-    <loader id="n22_jttb" name="EndIndex" xy="134,155" size="159,98"/>
+    <loader id="n14_jttb" name="EndIndex" xy="134,808" size="159,98"/>
+    <loader id="n22_jttb" name="StartIndex" xy="134,155" size="159,98"/>
   </displayList>
 </component>

FGUIProject/assets/ActivityDay7/components/ExpProcess.xml

@@ -4,7 +4,7 @@
     <image id="n0_nyhm" name="n0" src="nyhmb" fileName="images/qrhd_jdt_db.png" xy="0,0" size="38,676">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+    <image id="n1_nyhm" name="bar" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
   </displayList>
   <ProgressBar reverse="true"/>
 </component>

FGUIProject/assets/Main/MainUI.xml

@@ -14,12 +14,14 @@
       <Button title="福利大厅"/>
     </component>
     <component id="n75_mbf1" name="btnActivityLuckyBox" src="mbf1o4" fileName="components/Button4.xml" xy="18,595" group="n52_qqat"/>
-    <image id="n77_bhmm" name="ActivityDay7" src="q08xe" fileName="images/zjm_renwu.png" xy="29,773" group="n52_qqat"/>
     <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhs"/>
     </component>
+    <component id="n78_bhmm" name="btnActivityDay7" src="wg7t8y" fileName="components/ButtonModle.xml" xy="41,770" group="n52_qqat">
+      <Button icon="ui://mfvz4q8kq08xe"/>
+    </component>
     <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="25,1675" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fn"/>

GameClient/Assets/Game/HotUpdate/Data/ActivityDay7DataManager.cs

@@ -20,5 +20,10 @@ namespace GFGGame
             var day7ActivityReward = GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7ActivityReward);
             return MathHelper.isBitSet(day7ActivityReward, day);
         }
+
+        public bool CheckOpen()
+        {
+            return GetActivityDay7Day() <= Activity7DaysCfgArray.Instance.dataArray.Length;
+        }
     }
 }

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

@@ -14,8 +14,8 @@ namespace UI.ActivityDay7
         public GTextField m_Score;
         public GList m_DayList;
         public GList m_TaskList;
-        public GLoader m_StartIndex;
         public GLoader m_EndIndex;
+        public GLoader m_StartIndex;
         public const string URL = "ui://kupdwln7nyhm1";
         public const string PACKAGE_NAME = "ActivityDay7";
         public const string RES_NAME = "ActivityDay7UI";
@@ -70,8 +70,8 @@ namespace UI.ActivityDay7
             m_Score = (GTextField)comp.GetChild("Score");
             m_DayList = (GList)comp.GetChild("DayList");
             m_TaskList = (GList)comp.GetChild("TaskList");
-            m_StartIndex = (GLoader)comp.GetChild("StartIndex");
             m_EndIndex = (GLoader)comp.GetChild("EndIndex");
+            m_StartIndex = (GLoader)comp.GetChild("StartIndex");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,8 +82,8 @@ namespace UI.ActivityDay7
             m_Score = null;
             m_DayList = null;
             m_TaskList = null;
-            m_StartIndex = null;
             m_EndIndex = null;
+            m_StartIndex = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -12,8 +12,8 @@ namespace UI.Main
         public UI_Button2 m_btnDailyLogin;
         public UI_Button2 m_btnDailyWelfare;
         public UI_Button4 m_btnActivityLuckyBox;
-        public GImage m_ActivityDay7;
         public UI_ButtonModle1 m_btnMain;
+        public GButton m_btnActivityDay7;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnCiPai;
@@ -89,8 +89,8 @@ namespace UI.Main
             m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
             m_btnDailyWelfare = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityLuckyBox = (UI_Button4)UI_Button4.Create(comp.GetChild("btnActivityLuckyBox"));
-            m_ActivityDay7 = (GImage)comp.GetChild("ActivityDay7");
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
+            m_btnActivityDay7 = (GButton)comp.GetChild("btnActivityDay7");
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
@@ -126,9 +126,9 @@ namespace UI.Main
             m_btnDailyWelfare = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
-            m_ActivityDay7 = null;
             m_btnMain.Dispose();
             m_btnMain = null;
+            m_btnActivityDay7 = null;
             m_btnHuanZhuang.Dispose();
             m_btnHuanZhuang = null;
             m_btnXiuFang.Dispose();

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

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using ET;
 using FairyGUI;
 using UI.ActivityDay7;
 using UI.CommonGame;
@@ -66,11 +65,6 @@ namespace GFGGame
             _ui.m_ExpProcess.value = score;
         }
 
-        protected override void OnHide()
-        {
-            base.OnHide();
-        }
-
         //DayListRenderer
         private void DayListRenderer(int index, GObject obj)
         {
@@ -116,7 +110,7 @@ namespace GFGGame
         private void TaskListRenderer(int index, GObject obj)
         {
             var item = UI_TaskListItem.Proxy(obj);
-            var tasks = (TaskCfg[])obj.parent.data;
+            var tasks = (List<TaskCfg>)obj.parent.data;
             var taskCfg = tasks[index];
             item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskCfg.id);
             item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
@@ -179,7 +173,7 @@ namespace GFGGame
                 components.Add(target);
                 _ui.target.AddChild(target);
                 // 根据 maxScore  cfgScore pos.y endY 设置target 位置 x，z不变，y根据比例设置 
-                var y = pos.y - (pos.y - endY) * cfgScore / maxScore;
+                var y = pos.y + (endY - pos.y) * cfgScore / maxScore;
                 target.SetPosition(pos.x, y, pos.z);
                 item.m_Score.text = cfgScore.ToString();
                 var cfgBonusArr = cfg.bonusArr;
@@ -231,13 +225,18 @@ namespace GFGGame
             if (get)
             {
                 ViewManager.Show<RewardPreView>(new object[] { "已领取过了" });
+                return;
             }
-            else
+            //判断积分是否够
+            var score = ActivityDay7DataManager.Instance.GetScore();
+            if (score < activity7DaysCfg.score)
             {
-                var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
-                if (!result) return;
-                FreshGetStatus();
+                ViewManager.Show<RewardPreView>(new object[] { "积分还不够" });
+                return;
             }
+            var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
+            if (!result) return;
+            FreshGetStatus();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -116,8 +116,8 @@ namespace GFGGame
             // _btnStudio = _ui.m_list.GetChild("btnStudio").asButton;
             // _btnField = _ui.m_list.GetChild("btnField").asButton;
             _btnBag = _ui.m_list.GetChild("btnBag").asButton;
-            
-            _btnActivityDay7 = _ui.m_ActivityDay7.asButton;
+
+            _btnActivityDay7 = _ui.m_btnActivityDay7;
 
             // _btnGongGao.visible = false;
             // _btnHaoYou.visible = false;
@@ -653,6 +653,10 @@ namespace GFGGame
                 !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
                 (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
             }
+            if (_ui.m_btnActivityDay7.visible && !ActivityDay7DataManager.Instance.CheckOpen())
+            {
+                _ui.m_btnActivityDay7.visible = false;
+            }
         }
 
         private void ShowExitAlert()
@@ -716,6 +720,8 @@ namespace GFGGame
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoreView).Name, false);
             _btnTuJian.visible =
                 FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
+
+            _btnActivityDay7.visible = ActivityDay7DataManager.Instance.CheckOpen();
         }
 
         private void UpdateRedDot()