Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

QD_LCJ

2018-08-10 025f79e744a94f25ba720782f57c4bdb8de57d5e

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, June 28, 2018
//    [  Date ]:           Friday, August 10, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -23,6 +23,7 @@
        public int UnLockHole { get ; private set ; }

        public int UnLockCompose { get ; private set ; }

        public int RuneDrop { get ; private set ; }

        public int Fixed { get ; private set ; }


        public override string getKey()

        {

@@ -55,6 +56,8 @@
                UnLockCompose=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 

            

                RuneDrop=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 

			
                Fixed=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
            }

            catch (Exception ex)

            {


 Core/GameEngine/Model/Config/RuneTowerFloorConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: eb8552f7e3b6ad843878daecebc9eb01
timeCreated: 1530190652
timeCreated: 1533871891
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/Actor/UserInputHandler.cs

@@ -152,6 +152,21 @@
            {

                if (_hero.IsRun())

                {

                    if ((StatusMgr.IsValid()

                      && StatusMgr.Instance.CanMove(PlayerDatas.Instance.PlayerId)))

                    {

                        if (!_hero.IsRushing

                         && !GA_Hero.s_MapSwitching)

                        {

                            float _distance = MathUtility.DistanceSqrtXZ(_hero.PrevPos, _hero.Pos);

                            if (_distance > 0.25f)

                            {

                                _hero.PrevPos = _hero.Pos;

                            }

                            Send_CB409_tagCMPyMove(0);

                        }

                    }



                    if (_hero.State == E_ActorState.AutoRun)

                    {

                        _hero.StopPathFind();


 System/Compose/New/ComposeEquipWin.cs

@@ -112,7 +112,6 @@
            DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent += OnComposeAnswer;

            UIEventTrigger.Get(helpBtn.gameObject).OnDown = OnClickHelpBtn;

            UIEventTrigger.Get(helpBtn.gameObject).OnUp = OnDownUp;

            selectModel.haveSelectItemRefresh += RefreshComposeSuccessRate;

            successRate = 0;

            composeWinModel.funcType = ComposeFuncType.Equip;

            firstTypeDict = composeWinModel.GetFirstTypeModel();

@@ -136,7 +135,6 @@
        {

            selectModel.selectEquipEvent -= RefreshSelectItem;

            DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent -= OnComposeAnswer;

            selectModel.haveSelectItemRefresh -= RefreshComposeSuccessRate;

        }



        protected override void OnAfterClose()

@@ -289,8 +287,8 @@
            if (preThirdType != curThirdType)

            {

                preThirdType = curThirdType;

                curComposeEquipIndex = -1;

            }

            curComposeEquipIndex = -1;

            CreateCell();

            selectModel.ClearSelectModel();

        }

@@ -300,21 +298,38 @@
            if (thirdTypelist == null)

                return;



            ChangeUIState(false, true, false);

            equipTypeLineCellCtrl.Refresh();

            int line = thirdTypelist.Count / 3;

            if(thirdTypelist.Count % 3 > 0)

            if(thirdTypelist.Count > 1)

            {

                line += 1;

                ChangeUIState(false, true, false);

                equipTypeLineCellCtrl.Refresh();

                int line = thirdTypelist.Count / 3;

                if (thirdTypelist.Count % 3 > 0)

                {

                    line += 1;

                }

                int i = 0;

                for (i = 0; i < line; i++)

                {

                    equipTypeLineCellCtrl.AddCell(ScrollerDataType.Header, i);

                }



                equipTypeLineCellCtrl.Restart();

            }

            int i = 0;

            for(i = 0; i < line; i++)

            else

            {

                equipTypeLineCellCtrl.AddCell(ScrollerDataType.Header,i);

                if(thirdTypelist.Count > 0)

                {

                    ItemCompoundConfig tagItemCompound = thirdTypelist[0];

                    ClickEquipTypeCell(tagItemCompound, 0);

                    RefreshUI(tagItemCompound);

                }

            }



            equipTypeLineCellCtrl.Restart();



            
            if(curComposeEquipIndex != -1)

            {

                ItemCompoundConfig tagItemCompound = thirdTypelist[curComposeEquipIndex];

                ClickEquipTypeCell(tagItemCompound, curComposeEquipIndex);

            }

        }



        private void RefreshEquipTypeLineCell(ScrollerDataType type, CellView cell)

@@ -336,10 +351,6 @@
                    icon.SetSprite(tagChinItem.IconKey);

                    bgIcon.SetItemBackGround(tagChinItem.ItemColor);

                    nameText.text = GeneralConfig.Instance.equipPlaceNameDict[tagChinItem.EquipPlace];

                    if (index == curComposeEquipIndex)

                    {

                        ClickEquipTypeCell(tagItemCompound, index);

                    }

                    cellBtn.RemoveAllListeners();

                    cellBtn.AddListener(()=> {

                        ClickEquipTypeCell(tagItemCompound,index);

@@ -637,15 +648,10 @@


        public void RefreshComposeSuccessRate()

        {

            Dictionary<int, ItemModel> unfixedSelectItemDict = selectModel.GetHaveUnfixedSelectItem();

            successRate = 0;

            if (unfixedSelectItemDict != null && compoundModel != null)

            if (compoundModel != null)

            {

                if (unfixedSelectItemDict.Count >= compoundModel.unfixedItemCount)

                {

                    successRate = compoundModel.successRate;



                }

                successRate = compoundModel.successRate;

            }

            successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%"));

        }


 System/FairyAu/FairyAuTaskWin.cs

@@ -129,6 +129,11 @@
        private void OnPlayerDie()

        {

            CloseImmediately();

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            {



                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }

        #endregion

        void ReceiveButton()//领取奖励


 System/MainInterfacePanel/TaskWin.cs

@@ -85,7 +85,11 @@


        private void OnPlayerDie()

        {

            Close();

            CloseImmediately();

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }



        protected override void OnAfterClose()


 System/RuneTower/RuneTowerDungeonHintWin.cs

@@ -18,16 +18,15 @@
        [SerializeField] Text m_Floor;



        [SerializeField] RectTransform m_NormalContainer;

        [SerializeField] ItemBehaviour m_Essence;

        [SerializeField] RunePreviewBehaviour m_Rune;

        [SerializeField] Text m_RuneDrop;



        [SerializeField] RectTransform m_UnLockHoleContainer;

        [SerializeField] Text m_Current;

        [SerializeField] Text m_Next;



        [SerializeField] RectTransform m_UnLockRuneContainer;

        [SerializeField] RunePreviewBehaviour m_UnLockRuneType;

        [SerializeField] Text m_RuneTypeDescription;

        [SerializeField] RectTransform m_EssenceContainer;

        [SerializeField] ItemBehaviour m_Essence;



        RuneTowerModel runeTowerModel { get { return ModelCenter.Instance.GetModel<RuneTowerModel>(); } }



@@ -65,30 +64,33 @@


            m_Floor.text = Language.Get("RuneTower14", towerConfig.TowerName, config.FloorName);



            if (config.UnLockRune > 0 || config.UnLockCompose > 0)

            {

                m_NormalContainer.gameObject.SetActive(false);

                m_UnLockHoleContainer.gameObject.SetActive(false);

                m_UnLockRuneContainer.gameObject.SetActive(true);

            var isLastFloor = runeTowerModel.IsTowerLastFloor(runeTowerModel.currentFloor);



                if (config.UnLockRune > 0)

                {

                    var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.UnLockRune);

                    m_RuneTypeDescription.text = Language.Get("RuneTower3", Language.Get(StringUtility.Contact("RuneType_", itemConfig.Effect1)));

                    m_UnLockRuneType.Display(config.UnLockRune);

                }

                else

                {

                    var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.UnLockCompose);

                    m_RuneTypeDescription.text = Language.Get("RuneTower8", Language.Get(StringUtility.Contact("RuneType_", itemConfig.Effect1)));

                    m_UnLockRuneType.Display(config.UnLockCompose);

                }

            if (isLastFloor)

            {

                m_NormalContainer.gameObject.SetActive(true);

                m_UnLockHoleContainer.gameObject.SetActive(false);

                m_EssenceContainer.gameObject.SetActive(false);



                m_Rune.Display(config.RuneDrop);

                var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.RuneDrop);

                m_RuneDrop.text = Language.Get("RuneTower13", UIHelper.GetTextColorByItemColor(itemConfig.ItemColor, itemConfig.ItemName));

            }

            else if (config.Fixed == 1)

            {

                m_NormalContainer.gameObject.SetActive(true);

                m_UnLockHoleContainer.gameObject.SetActive(false);

                m_EssenceContainer.gameObject.SetActive(false);



                m_Rune.Display(config.RuneDrop);

                var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.RuneDrop);

                m_RuneDrop.text = Language.Get("RuneTower23", UIHelper.GetTextColorByItemColor(itemConfig.ItemColor, itemConfig.ItemName));

            }

            else if (config.UnLockHole > 0)

            {

                m_NormalContainer.gameObject.SetActive(false);

                m_UnLockHoleContainer.gameObject.SetActive(true);

                m_UnLockRuneContainer.gameObject.SetActive(false);

                m_EssenceContainer.gameObject.SetActive(false);



                var nextHole = runeTowerModel.GetAccumulativeUnLockHoleCount(runeTowerModel.currentFloor);

                var currentHole = nextHole - 1;

@@ -97,16 +99,11 @@
            }

            else

            {

                m_NormalContainer.gameObject.SetActive(true);

                m_NormalContainer.gameObject.SetActive(false);

                m_UnLockHoleContainer.gameObject.SetActive(false);

                m_UnLockRuneContainer.gameObject.SetActive(false);

                m_EssenceContainer.gameObject.SetActive(true);



                m_Essence.SetItem(config.RuneDrop, 1);



                var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.RuneDrop);

                var runeType = Language.Get(StringUtility.Contact("RuneType_", itemConfig.Effect1));



                m_RuneDrop.text = Language.Get("RuneTower13", UIHelper.GetTextColorByItemColor(itemConfig.ItemColor, runeType));

                m_Essence.SetItem(2106, config.RuneEssence);

            }



        }


 System/RuneTower/RuneTowerModel.cs

@@ -151,6 +151,21 @@
            }

        }



        public bool IsTowerLastFloor(int _floorId)

        {

            var index = sortedFloors.IndexOf(_floorId);

            if (sortedFloors.Count - 1 == index)

            {

                return true;

            }

            else

            {

                var config = ConfigManager.Instance.GetTemplate<RuneTowerFloorConfig>(_floorId);

                var nextConfig = ConfigManager.Instance.GetTemplate<RuneTowerFloorConfig>(sortedFloors[index + 1]);

                return nextConfig.TowerId > config.TowerId;

            }

        }



        public List<int> GetUnLockedRuneCategorys()

        {

            var categorys = new List<int>();