zhaoyang 2 years ago
parent
commit
528d0500de

+ 5 - 5
FGUIProject/assets/Store/components/ComVipLv.xml

@@ -2,20 +2,20 @@
 <component size="956,220">
   <displayList>
     <image id="n33_hhx9" name="n33" src="hhx91" fileName="imagesNew/VipLevel_baseboard.png" xy="0,0"/>
-    <text id="n34_hhx9" name="txtLv" xy="60,65" pivot="0.5,0" size="128,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" text="45"/>
-    <text id="n35_hhx9" name="n35" xy="38,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
-    <image id="n36_hhx9" name="n36" src="fqortau" fileName="imagesNew/sc_xian.png" xy="31,152" size="168,4" group="n38_hhx9"/>
+    <text id="n34_hhx9" name="txtLv" xy="55,65" pivot="0.5,0" size="116,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" letterSpacing="-12" text="88"/>
+    <text id="n35_hhx9" name="n35" xy="40,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
     <text id="n37_hhx9" name="n37" xy="57,154" size="116,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="会员等级"/>
-    <group id="n38_hhx9" name="n38" xy="31,65" size="168,128"/>
+    <group id="n38_hhx9" name="n38" xy="40,65" size="133,128"/>
     <component id="n39_hhx9" name="proExp" src="hhx91p" fileName="components/ProgressBar1.xml" xy="250,139">
       <ProgressBar value="50" max="100"/>
     </component>
     <text id="n40_hhx9" name="n40" xy="265,86" size="100,44" group="n43_hhx9" fontSize="32" color="#8c8580" text="再获得"/>
     <loader id="n41_hhx9" name="loaIcon" xy="365,86" size="45,45" group="n43_hhx9" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}积分可升级为[color=#5A3E16]{lv=0}[/color]级会员"/>
+    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}积分可升级为[color=#5A3E16]{vipLv=0}[/color]级会员"/>
     <group id="n43_hhx9" name="grpTips" xy="265,86" size="468,45" advanced="true" layout="hz" excludeInvisibles="true"/>
     <component id="n44_hhx9" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="862,63" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
+    <text id="n45_l500" name="txtTipsFull" xy="505,107" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/Store/components/ProgressBar1.xml

@@ -5,7 +5,7 @@
     <image id="n0_hhx9" name="n0" src="hhx9e" fileName="imagesNew/VipLevel_Progress_frame1.png" xy="4,3" size="655,18">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18"/>
+    <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18" fillMethod="hz"/>
     <image id="n2_hhx9" name="n2" src="hhx9d" fileName="imagesNew/VipLevel_Progress_frame2.png" xy="0,0" fillMethod="hz"/>
     <text id="n4_hhx9" name="txttitle" xy="576,21" pivot="1,0" size="71,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=100}"/>
   </displayList>

+ 16 - 4
GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs

@@ -24,10 +24,22 @@ namespace GFGGame
             UI_ComVipLv com = UI_ComVipLv.Proxy(obj);
             com.m_txtLv.text = RoleDataManager.vipLv.ToString();
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
-            com.m_proExp.target.max = vipCfg.num;
-            com.m_proExp.target.value = RoleDataManager.vipExp;
-
-
+            VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
+            com.m_txtTipsFull.visible = nextVipCfg == null;
+            if (com.m_btnRule.data == null)
+            {
+                com.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+                com.m_btnRule.data = 300007;
+            }
+            if (nextVipCfg != null)
+            {
+                com.m_proExp.target.max = vipCfg.num;
+                com.m_proExp.target.value = RoleDataManager.vipExp;
+                com.m_proExp.m_txttitle.SetVar("value", com.m_proExp.target.value.ToString()).FlushVars();
+                com.m_proExp.m_txttitle.SetVar("max", com.m_proExp.target.max.ToString()).FlushVars();
+                com.m_txtTips.SetVar("exp", (vipCfg.num - RoleDataManager.vipExp).ToString()).FlushVars();
+                com.m_txtTips.SetVar("vipLv", (nextVipCfg.id).ToString()).FlushVars();
+            }
             UI_ComVipLv.ProxyEnd();
         }
     }

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs

@@ -13,6 +13,7 @@ namespace UI.Store
         public GTextField m_txtTips;
         public GGroup m_grpTips;
         public GButton m_btnRule;
+        public GTextField m_txtTipsFull;
         public const string URL = "ui://p9mtgheohhx91r";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ComVipLv";
@@ -66,6 +67,7 @@ namespace UI.Store
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_grpTips = (GGroup)comp.GetChild("grpTips");
             m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_txtTipsFull = (GTextField)comp.GetChild("txtTipsFull");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +78,7 @@ namespace UI.Store
             m_txtTips = null;
             m_grpTips = null;
             m_btnRule = null;
+            m_txtTipsFull = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 7 - 1
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs

@@ -36,6 +36,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateVipProgressCom);
 
         }
         protected override void OnShown()
@@ -43,9 +44,13 @@ namespace GFGGame
             base.OnShown();
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
             _ui.m_list.numItems = _shopCfgs.Count;
-
+            UpdateVipProgressCom();
         }
 
+        private void UpdateVipProgressCom()
+        {
+            ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
+        }
         protected override void OnHide()
         {
             base.OnHide();
@@ -53,6 +58,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateVipProgressCom);
         }
 
         private void ListItemRenderer(int index, GObject obj)

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes