Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
   </displayList>
-  <ProgressBar reverse="true"/>
+  <ProgressBar/>
 </component>

FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="94,95" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" pages="0,非最大,1,最大" selected="1"/>
+  <controller name="c1" pages="0,非最大,1,最大" selected="0"/>
   <controller name="c2" pages="0,未获得,1,已获得" selected="0"/>
   <displayList>
     <image id="n11_bhmm" name="n11" src="nyhm4" fileName="images/qrhd_wp_db_1.png" xy="-17,-15" group="n9_bhmm">
@@ -15,9 +15,6 @@
     <image id="n6_bhmm" name="n6" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="58,62" group="n9_bhmm"/>
     <text id="n7_bhmm" name="Num" xy="58,54" size="47,42" group="n9_bhmm" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
     <text id="n8_bhmm" name="Score" xy="-48,39" size="66,42" group="n9_bhmm" fontSize="30" color="#fffbeb" autoSize="none" text="1000"/>
-    <image id="n12_bhmm" name="n12" src="l500tlx" fileName="imagesNew/wpk_zz.png" pkg="eg2y0ldp" xy="-7,-6" group="n9_bhmm">
-      <gearDisplay controller="c2" pages="1"/>
-    </image>
     <image id="n10_bhmm" name="Get" src="orsttis" fileName="images/pfjl_ywc.png" pkg="eg2y0ldp" xy="10,27" group="n9_bhmm">
       <gearDisplay controller="c2" pages="1"/>
     </image>

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

@@ -11,7 +11,7 @@ namespace GFGGame
 
         public long GetScore()
         {
-            return ItemDataManager.GetItemNum(ConstItemID.BATTLE_PASS_CURRENCY);
+            return ItemDataManager.GetItemNum(ConstItemID.ACTIVITY_DAY_7_SCORE);
         }
 
         //NumericType.Day7ActivityReward
@@ -28,6 +28,7 @@ namespace GFGGame
         
         public long GetEndTime()
         {
+            //TODO 进行缓存
             return TimeUtil.TodayRestTime() +
                    (Activity7DaysCfgArray.Instance.dataArray.Length - GetActivityDay7Day())
                    * TimeUtil.SECOND_PER_DAY * 1000;

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

@@ -68,8 +68,7 @@ namespace GFGGame
             var battlePassLevel = GetBattlePassLevel();
             if (level > battlePassLevel) return 0;
             if (!NormalRewards.Contains(level)) return 1;
-            if (!IsBuy) return 2;
-            return !SuperRewards.Contains(level) ? 3 : 2;
+            return SuperRewards.Contains(level) ? 2 : 3;
         }
 
         //检查普通领取状态

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

@@ -68,6 +68,20 @@ namespace GFGGame
             base.Hide();
         }
 
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+        }
+
+        private void OnItemChange(EventContext context)
+        {
+            var itemId = (int)context.data;
+            if (itemId != ConstItemID.ACTIVITY_DAY_7_SCORE) return;
+            SetScoreList();
+            SetScore();
+        }
+
+
         private void SetScore()
         {
             var score = ActivityDay7DataManager.Instance.GetScore();

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -107,6 +107,12 @@ namespace GFGGame
         {
             if (!(context.sender is GObject obj)) return;
             var id = (int)obj.data;
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            if (!isBuy)
+            {
+                ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
+                return;
+            }
             var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
             if (!get) return;
             SetBattlePassLevel();

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -173,7 +173,7 @@ namespace GFGGame
         {
             Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(TaskView).FullName, viewData });
+            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()