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

FGUIProject/assets/Store/components/ComVipLv.xml

@@ -16,6 +16,6 @@
     <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="已满级"/>
+    <text id="n45_l500" name="txtTipsFull" xy="505,87" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

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

@@ -24,9 +24,12 @@ namespace GFGGame
         {
             UI_ComVipLv com = UI_ComVipLv.Proxy(obj);
             com.m_txtLv.text = RoleDataManager.vipLv.ToString();
+            int level = RoleDataManager.vipLv;
+            ET.Log.Debug("vipLv:" + level);
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
             VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
-            com.m_txtTipsFull.visible = nextVipCfg == null;
+            com.m_txtTipsFull.visible = RoleDataManager.vipExp >= vipCfg.num && nextVipCfg == null;
+            com.m_grpTips.visible = nextVipCfg != null || RoleDataManager.vipExp < vipCfg.num;
             if (com.m_btnRule.data == null)
             {
                 com.m_btnRule.onClick.Add(RuleController.ShowRuleView);

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -371,7 +371,7 @@ namespace GFGGame
         // ReSharper disable Unity.PerformanceAnalysis
         private void OnBtnBuyClick(EventContext context)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_POWER) <= 0)
+            if (_itemId == ConstItemID.POWER && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_POWER) <= 0)
             {
                 GuideController.TryCompleteGuideIndex(ConstGuideId.BUY_POWER, 1);
                 GuideController.TryCompleteGuide(ConstGuideId.BUY_POWER, 1);
@@ -568,7 +568,10 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_list.GetChildAt(1).asCom.GetChild("btnCurReceive").asButton, ConstGuideId.BUY_POWER, 1, "花点小钱可以购买体力超值返利包，每天都能领体力哦~");
+            if (_itemId == ConstItemID.POWER)
+            {
+                GuideController.TryGuide(_ui.m_list.GetChildAt(1).asCom.GetChild("btnCurReceive").asButton, ConstGuideId.BUY_POWER, 1, "花点小钱可以购买体力超值返利包，每天都能领体力哦~");
+            }
 
         }
     }