lzx 1 dag sedan
förälder
incheckning
2e0070a8b6

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.9587611
+    - _Alpha: 0.7612489
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.82985586
+    - _Alpha: 0.24045788
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.2834084
+    - _Alpha: 0.23318517
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.11669123
+    - _MainTexOffsetU: 0.17292964
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

+ 4 - 4
Assets/Res/UI/BattleSettlementPanel.prefab

@@ -181,7 +181,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 4477774830012043257}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1
@@ -449,7 +449,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &9138207573109554942
 RectTransform:
   m_ObjectHideFlags: 0
@@ -631,7 +631,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 25}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &4603564870567916663
 MonoBehaviour:
@@ -651,7 +651,7 @@ MonoBehaviour:
     m_Top: 25
     m_Bottom: 0
   m_ChildAlignment: 1
-  m_Spacing: 0
+  m_Spacing: 12.86
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0

+ 2 - 2
Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -77,7 +77,7 @@ namespace Fort23.Mono
                     {
                         SkipToWidget skipToWidget1 =
                             await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null,
-                                SkipToContent);
+                                SkipToContent,isInstance:true);
                         skipToWidget1.CustonInit(3);
                         skipToWidgets.Add(skipToWidget1);
                         skipToWidget1.OnClick = OnClick;
@@ -85,7 +85,7 @@ namespace Fort23.Mono
 
                     SkipToWidget skipToWidget =
                         await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null,
-                            SkipToContent);
+                            SkipToContent,isInstance:true);
                     skipToWidget.CustonInit(1);
                     skipToWidgets.Add(skipToWidget);
                     skipToWidget.OnClick = OnClick;

+ 2 - 2
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -139,7 +139,7 @@ namespace Fort23.Mono
                 {
                     return;
                 }
-                if (PlayerManager.Instance.BagController.DeductItem(daoyouGiftConfig.ItemID, count))
+                if (!PlayerManager.Instance.BagController.DeductItem(daoyouGiftConfig.ItemID, count))
                 {
                     TipMessagePanel.OpenTipMessagePanel(10324);
                     return;
@@ -207,7 +207,7 @@ namespace Fort23.Mono
                     }
 
                     //TODO 消耗:送礼给道友
-                    PlayerManager.Instance.BagController.DeductItem(widgetItem1.itemInfo.itemID, count);
+                    // PlayerManager.Instance.BagController.DeductItem(widgetItem1.itemInfo.itemID, count);
                     daoYouData.emotionValue += widgetItem1.itemInfo.config.associateVlaue[0];
 
                     int emotionId = 4 - (int)(daoYouData.emotionValue / (100 / (float)3));