瀏覽代碼

修改bug

lzx 2 天之前
父節點
當前提交
4aa1e30ab3

+ 2 - 2
Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -124,7 +124,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0.0000026226, y: -29.9}
+  m_AnchoredPosition: {x: 0.0000026226, y: -21.5}
   m_SizeDelta: {x: 80, y: 31.1973}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1237620596013164419
@@ -923,7 +923,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0.7, y: -38.7}
+  m_AnchoredPosition: {x: 0.7, y: -32.5}
   m_SizeDelta: {x: 0, y: 30.610802}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4372224768594358457

+ 101 - 1
Assets/Res/UI/SkillInfopanel.prefab

@@ -128,7 +128,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1500, y: 3248}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5048528037997048130
 MonoBehaviour:
@@ -213,6 +213,16 @@ MonoBehaviour:
     - gameObject: {fileID: 7124841329176253432}
     - gameObject: {fileID: 534743054050646405}
     - gameObject: {fileID: 8307814055743465005}
+  - key: Icon_FabaoIcon
+    gameObject: {fileID: 2674243094589550573}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7143455120279600479}
+    - gameObject: {fileID: 6452252745516188510}
+    - gameObject: {fileID: 7124841329176253432}
+    - gameObject: {fileID: 534743054050646405}
+    - gameObject: {fileID: 8307814055743465005}
   isAssetBundle: 1
 --- !u!225 &4114640352870270046
 CanvasGroup:
@@ -610,6 +620,7 @@ RectTransform:
   m_Children:
   - {fileID: 3849278629804045308}
   - {fileID: 4555844957164556483}
+  - {fileID: 1644800439856113261}
   - {fileID: 3575994812429690981}
   - {fileID: 6122583032657971884}
   - {fileID: 8822711238517633434}
@@ -1387,6 +1398,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &5568597187285441230
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1644800439856113261}
+  - component: {fileID: 7547283622585160836}
+  - component: {fileID: 2674243094589550573}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_FabaoIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1644800439856113261
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5568597187285441230}
+  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: 1490485299211484798}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 38.1, y: -43.179}
+  m_SizeDelta: {x: 83, y: 83}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &7547283622585160836
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5568597187285441230}
+  m_CullTransparentMesh: 1
+--- !u!114 &2674243094589550573
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5568597187285441230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_s3501
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: d0066cb0ef604bbd9d9c5b581027eebb
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5757300355990343263
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 2
Assets/Scripts/GameUI/UI/SkillInfopanel.cs

@@ -31,7 +31,8 @@ namespace Fort23.Mono
         public void CustomInit(FaBaoInfo faBaoInfo)
         {
             Icon_BuffIcon.gameObject.SetActive(false);
-            Icon_SkillIcon.gameObject.SetActive(true);
+            Icon_SkillIcon.gameObject.SetActive(false);
+            Icon_FabaoIcon.gameObject.SetActive(true);
             Text_Name.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
             Text_Level.text = "等级:" + faBaoInfo.FaBaoData.level.ToString();
             Text_Tag.text = "法宝";
@@ -40,7 +41,7 @@ namespace Fort23.Mono
             Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
             Text_Power.gameObject.SetActive(true);
             StarRootGam.SetActive(false);
-            Icon_SkillIcon.icon_name = faBaoInfo.SkillConfig.icon;
+            Icon_FabaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
         }
 
         // public void CustomInit(SkillConfig skillConfig)
@@ -72,6 +73,7 @@ namespace Fort23.Mono
         {
             Icon_BuffIcon.gameObject.SetActive(false);
             Icon_SkillIcon.gameObject.SetActive(true);
+            Icon_FabaoIcon.gameObject.SetActive(false);
             Text_Name.text = LanguageManager.Instance.Text(skillInfo.skillConfig.name);
             Text_Level.text = "等级:" + skillInfo.SkillPowerupConfig.ID.ToString();
             Text_Tag.text = "功法";
@@ -99,6 +101,7 @@ namespace Fort23.Mono
         {
             Icon_BuffIcon.gameObject.SetActive(true);
             Icon_SkillIcon.gameObject.SetActive(false);
+            Icon_FabaoIcon.gameObject.SetActive(false);
             Text_Name.text = LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
             Text_Level.text = "层数:" +buffBasic.buffCount;
             Text_Tag.text = "buff";

+ 11 - 0
Assets/Scripts/GameUI/UI/SkillInfopanelData.cs

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