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

hch

2019-11-12 790f7cacbb853379a6ea0e6f65267c679cf2ed5c

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

 Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0309_tagPlayerLoginInfo.cs

@@ -1,6 +1,6 @@
using System;
using LitJson;

using Snxxz.UI;
using UnityEngine;

/** 主角登录时候的简短信息 */
@@ -20,9 +20,13 @@
            GameNetSystem.Instance.UpdateCrossServerData(vNetData.IP, vNetData.Port, vNetData.CrossState);
        }

        if (RoleChange != null)
        if (DTC0132_tagCreateRoleSucess.isCreateRole)
        {
            RoleChange();
            var tagCRoleLoginAsk = new C0108_tagCRoleLoginAsk();
            tagCRoleLoginAsk.Type = 2;//进入游戏
            tagCRoleLoginAsk.ClientID = SDKUtility.Instance.RegistrationID;
            GameNetSystem.Instance.SendInfo(tagCRoleLoginAsk);
            NetLinkWin.Show();
        }

        var _hero = PlayerDatas.Instance.hero;

 Fight/MapTransferUtility.cs

@@ -765,7 +765,7 @@


            var _curMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);

            // 副本中不可以传送

            if (_curMapConfig.MapFBType != 0)

            if (_curMapConfig.MapFBType != 0 && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");

                return;


 System/Login/CreateRoleWin.cs

@@ -78,7 +78,6 @@


        protected override void OnPreOpen()

        {

            DTC0309_tagPlayerLoginInfo.RoleChange += OnCreateRoleSuccess;

            model.onCreateRole = true;

        }



@@ -93,7 +92,6 @@


        protected override void OnAfterClose()

        {

            DTC0309_tagPlayerLoginInfo.RoleChange -= OnCreateRoleSuccess;

            model.onCreateRole = false;

        }



@@ -249,6 +247,7 @@


            LanguageVerify.Instance.VerifyPlayerName(m_NameInput.text, 0, string.Empty, 0, 0, (bool ok, string name) =>

              {

                  DTC0132_tagCreateRoleSucess.isCreateRole = false;

                  C0105_tagCCreateRole createRole = new C0105_tagCCreateRole();//实例化C0105_tagCCreateRole

                  createRole.Job = (byte)CreateRoleManager.Instance.selectedJob.value;

                  createRole.Name = name;

@@ -269,12 +268,6 @@
                ServerTipDetails.DisplayNormalTip(Language.Get("L1116"));

                return;

            }



            var tagCRoleLoginAsk = new C0108_tagCRoleLoginAsk();

            tagCRoleLoginAsk.Type = 2;//进入游戏

            tagCRoleLoginAsk.ClientID = SDKUtility.Instance.RegistrationID;

            GameNetSystem.Instance.SendInfo(tagCRoleLoginAsk);

            NetLinkWin.Show();

        }



        [System.Serializable]


 System/MainInterfacePanel/ChatFrame.cs

@@ -265,7 +265,7 @@
                    }

                    else

                    {

                        language = Language.Get(config.ExitDescription);

                        //language = Language.Get(config.ExitDescription);

                    }

                }

                else

@@ -273,15 +273,21 @@
                    language = Language.Get(config.ExitDescription);

                }



                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

                   language, (bool isOk) =>

                    {

                        if (isOk)

                        {

                            GoToOneKeyButton();

                        }

                    }

                );

                if (language == string.Empty)

                {

                    GoToOneKeyButton();

                }

                else {

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),

                       language, (bool isOk) =>

                       {

                           if (isOk)

                           {

                               GoToOneKeyButton();

                           }

                       }

                    );

                }



            }

            else


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -140,7 +140,7 @@
            IsShowTaskPanel();//是否显示任务面板

            m_MainPositionTween.ShowTaskImmedidately(true, false);



            if (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID))

            if (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID) && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                m_FunctionForecastTip.gameObject.SetActive(false);

            }

@@ -509,7 +509,7 @@
        private void IsShowTaskPanel()//是否显示任务面板

        {

            var hideTask = AdventureStage.Instance.IsInAdventureStage

                || MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID)

                || (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID) && PlayerDatas.Instance.baseData.MapID != 31020)

                || CrossServerUtility.IsCrossServer()

                || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne;




 System/MainInterfacePanel/TaskListTip.cs

@@ -476,11 +476,11 @@
            return 1;

        }



        private bool IsDungeon()//判断是否在副本中

        private bool IsDungeon()//判断是否在副本中, boss之家暂时视为同非副本

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = MapConfig.Get(mapId);

            return mapConfig != null && mapConfig.MapFBType != 0;

            return mapConfig != null && mapConfig.MapFBType != 0 && mapId != 31020;

        }



        private void TaskJump(int jumpTask = 0)


 System/SystemSetting/SystemSetting.cs

@@ -67,7 +67,7 @@


    public GameFps GetGameFps()

    {

        return (GameFps)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFps.Half);

        return (GameFps)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFps.Full);

    }



    public void SetSystemSettingSwitch(SystemSwitch type, bool _value)


 System/WorldMap/MapModel.cs

@@ -106,7 +106,7 @@
            }



            var currentMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);

            if (currentMapConfig.MapFBType != 0)

            if (currentMapConfig.MapFBType != 0 && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                SysNotifyMgr.Instance.ShowTip("DungeonNoGO");

                return;


 Utility/ConfigInitiator.cs

@@ -294,11 +294,11 @@
        normalTasks.Add(new ConfigInitTask("VipPrivilegeInfoConfig", () => { VipPrivilegeInfoConfig.Init(); }, () => { return VipPrivilegeInfoConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("FairyLeagueRankAwardConfig", () => { FairyLeagueRankAwardConfig.Init(); }, () => { return FairyLeagueRankAwardConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("SpiritWeaponConfig", () => { SpiritWeaponConfig.Init(); }, () => { return SpiritWeaponConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("NewDropItemGroupConfig", () => { NewDropItemGroupConfig.Init(); }, () => { return NewDropItemGroupConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("OpenServerActivityConfig", () => { OpenServerActivityConfig.Init(); }, () => { return OpenServerActivityConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("RidingPetBossRewardConfig", () => { RidingPetBossRewardConfig.Init(); }, () => { return RidingPetBossRewardConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("ReikiRootEffectConfig", () => { ReikiRootEffectConfig.Init(); }, () => { return ReikiRootEffectConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("ItemExchangeConfig", () => { ItemExchangeConfig.Init(); }, () => { return ItemExchangeConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("NewDropItemGroupConfig", () => { NewDropItemGroupConfig.Init(); }, () => { return NewDropItemGroupConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("OpenServerActivityConfig", () => { OpenServerActivityConfig.Init(); }, () => { return OpenServerActivityConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("RidingPetBossRewardConfig", () => { RidingPetBossRewardConfig.Init(); }, () => { return RidingPetBossRewardConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("ReikiRootEffectConfig", () => { ReikiRootEffectConfig.Init(); }, () => { return ReikiRootEffectConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("ItemExchangeConfig", () => { ItemExchangeConfig.Init(); }, () => { return ItemExchangeConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("AddUpRechargeConfig", () => { AddUpRechargeConfig.Init(); }, () => { return AddUpRechargeConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("BOSSFirstKillConfig", () => { BOSSFirstKillConfig.Init(); }, () => { return BOSSFirstKillConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("EquipShenAttrConfig", () => { EquipShenAttrConfig.Init(); }, () => { return EquipShenAttrConfig.inited; }));