Merge remote-tracking branch 'remotes/origin/dev' into douYou

# Conflicts:
#	GameClient/Assets/Plugins/Android/AndroidManifest.xml
#	GameClient/ProjectSettings/ProjectSettings.asset

.gitignore

@@ -45,6 +45,9 @@
 /GameClient/Assets/StreamingAssets/Bundles.meta
 /GameClient/Assets/StreamingAssets
 /StaticRes
+/GameClient/Assets/Plugins/Android/AndroidManifest.xml
+/GameClient/Assets/Plugins/Android/AndroidManifest.xml.meta
+/GameClient/ProjectSettings/ProjectSettings.asset
 /GameClient/.idea/.idea.GameClient/.idea/indexLayout.xml
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar
 /GameClient/Assets/Plugins/Android/libs/douyou-release.aar.meta

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -224,7 +224,7 @@ namespace GFGGame
             await ActivitySProxy.ReqGetNewPlayerBonusStatus();
             await ActivitySProxy.GetNewPlayerOnceStatus();
             await ActivitySProxy.GetTipsStatus();
-            await ActivitySProxy.GetOnceStatus(5006);
+            await ActivitySProxy.GetOnceStatus(ActivityDataManager.Instance.activityZCJBId);
             await RoleInfoSProxy.GetThemeID();
 
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;

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

@@ -283,9 +283,16 @@ namespace GFGGame
         public int activityZCJBId = 61101;
         public bool CheckZCJBRed()
         {
+            List<ActivityDressCfg> zcjbCfgList = new List<ActivityDressCfg>();
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
+            if (zcjbCfgList == null || zcjbCfgList.Count == 0)
+            {
+                return false;
+            }
             ItemData numItem;
             long num;
-            if(BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
+            if(BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -294,11 +301,11 @@ namespace GFGGame
                 num = 0;
             }
 
-            for (int i = 0; i < ActivityDressCfgArray.Instance.dataArray.Length - 1; i++)
+            for (int i = 0; i < zcjbCfgList.Count; i++)
             {
                     if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
                     {
-                        if (num >= ActivityDressCfgArray.Instance.dataArray[i].comsumeArr[0][1])
+                        if (num >= zcjbCfgList[i].comsumeArr[0][1])
                         {
                             return true;
                         }
@@ -391,15 +398,19 @@ namespace GFGGame
         }
         public bool isExtendTime(int day)
         {
-            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
-            long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
-            long ExtendTime = (day * 24 * 60 * 60 * 1000);
-            long currentTime = TimeHelper.ServerNow();
-            if(currentTime > endTime)
+            int id = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(id);
+            if (activityCfg != null)
             {
-                if((currentTime - endTime) <= ExtendTime)
+                long endTime = TimeUtil.DateTimeToTimestamp(activityCfg.endTime);
+                long ExtendTime = (day * 24 * 60 * 60 * 1000);
+                long currentTime = TimeHelper.ServerNow();
+                if (currentTime > endTime)
                 {
-                    return true;
+                    if ((currentTime - endTime) <= ExtendTime)
+                    {
+                        return true;
+                    }
                 }
             }
             return false;

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -247,9 +247,13 @@ namespace GFGGame
         //招财进宝活动
         public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
         {
-            ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(5006).paramsArr[0];
+            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            if (activityID != 0)
+            {
+                ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(activityID).paramsArr[0];
+            }
             S2C_GetDressRewrdStatusList response = null;
-            response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = id });
+            response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = activityID });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

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

@@ -31,6 +31,8 @@ namespace GFGGame
         private string[] effArray = new string[2] { "ZJ_JuQing", "ZJ_ZD" };
 
         private int currentDifficulty;
+
+        private int activityID;
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -112,7 +114,7 @@ namespace GFGGame
                 _chapterID = (int)this.viewData;
             }
             MainStoryDataManager.currentChapterCfgId = _chapterID;
-
+            activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
             //由于这里会切换特效，所以切换界面时进行清空
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
@@ -138,12 +140,12 @@ namespace GFGGame
             UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
             valueBar.m_c1.selectedIndex = 12;
             UI_ComponentValueBar.ProxyEnd();
-            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityID)[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;
             _ui.m_ActivityZCJB.visible = true;
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
@@ -200,12 +202,12 @@ namespace GFGGame
             currentDifficulty = chapterCfg.type;
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("wxsg_bj");
             }
             else
             {
                 currentDifficulty = 0;
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("wxsg_bj");
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;
@@ -251,8 +253,10 @@ namespace GFGGame
                         levelItem.m_c1.selectedIndex = 0;
                         levelItem.m_flower.target.visible = false;
                         levelItem.m_txtName.text = levelCfg.name;
+                        levelItem.m_comDialogBg.m_loabg.url = ResPathUtil.GetBgImgPath("wxsg_zjBg");
+                        levelItem.m_comDialogBg.m_loaIcon.url = ResPathUtil.GetChapterGuideIconPath("wxsg_zjBg");
                         levelItem.m_comDialogBg.m_c1.selectedIndex = Random.Range(0, 10);
-
+                        levelItem.m_txtDialogOrder.text = showId;
                     }
 
                     //根据困难程度选择显示图片
@@ -376,7 +380,7 @@ namespace GFGGame
 
         private void UpdateActivityTime(object param = null)
         {
-            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime)

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

@@ -37,10 +37,11 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            UpdateList();
+            
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
             zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
             _ui.m_List.numItems = zcjbCfgList.Count;
+            UpdateList();
             _ui.m_List.ScrollToView(Mathf.Max(0, ActivityDataManager.Instance.ActivityZCJBList.Count - 1), false, true);
         }
         protected override void OnHide()
