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

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -183,5 +183,8 @@ namespace GFGGame
 
         //通知阿福赠礼活动状态的更新
         public const string AFU_GIFT_CHANGED = "AFU_GIFT_CHANGED";
+
+        //通知七日签到数据更新
+        public const string SEVENDAY_LOGIN = "SEVENDAYLOGIN";
     }
 }

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

@@ -37,6 +37,8 @@ namespace GFGGame
                 {
                     ActivityDataManager.Instance.sevenDayLoginLoginIdList = response.KsBonusId;
                     ActivityDataManager.Instance.sevenDayLoginBonusStatusList = response.VsBonusStatus;
+
+                    EventAgent.DispatchEvent(ConstMessage.SEVENDAY_LOGIN);
                     return true;
                 }
             }

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

@@ -109,7 +109,7 @@ namespace GFGGame
         {
             _bgIndex = 0;
             _modelIndex = 0;
-            _dressUpObjUI.dressUpObj.TakeOffAll();
+            _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
             UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_comModelRes.m_loaRes.url = "";
             UI_ComModel.ProxyEnd();

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

@@ -13,7 +13,6 @@ namespace GFGGame
     {
         private UI_NewLimitChargeUI _ui;
         private List<ShopCfg> _shopCfgs;
-        private DressUpObjUI _dressUpObjUI;
         private List<DressUpObjUI> _dressUpObjUIs = new List<DressUpObjUI>();
         private int _curSelectIndex = 0;
 
@@ -23,11 +22,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if (_dressUpObjUI != null)
-            {
-                _dressUpObjUI.Dispose();
-                _dressUpObjUI = null;
-            }
             for (int i = 0; i < _dressUpObjUIs.Count; i++)
             {
                 if (_dressUpObjUIs[i] != null)
@@ -56,8 +50,6 @@ namespace GFGGame
             this.clickBlankToClose = false;
             this.bringToFontOnClick = false;
 
-            _dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
-
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
@@ -145,7 +137,7 @@ namespace GFGGame
                 item.m_holder.data = dressUpObjUI;
                 _dressUpObjUIs.Add(dressUpObjUI);
             }
-            _dressUpObjUI = item.m_holder.data as DressUpObjUI;
+            DressUpObjUI _dressUpObjUI = item.m_holder.data as DressUpObjUI;
             _dressUpObjUI.ResetSceneObj(80, false, true, null, false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
             _dressUpObjUI.UpdateWrapper(item.m_holder);

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xqfs_bj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
         }
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -479,7 +479,8 @@ namespace GFGGame
             {
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(roleData);
             }
-            _ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
+            //_ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
+            CheckNumImage(allCircleScore.ToString());
             _ui.m_comClick.m_comResult.target.visible = false;
 
             _time = 0;
@@ -497,6 +498,73 @@ namespace GFGGame
             }
         }
 
+        private void CheckNumImage(string Num)
+        {
+            string res = "ui://Main/zd_pf_sz";
+            List<GLoader> num = new List<GLoader>
+            {
+                _ui.m_comClick.m_comAllPerfect.m_num0,
+                _ui.m_comClick.m_comAllPerfect.m_num1,
+                _ui.m_comClick.m_comAllPerfect.m_num2,
+                _ui.m_comClick.m_comAllPerfect.m_num3,
+                _ui.m_comClick.m_comAllPerfect.m_num4,
+            };
+            string numflog = "";
+            for (int i = 0; i < 5; i++)
+            {
+                numflog = Num.Length > i ? Num.Substring(i, 1) : "";
+                switch (Num.Length)
+                {
+                    case 0:
+                        num[i].url = null;
+                        break;
+                    case 1:
+                        if (i == 2)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 2:
+                        if (i >= 1 && i <= 2)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 3:
+                        if (i >= 1 && i <= 3)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 4:
+                        if (i >= 0 && i <= 3)
+                        {
+                            num[i].url = res + numflog;
+                        }
+                        else
+                        {
+                            num[i].url = null;
+                        }
+                        break;
+                    case 5:
+                        num[i].url = res + numflog;
+                        break;
+                }
+            }
+        }
+
         private void GetCurStar(out int star)
         {
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -658,13 +658,10 @@ namespace GFGGame
                 _ui.m_comClick.m_comAllPerfect.m_num3,
                 _ui.m_comClick.m_comAllPerfect.m_num4,
             };
-            ET.Log.Debug("y:  " +_ui.m_comClick.m_comAllPerfect.m_numGrade.y);
             string numflog = "";
             for (int i = 0 ; i < 5; i++)
             { 
-                ET.Log.Debug("numflog" + numflog +"     i"+ i);
                 numflog = Num.Length > i ? Num.Substring(i, 1) : "";
-                ET.Log.Debug("numflog" + numflog);
                 switch (Num.Length)
                 {
                     case 0:

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
         {
             base.OnShown();
             skillScoreDic = this.viewData as Dictionary<int, int>;
-
+            _ui.m_effReduceScore.visible = false;
             UpdateView();
         }
         private void UpdateView()

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

@@ -176,6 +176,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.AddEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.AddEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
+            EventAgent.AddEventListener(ConstMessage.SEVENDAY_LOGIN, SevenDayLoginShow);
         }
 
 
@@ -213,25 +214,7 @@ namespace GFGGame
 
             //long lastTime = GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
 
-            //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
-            ET.Log.Debug("zyq"+ GameGlobal.isLogon);
-            if (GameGlobal.isLogon)
-            {
-                ET.Log.Debug("zyq" + GameGlobal.isLogon);
-                ET.Log.Debug("zyq" + ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count + ":::" + GuideDataManager.currentGuideId);
-                if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
-                    GuideDataManager.currentGuideId <= 0)
-                {
-                    ViewManager.Show<SevenDayLoginView>();
-                    
-                }
-                else if (RedDotDataManager.Instance.DailySignRed())
-                {
-                    ViewManager.Show<DailySignView>(new object[] { 1 });
-                }
 
-                //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
-            }
 
             SetPos();
             GetAdIds();
@@ -274,6 +257,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.AFU_GIFT_CHANGED, ChangeAfuActivityState);
+            EventAgent.RemoveEventListener(ConstMessage.SEVENDAY_LOGIN, SevenDayLoginShow);
         }
 
         private void AddEffect()
@@ -1197,5 +1181,25 @@ namespace GFGGame
         {
             _ui.m_btnActivityAfuGift.target.visible = ActivityAfuGiftDataManager.Instance.IsOpen;
         }
+
+      private void SevenDayLoginShow()
+        {
+            //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            if (GameGlobal.isLogon)
+            {
+                if (ActivityDataManager.Instance.CanGetSevenDayBonus() &&
+                    GuideDataManager.currentGuideId <= 0)
+                {
+                    ViewManager.Show<SevenDayLoginView>();
+
+                }
+                else if (RedDotDataManager.Instance.DailySignRed())
+                {
+                    ViewManager.Show<DailySignView>(new object[] { 1 });
+                }
+
+                //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            }
+        }
     }
 }