少年修仙传客户端代码仓库
client_Zxw
2019-01-16 b73ea3db37f14ffb23392cd7a7adbbab9ae69641
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
12个文件已修改
71 ■■■■ 已修改文件
Core/GameEngine/DataToCtl/PackageRegedit.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Player/PlayerDatas.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/GameNetSystem.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/MapTransferUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerBoss/CrossServerBossModel.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/InGamePushContainer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityNotifyWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/HUD/HeadUpName.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/EnumHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -12,9 +12,6 @@
        get {
            lock (lockojb1) { return m_PackageTable; }
        }
        set {
            lock (lockojb1) { m_PackageTable = value; }
        }
    }
    static object lockojb2 = new object();
@@ -22,9 +19,6 @@
    static Dictionary<ushort, DtcBasic> packToBusinessTable {
        get {
            lock (lockojb2) { return m_PackToBusinessTable; }
        }
        set {
            lock (lockojb2) { m_PackToBusinessTable = value; }
        }
    }
@@ -471,6 +465,11 @@
        catch (Exception ex)
        {
            DebugEx.LogError(ex.StackTrace);
            DebugEx.LogErrorFormat("封包是否为Null:{0};", _package == null);
            if (_package != null)
            {
                DebugEx.LogErrorFormat("封包编号是:{0};", _package.cmd);
            }
        }
    }
Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -34,7 +34,8 @@
    public PlayerRankData rank { get { return m_Rank; } }
    StoreModel m_StoreModel;
    StoreModel StoreModel {
    StoreModel StoreModel
    {
        get { return m_StoreModel ?? (m_StoreModel = ModelCenter.Instance.GetModel<StoreModel>()); }
    }
Core/NetworkPackage/GameNetSystem.cs
@@ -355,16 +355,28 @@
    void OnUpdate()
    {
        lock (this)
        {
        while (mainProtocolQueue.Count > 0)
        {
            PackageRegedit.Distribute(mainProtocolQueue.Dequeue());
                var package = mainProtocolQueue.Dequeue();
                if (package != null)
                {
                    PackageRegedit.Distribute(package);
                }
        }
        while (crossSeverProtocolQueue.Count > 0)
        {
            PackageRegedit.Distribute(crossSeverProtocolQueue.Dequeue());
                var package = crossSeverProtocolQueue.Dequeue();
                if (package!=null)
                {
                    PackageRegedit.Distribute(package);
        }
    }
        }
    }
    public enum NetState
    {
Fight/GameActor/GActorPlayerBase.cs
@@ -236,6 +236,8 @@
        HideSecondaryEffect();
        HideHorseEffect();
        m_EquipDict.Clear();
        if (m_HorseModel)
        {
            HorseConfig _horseConfig = Config.Instance.Get<HorseConfig>((int)HorseID);
@@ -1075,7 +1077,10 @@
        }
        else
        {
            SwitchHand(false);
            if (!m_EquipDict.ContainsKey((int)RoleEquipType.retWeapon2))
            {
                SwitchHand(true);
            }
        }
        // 重新确定当前状态
@@ -1122,6 +1127,7 @@
            }
            m_ClothesModel.transform.localRotation = Quaternion.identity;
        }
        if (State == E_ActorState.AutoRun ||
Fight/MapTransferUtility.cs
@@ -566,7 +566,7 @@
                    _destPos = npc.Pos;
                }
                _hero.MoveToPosition(_destPos, _chkDist);
                _hero.MoveToPosition(_destPos, _chkDist, true);
            }
            if (s_OnHeroStartMoveToNPC != null)
System/CrossServerBoss/CrossServerBossModel.cs
@@ -426,16 +426,16 @@
        public void UpdateRedpoint()
        {
            if (!FuncOpen.Instance.IsFuncOpen(162))
            {
                redpoint.count = 0;
            }
            else
            if (FuncOpen.Instance.IsFuncOpen(162) && TimeUtility.OpenDay >= GeneralDefine.crossServerOneVsOneOpenDay)
            {
                var wearyValueLimit = GeneralDefine.bossWearyValues[2];
                var count = (wearyValueLimit - wearyValue) + (GeneralDefine.dogzBoxLimit - bigBoxCollectCount);
                redpoint.count = count;
            }
            else
            {
                redpoint.count = 0;
            }
            redpoint.state = redpoint.count > 0 ? RedPointState.Quantity : RedPointState.None;
            CrossServerUtility.UpdateCrossServerRedpoint();
System/Dungeon/DungeonModel.cs
@@ -1010,7 +1010,7 @@
                                && dungeonResult.leaderID == PlayerDatas.Instance.baseData.PlayerID)
                            {
                                RealmBossShow.Instance.Open(realmModel.cacheRealmLv);
                                ModelCenter.Instance.GetModel<ChatCenter>().CheckSendRealmThanks();
                                //ModelCenter.Instance.GetModel<ChatCenter>().CheckSendRealmThanks();
                            }
                            else
                            {
System/MainInterfacePanel/InGamePushContainer.cs
@@ -34,6 +34,8 @@
        ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }
        DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
        DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
        CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
        FBHelpPointExchageModel exchageModel { get { return ModelCenter.Instance.GetModel<FBHelpPointExchageModel>(); } }
@@ -51,6 +53,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
        public void Init()
        {
            CheckBetterEquip();
@@ -275,6 +278,10 @@
                        killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];
                        show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
                        break;
                    case FindPreciousType.CrossServerBoss:
                        killable = crossServerBossModel.wearyValue < GeneralDefine.bossWearyValues[2];
                        show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);
                        break;
                }
                if (!killable)
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -604,6 +604,8 @@
        private void SetAtkType()//逍遥城非boss区域特殊处理
        {
            if (PlayerDatas.Instance.hero != null)
            {
            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
            if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool && Buffmodel.PkType!=0)
            {
@@ -611,6 +613,7 @@
                Buffmodel.PkType = 0;
            }
        }
        }
        private void OnMaininterCDTime()
        {
            MarkRayButton();
System/OpenServerActivity/OpenServerActivityNotifyWin.cs
@@ -41,6 +41,12 @@
        private void CheckFlashRushToBuy()
        {
            if(CrossServerUtility.IsCrossServerOneVsOne())
            {
                flashRushToBuyNotify.gameObject.SetActive(false);
                return;
            }
            OperationFlashRushToBuy.FlashSaleShop saleShop = null;
            if(activityNotifyModel.flashSaleShops.Count > 0)
            {
UI/HUD/HeadUpName.cs
@@ -93,7 +93,7 @@
        {
            if (m_Realm)
            {
                if (_realm > 0)
                if (_realm > 0 && Config.Instance.ContainKey<RealmConfig>(_realm))
                {
                    m_Realm.gameObject.SetActive(true);
                    m_PlayerName.alignment = TextAnchor.MiddleLeft;
Utility/EnumHelper.cs
@@ -902,6 +902,7 @@
    Dogz = 138, //神兽
    AddPoint = 145,//加点
    CrossServer = 157, //跨服天梯赛
    CrossServerBoss=162,
}
//属性类型
public enum AttrEnum