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

# Conflicts:
#	GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0!a.png
#	GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0!a.png.meta
#	GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0.png
#	GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0.png.meta
#	GameClient/Assets/ResIn/UI/PopWindow/PopWindow_fui.bytes
#	GameClient/Assets/ResIn/UI/PopWindow/PopWindow_fui.bytes.meta
#	GameClient/Assets/ResIn/UI/PopWindow_fui.bytes.meta
#	GameClient/Assets/YooAsset/LICENSE.md.meta

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

@@ -85,7 +85,8 @@ namespace GFGGame
             _roleData.name = RoleDataManager.roleName;
             _roleData.scoreType = InstanceZonesDataManager.currentScoreType;
             _roleData.baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
-            _roleData.leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(_roleData.scoreType);
+            if(_roleData.scoreType != 0)
+                _roleData.leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(_roleData.scoreType);
             _roleData.cardId = InstanceZonesDataManager.currentCardId; ;//词牌id
 
             CardData cardData = CardDataManager.GetCardDataById(_roleData.cardId);

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

@@ -142,7 +142,6 @@ namespace GFGGame
             int score = 0;
             foreach (int key in SkillDataManager.Instance.LeagueSkillScoreDatas.Keys)
             {
-
                 score += SkillDataManager.Instance.LeagueSkillScoreDatas[key][scoreType];
             }
             return score;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs

@@ -20,16 +20,16 @@ namespace UI.League
         public GTextField m_txtAnswerTime;
         public GTextField m_txtAnswerNum;
         public GTextField m_txtContent;
-        public GList m_listResult;
         public GTextInput m_txtResult;
         public GImage m_imgFault;
-        public GTextField m_txtRightCount1;
+        public GList m_listResult;
         public GLoader m_loaIocn;
         public UI_ComHeadIcon m_comRightHead;
         public GGraph m_holderHead;
         public GImage m_imgFail;
         public GTextField m_txtInfo;
         public GTextField m_txtCdTime;
+        public GTextField m_txtRightCount1;
         public GTextField m_txtJoinNum;
         public GList m_listJoin;
         public GList m_listChat;
@@ -95,16 +95,16 @@ namespace UI.League
             m_txtAnswerTime = (GTextField)comp.GetChild("txtAnswerTime");
             m_txtAnswerNum = (GTextField)comp.GetChild("txtAnswerNum");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
-            m_listResult = (GList)comp.GetChild("listResult");
             m_txtResult = (GTextInput)comp.GetChild("txtResult");
             m_imgFault = (GImage)comp.GetChild("imgFault");
-            m_txtRightCount1 = (GTextField)comp.GetChild("txtRightCount1");
+            m_listResult = (GList)comp.GetChild("listResult");
             m_loaIocn = (GLoader)comp.GetChild("loaIocn");
             m_comRightHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comRightHead"));
             m_holderHead = (GGraph)comp.GetChild("holderHead");
             m_imgFail = (GImage)comp.GetChild("imgFail");
             m_txtInfo = (GTextField)comp.GetChild("txtInfo");
             m_txtCdTime = (GTextField)comp.GetChild("txtCdTime");
+            m_txtRightCount1 = (GTextField)comp.GetChild("txtRightCount1");
             m_txtJoinNum = (GTextField)comp.GetChild("txtJoinNum");
             m_listJoin = (GList)comp.GetChild("listJoin");
             m_listChat = (GList)comp.GetChild("listChat");
@@ -126,10 +126,9 @@ namespace UI.League
             m_txtAnswerTime = null;
             m_txtAnswerNum = null;
             m_txtContent = null;
-            m_listResult = null;
             m_txtResult = null;
             m_imgFault = null;
-            m_txtRightCount1 = null;
+            m_listResult = null;
             m_loaIocn = null;
             m_comRightHead.Dispose();
             m_comRightHead = null;
@@ -137,6 +136,7 @@ namespace UI.League
             m_imgFail = null;
             m_txtInfo = null;
             m_txtCdTime = null;
+            m_txtRightCount1 = null;
             m_txtJoinNum = null;
             m_listJoin = null;
             m_listChat = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs

@@ -24,7 +24,7 @@ namespace UI.LuckyBox
         public UI_LuckyBoxBonusShowItem m_item8;
         public UI_LuckyBoxBonusShowItem m_item9;
         public GButton m_BtnPass;
-        public GGraph m_touchFlipOpen;
+        public GLoader m_touchFlipOpen;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://drx9d1use050tf3";
@@ -91,7 +91,7 @@ namespace UI.LuckyBox
             m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
             m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
             m_BtnPass = (GButton)comp.GetChild("BtnPass");
-            m_touchFlipOpen = (GGraph)comp.GetChild("touchFlipOpen");
+            m_touchFlipOpen = (GLoader)comp.GetChild("touchFlipOpen");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -25,7 +25,7 @@ namespace GFGGame
         private const float SHOES_SCALE = 2.5f;
         private const float BODY_SCALE = 1f;
 
