商店

FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员积分"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n58_qik1" name="list" xy="0,790" size="1080,1082" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="8" colGap="60" defaultItem="ui://p9mtgheoqik1tby" align="center">

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员积分"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">

FGUIProject/assets/Store/StoreMonthUI.xml

@@ -10,8 +10,8 @@
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
     <loader id="n33_qik1" name="loaCard" xy="190,612" size="592,340" url="ui://p9mtgheohhx91a" autoSize="true"/>
-    <text id="n4_qik1" name="txtTime" xy="727,570" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
-    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="127,1004" size="826,240"/>
+    <text id="n43_qik1" name="txtTPrivilege" xy="768,566" pivot="1,0" size="131,44" fontSize="32" color="#915e15" ubb="true" vars="true" text="[color=#C53619]{value=29}[/color]项特权"/>
+    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="121,1004" size="839,240"/>
     <component id="n32_qik1" name="btnBuy" src="qik1tc2" fileName="components/Button10.xml" xy="415,864"/>
     <text id="n6_qik1" name="txtTips" xy="149,954" pivot="0.5,0" size="781,36" fontSize="26" color="#8c8580" vars="true" text="购买/续费可获得{value=300}会员积分（剩余天数超过{day=300}天后无法继续续费）"/>
     <text id="n7_qik1" name="n7" xy="296,1025" size="182,41" group="n10_qik1" fontSize="30" color="#8c8580" vars="true" text="购买立即获得"/>
@@ -30,6 +30,7 @@
     <text id="n24_qik1" name="txtDailyMoneyCount" xy="684,1080" size="47,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
     <group id="n25_qik1" name="n25" xy="625,1080" size="106,42" group="n30_qik1" advanced="true"/>
     <group id="n30_qik1" name="n30" xy="349,1080" size="382,42" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
+    <text id="n4_qik1" name="txtTime" xy="784,1190" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
     <component id="n31_qik1" name="btnGet" src="qik1tc1" fileName="components/Button9.xml" xy="428,1145"/>
     <image id="n34_qik1" name="n34" src="hhx91c" fileName="imagesNew/ornamental_title.png" xy="103,1281" pivot="0.5,0.5" group="n37_qik1" scale="-1,1"/>
     <text id="n35_qik1" name="txtGiftBag" xy="474,1268" pivot="0.5,0" size="132,44" group="n37_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="特权礼包"/>

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -10,7 +10,7 @@ namespace UI.Store
         public GComponent m_valueBar;
         public GButton m_btnRule;
         public GLoader m_loaCard;
-        public GTextField m_txtTime;
+        public GTextField m_txtTPrivilege;
         public UI_Button10 m_btnBuy;
         public GTextField m_txtTips;
         public GLoader m_loaMoney;
@@ -18,6 +18,7 @@ namespace UI.Store
         public GTextField m_txtPrivilegeCount;
         public GLoader m_loaDailyMoney;
         public GTextField m_txtDailyMoneyCount;
+        public GTextField m_txtTime;
         public GButton m_btnGet;
         public GTextField m_txtGiftBag;
         public GList m_list;
@@ -72,7 +73,7 @@ namespace UI.Store
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_loaCard = (GLoader)comp.GetChild("loaCard");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtTPrivilege = (GTextField)comp.GetChild("txtTPrivilege");
             m_btnBuy = (UI_Button10)UI_Button10.Create(comp.GetChild("btnBuy"));
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_loaMoney = (GLoader)comp.GetChild("loaMoney");
@@ -80,6 +81,7 @@ namespace UI.Store
             m_txtPrivilegeCount = (GTextField)comp.GetChild("txtPrivilegeCount");
             m_loaDailyMoney = (GLoader)comp.GetChild("loaDailyMoney");
             m_txtDailyMoneyCount = (GTextField)comp.GetChild("txtDailyMoneyCount");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
             m_list = (GList)comp.GetChild("list");
@@ -90,7 +92,7 @@ namespace UI.Store
             m_valueBar = null;
             m_btnRule = null;
             m_loaCard = null;
-            m_txtTime = null;
+            m_txtTPrivilege = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtTips = null;
@@ -99,6 +101,7 @@ namespace UI.Store
             m_txtPrivilegeCount = null;
             m_loaDailyMoney = null;
             m_txtDailyMoneyCount = null;
+            m_txtTime = null;
             m_btnGet = null;
             m_txtGiftBag = null;
             m_list = null;

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -249,7 +249,7 @@ namespace GFGGame
         private void OnBtnShopClick()
         {
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, true);
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas });
         }
 
         /// <summary>

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

@@ -39,6 +39,7 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnBuy.target.onClick.Add(OnBtnBuyCardClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnBlackReward.onClick.Add(OnBtnBlackRewardClick);
@@ -104,6 +105,7 @@ namespace GFGGame
                     _ui.m_txtMoneyCount.text = privilegeCfg.value1Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value1Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = false;
+                    _ui.m_btnRule.data = 300010;
                     break;
                 case ConstStoreSubId.STORE_MONTH_BLACK_CARD:
                     iconUrl = "ui://Store/MonthCard_Icon";
@@ -122,6 +124,7 @@ namespace GFGGame
                     _ui.m_txtMoneyCount.text = privilegeCfg.value2Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value2Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = true;
+                    _ui.m_btnRule.data = 300011;
                     break;
             }
 
@@ -141,6 +144,7 @@ namespace GFGGame
             _ui.m_loaMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_loaDailyMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_txtPrivilegeCount.text = privilegeCount.ToString();
+            _ui.m_txtTPrivilege.SetVar("value", privilegeCount.ToString()).FlushVars();
             _ui.m_btnGet.enabled = endTime > TimeHelper.ServerNow() && !isGot;
             _ui.m_btnGet.text = isGot ? "已领取" : "领取";
             _ui.m_btnGet.data = monthCfg.type; ;