Browse Source

补充提交

zhangyuqian 1 year ago
parent
commit
422375c6ea

+ 2 - 10
GameClient/Assets/Game/HotUpdate/Data/CollectPartDataManager.cs

@@ -114,15 +114,7 @@ namespace GFGGame
                     {
                         int partIndex = cfg.AdditionSite;
                         int partIndexCommon = 0;
-                        if (partIndex != 99)
-                        {
-                            //0表示所有部位,1~7表示各个部位
-                            partIndexCommon = 0;
-                        }
-                        else
-                        {
-                            partIndexCommon = partIndex;
-                        }
+                        partIndexCommon = partIndex;
                         int level = CollectPartDataDic[partIndex][0];
                         int levelNum = CollectPartDataDic[partIndex][1];
                         if(levelNum == 0)
@@ -130,7 +122,7 @@ namespace GFGGame
                             addNum += 0;
                             break;
                         }
-                        CollegeBoostCfg collegeCfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(partIndexCommon, level, levelNum);
+                        CollegeBoostCfg collegeCfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(partIndex, level, levelNum);
                         addNum += (float)collegeCfg.value / 10000;
                         break;
                     }

+ 9 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs

@@ -36,6 +36,9 @@ namespace UI.RoleInfo
         public GTextInput m_SetLeagueNumType;
         public GTextInput m_SetNum;
         public GButton m_btnTeaPartyStart;
+        public GButton m_btnShareTest1;
+        public GButton m_btnShareTest2;
+        public GButton m_btnShareTest3;
         public const string URL = "ui://374k3dwvlqp0dm";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ComBtn";
@@ -112,6 +115,9 @@ namespace UI.RoleInfo
             m_SetLeagueNumType = (GTextInput)comp.GetChild("SetLeagueNumType");
             m_SetNum = (GTextInput)comp.GetChild("SetNum");
             m_btnTeaPartyStart = (GButton)comp.GetChild("btnTeaPartyStart");
+            m_btnShareTest1 = (GButton)comp.GetChild("btnShareTest1");
+            m_btnShareTest2 = (GButton)comp.GetChild("btnShareTest2");
+            m_btnShareTest3 = (GButton)comp.GetChild("btnShareTest3");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -144,6 +150,9 @@ namespace UI.RoleInfo
             m_SetLeagueNumType = null;
             m_SetNum = null;
             m_btnTeaPartyStart = null;
+            m_btnShareTest1 = null;
+            m_btnShareTest2 = null;
+            m_btnShareTest3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/CollegeSproxy.cs

@@ -15,7 +15,7 @@ namespace ET
             CollegeBoostCfg collectcfg;
             for (int i = 0; i < response.CollectPartInfos.Count; i++)
             {
-                List<int> item = new List<int>() { response.CollectPartInfos[i].Stage, response.CollectPartInfos[i].Lvl };
+                    List<int> item = new List<int>() { response.CollectPartInfos[i].Stage, response.CollectPartInfos[i].Lvl };
                     collectcfg = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(i, item[0], item[1]);
                     if (collectcfg == null)
                     {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingSelectView.cs

@@ -86,7 +86,7 @@ namespace GFGGame
                 listItem.target.visible = true;
                 if (levelNum > 0)
                 {
-                    addNum = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(partIndex1, level, levelNum).value;
+                    addNum = CollegeBoostCfgArray.Instance.GetCfgBytypePartsAndtypePhaseAndlayer(partIndex2, level, levelNum).value;
                     float addNumPercentage = (float)addNum / CollectPartDataManager.Instance.AddtitionRatio;
                     listItem.m_c1.selectedIndex = 0;
                     listItem.m_partIcon.url = string.Format("ui://ClothingUpgrade/{0}", CollectPartDataManager.Instance.partImage[partIndex2]);

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingUpgradeView.cs

@@ -151,12 +151,12 @@ namespace GFGGame
             if (_partIndex != 99)
             {
                 maxRank = CollectPartDataManager.Instance.MaxNormalRank;
-                partIndexCommon = 0;
+                partIndexCommon = _partIndex;
             }
             else
             {
                 maxRank = CollectPartDataManager.Instance.MaxSpecialRank;
-                partIndexCommon = 99;
+                partIndexCommon = _partIndex;
             }
             for (int i = 0; i < 3; i++)
             {

+ 15 - 1
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -49,7 +49,9 @@ namespace GFGGame
             _ui.m_btnAddNum.onClick.Add(OnClickBtnAddCount);
             _ui.m_btnSetNum.onClick.Add(OnClickBtnSetCount);
             _ui.m_ComBtn.m_btnTeaPartyStart.onClick.Add(OnClickBtnTeaPartyStart);
-
+            _ui.m_ComBtn.m_btnShareTest1.onClick.Add(OnClickShareTest1);
+            _ui.m_ComBtn.m_btnShareTest2.onClick.Add(OnClickShareTest2);
+            _ui.m_ComBtn.m_btnShareTest3.onClick.Add(OnClickShareTest3);
 
             var dataArray = RoleLevelCfgArray.Instance.dataArray;
             RoleLevelCfg maxLvlCfg = dataArray[dataArray.Length - 1];
@@ -367,5 +369,17 @@ namespace GFGGame
             if (string.IsNullOrEmpty(num)) return;
             GMController.SendGMCommand($"addNum {roleNumType} {num}", "").Coroutine();
         }
+        private void OnClickShareTest1(EventContext context = null)
+        {
+
+        }
+        private void OnClickShareTest2(EventContext context = null)
+        {
+
+        }
+        private void OnClickShareTest3(EventContext context = null)
+        {
+
+        }
     }
 }

BIN
GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_fui.bytes