Merge branch 'master' of http://fort23.cn:3000/fort23/XY001

# Conflicts:
#	Assets/Scenes/UIBuild.scene   resolved by origin/master(远端) version

Assets/Res/UI/SpecificProfessionEquipmentPanel.prefab

@@ -203,7 +203,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2794770272681099308
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3191,8 +3191,8 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
-  - key: title
-    gameObject: {fileID: 8010972938947094933}
+  - key: zyTitle
+    gameObject: {fileID: 5467978613374042178}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -3201,7 +3201,7 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
-  - key: bg
+  - key: colorBg
     gameObject: {fileID: 418935367691406417}
     isAssetBundle: 0
     isList: 0
@@ -3211,6 +3211,26 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: miniTitle
+    gameObject: {fileID: 6504731158651364930}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 345039711155953141}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: zyBg
+    gameObject: {fileID: 4887070157619235640}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 345039711155953141}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!114 &3602538398910660699
 MonoBehaviour:
@@ -3224,7 +3244,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxDuration: 0.2
+  maxDuration: 1
   isUpdate: 0
   currTime: 0.2
   GrpupInfos:
@@ -3237,7 +3257,7 @@ MonoBehaviour:
     - {fileID: 539445254930693763}
     TweenAssetInfo: {fileID: 11400000, guid: f0bdd4e99fcc6c74da59f9ab86e8701f, type: 2}
     TargetFoldout: 1
-    maxDuration: 0.2
+    maxDuration: 1
     isUpdate: 1
     currTime: 0
   MinMaxGradient:
@@ -3304,6 +3324,7 @@ MonoBehaviour:
       m_NumAlphaKeys: 2
     m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
     m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
 --- !u!1 &4398584149693849749
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -65,9 +66,47 @@ namespace Fort23.Mono
         {
             isClickOnce = false;
             curZy = zy;
+            SetZyInfo();
             HeroUITools.UpdateZyEqIcon(zy, eqs, poolName:"eq2");
         }
 
-        
+        private void SetZyInfo()
+        {
+            switch (curZy)
+            { //  
+                case 1:
+                    SetZyTxt(97);
+                    zyBg.icon_name = "bg_warrior";
+                    break;
+                case 2:
+                    SetZyTxt(98);
+                    zyBg.icon_name = "bg_priest";
+                    break;
+                case 3:
+                    SetZyTxt(99);
+                    zyBg.icon_name = "bg_Mage";
+                    break;
+                case 4:
+                    SetZyTxt(100);
+                    zyBg.icon_name = "bg_Archer";
+                    break;
+                default:
+                    break;
+            }
+
+            SetZyBg(curZy);
+        }
+
+        private void SetZyTxt(int languageId)
+        {
+            zyTitle.text = LanguageManager.Instance.Text(languageId);
+            miniTitle.text = LanguageManager.Instance.Text(languageId);
+        }
+
+        private void SetZyBg(int zy)
+        {
+            
+           
+        }
     }
 }

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanelData.cs

@@ -96,26 +96,48 @@ namespace Fort23.Mono
 	      return _txtZyName;
 	     }
 	   }
-	  private GameObject _title;
-	  public GameObject title
+	  private Text _zyTitle;
+	  public Text zyTitle
 	   {
 	   get{
-	      if (_title == null)
+	      if (_zyTitle == null)
 	       {
-	         _title  = GetUIUnit<GameObject>("title"); 
+	         _zyTitle  = GetUIUnit<Text>("zyTitle"); 
 	       }
-	      return _title;
+	      return _zyTitle;
 	     }
 	   }
-	  private MyImage _bg;
-	  public MyImage bg
+	  private MyImage _colorBg;
+	  public MyImage colorBg
 	   {
 	   get{
-	      if (_bg == null)
+	      if (_colorBg == null)
 	       {
-	         _bg  = GetUIUnit<MyImage>("bg"); 
+	         _colorBg  = GetUIUnit<MyImage>("colorBg"); 
 	       }
-	      return _bg;
+	      return _colorBg;
+	     }
+	   }
+	  private Text _miniTitle;
+	  public Text miniTitle
+	   {
+	   get{
+	      if (_miniTitle == null)
+	       {
+	         _miniTitle  = GetUIUnit<Text>("miniTitle"); 
+	       }
+	      return _miniTitle;
+	     }
+	   }
+	  private MyImage _zyBg;
+	  public MyImage zyBg
+	   {
+	   get{
+	      if (_zyBg == null)
+	       {
+	         _zyBg  = GetUIUnit<MyImage>("zyBg"); 
+	       }
+	      return _zyBg;
 	     }
 	   }
 	  #endregion 自定义数据结束