少年修仙传客户端代码仓库
client_linchunjie
2019-05-17 f8ebc6dabe6d4d5ed32fc4322f0aa8ae6214311d
Merge branch 'master' into ClientPreciousDungeon
9个文件已修改
134 ■■■■■ 已修改文件
System/Debug/DebugUtility.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipGem/EquipStrengthModel.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GeneralConfig/GeneralDefine.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionIncidentPanel.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/BetterItemGetBehaviour.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainWin/HighSettingFadeInFadeOut.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainWin/MainWinTopGrid.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Debug/DebugUtility.cs
@@ -46,12 +46,18 @@
        if (debugAccount)
        {
            var parentDirectory = Directory.GetParent(Application.persistentDataPath);
            var content = File.ReadAllText(parentDirectory + "/Debug");
            if (!string.IsNullOrEmpty(content))
            if (Application.isMobilePlatform)
            {
                var json = JsonMapper.ToObject<DebugBranch>(File.ReadAllText(parentDirectory + "/Debug"));
                debugBranch = json.branch;
                var parentDirectory = Directory.GetParent(Application.persistentDataPath);
                if (File.Exists(parentDirectory + "/Debug"))
                {
                    var content = File.ReadAllText(parentDirectory + "/Debug");
                    if (!string.IsNullOrEmpty(content))
                    {
                        var json = JsonMapper.ToObject<DebugBranch>(File.ReadAllText(parentDirectory + "/Debug"));
                        debugBranch = json.branch;
                    }
                }
            }
        }
System/EquipGem/EquipStrengthModel.cs
@@ -62,6 +62,7 @@
        public int redpointLimitLevel { get; private set; }
        public int redpointLimitMoney { get; private set; }
        public int redpointLimitMoneyLevel { get; private set; }
        private bool isChangeBool = true;
        public bool IsChangeBool {
@@ -126,6 +127,7 @@
            var funcConfig = FuncConfigConfig.Get("StrengthenRedPointLevel");
            redpointLimitLevel = int.Parse(funcConfig.Numerical1);
            redpointLimitMoney = int.Parse(funcConfig.Numerical2);
            redpointLimitMoneyLevel = int.Parse(funcConfig.Numerical3);
            equipPlaces = new List<int>(12);
            for (int i = 1; i <= 12; i++)
@@ -589,11 +591,15 @@
                    return;
                }
            }
            var money = UIHelper.GetMoneyCnt(3);
            if (money < (ulong)redpointLimitMoney)
            if (PlayerDatas.Instance.baseData.LV >= redpointLimitMoneyLevel)
            {
                RefreshRedpoint(Int2.zero, 0);
                return;
                var money = UIHelper.GetMoneyCnt(3);
                if (money < (ulong)redpointLimitMoney)
                {
                    RefreshRedpoint(Int2.zero, 0);
                    return;
                }
            }
            var equipSets = equipModel.GetAllEquipSets();
System/GeneralConfig/GeneralDefine.cs
@@ -192,11 +192,13 @@
    public static List<int> equipDecomposeScreen = new List<int>();
    public static Dictionary<int, float> AtkTypeIncreasePushDis = new Dictionary<int, float>();
    public static Dictionary<int, CameraController.LookAtData> NpcDieSetCamera = new Dictionary<int, CameraController.LookAtData>();
    public static int BlueEquipJumpLevel { get; private set; }
    public static void Init()
    {
        try
        {
            BlueEquipJumpLevel = GetInt("BlueEquipJumpLevel");
            initDepotGridCount = GetInt("InitDepotCellCount");
            maxDepotGridCount = GetInt("MaxDepotCellCount");
            initBagGridCount = GetInt("InitBagCellCount");
System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -58,20 +58,31 @@
            if (incidents.Count > 0)
            {
                model.selectIncident = incidents[0];
                var error = 0;
                foreach (var id in incidents)
                var _ids = new List<int>(incidents);
                _ids.Sort((x, y) =>
                {
                    HazyRegionModel.Incident incident;
                    if (model.TryGotoIncident(id, false, out error)
                        && model.TryGetIncident(id, out incident)
                        && incident.state == HazyRegionModel.IncidentState.Processing)
                    HazyRegionModel.Incident lhs_incident;
                    HazyRegionModel.Incident rhs_incident;
                    if (model.TryGetIncident(x, out lhs_incident)
                    && model.TryGetIncident(y, out rhs_incident))
                    {
                        model.selectIncident = id;
                        break;
                        var lhs_index = model.incidentSelectSort.IndexOf(lhs_incident.state);
                        var rhs_index = model.incidentSelectSort.IndexOf(rhs_incident.state);
                        if (lhs_index != rhs_index)
                        {
                            return lhs_index.CompareTo(rhs_index);
                        }
                        lhs_index = incidents.IndexOf(x);
                        rhs_index = incidents.IndexOf(y);
                        if (lhs_index != rhs_index)
                        {
                            return lhs_index.CompareTo(rhs_index);
                        }
                    }
                }
                    return 0;
                });
                model.selectIncident = _ids[0];
            }
            m_CyclicScroll.Init(incidents);
System/HazyRegion/HazyRegionModel.cs
@@ -11,7 +11,7 @@
        Dictionary<int, Incident> m_Incidents = new Dictionary<int, Incident>();
        Dictionary<int, AdventureInfo> m_AdventureInfos = new Dictionary<int, AdventureInfo>();
        public List<HazyRegionIncidentType> incidentTypesSort = new List<HazyRegionIncidentType>()
        public readonly List<HazyRegionIncidentType> incidentTypesSort = new List<HazyRegionIncidentType>()
        {
            HazyRegionIncidentType.Adventure,
            HazyRegionIncidentType.Precious,
@@ -20,6 +20,13 @@
            HazyRegionIncidentType.DemonKing,
        };
        public readonly List<IncidentState> incidentSelectSort = new List<IncidentState>()
        {
            IncidentState.Processing,
            IncidentState.UnStart,
            IncidentState.Complete,
        };
        public int limitPoint { get; private set; }
        public int point { get; private set; }
        public int processingIncidentId { get; private set; }
System/KnapSack/BetterItemGetBehaviour.cs
@@ -26,7 +26,6 @@
        [SerializeField] Button m_Puton;
        [SerializeField] Button m_BetterEquipDetail;
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        BetterEquipGetModel model { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }
        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
@@ -115,7 +114,8 @@
            }
            else
            {
                if (itemConfig.ItemColor >= 3)
                if ((PlayerDatas.Instance.baseData.LV < GeneralDefine.BlueEquipJumpLevel && itemConfig.ItemColor >= 2)
                    || itemConfig.ItemColor >= 3)
                {
                    playerPack.SetLookIndex(betterEquip.guid);
                    WindowCenter.Instance.Close<MainInterfaceWin>();
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -451,7 +451,7 @@
            if (FunctionalGuideCenter.Instance.IsAreaNeedUnflod(2))
            {
                m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = true, immediately = false });
                m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = false, immediately = false });
                m_HighSettingFadeInFadeOut.SwitchImmedidately(true);
            }
        }
