少年修仙传客户端代码仓库
client_Wu Xijin
2019-06-27 62ae4442da588e16f089281f3d9cb3025f493fb4
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
35 ■■■■ 已修改文件
System/KnapSack/Logic/ItemLogicUtility.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Mail/MailAllModel.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/QuickSetting.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -847,6 +847,7 @@
            {
                var equipServerIndex = EquipSet.ClientPlaceToServerPlace(new Int2(model.config.LV, model.config.EquipPlace));
                if (model.config.EquipPlace > 0
                    && !model.isAuction
                    && model.config.EquipPlace != (int)RoleEquipType.Guard
                    && model.config.RealmLimit <= realmLv
                    && !IsOverdue(model.guid)
System/Mail/MailAllModel.cs
@@ -519,13 +519,14 @@
            int openTime = openTimelist[i];
            for (int j = 0;j < quests[openTime].Count; j++)
            {
                if(dailyIdlist.Contains(quests[openTime][j]))
                var dailyQuestId = quests[openTime][j];
                if (dailyIdlist.Contains(dailyQuestId))
                {
                    continue;
                }
                dailyIdlist.Add(quests[openTime][j]);
                dailyIdlist.Add(dailyQuestId);
                DailyQuestOpenTime dailyQuestOpenTime;
                dailyModel.TryGetOpenTime(quests[openTime][j], out dailyQuestOpenTime);
                dailyModel.TryGetOpenTime(dailyQuestId, out dailyQuestOpenTime);
                if (dailyQuestOpenTime.IsValidServerOpenTime())
                {
                    List<HourMinute> hourMinutelist = dailyQuestOpenTime.GetHourMinuteByWeek(dayOfWeek);
@@ -536,10 +537,20 @@
                            HourMinute hourMinute = hourMinutelist[k];
                            if (!hourMinute.wholeDay)
                            {
                                var config = DailyQuestConfig.Get(quests[openTime][j]);
                                var config = DailyQuestConfig.Get(dailyQuestId);
                                string openTimeStr = StringUtility.Contact(hourMinute.hourBegin > 9 ? hourMinute.hourBegin.ToString() : "0" + hourMinute.hourBegin, ":", hourMinute.minuteBegin > 9 ? hourMinute.minuteBegin.ToString() : "0" + hourMinute.minuteBegin);
                                string endTimeStr = StringUtility.Contact(hourMinute.hourEnd > 9 ? hourMinute.hourEnd.ToString() : "0" + hourMinute.hourEnd, ":", hourMinute.minuteEnd > 9 ? hourMinute.minuteEnd.ToString() : "0" + hourMinute.minuteEnd);
                                todayDailySB.Append(StringUtility.Contact("【", config.Title, "】", openTimeStr, "-", endTimeStr, "\n"));
                                switch ((DailyQuestType)dailyQuestId)
                                {
                                    case DailyQuestType.FairyFeast:
                                        todayDailySB.Append(StringUtility.Contact("【", k == 0 ? config.Title : Language.Get("FairyFeastQuestion"), "】",
                                            openTimeStr, "-", endTimeStr, "\n"));
                                        break;
                                    default:
                                        todayDailySB.Append(StringUtility.Contact("【", config.Title, "】", openTimeStr, "-", endTimeStr, "\n"));
                                        break;
                                }
                            }
                        }
                    }
System/Skill/QuickSetting.cs
@@ -9,7 +9,6 @@
/// </summary>
[XLua.LuaCallCSharp]
public class QuickSetting : Singleton<QuickSetting>
{
    public QuickSetting()
    {
@@ -25,6 +24,7 @@
    public Dictionary<QuickSettingType, QuickSettingRange> quickSettingDic = new Dictionary<QuickSettingType, QuickSettingRange>();
    public const char UCharacter = '*';
    private string setting;
    private string cacheSetting;
    private StringBuilder textBuilder = new StringBuilder();
    public event Action onQuickSettingUpdate;
@@ -75,6 +75,7 @@
        if (value != null && value.Length > 0)
        {
            setting = StringUtility.Contact(value, setting.Substring(value.Length, setting.Length - value.Length));
            cacheSetting = setting;
            PlayerDatas.Instance.baseData.Setting = setting;
        }
        PlayerDatas.Instance.skill.SetQuickSkills();
@@ -121,9 +122,13 @@
    public void SendPackage()
    {
        C0303_tagCSetShutCutData vNetData = new C0303_tagCSetShutCutData();
        vNetData.Setting = setting;
        GameNetSystem.Instance.SendInfo(vNetData);
        if (cacheSetting != setting)
        {
            cacheSetting = setting;
            C0303_tagCSetShutCutData vNetData = new C0303_tagCSetShutCutData();
            vNetData.Setting = setting;
            GameNetSystem.Instance.SendInfo(vNetData);
        }
    }
    private void BeforePlayerDataInitializeEvent()