Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1015,6 +1015,7 @@ RectTransform:
   - {fileID: 1219834969852229682}
   - {fileID: 918016307754855288}
   - {fileID: 3549792637730888341}
+  - {fileID: 499061870556061026}
   - {fileID: 2507585154746067127}
   - {fileID: 753562404598425228}
   - {fileID: 1896441137542441893}
@@ -1231,6 +1232,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: Text_NextLevel
+    gameObject: {fileID: 3298864134895232804}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &3256041832133504665
 GameObject:
@@ -1416,6 +1426,86 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &4228054946003301881
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 499061870556061026}
+  - component: {fileID: 6421055668625946939}
+  - component: {fileID: 3298864134895232804}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_NextLevel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &499061870556061026
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4228054946003301881}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 111.75, y: -281}
+  m_SizeDelta: {x: -322.58, y: -1558.3776}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6421055668625946939
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4228054946003301881}
+  m_CullTransparentMesh: 1
+--- !u!114 &3298864134895232804
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4228054946003301881}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.41960785, g: 0.40784314, b: 0.3529412, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 43
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 47
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 18 -19
 --- !u!1 &4731082921620160257
 GameObject:
   m_ObjectHideFlags: 0
@@ -2754,7 +2844,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 93, y: 316.10516}
+  m_AnchoredPosition: {x: 16, y: 358.18}
   m_SizeDelta: {x: 317.0255, y: 36.152}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2100578571696428461

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -2675,7 +2675,102 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: Text_Cd
+    gameObject: {fileID: 3516989901371345886}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 0
+--- !u!1 &3362476855169369942
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 570296266500672836}
+  - component: {fileID: 3178996994500239182}
+  - component: {fileID: 3516989901371345886}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Cd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &570296266500672836
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3362476855169369942}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6870355629153732168}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -188.6, y: -340}
+  m_SizeDelta: {x: 321.5699, y: 50.9141}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3178996994500239182
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3362476855169369942}
+  m_CullTransparentMesh: 1
+--- !u!114 &3516989901371345886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3362476855169369942}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8773585, g: 0.83873266, b: 0.79045033, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 51
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u76D8CD:3"
 --- !u!1 &3415559647474066940
 GameObject:
   m_ObjectHideFlags: 0
@@ -4880,6 +4975,7 @@ RectTransform:
   - {fileID: 1761868374682694598}
   - {fileID: 8153636129082282834}
   - {fileID: 505629753215968796}
+  - {fileID: 570296266500672836}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -84,7 +84,7 @@ namespace Fort23.Mono
             UpdateSkillWidget();
             UpdateRoad();
 
-            CloseSelect();
+            // CloseSelect();
             return base.AsyncInit(uiData);
         }
 
@@ -524,6 +524,9 @@ namespace Fort23.Mono
                 skillKongWidget.OnClick = OnClickSkillKongWidget;
                 allKongSkill.Add(skillKongWidget);
             }
+
+
+            ChangeFuZhuYingXiang();
         }
 
 
@@ -801,7 +804,8 @@ namespace Fort23.Mono
                 {
                     if (allKongSkill[i].SkillInfo != null)
                     {
-                        allKongSkill[i].SelectState(true);
+                        if(selectSkillConfig.skillConfig.SkillType == allKongSkill[i].SkillInfo.skillConfig.SkillType)
+                            allKongSkill[i].SelectState(true);
                     }
                 }
             }
@@ -832,9 +836,14 @@ namespace Fort23.Mono
         private void ChangeFuZhuYingXiang()
         {
             yingxiang.Clear();
+            float addcd = 0;
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].Icon_YingXiang.gameObject.SetActive(false);
+                if (allKongSkill[i].SkillInfo != null)
+                {
+                    addcd += allKongSkill[i].SkillInfo.skillConfig.addcd;
+                }
 
                 if (allKongSkill[i].SkillInfo != null && allKongSkill[i].SkillInfo.skillConfig.SkillType == 2 && allKongSkill[i].SkillInfo.skillConfig.PromoteLanPara_1 != null)
                 {
@@ -859,6 +868,8 @@ namespace Fort23.Mono
             {
                 allKongSkill[i].Icon_YingXiang.gameObject.SetActive(true);
             }
+
+            Text_Cd.text = "功法盘CD：" + ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd);
         }
 
         public List<int> GetNumbers(int start, float offset)

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanelData.cs

