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

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -65,6 +65,13 @@ namespace GFGGame
             GoodsItemTipsController.ShowItemTips(ConstItemID.LEAGUE_CURRENCY, sourceDatas);
         }
 
+        // 活动摘星道具
+        private void OnClickLuckyBoxActivityProp(object[] gobackParam = null)
+        {
+            object[] sourceDatas = new object[] { ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2, gobackParam };
+            GoodsItemTipsController.ShowItemTips(ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2, sourceDatas);
+        }
+
         public void Dispose()
         {
             if (_valueBar != null)
@@ -200,6 +207,7 @@ namespace GFGGame
                 case ConstItemID.LEAGUE_CONTRIBUTION:
                 case ConstItemID.LEAGUE_CURRENCY:
                 case ConstItemID.LUCKYBOX_COST_2:
+                case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
                     button.m_imgAdd.visible = true;
                     break;
                 default:
@@ -263,6 +271,9 @@ namespace GFGGame
                     // ItemUtil.ExchangeItemById(itemId, 10, true, null, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED, true);
                     BuyItemConteoller.Show(itemId, 10, ConstBuyType.TYPE_ITEM, null, true, false, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
                     break;
+                case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
+                    OnClickLuckyBoxActivityProp();
+                    break;
                 default:
 
                     break;