Browse Source

套装养护换新

zhaoyang 3 years ago
parent
commit
beb282bf11

+ 3 - 0
FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -2,5 +2,8 @@
 <component size="1080,1920">
   <displayList>
     <list id="n0_py5g" name="listPrppertyLast" xy="508,570" size="200,300" overflow="scroll"/>
+    <list id="n2_bd1c" name="listAddPrppertyLast" xy="446,840" size="200,300" overflow="scroll"/>
+    <text id="n1_bd1c" name="n1" xy="487,621" size="164,54" fontSize="40" text="养护完成"/>
+    <text id="n3_bd1c" name="txtRenewTips" xy="358,1260" size="364,54" visible="false" fontSize="40" text="本套装的换新已可用"/>
   </displayList>
 </component>

+ 4 - 4
FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -38,7 +38,7 @@
     <group id="n21_nk8d" name="grpFoster" xy="145,746" size="900,977" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <text id="n22_nk8d" name="txtRenewProperty" xy="391,1264" size="322,42" group="n29_nk8d" fontSize="30" text="套装所有部件属性+10%"/>
+    <text id="n22_nk8d" name="txtRenewProperty" xy="391,1264" size="322,41" group="n29_nk8d" fontSize="30" text="套装所有部件属性+10%"/>
     <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="878,1292" group="n29_nk8d"/>
     <list id="n25_nk8d" name="listRenewMaterial" xy="0,1470" size="654,202" group="n29_nk8d" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gu">
       <item/>
@@ -47,13 +47,13 @@
     </list>
     <component id="n26_nk8d" name="comRenewCost" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="656,1421" group="n29_nk8d"/>
     <component id="n27_nk8d" name="btnRenew" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="624,1498" group="n29_nk8d"/>
-    <text id="n28_nk8d" name="txtRenewTips" xy="694,1650" size="182,42" group="n29_nk8d" fontSize="30" text="完成养护阶段"/>
+    <text id="n28_nk8d" name="txtRenewTips" xy="694,1650" size="182,41" group="n29_nk8d" fontSize="30" text="完成养护阶段"/>
     <group id="n29_nk8d" name="grpRenew" xy="0,1264" size="1030,427" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
     </group>
-    <text id="n30_nk8d" name="n30" xy="480,1372" size="152,42" group="n34_nk8d" fontSize="30" text="已完成换新"/>
-    <text id="n31_nk8d" name="txtRenewShow" xy="379,1466" size="322,42" group="n34_nk8d" fontSize="30" text="套装所有部件属性+10%"/>
+    <text id="n30_nk8d" name="n30" xy="480,1372" size="152,41" group="n34_nk8d" fontSize="30" text="已完成换新"/>
+    <text id="n31_nk8d" name="txtRenewShow" xy="379,1466" size="322,41" group="n34_nk8d" fontSize="30" text="套装所有部件属性+10%"/>
     <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="497,1594" group="n34_nk8d"/>
     <group id="n34_nk8d" name="grpRenewFinish" xy="379,1372" size="322,322" advanced="true">
       <gearDisplay controller="c1" pages="1"/>

+ 1 - 1
FGUIProject/assets/ClothingFoster/components/ComRenewReward.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="152,119">
   <displayList>
-    <loader id="n23_nk8d" name="loaReward" xy="27,0" pivot="0.5,0.5" size="100,100"/>
+    <loader id="n23_nk8d" name="loaReward" xy="17,-10" size="120,120" fill="scale"/>
     <text id="n24_nk8d" name="n24" xy="0,77" size="152,41" fontSize="30" text="换新后获得"/>
   </displayList>
 </component>

+ 1 - 0
FGUIProject/assets/ClothingFoster/components/comFosterAni.xml

@@ -5,5 +5,6 @@
     <component id="n36_nk8d" name="proFoster" src="py5ga" fileName="images/ProgressBar1.xml" xy="0,108">
       <ProgressBar max="100"/>
     </component>
+    <text id="n37_bd1c" name="txtContent" xy="8,179" size="209,42" fontSize="30" text="服装浆洗中......"/>
   </displayList>
 </component>

+ 1 - 6
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -156,13 +156,8 @@ namespace GFGGame
                 }
             }
             Timers.inst.CallLater(AfterEnterGame);
-            SendGameProtocol();
-
-        }
-        private static void SendGameProtocol()
-        {
-            SuitFosterHelper.SendGetSuitInfos().Coroutine();
         }
