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

FGUIProject/assets/League/LeagueUI.xml

@@ -16,7 +16,9 @@
     <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81" controller="c1,0">
       <Button title="雅集建设"/>
     </component>
-    <text id="n30_gfx4" name="txtLowKeep" xy="771,32" pivot="1,0" size="255,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#ff0000" align="right" text="已连续低维护：1天"/>
+    <image id="n32_duuf" name="n32" src="duuf82" fileName="images/lm_zjm_lxdwh_db.png" xy="125,219" group="n33_duuf"/>
+    <text id="n30_gfx4" name="txtLowKeep" xy="171,215" pivot="0.5,0" size="242,39" group="n33_duuf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#68430f" align="right" text="已连续低维护：1天"/>
+    <group id="n33_duuf" name="grpLowKeep" xy="125,215" size="345,39" advanced="true"/>
     <image id="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="139,261" group="n31_fqor"/>
     <text id="n10_u2u3" name="txtUnionName" xy="185,263" pivot="0.5,0" size="212,44" group="n31_fqor" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="雅集名字7个字"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="44,213" group="n31_fqor"/>

FGUIProject/assets/League/package.xml

@@ -201,6 +201,7 @@
     <image id="l5007z" name="yj_zz.png" path="/images/"/>
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
     <component id="vols81" name="ComLine.xml" path="/components/"/>
+    <image id="duuf82" name="lm_zjm_lxdwh_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/RoleInfoUI.xml

@@ -10,14 +10,14 @@
     <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="983,129">
       <Button title="?" titleColor="#000000"/>
     </component>
-    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
     <image id="n29_r9ri" name="n29" src="ysx9gg" fileName="images/zjm_dj_1.png" xy="305,329" group="n53_oqa1"/>
-    <text id="n30_r9ri" name="txtLvl" xy="314,336" size="31,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
+    <text id="n30_r9ri" name="txtLvl" xy="314,336" size="27,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
       <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>
     </text>
     <image id="n32_r9ri" name="n32" src="r9ri16" fileName="images/grxx_zyshul.png" xy="158,375" group="n53_oqa1"/>
-    <text id="n36_r9ri" name="txtExp" xy="220,373" pivot="0.5,0" size="33,34" group="n53_oqa1" fontSize="24" color="#fbedda" letterSpacing="-2" text="0/1"/>
+    <text id="n36_r9ri" name="txtExp" xy="219,373" pivot="0.5,0" size="34,34" group="n53_oqa1" fontSize="24" color="#fbedda" letterSpacing="-2" text="0/1"/>
     <group id="n53_oqa1" name="n53" xy="96,147" size="259,260" group="n37_r9ri"/>
     <image id="n50_r9ri" name="n50" src="r9rim" fileName="images/grxx_xtxtx.png" xy="417,297" size="576,6" group="n54_oqa1"/>
     <text id="n5_d4iw" name="txtRoleName" xy="428,214" size="328,64" group="n54_oqa1" fontSize="48" color="#927346" align="center" letterSpacing="-2" text="玩家名称七个字"/>
@@ -43,7 +43,7 @@
       <relation target="" sidePair="top-top"/>
     </group>
     <image id="n42_r9ri" name="n42" src="r9ri13" fileName="images/grxx_zydik.png" xy="0,1780" group="n46_r9ri"/>
-    <component id="n44_r9ri" name="btnSkill" src="r9ri1k" fileName="components/Button3.xml" xy="805,1807" group="n46_r9ri"/>
+    <component id="n44_r9ri" name="btnSkill" src="r9ri1k" fileName="components/Button3.xml" xy="805,1807" group="n46_r9ri" visible="false"/>
     <component id="n45_r9ri" name="btnSetting" src="r9ri1l" fileName="components/Button4.xml" xy="935,1807" group="n46_r9ri"/>
     <group id="n46_r9ri" name="n46" xy="0,1780" size="1080,140" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>

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

@@ -8,7 +8,7 @@ namespace GFGGame
         {
             //获取7日任务活动
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.Day7);
-            return activityInfo == null ? 0 : TimeUtil.GetDayByTime(activityInfo.StartTime, activityInfo.EndTime);
+            return activityInfo == null ? 0 : TimeUtil.GetDayByTime(activityInfo.StartTime, TimeHelper.ServerNow());
         }
 
         public long GetScore()

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

@@ -101,7 +101,7 @@ namespace GFGGame
         {
             var activityInfoIds = GetActivityInfoIdsByType(activityType);
             return activityInfoIds.Select(GetActivityInfo).FirstOrDefault(activityInfo =>
-                activityInfo != null && activityInfo.EndTime <= TimeHelper.ServerNow());
+                activityInfo != null && activityInfo.EndTime >TimeHelper.ServerNow());
         }
 
         //添加活动奖励获取数据

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

