少年修仙传客户端代码仓库
client_Hale
2019-05-27 e760396c0ed136e55bd5c9147940775064c51548
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
8个文件已修改
278 ■■■■■ 已修改文件
Core/NetworkPackage/ServerPack/HA3_Function/HA333_tagMCDailyActivityInfoList.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestBehaviour.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestModel.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonTargetBehaviour.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/ClientHazyGrassStage.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyGrassDungeonWin.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionEntrancePanel.cs 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionModel.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HA3_Function/HA333_tagMCDailyActivityInfoList.cs
@@ -5,7 +5,7 @@
public class HA333_tagMCDailyActivityInfoList : GameNetPackBasic {
    public uint CurValue;    // 当前总活跃度
    public uint RealmPoint;    // 可领取修行点
    public uint UsableActivePoint;    // 可使用活跃点
    public byte StageIndex;    // 当前阶段索引
    public uint AwardRecord;    // 领奖记录 按位存储
    public uint ExtraPoint;    // 多倍活动获得的额外修行点
@@ -16,7 +16,7 @@
    public override void ReadFromBytes (byte[] vBytes) {
        TransBytes (out CurValue, vBytes, NetDataType.DWORD);
        TransBytes (out RealmPoint, vBytes, NetDataType.DWORD);
        TransBytes (out UsableActivePoint, vBytes, NetDataType.DWORD);
        TransBytes (out StageIndex, vBytes, NetDataType.BYTE);
        TransBytes (out AwardRecord, vBytes, NetDataType.DWORD);
        TransBytes (out ExtraPoint, vBytes, NetDataType.DWORD);
System/DailyQuest/DailyQuestBehaviour.cs
@@ -342,6 +342,16 @@
                case DailyQuestType.RuneTower:
                    m_PracticePoint.text = Language.Get("PointPerFloor", config.OnceActivity);
                    break;
                case DailyQuestType.HazyRegion:
                    if (config.OnceActivity == 0)
                    {
                        m_PracticePoint.text = string.Empty;
                    }
                    else
                    {
                        m_PracticePoint.text = Language.Get("DailyQuestPerTime", config.OnceActivity);
                    }
                    break;
                default:
                    if (config.OnceActivity / (float)config.OnceActivityTime < 1f)
                    {
System/DailyQuest/DailyQuestModel.cs
@@ -58,6 +58,25 @@
            }
        }
        int m_UsableActivePoint = 0;
        public int usableActivePoint
        {
            get { return m_UsableActivePoint; }
            private set
            {
                if (m_UsableActivePoint != value)
                {
                    m_UsableActivePoint = value;
                    if (usableActivePointUpdateEvent != null)
                    {
                        usableActivePointUpdateEvent();
                    }
                }
            }
        }
        DailyQuestCategory m_Category;
        public DailyQuestCategory category {
            get {
@@ -90,10 +109,12 @@
        TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
        MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
        SkyTowerModel skyTowerModel { get { return ModelCenter.Instance.GetModel<SkyTowerModel>(); } }
        HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }
        public event Action<int> activeValueRewardGotEvent;
        public event Action<int> dailyQuestProgressUpdateEvent;
        public event Action currentActiveValueUpdateEvent;
        public event Action usableActivePointUpdateEvent;
        public event Action categoryChangeEvent;
        public override void Init()
@@ -140,6 +161,7 @@
        public void OnBeforePlayerDataInitialize()
        {
            currentActiveValue = 0;
            usableActivePoint = 0;
        }
        public void OnMapInitOk()
@@ -296,16 +318,6 @@
                        {
                            case 11:
                                return Math.Max(dailyQuestOpenTime.DayTimes, GetDailyQuestCompletedTimes(_dailyQuestId));
                            case 25:
                                if (dailyQuestTimes.ContainsKey(config.RelatedID))
                                {
                                    return dailyQuestOpenTime.DayTimes + dailyQuestTimes[config.RelatedID].dayBuyTimes
                                        + dailyQuestTimes[config.RelatedID].dayUseItemTimes;
                                }
                                else
                                {
                                    return dailyQuestOpenTime.DayTimes;
                                }
                            default:
                                return dailyQuestOpenTime.DayReKind > 0 ? dailyQuestOpenTime.DayTimes : dailyQuestOpenTime.WeekTimes;
                        }
@@ -437,6 +449,8 @@
            currentRewardStageIndex = (int)_activeValueInfo.StageIndex;
            usableActivePoint = (int)_activeValueInfo.UsableActivePoint;
            for (int i = 0; i < dailyQuestActiveValueRewards.Count; i++)
            {
                var reward = dailyQuestActiveValueRewards[i];
@@ -563,6 +577,11 @@
            UpdateDailyActionRedpoint((int)DailyQuestType.FairyLeague);
        }
        public void UpdateHazyRegion()
        {
            UpdateDailyActionRedpoint((int)DailyQuestType.HazyRegion);
        }
        public void UpdateRedpoints()
        {
            foreach (var dailyQuest in dailyQuests.Values)
@@ -600,6 +619,10 @@
                                dailyQuest.redpoint.state = RedPointState.None;
                                break;
                            case DailyQuestType.DungeonAssist:
                                break;
                            case DailyQuestType.HazyRegion:
                                dailyQuest.redpoint.state = hazyRegionModel.redpoint.state == RedPointState.Simple ?
                                    RedPointState.Simple : RedPointState.None;
                                break;
                            default:
                                if (PlayerDatas.Instance.baseData.LV <= GeneralDefine.dailyQuestRedpointLevelLimit
@@ -912,20 +935,8 @@
                                    }
                                }
                            case 19:
                                return DailyQuestState.Normal;
                            case 25:
                                {
                                    var dailyQuestOpenTime = DailyQuestOpenTimeConfig.Get(config.RelatedID);
                                    if (completedTimes >= dailyQuestOpenTime.DayTimes +
                                        dailyQuestOpenTime.DayBuyTimes + dailyQuestOpenTime.DayItemAddTimes)
                                    {
                                        return DailyQuestState.Completed;
                                    }
                                    else
                                    {
                                        return DailyQuestState.CanBuyTimes;
                                    }
                                }
                                return DailyQuestState.Normal;
                            default:
                                return DailyQuestState.Completed;
                        }
System/Dungeon/DungeonTargetBehaviour.cs
@@ -11,7 +11,7 @@
        [SerializeField] Text descText;
        [SerializeField] List<Text> m_TargetDescs;
        [SerializeField] List<Text> m_TargetNums;
        private int currentDungeonId = 0;
        private Dungeon dungeonInfo;
        DungeonModel m_Model;
        DungeonModel model
@@ -22,10 +22,19 @@
            }
        }
        public void Init(int mapID)
        public void Init(Dungeon dungeon)
        {
            currentDungeonId = mapID;
            dungeonInfo = dungeon;
            UpdateMissionEvent();
        }
        public void Init(int mapId, int lineId = 0)
        {
            Init(new Dungeon()
            {
                mapId = mapId,
                lineId = lineId,
            });
        }
        private void OnEnable()
