修改小红点

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
+    - _Alpha: 0.47361833
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

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
+    - _Alpha: 0.17283696
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

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.20844805
+    - _Alpha: 0.2834084
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20198262
+    - _MainTexOffsetU: 0.11669123
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/LanguageChineseConfig.json

@@ -40334,11 +40334,11 @@
     },
     {
       "ID": 10824,
-      "txt": "0"
+      "txt": "通过剧情章节{0}获得"
     },
     {
       "ID": 10825,
-      "txt": "0"
+      "txt": "逍遥游"
     },
     {
       "ID": 10826,

Assets/Res/UI/SentimentPanel/SentimentEffectWidget.prefab

@@ -10,15 +10,14 @@ GameObject:
   m_Component:
   - component: {fileID: 5128332994992752120}
   - component: {fileID: 7251623595138651149}
-  - component: {fileID: 3305285200198918566}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: xuanzhong
+  m_Name: xuanzhongroot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5128332994992752120
 RectTransform:
   m_ObjectHideFlags: 0
@@ -46,49 +45,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1264848316944022062}
   m_CullTransparentMesh: 1
---- !u!114 &3305285200198918566
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1264848316944022062}
-  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: 0.29207748, g: 1, b: 0.23113197, 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: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_yuanquan2
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 236
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &2046892425832779656
 GameObject:
   m_ObjectHideFlags: 0
@@ -338,6 +294,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: xuanzhongroot
+    gameObject: {fileID: 5128332994992752120}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5573784481617384691
 GameObject:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -1459,6 +1459,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6529229226112788195
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1620555677830961077}
+  - component: {fileID: 3613402913418895447}
+  - component: {fileID: 6973364679216323432}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: xuanzhong
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1620555677830961077
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529229226112788195}
+  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: 9037135992368401232}
+  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: -500, y: 515}
+  m_SizeDelta: {x: 130, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3613402913418895447
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529229226112788195}
+  m_CullTransparentMesh: 1
+--- !u!114 &6973364679216323432
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529229226112788195}
+  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: 0.29207748, g: 1, b: 0.23113197, 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: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_yuanquan2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 236
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6901206084516032637
 GameObject:
   m_ObjectHideFlags: 0
@@ -2297,6 +2386,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1620555677830961077}
   - {fileID: 8245128900902318849}
   - {fileID: 4014844787387584513}
   - {fileID: 523803205534896214}
@@ -2454,6 +2544,14 @@ MonoBehaviour:
     - gameObject: {fileID: 4730272705645730995}
     - gameObject: {fileID: 5901101323936336534}
     - gameObject: {fileID: 6685742129767991100}
+  - key: xuanzhong
+    gameObject: {fileID: 6973364679216323432}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 4730272705645730995}
+    - gameObject: {fileID: 5901101323936336534}
+    - gameObject: {fileID: 6685742129767991100}
   isAssetBundle: 1
 --- !u!1001 &6883880457042837264
 PrefabInstance:
@@ -2700,7 +2798,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 77
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -152,12 +152,10 @@ namespace Fort23.Mono
                             break;
                         case 1:
 
-                            int currentMiao =
-                                (int)((PlayerManager.Instance.myHero.GetAllExp()) /
-                                      1000);
 
-                            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-                            if (PlayerManager.Instance.myHero.heroData.exp + allexp <
+                            float allexp = PlayerManager.Instance.myHero.GetAllExp();
+
+                            if (allexp <
                                 PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
                             {
                                 isEnable = false;
@@ -195,13 +193,16 @@ namespace Fort23.Mono
                                         }
                                     }
 
-                                    //当前升级已经查看了也不显示红点
-                                    if (redDot != null &&
-                                        redDot.Params.Contains(
-                                            PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                                    if (PlayerManager.Instance.myHero.powerUpConfig.ID > 60)
                                     {
-                                        isEnable = false;
-                                        return;
+                                        //当前升级已经查看了也不显示红点
+                                        if (redDot != null &&
+                                            redDot.Params.Contains(
+                                                PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                                        {
+                                            isEnable = false;
+                                            return;
+                                        }
                                     }
                                 }
                             }
@@ -220,12 +221,16 @@ namespace Fort23.Mono
                                     }
                                 }
 
-                                //当前升级已经查看了也不显示红点
-                                if (redDot != null &&
-                                    redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                                if (PlayerManager.Instance.myHero.powerUpConfig.ID > 60)
                                 {
-                                    isEnable = false;
-                                    return;
+                                    //当前升级已经查看了也不显示红点
+                                    if (redDot != null &&
+                                        redDot.Params.Contains(
+                                            PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                                    {
+                                        isEnable = false;
+                                        return;
+                                    }
                                 }
                             }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -292,11 +292,14 @@ namespace Fort23.Mono
                             }
                         }
 
-                        if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
-                        {
-                            redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
-                            RedDotManager.Instance.AddRedDot(redDot);
-                        }
+                       
+                            if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                            {
+                                redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                                RedDotManager.Instance.AddRedDot(redDot);
+                            }
+                        
+                    
                     }
                 }
                 else
