Merge branch 'master' of http://192.168.1.190:3000/GFG/Client into ios_test

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -137,7 +137,7 @@ MonoBehaviour:
         UserData: 
     - GroupName: res
       GroupDesc: 
-      AssetTags: preload
+      AssetTags: dynamic
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Res

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BlindBox/UI_Button1.cs

@@ -7,8 +7,8 @@ namespace UI.BlindBox
     public partial class UI_Button1
     {
         public GButton target;
-        public GLoader m_img;
         public GTextField m_num;
+        public GLoader m_newimg;
         public const string URL = "ui://zxtyrwszcf1ai";
         public const string PACKAGE_NAME = "BlindBox";
         public const string RES_NAME = "Button1";
@@ -56,13 +56,13 @@ namespace UI.BlindBox
 
         private void Init(GComponent comp)
         {
-            m_img = (GLoader)comp.GetChild("img");
             m_num = (GTextField)comp.GetChild("num");
+            m_newimg = (GLoader)comp.GetChild("newimg");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_img = null;
             m_num = null;
+            m_newimg = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -36,7 +36,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(1);
+            BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(2);
             int id1 = blindBoxCfg.OrdinaryDropDisplay; //(int)(this.viewData as object[])[0];
             int id2 = blindBoxCfg.HideDropDisplay; //(int)(this.viewData as object[])[1];
             _rewardNormal = DropOutCfgArray.Instance.GetCfgsByid(id1);

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

@@ -18,15 +18,15 @@ namespace GFGGame
     public class BlindBoxView : BaseWindow
     {
         private UI_BlindBoxUI _ui;
-        private EffectUI _effectUI1;
+        //private EffectUI _effectUI1;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
         private ItemCfg itemcfg;
         private int listIndex = 0;
-        BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(1);
+        BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(2);
         public override void Dispose()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
+            // EffectUIPool.Recycle(_effectUI1);
+            // _effectUI1 = null;
             foreach (var v in _effectUIDic)
             {
                 EffectUIPool.Recycle(v.Value);
@@ -67,7 +67,7 @@ namespace GFGGame
             _ui.m_buyBtn.m_num.text = blindBoxCfg.CostIDNumArr[1].ToString();
 
             _ui.m_boxList.itemRenderer = RenderBoxList;
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effect, "ui_Activity", "WSJ_UI_DX/WSJ_UI_DX");
+            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effect, "ui_Activity", "WSJ_UI_DX/WSJ_UI_DX");
         }
 
         protected override void OnShown()
@@ -82,7 +82,8 @@ namespace GFGGame
                 Log.Error(string.Format("没有{0}物品"));
             }
 
-            //_ui.m_buyBtn.m_img.url = ResPathUtil.GetIconPath(itemcfg);
+             _ui.m_buyBtn.m_newimg.url = "ui://eg2y0ldpuje19g0w";
+            // _ui.m_buyBtn.m_img.width = 5;
             _ui.m_boxList.numItems = 6;
             _ui.m_rewardList.numItems = 6;
             UpdateTime(null);
@@ -173,7 +174,7 @@ namespace GFGGame
         private async void ReqBuyAll()
         {
             bool result;
-            result = await LuckyBoxSProxy.ReqGetBlindBox(1, 6);
+            result = await LuckyBoxSProxy.ReqGetBlindBox(2, 6);
             if (result)
             {
                 UpdateAllBoxAni();
@@ -183,7 +184,7 @@ namespace GFGGame
         private async void ReqBuyOne()
         {
             bool result;
-            result = await LuckyBoxSProxy.ReqGetBlindBox(1, 1);
+            result = await LuckyBoxSProxy.ReqGetBlindBox(2, 1);
             if (result)
             {
                 UI_boxItem listItem = UI_boxItem.Proxy(_ui.m_boxList.GetChildAt(listIndex));
@@ -261,7 +262,7 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10301);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10302);
             if (activityInfo != null)
             {
                 long endTime = activityInfo.EndTime;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -366,7 +366,7 @@ namespace GFGGame
         //限定盲盒按钮显示
         private void RefreshBtnXdmhActivity()
         {
-            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10301);
+            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10302);
         }
 
         private void RefreshBtnActivityFYJY()