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

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

@@ -19,7 +19,6 @@ namespace GFGGame
 
         private LuckyBoxCfg _luckyBoxCfg;
         private const int _turnTime = 7;
-        private int _curTime = _turnTime;
         private int _bgIndex = 0;
         private int _modelIndex = 0;
         private List<DressUpObjUI> _dressUpObjUIs = new List<DressUpObjUI>(2);
@@ -42,12 +41,8 @@ namespace GFGGame
             _com = comModel;
         }
 
-        private bool showNoAnim;
         public void OnShown(int luckyBoxId)
         {
-            showNoAnim = true;
-            // _comModel = UI_ComModel.Proxy(_com);
-            _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
             _com.GetChild("loaMask").asLoader.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             InitDressUpObj();
@@ -73,7 +68,7 @@ namespace GFGGame
                 _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitIdArr.Length ? 0 : _modelIndex + 1;
             }
 
-            if(_luckyBoxCfg.isAni == 0)
+            if (_luckyBoxCfg.isAni == 0)
             {
                 _com.GetTransition("t0").Play(ChangeRes);
             }
@@ -151,15 +146,6 @@ namespace GFGGame
 
             int scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000 : 100;
             _dressUpObjUIs[_index].sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
-            //if (showNoAnim)
-            //{
-            //    ChangeModelAlpha(_index, 1);
-            //    showNoAnim = false;
-            //}
-            //else
-            //{
-            //    ShowModel();
-            //}
             ShowModel();
         }
 
@@ -207,8 +193,6 @@ namespace GFGGame
         {
             _index ^= 1;
         }
-
-
         private bool InitModel(int index)
         {
             if (_dressUpObjUIs[index].sceneObject == null)
@@ -246,7 +230,7 @@ namespace GFGGame
 
         private void ChangeModelAlpha(int index, float value)
         {
-            if(modelInfos[index].cubismModels == null)
+            if (modelInfos[index].cubismModels == null)
             {
                 return;
             }
@@ -291,10 +275,6 @@ namespace GFGGame
             _dressUpObjUI2.UpdateWrapper(_comModel.m_comModelRes2.m_holder);
 
             UI_ComModel.ProxyEnd();
-
-            //int temp = 1 - _index;
-            //InitModel(temp);
-            //ChangeModelAlpha(temp, 0);
         }
     }
 }

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

@@ -143,7 +143,7 @@ namespace GFGGame
                     if (index < TeapartyRoleIdList.Count - 1)
                         strRoleName = strRoleName + "、";
                 }
-                strAlertText = string.Format("茶话会角色：{0}参与人数不足，确认是否开启！" ,strRoleName);
+                strAlertText = string.Format("茶话会角色：[color=#FF0000]{0}[/color]参与人数不足，确认是否开启！", strRoleName);
             }
             else
                 strAlertText = "是否开启茶话会?";

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

@@ -340,7 +340,8 @@ namespace GFGGame
             comBox.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastTsyDrawCount.ToString()).FlushVars();
             comBox.m_txtCount.SetVar("name", cfg.name).FlushVars();
 
-            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
+            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByTypeAndID(ActivityType.XSLB3, activityId);
             var list = activityInfoByTypeList.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {

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

@@ -145,7 +145,6 @@ namespace GFGGame
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
-            AddEffect();
             firstIn = true;
         }
 
@@ -234,6 +233,7 @@ namespace GFGGame
             {
                 firstIn = false;
                 MainUIAnimFinished();
+                Timers.inst.StartCoroutine(AddEffect());
             }
             else
             {
@@ -255,8 +255,9 @@ namespace GFGGame
             Timers.inst.Remove(UpdateAdListTime);
         }
 
-        private void AddEffect()
+        private IEnumerator AddEffect()
         {
+            yield return new WaitForSeconds(1f);
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1"));
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3"));