少年修仙传客户端代码仓库
client_Wu Xijin
2018-10-26 46c16cea14361e487f15a46d7b7626f810c54b06
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
80 ■■■■■ 已修改文件
Fight/Actor/TestPlayerController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzModel.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackSendQuestMgr.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/WashAttrPointWin.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SystemSetting/SettingMgr.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/EnumHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/TestPlayerController.cs
@@ -52,7 +52,7 @@
            if (m_StartedRotateCamera)
            {
                CameraController.Instance.Distance = 11;
                CameraController.Instance.rotationX = -11;
                CameraController.Instance.rotationX = -110;
                CameraController.Instance.rotationY = 50;
            }
            else
System/Dogz/DogzModel.cs
@@ -19,6 +19,8 @@
        public void OnBeforePlayerDataInitialize()
        {
            playerPack.RefreshItemCountAct -= RefreshDogzEquipInfo;
            FuncOpen.Instance.OnFuncStateChangeEvent -= UpdateDogzState;
            curSumAssistNum = DogzAssistDefaultCnt;
            addAssistCnt = 0;
            SelectDogzItemQuality = 0;
@@ -37,9 +39,9 @@
        public void OnPlayerLoginOk()
        {
            SetDogzEquipInfo();
            playerPack.RefreshItemCountAct -= RefreshDogzEquipInfo;
            SetDogzEquipInfo();
            playerPack.RefreshItemCountAct += RefreshDogzEquipInfo;
            FuncOpen.Instance.OnFuncStateChangeEvent += UpdateDogzState;
            UpdateDogzAssistRed();
            UpdateDogzEquipPlaceRed();
            UpdateAssistNumRed();
@@ -301,6 +303,17 @@
            SysNotifyMgr.Instance.ShowTip("DogzQualityAsk", GetDogzPartNameByIndex(index), GetItemColorName(color));
            return false;
        }
        private void UpdateDogzState(int funcId)
        {
            if (funcId != (int)FuncOpenEnum.Dogz) return;
            UpdateDogzAssistRed();
            UpdateDogzEquipPlaceRed();
            UpdateAssistNumRed();
        }
        #region 协议
@@ -866,10 +879,13 @@
        public void UpdateDogzAssistRed()
        {
            foreach(var value in dogzAssistRedDict.Values)
            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
            foreach (var value in dogzAssistRedDict.Values)
            {
                value.state = RedPointState.None;
            }
            bool isMaxAssistNum = GetAssistDogzCount() >= curSumAssistNum ? true : false;
            int minAlreadyAssistId = 0;
            foreach (var dogzId in m_DogzEquipLimit.Keys)
@@ -926,7 +942,9 @@
        public void UpdateDogzEquipPlaceRed()
        {
            foreach(var value in dogzEquipPlaceRedDict.Values)
            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
            foreach (var value in dogzEquipPlaceRedDict.Values)
            {
                foreach(var value2 in value.Values)
                {
@@ -934,7 +952,7 @@
                }
            }
            foreach(var value in dogzAssistRedDict.Values)
            foreach (var value in dogzAssistRedDict.Values)
            {
                if(value.state == RedPointState.Simple)
                {
@@ -1056,7 +1074,9 @@
        public void UpdateAssistNumRed()
        {
          if(CheckIsAddAssistNum() && !IsAddMaxAssist())
            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
            if (CheckIsAddAssistNum() && !IsAddMaxAssist())
           {
                if(addAssistDogzRedpoint.state == RedPointState.None)
                {
System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -93,6 +93,7 @@
            get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); }
        }
        RolePointModel rolePointModel { get { return ModelCenter.Instance.GetModel<RolePointModel>(); } }
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
@@ -328,7 +329,7 @@
                                foreach (var key in sumOffsetlist.Keys)
                                {
                                    PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshFreePoint;
                                    //rolePointModel.SendAddPoint((int)key, (int)sumOffsetlist[key]);
                                    rolePointModel.SendAddPoint((int)key, (int)sumOffsetlist[key]);
                                }
                            }
                            else
System/KnapSack/Logic/WashAttrPointWin.cs
@@ -2,6 +2,7 @@
using UnityEngine.UI;
using TableConfig;
using System;
using System.Collections.Generic;
namespace Snxxz.UI
{
@@ -109,22 +110,29 @@
        private void RefreshWashAttrDes()
        {
            //float initPoint = rolePointModel.GetPointCreate(PlayerDatas.Instance.baseData.Job)[(int)selectAttr];
            //switch (selectAttr)
            //{
            //    case AttrEnum.POWER:
            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseSTR) - initPoint;
            //        break;
            //    case AttrEnum.AGILITY:
            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePHY) - initPoint;
            //        break;
            //    case AttrEnum.PHYSIQUE:
            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseCON) - initPoint;
            //        break;
            //    case AttrEnum.MENTALITY:
            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePNE) - initPoint;
            //        break;
            //}
            var model = ModelCenter.Instance.GetModel<RolePointModel>();
            Dictionary<int, int> dict = null;
            bool isContain = model.TryGetPointInit(PlayerDatas.Instance.baseData.Job,out dict);
            float initPoint = 0;
            if(isContain && dict.ContainsKey((int)selectAttr))
            {
                initPoint = dict[(int)selectAttr];
            }
            switch (selectAttr)
            {
                case AttrEnum.POWER:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseSTR) - initPoint;
                    break;
                case AttrEnum.AGILITY:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePHY) - initPoint;
                    break;
                case AttrEnum.PHYSIQUE:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseCON) - initPoint;
                    break;
                case AttrEnum.MENTALITY:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePNE) - initPoint;
                    break;
            }
            PlayerPropertyConfig propertyConfig = Config.Instance.Get<PlayerPropertyConfig>((int)selectAttr);
            washAttrDesText.text = Language.Get("BagWin_Washpoint2", propertyConfig.Name, UIHelper.GetPropertyMapPlayerData(selectAttr), washPoint);
System/SystemSetting/SettingMgr.cs
@@ -35,7 +35,7 @@
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.coins, true);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.other, true);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoDrop, true);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoHangUp,false);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoHangUp,true);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoBuyDrug, true);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoSell, true);
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoDevour, true);
Utility/EnumHelper.cs
@@ -881,6 +881,7 @@
    OpenServerRedEnvelope = 122,//开服红包
    EquipDecompose = 123, //装备分解
    TreasureFindHost = 124, //法宝认主
    Dogz = 138, //神兽
    AddPoint = 145,//加点
}
//属性类型