少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-16 5ad6f9923e1a2b09e39de824248d6d1b2f5c4ec4
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
26 ■■■■■ 已修改文件
Core/GameEngine/Model/Player/PlayerDatas.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>()); }
    }
Fight/GameActor/GActorPlayerBase.cs
@@ -236,6 +236,8 @@
        HideSecondaryEffect();
        HideHorseEffect();
        m_EquipDict.Clear();
        if (m_HorseModel)
        {
            HorseConfig _horseConfig = Config.Instance.Get<HorseConfig>((int)HorseID);
@@ -650,7 +652,7 @@
        }
        int _baseHandResID = ModelResConfig.GetHandByClothesID((int)ClothesItemID);
        int _resID = _baseHandResID;
        if(JobSetup.Job == 2)
        if (JobSetup.Job == 2)
        {
            _resID = JobSetup.BaseEquip[2];
        }
@@ -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 ||
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/MainInterfaceWin.cs
@@ -604,11 +604,14 @@
        private void SetAtkType()//逍遥城非boss区域特殊处理
        {
            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
            if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool && Buffmodel.PkType!=0)
            if (PlayerDatas.Instance.hero != null)
            {
                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
                Buffmodel.PkType = 0;
                bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
                if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool && Buffmodel.PkType != 0)
                {
                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
                    Buffmodel.PkType = 0;
                }
            }
        }
        private void OnMaininterCDTime()