Merge remote-tracking branch 'origin/master' into HazyRegion_1

client_linchunjie

2019-05-22 e75e1b9182a6872108a9cf397d4d9c1ed3afda50

Merge remote-tracking branch 'origin/master' into HazyRegion_1

 Fight/GameActor/GA_Hero.cs

@@ -639,7 +639,6 @@
                    title = _titleID,

                    name = PlayerDatas.Instance.baseData.PlayerName,

                    alliance = _familyName,

                    forceShowRealm = FuncOpen.Instance.IsFuncOpen(12),

                }

            );



@@ -677,7 +676,7 @@
            return;

        }



        m_HeadUpName.SetPlayerRealm(_realm, FuncOpen.Instance.IsFuncOpen(12));

        m_HeadUpName.SetPlayerRealm(_realm);

    }



    private void OnFunctionOpen(int functionId)


 Fight/GameActor/GA_NpcCollect.cs

@@ -259,14 +259,16 @@
        {

            _hero.MoveToPosition(Pos, 1f);

        }



        PrepareHandler.Instance.TriggerOnShowCollect(ServerInstID, NpcConfig.NPCID);

    }



    protected override void HandleOnClick()

    {

        if (NpcConfig.NPCID != GeneralDefine.GatherSoulDZ)

        {

            base.HandleOnClick();

        }

        // if (NpcConfig.NPCID != GeneralDefine.GatherSoulDZ)

        // {

        //     base.HandleOnClick();

        // }

    }



    protected override void OnUnit()


 Fight/PrepareHandler.cs

@@ -41,11 +41,16 @@
    public UnityAction<uint, int> OnShowCollectIcon;
    public UnityAction<uint, int> OnHideCollectIcon;

    public void TriggerOnShowCollect(uint sid, int npcId)
    {
        if (OnShowCollectIcon != null)
        {
            OnShowCollectIcon(sid, npcId);
        }
    }

    public void Init()
    {
        NPCInteractProcessor.s_NpcInteractEvent -= HandleCallback;
        NPCInteractProcessor.s_NpcInteractEvent += HandleCallback;

        WindowCenter.Instance.windowAfterOpenEvent -= CheckOpenCollectIcon;
        WindowCenter.Instance.windowAfterOpenEvent += CheckOpenCollectIcon;
        WindowCenter.Instance.windowAfterCloseEvent -= CheckCloseCollectIcon;
@@ -89,7 +94,7 @@
        }
    }

    private void HandleCallback(E_NpcType type, int npcID, uint sid)
    public void HandleCallback(E_NpcType type, int npcID, uint sid)
    {
        var _target = GAMgr.Instance.GetBySID(sid);
        if (!(_target is GA_NpcCollect))
@@ -143,15 +148,16 @@
                    _hero.SelectTarget = _npc;
                }

                if (OnShowCollectIcon != null)
                {
                    OnShowCollectIcon(_npc.ServerInstID, _npc.NpcConfig.NPCID);
                }

                _checkDis = MathUtility.DistanceSqrtXZ(_hero.Pos, _npc.Pos);

                if (_checkDis < 4f)
                {
                    if (OnShowCollectIcon != null)
                    {
                        OnShowCollectIcon(_npc.ServerInstID, _npc.NpcConfig.NPCID);
                    }

                    NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, _npc.NpcConfig.NPCID, _npc.ServerInstID);
                    var _dir = MathUtility.ForwardXZ(_npc.Pos, _hero.Pos);
                    _hero.Forward = _dir;
                }

 Lua/LuaGameNetSystem.cs

@@ -132,7 +132,7 @@
        GameNetSystem.Instance.SendInfo(sendBytes.ToArray());
    }

    int readIndex = 0;
    int readIndex = 2;
    public uint TransUintBytes(byte[] value, LuaGameNetSystem.NetDataType type)
    {
        var length = GetBytesLength(type);

 System/Alchemy/AlchemyDrugBatchUseWin.cs

@@ -108,6 +108,13 @@
        {

            var count = (int)Mathf.Ceil(m_SplitSlider.value);



            var isAddReikiPoint = false;

            var config = ItemConfig.Get(itemId);

            if (config != null && config.Effect1 == 200)

            {

                isAddReikiPoint = true;

            }



            var items = packModel.GetItemsById(PackType.Item, itemId);

            if (items != null)

            {

@@ -130,6 +137,11 @@
                }

            }



            if (isAddReikiPoint)

            {

                ModelCenter.Instance.GetModel<ReikiRootModel>().reikiPointPromoteSymbol = true;

            }



            CloseImmediately();

        }

    }


 System/Alchemy/AlchemyUseDrugCell.cs

@@ -103,6 +103,11 @@
                        }

                        else if (ItemOperateUtility.Instance.CheckItemUselimit(itemId))

                        {

                            var config = ItemConfig.Get(itemId);

                            if (config != null && config.Effect1 == 200)

                            {

                                ModelCenter.Instance.GetModel<ReikiRootModel>().reikiPointPromoteSymbol = true;

                            }

                            ItemOperateUtility.Instance.UseItem(list[0].guid);

                        }

                    }


 System/CrossServerBoss/CrossServerBossBreifInfoBehaviour.cs

@@ -197,7 +197,7 @@

            if (m_Realm != null && m_RealmContainer != null)
            {
                if (RealmConfig.Has(_realm))
                if (_realm > 0 && RealmConfig.Has(_realm))
                {
                    m_RealmContainer.gameObject.SetActive(true);
                    var realmConfig = RealmConfig.Get(_realm);

 System/CrossServerOneVsOne/RankCellCtrl.cs

@@ -88,7 +88,7 @@
                m_NameTxt.text = data.PlayerName;

                m_JobTxt.text = OccupationNameConfig.GetOccupationName(data.Job, 1);

                RealmConfig presentCfg = RealmConfig.Get(data.Realm);

                if (presentCfg != null)

                if (data.Realm > 0 && presentCfg != null)

                {

                    m_RealmImage.gameObject.SetActive(true);

                    m_RealmImage.SetSprite(presentCfg.Img);


 System/DailyQuest/FindNumberWin.cs

@@ -95,7 +95,7 @@
        {
            var own = (int)UIHelper.GetMoneyCnt(1);//拥有的仙玉
            var need = NeedCostJade;
            var strLanguage = Language.Get("FairyLand_Func13", NeedCostJade, need);
            var strLanguage = Language.Get("FairyLand_Func13", NeedCostJade);
            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strLanguage, (bool isOk) =>
            {
                if (isOk)

 System/DailyQuest/ResourcesBackBoxBack.cs

@@ -372,7 +372,7 @@
                {

                    int fairyJade = 0;

                    fairyJade = resourcesBackClass.NormalCostJade - CostJade;

                    string strLanguage = string.Format(Language.Get("FairyLand_Func13"), CostJade, resourcesBackClass.NormalCostJade, fairyJade);

                    string strLanguage = string.Format(Language.Get("FairyLand_Func13"), CostJade);

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strLanguage, (bool isOk) =>

                    {

                        if (isOk)

@@ -393,7 +393,7 @@
                {

                    int fairyJade = 0;

                    fairyJade = resourcesBackClass.VipCostJade - CostJade;

                    string strLanguage = string.Format(Language.Get("FairyLand_Func13"), CostJade, resourcesBackClass.VipCostJade, fairyJade);

                    string strLanguage = string.Format(Language.Get("FairyLand_Func13"), CostJade);

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strLanguage, (bool isOk) =>

                    {

                        if (isOk)


 System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs

@@ -197,7 +197,7 @@

            if (m_Realm != null && m_RealmContainer != null)
            {
                if (RealmConfig.Has(_realm))
                if (_realm > 0 && RealmConfig.Has(_realm))
                {
                    m_RealmContainer.gameObject.SetActive(true);
                    var realmConfig = RealmConfig.Get(_realm);

 System/Dungeon/TrialDungeonEntranceWin.cs

@@ -170,7 +170,7 @@
            var npcConfig = NPCConfig.Get(_npcId);

            if (npcConfig != null)

            {

                if (RealmConfig.Has(npcConfig.ClientRealm))

                if (npcConfig.ClientRealm > 0 && RealmConfig.Has(npcConfig.ClientRealm))

                {

                    m_BossRealm.gameObject.SetActive(true);

                    var realmConfig = RealmConfig.Get(npcConfig.ClientRealm);


 System/FairyAu/FairyFeastMemberCell.cs

@@ -51,10 +51,16 @@
            }

            var realmLevel = fairyMember.OfficialRank;

            var config = RealmConfig.Get(realmLevel);

            if (config != null)

            if (realmLevel>0&& config != null)

            {

                m_Realm.gameObject.SetActive(true);

                m_Realm.SetSprite(config.Img);

            }

            else

            {

                m_Realm.gameObject.SetActive(false);

            }



            m_Transmit.gameObject.SetActive(fairyMember.PlayerID != PlayerDatas.Instance.baseData.PlayerID);

            if (fairyMember.PlayerID != PlayerDatas.Instance.baseData.PlayerID)

            {


 System/FairyAu/FairyGrabBossBehaviour.cs

@@ -90,12 +90,18 @@
                m_BossName.color = UIHelper.GetUIColor(horseConfig.Quality, true);

            }



            var realmConfig = RealmConfig.Get(npcConfig.ClientRealm);

            if (realmConfig != null)

            if (npcConfig.ClientRealm > 0 && RealmConfig.Has(npcConfig.ClientRealm))

            {

                m_RealmIcon.gameObject.SetActive(true);

                var realmConfig = RealmConfig.Get(npcConfig.ClientRealm);

                m_RealmIcon.SetSprite(realmConfig.Img);

                m_RealmIcon.SetNativeSize();

            }

            else

            {

                m_RealmIcon.gameObject.SetActive(false);

            }



        }



        private void BossProgressUpdate(int _bossId)


 System/FairyAu/FairyMemberCell.cs

@@ -10,19 +10,15 @@
    public class FairyMemberCell : ScrollerUI

    {

        FairyModel m_Model;

        FairyModel model

        {

            get

            {

        FairyModel model {

            get {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<FairyModel>());

            }

        }



        KingFairyModel m_KingFairyModel;

        KingFairyModel kingFairyModel

        {

            get

            {

        KingFairyModel kingFairyModel {

            get {

                return m_KingFairyModel ?? (m_KingFairyModel = ModelCenter.Instance.GetModel<KingFairyModel>());

            }

        }

@@ -51,12 +47,17 @@
            m_NameTxt.color = UIHelper.GetUIColor(fairyMember.PlayerID == PlayerDatas.Instance.PlayerId ?

                TextColType.Green : TextColType.NavyBrown, true);

            int realmLv = fairyMember.OfficialRank;

            var realmConfig = RealmConfig.Get(realmLv);

            m_RealmImg.gameObject.SetActive(realmConfig != null);

            if (realmConfig != null)

            if (realmLv > 0 && RealmConfig.Has(realmLv))

            {

                var realmConfig = RealmConfig.Get(realmLv);

                m_RealmImg.gameObject.SetActive(true);

                m_RealmImg.SetSprite(realmConfig.Img);

            }

            else

            {

                m_RealmImg.gameObject.SetActive(false);

            }



            m_LvTxt.text = fairyMember.LV.ToString();

            m_DutyTxt.text = Language.Get(string.Format("L102{0}", fairyMember.FamilyLV + 1));

            m_ContributeTxt.text = fairyMember.FamilyActiveValue.ToString();


 System/FindPrecious/ElderGodBreifInfoBehaviour.cs

@@ -93,7 +93,7 @@
                    m_BossLevel.text = Language.Get("Z1024", _level);

                    if (m_Realm != null && m_RealmContainer != null)

                    {

                        if (RealmConfig.Has(_realm))

                        if (_realm > 0 && RealmConfig.Has(_realm))

                        {

                            m_RealmContainer.gameObject.SetActive(true);

                            var realmConfig = RealmConfig.Get(_realm);


 System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs

@@ -92,7 +92,7 @@


            if (m_Realm != null && m_RealmContainer != null)

            {

                if (RealmConfig.Has(_realm))

                if (_realm > 0 && RealmConfig.Has(_realm))

                {

                    m_RealmContainer.gameObject.SetActive(true);

                    var realmConfig = RealmConfig.Get(_realm);


 System/FriendSystem/AddCell.cs

@@ -45,7 +45,7 @@
                lvText.text = friendPlayer.LV.ToString();
            }
            RealmConfig realmModel = RealmConfig.Get(friendPlayer.RealmLV);
            if (friendPlayer.RealmLV != 0)
            if (friendPlayer.RealmLV > 0  && RealmConfig.Has(friendPlayer.RealmLV))
            {
                realmIcon.gameObject.SetActive(true);
                realmIcon.SetSprite(realmModel.Img);

 System/FriendSystem/AddFriendTips.cs

@@ -20,18 +20,15 @@
    private GameObject _searchBG;

    private bool _isRecommend = true;
    public bool IsRecommend
    {
    public bool IsRecommend {
        get { return _isRecommend; }
        set { _isRecommend = value; }
    }
    private string _strSearch = "";

    FriendsModel _friendsModel;
    FriendsModel friendsModel
    {
        get
        {
    FriendsModel friendsModel {
        get {
            return _friendsModel ?? (_friendsModel = ModelCenter.Instance.GetModel<FriendsModel>());
        }
    }
@@ -51,7 +48,7 @@
    {
        _addfriendCtrl = transform.Find("AddFriendCtrl").GetComponent<ScrollerController>();
        _addfriendCtrl.OnRefreshCell += OnRefreshAddFriendCell;
       

        _addfriendGroup = transform.Find("AddFriendCtrl").GetComponent<ToggleGroup>();
        _titleText = transform.Find("SearchTitle/Text").GetComponent<Text>();
        _refreshBtn = transform.Find("RefreshBtn").GetComponent<Button>();
@@ -62,9 +59,9 @@
        _searchBG = transform.Find("BG").gameObject;
        _searchGo = transform.Find("SearchTitle").gameObject;

        _refreshBtn.onClick.AddListener(()=> { OnClickRefreshBtn(); });
        _lookBtn.onClick.AddListener(()=> { OnClickLookBtn(); });
        _inputPlayerName.onValueChanged.AddListener((string inputStr)=> { OnEndInput(inputStr); });
        _refreshBtn.onClick.AddListener(() => { OnClickRefreshBtn(); });
        _lookBtn.onClick.AddListener(() => { OnClickLookBtn(); });
        _inputPlayerName.onValueChanged.AddListener((string inputStr) => { OnEndInput(inputStr); });

        ChatCtrl.Inst.OnClickCloseChatEvent += CloseFriendlist;
    }
@@ -73,13 +70,13 @@
    {
        FriendListUICtrl(false);
    }
    

    public void OnInit()
    {
        _addfriendCtrl.vertical = true;
        RefreshRecommendModel();
       friendsModel.RefreshRecommendFriendEvent -= RefreshRecommendModel;
       friendsModel.RefreshRecommendFriendEvent += RefreshRecommendModel;
        friendsModel.RefreshRecommendFriendEvent -= RefreshRecommendModel;
        friendsModel.RefreshRecommendFriendEvent += RefreshRecommendModel;
        TimeDownMgr.CoolTimeData data;
        if (TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.BagSort, out data))
        {
@@ -117,7 +114,7 @@
        }
        else
        {
            _refreshText.text = Language.Get("FriendsPlayer101",time);
            _refreshText.text = Language.Get("FriendsPlayer101", time);
            _refreshBtn.interactable = false;
            _refreshText.color = greyColor;
        }
@@ -150,7 +147,7 @@
    private void OnRefreshAddFriendCell(ScrollerDataType type, CellView cell)
    {
        cell.GetComponent<Toggle>().group = _addfriendGroup;
        FriendPlayer data =friendsModel.GetAddFriendInfo((uint)cell.index);
        FriendPlayer data = friendsModel.GetAddFriendInfo((uint)cell.index);
        Text friendName = cell.transform.Find("PlayerNameText").GetComponent<Text>();
        Text friendLv = cell.transform.Find("Contain_LV/PlayerLv").GetComponent<Text>();
        Image friendLvIcon = cell.transform.Find("Contain_LV/PlayerLvIcon").GetComponent<Image>();
@@ -173,7 +170,7 @@


        RealmConfig realmModel = RealmConfig.Get(data.RealmLV);
        if (data.RealmLV != 0)
        if (data.RealmLV > 0 && RealmConfig.Has(data.RealmLV))
        {
            titleIcon.gameObject.SetActive(true);
            titleIcon.SetSprite(realmModel.Img);
@@ -202,8 +199,8 @@
            stateText.gameObject.SetActive(false);
        }

        Dictionary<uint, FriendPlayer> friendDict =friendsModel.GetFriendInfoDict((byte)GroupType.Friend);
        if(friendDict != null)
        Dictionary<uint, FriendPlayer> friendDict = friendsModel.GetFriendInfoDict((byte)GroupType.Friend);
        if (friendDict != null)
        {
            if (friendDict.ContainsKey(data.PlayerID))
            {
@@ -212,7 +209,7 @@
                //stateText.text = Language.Get("Friend105");
            }
        }
  

    }


@@ -232,7 +229,7 @@
        {
            ServerTipDetails.DisplayNormalTip(Language.Get("Friend106"));
        }
     

    }

    private void OnEndInput(string inputStr)
@@ -242,10 +239,10 @@

    public void OnClickRefreshBtn()
    {
       friendsModel.OnSendCA9A3_tagCGQueryRecommendFriends();
        friendsModel.OnSendCA9A3_tagCGQueryRecommendFriends();
        TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.BagSort, 5.0f, RefreshTime);
        _refreshImage.SetSprite("BlackBtn");
        _refreshText.text = Language.Get("FriendsPlayer101",5);
        _refreshText.text = Language.Get("FriendsPlayer101", 5);
        _refreshBtn.interactable = false;
        _refreshText.color = greyColor;
    }

 System/FriendSystem/FriendPanel.cs

@@ -365,7 +365,7 @@
        }
        isOnline.text = friendsModel.GetOnlineType(data.OnlineType);
        RealmConfig realmModel = RealmConfig.Get(data.RealmLV);
        if (data.RealmLV != 0)
        if (data.RealmLV > 0 && RealmConfig.Has(data.RealmLV))
        {
            titleIcon.gameObject.SetActive(true);
            titleIcon.SetSprite(realmModel.Img);

 System/FriendSystem/FriendQuestWin.cs

@@ -112,7 +112,7 @@
            Image realmImg = cell.transform.Find("RealmImage").GetComponent<Image>();
            DebugEx.Log("境界：" + friendInfo.RealmLV);
            RealmConfig realmConfig = RealmConfig.Get(friendInfo.RealmLV);
            if (friendInfo.RealmLV > 0)
            if (friendInfo.RealmLV > 0 && RealmConfig.Has(friendInfo.RealmLV))
            {
                realmImg.gameObject.SetActive(true);
                realmImg.SetSprite(realmConfig.Img);

 System/GatheringSoul/GatherSoulGenerateBossWin.cs

@@ -147,7 +147,7 @@
                if (UIHelper.GetMoneyCnt(1) >= (ulong)cost)

                {

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

                        Language.Get("GenerateBossCostConfirm", cost, (ulong)cost),

                        Language.Get("GenerateBossCostConfirm", cost),

                        (bool isOk) =>

                        {

                            if (isOk)


 System/HazyRegion/HazyRegionModel.cs

@@ -529,7 +529,9 @@


        void SendGotoIncidentDungeon(HazyRegionConfig config)

        {

            if (config.dungeonType == 2)

            if (config.dungeonId == HazyGrassModel.FairyGrassMapId ||

                config.dungeonId == HazyGrassModel.ReikiGrassMapId ||

                config.dungeonId == HazyDemonKingModel.DEMONKINGMAPID2)

            {

                var pak = new CC105_tagCMEnterCrossServer();

                pak.DataMapID = (uint)config.dungeonId;


 System/ItemTip/TipEquipBaseInfoWidget.cs

@@ -75,7 +75,7 @@
                m_ScoreOrType.text = itemConfig.ItemTypeName;
            }

            if (itemConfig.RealmLimit >= 0)
            if (itemConfig.RealmLimit > 0 && RealmConfig.Has(itemConfig.RealmLimit))
            {
                m_RealmContainer.gameObject.SetActive(true);
                var realmConfig = RealmConfig.Get(itemConfig.RealmLimit);

 System/KnapSack/BetterItemGetBehaviour.cs

@@ -179,7 +179,10 @@
            var itemConfig = ItemConfig.Get(betterModel.itemId);

            m_EquipName.text = itemConfig.ItemName;

            m_EquipName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);

            m_FunctionTitle.text = Language.Get(itemConfig.ItemColor >= 3 ? "GoodEquip_See" : "GoodEquip_FitUp");



            var isView = (PlayerDatas.Instance.baseData.LV < GeneralDefine.BlueEquipJumpLevel && itemConfig.ItemColor >= 2)

                    || itemConfig.ItemColor >= 3;

            m_FunctionTitle.text = Language.Get(isView ? "GoodEquip_See" : "GoodEquip_FitUp");



            m_EquipBehaviour.button.SetListener(() => { ItemTipUtility.Show(betterModel.guid, false); });

            m_EquipBehaviour.Init(betterModel, true);


 System/MainInterfacePanel/MainCollectBehaviour.cs

@@ -19,7 +19,8 @@
        int collectNpcId = 0;

        uint serverInstanceId = 0;



        DungeonModel dungeonModel {

        DungeonModel dungeonModel

        {

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

        }



@@ -37,7 +38,6 @@


            collectNpcId = npcId;

            serverInstanceId = sid;



            var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            m_ContainerNormalCollect.gameObject.SetActive(false);

            m_GatherSoulBuild.gameObject.SetActive(false);

@@ -82,7 +82,8 @@
        {

            if (collectNpcId != 0 && serverInstanceId != 0)

            {

                NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, collectNpcId, serverInstanceId);

                PrepareHandler.Instance.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);

                // NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, collectNpcId, serverInstanceId);

            }

        }

    }


 System/MainInterfacePanel/TaskBoxBGMWin.cs

@@ -200,8 +200,13 @@
            var taskInfoConfig = TASKINFOConfig.Get(StrConversa);

            if (taskInfoConfig == null)

            {

                DebugEx.LogError("任务表格配置错误");

                return;

                taskInfoConfig = TASKINFOConfig.Get(StrConversa.ToLower());

                if(taskInfoConfig == null) 
                {

                    DebugEx.LogError("任务表格配置错误");

                    return;

                }

               
            }

            if (taskmodel.BountyDic.ContainsKey(_TaskId) || taskmodel.FairyAuDic.ContainsKey(_TaskId))

            {


 System/MainWin/RealmEntranceBehaviour.cs

@@ -59,7 +59,7 @@
        {
            var realm = PlayerDatas.Instance.baseData.realmLevel;
            var config = RealmConfig.Get(realm);
            if (config != null)
            if (config != null )
            {
                m_Realm.SetSprite(config.Img);
            }

 System/NewBieGuidance/NewBieTrigger.cs

@@ -52,6 +52,7 @@
                treasureModel.treasureStageUpEvent += OnTreasureStageChange;

                achievementModel.achievementAwardableEvent += OnAchievementAwardAble;

                prayerModel.freeCoinPrayerStateChange += OnFreeCoinPrayer;

                BossShowModel.Instance.bossShowCompletedEvent += OnBossShowEnd;

            }



        }

@@ -71,6 +72,7 @@
                treasureModel.treasureStageUpEvent -= OnTreasureStageChange;

                achievementModel.achievementAwardableEvent -= OnAchievementAwardAble;

                prayerModel.freeCoinPrayerStateChange -= OnFreeCoinPrayer;

                BossShowModel.Instance.bossShowCompletedEvent -= OnBossShowEnd;

            }



        }

@@ -106,6 +108,7 @@
            achievementModel.achievementAwardableEvent += OnAchievementAwardAble;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent += OnTreasureShowEnd;

            prayerModel.freeCoinPrayerStateChange += OnFreeCoinPrayer;

            BossShowModel.Instance.bossShowCompletedEvent += OnBossShowEnd;

        }



        private void OnWindowPreClose(Window _window)

@@ -129,6 +132,7 @@
            achievementModel.achievementAwardableEvent -= OnAchievementAwardAble;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent -= OnTreasureShowEnd;

            prayerModel.freeCoinPrayerStateChange -= OnFreeCoinPrayer;

            BossShowModel.Instance.bossShowCompletedEvent -= OnBossShowEnd;

        }



        private void OnFunctionOpen(int _functionId)

@@ -201,6 +205,11 @@
            CheckNewBieGuide();

        }



        private void OnBossShowEnd()

        {

            CheckNewBieGuide();

        }



        private void CheckNewBieGuide()

        {

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

@@ -214,6 +223,11 @@
                return;

            }



            if (BossShowModel.Instance.BossShowing)

            {

                return;

            }



            if (guides != null)

            {

                NewBieCenter.Instance.CheckNewBieGuides(guides);


 System/OpenServerActivity/ImpactRankWin.cs

@@ -225,7 +225,7 @@
            else

            {

                var _rank = 0;

                if(!rankModel.TryGetMyRank((int)model.GetRankType(model.presentSelectType),out _rank))

                if (!rankModel.TryGetMyRank((int)model.GetRankType(model.presentSelectType), out _rank))

                {

                    _rank = -1;

                }

@@ -246,7 +246,7 @@
                case RankType.OpenServerRealm:

                    m_TargetImg.gameObject.SetActive(_hasData && _playerData.value >= 0);

                    m_TotalTargetValue.gameObject.SetActive(!_hasData);

                    if (_hasData && _playerData.value >= 0)

                    if (_hasData && _playerData.value > 0)

                    {

                        var _realmConfig = RealmConfig.Get(_playerData.value);

                        m_TargetImg.SetSprite(_realmConfig == null ? string.Empty : _realmConfig.Img);


 System/Pet/PetWin.cs

@@ -23,7 +23,7 @@
        {

            if (!WindowJumpMgr.Instance.IsJumpState && functionOrder < 2)//是否进行跳转

            {

                if (mountModel.IsHorsePanelState() > petmodel.IsPetPanelRedPointState())

                if (mountModel.IsHorsePanelState() < petmodel.IsPetPanelRedPointState())

                {

                    functionOrder = 1;

                }


 System/Rank/RankHeadCell.cs

@@ -94,8 +94,8 @@
                        break;

                    case RankType.JadeDynastyTower:

                        realmLv = (int)data.value1;

                        jobText.text = data.cmpValue +Language.Get("JadeDynastyBossDungeon_Floor") ;

                        rankWhat.text =(10000-data.cmpValue2) +Language.Get("RealmWin_Bewrite_35") ;

                        jobText.text = data.cmpValue + Language.Get("JadeDynastyBossDungeon_Floor");

                        rankWhat.text = (10000 - data.cmpValue2) + Language.Get("RealmWin_Bewrite_35");

                        break;

                    default:

                        rankWhat.text = data.cmpValue.ToString();

@@ -103,7 +103,7 @@
                        break;

                }

                RealmConfig presentCfg = RealmConfig.Get(realmLv);

                if (presentCfg != null)

                if (realmLv > 0 && presentCfg != null)

                {

                    realmImg.gameObject.SetActive(data.type != (int)RankType.Realm);

                    m_CompareImg.gameObject.SetActive(data.type == (int)RankType.Realm);


 System/Realm/RealmBriefBehaviour.cs

@@ -37,8 +37,16 @@


        void DisplayBase()

        {

            var config = RealmConfig.Get(realmLevel);

            m_Icon.SetSprite(config.Img);

            if (realmLevel > 0 && RealmConfig.Has(realmLevel))

            {

                var config = RealmConfig.Get(realmLevel);

                m_Icon.gameObject.SetActive(true);

                m_Icon.SetSprite(config.Img);

            }

            else

            {

                m_Icon.gameObject.SetActive(false);

            }

        }



        void DisplayProperty()


 System/Role/ReikiRootModel.cs

@@ -81,6 +81,8 @@


        public bool openFromTreasureSkill { get; set; }



        public bool reikiPointPromoteSymbol { get; set; }



        public readonly Redpoint redpoint = new Redpoint(101, 10103);


        public event Action onCacheFreePointRefresh;

@@ -102,6 +104,7 @@
            m_ReikiRootFreePoints.Clear();

            isServerPrepare = false;

            resetReikiRootRecord = false;

            reikiPointPromoteSymbol = false;

        }



        public void OnPlayerLoginOk()

@@ -531,12 +534,14 @@
                    RefreshRedpoint();



                    if (freePoint > lastFreePoint && isServerPrepare

                        && WindowCenter.Instance.IsOpen<AlchemyUseDrugWin>())

                        && WindowCenter.Instance.IsOpen<AlchemyUseDrugWin>()

                        && reikiPointPromoteSymbol)

                    {

                        ReikiRootPointPromoteWin.point = new Int2(lastFreePoint, freePoint);

                        WindowCenter.Instance.Open<ReikiRootPointPromoteWin>();

                    }

                    lastFreePoint = freePoint;

                    reikiPointPromoteSymbol = false;

                    break;

            }

        }


 System/RoleParticulars/ViewFuncCell.cs

@@ -183,7 +183,7 @@
                    case FuncPowerType.Realm:

                        handled = true;

                        var realmConfig = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);

                        if (realmConfig != null)

                        if (PlayerDatas.Instance.baseData.realmLevel > 0 && realmConfig != null)

                        {

                            m_MyRealmIcon.gameObject.SetActive(true);

                            m_MyRealmIcon.SetSprite(realmConfig.Img);

@@ -191,7 +191,7 @@
                            m_MyDescs[0].text = config.compareTip[0];

                        }

                        realmConfig = RealmConfig.Get(otherPlayerInfo.rolePropData.RealmLV);

                        if (realmConfig != null)

                        if (otherPlayerInfo.rolePropData.RealmLV > 0 && realmConfig != null)

                        {

                            m_CompareRealmIcon.gameObject.SetActive(true);

                            m_CompareRealmIcon.SetSprite(realmConfig.Img);


 System/RuneTower/RuneTowerWin.cs

@@ -194,7 +194,7 @@
            var towerFloorConfig = RuneTowerFloorConfig.Get(model.selectedFloor);

            var npcConfig = NPCConfig.Get(towerFloorConfig.BossId);



            if (RealmConfig.Has(npcConfig.ClientRealm))

            if (npcConfig.ClientRealm > 0 && RealmConfig.Has(npcConfig.ClientRealm))

            {

                m_BossRealm.gameObject.SetActive(true);

                var realmConfig = RealmConfig.Get(npcConfig.ClientRealm);


 System/Skill/ExpertSkillSelectWin.cs

@@ -359,8 +359,8 @@


            var level = 0;

            var selectExpertSkill = 0;

            if (model.TryGetExpertSkill(selectSkillId, out selectExpertSkill)

                && selectExpertSkill != selectExpert && model.TryGetExpertActiveLevel(selectExpert, out level)

            model.TryGetExpertSkill(selectSkillId, out selectExpertSkill);

            if (selectExpertSkill != selectExpert && model.TryGetExpertActiveLevel(selectExpert, out level)

                && level > 0)

            {

                var pak = new CA516_tagCMSelectSkillElement();


 System/SkyTower/SkyTowerWin.cs

@@ -111,7 +111,7 @@
            var towerConfig = SkyTowerConfig.Get(model.currentFloor);
            var npcConfig = NPCConfig.Get(towerConfig.bossId);

            if (RealmConfig.Has(npcConfig.ClientRealm))
            if (npcConfig.ClientRealm > 0 && RealmConfig.Has(npcConfig.ClientRealm))
            {
                m_BossRealm.gameObject.SetActive(true);
                var realmConfig = RealmConfig.Get(npcConfig.ClientRealm);

 System/Tip/PromoteDetailsWin.cs

@@ -84,10 +84,10 @@
                    WindowCenter.Instance.Open<EquipFrameWin>(false, 0);

                    break;

                case RolePromoteModel.PromoteDetailType.Mount:

                    WindowCenter.Instance.Open<PetWin>(false, 1);

                    WindowCenter.Instance.Open<PetWin>(false, 0);

                    break;

                case RolePromoteModel.PromoteDetailType.Pet:

                    WindowCenter.Instance.Open<PetWin>(false, 0);

                    WindowCenter.Instance.Open<PetWin>(false, 1);

                    break;

                case RolePromoteModel.PromoteDetailType.RuneMosaic:

                    WindowCenter.Instance.Open<RunePanel>();


 UI/Common/BossLifeBar.cs

@@ -77,7 +77,7 @@

            if (m_Realm != null)
            {
                if (RealmConfig.Has(npcConfig.ClientRealm))
                if (npcConfig.ClientRealm > 0 && RealmConfig.Has(npcConfig.ClientRealm))
                {
                    m_Realm.gameObject.SetActive(true);
                    var realmConfig = RealmConfig.Get(npcConfig.ClientRealm);

 UI/HUD/HeadUpName.cs

@@ -83,18 +83,17 @@
        {

            m_PlayerName.text = info.name;

            m_HangHint.gameObject.SetActive(info.isHang);

            SetPlayerRealm((int)info.realm, info.forceShowRealm);

            SetPlayerRealm((int)info.realm);

            SetTitle(info.title);

            SetAlliance(info.alliance);

            SyncPosition(true);

        }



        public void SetPlayerRealm(int realm, bool forceShow = false)

        public void SetPlayerRealm(int realm)

        {

            if (m_Realm)

            {

                var show = forceShow || realm != 0;

                if (show && RealmConfig.Has(realm))

                if (realm > 0 && RealmConfig.Has(realm))

                {

                    m_Realm.gameObject.SetActive(true);

                    m_PlayerName.alignment = TextAnchor.MiddleLeft;

@@ -114,7 +113,7 @@
        {

            if (m_Realm != null)

            {

                if (RealmConfig.Has(_realm))

                if (_realm > 0 && RealmConfig.Has(_realm))

                {

                    m_Realm.gameObject.SetActive(true);

                    m_PlayerName.alignment = TextAnchor.MiddleLeft;

@@ -418,7 +417,6 @@
        public struct PlayerInfo

        {

            public uint realm;

            public bool forceShowRealm;

            public uint title;

            public string name;

            public string alliance;