少年修仙传客户端代码仓库
10318 子 【英文】上线测试检查 / 【英文】【越南】【BT】【砍树】统一增加奖励获得封包
7个文件已修改
186 ■■■■■ 已修改文件
LogicProject/System/Achievement/ILAchievementModel.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/CommonGetItemCell.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/CommonGetItemWin.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackModel.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RankAction/MissionActCell.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Welfare/SuccessBPCell.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LogicProject/System/Achievement/ILAchievementModel.cs
@@ -301,8 +301,9 @@
        return ids;
    }
    //成就是两个封包A340 A342合并逻辑,没有通知进度的情况下已领取则代表进度满; 只有修仙之路是战令购买特殊处理
    //批量领取同类型成就
    public void GetAchievementReward(int successID)
    public void GetAchievementReward(int successID, byte isPassport = 0)
    {
        var config = SuccessConfig.Get(successID);
@@ -316,14 +317,33 @@
            achievementModel.TryGetAchievement(ids[i], out achievement);
            if (configEx.Type != config.Type)
                continue;
            int process = Mathf.Min(achievement.progress, configEx.NeedCnt);
            if (achievement.completed)
                continue;
            if (achievement.progress < configEx.NeedCnt)
                return;
                process = configEx.NeedCnt;
            if (isPassport == 0)
            {
                if (achievement.completed)
                    continue;
            }
            else
            {
                if (achievement.completedBP && achievement.completed)
                    continue;
            }
            if (process < configEx.NeedCnt)
            {
                if (isPassport == 1)
                    continue;
                else
                    return;
            }
            if (sendCount > 30) return; //分批
            var sendInfo = new CA542_tagMCGetSuccessAward();
            sendInfo.SuccID = (uint)ids[i];
            sendInfo.IsPassport = isPassport;
            GameNetSystem.Instance.SendInfo(sendInfo);
            sendCount++;
        }
