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

FGUIProject/assets/League/ListAnswerRuleItem.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="815,47">
   <displayList>
-    <graph id="n20_9jv6" name="n20" xy="19,26" size="1,21" type="rect" lineSize="0" fillColor="#fff2e8e4">
+    <graph id="n20_9jv6" name="n20" xy="19,26" size="1,31" type="rect" lineSize="0" fillColor="#fff2e8e4">
       <relation target="n18_pvb4" sidePair="height-height"/>
     </graph>
     <image id="n19_9jv6" name="n19" src="9jv664" fileName="images/lm_zsd.png" xy="10,11"/>
-    <text id="n18_pvb4" name="txtRule" xy="45,1" size="769,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="none" text="每天 开启雅集夜宴"/>
+    <text id="n18_pvb4" name="txtRule" xy="45,1" size="769,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="height" text="每天 开启雅集夜宴"/>
   </displayList>
   <relation target="n18_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/Main/MainUI.xml

@@ -46,7 +46,8 @@
     <group id="n88_ktf2" name="n88" xy="547,162" size="503,132" group="n52_qqat" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" scrollItemToViewOnClick="false" foldInvisibleItems="true">
+    <list id="n41_wg7t" name="list" xy="939,321" size="120,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" align="right" scrollItemToViewOnClick="false" foldInvisibleItems="true">
+      <relation target="" sidePair="right-right"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
@@ -59,10 +60,13 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
     </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="995,1597" pivot="0.5,0" anchor="true" size="102,117" group="n57_oju1" visible="false">
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="1001,1597" pivot="0.5,0" anchor="true" size="114,117" group="n57_oju1" visible="false">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true">
+    <image id="n91_jt8d" name="n91" src="jt8doy" fileName="imagesNew/db_qipaokuang.png" xy="733,1106" group="n93_jt8d"/>
+    <text id="n92_jt8d" name="n92" xy="749,1107" pivot="0.5,0" size="179,35" group="n93_jt8d" fontSize="25" color="#fef7f7" letterSpacing="-2" strokeColor="#836330" text="雅集夜宴进行中..."/>
+    <group id="n93_jt8d" name="grpLeagueAnswer" xy="733,1106" size="216,39" group="n57_oju1" advanced="true"/>
+    <group id="n57_oju1" name="grpList" xy="733,321" size="326,1393" group="n52_qqat" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -4,18 +4,19 @@
   <displayList>
     <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="0,1"/>
     <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="1,154"/>
-    <text id="n3_r1a9" name="txtName" xy="55,228" size="103,46" fontSize="34" color="#6a5d56" text="赵钱孙"/>
-    <component id="n11_wzce" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,196"/>
-    <text id="n12_wzce" name="txtLv" xy="170,170" pivot="0.5,0" size="36,56" fontSize="24" color="#fff9f1" leading="-8" ubb="true" vars="true" text="Lv.&#xA;30"/>
+    <text id="n3_r1a9" name="txtName" xy="55,228" size="105,46" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n12_wzce" name="txtLv" xy="157,192" pivot="1,0" size="51,34" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
     <loader id="n7_sx2v" name="loaRarity" xy="162,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n16_qr4e" name="loaMainScore" xy="9,11" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
     <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,0"/>
     <graph id="n13_dcro" name="holder" xy="107,114" size="1,1" touchable="false" type="rect">
       <gearDisplay controller="button" pages="1"/>
     </graph>
-    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="4,197" group="n19_v461"/>
-    <text id="n18_v461" name="txtStarLv" xy="30,193" pivot="1,0" size="32,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
-    <group id="n19_v461" name="n19" xy="4,193" size="58,34" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n18_v461" name="txtStarLv" xy="156,171" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="183,175" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="156,171" size="53,34" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -646,6 +646,7 @@
     <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
     <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
