修改图集 修改bug

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.060239255
+    - _Alpha: 0.44737035
     - _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.106503345
+    - _Alpha: 0.14463997
     - _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.17842919
+    - _Alpha: 0.512872
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.23884106
+    - _MainTexOffsetU: -0.11778742
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/PlayerGuideConfig.json

@@ -1215,7 +1215,7 @@
         1002
       ],
       "AwardItemNum": [
-        2700
+        300
       ],
       "blackAlpha": 0.0,
       "Handle": 1,
@@ -1325,12 +1325,6 @@
       "SpeakerImage": 3,
       "desc": 10448,
       "Highlighting": 1,
-      "AwardItem": [
-        1002
-      ],
-      "AwardItemNum": [
-        2700
-      ],
       "blackAlpha": 0.0,
       "Handle": 1,
       "IsSkip": 0,

Assets/Res/Config/ReddotConfig.json

@@ -109,6 +109,13 @@
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
+    },
+    {
+      "ID": 15,
+      "GroupID": 15,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/DivineSence/DivineSenceLevelPreviewPanel.prefab

@@ -143,7 +143,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3019608, g: 0.4666667, b: 0.654902, a: 1}
+  m_Color: {r: 0.5764706, g: 0.6784314, b: 0.49411768, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -236,7 +236,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6901961, g: 0.41960788, b: 0.15686275, a: 1}
+  m_Color: {r: 0.82745105, g: 0.49803925, b: 0.2901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1748,7 +1748,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.48627454, g: 0.29411766, b: 0.63529414, a: 1}
+  m_Color: {r: 0.2901961, g: 0.57254905, b: 0.83921576, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2329,7 +2329,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7411765, g: 0.64705884, b: 0.3019608, a: 1}
+  m_Color: {r: 0.6039216, g: 0.29803923, b: 0.82745105, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2684,7 +2684,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.62352943, g: 0.25490198, b: 0.21960786, a: 1}
+  m_Color: {r: 0.82745105, g: 0.35686275, b: 0.2901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3382,7 +3382,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8313726, g: 0.7803922, b: 0.7137255, a: 1}
+  m_Color: {r: 0.7176471, g: 0.6862745, b: 0.6509804, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:
@@ -3782,7 +3782,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: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -123,6 +123,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6830660241309542230}
+  - {fileID: 6917986645319643930}
   m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
@@ -5352,7 +5353,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: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:
@@ -7801,6 +7802,116 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &4715737588898637566
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 6945085581065943726}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -18
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -18
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 15
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &6917986645319643930 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 4715737588898637566}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4810030704107047755
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/UseExpElixirPanel.prefab

@@ -560,7 +560,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: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 2670}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3563408254755769735
 MonoBehaviour:

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -2197,6 +2197,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2854060935180710084, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Text
+      value: "\u751F\u547D\u751F\u547D"
+      objectReference: {fileID: 0}
     - target: {fileID: 2854060935180710084, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_Color.b
       value: 0.6509804
@@ -2319,7 +2323,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5850466370090942673, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 129.6158
+      value: 160.073
       objectReference: {fileID: 0}
     - target: {fileID: 5850466370090942673, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2327,7 +2331,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5850466370090942673, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16.4
+      value: 3.899994
       objectReference: {fileID: 0}
     - target: {fileID: 5850466370090942673, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2335,7 +2339,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7394528043978614730, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 96.4396
+      value: 160.9374
       objectReference: {fileID: 0}
     - target: {fileID: 7394528043978614730, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2343,7 +2347,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7394528043978614730, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 229
+      value: 154.20062
       objectReference: {fileID: 0}
     - target: {fileID: 7394528043978614730, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2351,7 +2355,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7937119318591600940, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_Text
-      value: 820
+      value: "8200.44\u4E07"
       objectReference: {fileID: 0}
     - target: {fileID: 7937119318591600940, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_Color.b
@@ -2369,6 +2373,10 @@ PrefabInstance:
       propertyPath: m_FontData.m_FontSize
       value: 34
       objectReference: {fileID: 0}
+    - target: {fileID: 7937119318591600940, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UIAtlas/battle.spriteatlasv2.meta

@@ -20,8 +20,8 @@ SpriteAtlasImporter:
     padding: 4
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
+    enableRotation: 0
+    enableTightPacking: 0
     enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1

Assets/Res/UIAtlas/bufficon.spriteatlasv2.meta

@@ -20,8 +20,8 @@ SpriteAtlasImporter:
     padding: 4
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
+    enableRotation: 0
+    enableTightPacking: 0
     enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -273,6 +273,27 @@ namespace Fort23.Mono
                             break;
                     }
 
+                    break;
+                case 15: //丹药小红点
+                    isEnable = false;
+                    switch (EnableId) //具体出现条件
+                    {
+                        case 0: //没有自己的红点逻辑根据下层红点来决定
+                            isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
+                            break;
+                        case 1:
+                            foreach (var keyValuePair in PlayerManager.Instance.BagController.allBagDic)
+                            {
+                                if (keyValuePair.Value.config.itemTag == 5 && keyValuePair.Value.count.Value > 0)
+                                {
+                                    isEnable = true;
+                                    return;
+                                }
+                            }
+
+                            break;
+                    }
+
                     break;
             }
         }

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

@@ -143,13 +143,13 @@ namespace Fort23.Mono
                 PlayerManager.Instance.myHero.defense.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
-            heroAttributeWidget =
-                await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
-                    Content, isInstance: true);
-            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10715, new HeroAttributeData("攻击速度", "",
-                PlayerManager.Instance.myHero.attSpeed.Value.ToString()));
-            HeroAttributeWidgets.Add(heroAttributeWidget);
+            // heroAttributeWidget =
+            //     await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
+            //         Content, isInstance: true);
+            // heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            // heroAttributeWidget.CustomInit1(10715, new HeroAttributeData("攻击速度", "",
+            //     PlayerManager.Instance.myHero.attSpeed.Value.ToString()));
+            // HeroAttributeWidgets.Add(heroAttributeWidget);
 
 
             heroAttributeWidget =

Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs

@@ -42,10 +42,11 @@ namespace Fort23.Mono
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
                 for (var i = 0; i < _towerInfoConfig.reward.Length; i++)
                 {
-                    ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[i], 1);
+                    ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[i], _towerInfoConfig.rewardCount[i]);
+                    PlayerManager.Instance.BagController.AddItem(itemInfo);
                     itemInfos.Add(itemInfo);
                 }
-             
+
                 towerLevelData.reward = true;
                 AccountFileInfo.Instance.SavePlayerData();
                 RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
@@ -70,7 +71,7 @@ namespace Fort23.Mono
 
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_towerInfoConfig.reward[0]);
             Icon_Item.icon_name = itemConfig.icon;
-            Text_Num.text = "1";
+            Text_Num.text = _towerInfoConfig.rewardCount[0].ToString();
             GetWard.transform.RecoverColor();
             //上一层已经通关
             if ((lastTowerLevelData != null && lastTowerLevelData.finish)
@@ -89,7 +90,6 @@ namespace Fort23.Mono
                         fx_ui_jiangli_loop.gameObject.SetActive(true);
                         fx_ui_jiangli_loop.Play();
                         GetWard.transform.RecoverColor();
-                      
                     }
                     //领了奖励
                     else if (towerLevelData != null && towerLevelData.reward)