Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -27,7 +27,7 @@
     <group id="n6_tu96" name="n6" xy="204,1391" size="672,166" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712">
+    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712" visible="false">
       <relation target="n6_tu96" sidePair="top-bottom"/>
     </component>
   </displayList>

FGUIProject/assets/FieldGuide/components/CompGuideItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="994,236">
   <displayList>
-    <loader id="n15_pjip" name="loaderPic" xy="15,17" size="964,202" url="ui://vqq9h9h4r0yx1v" autoSize="true"/>
+    <loader id="n15_pjip" name="loaderPic" xy="15,15" size="964,202" url="ui://vqq9h9h4r0yx1v" autoSize="true"/>
     <image id="n8_pjip" name="bg" src="pjip9" fileName="images/tujian_dikuang_1.png" xy="0,0"/>
     <loader id="n11_pjip" name="loaderTitle" xy="40,0" size="58,198" url="ui://vqq9h9h4pjip4" autoSize="true"/>
     <image id="n12_pjip" name="n12" src="pjip3" fileName="images/tujian_sjdu.png" xy="814,90"/>

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

@@ -8,7 +8,7 @@ namespace GFGGame
     {
         private List<GComponent> comRedDotPool = new List<GComponent>();
 
-        public void SetComRedDot(GComponent parentCom, bool isRed, string res = "", int left = 0, int right = 0, int top = 0, int bottom = 0)
+        public void SetComRedDot(GComponent parentCom, bool isRed, string res = "", int left = 0, int top = 0)
         {
             GComponent comRedDot;
 
@@ -26,10 +26,12 @@ namespace GFGGame
                 }
                 parentCom.AddChild(comRedDot);
                 comRedDot.name = "comResDot";
-                comRedDot.SetPosition(parentCom.width - comRedDot.width - left + right, bottom - top, 0);
+                comRedDot.SetPosition(parentCom.width - comRedDot.width + left, top, 0);
                 comRedDot.AddRelation(comRedDot, RelationType.TopExt_Top);
                 comRedDot.AddRelation(comRedDot, RelationType.RightExt_Right);
-                comRedDot.GetChild("loaIcon").asLoader.url = ResPathUtil.GetCommonGameResPath(res == "" ? "zx_hogndian" : res);
+                string path = ResPathUtil.GetCommonGameResPath(res == "" ? "zx_hogndian" : res);
+                GLoader loaIcon = comRedDot.GetChild("loaIcon").asLoader;
+                loaIcon.url = path;
             }
             else
             {

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

@@ -11,9 +11,9 @@ namespace GFGGame
 {
     public class ClothingSyntheticView : BaseWindow
     {
-        private const int HEAD_Y = 842;
+        private const int HEAD_Y = 942;
         private const int FA_XING_Y = 609;
-        private const int UPPER_BODY_Y = 459;
+        private const int UPPER_BODY_Y = 383;
         private const int LOWER_BODY_Y = 112;
         private const int SHOES_Y = -287;
         private const int BODY_Y = 289;

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

@@ -6,6 +6,7 @@ namespace GFGGame
     {
         public static bool enable = true;
         private static List<int> _waitingToShowList = new List<int>();
+        private static List<int> _waitingToShowSuit = new List<int>();
 
         public static void AddItemId(int itemId)
         {
@@ -14,26 +15,35 @@ namespace GFGGame
                 return;
             }
             _waitingToShowList.Add(itemId);
+            int suitId = SuitCfgManager.Instance.GetItemSuitId(itemId);
+            if (_waitingToShowSuit.IndexOf(suitId) < 0)
+            {
+                _waitingToShowSuit.Add(suitId);
+            }
         }
 
         public static int TryShow(int itemId)
         {
+            int suitId = 0;
             if (itemId > 0)
             {
-                int index = _waitingToShowList.IndexOf(itemId);
+                // int index = _waitingToShowList.IndexOf(itemId);
+                suitId = SuitCfgManager.Instance.GetItemSuitId(itemId);
+
+                int index = _waitingToShowSuit.IndexOf(suitId);
                 if (index >= 0)
                 {
-                    _waitingToShowList.RemoveAt(index);
-                    ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, itemId);
+                    _waitingToShowSuit.RemoveAt(index);
+                    ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, suitId);
                 }
             }
-            else if (_waitingToShowList.Count > 0)
+            else if (_waitingToShowSuit.Count > 0)
             {
-                itemId = _waitingToShowList[0];
-                _waitingToShowList.RemoveAt(0);
-                ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, itemId);
+                suitId = _waitingToShowSuit[0];
+                _waitingToShowSuit.RemoveAt(0);
+                ViewManager.Show(ViewName.GET_SUIT_ITEM_VIEW, suitId);
             }
-            return itemId;
+            return suitId;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -14,8 +14,6 @@ namespace GFGGame
         private GoWrapper _wrapper;
         private GameObject _gameObject1;
         private GoWrapper _wrapper1;
-        //正在显示的套装id
-        private int _suitIdShowing;
 
         private int guideId = 0;//0：没有引导 1：首次获得套装2：首次获得套装部件
         public override void Dispose()
@@ -49,15 +47,14 @@ namespace GFGGame
         {
             base.OnShown();
             GRoot.inst.touchable = true;
-            int itemId = (int)viewData;
+            int suitId = (int)viewData;
             guideId = 0;
-            UpdateView(itemId);
+            UpdateView(suitId);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-            _suitIdShowing = 0;
             if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
@@ -79,20 +76,13 @@ namespace GFGGame
             TryCompleteGuide();
         }
 
-        public override void Refresh()
-        {
-            int itemId = (int)viewData;
-            guideId = 0;
-            UpdateView(itemId);
-        }
-
         private void OnClickBg()
         {
-            int itemId = GetSuitItemController.TryShow(0);
-            if (itemId > 0)
+            int suitId = GetSuitItemController.TryShow(0);
+            if (suitId > 0)
             {
 
-                UpdateView(itemId);
+                UpdateView(suitId);
             }
             else
             {
@@ -120,15 +110,15 @@ namespace GFGGame
             GoodsItemTipsController.ShowItemTips(itemID);
         }
 
-        private void UpdateView(int itemId)
+        private void UpdateView(int suitId)
         {
             _ui.m_holderEffect.visible = true;
-            int count = 0;
+            int count = 0;//套装当前拥有的部件数量
             int totalCount = 1;
-            int suitId = 0;
+            // int suitId = 0;
             int[] itemIds = null;
-            DressUpMenuSuitDataManager.GetSuitProgressByItemId(itemId, out suitId, out count);
-            totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
+            // totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
             itemIds = SuitCfgManager.Instance.GetSuitItems(suitId);
             if (suitId > 0)
             {
@@ -146,28 +136,24 @@ namespace GFGGame
             }
             _ui.m_probar.max = totalCount;
             _ui.m_probar.value = count;
-            UpdateItem(itemId);
-            if(_suitIdShowing == 0 || _suitIdShowing != suitId)
+            // UpdateItem(itemId);
+            if (_sceneObject != null)
             {
-                if (_sceneObject != null)
-                {
-                    GameObject.Destroy(_sceneObject);
-                    _sceneObject = null;
-                }
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
-                int scale = 70;
-                _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
-                SceneController.UpdateRole(itemIds, _sceneObject);
-                if (_wrapper == null)
-                {
-                    _wrapper = new GoWrapper(_sceneObject);
-                    _ui.m_holder.SetNativeObject(_wrapper);
-                }
-                else
-                {
-                    _wrapper.wrapTarget = _sceneObject;
-                }
-                _suitIdShowing = suitId;
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+            _sceneObject = GameObject.Instantiate(_scenePrefab);
+            int scale = 70;
+            _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
+            SceneController.UpdateRole(itemIds, _sceneObject);
+            if (_wrapper == null)
+            {
+                _wrapper = new GoWrapper(_sceneObject);
+                _ui.m_holder.SetNativeObject(_wrapper);
+            }
+            else
+            {
+                _wrapper.wrapTarget = _sceneObject;
             }
 
         }

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -137,7 +137,7 @@ namespace GFGGame
             int state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
             item.m_c1.selectedIndex = state;
             item.m_txtNum.text = cfg.count.ToString();
-            RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 0, 20, 0, 8);
+            RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 12, 4);
 
             item.target.data = _rewardCfgs[index];
             UI_ListBoxRewardItem.ClearProxy();

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

@@ -31,7 +31,7 @@ namespace GFGGame
             _ui.m_compBanner.m_listTab.numItems = _listBannerDatas.Length;
 
             _ui.m_listGuide.itemRenderer = ListGuideItemRenderer;
-            _ui.m_listGuide.numItems = _listGuideDatas.Length;
+            // _ui.m_listGuide.numItems = _listGuideDatas.Length;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listGuide.onClickItem.Add(OnClickListGuideItem);
@@ -93,7 +93,7 @@ namespace GFGGame
             listItem.m_loaderPic.url = "ui://FieldGuide/tujian_tup_" + id;
             listItem.target.data = id;
             bool red = actions[index]();
-            RedDotController.Instance.SetComRedDot(listItem.target, red, "", 20);
+            RedDotController.Instance.SetComRedDot(listItem.target, red, "", -20);
         }
 
         private void OnClickListBannerItem(EventContext context)

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

