Browse Source

UI细节完善

liao 3 months ago
parent
commit
c3e5e600ec

+ 27 - 6
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

File diff suppressed because it is too large
+ 278 - 286
Assets/Scenes/UIBuild.scene


+ 40 - 1
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;
@@ -63,9 +64,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)
+        {
+            
+           
+        }
     }
 }

+ 32 - 10
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 自定义数据结束 

BIN
Excel2Json/Excel/Language.xlsx


+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

File diff suppressed because it is too large
+ 53 - 2648
UserSettings/Layouts/default-2022.dwlt


Some files were not shown because too many files changed in this diff