System/MainWin/HighSettingFadeInFadeOut.cs
@@ -29,6 +29,7 @@
        State state = State.Closed;
        float closeTimer = 0f;
        int openedFunctionCount = 0;
        TreasureFindHostModel hostModel { get { return ModelCenter.Instance.GetModel<TreasureFindHostModel>(); } }
        LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } }
@@ -38,6 +39,9 @@
        void Start()
        {
            m_Switch.SetListener(() => { Switch(state == State.Closed); });
            openedFunctionCount = 0;
            openedFunctionCount += CountOpenedFunction(m_GridGroup1);
            openedFunctionCount += CountOpenedFunction(m_GridGroup2);
            SwitchImmedidately(false);
        }
@@ -80,7 +84,7 @@
            var index = 0;
            foreach (var grid in m_GridGroup1)
            {
                if (!grid.alwayShow)
                if (!grid.alwayShow && openedFunctionCount > 5)
                {
                    grid.Switch(active, 0, 0f);
                }
@@ -94,7 +98,7 @@
            index = 0;
            foreach (var grid in m_GridGroup2)
            {
                if (!grid.alwayShow)
                if (!grid.alwayShow && openedFunctionCount > 5)
                {
                    var offset = (index / 6) + 1;
                    grid.Switch(active, offset * (m_GridSize.y + m_Space.y), offset * 0.1f);
@@ -118,7 +122,11 @@
        {
            foreach (var grid in m_GridGroup1)
            {
                if (!grid.alwayShow)
                if (grid.alwayShow || openedFunctionCount <= 5)
                {
                    grid.SwitchImmediately(true, 0);
                }
                else
                {
                    grid.SwitchImmediately(active, 0);
                }
@@ -127,7 +135,11 @@
            var index = 0;
            foreach (var grid in m_GridGroup2)
            {
                if (!grid.alwayShow)
                if (grid.alwayShow || openedFunctionCount <= 5)
                {
                    grid.SwitchImmediately(true, ((index / 6) + 1) * (m_GridSize.y + m_Space.y));
                }
                else
                {
                    grid.SwitchImmediately(active, ((index / 6) + 1) * (m_GridSize.y + m_Space.y));
                }
@@ -210,6 +222,10 @@
        private void RefreshGridsActiveState()
        {
            openedFunctionCount = 0;
            openedFunctionCount += CountOpenedFunction(m_GridGroup1);
            openedFunctionCount += CountOpenedFunction(m_GridGroup2);
            ActiveGroup(m_GridGroup1);
            ActiveGroup(m_GridGroup2);
            LayoutGroup(m_GridGroup1, m_GroupContainer1);
@@ -220,6 +236,11 @@
        bool IsShowButton()
        {
            if (openedFunctionCount <= 5)
            {
                return false;
            }
            foreach (var grid in m_GridGroup1)
            {
                if (!grid.alwayShow && grid.gameObject.activeSelf)
@@ -261,6 +282,18 @@
            m_ArrowClose.gameObject.SetActive(state == State.Closed);
        }
        int CountOpenedFunction(MainWinTopGrid[] grids)
        {
            var count = 0;
            foreach (var grid in grids)
            {
                var active = grid.IsOpen();
                count += active ? 1 : 0;
            }
            return count;
        }
        void ActiveGroup(MainWinTopGrid[] grids)
        {
            foreach (var grid in grids)
@@ -271,6 +304,11 @@
                    grid.gameObject.SetActive(true);
                }
                if (grid.gameObject.activeSelf && (grid.alwayShow || openedFunctionCount <= 5))
                {
                    grid.SwitchImmediately(true, 0);
                }
                if (!active && grid.gameObject.activeSelf)
                {
                    grid.gameObject.SetActive(false);
System/MainWin/MainWinTopGrid.cs
@@ -28,14 +28,6 @@
        float targetY = 0f;
        float targetAlpha = 0f;
        private void OnEnable()
        {
            if (m_AlwayShow)
            {
                SwitchImmediately(true, 0);
            }
        }
        public void Switch(bool active, float offset, float delay)
        {
            if (m_AlwayShow)