@@ -199,7 +199,7 @@ namespace GFGGame
             bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
             listItem.m_imgLock.visible = listItem.m_imgLockBg.visible = !haveSuit;
             int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(suitId);
-            RedDotController.Instance.SetComRedDot(listItem.target, status == ConstBonusStatus.CAN_GET, "", 0, 4, 0, 402);
+            RedDotController.Instance.SetComRedDot(listItem.target, status == ConstBonusStatus.CAN_GET, "", 4, 402);
             if (status == ConstBonusStatus.CAN_GET)
             {
                 listItem.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_1";

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

@@ -138,6 +138,7 @@ namespace GFGGame
                 _wrapper.wrapTarget = _sceneObject;
             }
             _ui.m_btnChangeAction.grayed = !_dressUpObjDataCache.HasSuitPicRes;
+            UpdateSuitBoxStatus();
         }
 
         private void UpdateArrows()

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

@@ -123,7 +123,7 @@ namespace GFGGame
                                 }
                                 else
                                 {
-                                    int itemId = GetSuitItemController.TryShow(0);
+                                    GetSuitItemController.TryShow(0);
                                 }
                             });
                         }

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

@@ -95,7 +95,7 @@ namespace GFGGame
                 }
                 else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
                 {
-                    int itemId = GetSuitItemController.TryShow(0);
+                    GetSuitItemController.TryShow(0);
 
                 }
                 this.Hide();

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

@@ -118,7 +118,7 @@ namespace GFGGame
             }
             listItem.target.data = chapterCfg.id;
             listItem.m_content.target.data = chapterCfg.id;
-            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", 0, 8, 0, (int)listItem.m_content.m_txtProgress.y - 20);
+            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", 0, (int)listItem.m_content.m_txtProgress.y - 20);
         }
 
         private void UpdateList()

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -90,7 +90,7 @@ namespace GFGGame
             item.m_txtTitle.text = noticeInfo.title;
             item.m_txtTime.text = TimeUtil.FormattingTime(noticeInfo.time);
             // item.m_imgTips.visible = !noticeInfo.readStatus;
-            RedDotController.Instance.SetComRedDot(item.target, !noticeInfo.readStatus, "gg_gg_hdhdgth", 13, 0, 0, 12);
+            RedDotController.Instance.SetComRedDot(item.target, !noticeInfo.readStatus, "gg_gg_hdhdgth", -13, 12);
             if (item.m_btnGo.data == null)
             {
                 item.m_btnGo.onClick.Add(OnListNoticeBtnGoClick);