Merge branch 'master' into 【1.4】聚魂功能

client_linchunjie

2018-12-20 605a8938233a9490693d219c1771ecdff89c1123

Merge branch 'master' into 【1.4】聚魂功能

 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -45,6 +45,30 @@
            if (timer > 1f)

            {

                timer = 0f;



                var bossId = model.currentBossNotify.bossId;

                if (!model.IsBossAlive(bossId))

                {

                    var type = model.GetBossFindPreciousType(bossId);

                    switch (type)

                    {

                        case FindPreciousType.DemonJar:

                            model.ReportConfirmBossRebornNotify(model.currentBossNotify);

                            break;

                        default:

                            FindPreciousModel.BossInfo bossInfo;

                            if (model.TryGetBossInfo(bossId, out bossInfo))

                            {

                                var rebornCountDown = (int)(bossInfo.refreshTime - TimeUtility.ServerNow).TotalSeconds;

                                if (rebornCountDown > FindPreciousModel.PREPOSE_SECONDS)

                                {

                                    model.ReportConfirmBossRebornNotify(model.currentBossNotify);

                                }

                            }

                            break;

                    }

                }



                DisplayRebornCountDown();

            }

        }


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -513,22 +513,7 @@
            if ((_areaType == MapArea.E_Type.Neutral || _areaType == MapArea.E_Type.Boss) && _enter)

            {

                WindowCenter.Instance.Open<NeutralMarkWin>();

                int mapID = PlayerDatas.Instance.baseData.MapID;

                var config = Config.Instance.Get<MapConfig>(mapID);

                int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();

                if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID) || fairyGrabBossModel.grabBossHintOpen)

                {

                    //return;

                }

                else

                {

                    if (atkInt.Length > 1 && Buffmodel.PkType != 5)

                    {

                        onMainModel.AreaState = Buffmodel.PkType;

                        DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);

                    }

                }

                
                AtkTypeChange();

            }



            if (_areaType == MapArea.E_Type.Neutral && !_enter)

@@ -583,6 +568,25 @@
            }

        }



        private void AtkTypeChange()//骑宠争夺是否切换状态

        {

            int mapID = PlayerDatas.Instance.baseData.MapID;

            var config = Config.Instance.Get<MapConfig>(mapID);

            int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();

            if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))

            {

  
            }

            else

            {

                if (fairyGrabBossModel.grabBossHintOpen && atkInt.Length > 1 && Buffmodel.PkType != 5)

                {

                    onMainModel.AreaState = Buffmodel.PkType;

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);

                }

            }



        }

        private void OnMaininterCDTime()

        {

            MarkRayButton();

@@ -1152,6 +1156,7 @@
        {

            IsShowTaskPanel();

            ShowFairyGrabBoss();

            AtkTypeChange();

        }



        private void ShowFairyGrabBoss()


 System/Vip/VipInvest/CheckDisplay.cs

@@ -27,7 +27,7 @@
        private void OnEnable()

        {

            IsBool = false;

            _time = 0;

            _time = 0;     
        }
        private void LateUpdate()

        {


 System/Vip/VipInvest/RotatePointer.cs

@@ -31,7 +31,7 @@
        public float _Speed = 1f;

        WheelOfFortuneModel wheelOfFortuneModel { get { return ModelCenter.Instance.GetModel<WheelOfFortuneModel>(); } }

        [SerializeField] CheckDisplay m_CheckDisplay;



        private int FairyJade = 0;

        public void Init()

        {

            IsRotateBool = false;

@@ -43,7 +43,7 @@
        }

        private void OnEnable()

        {



            FairyJade = (int)UIHelper.GetMoneyCnt(2);

        }

        private void OnDisable()

        {

@@ -61,6 +61,10 @@
                    sequence.Kill();

                    transform.localRotation = Quaternion.Euler(0, 0, -Angle);

                    m_CheckDisplay.ShowSelected(wheelOfFortuneModel.Lattice);

                    int money = ((int)UIHelper.GetMoneyCnt(2) - FairyJade);

                    string str=UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName);

                    SysNotifyMgr.Instance.ShowTip("BindJadeNotice", str, money);

                    FairyJade = (int)UIHelper.GetMoneyCnt(2);

                    if (IsButtonShow != null)

                    {

                        IsButtonShow(true);

@@ -113,6 +117,10 @@
                            IsButtonShow(true);

                        }

                        m_CheckDisplay.ShowSelected(wheelOfFortuneModel.Lattice);

                        int money = ((int)UIHelper.GetMoneyCnt(2) - FairyJade);

                        string str = UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName);

                        SysNotifyMgr.Instance.ShowTip("BindJadeNotice", str, money);

                        FairyJade = (int)UIHelper.GetMoneyCnt(2);

                    });

                    IsRotateBool = false;

                }


 System/Vip/VipInvest/WheelOfFortuneModel.cs

@@ -5,6 +5,7 @@

using LitJson;
using System;
using System.Collections;

using System.Collections.Generic;
using TableConfig;
using UnityEngine;
@@ -84,7 +85,8 @@
                    angleClass.AngleEnd = (float)AngleList[i][1];
                    AngleDic.Add(Type, angleClass);
                }
            }
            }

            SysNotifyMgr.Instance.RegisterCondition("BindJadeNotice", SatisfyNotifyCondition);
        }

        public override void UnInit()
@@ -202,6 +204,16 @@
            }
            return 0;
        }
        private bool SatisfyNotifyCondition(string key, ArrayList paramArray)

        {

           
            if (paramArray != null && paramArray.Count > 0 &&

                paramArray[0].Equals(UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName)))

            {

                return false;

            }

            return true;

        }
    }
}


 System/Vip/VipInvest/WheelOfFortuneWin.cs

@@ -109,7 +109,7 @@
        private void EndOfFlashing()

        {

            TiedJadeChange();

            SoundPlayer.Instance.PlayUIAudio(72);

            SoundPlayer.Instance.PlayUIAudio(72);          
            m_UIEffect_1.Play();

        }



@@ -188,7 +188,7 @@
        }
        private Sequence mScoreSequence;
        private void TiedJadeChange()//绑玉变化

        {

        {           
            m_RotationTween.enabled = true;

            mScoreSequence = DOTween.Sequence();

            mScoreSequence.SetAutoKill(false);


 Utility/SevenZipUtility.cs

@@ -37,7 +37,9 @@

    public static void DeCompress(string from, string to)
    {
#if !(UNITY_IOS || UNITY_IPHONE)
        lzma.doDecompress7zip(from, to, false, true);
#endif
    }

}