修改ui

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 19.70581}
+  m_AnchoredPosition: {x: 0, y: 18}
   m_SizeDelta: {x: 0, y: -39.4115}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2840349042557368767
@@ -69,10 +69,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -473,14 +473,14 @@ RectTransform:
   m_GameObject: {fileID: 1213606337501340908}
   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_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1723988732018600186}
   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: -0.00086117, y: -19.368}
+  m_AnchoredPosition: {x: -0.00086117, y: -14}
   m_SizeDelta: {x: 0, y: 39.411}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1665665082766802650
@@ -1599,8 +1599,8 @@ 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: 96.5, y: -518.2}
-  m_SizeDelta: {x: 543.1503, y: 100}
+  m_AnchoredPosition: {x: 0.0019042, y: -518.2}
+  m_SizeDelta: {x: 750, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6922482407468544096
 CanvasRenderer:
@@ -2314,8 +2314,8 @@ 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: 132.5, y: -3.2299805}
-  m_SizeDelta: {x: 253, y: 80}
+  m_AnchoredPosition: {x: 103.21329, y: -3.2299805}
+  m_SizeDelta: {x: 439.9846, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390928313110045558
 CanvasRenderer:
@@ -2346,7 +2346,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3114,7 +3114,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 78.1464
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4345,10 +4345,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 3
     m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -4883,6 +4883,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 8626833803530248980}
   - {fileID: 317265118546245604}
   - {fileID: 4212652325341776174}
   - {fileID: 3478042439320372479}
@@ -5049,6 +5050,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: ItemWidgetType1Game
+    gameObject: {fileID: 1741321682879132432}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9056821549282551153
 GameObject:
@@ -5087,8 +5093,8 @@ 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: -126, y: -3.2299805}
-  m_SizeDelta: {x: 253, y: 80}
+  m_AnchoredPosition: {x: -258, y: -3.2299805}
+  m_SizeDelta: {x: 175.7003, y: 55.5574}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5534412852682778287
 CanvasRenderer:
@@ -5282,3 +5288,213 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1001 &2495980306006119692
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 9037135992368401232}
+    m_Modifications:
+    - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Name
+      value: ItemWidgetType1Game
+      objectReference: {fileID: 0}
+    - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Text
+      value: 1/2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.b
+      value: 0.9372549
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.g
+      value: 0.98039216
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.r
+      value: 0.96862745
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_Font
+      value: 
+      objectReference: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 72.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 46.6854
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 259.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -1592.0764
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 30.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 30.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -23.3427
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 42
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 67.6526
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 51.3319
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -23.3427
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3821607290282984346, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4820721191068096122}
+  m_SourcePrefab: {fileID: 100100000, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+--- !u!1 &1705337346385368726 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3821607290282984346, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 2495980306006119692}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4820721191068096122
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1705337346385368726}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.20392157, g: 0.3764706, b: 0.32941177, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &1741321682879132432 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 2495980306006119692}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &8626833803530248980 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 2495980306006119692}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -3905,6 +3905,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6694772361877173011}
     m_Modifications:
+    - target: {fileID: 1497465469377369551, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: imageH
+      value: 30.308811
+      objectReference: {fileID: 0}
     - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_Name
       value: ItemWidgetType1
@@ -4143,6 +4147,30 @@ PrefabInstance:
       propertyPath: imageH
       value: 80
       objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 66
+      objectReference: {fileID: 0}
+    - target: {fileID: 1428057306796271496, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.5471
+      objectReference: {fileID: 0}
+    - target: {fileID: 2289986991244638643, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -329,9 +329,10 @@ namespace Fort23.Mono
             BtnChangeRoot.SetActive(true);
             currentFaBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[selectIndex];
             selectedFaBaoInfo = currentFaBaoInfo;
-            UpdateCurrentFaBaoWidget();
+           
             UpdateUI(selectedFaBaoInfo);
             UpadaFabaoBag();
+            await UpdateCurrentFaBaoWidget();
             
             if(currentFaBaoWidget != null)
                 SetSelectIcon(currentFaBaoWidget.SelectRoot);
@@ -364,16 +365,18 @@ namespace Fort23.Mono
 
                 if (faBaoInfo.FaBaoData.useIndex != -1)
                 {
-                    Btn_Change.transform.Gray(true);
+                    Btn_Change.gameObject.SetActive(false);
+                    // Btn_Change.transform.Gray(true);
                 }
                 else
                 {
-                    Btn_Change.transform.RecoverColor();
+                    Btn_Change.gameObject.SetActive(true);
+                    // Btn_Change.transform.RecoverColor();
                 }
 
 
                 Btn_PeiYang.gameObject.SetActive(true);
-                Btn_Change.gameObject.SetActive(true);
+                //Btn_Change.gameObject.SetActive(true);
                 await UpdateFaBaoUI(faBaoInfo);
             }
             else
@@ -466,7 +469,7 @@ namespace Fort23.Mono
             itemWidgetType1s.Clear();
             for (var i = 0; i < faBaoInfo.FabaoPowerupConfig.PowerupItemIDs.Length; i++)
             {
-                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
+                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game,null, ItemRoot);
                 itemWidgetType1.CustomInit(faBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i], faBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }
@@ -474,7 +477,7 @@ namespace Fort23.Mono
             //大突破需要消耗对应的法宝碎片
             if (faBaoInfo.FabaoPowerupConfig.PromotePieceNum != null && faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0] != -1)
             {
-                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponent<ItemWidgetType1>(null, ItemRoot);
+                ItemWidgetType1 itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Game,null, ItemRoot);
                 itemWidgetType1.CustomInit(faBaoInfo.FabaoConfig.ItemID, faBaoInfo.FabaoPowerupConfig.PromotePieceNum[0]);
                 itemWidgetType1s.Add(itemWidgetType1);
             }

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanelData.cs

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