+    <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -12,8 +12,8 @@
     <image id="n22_10not" name="n22" src="hhx91f" fileName="imagesNew/GiftBag_baseboard1.png" xy="26,0"/>
     <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="0,-1" group="n26_10not"/>
     <text id="n48_l500" name="n48" xy="17,7" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
-    <text id="n49_l500" name="txtDesc" xy="8,32" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
-    <text id="n50_l500" name="n50" xy="63,42" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
+    <text id="n49_l500" name="txtDesc" xy="8,32" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#e4622d" strokeSize="2" text="800"/>
+    <text id="n50_l500" name="n50" xy="63,42" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" strokeColor="#e4622d" strokeSize="2" text="%"/>
     <group id="n51_l500" name="n51" xy="8,32" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="290,455" overflow="hidden">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0">
     <remark page="0" value="可购买"/>
     <remark page="1" value="已售罄"/>
   </controller>
@@ -13,8 +13,8 @@
     <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
     <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n26_10not"/>
     <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
-    <text id="n49_l500" name="txtDesc" xy="207,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
-    <text id="n50_l500" name="n50" xy="262,310" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
+    <text id="n49_l500" name="txtDesc" xy="207,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#e4622d" strokeSize="2" text="800"/>
+    <text id="n50_l500" name="n50" xy="262,310" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" strokeColor="#e4622d" strokeSize="2" text="%"/>
     <group id="n51_l500" name="n51" xy="207,301" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>

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

@@ -34,7 +34,7 @@ namespace GFGGame
             {
                 return true;
             }
-            if(TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily))
+            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily))
             {
                 return true;
             }
@@ -51,9 +51,9 @@ namespace GFGGame
         {
             //任务奖励
             var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
-            for(var day = currentDay; day > 0; day--)
+            for (var day = currentDay; day > 0; day--)
             {
-                if(ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(day))
+                if (ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(day))
                 {
                     return true;
                 }
@@ -62,7 +62,7 @@ namespace GFGGame
             var activity7DaysCfgs = Activity7DaysCfgArray.Instance.dataArray;
             foreach (var cfg in activity7DaysCfgs)
             {
-                if(ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfg.id))
+                if (ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfg.id))
                 {
                     return true;
                 }
@@ -367,6 +367,9 @@ namespace GFGGame
             return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 &&
                    RoleDataManager.vipLv > 0;
         }