@@ -305,6 +305,17 @@ namespace Fort23.Mono
 	      return _Sv;
 	     }
 	   }
+	  private Text _Text_Cd;
+	  public Text Text_Cd
+	   {
+	   get{
+	      if (_Text_Cd == null)
+	       {
+	         _Text_Cd  = GetUIUnit<Text>("Text_Cd"); 
+	       }
+	      return _Text_Cd;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidget.cs

@@ -9,6 +9,8 @@ namespace Fort23.Mono
     public partial class GongFaUpgradeInfoWidget : UIComponent
     {
         private SkillInfo _skillInfo;
+        
+        private SkillInfo currentSkillInfo;
 
         private void Init()
         {
@@ -26,9 +28,10 @@ namespace Fort23.Mono
         {
         }
 
-        public void CustomInit(SkillInfo currentSkillInfo, SkillInfo skillInfo)
+        public void CustomInit(SkillInfo currentSkillInfo, SkillInfo skillInfo,bool isUp)
         {
             _skillInfo = skillInfo;
+            this.currentSkillInfo = currentSkillInfo;
 
             if (_skillInfo.skillConfig.level <= currentSkillInfo.skillConfig.level)
             {
@@ -39,21 +42,9 @@ namespace Fort23.Mono
                 Icon_Marsk.gameObject.SetActive(true);
             }
 
-            if (_skillInfo.skillConfig.level == currentSkillInfo.skillConfig.level + 1)
-            {
-                Icon_Select.gameObject.SetActive(true);
-            }
-            else
-            {
-                Icon_Select.gameObject.SetActive(false);
-            }
+     
 
             Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.PromoteLan), skillInfo.skillConfig.PromoteLanPara);
-            // for (var i = 0; i < StarRoot.Count; i++)
-            // {
-            //     MyImage myImage = StarRoot[i] as MyImage;
-            //     myImage.gameObject.SetActive(false);
-            // }
             
             for (var i = 0; i < StarRoot.Count; i++)
             {
@@ -99,6 +90,18 @@ namespace Fort23.Mono
             // }
         }
 
+        public void SelectWidget(bool isUp)
+        {
+            if (_skillInfo.skillConfig.level == currentSkillInfo.skillConfig.level + 1 && isUp)
+            {
+                Icon_Select.gameObject.SetActive(true);
+            }
+            else
+            {
+                Icon_Select.gameObject.SetActive(false);
+            }
+        }
+
         public override void DormancyObj()
         {
             _skillInfo = null;

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -35,6 +35,7 @@ namespace Fort23.Mono
             isAddStack = true;
             IsShowAppBar = false;
         }
+
         public async override CTask GetFocus()
         {
             // await AppBarPanel.OpenPanel(this);
@@ -166,14 +167,13 @@ namespace Fort23.Mono
             Text_Level1.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
             Text_Level.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
 
-            Text_SkillCd.text = $"功法运作周期：{skillConfig.cd}转";
+            Text_SkillCd.text = $"加功法盘速度：{skillConfig.addcd}秒";
 
             skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
 
             UpdateStarBtn();
 
-
             Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
             Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " ";
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.GetComponent<RectTransform>());
@@ -253,9 +253,9 @@ namespace Fort23.Mono
             {
                 if (configs[i].level == 1)
                     continue;
-                SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID,configs[i].level);
+                SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
                 GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
-                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1);
+                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1, false);
                 _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
             }
         }