-        private const float DURATION = 0.6f;
+        private const float DURATION = 0.5f;
 
         private readonly int[] HEAD_Y_ARR = new int[] { ConstDressUpItemType.TOU_SHI, ConstDressUpItemType.ER_SHI, ConstDressUpItemType.JING_SHI, ConstDressUpItemType.ZHUANG_RONG };
         private readonly int[] FA_XING_Y_ARR = new int[] { ConstDressUpItemType.FA_XING };
@@ -191,6 +191,7 @@ namespace GFGGame
             UI_ClothingListItem.ProxyEnd();
         }
 
+        private EaseType ease = EaseType.ExpoOut;
         private void UpdateRole(bool tween)
         {
             _dressUpObjUI.ResetSceneObj(45, true, true, null, false);
@@ -205,33 +206,33 @@ namespace GFGGame
             var dy = _ui.m_compHolder.target.height - 642;
             if (Array.IndexOf(HEAD_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(HEAD_Y + dy, duration);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(HEAD_SCALE, HEAD_SCALE), duration);
+                _ui.m_compHolder.m_compMover.target.TweenMoveY(HEAD_Y + dy, duration).SetEase(ease);
+                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(HEAD_SCALE, HEAD_SCALE), duration).SetEase(ease);
             }
             else if (Array.IndexOf(FA_XING_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(FA_XING_Y + dy, duration);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(FA_XING_SCALE, FA_XING_SCALE), duration);
+                _ui.m_compHolder.m_compMover.target.TweenMoveY(FA_XING_Y + dy, duration).SetEase(ease);
+                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(FA_XING_SCALE, FA_XING_SCALE), duration).SetEase(ease);
             }
             else if (Array.IndexOf(UPPER_BODY_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(UPPER_BODY_Y + dy, duration);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(UPPER_BODY_SCALE, UPPER_BODY_SCALE), duration);
+                _ui.m_compHolder.m_compMover.target.TweenMoveY(UPPER_BODY_Y + dy, duration).SetEase(ease);
+                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(UPPER_BODY_SCALE, UPPER_BODY_SCALE), duration).SetEase(ease);
             }
             else if (Array.IndexOf(LOWER_BODY_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(LOWER_BODY_Y + dy, duration);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(LOWER_BODY_SCALE, LOWER_BODY_SCALE), duration);
+                _ui.m_compHolder.m_compMover.target.TweenMoveY(LOWER_BODY_Y + dy, duration).SetEase(ease);
+                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(LOWER_BODY_SCALE, LOWER_BODY_SCALE), duration).SetEase(ease);
             }
             else if (Array.IndexOf(SHOES_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(SHOES_Y + dy, duration);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(SHOES_SCALE, SHOES_SCALE), duration);
+                _ui.m_compHolder.m_compMover.target.TweenMoveY(SHOES_Y + dy, duration).SetEase(ease);
+                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(SHOES_SCALE, SHOES_SCALE), duration).SetEase(ease);
             }
             else
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(BODY_Y + dy, duration);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(BODY_SCALE, BODY_SCALE), duration);
+                _ui.m_compHolder.m_compMover.target.TweenMoveY(BODY_Y + dy, duration).SetEase(ease);
+                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(BODY_SCALE, BODY_SCALE), duration).SetEase(ease);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -986,7 +986,6 @@ namespace GFGGame
         }
         private void UpdateSearchList()
         {
-
             if (_scoreIndex == SORT_BY_HIGH_SCORE)
             {
                 _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3, true);

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

@@ -49,7 +49,7 @@ namespace GFGGame
             _ui.m_listChat.itemRenderer = RenderListChatItem;
             _ui.m_listChat.itemProvider = GetListChatItemResource;
             _ui.m_listChat.SetVirtual();
-            _ui.m_txtResult.onFocusOut.Add(OnFocuseOut);
+            //_ui.m_txtResult.onFocusOut.Add(OnFocuseOut);
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_league", "Answer_bgtx");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderHead, "ui_league", "Answer_Succeed");
@@ -182,7 +182,7 @@ namespace GFGGame
                 Hide();
                 return;
             }
