Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -255,15 +255,15 @@ public class DialogueManager : Singleton<DialogueManager>
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
                 for (var i = 0; i < dialogueConfig.PrizeIDs.Length; i++)
                 {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(dialogueConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
+                    // DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(dialogueConfig.PrizeIDs[i]);
+                    // if (dropConfig.dropType == 3)
+                    // {
+                    //     ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], dialogueConfig.PrizeNums[i]);
+                    //     itemInfos.Add(itemInfo);
+                    // }
+                    // else
                     {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], dialogueConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(dialogueConfig.PrizeIDs[i]);
+                        List<ItemInfo> items = DropManager.Instance.Drop(dialogueConfig.PrizeIDs[i],dialogueConfig.PrizeNums[i]);
                         itemInfos.AddRange(items);
                     }
                 }

Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontPanel.cs

@@ -80,7 +80,7 @@ namespace Fort23.Mono
 
                 if (PlayerManager.Instance.myHero.powerUpConfig.ID > combatHeroInfo.MonsterPowerUpConfig.ID)
                 {
-                    csc.ChangeState(0);
+                    csc.ChangeState(2);
                 }
                 else if (PlayerManager.Instance.myHero.powerUpConfig.ID == combatHeroInfo.MonsterPowerUpConfig.ID)
                 {
@@ -88,7 +88,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    csc.ChangeState(2);
+                    csc.ChangeState(0);
                 }
 
                 ComBatFrontWidget bossInfoHeadWidget =

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -323,53 +323,53 @@ namespace Fort23.Mono
                     }
 
 
-                    if (eventConditionConfig.optionType == 3)
-                    {
-                        Btn_Bag.gameObject.SetActive(true);
-                        List<ItemInfo> itemInfos = new List<ItemInfo>();
-                        for (var i = 0; i < eventConditionConfig.PrizeIDs.Length; i++)
-                        {
-                            DropConfig dropConfig =
-                                ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
-                            if (dropConfig.dropType == 3)
-                            {
-                                ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0],
-                                    eventConditionConfig.PrizeNums[i]);
-                                itemInfos.Add(itemInfo);
-                            }
-                            else
-                            {
-                                List<ItemInfo> items = DropManager.Instance.DropItem(eventConditionConfig.PrizeIDs[i]);
-                                itemInfos.AddRange(items);
-                            }
-                        }
-
-                        ShowItemMoveToTargetPanel showItemMoveToTargetUiPane =
-                            UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
-                        Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
-                                         Btn_Bag.transform.position;
-                        Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
-                                           StartPos.transform.position;
-                        int maxCount = 1;
-
-                        foreach (var itemInfo in itemInfos)
-                        {
-                            int addValue = (int)itemInfo.count.Value / maxCount;
-                            int finishVale = (int)itemInfo.count.Value % maxCount;
-                            // ItemInfo i = itemInfo;
-                            showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon,
-                                CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
-                                {
-                                    int currAddValue = addValue;
-                                    if (imageMove.GroupIndex == maxCount - 1)
-                                    {
-                                        currAddValue += finishVale;
-                                    }
-                                });
-                        }
-
-                        await TimerComponent.Instance.WaitAsync(2000);
-                    }
+                    // if (eventConditionConfig.optionType == 3)
+                    // {
+                    //     Btn_Bag.gameObject.SetActive(true);
+                    //     List<ItemInfo> itemInfos = new List<ItemInfo>();
+                    //     for (var i = 0; i < eventConditionConfig.PrizeIDs.Length; i++)
+                    //     {
+                    //         DropConfig dropConfig =
+                    //             ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
+                    //         if (dropConfig.dropType == 3)
+                    //         {
+                    //             ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0],
+                    //                 eventConditionConfig.PrizeNums[i]);
+                    //             itemInfos.Add(itemInfo);
+                    //         }
+                    //         else
+                    //         {
+                    //             List<ItemInfo> items = DropManager.Instance.DropItem(eventConditionConfig.PrizeIDs[i]);
+                    //             itemInfos.AddRange(items);
+                    //         }
+                    //     }
+                    //
+                    //     ShowItemMoveToTargetPanel showItemMoveToTargetUiPane =
+                    //         UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
+                    //     Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
+                    //                      Btn_Bag.transform.position;
+                    //     Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix *
+                    //                        StartPos.transform.position;
+                    //     int maxCount = 1;
+                    //
+                    //     foreach (var itemInfo in itemInfos)
+                    //     {
+                    //         int addValue = (int)itemInfo.count.Value / maxCount;
+                    //         int finishVale = (int)itemInfo.count.Value % maxCount;
+                    //         // ItemInfo i = itemInfo;
+                    //         showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon,
+                    //             CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
+                    //             {
+                    //                 int currAddValue = addValue;
+                    //                 if (imageMove.GroupIndex == maxCount - 1)
+                    //                 {
+                    //                     currAddValue += finishVale;
+                    //                 }
+                    //             });
+                    //     }
+                    //
+                    //     await TimerComponent.Instance.WaitAsync(2000);
+                    // }
 
 
                     // 无选项，关闭面板，返回 null

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

@@ -51,7 +51,7 @@ namespace Fort23.Mono
             if (count > PlayerManager.Instance.BagController.GetItemCount(id))
             {
                 Text_Count.text =
-                    $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/<color=red>{count}</color>";
+                    $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}</color>/{count}";
             }
             else
             {