+
         private static void AfterEnterGame(object param)
         {
             //GameProxy.ReqGetStoryScoreList();

+ 34 - 19
GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using ET;
@@ -17,7 +18,11 @@ namespace GFGGame
 
         public void InitServerData(SuitFosterData suitFosterData)
         {
-            _suitInfoBySuitIdDic.Add(suitFosterData.suitId, suitFosterData);
+            if (!_suitInfoBySuitIdDic.ContainsKey(suitFosterData.suitId))
+            {
+                _suitInfoBySuitIdDic.Add(suitFosterData.suitId, suitFosterData);
+            }
+            _suitInfoBySuitIdDic[suitFosterData.suitId] = suitFosterData;
         }
         public void SetMaintainSuit(int suitId, int maintainStep)
         {
@@ -42,8 +47,16 @@ namespace GFGGame
 
         public SuitFosterData GetSuitFosterData(int suitId)
         {
-
-            return _suitInfoBySuitIdDic.ContainsKey(suitId) ? _suitInfoBySuitIdDic[suitId] : new SuitFosterData() { suitId = suitId, maintainStep = 0, maintainBonusSteps = new List<int>(), makeNewState = 0 };
+            if (_suitInfoBySuitIdDic.ContainsKey(suitId))
+            {
+                return _suitInfoBySuitIdDic[suitId];
+            }
+            else
+            {
+                SuitFosterData suitFosterData = new SuitFosterData() { suitId = suitId, maintainStep = 0, maintainBonusSteps = new List<int>(), makeNewState = 0 };
+                InitServerData(suitFosterData);
+                return suitFosterData;
+            }
 
         }
 
@@ -118,7 +131,8 @@ namespace GFGGame
                     }
                     if (addPropertyData.ContainsKey(score))
                     {
-                        addCount = addCount + (int)addPropertyData[itemCfg.mainScore];
+                        addCount = addCount + (int)addPropertyData[score];
+                        addPropertyData[score] = addCount;
                     }
                     else
                     {
@@ -146,38 +160,39 @@ namespace GFGGame
             return 2;
         }
 
-        public SortedList GetSuitFosterRewards(int suitId)
+        public List<SuitFosterCfg> GetSuitFosterRewards(int suitId)
         {
-            SuitFosterCfg[] cfg = SuitFosterCfgArray.Instance.GetCfgs(suitId);
-            List<SuitFosterCfg> list = new List<SuitFosterCfg>(cfg);
-            list = SortRewardList(list, suitId);
-
-            SortedList sortedList = new SortedList();
-            for (int i = 0; i < list.Count; i++)
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(suitId);
+            List<SuitFosterCfg> list = new List<SuitFosterCfg>(cfgs);
+            for (int i = list.Count - 1; i >= 0; i--)
             {
-                if (list[i].rewardsArr.Length > 0)
+                if (list[i].rewardsArr.Length == 0)
                 {
-                    sortedList.Add((i + 1), list[i]);
+                    list.RemoveAt(i);
                 }
             }
+            list = SortRewardList(list, suitId);
 
-            return sortedList;
+            return list;
         }
         private List<SuitFosterCfg> SortRewardList(List<SuitFosterCfg> list, int suitId)
         {
             SuitFosterData fosterData = GetSuitFosterData(suitId);
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(suitId);
+
             list.Sort((SuitFosterCfg a, SuitFosterCfg b) =>
             {
-                int indexA = list.IndexOf(a) + 1;
-                int indexB = list.IndexOf(b) + 1;
+                int indexA = Array.IndexOf(cfgs, a) + 1;
+                int indexB = Array.IndexOf(cfgs, b) + 1;
                 if (fosterData.maintainBonusSteps.IndexOf(indexA) >= 0 && fosterData.maintainBonusSteps.IndexOf(indexB) < 0)
                 {
-                    return -1;
+                    return 1;
                 }
                 else if (fosterData.maintainBonusSteps.IndexOf(indexA) < 0 && fosterData.maintainBonusSteps.IndexOf(indexB) >= 0)
                 {
-                    return 1;
+                    return -1;
                 }
+
                 return 0;
             });
             return list;
@@ -188,7 +203,7 @@ namespace GFGGame
         {
             SuitFosterData fosterData = GetSuitFosterData(suitId);
 
-            return fosterData.maintainBonusSteps.IndexOf(step) > 0;
+            return fosterData.maintainBonusSteps.IndexOf(step) >= 0;
         }
         //当前奖励状态:state 0:未领1:不可领2:已完成
         //当前奖励Index

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs

@@ -8,6 +8,8 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GList m_listPrppertyLast;
+        public GList m_listAddPrppertyLast;
+        public GTextField m_txtRenewTips;
         public const string URL = "ui://uicwtr5bpy5gs";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "SuitFosterFinishUI";
@@ -56,10 +58,14 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_listPrppertyLast = (GList)comp.GetChild("listPrppertyLast");
+            m_listAddPrppertyLast = (GList)comp.GetChild("listAddPrppertyLast");
+            m_txtRenewTips = (GTextField)comp.GetChild("txtRenewTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_listPrppertyLast = null;
+            m_listAddPrppertyLast = null;
+            m_txtRenewTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_comFosterAni.cs

@@ -8,6 +8,7 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GProgressBar m_proFoster;
+        public GTextField m_txtContent;
         public const string URL = "ui://uicwtr5bnk8d17";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "comFosterAni";
@@ -56,10 +57,12 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_proFoster = (GProgressBar)comp.GetChild("proFoster");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_proFoster = null;
+            m_txtContent = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 15 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterFinishView.cs

@@ -1,3 +1,4 @@
+using System.Collections;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -5,7 +6,10 @@ namespace GFGGame
     public class SuitFosterFinishView : BaseWindow
     {
         private UI_SuitFosterFinishUI _ui;
-
+        private int _suitId;
+        private int _index;
+        private SortedList _propertyList;
+        private SortedList _curPropertyList;
         public override void Dispose()
         {
 
@@ -20,7 +24,7 @@ namespace GFGGame
             _ui = UI_SuitFosterFinishUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
-            // this.modal = true;
+            this.modal = true;
             // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
         }
@@ -28,7 +32,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _suitId = (int)(this.viewData as object[])[0];
+            _index = (int)(this.viewData as object[])[1];
+
+            _propertyList = (this.viewData as object[])[1] as SortedList;
+            SuitFosterDataManager.Instance.GetPropertyData(_suitId, _index, out _curPropertyList, out SortedList _addPropertyList);
+
+            SuitFosterData data = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
+            SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
 
+            _ui.m_txtRenewTips.visible = data.maintainStep >= cfg.renewOpenLv;
         }
 
         protected override void OnHide()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
                 return;
             }
             SuitFosterHelper.SendMaintainSuit(_suitId, _index + 1).Coroutine();
-
+            this.Hide();
         }
     }
 }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitListView.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -50,6 +51,7 @@ namespace GFGGame
             _ui.m_btnHaveGot.selected = true;
             _ui.m_btnNotGet.selected = true;
 