@@ -312,11 +315,15 @@ namespace Fort23.Mono
                         }
                     }
 
-                    if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
-                    {
-                        redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
-                        RedDotManager.Instance.AddRedDot(redDot);
-                    }
+                   
+                        if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                        {
+                            redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                            RedDotManager.Instance.AddRedDot(redDot);
+                        }
+                    
+
+                  
                 }
 
 

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

@@ -221,7 +221,7 @@ namespace Fort23.Mono
                 HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>();
                 foreach (var heroPowerUpConfig in heroPowerUpConfigs)
                 {
-                    if (heroPowerUpConfig.MaxFabaoNum > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum)
+                    if (heroPowerUpConfig.MaxFabaoNum > btnFaBaoWidget.index)
                     {
                         TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10331,
                             LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidgetData.cs

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

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -5,6 +5,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using UnityEngine;
 using UnityEngine.UI;
 using Utility;
 
@@ -123,7 +124,16 @@ namespace Fort23.Mono
                 if (!PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId,
                         sentimentEffectConfig.upConstCount))
                 {
-                    ItemSourcePanel.OpenPanel(sentimentEffectConfig.upConstItemId);
+                    if (sentimentEffectConfig.upConstItemId == 22001)
+                    {
+                        string tips = LanguageManager.Instance.Text(10824, LanguageManager.Instance.Text(10825));
+                        TipMessagePanel.OpenTipMessagePanel(tips);
+                    }
+                    else
+                    {
+                        ItemSourcePanel.OpenPanel(sentimentEffectConfig.upConstItemId);
+                    }
+
                     AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
@@ -242,7 +252,8 @@ namespace Fort23.Mono
                 int conFigId = sentimentEffectWidget.sentimentProperty.groupId * 10 + level;
                 var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
                 SentimentEffectWidget sentimentEffectWidget1 = null;
-                if (sentimentEffectConfig.lastSentimentEffectId == mainSentimentEffectWidget.sentimentEffectConfig.groupId)
+                if (sentimentEffectConfig.lastSentimentEffectId ==
+                    mainSentimentEffectWidget.sentimentEffectConfig.groupId)
                 {
                     sentimentEffectWidget1 = mainSentimentEffectWidget;
                 }
@@ -256,8 +267,6 @@ namespace Fort23.Mono
                 {
                     sentimentEffectWidget.CreatXian(XianRoot, sentimentEffectWidget1);
                 }
-
-              
             }
         }
 
@@ -311,7 +320,10 @@ namespace Fort23.Mono
             curretnSentimentProperty = sentimentEffectWidget.sentimentProperty;
 
             Text_EffectName.text = LanguageManager.Instance.Text(sentimentEffectWidget.sentimentEffectConfig.name);
-
+            xuanzhong.transform.SetParent(sentimentEffectWidget.xuanzhongroot);
+            xuanzhong.transform.localPosition = Vector3.zero;
+            xuanzhong.transform.localScale = Vector3.one;
+            xuanzhong.gameObject.SetActive(true);
 
             UpdateUi();
         }
@@ -334,6 +346,10 @@ namespace Fort23.Mono
             curretnSentimentProperty = null;
             // UIManager.Instance.DormancyGComponent(energyWidget);
             // energyWidget = null;
+            
+            xuanzhong.transform.SetParent(transform);
+            // xuanzhong.transform.localPosition = Vector3.zero;
+            xuanzhong.gameObject.SetActive(false);
 
             await base.Close();
         }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs

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