Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/Scripts/GameUI/UI/MainUIPanel.cs   resolved by master version

Assets/Res/Config/DropGroupConfig.json

@@ -23,7 +23,7 @@
     },
     {
       "ID": 40001,
-      "dropRate": 10,
+      "dropRate": 70,
       "dropItemID": [
         40001,
         40002,
@@ -237,7 +237,7 @@
     },
     {
       "ID": 41013,
-      "dropRate": 300,
+      "dropRate": 237,
       "dropItemID": [
         41001
       ]
@@ -258,7 +258,7 @@
     },
     {
       "ID": 41016,
-      "dropRate": 37,
+      "dropRate": 100,
       "dropItemID": [
         41004
       ]

Assets/Res/Config/ItemConfig.json

@@ -2,8 +2,8 @@
   "configList": [
     {
       "ID": 1001,
-      "itemName": 1001,
-      "itemDesc": 10011,
+      "itemName": 169,
+      "itemDesc": 162,
       "icon": "icon_item_1001",
       "itemTyp": 1,
       "quality": 3,
@@ -25,8 +25,8 @@
     },
     {
       "ID": 1002,
-      "itemName": 1002,
-      "itemDesc": 10021,
+      "itemName": 170,
+      "itemDesc": 163,
       "icon": "icon_item_1002",
       "itemTyp": 1,
       "quality": 4,
@@ -48,8 +48,8 @@
     },
     {
       "ID": 1003,
-      "itemName": 1003,
-      "itemDesc": 10031,
+      "itemName": 171,
+      "itemDesc": 164,
       "icon": "",
       "itemTyp": 1,
       "quality": 1,
@@ -66,7 +66,7 @@
     {
       "ID": 1004,
       "itemName": 5,
-      "itemDesc": 10041,
+      "itemDesc": 165,
       "icon": "icon_tx105",
       "itemTyp": 5,
       "quality": 8,
@@ -83,7 +83,7 @@
     {
       "ID": 1005,
       "itemName": 6,
-      "itemDesc": 10051,
+      "itemDesc": 166,
       "icon": "icon_tx107",
       "itemTyp": 5,
       "quality": 8,
@@ -100,7 +100,7 @@
     {
       "ID": 1006,
       "itemName": 13,
-      "itemDesc": 10061,
+      "itemDesc": 167,
       "icon": "icon_tx113",
       "itemTyp": 5,
       "quality": 8,
@@ -117,7 +117,7 @@
     {
       "ID": 1007,
       "itemName": 16,
-      "itemDesc": 10071,
+      "itemDesc": 168,
       "icon": "icon_tx116",
       "itemTyp": 5,
       "quality": 8,
@@ -134,7 +134,7 @@
     {
       "ID": 1008,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 169,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -155,7 +155,7 @@
     {
       "ID": 1009,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 170,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -176,7 +176,7 @@
     {
       "ID": 1010,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 171,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -197,7 +197,7 @@
     {
       "ID": 1011,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 172,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -218,7 +218,7 @@
     {
       "ID": 1012,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 173,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -239,7 +239,7 @@
     {
       "ID": 1013,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 174,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -260,7 +260,7 @@
     {
       "ID": 1014,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 175,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -281,7 +281,7 @@
     {
       "ID": 1015,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 176,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -302,7 +302,7 @@
     {
       "ID": 1016,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 177,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -323,7 +323,7 @@
     {
       "ID": 1017,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 178,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -344,7 +344,7 @@
     {
       "ID": 1018,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 179,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -365,7 +365,7 @@
     {
       "ID": 1019,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 180,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -386,7 +386,7 @@
     {
       "ID": 1020,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 181,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -407,7 +407,7 @@
     {
       "ID": 1021,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 182,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -428,7 +428,7 @@
     {
       "ID": 1022,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 183,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -449,7 +449,7 @@
     {
       "ID": 1023,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 184,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -470,7 +470,7 @@
     {
       "ID": 1024,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 185,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -491,7 +491,7 @@
     {
       "ID": 1025,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 186,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -512,7 +512,7 @@
     {
       "ID": 1026,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 187,
       "icon": "",
       "itemTyp": 4,
       "quality": null,
@@ -533,7 +533,7 @@
     {
       "ID": 1027,
       "itemName": null,
-      "itemDesc": null,
+      "itemDesc": 188,
       "icon": "",
       "itemTyp": 4,
       "quality": null,

Assets/Res/Config/LanguageChineseConfig.json

@@ -639,6 +639,50 @@
     {
       "ID": 160,
       "txt": "項鏈"
+    },
+    {
+      "ID": 161,
+      "txt": "{0}級"
+    },
+    {
+      "ID": 162,
+      "txt": "金幣，可用於開寶箱"
+    },
+    {
+      "ID": 163,
+      "txt": "鑽石，後續開放（敬請期待）"
+    },
+    {
+      "ID": 164,
+      "txt": "經驗，用於英雄升級"
+    },
+    {
+      "ID": 165,
+      "txt": "英雄碎片，用於提升星級"
+    },
+    {
+      "ID": 166,
+      "txt": "英雄碎片，用於提升星級"
+    },
+    {
+      "ID": 167,
+      "txt": "英雄碎片，用於提升星級"
+    },
+    {
+      "ID": 168,
+      "txt": "英雄碎片，用於提升星級"
+    },
+    {
+      "ID": 169,
+      "txt": "金幣"
+    },
+    {
+      "ID": 170,
+      "txt": "鑽石"
+    },
+    {
+      "ID": 171,
+      "txt": "英雄經驗"
     }
   ]
 }

Assets/Scenes/testCombat.scene

@@ -276,7 +276,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
-  LoadType: 1
+  LoadType: 0
   h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
   isOpenHotFix: 0
   isLoadDll: 0

Assets/Scripts/GameLogic/Combat/CombatEvent/Combat_EquipFallEventData.cs

@@ -7,5 +7,6 @@ namespace Common.Utility.CombatEvent
     {
         public string[] fallEquip;
         public Vector3 startPos_WorldPos;
+        public float waitTime;
     }
 }

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -98,7 +98,7 @@ namespace GameLogic.Combat.CombatType
         /// <summary>
         /// 掉落逻辑放这里
         /// </summary>
-        private void EntityDropLogic(CombatHeroEntity combatHeroEntity)
+        private void EntityDropLogic(CombatHeroEntity combatHeroEntity, float waitTime= 2f)
         {
             // return;
             List<ItemInfo> equipmentList =
@@ -120,12 +120,13 @@ namespace GameLogic.Combat.CombatType
 
             combatEquipFallEventData.fallEquip = allEquip.ToArray();
             combatEquipFallEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
+            combatEquipFallEventData.waitTime = waitTime;
             EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, combatEquipFallEventData);
         }
 
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
         {
-            if (harmReturnInfo==null||harmReturnInfo.harmType == HarmType.SystemKo)
+            if (harmReturnInfo==null || harmReturnInfo.harmType == HarmType.SystemKo)
             {
                 return;
             }
@@ -139,7 +140,11 @@ namespace GameLogic.Combat.CombatType
                 }
                 else if (combatHeroEntity.CurrCombatHeroInfo.heroType == 4) ///boss死了
                 {
-                    EntityDropLogic(combatHeroEntity);
+                    for (int i = 0; i < 5; i++)
+                    {
+                        EntityDropLogic(combatHeroEntity, 0.8f);
+                    }
+                    
                     BossKo(combatHeroEntity);
                 }
             }

Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -158,6 +158,8 @@ namespace GameLogic.Equipment
             return info;
         }
 
+
+        public bool atLeastOneBetterEq = false;
         /// <summary>
         /// 是否有更好的装备
         /// </summary>
@@ -169,15 +171,32 @@ namespace GameLogic.Equipment
             {
                 UpdateAllBestEqs();
             }
+
+            atLeastOneBetterEq = false;
+
+            int count = 0;
             
             foreach (KeyValuePair<int,Dictionary<int,ItemInfo>> keyValuePair in allBestEqDic)
             {
                 int zy = keyValuePair.Key;
                 Dictionary<int, ItemInfo> bwDic = keyValuePair.Value;
-                if (bwDic.Count > 0)
-                {
-                    return true;
-                }
+                count += bwDic.Count;
+                // if (bwDic.Count > 0)
+                // {
+                //     // return true;
+                //     count++;
+                // }
+            }
+
+            if (count >= 1)
+            {
+                atLeastOneBetterEq = true;
+            }
+            
+            //有2个以上的职业，有更好准备是再显示最外层的小红点.
+            if (count > 3)
+            {
+                return true;
             }
 
             return false;

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -67,7 +67,7 @@ namespace GameLogic.Player
             List<ItemInfo> equipmentList = new List<ItemInfo>();
             ItemInfo itemInfo = null;
 
-            if (monsterType == 1)
+            if (monsterType == 2)
             {
                 for (int i = 0; i < levelBattleConfig.miniMonsterItem.Length; i++)
                 {
@@ -75,7 +75,7 @@ namespace GameLogic.Player
                     i += 2;
                 }
             }
-            else if (monsterType == 2)
+            else if (monsterType == 3)
             {
                 for (int i = 0; i < levelBattleConfig.eliteMonsterItem.Length; i++)
                 {
@@ -84,7 +84,7 @@ namespace GameLogic.Player
                 }
                
             }
-            else if (monsterType == 3)
+            else if (monsterType == 4)
             {
                 for (int i = 0; i < levelBattleConfig.bossItem.Length; i++)
                 {

Assets/Scripts/GameUI/Combat/CombatEquipFallManager.cs

@@ -26,11 +26,13 @@ namespace GameLogic.CombatScenesTool
             private int stateIndex;
             private float _addTime;
             public EquipFallObjectMono EquipFallObjectMono;
+            public float waitTime;
 
-            public void Init(GameObjectPool GameObjectPool, Parabola3DPath Parabola3DPath)
+            public void Init(GameObjectPool GameObjectPool, Parabola3DPath Parabola3DPath, float waitTime = 2f)
             {
                 this.GameObjectPool = GameObjectPool;
                 this.Parabola3DPath = Parabola3DPath;
+                this.waitTime = waitTime;
                 _addTime = 1.0f / Parabola3DPath.totalFlightTime;
                 EquipFallObjectMono = GameObjectPool.own.GetComponent<EquipFallObjectMono>();
                 EquipFallObjectMono.idleObject.SetActive(false);
@@ -71,7 +73,7 @@ namespace GameLogic.CombatScenesTool
                 else if (stateIndex == 1)
                 {
                     _currTime += t;
-                    if (_currTime > 2)
+                    if (_currTime > waitTime)
                     {
                         stateIndex = 2;
                         _currTime = 0;
@@ -88,7 +90,7 @@ namespace GameLogic.CombatScenesTool
                     float d = Vector3.SqrMagnitude(position - pos);
                     float addTime = 1.0f / (d / 64);
                     position = Vector3.Lerp(position,
-                        pos, addTime * t);
+                        pos, addTime * t * 3f);
                     GameObjectPool.own.transform.position = position;
                     if (d < 0.3f)
                     {
@@ -134,7 +136,7 @@ namespace GameLogic.CombatScenesTool
             }
             
             Combat_EquipFallEventData combatEquipFallEventData = ievetEquia as Combat_EquipFallEventData;
-            Fall(combatEquipFallEventData.fallEquip, combatEquipFallEventData.startPos_WorldPos);
+            Fall(combatEquipFallEventData.fallEquip, combatEquipFallEventData.startPos_WorldPos, combatEquipFallEventData.waitTime);
         }
 
         public override void Dispose()
@@ -143,7 +145,7 @@ namespace GameLogic.CombatScenesTool
             EventManager.Instance.RemoveEventListener(CustomEventType.Combat_EquipFall, Combat_EquipFall);
         }
 
-        public void Fall(string[] allEquip, Vector3 worldPos)
+        public void Fall(string[] allEquip, Vector3 worldPos, float waitTime = 2f)
         {
             if (allEquip == null)
             {
@@ -179,7 +181,7 @@ namespace GameLogic.CombatScenesTool
                     }
 
                     // equipFallObject.Parabola3DPath = parabolaPath;
-                    equipFallObject.Init(pool, parabolaPath);
+                    equipFallObject.Init(pool, parabolaPath, waitTime);
                     allEquipFall.Add(equipFallObject);
                 });
             }

Assets/Scripts/GameUI/UI/Hero/HeroBagPanel.cs

@@ -57,7 +57,7 @@ namespace Fort23.Mono
 
         private void CheckAlterRed(IEventData e = null)
         {
-            if (PlayerManager.Instance.eqController.IsBetterEqs(false))
+            if (PlayerManager.Instance.eqController.atLeastOneBetterEq)
             {
                 AlerRed.SetActive(true);
             }

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -507,7 +507,12 @@ namespace Fort23.Mono
             animateNumberList.Add(animTxtAtk);
             animateNumberList.Add(animTxtDef);
             animateNumberList.Add(animTxtShanBi);
-            
+
+            curHp = 0;
+            curAtk = 0;
+            curDef = 0;
+            curShanBi = 0;
+
             UpdateAttributeUI(true);
         }
 
@@ -515,17 +520,19 @@ namespace Fort23.Mono
         
         private long curHeroCount;
         private long costHeroCount;
+        
+        private long curHp, curAtk, curDef, curShanBi;
         public async void UpdateAttributeUI(bool isInit = false)
         {
             StarsObj.SetActive(true);
             
-            PlayEft(isInit, txtHP, heroInfo.hp.Value.ToStringEx(), 0);
+            PlayEft(isInit, txtHP, ref curHp, heroInfo.hp.Value, 0);
             
-            PlayEft(isInit, txtATK, heroInfo.attack.Value.ToStringEx(), 1);
+            PlayEft(isInit, txtATK, ref curAtk, heroInfo.attack.Value, 1);
          
-            PlayEft(isInit, txtDEF, heroInfo.defense.Value.ToStringEx(), 2);
+            PlayEft(isInit, txtDEF, ref curDef, heroInfo.defense.Value, 2);
 
-            PlayEft(isInit, txtSHANBI, heroInfo.shanbi.Value.ToStringEx(), 3);
+            PlayEft(isInit, txtSHANBI, ref curShanBi, heroInfo.shanbi.Value, 3);
 
             txtLv.text = heroInfo.level.Value.ToStringEx();
             txtExpGain.text = heroInfo.expGain.Value.ToStringEx();
@@ -599,22 +606,24 @@ namespace Fort23.Mono
         /// </summary>
         /// <param name="isInit">是否为首次(初始), 首次不做动画处理</param>
         /// <param name="txtOld">当前(旧的)</param>
-        /// <param name="txtNew"></param>
+        /// <param name="newValue"></param>
         /// <param name="eftRoot"></param>
-        private async void PlayEft(bool isInit, TextMeshProUGUI txtOld, string txtNew, int idx)
+        private void PlayEft(bool isInit, TextMeshProUGUI txtOld, ref long curValue, long newValue, int idx)
         {
-            if (txtOld.text != txtNew)
+            if (curValue != newValue)
             {
-                long old = long.Parse(txtOld.text);
-                long newV = long.Parse(txtNew);
-                txtOld.text = txtNew;
+                // long old = long.Parse(txtOld.text);
+                // long newV = long.Parse(newValue);
+                long tmpValue = curValue;
+                curValue = newValue;
+                txtOld.text = newValue.ToStringEx();
                 if (!isInit)
                 {
-                    animateNumberList[idx].Start(old, newV);
+                    animateNumberList[idx].Start(tmpValue, newValue);
                     
-                    await UIManager.Instance.CreateGComponent(delegate(HeroUpTxtEft heroUpTxtEft)
+                    UIManager.Instance.CreateGComponent(delegate(HeroUpTxtEft heroUpTxtEft)
                         {
-                            heroUpTxtEft.txtEft.text = "+" + (newV - old).ToStringEx();
+                            heroUpTxtEft.txtEft.text = "+" + (newValue - tmpValue).ToStringEx();
                         }, 
                         poolName: "HeroUpTxtEft", root: eftNumPos[idx] as RectTransform);
                 }

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -219,7 +219,7 @@ namespace Fort23.Mono
             for (int i = 1; i < 10; i++)
             {
                 HeroPowerUpConfig powerUpConfig =
-                    ConfigComponent.Instance.Get<HeroPowerUpConfig>(heroInfo.promoteConfig.ID + i);
+                    ConfigComponent.Instance.Get<HeroPowerUpConfig>(heroInfo.powerUpConfig.ID + i);
                 
                 totalExp += powerUpConfig.levelUpExp;
             }

Assets/Scripts/GameUI/UI/Hero/ItemPanel.cs

@@ -61,6 +61,7 @@ namespace Fort23.Mono
 			if (itemInfo.eqInfo != null)
 			{
 				txtlName.text = LanguageManager.Instance.Text(itemInfo.eqInfo.basicEquipConfig.eqName);
+				zyIcon.gameObject.SetActive(true);
 				zyIcon.icon_name = HeroUITools.GetZyIcon(itemInfo.eqInfo.basicEquipConfig.profession);
 
 				
@@ -75,6 +76,7 @@ namespace Fort23.Mono
 			}
 			else
 			{
+				zyIcon.gameObject.SetActive(false);
 				txtlName.text = LanguageManager.Instance.Text(itemInfo.config.itemName);
 				desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc);
 			}

Assets/Scripts/GameUI/UI/Items/WidgetItem.cs

@@ -1,4 +1,5 @@
 using System;
+using Core.Language;
 using GameLogic.Bag;
 using GameLogic.Equipment;
 using UnityEngine;
@@ -62,11 +63,22 @@ namespace Fort23.Mono
             
             heroShards.SetActive(false);
             
-            numObj.SetActive(true);
+            
             alertRed.SetActive(false);
             icon.gameObject.SetActive(true);
+            
+            if (itemInfo.count.Value > 0)
+            {
+                numObj.SetActive(true);
+                num.text = itemInfo.count.Value.ToStringEx();
+            }
+            else
+            {
+                numObj.SetActive(false);
+            }
+            
 
-            num.text = itemInfo.count.Value.ToStringEx();
+            
             
             if (itemInfo.eqInfo != null)
             {
@@ -74,7 +86,8 @@ namespace Fort23.Mono
                 
                 lvObj.SetActive(true);
 
-                txtLv.text = itemInfo.eqInfo.level + "级";
+                // txtLv.text = itemInfo.eqInfo.level + "级";
+                txtLv.text = LanguageManager.Instance.Text(161, itemInfo.eqInfo.level);
                 
                 bg.color = colorConfig.bgColors[itemInfo.eqInfo.quality];
                 corner.color = colorConfig.cornerColors[itemInfo.eqInfo.quality];