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

client_Hale

2018-11-19 8581b75ad2116f49af07a49966e8a3d78597d2e5

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

 System/RuneTower/RunePreviewGroup.cs

@@ -28,10 +28,10 @@


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



        public void Display(int _floor)

        public void Display(int selectedFloor, int nextUnLockFloor)

        {

            var config = Config.Instance.Get<RuneTowerFloorConfig>(_floor);

            if (_floor == runeTowerModel.selectedFloor)

            var config = Config.Instance.Get<RuneTowerFloorConfig>(nextUnLockFloor);

            if (nextUnLockFloor == runeTowerModel.selectedFloor)

            {

                m_FloorTitle.text = Language.Get("RuneTower10");

            }

@@ -56,12 +56,12 @@
                m_UnLockRuneHoleContainer.gameObject.SetActive(true);

                m_UnLockRuneComposeContainer.gameObject.SetActive(false);



                var nextHole = runeTowerModel.GetAccumulativeUnLockHoleCount(_floor);

                var nextHole = runeTowerModel.GetAccumulativeUnLockHoleCount(nextUnLockFloor);

                var currentHole = nextHole - 1;

                m_CurrentUnLockRuneHole.text = currentHole.ToString();

                m_NextUnLockRuneHole.text = nextHole.ToString();

            }

            else

            else if (config.UnLockCompose > 0)

            {

                m_UnLockRuneTypeContainer.gameObject.SetActive(false);

                m_UnLockRuneHoleContainer.gameObject.SetActive(false);

@@ -71,7 +71,17 @@
                m_UnLockRuneCompose.text = Language.Get("RuneTower8", Language.Get(StringUtility.Contact("RuneType_", itemConfig.Effect1)));

                m_RuneComposeBehaviour.Display(config.UnLockCompose);

            }

            else

            {

                var selectedConfig = Config.Instance.Get<RuneTowerFloorConfig>(selectedFloor);

                m_UnLockRuneTypeContainer.gameObject.SetActive(true);

                m_UnLockRuneHoleContainer.gameObject.SetActive(false);

                m_UnLockRuneComposeContainer.gameObject.SetActive(false);



                var itemConfig = Config.Instance.Get<ItemConfig>(selectedConfig.RuneDrop);

                m_UnLockRuneType.text = Language.Get("RuneTower13", Language.Get(StringUtility.Contact("RuneType_", itemConfig.Effect1)));

                m_RuneBehaviour.Display(config.RuneDrop);

            }

        }



    }


 System/RuneTower/RuneTowerWin.cs

@@ -236,7 +236,7 @@
            }



            var nextUnLockFloor = model.GetNextUnLockFloor(model.selectedFloor);

            m_RunePreviewGroup.Display(nextUnLockFloor);

            m_RunePreviewGroup.Display(model.selectedFloor, nextUnLockFloor);

        }



        private void UpdateFightPower()