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

client_linchunjie

2018-08-24 3ebc164f5de609a2d01d23c777248ee43772fd8d

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

 Core/GameEngine/Login/Launch.cs

@@ -43,7 +43,7 @@
        SoundPlayer.CreateSoundPlayer();

        SoundPlayer.Instance.PlayLoginMusic();

        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());

        SystemSetting.Instance.SetVSyncCount(SystemSetting.Instance.GetVSyncCount());

        SystemSetting.Instance.SetGameFrame(SystemSetting.Instance.GetGameFrame());



        SDKUtility.Instance.Init();

        GameObjectPoolManager.Instance.gameObject.name = "GameObjectPool";


 System/FairyAu/PlayerRedPacketDatas.cs

@@ -152,6 +152,8 @@
                }

                else

                {

                    


                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].RedPacketID = (int)info.RedPacketInfo[i].RedPacketID;

                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PlayerID = (int)info.RedPacketInfo[i].PlayerID;

                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Name = info.RedPacketInfo[i].Name;

@@ -162,6 +164,17 @@
                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].GetWay = (int)info.RedPacketInfo[i].GetWay;

                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PacketCnt = (int)info.RedPacketInfo[i].PacketCnt;

                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = (int)info.RedPacketInfo[i].State;

                    if ((int)info.RedPacketInfo[i].RedPacketID == RedBagId)

                    {

                        var Values = _DicRedGrabinfo.Values;

                        foreach (var value in Values)

                        {

                            if (value.Name == PlayerDatas.Instance.baseData.PlayerName)

                            {

                                _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = 2;

                            }

                        }

                    }

                    _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Wish = (string)info.RedPacketInfo[i].Wish;

                    if (Event_RedEnvelopeToRefresh != null)

                    {

@@ -170,10 +183,7 @@
                    }

                        

                }



            }





        }



        IsRedBagGet();


 System/SystemSetting/SystemSetWin.cs

@@ -50,7 +50,7 @@
            m_HighQuality.AddListener(OnSetQualityHigh);

            m_MediumQuality.AddListener(OnSetQualityMedium);

            m_LowQuality.AddListener(OnSetQualityLow);

            m_SixtyFrame.AddListener(SwitchVSyncCount);

            m_SixtyFrame.AddListener(SwitchGameFrame);



            m_OtherPlayer.AddListener(OnShowOrHideOtherPlayers);

            m_Monster.AddListener(OnShowOrHideMonsters);

@@ -82,7 +82,7 @@
            UpdateToggleSkin(m_OtherPlayer);

            UpdateToggleSkin(m_Monster);



            m_SixtyFrame.isOn = SystemSetting.Instance.GetVSyncCount() == 1;

            m_SixtyFrame.isOn = SystemSetting.Instance.GetGameFrame() == GameFrame.FullFrame;



            var serverName = ServerListCenter.Instance.GetServerData(ServerListCenter.Instance.currentServer.region_flag).name;

            var playerAccount = PlayerDatas.Instance.baseData.AccID.Split('@');

@@ -116,7 +116,7 @@


            loginModel.accountBindOkEvent += UpdateAccountBindTitle;

            SDKUtility.Instance.onFreePlatfromDoIDAuthenticationOk += OnAuthenticationOk;

            SystemSetting.Instance.vSyncCountChangeEvent += OnSwitchVSyncCount;

            SystemSetting.Instance.gameFrameChangeEvent += OnSwitchGameFrame;

            SystemSetting.Instance.playerSyncCountChangeEvent += OnPlayerSyncCountChange;



            isInited = true;

@@ -127,7 +127,7 @@
            isInited = false;

            loginModel.accountBindOkEvent -= UpdateAccountBindTitle;

            SDKUtility.Instance.onFreePlatfromDoIDAuthenticationOk -= OnAuthenticationOk;

            SystemSetting.Instance.vSyncCountChangeEvent -= OnSwitchVSyncCount;

            SystemSetting.Instance.gameFrameChangeEvent -= OnSwitchGameFrame;

            SystemSetting.Instance.playerSyncCountChangeEvent -= OnPlayerSyncCountChange;

            SystemSetting.Instance.SetPlayerSyncCount(playerSyncCountRef);

        }

