Merge remote-tracking branch 'remotes/origin/master' into xiaojie

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

@@ -54,7 +54,10 @@ namespace GFGGame
                             TimeUtil.GetCurDay());
                         if (!isGot)
                         {
-                            ViewManager.Show<DailySignView>(new object[] { 1 });
+                            if (RedDotDataManager.Instance.DailySignRed())
+                            {
+                                ViewManager.Show<DailySignView>(new object[] { 1 });
+                            }  
                         }
                     });
 

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -22,6 +22,7 @@ namespace GFGGame
         private float _signCount;
         private int _month;
         private int _day;
+        private bool isOpenPanel = true;
 
         public override void Dispose()
         {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs

@@ -60,8 +60,13 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            if (GameGlobal.isLogon && RedDotDataManager.Instance.DailySignRed())
+            {
+                ViewManager.Show<DailySignView>();
+            }
             _ui.m_list.numItems = 0;
             ViewManager.SetMaskAlpha(0.6f);
+            GameGlobal.isLogon = false;
         }
         private void ListItemRender(int index, GObject obj)
         {
@@ -95,6 +100,7 @@ namespace GFGGame
                 {
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);
                     UpdateView();
+                    GameGlobal.isLogon = false;
                 }
             }
             else

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -166,7 +166,7 @@ namespace GFGGame
         private void OnClickBtnSend(EventContext context)
         {
             GObject item = context.sender as GObject;
-            FriendInfoData friendInfo = item.data as FriendInfoData;
+            FriendInfoData friendInfo = FriendDataManager.Instance.GetFriendDataById((long)item.data);
             if (friendInfo.takeGiftState == ConstBonusStatus.CAN_GET)
             {
                 // if (FriendDataManager.Instance.Count >= GlobalCfgArray.globalCfg.maxGetPowerCount)

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

@@ -218,7 +218,11 @@ namespace GFGGame
                     GuideDataManager.currentGuideId <= 0)
                 {
                     ViewManager.Show<SevenDayLoginView>();
-                    GameGlobal.isLogon = false;
+                    
+                }
+                else if (RedDotDataManager.Instance.DailySignRed())
+                {
+                    ViewManager.Show<DailySignView>();
                 }
 
                 //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -76,6 +76,7 @@ namespace GFGGame
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
+            item.m_ComIcon.m_loaIcon.url = $"Assets/Res/Texture/Studios/CYJD/{"dangan_"}{cfg.res}.{"png"}";
             item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
             item.m_grpName.visible = isPass;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -115,7 +115,7 @@ namespace GFGGame
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
             _ui.m_btnAdd.visible = limitCfg.itemID > 0;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_studioCfg.res);
+            _ui.m_loaBg.url = $"Assets/Res/Texture/Studios/CYJD/{_studioCfg.res}.{"png"}";//ResPathUtil.GetBgImgPath(_studioCfg.res);
             _ui.m_btnChange.title = _studioCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);