@@ -124,7 +125,7 @@ namespace GFGGame
             UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(_ui.m_List.GetChildAt(itemCfg - 1));
             if (item.m_RewardBtn.m_c1.selectedIndex == 1)
             {
-                bool result = await ActivitySProxy.ReqActivityZCJBReward(5006, itemCfg);
+                bool result = await ActivitySProxy.ReqActivityZCJBReward(ActivityDataManager.Instance.GetCurOpenActiveByType(17), zcjbCfgList[itemCfg - 1].id);
                 if (!result) return;
                 GetSuitItemController.TryShow(0);
                 EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);

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

@@ -41,8 +41,8 @@ namespace GFGGame
             _ui.m_btnChange.onClick.Add(this.Hide);
             _ui.m_shopBtn.onClick.Add(OnClickShopBtn);
 
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "zcjb_All");
-            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "zcjb_icon");
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "WGSX_All_Tx/WGSX_All_Tx");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "WGSX_Button/WGSX_Button");
         }                
         protected override void OnShown()
         {
@@ -98,7 +98,7 @@ namespace GFGGame
         }
         private async void ReqInfo()
         {
-            await ActivitySProxy.SetOnceStatus(5006, 1, 1);
+            await ActivitySProxy.SetOnceStatus(ActivityDataManager.Instance.activityZCJBId, 1, 1);
             bool result = await ActivitySProxy.ReqActivityZCJBInfo();
             if (!result) return;
         }

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

@@ -172,6 +172,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBtnNewYearRedEnvelope);
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.AddEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward); 
+            EventAgent.AddEventListener(ConstMessage.CARD_INFO, CardBgRes);
         }
 
         protected override void RemoveEventListener()
@@ -188,6 +189,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.RemoveEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_INFO, CardBgRes);
         }
 
         protected override void OnShown()
@@ -668,7 +670,20 @@ namespace GFGGame
                 }
                 else
                 {
-                    _ui.m_btnWeeklyGift.target.visible = true;
+                    ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.GetCurOpenActiveByType(101));
+                    int giftShopId = activityCfg.paramsArr[0];
+                    ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(giftShopId);
+                    var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+                    if (remainBuyNum == 0)
+                    {
+                        //已售完
+                        _ui.m_btnWeeklyGift.target.visible = false;
+                    }
+                    else
+                    {
+                        //未售完
+                        _ui.m_btnWeeklyGift.target.visible = true;
+                    }
                 }
             }
         }
@@ -752,6 +767,11 @@ namespace GFGGame
                 //long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 //_ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
+            ActivityOpenCfg zcjbCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.GetCurOpenActiveByType(17));
+            if(zcjbCfg != null)
+            {
+                _ui.m_btnActivityZCJB.m_iconMain.url = ResPathUtil.GetActivityPath(zcjbCfg.res, "png");
+            }   
         }
 
         private void UpdateOpenServerActivity()
@@ -944,23 +964,31 @@ namespace GFGGame
             }
             if(MainDataManager.Instance.CardBgID == 0)
             {
-                _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = "";
+                _ui.m_cardBgIcon.target.visible = false;
+                _ui.m_cardBg.target.visible = false;
                 return;
             }
             ItemCfg cardItem = ItemCfgArray.Instance.GetCfg(MainDataManager.Instance.CardBgID);
             string resName = cardItem.res;
             string resPath = ResPathUtil.GetCardAnimationPath(resName);
+            var _cardData = CardDataManager.GetCardDataById(MainDataManager.Instance.CardBgID);
             Vector2 omCardImgResTargetSize = new Vector2((ViewGlobal.GetRealTopOffset() + _ui.target.height) * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, (ViewGlobal.GetRealTopOffset() + _ui.target.height));
-            if (YooAssets.CheckResExist(resPath))
+            if (_cardData != null && _cardData.itemCfg.animationCardStar > 0
+                && _cardData.star >= _cardData.itemCfg.animationCardStar
+                && YooAssets.CheckResExist(resPath))
             {
                 await LoadManager.Instance.CheckResExsitedOrDownload(resPath);
                 _effectUI1 = new EffectUI();
                 _effectUI1.Reset(_ui.m_cardBg.m_comCardHolder.m_holder, resName, resName, 110, EffectUIType.Card);
                 float offY = GRoot.inst.height / 1000;
+                _ui.m_cardBg.target.visible = true;
+                _ui.m_cardBgIcon.target.visible = false;
                 _ui.m_cardBg.m_comCardHolder.m_holder.y = _ui.m_cardBg.m_comCardHolder.m_holder.y + (offY*50);
             }
             else
             {
+                _ui.m_cardBg.target.visible = false;
+                _ui.m_cardBgIcon.target.visible = true;
                 _ui.m_cardBgIcon.m_ComCardImgRes.target.size = omCardImgResTargetSize;
                 _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(resName);
             }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeThemeView.cs

@@ -132,6 +132,7 @@ namespace GFGGame
         {
             await ActivitySProxy.SetOnceStatus(MainDataManager.Instance.CardBgKey, 0, 0);
             MainDataManager.Instance.CardBgID = 0;
+            PromptController.Instance.ShowFloatTextPrompt("关闭成功！");
             this.Hide();
         }
         private void AddEffect()

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -213,6 +213,10 @@ namespace GFGGame
                         item.visible = true;
                     }
                 }
+                else
+                {
+                    item.visible = true;
+                }
                 item.title = _storeTabCfgs[index][0];
                 menu2 = int.Parse(_storeTabCfgs[index][1]);
             }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -70,7 +70,7 @@ namespace GFGGame
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
-            cfgName = "cfg_dev";
+            cfgName = "cfg_dev19";
             ChannelId = (int)ChannelID.Test;
 #elif PT_DouYouDev
             netType = EnumNetType.LOCAL;