@@ -281,6 +281,33 @@ namespace Fort23.Mono
             {
                 if (_skillInfo.SkillData.level < _skillPowerupConfigs.Count)
                 {
+                    AccountFileInfo.SkillData skillData = new AccountFileInfo.SkillData();
+                    skillData.id = _skillInfo.SkillData.id;
+                    skillData.level = _skillInfo.SkillData.level + 1;
+                    skillData.star = _skillInfo.SkillData.star;
+
+                    SkillInfo nextSkillInfo = new SkillInfo(skillData);
+
+                    string[] effs = new string[_skillInfo.effectValue.Length];
+                    for (var i = 0; i < _skillInfo.effectValue.Length; i++)
+                    {
+                        if (_skillInfo.effectValue[i] == nextSkillInfo.effectValue[i])
+                        {
+                            effs[i] = _skillInfo.effectValue[i].ToString();
+                        }
+                        else
+                        {
+                            effs[i] = $"{_skillInfo.effectValue[i].ToString()}<color=green>→({nextSkillInfo.effectValue[i]})</color>";
+                        }
+                    }
+
+
+                    Text_NextLevel.gameObject.SetActive(true);
+                    Text_NextLevel.text = $"{_skillInfo.skillConfig.level}级  →  {nextSkillInfo.skillConfig.level}级";
+
+
+                    Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), effs);
+
                     Btn_UpStar.gameObject.SetActive(false);
                     if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
                     {
@@ -305,10 +332,14 @@ namespace Fort23.Mono
                             energyWidget.CustomInit(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
                             _energyWidgets.Add(energyWidget);
                         }
+
+                        Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), _skillInfo.effectValue);
                     }
                 }
                 else
                 {
+                    Text_NextLevel.gameObject.SetActive(true);
+                    Text_NextLevel.text = $"{_skillInfo.skillConfig.level}级  →  Max级";
                     Text_UpGrade.text = "已满级";
                     Btn_UpStar.gameObject.SetActive(false);
                     UpGradeItemRoot.SetActive(false);
@@ -318,6 +349,11 @@ namespace Fort23.Mono
 
             if (isUpStar)
             {
+                foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
+                {
+                    gongFaUpgradeInfoWidget.SelectWidget(true);
+                }
+
                 if (_skillInfo.skillConfig.level < 6)
                 {
                     Btn_UpStar.gameObject.transform.RecoverColor();
@@ -352,6 +388,13 @@ namespace Fort23.Mono
                 Text_UpStar.text = "领悟";
                 Text_UpGrade.text = "升级";
                 Btn_UpGrade.gameObject.transform.RecoverColor();
+                foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
+                {
+                    gongFaUpgradeInfoWidget.SelectWidget(false);
+                }
+
+                Text_NextLevel.gameObject.SetActive(false);
+                Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec), _skillInfo.effectValue);
             }
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.GetComponent<RectTransform>());

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -30,13 +30,13 @@ namespace Fort23.Mono
 	      return _Icon_GongFaIcon;
 	     }
 	   }
-	  private List<object> _StarRoot;
-	  public List<object> StarRoot
+	  private List<MyImage> _StarRoot;
+	  public List<MyImage> StarRoot
 	   {
 	   get{
 	      if (_StarRoot == null)
 	       {
-	         _StarRoot  = GetUIUnit<List<object>>("StarRoot"); 
+	         _StarRoot  = GetUIUnit<List<MyImage>>("StarRoot"); 
 	       }
 	      return _StarRoot;
 	     }
@@ -228,6 +228,17 @@ namespace Fort23.Mono
 	      return _Text_UpGrade;
 	     }
 	   }
+	  private Text _Text_NextLevel;
+	  public Text Text_NextLevel
+	   {
+	   get{
+	      if (_Text_NextLevel == null)
+	       {
+	         _Text_NextLevel  = GetUIUnit<Text>("Text_NextLevel"); 
+	       }
+	      return _Text_NextLevel;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs

@@ -126,7 +126,7 @@ namespace Fort23.Mono
                     continue;
                 SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
                 GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
-                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1);
+                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1,false);
                 _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
             }
         }