@@ -37,10 +46,10 @@
        private void UpdateMissionEvent()
        {
            if (currentDungeonId == 0) return;
            if (dungeonInfo.mapId == 0) return;
            var dateMapId = model.GetDataMapIdByMapId(currentDungeonId);
            var hintId = model.GetDungeonHintId(dateMapId, 0);
            var dateMapId = model.GetDataMapIdByMapId(dungeonInfo.mapId);
            var hintId = model.GetDungeonHintId(dateMapId, dungeonInfo.lineId);
            var config = DungeonHintConfig.Get(hintId);
            m_TargetDescs[0].gameObject.SetActive(config.targetNum >= 1);
System/HazyRegion/ClientHazyGrassStage.cs
@@ -16,8 +16,6 @@
    static Vector3 s_EnemyPosition = Vector3.zero;
    static GA_NpcClientFightNorm s_ClientMonster = null;
    bool hasInitializedNpc = false;
    public bool hasCompleted { get; private set; }
@@ -50,7 +48,6 @@
        ClientCollectUtility.OnCollectFinished += OnCollectFinished;
        dungeonModel.onDungeonResultEvent += OnDungeonResultEvent;
        PersonalEnemy.OnNpcAppear += OnNpcAppear;
    }
    protected override void OnStageLoadFinish()
@@ -61,7 +58,6 @@
        InitializeNpc();
        model.onMapNpcCountRefresh += OnMapNpcCountRefresh;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += PlayerLoginOk;
    }
    public override void UnInitialize()
