Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dungeon/DungeonRuneTowerVictoryWin.cs

@@ -46,7 +46,7 @@
                var config = Config.Instance.Get<RuneTowerFloorConfig>(runeTowerModel.currentFloor);

                var lastFloor = (int)ModelCenter.Instance.GetModel<RuneModel>().RuneTowerOpenLV;

                var lastFloorConfig = Config.Instance.Get<RuneTowerFloorConfig>(lastFloor);

                m_RuneTowerNext.gameObject.SetActive(config.TowerId == lastFloorConfig.TowerId);

                m_RuneTowerNext.gameObject.SetActive(lastFloorConfig.AutoExit == 0 && config.TowerId == lastFloorConfig.TowerId);



                DisplayRunesUnLock(lastFloor);

            }