Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Editor/Excel/ExcelReader.cs

@@ -23,7 +23,7 @@ namespace GFGEditor
             for (int i = 0; i < totalCount; i++)
             {
                 string filePath = files[i];
-                string fileName = Path.GetFileNameWithoutExtension(filePath);
+                string fileName = Path.GetFileNameWithoutExtension(filePath).Trim();
                 if (!fileName.Contains("~") && !fileName.StartsWith(".") && fileName != "")
                 {
                     EditorUtility.DisplayProgressBar("进度", $"fileNmae{fileName}", 1);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/PearlRebateTipsView.cs

@@ -92,7 +92,7 @@ namespace GFGGame
                     id0 = item.itemsArr[1][0];
                     count0 = item.itemsArr[1][1];
                     itemDate0 = ItemUtil.createItemData(id0, count0);
-                    itemView0 = new ItemView(_ui.m_item2);
+                    itemView0 = new ItemView(_ui.m_item1);
                     itemView0.SetData(itemDate0);
                     break;
                 case 3:

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftDCTipsView.cs

@@ -129,7 +129,7 @@ namespace GFGGame
             ItemData itemDate = ItemUtil.createItemData(id, count);
             ItemView itemView = new ItemView(item.m_item);
             itemView.SetData(itemDate);
-            item.m_name.text = ItemCfgArray.Instance.GetCfg(itemCfg.id).name;
+            item.m_name.text = ItemCfgArray.Instance.GetCfg(itemCfg.itemsArr[index][0]).name;
             UI_ZGTHRewardItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftTipsView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
         {
             base.OnShown();
             
-            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(ActivityOpenCfgArray.Instance.GetCfg(6001).paramsArr[0]);
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(ActivityOpenCfgArray.Instance.GetCfg(6002).paramsArr[0]);
             giftItemId = shopCfg.itemId;
             itemcfg = ItemCfgArray.Instance.GetCfg(giftItemId);
             _ui.m_Itemlist.numItems = itemcfg.itemsArr.Length;  
@@ -68,6 +68,24 @@ namespace GFGGame
             {
                 _ui.m_btnBuy.visible = false;
             }
+            _ui.m_btnBuy.GetChild("title").text = string.Format("{0}元/购买", shopCfg.configPrice.ToString());
+
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);
+            long endTime = 0;
+            if (activityInfo != null)
+            {
+                endTime = activityInfo.EndTime;
+            }
+            var leftTime = endTime - TimeHelper.ServerNow();
+            if (leftTime <= 0)
+            {
+                _ui.m_timeText.text = "";
+                _ui.m_btnBuy.visible = false;
+                Timers.inst.Remove(UpdateTime);
+                return;
+            }
+            _ui.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
+
             Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()
@@ -93,7 +111,7 @@ namespace GFGGame
             ItemData itemDate = ItemUtil.createItemData(id, count);
             ItemView itemView = new ItemView(item.m_item);
             itemView.SetData(itemDate);
-            item.m_name.text = ItemCfgArray.Instance.GetCfg(itemcfg.id).name;
+            item.m_name.text = ItemCfgArray.Instance.GetCfg(itemcfg.itemsArr[index][0]).name;
             UI_ZGTHRewardItem.ProxyEnd();
         }
         private void UpdateTime(object param)

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

@@ -595,19 +595,20 @@ namespace GFGGame
         //圆形
         private void OnClickBtnGiftBag2()
         {
-            var activityInfoByTypeList =
-                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB2);
+            //var activityInfoByTypeList =
+            //    ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB2);
 
-            var list = activityInfoByTypeList
-                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-            }
-            else
-            {
-                ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB2, this.viewData });
-            }
+            //var list = activityInfoByTypeList
+            //    .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+            //if (list.Count == 0)
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+            //}
+            //else
+            //{
+            //    ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB2, this.viewData });
+            //}
+            ViewManager.Show<ZGTHgiftTipsView>();
         }
 
         //列表样式
@@ -681,7 +682,7 @@ namespace GFGGame
 
             //特惠礼包/限时礼包窗口内的倒计时
             UpGiftBox1();
-            UpGiftBox2();
+            //UpGiftBox2();
             EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_TIME);
             UpdateRedDot();
         }
@@ -761,6 +762,17 @@ namespace GFGGame
 
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             _ui.m_btnPearRebate.target.visible = ActivityDataManager.Instance.CheckPearRebateTips(6000);
+
+            _ui.m_btnGiftBag1.target.visible = ActivityDataManager.Instance.CheckPearRebateTips(6002);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);
+            long endTime = 0;
+            if (activityInfo != null)
+            {
+                endTime = activityInfo.EndTime;
+            }
+            var leftTime = endTime - TimeHelper.ServerNow();
+            _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
+
             UpdateSevenIcon();
 
             if (!ActivityDataManager.Instance.IsGetNewPlayerReward)