+            SuitFosterHelper.SendGetSuitInfos().Coroutine();
             UpdateListSuit();
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
         }

+ 8 - 5
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using FairyGUI;
 using UI.ClothingFoster;
 namespace GFGGame
@@ -7,7 +9,7 @@ namespace GFGGame
     {
         private UI_SuitRewardUI _ui;
         private int _suitId;
-        private SortedList _rewardsList;
+        private List<SuitFosterCfg> _rewardsList;
 
         public override void Dispose()
         {
@@ -44,9 +46,10 @@ namespace GFGGame
         private void ListRewardRender(int index, GObject obj)
         {
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
-            SuitFosterCfg cfg = (SuitFosterCfg)_rewardsList.GetByIndex(index);
-            int key = (int)_rewardsList.GetKey(index);
-            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[key - 1]);
+            SuitFosterCfg cfg = _rewardsList[index];
+            SuitFosterCfg[] cfgs = SuitFosterCfgArray.Instance.GetCfgs(_suitId);
+            int _index = Array.IndexOf(cfgs, cfg);
+            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[_index]);
             ItemData itemData = new ItemData();
             itemData.id = cfg.rewardsArr[0][0];
             itemData.num = cfg.rewardsArr[0][1];
@@ -55,7 +58,7 @@ namespace GFGGame
                 obj.data = new ItemView(item.m_ComReward);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).ImgGotVisible = SuitFosterDataManager.Instance.GetRewardState(_suitId, key);
+            (obj.data as ItemView).ImgGotVisible = SuitFosterDataManager.Instance.GetRewardState(_suitId, _index + 1);
         }
     }
 }

+ 28 - 9
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -19,8 +19,8 @@ namespace GFGGame
         private bool _actionIsPic;
 
         private List<int> _suitIds;//已解锁套装列表
-        private SortedList _propertyList;
-        private SortedList _addPropertyList;
+        private SortedList _propertyList = new SortedList();
+        private SortedList _addPropertyList = new SortedList();
         private int _suitId;
         private int _index;
 
@@ -85,8 +85,12 @@ namespace GFGGame
                 }
             }
 
+            _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
+            _ui.m_c1.selectedIndex = 0;
             UpdateView();
 
+            Debug.Log("养护奖励:" + ItemDataManager.GetItemNum(100169));
+            Debug.Log("换新奖励:" + ItemDataManager.GetItemNum(10370));
         }
 
         protected override void OnHide()
@@ -160,6 +164,7 @@ namespace GFGGame
             if (targetIndex >= 0 && direction == -1 || targetIndex < _suitIds.Count && direction == 1)
             {
                 _suitId = _suitIds[targetIndex];
+                _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
                 UpdateView();
             }
         }