@@ -177,7 +177,7 @@ namespace GFGGame
                 int lockValue = shopCfg.lockValue;
                 if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
                 {
-                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
+                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
                 return ArenaDataManager.Instance.Grade >= lockValue;
@@ -210,7 +210,7 @@ namespace GFGGame
                 int lockValue = shopCfg.lockValue;
                 if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
                 {
-                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
+                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
                 ArenaRankCfg arenaRankCfg = ArenaRankCfgArray.Instance.GetCfg(lockValue);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs

@@ -13,6 +13,7 @@ namespace UI.League
         public UI_Button3 m_btnMember;
         public UI_Button3 m_btnConstruct;
         public GTextField m_txtLowKeep;
+        public GGroup m_grpLowKeep;
         public GTextField m_txtUnionName;
         public UI_ComLeagueHead m_comLeagueHead;
         public GComponent m_comHead;
@@ -78,6 +79,7 @@ namespace UI.League
             m_btnMember = (UI_Button3)UI_Button3.Create(comp.GetChild("btnMember"));
             m_btnConstruct = (UI_Button3)UI_Button3.Create(comp.GetChild("btnConstruct"));
             m_txtLowKeep = (GTextField)comp.GetChild("txtLowKeep");
+            m_grpLowKeep = (GGroup)comp.GetChild("grpLowKeep");
             m_txtUnionName = (GTextField)comp.GetChild("txtUnionName");
             m_comLeagueHead = (UI_ComLeagueHead)UI_ComLeagueHead.Create(comp.GetChild("comLeagueHead"));
             m_comHead = (GComponent)comp.GetChild("comHead");
@@ -101,6 +103,7 @@ namespace UI.League
             m_btnConstruct.Dispose();
             m_btnConstruct = null;
             m_txtLowKeep = null;
+            m_grpLowKeep = null;
             m_txtUnionName = null;
             m_comLeagueHead.Dispose();
             m_comLeagueHead = null;

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -54,7 +55,9 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            onClickDayIndex = ActivityDay7DataManager.Instance.GetActivityDay7Day() - 1;
+            var min = Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
+                ActivityDay7DataManager.Instance.GetActivityDay7Day());
+            onClickDayIndex = Math.Max(0, min - 1);
             SetScoreList();
             SetScore();
             SetDayList();

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -269,9 +269,14 @@ namespace GFGGame
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(context.data as GObject);// (GObject)context.data as GObject;
             int id = (int)listItem.target.data;
             // bool isSuit = SuitCfgArray.Instance.GetTotalCountOfOneSuit(id) > 0;
+
             if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
             {
-                if (SuitCfgArray.Instance.CheckSuitHasAction(id))
+                if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0 && GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS).id)
+                {
+                    ShowSuitPartList(id, true);
+                }
+                else if (SuitCfgArray.Instance.CheckSuitHasAction(id))
                 {
                     listItem.m_comAxtionSelect.target.visible = true;
                     UI_PartsListItem.ProxyEnd();
@@ -1056,14 +1061,14 @@ namespace GFGGame
             }
             if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里，可以查看集齐成套的服饰，点击一键换上。");
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "", 0);
-            if (_ui.m_partsList.m_list.numItems > 0)
-            {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
-                GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnAction, ConstGuideId.FREEDOM_DRESS, 5, "选择特殊动作并穿上。");
-                UI_PartsListItem.ProxyEnd();
-            }
-            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 6, "搭配好的服饰，可以保存到主界面显示。");
-            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 7, "辛苦搭配完，去拍个照片留念呀~~");
+            // if (_ui.m_partsList.m_list.numItems > 0)
+            // {
+            //     UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
+            //     GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnAction, ConstGuideId.FREEDOM_DRESS, 5, "选择特殊动作并穿上。");
+            //     UI_PartsListItem.ProxyEnd();
+            // }
+            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰，可以保存到主界面显示。");
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 6, "辛苦搭配完，去拍个照片留念呀~~");
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 2, "");
 

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -124,8 +124,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 10, "");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
+            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 9, "");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
 
         }
         protected override void TryCompleteGuide()
@@ -133,8 +133,8 @@ namespace GFGGame
             base.TryCompleteGuide();
 
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.FREEDOM_DRESS, 10);
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -618,8 +618,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 8, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
-            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 9, "来记录下这一刻吧。");
+            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 7, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 8, "来记录下这一刻吧。");
             // GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -124,8 +124,8 @@ namespace GFGGame
         private void UpdateInfo()
         {
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
-            int lowKeepDay = (int)LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LowKeepDay);
-            _ui.m_txtLowKeep.visible = lowKeepDay > 0;
+            long lowKeepDay = LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LowKeepDay);
+            _ui.m_grpLowKeep.visible = lowKeepDay > 0;
             _ui.m_txtLowKeep.text = string.Format("已连续低维护：{0}天", lowKeepDay);
             _ui.m_txtUnionName.text = leagueData.Name;
             _ui.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueData.Icon);