@@ -182,7 +182,7 @@
                SystemSetting.Instance.SetQualityLevel(GameQuality.Low);

                if (isInited)

                {

                    SystemSetting.Instance.SetVSyncCount(2);

                    SystemSetting.Instance.SetGameFrame(GameFrame.HalfFrame);

                    SystemSetting.Instance.SetPlayerSyncCount(5);

                }

            }

@@ -190,25 +190,25 @@
            UpdateToggleSkin(m_LowQuality);

        }



        private void SwitchVSyncCount()

        private void SwitchGameFrame()

        {

            var currentVSyncCount = SystemSetting.Instance.GetVSyncCount();

            switch (currentVSyncCount)

            var gameFrame = SystemSetting.Instance.GetGameFrame();

            switch (gameFrame)

            {

                case 1:

                    SystemSetting.Instance.SetVSyncCount(2);

                case GameFrame.HalfFrame:

                    SystemSetting.Instance.SetGameFrame(GameFrame.FullFrame);

                    break;

                case 2:

                    SystemSetting.Instance.SetVSyncCount(1);

                case GameFrame.FullFrame:

                    SystemSetting.Instance.SetGameFrame(GameFrame.HalfFrame);

                    break;

                default:

                    break;

            }

        }



        private void OnSwitchVSyncCount()

        private void OnSwitchGameFrame()

        {

            m_SixtyFrame.isOn = SystemSetting.Instance.GetVSyncCount() == 1;

            m_SixtyFrame.isOn = SystemSetting.Instance.GetGameFrame() == GameFrame.FullFrame;

        }



        private void OnShowOrHideOtherPlayers(bool _value)


 System/SystemSetting/SystemSetting.cs

@@ -12,7 +12,7 @@
    const string SOUND_VOLUME_KEY = "SoundRatioKey";  //音乐

    const string SOUND_EFFECT_KEY = "SoundEffect"; //音效

    const string FPS_KEY = "FPSKey";

    const string VSYNC_KEY = "GameVSyncCountSetting";//垂直同步率

    const string GAMEFRAME_KEY = "GameFrameSetting";//垂直同步率



    public Dictionary<SystemSwitch, bool> systemSettings = new Dictionary<SystemSwitch, bool>();



@@ -21,7 +21,7 @@
    public event Action<SystemSwitch, bool> OnSettingChanged;

    public event Action qualityLevelChangeEvent;

    public event Action playerSyncCountChangeEvent;

    public event Action vSyncCountChangeEvent;

    public event Action gameFrameChangeEvent;



    public SystemSetting()

    {

@@ -54,19 +54,19 @@
        return LocalSave.GetFloat(SOUND_EFFECT_KEY, 1);

    }



    public void SetVSyncCount(int _vSync)

    public void SetGameFrame(GameFrame _frame)

    {

        LocalSave.SetInt(VSYNC_KEY, QualitySettings.vSyncCount = Mathf.Clamp(_vSync, 0, 2));



        if (vSyncCountChangeEvent != null)

        LocalSave.SetInt(GAMEFRAME_KEY, (int)_frame);

        SetFPSLimit((int)_frame);

        if (gameFrameChangeEvent != null)

        {

            vSyncCountChangeEvent();

            gameFrameChangeEvent();

        }

    }



    public int GetVSyncCount()

    public GameFrame GetGameFrame()

    {

        return LocalSave.GetInt(VSYNC_KEY, 2);

        return (GameFrame)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFrame.HalfFrame);

    }



    public void SetSystemSettingSwitch(SystemSwitch type, bool _value)

@@ -219,12 +219,12 @@


    public void SetFPSLimit(int _fps)

    {

        LocalSave.SetInt(FPS_KEY, Application.targetFrameRate = Mathf.Clamp(_fps, 30, 60));

        Application.targetFrameRate = Mathf.Clamp(_fps, 30, 60);

    }



    public int GetFPSLimit()

    {

        return LocalSave.GetInt(FPS_KEY, 30);

        return (int)GetGameFrame();

    }



    public void LetFPSUnLimit()

@@ -264,4 +264,11 @@
    Low = 0,

    Medium = 1,

    High = 2,

}



public enum GameFrame

{

    Free = -1,

    HalfFrame = 30,

    FullFrame = 60,

}