@@ -168,6 +173,8 @@ namespace GFGGame
         private void UpdateFoster()
         {
             UpdateFosterReward();
+            _propertyList.Clear();
+            _addPropertyList.Clear();
             SuitFosterDataManager.Instance.GetPropertyData(_suitId, _index, out _propertyList, out _addPropertyList);
             _ui.m_listProperty.numItems = _propertyList.Count;
             _ui.m_listFoster.numItems = SuitFosterCfgArray.Instance.GetCfgs(_suitId).Length;
@@ -186,10 +193,10 @@ namespace GFGGame
             UI_ListFosterItem item = UI_ListFosterItem.Proxy(obj);
             item.target.data = index;
             item.m_finish.selectedIndex = SuitFosterDataManager.Instance.GetFosterState(_suitId, index);
-            if (SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep == index)
-            {
-                _index = index;
-            }
+            // if (SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep == index)
+            // {
+            //     _index = index;
+            // }
         }
 
         private void ListPropertyItemRender(int index, GObject obj)
@@ -216,7 +223,6 @@ namespace GFGGame
             {
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("请完成{0}阶段", SuitFosterDataManager.Instance.stepNames[_index]));
             }
-            SuitFosterHelper.SendMaintainSuit(_suitId, index + 1).Coroutine();
         }
         private void OnClickComFosterReward()
         {
@@ -238,11 +244,12 @@ namespace GFGGame
         private void OnListenerFoster()
         {
             _ui.m_comFosterAni.target.visible = true;
+            _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
             _ui.m_comFosterAni.m_proFoster.value = 0;
             _ui.m_comFosterAni.m_proFoster.TweenValue(100, 2f).OnComplete(() =>
              {
                  _ui.m_comFosterAni.target.visible = false;
-                 ViewManager.Show<SuitFosterFinishView>(_propertyList);
+                 ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
                  UpdateFoster();
              });
 
@@ -252,6 +259,8 @@ namespace GFGGame
             SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[(int)(context.data) - 1];
             ViewManager.Show<RewardView>(ItemUtil.CreateItemDataList(cfg.rewardsArr));
             UpdateFosterReward();
+            Debug.Log("养护奖励:" + ItemDataManager.GetItemNum(100169));
+
         }
         /*************************************************换新************************************************/
         private void UpdateRenew()
@@ -288,7 +297,7 @@ namespace GFGGame
             UI_ComConsumeCurrency comConsumeCurrency = UI_ComConsumeCurrency.Proxy(_ui.m_comRenewCost);
             int has = ItemDataManager.GetItemNum(renewCfg.costId);
             int need = renewCfg.costNum;
-            // comConsumeCurrency.m_txtHas.text = has.ToString();
+            comConsumeCurrency.m_txtHas.text = has.ToString();
             comConsumeCurrency.m_txtNeed.text = need.ToString();
             if (_canRenew && has < need) _canRenew = false;
         }
@@ -330,11 +339,21 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("材料不足");
                 return;
             }
+            SuitFosterData data = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
+            SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
+            if (data.maintainStep < cfg.renewOpenLv)
+            {
+                PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启换新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
+                return;
+            }
+            SuitFosterHelper.SendMakeNewSuit(_suitId).Coroutine();
         }
         private void OnListenerRenew()
         {
             ViewManager.Show<SuitRenewFinishView>(_suitId);
             UpdateRenew();
+            Debug.Log("换新奖励:" + ItemDataManager.GetItemNum(10370));
+
         }
     }
 }

+ 5 - 4
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
         private UI_RewardUI _ui;
         private List<ItemData> _listItemDatas;
 
-      
+
 
         public override void Dispose()
         {
@@ -38,13 +38,14 @@ namespace GFGGame
             _listItemDatas = this.viewData as List<ItemData>;
             _ui.m_listReward.numItems = _listItemDatas.Count;
         }
-        private void RenderListRewardItem(int index,GObject obj)
+        private void RenderListRewardItem(int index, GObject obj)
         {
             obj.data = _listItemDatas[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             item.m_txtName.text = itemCfg.name;
-            item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
+            // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
+            item.m_txtCount.text = string.Format("x{0}", _listItemDatas[index].num);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
         }
         private void OnClickListReward(EventContext context)
@@ -57,7 +58,7 @@ namespace GFGGame
         }
 
 
-        private bool _showTips=true;
+        private bool _showTips = true;
         /// <summary>
         /// 是否展示物品详情,默认展示
         /// </summary>

BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


+ 2 - 2
GameClient/Packages/manifest.json

@@ -3,8 +3,8 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.collab-proxy": "1.15.12",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.14",
-    "com.unity.ide.vscode": "1.2.4",
+    "com.unity.ide.visualstudio": "2.0.15",
+    "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.29",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",

+ 2 - 2
GameClient/Packages/packages-lock.json

@@ -32,7 +32,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.14",
+      "version": "2.0.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -41,7 +41,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},