@@ -73,8 +69,6 @@
        ClientCollectUtility.OnCollectFinished -= OnCollectFinished;
        dungeonModel.onDungeonResultEvent -= OnDungeonResultEvent;
        model.onMapNpcCountRefresh -= OnMapNpcCountRefresh;
        PersonalEnemy.OnNpcAppear -= OnNpcAppear;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= PlayerLoginOk;
    }
    private void OnMapNpcCountRefresh()
@@ -203,9 +197,7 @@
        if (hasInitializedNpc)
        {
            s_EnemyPosition = s_NpcPositions[UnityEngine.Random.Range(0, s_NpcPositions.Count)];
            InitializeMonster();
            //s_EnemyPosition = s_NpcPositions[UnityEngine.Random.Range(0, s_NpcPositions.Count)];
        }
        if (hasInitializedNpc)
@@ -244,32 +236,6 @@
        });
    }
    void InitializeMonster()
    {
        var position = s_EnemyPosition;
        if (s_ClientMonster != null)
        {
            position = s_ClientMonster.Pos;
            PersonalEnemy.Release(s_ClientMonster);
        }
        if (ClientDungeonStageUtility.clientMapId == HazyGrassModel.FAIRY_CLIENTDATAMAP)
        {
            PersonalEnemy.Create((uint)s_EnemyNpcId, E_ActorGroup.Enemy, position);
        }
    }
    private void OnNpcAppear(GA_NpcClientFightNorm _npc)
    {
        s_ClientMonster = _npc;
    }
    private void PlayerLoginOk()
    {
        InitializeMonster();
    }
    void UnloadAllNpc()
    {
        foreach (var _npc in s_CollectNpcs.Values)
@@ -284,11 +250,6 @@
        }
        s_CollectNpcs.Clear();
        if (s_ClientMonster != null)
        {
            s_ClientMonster = null;
        }
    }
    #region 本地Npc数据
System/HazyRegion/HazyGrassDungeonWin.cs
@@ -63,12 +63,12 @@
            {
                var incidentId = hazyRegionModel.GetIncidentId(ClientDungeonStageUtility.dungeonInfo.mapId, ClientDungeonStageUtility.dungeonInfo.lineId);
                var config = HazyRegionConfig.Get(incidentId);
                m_DungeonTarget.Init(config.dungeonId);
                m_DungeonTarget.Init(config.dungeonId, config.lineId);
            }
            else
            {
                var mapId = PlayerDatas.Instance.baseData.MapID;
                m_DungeonTarget.Init(mapId);
                m_DungeonTarget.Init(mapId, PlayerDatas.Instance.baseData.dungeonLineId);
            }
            DisplayGrassRefreshTime();