-            _ui.m_txtTime.text = string.Format("{0}{1}", str, TimeUtil.FormattingTimeTo_mmss(endTime - curTime));
+            _ui.m_txtTime.text = string.Format("{0}[color=#E07748]{1}[/color]", str, TimeUtil.FormattingTimeTo_mmss(endTime - curTime));
         }
         private void UpdateQuestionState()
         {
@@ -241,7 +241,7 @@ namespace GFGGame
         private void UpdateResult()
         {
             _ui.m_ctrlResult.selectedIndex = LeagueDataManager.Instance.LastAnswerRoleData.LastQuestionResult;
-            _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            _ui.m_txtRightCount.text = string.Format("全员已答对[color=#AF5638]{0}[/color]题", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
             _ui.m_txtRightCount.SetVar("value", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtRightCount1.SetVar("value", LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtCdTime.SetVar("value", GlobalCfgArray.globalCfg.leagueQuestionNextTime.ToString()).FlushVars();
@@ -255,7 +255,7 @@ namespace GFGGame
                 OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(LeagueDataManager.Instance.LastAnswerRoleData.RightRoleId);
                 ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(roleInfoData.headId == 0 ? ConstItemID.HEADID : roleInfoData.headId);
                 _ui.m_comRightHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-                _ui.m_txtInfo.text = string.Format("{0} 答对了！", roleInfoData.roleName);
+                _ui.m_txtInfo.text = string.Format("{0} [color=#915E15]答对了！[/color]", roleInfoData.roleName);
                 _ui.m_holderHead.visible = true;
                 Timers.inst.Remove(UpdateResultTime);
                 Timers.inst.Add(1, 0, UpdateResultTime);
@@ -274,7 +274,7 @@ namespace GFGGame
                 _ui.m_imgFail.visible = false;
                 if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionCount) == GlobalCfgArray.globalCfg.leagueQuestionNum)//全部答完
                 {
-                    _ui.m_txtInfo.text = "全部题目答完啦~";
+                    _ui.m_txtInfo.text = "全部题目答完啦，活动结束啦~";
                 }
                 else//答题时间结束
                 {

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

@@ -104,8 +104,16 @@ namespace GFGGame
 
         protected void ReferNextShow()
         {
-            if (_chooseIndex != -1)
+            if (_chooseIndex != -1 && GetSuitItemController.GetSuitWaitingToId(_itemIdList[_chooseIndex]))
                 ClickItem(_chooseIndex);
+            else {
+                if (_handClick)
+                {
+                    _handClick = false;
+                    Timers.inst.Remove(UpClickDataTime);
+                    _ui.m_touchFlipOpen.touchable = false;
+                }
+            }
         }
 
         protected override void OnShown()
@@ -248,11 +256,9 @@ namespace GFGGame
                     item.m_comIcon.m_t0.Play();
 
                     if (!item.m_comIcon.m_imgNew.visible) {
-                        if (_handClick)
-                            _ui.m_touchFlipOpen.touchable = false;
                         _recordOpenIndex.Add(index);
                     }
-                    else if (_countNewRecord < 1)
+                    else if (_countNewRecord < 1) 
                         _countNewRecord += 1;
 
                     return;
@@ -279,6 +285,13 @@ namespace GFGGame
                             _recordOpenIndex.Add(index);
                             _countShow = 0;
                             _countNewRecord = 0;
+
+                            if (_handClick)
+                            {
+                                _handClick = false;
+                                Timers.inst.Remove(UpClickDataTime);
+                                _ui.m_touchFlipOpen.touchable = false;
+                            }
                         }
                     }
                     else
@@ -292,12 +305,6 @@ namespace GFGGame
                     }
                 }
                 UI_LuckyBoxBonusShowItem.ProxyEnd();
-
-                if (_handClick)
-                {
-                    _ui.m_touchFlipOpen.touchable = false;
-                    Timers.inst.Remove(UpClickDataTime);
-                }
             }
             else{
                 GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
@@ -341,7 +348,7 @@ namespace GFGGame
 
                     if (!open)
                     {
-                        _chooseIndex = index;
+                        _chooseIndex = -1;
                         ClickItem(index);
                     }
                 }
@@ -359,8 +366,8 @@ namespace GFGGame
         {
             if (_recordOpenIndex.Count >= _rewardList.Count) {
                 Timers.inst.Remove(UpDataTime);
-                _ui.m_touchFlipOpen.touchable = false;
                 HideOtherShowWindow();
+                _ui.m_touchFlipOpen.touchable = false;
             }
 
             for (int i = 0; i < _rewardList.Count; i++)
@@ -378,8 +385,8 @@ namespace GFGGame
             if (_recordOpenIndex.Contains(index))
             {
                 Timers.inst.Remove(UpClickDataTime);
-                _ui.m_touchFlipOpen.touchable = false;
                 HideOtherShowWindow();
+                _ui.m_touchFlipOpen.touchable = false;
             }
             else
                 ClickItem(index);

GameClient/Assets/YooAsset/LICENSE.md.meta → GameClient/Assets/ResIn/UI/PopWindow.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 3fec07d458534d34ea14d1b1a0a5100b
-TextScriptImporter:
+guid: 89429d3e5479e594d99e4f1b38b5abad
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta → GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 955bc580ab20c114c872810f5ca95c46
+guid: a8c401aba4033af429fdd6408ac6ff13
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/League/League_atlas0_8.png.meta → GameClient/Assets/ResIn/UI/PopWindow/PopWindow_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a62f0da8ccae26949aad09c45313a41a
+guid: 75e5da681840bea46bdb3c3a9e5e7664
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/PopWindow/PopWindow_fui.bytes.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:GameClient/Assets/YooAsset/LICENSE.md.meta
+guid: 3fec07d458534d34ea14d1b1a0a5100b
+========
+guid: 751a8d5c5d5ab164e8952dfa0c40028a
+>>>>>>>> remotes/origin/master:GameClient/Assets/ResIn/UI/PopWindow/PopWindow_fui.bytes.meta
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: