少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-07 5a9bdeb8e0952fb03719e4e195381a5dd21b1529
Merge branch 'master' into CrossServerBoss
7个文件已修改
69 ■■■■■ 已修改文件
Fight/Stage/Dungeon/DungeonStage.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatheringSoulModel.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/PlayerBuffDatas.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Mount/PlayerMountDatas.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Pet/PlayerPetDatas.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/WingsRefined.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/StageLoadTimeOutCatcher.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Stage/Dungeon/DungeonStage.cs
@@ -186,7 +186,11 @@
    private void OnEnterNormalDungeon()
    {
        WindowCenter.Instance.Open<DungeonFightWin>();
        if (PlayerDatas.Instance.baseData.ExAttr5 == 0)
        {
            WindowCenter.Instance.Open<DungeonFightWin>();
        }
        WindowCenter.Instance.Open<DungeonBeginCoolDownWin>();
        WindowCenter.Instance.Open<DungeonEndCoolDownWin>();
System/GatheringSoul/GatheringSoulModel.cs
@@ -353,7 +353,6 @@
                                {
                                    packIndexs.Add(list[i]);
                                }
                                break;
                            }
                        }
                    }
@@ -1587,16 +1586,20 @@
            {
                GatherSoulItem item;
                virtualPack.TryGetItem(PackType.rptGatherSoul, packIndexs[0], out item);
                for (int i = 0; i < count; i++)
                if (item != null)
                {
                    GatherSoulItem holeItem;
                    if (TryGetItem(i, out holeItem))
                    var hole = 0;
                    if (SatisfyReplace(item, out hole))
                    {
                        if (SatisfyReplace(i, item) && item.Compare(holeItem) == 1)
                        GatherSoulItem holeItem;
                        if (TryGetItem(hole, out holeItem))
                        {
                            replaceRedpointIndex = item.index;
                            replaceRedpoint.state = RedPointState.Simple;
                            return;
                            if (item.Compare(holeItem) == 1)
                            {
                                replaceRedpointIndex = item.index;
                                replaceRedpoint.state = RedPointState.Simple;
                                return;
                            }
                        }
                    }
                }
System/MainInterfacePanel/PlayerBuffDatas.cs
@@ -285,14 +285,14 @@
    public void ObjDelBuff(int playerId, int _BuffID)//buff减少
    {
        if (playerId != PlayerDatas.Instance.baseData.PlayerID)
        {
            return;
        }
        if (BuffUpdateEvent != null)
        {
            BuffUpdateEvent(playerId);
        }
        if (playerId != PlayerDatas.Instance.baseData.PlayerID)
        {
            return;
        }
        if (_BuffDic.ContainsKey(_BuffID))
        {
            _BuffDic.Remove(_BuffID);
System/Mount/PlayerMountDatas.cs
@@ -416,7 +416,7 @@
        for (int i = 0; i < MountList.Count; i++)
        {
            int SkillminLv = GetSkillLvDis(MountList[i]);
            if (SkillminLv < GetSkillMinLv)
            if (SkillminLv < GetSkillMinLv && SkillminLv!=0)
            {
                GetSkillMinLv = SkillminLv;
            }
@@ -427,7 +427,7 @@
        for (int i = 0; i < MountList.Count; i++)
        {
            int SkillLv = GetSkillLvDis(MountList[i]);
            if (SkillLv > GetSkillMinLv)
            if (SkillLv > GetSkillMinLv || SkillLv==0)
            {
                continue;
            }
@@ -446,6 +446,7 @@
    private int GetSkillLvDis(int MountId)//获取离升级最近的技能等级
    {
        int SkillLv = 0;
        foreach (var key in GetMountSkillAndItem.Keys)
        {
            if (_DicHorse.ContainsKey(MountId) && GetMountSkillAndItem[key].HorseID == MountId)
System/Pet/PlayerPetDatas.cs
@@ -407,7 +407,7 @@
        for (int i = 0; i < PetList.Count; i++)
        {
            int SkillminLv = GetSkillLvDis(PetList[i]);
            if (SkillminLv < GetSkillMinLv)
            if (SkillminLv < GetSkillMinLv && SkillminLv!=0)
            {
                GetSkillMinLv = SkillminLv;
            }
@@ -418,7 +418,7 @@
        for (int i = 0; i < PetList.Count; i++)
        {
            int SkillLv = GetSkillLvDis(PetList[i]);
            if (SkillLv > GetSkillMinLv)
            if (SkillLv > GetSkillMinLv || SkillLv==0)
            {
                continue;
            }
System/Strengthening/WingsRefined.cs
@@ -26,6 +26,7 @@
    [SerializeField] Button _RefineStopBtn;//停止精炼按钮
    [SerializeField] GameObject _ManagementFrame;//羽翼精炼面板框
    [SerializeField] RawImage _wingRawImage;//翅膀模型创建
    [SerializeField] RawImage _wingRawImage2;//翅膀模型创建2
    [SerializeField] Text _AttrNameTextNum1;//增加的伤害值
    [SerializeField] Text _AttrNameTextNum2;//增加的生命值
    [SerializeField] Slider _Pmgressbar;//精炼值
@@ -98,6 +99,7 @@
        CoroutinesBool = true;
        IsOpen = false;
        _wingRawImage.gameObject.SetActive(false);
        _wingRawImage2.gameObject.SetActive(false);
        _DevourDIc.Clear();
        m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
@@ -580,6 +582,7 @@
        {
            EquipFirstTxt.SetActive(true);
            _wingRawImage.gameObject.SetActive(false);
            _wingRawImage2.gameObject.SetActive(false);
            WingsImage.gameObject.SetActive(true);
            IconButton.gameObject.SetActive(false);
            WingsBG.SetItemBackGround(1);//翅膀框默认颜色值
@@ -589,16 +592,27 @@
    void ModelCreationDisplay()//模型展示创建
    {
        if (_wingRawImage.gameObject.activeSelf)
        if (_wingRawImage.gameObject.activeSelf || _wingRawImage2.gameObject.activeSelf)
        {
            return;
        }
        EquipFirstTxt.SetActive(false);
        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
        _wingRawImage.gameObject.SetActive(true);
        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
        var config = Config.Instance.Get<WingRefineExpConfig>((int)itemModel.itemInfo.ItemID);
        int _modelID = config.Model;
        UI3DModelExhibition.Instance.ShowWing(_modelID, Vec, _wingRawImage);
        if (itemModel.itemInfo.ItemID == 3724)
        {
            _wingRawImage2.gameObject.SetActive(true);
            _wingRawImage.gameObject.SetActive(false);
            UI3DModelExhibition.Instance.ShowWing(_modelID, Vec, _wingRawImage2);
        }
        else
        {
            _wingRawImage.gameObject.SetActive(true);
            _wingRawImage2.gameObject.SetActive(false);
            UI3DModelExhibition.Instance.ShowWing(_modelID, Vec, _wingRawImage);
        }
    }
Utility/StageLoadTimeOutCatcher.cs
@@ -63,8 +63,9 @@
    {
        try
        {
            var title = StringUtility.Contact("地图加载记录-->玩家名称:", PlayerDatas.Instance.baseData.PlayerName);
            var description = StringUtility.Contact("服务器:", socketType, ";", "协议编号:", protocol, ";", "时间:", time.ToString("HH:mm:ss"));
            var title = StringUtility.Contact("地图加载记录-->协议编号:", protocol);
            var description = StringUtility.Contact("服务器:", socketType, ";",
                "协议编号:", protocol, ";", "时间:", time.ToString("HH:mm:ss"), "玩家:", PlayerDatas.Instance.baseData.PlayerName);
            ExceptionCatcher.ReportException(title, description);
        }