System/HazyRegion/HazyRegionEntrancePanel.cs
@@ -8,11 +8,9 @@
{
    public class HazyRegionEntrancePanel : MonoBehaviour
    {
        [SerializeField] Text m_OpenTime;
        [SerializeField] Transform m_ContainerTimes;
        [SerializeField] Text m_Times;
        [SerializeField] Button m_BuyTimes;
        [SerializeField] Button m_GetPath;
        [SerializeField] Button m_Goto;
        [SerializeField] Text m_GotoLabel;
@@ -22,56 +20,52 @@
        private void Awake()
        {
            m_BuyTimes.AddListener(BuyTimes);
            m_GetPath.AddListener(GetPath);
            m_Goto.AddListener(Goto);
        }
        public void Display()
        {
            dailyQuestModel.dailyQuestProgressUpdateEvent += DailyQuestProgressUpdateEvent;
            dailyQuestModel.usableActivePointUpdateEvent += UsableActivePointUpdateEvent;
            model.onHazyRegionIncidentRefresh += OnHazyRegionIncidentRefresh;
            DisplayOpenTime();
            DisplayTimes();
            DisplayActivePoint();
            DisplayButtonState();
        }
        void DisplayTimes()
        void DisplayActivePoint()
        {
            m_ContainerTimes.gameObject.SetActive(!model.InFakeHazyRegion);
            if (!model.InFakeHazyRegion)
            {
                var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);
                var dailyQuestOpenTime = DailyQuestOpenTimeConfig.Get(config.RelatedID);
                var limitTimes = dailyQuestOpenTime.DayTimes;
                var totalTimes = dailyQuestModel.GetDailyQuestTotalTimes((int)DailyQuestType.HazyRegion);
                var completedTimes = dailyQuestModel.GetDailyQuestCompletedTimes((int)DailyQuestType.HazyRegion);
                var times = Mathf.Clamp(totalTimes - completedTimes, 0, limitTimes);
                m_Times.text = StringUtility.Contact(times, "/", limitTimes);
                var label = UIHelper.AppendColor(dailyQuestModel.usableActivePoint >= model.openActviePoint ?
                    TextColType.Green : TextColType.Red,
                    dailyQuestModel.usableActivePoint.ToString());
                m_Times.text = StringUtility.Contact(label, "/", model.openActviePoint);
            }
        }
        void DisplayOpenTime()
        {
            m_OpenTime.gameObject.SetActive(!model.InFakeHazyRegion);
            if (!model.InFakeHazyRegion)
            {
                DailyQuestOpenTime dailyQuestOpenTime;
                if (dailyQuestModel.TryGetOpenTime((int)DailyQuestType.HazyRegion, out dailyQuestOpenTime))
                {
                    HourMinute hourMinute;
                    if (dailyQuestOpenTime.TryGetNextOpenTime(out hourMinute))
                    {
                        var timeLabel = string.Format("{0}:{1}——{2}:{3}", hourMinute.hourBegin.ToString("D2"),
                            hourMinute.minuteBegin.ToString("D2"), hourMinute.hourEnd.ToString("D2"),
                            hourMinute.minuteEnd.ToString("D2"));
                        timeLabel = UIHelper.AppendColor(TextColType.Green, timeLabel);
                        m_OpenTime.text = Language.Get("HazyRegionEntranceTime", timeLabel);
                    }
                }
            }
            //m_OpenTime.gameObject.SetActive(!model.InFakeHazyRegion);
            //if (!model.InFakeHazyRegion)
            //{
            //    DailyQuestOpenTime dailyQuestOpenTime;
            //    if (dailyQuestModel.TryGetOpenTime((int)DailyQuestType.HazyRegion, out dailyQuestOpenTime))
            //    {
            //        HourMinute hourMinute;
            //        if (dailyQuestOpenTime.TryGetNextOpenTime(out hourMinute))
            //        {
            //            var timeLabel = string.Format("{0}:{1}——{2}:{3}", hourMinute.hourBegin.ToString("D2"),
            //                hourMinute.minuteBegin.ToString("D2"), hourMinute.hourEnd.ToString("D2"),
            //                hourMinute.minuteEnd.ToString("D2"));
            //            timeLabel = UIHelper.AppendColor(TextColType.Green, timeLabel);
            //            m_OpenTime.text = Language.Get("HazyRegionEntranceTime", timeLabel);
            //        }
            //    }
            //}
        }
        void DisplayButtonState()
@@ -93,38 +87,9 @@
            }
        }
        private void BuyTimes()
        private void GetPath()
        {
            var questState = dailyQuestModel.GetQuestState((int)DailyQuestType.HazyRegion);
            if (questState == DailyQuestModel.DailyQuestState.OutTime)
            {
                DailyQuestOpenTime dailyQuestOpenTime;
                if (dailyQuestModel.TryGetOpenTime((int)DailyQuestType.HazyRegion, out dailyQuestOpenTime))
                {
                    HourMinute hourMinute;
                    if (dailyQuestOpenTime.TryGetTodayNearestOpenTime(out hourMinute))
                    {
                        SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_1",
                            hourMinute.hourBegin.ToString("D2"),
                            hourMinute.hourEnd.ToString("D2"));
                    }
                }
                return;
            }
            if (questState == DailyQuestModel.DailyQuestState.Completed)
            {
                SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_3");
                return;
            }
            if (!model.TryAddTimes())
            {
                SysNotifyMgr.Instance.ShowTip("OpenHazyAddTimesError_1");
                return;
            }
            WindowCenter.Instance.Open<HazyRegionBuyTimesWin>();
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);
        }
        bool TryOpenHazyReion(out int error)
@@ -150,13 +115,12 @@
                    case DailyQuestModel.DailyQuestState.OutTime:
                        error = 1;
                        break;
                    case DailyQuestModel.DailyQuestState.CanBuyTimes:
                        error = 2;
                        break;
                    case DailyQuestModel.DailyQuestState.Completed:
                        error = 3;
                        break;
                }
                return false;
            }
            if (dailyQuestModel.usableActivePoint < model.openActviePoint)
            {
                error = 2;
                return false;
            }
            return true;
