Merge branch 'master' of http://192.168.2.10:3000/GFG/Client into yuqian

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -80,7 +80,7 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
 
             //_comEff = new GComponent();
             //_comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
@@ -138,7 +138,7 @@ namespace GFGGame
             UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
             valueBar.m_c1.selectedIndex = 12;
             UI_ComponentValueBar.ProxyEnd();
-            _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
             _ui.m_selectChapter.visible = false;
             _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;
@@ -200,12 +200,12 @@ namespace GFGGame
             currentDifficulty = chapterCfg.type;
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
             }
             else
             {
                 currentDifficulty = 0;
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             ItemCfg costItem = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0]);
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -141,7 +141,7 @@ namespace GFGGame
         {
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -149,7 +149,8 @@ namespace GFGGame
             {
                 num = 0;
             }
-            _ui.m_num.text = "金元宝：" + num;
+            ItemCfg item = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0]);
+            _ui.m_num.text = item.name+ ":" + num;
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -32,6 +32,9 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             modal = true;
+            this.viewCom.Center();
+
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_viewBtn.onClick.Add(OnBtnAdJump);
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
@@ -45,7 +48,7 @@ namespace GFGGame
         {
             base.OnShown();
             ReqInfo();
-            _ui.m_time.visible = false;
+            //_ui.m_time.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
         }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -69,7 +69,7 @@ namespace GFGGame
             }
             if (!GetSuitItemController.isAuto)
             {
-                _ui.m_btnShare.visible = true;
+                _ui.m_btnShare.visible = false;
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
+            _ui.m_btnShare.visible = false;
             Timers.inst.AddUpdate(CheckGuide);
         }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs

@@ -47,7 +47,7 @@ namespace GFGGame
             // _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
             if (!GetSuitItemController.isAuto)
             {
-                _ui.m_btnShare.visible = true;
+                _ui.m_btnShare.visible = false;
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs

@@ -44,7 +44,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            //_ui.m_btnShareWB.visible = false;
+            _ui.m_btnShareWB.visible = false;
+            _ui.m_btnShareWX.visible = false;
             _ui.m_btnShareQQ.visible = false;
             _ui.m_btnShareQQZone.visible = false;
             _ui.m_btnShareDouYin.visible = false;