System/KnapSack/Logic/CommonGetItemCell.cs
@@ -8,11 +8,16 @@
        [SerializeField] ItemCell itemCell;
        [SerializeField] TextEx txtItemName;
        public void Display(int index)
        public void Display(int itemID)
        {
            txtItemName.SetActive(ItemLogicUtility.Instance.isNameShow);
            int itemID = ItemLogicUtility.Instance.getItems[index].id;
            itemCell.Init(new ItemCellModel(itemID, false, (ulong)ItemLogicUtility.Instance.getItems[index].countEx));
            if (!ItemLogicUtility.Instance.totalShowItems.ContainsKey(itemID))
            {
                return;
            }
            var item = ItemLogicUtility.Instance.totalShowItems[itemID];
            itemCell.Init(new ItemCellModel(itemID, false, item.countEx));
            txtItemName.text = ItemConfig.Get(itemID).ItemName;
            itemCell.button.SetListener(() => {
                ItemTipUtility.Show(itemID);
System/KnapSack/Logic/CommonGetItemWin.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
@@ -30,32 +31,49 @@
        protected override void OnPreOpen()
        {
            ItemLogicUtility.Instance.OnGetItemShowEvent += OnGetItemShowEvent;
            scroller.OnRefreshCell += OnRefreshCell;
            desc.SetActive(!string.IsNullOrEmpty(ItemLogicUtility.Instance.getItemInfo));
            desc.text = ItemLogicUtility.Instance.getItemInfo;
            sureText.text = ItemLogicUtility.Instance.getItemBtnText;
            CreateScroller();
            closeText.text = string.Empty;
            closeText.text = Language.Get("L2004");
            openTime = Time.time;
        }
        protected override void OnPreClose()
        {
            ItemLogicUtility.Instance.OnGetItemShowEvent -= OnGetItemShowEvent;
            scroller.OnRefreshCell -= OnRefreshCell;
            ItemLogicUtility.Instance.OnGetItem?.Invoke();
            ItemLogicUtility.Instance.ClearGetItem();
        }
        void CreateScroller()
        {
            scroller.Refresh();
            for (int i = 0; i < ItemLogicUtility.Instance.getItems.Count; i++)
            var keys = ItemLogicUtility.Instance.totalShowItems.Keys.ToList();
            for (int i = 0; i < keys.Count; i++)
            {
                scroller.AddCell(ScrollerDataType.Header, i);
                scroller.AddCell(ScrollerDataType.Header, keys[i]);
            }
            scroller.Restart();
        }
        void OnGetItemShowEvent()
        {
            if (scroller.GetNumberOfCells(scroller.m_Scorller) != ItemLogicUtility.Instance.totalShowItems.Count)
            {
                CreateScroller();
            }
            else
            {
                scroller.m_Scorller.RefreshActiveCellViews();
            }
        }
        protected override void OnAfterOpen()
        {
        }
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -1727,13 +1727,42 @@
        public Action OnGetItem;    //CommonGetItemWin界面关闭时触发
        public string getItemInfo { get; private set; }  //通用显示获得的界面信息
        public string getItemBtnText { get; private set; }  //通用显示获得的界面按钮文字 默认确定
        public List<Item> getItems { get; private set; }
        public int closeSeconds { get; private set; } // 关闭倒计时时间 如果传0代表手动关闭
        public bool isNameShow { get; private set; } // 是否展示物品名字
        // 如果同时有多种奖励封包,同一个事件归集,不同事件直接顶掉显示最新
        public Dictionary<int, Item> totalShowItems = new Dictionary<int, Item>();
        public event Action OnGetItemShowEvent;
        private string getItemEventName;
        // 通用显示获得的物品
        public void ShowGetItem(List<Item> items, string info = "", int seconds = 3, string btnName = "", Action func = null,bool isNameShow = true)
        public void ShowGetItem(List<Item> items, string info = "", int seconds = 3, string btnName = "", Action func = null,bool isNameShow = true, string eventName = "default")
        {
            getItems = items;
            if (getItemEventName != eventName)
            {
                if (WindowCenter.Instance.IsOpen<CommonGetItemWin>())
                    WindowCenter.Instance.Close<CommonGetItemWin>();
                totalShowItems.Clear();
                getItemEventName = eventName;
            }
            //相同ID 合并数量显示
            for (int i = 0; i < items.Count; i++)
            {
                var id = items[i].id;
                if (totalShowItems.ContainsKey(id))
                {
                    totalShowItems[id] = new Item(id, items[i].countEx + totalShowItems[id].countEx, items[i].bind, items[i].quality);
                }
                else
                {
                    totalShowItems.Add(id, items[i]);
                }
            }
            getItemInfo = info;
            OnGetItem = func;
            if (btnName == "")
@@ -1741,13 +1770,37 @@
            getItemBtnText = btnName;
            closeSeconds = seconds;
            this.isNameShow = isNameShow;
            WindowCenter.Instance.Open<CommonGetItemWin>();
            OnGetItemShowEvent?.Invoke();
            if (!WindowCenter.Instance.IsOpen<CommonGetItemWin>())
                WindowCenter.Instance.Open<CommonGetItemWin>();
        }
        //通用显示获得的物品 和 更多的文本显示
        public void ShowGetItemRichText(List<Item> items, string info = "", int seconds = 3, string btnName = "", Action func = null, bool isNameShow = true)
        public void ShowGetItemRichText(List<Item> items, string info = "", int seconds = 3, string btnName = "", Action func = null, bool isNameShow = true, string eventName = "default")
        {
            getItems = items;
            if (getItemEventName != eventName)
            {
                if (WindowCenter.Instance.IsOpen<CommonGetItemRichTextWin>())
                    WindowCenter.Instance.Close<CommonGetItemRichTextWin>();
                totalShowItems.Clear();
                getItemEventName = eventName;
            }
            //相同ID 合并数量显示
            for (int i = 0; i < items.Count; i++)
            {
                var id = items[i].id;
                if (totalShowItems.ContainsKey(id))
                {
                    totalShowItems[id] = new Item(id, items[i].countEx + totalShowItems[id].countEx, items[i].bind, items[i].quality);
                }
                else
                {
                    totalShowItems.Add(id, items[i]);
                }
            }
            getItemInfo = info;
            OnGetItem = func;
            if (btnName == "")
@@ -1755,7 +1808,15 @@
            getItemBtnText = btnName;
            closeSeconds = seconds;
            this.isNameShow = isNameShow;
            WindowCenter.Instance.Open<CommonGetItemRichTextWin>();
            OnGetItemShowEvent?.Invoke();
            if (!WindowCenter.Instance.IsOpen<CommonGetItemRichTextWin>())
                WindowCenter.Instance.Open<CommonGetItemRichTextWin>();
        }
        public void ClearGetItem()
        {
            //不清理物品,下次收到数据会自动清理,只改事件方便打开界面测试
            getItemEventName = "";
        }
    }
}
System/KnapSack/Logic/PackModel.cs
@@ -1819,21 +1819,21 @@
            if (!commonShowAwardEvents.Contains(eventName))
                return;
            List<Item> items = new List<Item>();
            List<Item> showItems = new List<Item>();
            if (netPack.Exp != 0 || netPack.ExpPoint != 0)
            {
                ulong expValue = netPack.Exp + netPack.ExpPoint * (ulong)Constants.ExpPointValue;
                items.Add(new Item(GeneralDefine.expDisplayId, expValue));
                showItems.Add(new Item(GeneralDefine.expDisplayId, expValue));
            }
            if (netPack.MoneyList.Length != 0)
            {
                for (int i = 0; i < netPack.MoneyLen; i++)
                {
                    var moneyType = netPack.MoneyList[i].MoneyType;
                    if (GeneralDefine.moneyDisplayIds.ContainsKey(moneyType))
                    if (GeneralDefine.moneyDisplayIds.ContainsKey(moneyType) && netPack.MoneyList[i].MoneyValue != 0)
                    {
                        items.Add(new Item(GeneralDefine.moneyDisplayIds[moneyType], netPack.MoneyList[i].MoneyValue));
                        showItems.Add(new Item(GeneralDefine.moneyDisplayIds[moneyType], netPack.MoneyList[i].MoneyValue));
                    }
                }
@@ -1843,7 +1843,7 @@
            {
                for (int i = 0; i < netPack.ItemLen; i++)
                {
                    items.Add(new Item((int)netPack.ItemList[i].ItemID, netPack.ItemList[i].Count, netPack.ItemList[i].IsBind));
                    showItems.Add(new Item((int)netPack.ItemList[i].ItemID, netPack.ItemList[i].Count, netPack.ItemList[i].IsBind));
                }
            }
@@ -1852,7 +1852,10 @@
            if (LanguageConfig.Has("commonShowAwardEvents_" + eventName))
                info = Language.Get("commonShowAwardEvents_" + eventName);
            ItemLogicUtility.Instance.ShowGetItem(items, info, 0);
            if (showItems.Count == 0)
                return;
            ItemLogicUtility.Instance.ShowGetItem(showItems, info, 0, eventName: eventName);
        }
    }
}
System/RankAction/MissionActCell.cs
@@ -77,15 +77,15 @@
                if (state == 1)
                {
                    model.SendGetAward(id);
                    var mission = missionAct.missionInfo[id];
                    foreach (var item in mission.AwardItemList)
                    {
                        items.Add(new Item((int)item.ItemID, item.ItemCount));
                    }
                    //var mission = missionAct.missionInfo[id];
                    //foreach (var item in mission.AwardItemList)
                    //{
                    //    items.Add(new Item((int)item.ItemID, item.ItemCount));
                    //}
                }
            }
            ItemLogicUtility.Instance.ShowGetItem(items, "", 0);
            //ItemLogicUtility.Instance.ShowGetItem(items, "", 0);
        }
    }
System/Welfare/SuccessBPCell.cs
@@ -133,11 +133,13 @@
            }
            if (!completed)
            {
                GetAchievementReward(successID, 0);
                //GetAchievementReward(successID, 0);
                ILAchievementModel.Instance.GetAchievementReward(successID, 0);
            }
            if (isBuy && !completedBP)
            {
                GetAchievementReward(successID, 1);
                //GetAchievementReward(successID, 1);
                ILAchievementModel.Instance.GetAchievementReward(successID, 1);
            }
            if (completed && !isBuy)
            {
@@ -155,13 +157,14 @@
            }
        }
        public void GetAchievementReward(int _achievementId, byte getBP)
        {
            var sendInfo = new CA542_tagMCGetSuccessAward();
            sendInfo.SuccID = (uint)_achievementId;
            sendInfo.IsPassport = getBP;
            GameNetSystem.Instance.SendInfo(sendInfo);
        }
        //public void GetAchievementReward(int _achievementId, byte getBP)
        //{
        //    var sendInfo = new CA542_tagMCGetSuccessAward();
        //    sendInfo.SuccID = (uint)_achievementId;
        //    sendInfo.IsPassport = getBP;
        //    GameNetSystem.Instance.SendInfo(sendInfo);
        //}
    }
}