@@ -180,7 +144,7 @@
                    }
                    break;
                case 2:
                    WindowCenter.Instance.Open<HazyRegionBuyTimesWin>();
                    SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_2");
                    break;
                case 3:
                    SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_3");
@@ -193,24 +157,20 @@
        public void Dispose()
        {
            dailyQuestModel.dailyQuestProgressUpdateEvent -= DailyQuestProgressUpdateEvent;
            dailyQuestModel.usableActivePointUpdateEvent -= UsableActivePointUpdateEvent;
            model.onHazyRegionIncidentRefresh -= OnHazyRegionIncidentRefresh;
        }
        private void OnHazyRegionIncidentRefresh()
        {
            DisplayTimes();
            DisplayActivePoint();
            DisplayOpenTime();
            DisplayButtonState();
        }
        private void DailyQuestProgressUpdateEvent(int id)
        private void UsableActivePointUpdateEvent()
        {
            var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);
            if (config != null && id == config.RelatedID)
            {
                DisplayTimes();
            }
            DisplayActivePoint();
        }
    }
}
System/HazyRegion/HazyRegionModel.cs
@@ -53,6 +53,8 @@
        public bool requireIncidentAnimation { get; set; }
        public bool incidentDirty { get; set; }
        public int openActviePoint { get; private set; }
        int m_SelectIncident;
        public int selectIncident
        {
@@ -105,7 +107,7 @@
            AdventureStage.Instance.onExitAdventureStage += OnExitAdventureStage;
            findPreciousModel.bossInfoUpdateEvent += BossInfoUpdateEvent;
            DailyQuestActionTimer.Instance.RefreshDailyQuestState += RefreshDailyQuestState;
            dailyQuestModel.dailyQuestProgressUpdateEvent += DailyQuestProgressUpdateEvent;
            dailyQuestModel.usableActivePointUpdateEvent += UsableActivePointUpdateEvent;
        }
        public void OnBeforePlayerDataInitialize()
@@ -143,7 +145,7 @@
            AdventureStage.Instance.onLoadAdventureStage -= OnLoadAdventureStage;
            findPreciousModel.bossInfoUpdateEvent -= BossInfoUpdateEvent;
            DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState;
            dailyQuestModel.dailyQuestProgressUpdateEvent -= DailyQuestProgressUpdateEvent;
            dailyQuestModel.usableActivePointUpdateEvent -= UsableActivePointUpdateEvent;
        }
        private void OnLoadAdventureStage()
@@ -188,20 +190,15 @@
            }
        }
        private void DailyQuestProgressUpdateEvent(int id)
        private void RefreshDailyQuestState()
        {
            if (isServerPrepare)
            {
                var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);
                if (config != null && id == config.RelatedID)
                {
                    UpdateRedpoint();
                }
                UpdateRedpoint();
            }
        }
        private void RefreshDailyQuestState()
        private void UsableActivePointUpdateEvent()
        {
            if (isServerPrepare)
            {
@@ -231,6 +228,9 @@
            funcConfig = FuncConfigConfig.Get("FakeImmortalCount");
            fakeOpenTimes = int.Parse(funcConfig.Numerical1);
            funcConfig = FuncConfigConfig.Get("ImmortalDomainActivePoint");
            openActviePoint = int.Parse(funcConfig.Numerical2);
        }
        public bool TryGetIncident(int id, out Incident incident)
@@ -664,8 +664,7 @@
                }
                else
                {
                    var questState = dailyQuestModel.GetQuestState((int)DailyQuestType.HazyRegion);
                    satisfyEntrance = !playing && questState == DailyQuestModel.DailyQuestState.Normal;
                    satisfyEntrance = !playing && dailyQuestModel.usableActivePoint >= openActviePoint;
                }
                if (playing)
@@ -684,6 +683,8 @@
            entranceRedpoint.state = satisfyEntrance ? RedPointState.Simple : RedPointState.None;
            incidentRedpoint.state = satisfyIncident ? RedPointState.Simple : RedPointState.None;
            dailyQuestModel.UpdateHazyRegion();
        }
        public enum IncidentState