Merge branch 'JadeDynastyTower' of http://192.168.0.87:10010/r/snxxz_script...

client_Zxw

2019-01-21 d4e1d34622dfddc1eeb82f57fa4891076448d311

Merge branch 'JadeDynastyTower' of http://192.168.0.87:10010/r/snxxz_scripts into JadeDynastyTower

 Fight/Stage/Dungeon/JadeDynastyTowerDungeonStage.cs

@@ -42,7 +42,6 @@
    protected override void OnStageLoadFinish()
    {
        base.OnStageLoadFinish();

        WindowCenter.Instance.Open<RuneTowerDungeonHintWin>();
    }

@@ -55,10 +54,10 @@
    {
        WindowCenter.Instance.Close<RuneTowerDungeonHintWin>();
        SoundPlayer.Instance.PlayBackGroundMusicOneShot(258);
        var model = ModelCenter.Instance.GetModel<RuneTowerModel>();
        var config = Config.Instance.Get<RuneTowerFloorConfig>(model.currentFloor);
        var model = ModelCenter.Instance.GetModel<JadeDynastyTowerModel>();
        var config = Config.Instance.Get<JadeDynastyTowerConfig>(model.currentFloor);

        if (config != null && config.FloorIndex > 1)
        if (config != null && config.floorIndex > 1)
        {
            m_ShowCamera.gameObject.SetActive(true);
            CameraController.Instance.CameraObject.enabled = false;
@@ -82,7 +81,7 @@
                CameraController.Instance.CameraObject.transform.rotation,
                CameraController.Instance.CameraObject.fieldOfView));

            model.RequestSetDungeonAction();
            model.RequestRefreshMonster();

            m_ShowCamera.gameObject.SetActive(false);
            CameraController.Instance.CameraObject.enabled = true;
@@ -101,7 +100,6 @@
            WindowCenter.Instance.Open<MapNameHintWin>();
            WindowCenter.Instance.Open<RuneTowerDungeonHintWin>();
        }

    }

    IEnumerator Co_CameraLerpTo(Camera camera, Vector3 toPosition, Quaternion toRotation, float toFov)

 System/JadeDynastyTower/JadeDynastyTowerModel.cs

@@ -5,10 +5,11 @@

namespace Snxxz.UI
{
    public class JadeDynastyTowerModel : Model, IPlayerLoginOk, IMapInitOk
    public class JadeDynastyTowerModel : Model, IPlayerLoginOk, IMapInitOk, IBeforePlayerDataInitialize
    {
        public const int DATA_MAPID = 0;
        const int REDPOINTID = 1;
        const int functionId = 166;

        public int highestPassFloor { get; private set; }
        public int currentFloor {
@@ -29,8 +30,11 @@
            set { LocalSave.SetInt(StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "_JadeDynastyTowerUnLockFloor"), value); }
        }

        bool serverInited = false;
        Redpoint redpoint = new Redpoint(REDPOINTID);
        List<int> sortedFloors = new List<int>();

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        public override void Init()
        {
@@ -46,10 +50,19 @@
            var error = GetErrorOfChallenge();
            if (error == 0)
            {
                dungeonModel.RequestChallangeDungeon(DATA_MAPID, 0);
            }
            else
            {

                switch (error)
                {
                    case 1:
                        break;
                    case 2:
                        break;
                    default:
                        break;
                }
            }
        }

@@ -60,15 +73,22 @@

        private int GetErrorOfChallenge()
        {
            if (!FuncOpen.Instance.IsFuncOpen(functionId))
            {
                return 1;
            }

            var enterTimes = dungeonModel.GetEnterTimes(DATA_MAPID);
            var totalTimes = dungeonModel.GetTotalTimes(DATA_MAPID);
            if (enterTimes >= totalTimes)
            {
                return 2;
            }

            return 0;
        }

        public void RequestRefreshMonster()
        {

        }

        public void RequestSetDungeonAction()
        {
            var sendInfo = new CA508_tagCMDoFBAction();
            sendInfo.ActionType = 0;
@@ -118,12 +138,21 @@

        public void UpdateHighestPassFloor(HB213_tagMCZhuXianTowerInfo info)
        {
            var oldRecorder = highestPassFloor;
            highestPassFloor = (int)info.Floor;
            if (serverInited && highestPassFloor > oldRecorder)
            {
                var config = Config.Instance.Get<JadeDynastyTowerConfig>(highestPassFloor);
                if (config.unLockEquipPlace > 0)
                {
                    specialUnLockFloor = highestPassFloor;
                }
            }
        }

        public void OnPlayerLoginOk()
        {

            serverInited = true;
        }

        public void OnMapInitOk()
@@ -131,7 +160,7 @@
            switch (PlayerDatas.Instance.baseData.MapID)
            {
                case DATA_MAPID:
                    RequestSetDungeonAction();
                    RequestRefreshMonster();
                    break;
            }
        }
@@ -145,6 +174,10 @@
            }
        }

        public void OnBeforePlayerDataInitialize()
        {
            serverInited = false;
        }
    }
}


 System/Message/RichTableEvent.cs

@@ -391,6 +391,19 @@
                                    }

                                }

                                break;

                            case "jadedynastytower":

                                {

                                    var _id = 0;

                                    if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))

                                    {

                                        var config = Config.Instance.Get<JadeDynastyTowerConfig>(_id);

                                        if (config != null)

                                        {

                                            return config.floorName;

                                        }

                                    }

                                }

                                break;

                        }

                    }

                }