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

client_Hale

2019-01-15 965525d57a1933e38a952a8b555ee1d59c7ed710

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

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -470,7 +470,7 @@
        }

        catch (Exception ex)

        {

            DebugEx.LogError(ex);

            DebugEx.LogError(ex.StackTrace);

        }

    }




 System/FindPrecious/DemonJarAutoChallenge.cs

@@ -59,6 +59,16 @@

        timer = 0f;

        if (CrossServerLogin.Instance.IsEnterCrossServerPreparing())
        {
            return;
        }

        if (CrossServerUtility.IsCrossServer())
        {
            return;
        }

        var bossIds = findPreciousModel.GetBossSubscribes();
        var maxLevelBoss = 0;
        var maxLevel = 0;

 System/FindPrecious/FindPreciousModel.cs

@@ -551,6 +551,11 @@


        public bool AutoGotoSkillDemonJarBoss(BossNotify notify)

        {

            if (CrossServerUtility.IsCrossServer())

            {

                return false;

            }



            if (!demonJarModel.autoChallenge)

            {

                return false;


 System/Realm/RealmPropertyUpWin.cs

@@ -322,20 +322,8 @@


                    var model = ModelCenter.Instance.GetModel<MagicianModel>();

                    Dictionary<int, int> dict = new Dictionary<int, int>();

                    for (int i = 0; i < model.godWeaponTypes.Count; i++)

                    {

                        var type = model.godWeaponTypes[i];

                        var godWeaponInfo = model.GetGodWeaponInfo(type);

                        if (type == ActivateShow.godWeaponType)

                        {

                            var level = model.GetGodWeaponStageRequireLevel(type, ActivateShow.godWeaponStage);

                            dict.Add(type, level);

                        }

                        else

                        {

                            dict.Add(type, godWeaponInfo == null ? 0 : godWeaponInfo.level);

                        }

                    }

                    var level = model.GetGodWeaponStageRequireLevel(ActivateShow.godWeaponType, ActivateShow.godWeaponStage);

                    dict.Add(ActivateShow.godWeaponType, level);



                    UI3DPlayerExhibitionData data = new UI3DPlayerExhibitionData()

                    {