+
+
+
         //商店-礼包-活动礼包
         public bool GetGiftBagRewardRed()
         {

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

@@ -167,7 +167,7 @@ namespace GFGGame
         public int GetFilingRewardStateByIndex(int chapterId, int index)
         {
             StudioData studioData = GetStudioDataById(chapterId);
-            return studioData.RewardsStatus[index];
+            return studioData.RewardsStatus.Count > index ? studioData.RewardsStatus[index] : 0;
 
         }
 

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

@@ -9,7 +9,6 @@ namespace UI.Main
         public GButton target;
         public UI_ComCardMask m_comCardMask;
         public GTextField m_txtName;
-        public GComponent m_comStar;
         public GTextField m_txtLv;
         public GLoader m_loaRarity;
         public GLoader m_loaMainScore;
@@ -64,7 +63,6 @@ namespace UI.Main
         {
             m_comCardMask = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCardMask"));
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_comStar = (GComponent)comp.GetChild("comStar");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
@@ -76,7 +74,6 @@ namespace UI.Main
             m_comCardMask.Dispose();
             m_comCardMask = null;
             m_txtName = null;
-            m_comStar = null;
             m_txtLv = null;
             m_loaRarity = null;
             m_loaMainScore = null;

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

@@ -20,6 +20,7 @@ namespace UI.Main
         public UI_BtnModle m_btnGiftBag2;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
+        public GGroup m_grpLeagueAnswer;
         public GGroup m_grpList;
         public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
@@ -100,6 +101,7 @@ namespace UI.Main
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
+            m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
@@ -147,6 +149,7 @@ namespace UI.Main
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
+            m_grpLeagueAnswer = null;
             m_grpList = null;
             m_comListAd.Dispose();
             m_comListAd = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -64,6 +64,7 @@ namespace GFGGame
                         ViewManager.Show<MainUIView>(null, null, true);
                     }
                     PromptController.Instance.ShowFloatTextPrompt("您已离开雅集");
+                    return;
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -92,7 +92,7 @@ namespace GFGGame
 
             item.m_txtName.text = cardData.itemCfg.name;
             item.m_comCardMask.m_loaCard.asLoader.url = ResPathUtil.GetCardSmallPath(cardData.resources[cardData.resIndex]);
-            item.m_txtLv.text = string.Format("Lv.\n{0}", cardData.lv);
+            item.m_txtLv.text = string.Format("{0}级", cardData.lv);
             // item.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, cardData.itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             item.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (cardData.itemCfg.mainScore));

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

@@ -991,6 +991,12 @@ namespace GFGGame
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnLeague.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LeagueView).Name, false);
+            _ui.m_grpLeagueAnswer.visible = _btnLeague.visible && (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.Open || LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.WaitNext);
+            if (_ui.m_grpLeagueAnswer.visible)
+            {
+                Vector2 pos = _ui.m_list.TransformPoint(_btnLeague.position, _ui.target);
+                _ui.m_grpLeagueAnswer.SetPosition(pos.x - _ui.m_grpLeagueAnswer.width + 20, pos.y + 20, 0);
+            }
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoreView).Name, false);
             _btnTuJian.visible =
                 FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -69,6 +69,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
         }
         protected override void OnShown()
         {
@@ -80,6 +81,7 @@ namespace GFGGame
             _ui.m_list.selectedIndex = _curSelectIndex;
             _ui.m_list.ScrollToView(_curSelectIndex);
             ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
+            UpdateRedDot();
         }
 
         protected override void OnHide()
@@ -228,14 +230,15 @@ namespace GFGGame
             if (_curSelectIndex == 0) return;
             _curSelectIndex = _curSelectIndex - 1;
             _ui.m_list.ScrollToView(_curSelectIndex, true);
-            // _ui.m_list.selectedIndex = _curSelectIndex;
+            UpdateRedDot();
         }
         private void OnBtnRightClick()
         {
             if (_curSelectIndex == _ui.m_list.numItems - 1) return;
             _curSelectIndex = _curSelectIndex + 1;
             _ui.m_list.ScrollToView(_curSelectIndex, true);
-            // _ui.m_list.selectedIndex = _curSelectIndex;
+            UpdateRedDot();
+
         }
         private void UpdateSuitView()
         {
@@ -243,6 +246,34 @@ namespace GFGGame
             _ui.m_list.selectedIndex = _curSelectIndex;
         }
 
+        private void UpdateRedDot()
+        {
+
+            bool leftRed = false;
+            bool rightRed = false;
+            VipCfg[] vipCfgs = VipCfgArray.Instance.dataArray;
+            for (int i = 1; i < vipCfgs.Length; i++)
+            {
+                bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfgs[i].id);
+                bool red = !isGet && RoleDataManager.vipLv >= vipCfgs[i].id;
+
+                if (red && _curSelectIndex > i - 1)
+                {
+                    leftRed = true;
+                    break;
+                }
+                if (red && _curSelectIndex + 1 < i)
+                {
+                    rightRed = true;
+                    break;
+                }
+            }
+
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0 && _curSelectIndex > RoleDataManager.vipLv - 1) { leftRed = true; }
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0 && _curSelectIndex + 1 < RoleDataManager.vipLv) { rightRed = true; }
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, leftRed);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnRight, rightRed);
 
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -202,6 +202,12 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpRewardRed());
+
+            for (int i = 0; i < _ui.m_listSubTab.numItems; i++)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(i).asCom, false);
+            }
+
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_CHARGE)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpRewardRed());