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

client_Hale

2018-09-26 fb4b1ed3c3366f993136e1f9a442bb2dc6d758ab

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

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -11,6 +11,7 @@
    public static void Init()

    {

        // 登记相应的数据体及对应的数据转逻辑类

        Register(typeof(HB106_tagMCNotifyPlayerMove), typeof(DTCB106_tagMCNotifyPlayerMove));

        Register(typeof(H0132_tagCreateRoleSucess), typeof(DTC0132_tagCreateRoleSucess));

        Register(typeof(HA326_tagMCNPCIDCollectionCntInfo), typeof(DTCA326_tagMCNPCIDCollectionCntInfo));

        Register(typeof(HA904_tagGCDogzNPCRefreshTime), typeof(DTCA904_tagGCDogzNPCRefreshTime));


 Core/GameEngine/Model/Config/EquipGSParamConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Saturday, September 01, 2018
//    [  Date ]:           Wednesday, September 26, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -38,6 +38,8 @@
        public int SpeedPerC { get ; private set ; }

        public int AtkSpeedC { get ; private set ; }

        public int SkillAtkRateReduceC { get ; private set ; }
        public int HitC { get ; private set ; }

        public int MissC { get ; private set ; }

        public override string getKey()
        {
@@ -100,6 +102,10 @@
                AtkSpeedC=IsNumeric(rawContents[25]) ? int.Parse(rawContents[25]):0; 

            

                SkillAtkRateReduceC=IsNumeric(rawContents[26]) ? int.Parse(rawContents[26]):0; 
			
                HitC=IsNumeric(rawContents[27]) ? int.Parse(rawContents[27]):0; 
			
                MissC=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0; 
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e238f9455d4062c4c867b41cfea2f046
timeCreated: 1535787590
timeCreated: 1537960022
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Config/InSevenDaysConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Monday, March 05, 2018
//    [  Date ]:           Wednesday, September 26, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -14,7 +14,13 @@
        public int RewardID { get ; private set ; }
        public string Reward { get ; private set; } 
        public string ICON { get ; private set; } 
        public string RewardName { get ; private set; } 
        public string Image { get ; private set; } 
        public string ImgTxt1 { get ; private set; } 
        public string ImgTxt2 { get ; private set; } 
        public string DayIcon { get ; private set; } 
        public int Money { get ; private set ; }
        public int IsTitle { get ; private set ; }

        public override string getKey()
        {
@@ -30,7 +36,19 @@
            
                ICON = rawContents[2].Trim();
            
                Money=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
                RewardName = rawContents[3].Trim();

			
                Image = rawContents[4].Trim();

			
                ImgTxt1 = rawContents[5].Trim();

			
                ImgTxt2 = rawContents[6].Trim();

			
                DayIcon = rawContents[7].Trim();

			
                Money=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
			
                IsTitle=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/InSevenDaysConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9d99e3fb619c7cd42a34671aae8a28b1
timeCreated: 1520257032
timeCreated: 1537969598
licenseType: Free
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs

@@ -50,7 +50,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

            if (!WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

            {

                WindowCenter.Instance.Open<RealmUpHoldWin>();

            }


 Core/GameEngine/Model/Player/Realm/RealmModel.cs

@@ -70,7 +70,7 @@
            if (StageManager.Instance.CurrentStage is DungeonStage)

            {

                if (PlayerDatas.Instance.realm.holdDataList.Count > 0

                && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

                && !WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

                {

                    WindowCenter.Instance.Open<RealmUpHoldWin>();

                }

@@ -89,7 +89,7 @@
                cacheRealmLv = PlayerDatas.Instance.baseData.realmLevel;

            }

            if (PlayerDatas.Instance.realm.holdDataList.Count > 0

                && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

                && !WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

            {

                WindowCenter.Instance.Open<RealmUpHoldWin>();

            }

@@ -97,7 +97,7 @@
            {

                if (dungeonModel.dungeonResult.leaderID == PlayerDatas.Instance.PlayerId)

                {

                    if (!WindowCenter.Instance.CheckOpen<RealmWin>() && !NewBieCenter.Instance.inGuiding)

                    if (!WindowCenter.Instance.IsOpen<RealmWin>() && !NewBieCenter.Instance.inGuiding)

                    {

                        openByDungeonStep = cacheRealmLv < PlayerDatas.Instance.baseData.realmLevel;

                        WindowCenter.Instance.Open<RealmWin>();

@@ -112,7 +112,7 @@
            if (StageManager.Instance.CurrentStage is DungeonStage)

            {

                if (PlayerDatas.Instance.realm.holdDataList.Count > 0

               && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

               && !WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

                {

                    WindowCenter.Instance.Open<RealmUpHoldWin>();

                }


 Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs

@@ -52,6 +52,8 @@
            _tagGsProValueDict.Add(AttrEnum.MoveSpeedPrecent, gsModel.SpeedPerC);

            _tagGsProValueDict.Add(AttrEnum.ATKSPEED, gsModel.AtkSpeedC);

            _tagGsProValueDict.Add(AttrEnum.SkillHurtPrecent, gsModel.SkillAtkRateReduceC);

            _tagGsProValueDict.Add(AttrEnum.HIT, gsModel.HitC);

            _tagGsProValueDict.Add(AttrEnum.MISS, gsModel.MissC);

            return _tagGsProValueDict;

        }

    }


 Core/NetworkPackage/ClientPack/ClientToMapServer/CA5_Function/CA5C0_tagCMDogzEquipItem.cs

@@ -5,7 +5,8 @@



public class CA5C0_tagCMDogzEquipItem : GameNetPackBasic {


    public byte DogzID;    // 神兽ID


    public byte EquipIndex;    //神兽装备所在神兽背包索引

    public byte EquipIndexCount;

    public  byte[] EquipIndexList;    //神兽装备所在神兽背包索引列表




    public CA5C0_tagCMDogzEquipItem () {


        combineCmd = (ushort)0x03FE;


@@ -14,7 +15,8 @@



    public override void WriteToBytes () {


        WriteBytes (DogzID, NetDataType.BYTE);


        WriteBytes (EquipIndex, NetDataType.BYTE);

        WriteBytes (EquipIndexCount, NetDataType.BYTE);

        WriteBytes (EquipIndexList, NetDataType.BYTE, EquipIndexCount);

    }





}



 Core/NetworkPackage/DTCFile/ServerPack/H05_PlayerMove/DTC0501_tagObjMove.cs

@@ -37,6 +37,11 @@
                _player.ActorInfo.moveSpeed = 500f / vNetData.Speed;

                _player.MoveToPosition(_destPosition);

            }



            if(vNetData.ObjID == PlayerDatas.Instance.PlayerId)

            {

                MapTransferUtility.Instance.Clear();

            }

        }

        else

        {


 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs

@@ -40,6 +40,11 @@
                BossFakeLineUtility.Instance.lastBossNpcID = 0;

                BossFakeLineUtility.Instance.inMistakeForBossAliveOverTime = Time.realtimeSinceStartup - 61;

            }



            if (_targetFight.NpcConfig.IsBoss > 1 && vNetData.KillerID == PlayerDatas.Instance.baseData.PlayerID)

            {

                BossFakeLineUtility.Instance.RecordBossKillTime(_targetFight.NpcConfig.NPCID,System.DateTime.Now);

            }

        }



        _actor.SetAnimatorSpeed(1);


 Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA126_tagMCPrepareChangeMap.cs

@@ -49,7 +49,7 @@
            _mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(_realMapDataID, DTCA127_tagMCStartChangeMap.LineID);

        }

        if (!WindowCenter.Instance.CheckOpen<LoadingWin>())
        if (!WindowCenter.Instance.IsOpen<LoadingWin>())
        {
            LoadingWin.targetMapResId = _mapResConfig.ID;
            WindowCenter.Instance.Open<LoadingWin>();

 Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB106_tagMCNotifyPlayerMove.cs

New file
@@ -0,0 +1,51 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, September 26, 2018
//--------------------------------------------------------
using UnityEngine;

public class DTCB106_tagMCNotifyPlayerMove : DtcBasic
{

    public override void Done(GameNetPackBasic vNetPack)
    {
        base.Done(vNetPack);
        var package = vNetPack as HB106_tagMCNotifyPlayerMove;

        if (PlayerDatas.Instance.hero == null
        || package == null)
        {
            return;
        }

        MapTransferUtility.Instance.Clear();

        if (package.NPCID != 0)
        {
            GAStaticDefine.NPCLocation _npcLocation;
            var _findLocation = GAStaticDefine.TryGetMapNPCLocation((int)package.NPCID, out _npcLocation);
            if (_findLocation)
            {
                Vector3 _destPos = new Vector3(_npcLocation.position.x, PlayerDatas.Instance.hero.Pos.y, _npcLocation.position.y);
                PlayerDatas.Instance.hero.MoveToPosition(_destPos, _npcLocation.scope);
                MapTransferUtility.Instance.MapTransferDoType = MapTransferUtility.E_MapTransferDoType.Npc;
                MapTransferUtility.Instance.NpcID = (int)package.NPCID;
            }
            else
            {
                DebugEx.LogWarningFormat("找不到NPCID: {0} 在Npc刷新表中的配置", package.NPCID);
            }
        }
        else
        {
            Vector3 _pos = new Vector3((package.PosX - GA_Hero.MapOffset.x) * .5f, 0, (package.PosY - GA_Hero.MapOffset.z) * .5f);
            PlayerDatas.Instance.hero.MoveToPosition(_pos);
        }

    }

}





 Core/NetworkPackage/DTCFile/ServerPack/HB1_Role/DTCB106_tagMCNotifyPlayerMove.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 3826652b2693c1a4aba8f48340defea8
timeCreated: 1537926963
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/NetworkPackage/ServerPack/HA9_Function/HA901_tagGCBossShuntLineStateInfo.cs

@@ -21,16 +21,18 @@
        {
            BossLineStateInfo[i] = new tagGCBossShuntLineState();
            TransBytes(out BossLineStateInfo[i].BossID, vBytes, NetDataType.DWORD);
            TransBytes(out BossLineStateInfo[i].DeadLineCount, vBytes, NetDataType.BYTE);
            TransBytes(out BossLineStateInfo[i].DeadLineList, vBytes, NetDataType.BYTE, BossLineStateInfo[i].DeadLineCount);
            TransBytes(out BossLineStateInfo[i].LineCount, vBytes, NetDataType.BYTE);
            TransBytes(out BossLineStateInfo[i].LineIDList, vBytes, NetDataType.BYTE, BossLineStateInfo[i].LineCount);
            TransBytes(out BossLineStateInfo[i].StateList, vBytes, NetDataType.BYTE, BossLineStateInfo[i].LineCount);
        }
    }

    public struct tagGCBossShuntLineState
    {
        public uint BossID;        // bossID
        public byte DeadLineCount;
        public byte[] DeadLineList;        // 已死亡的线路列表
        public byte LineCount;
        public byte[] LineIDList;        // 线路ID列表
        public byte[] StateList;        // 对应状态列表， 0-被击杀，1-活着
    }

}

 Core/NetworkPackage/ServerPack/HA9_Function/HA902_tagGCGameWorldBossInfo.cs

@@ -25,6 +25,7 @@
            TransBytes(out BossInfoList[i].RecordLen, vBytes, NetDataType.WORD);
            TransBytes(out BossInfoList[i].KillRecord, vBytes, NetDataType.Chars, BossInfoList[i].RecordLen);
            TransBytes(out BossInfoList[i].RefreshSecond, vBytes, NetDataType.DWORD);
            TransBytes(out BossInfoList[i].RefreshCD, vBytes, NetDataType.DWORD);
        }
    }

@@ -35,6 +36,7 @@
        public ushort RecordLen;        // 长度
        public string KillRecord;        // 最近击杀记录时间玩家名size = RecordLen
        public uint RefreshSecond;        // 刷新倒计时, 秒    
        public uint RefreshCD;        // 刷新总CD时, 秒	
    }

}

 Core/NetworkPackage/ServerPack/HB1_Role/HB106_tagMCNotifyPlayerMove.cs

New file
@@ -0,0 +1,21 @@
using UnityEngine;
using System.Collections;

// B1 06 通知玩家向目标点移动 #tagMCNotifyPlayerMove

public class HB106_tagMCNotifyPlayerMove : GameNetPackBasic {
    public uint PosX;
    public uint PosY;
    public uint NPCID;    //目标点寻路NPCID, 可能为0

    public HB106_tagMCNotifyPlayerMove () {
        _cmd = (ushort)0xB106;
    }

    public override void ReadFromBytes (byte[] vBytes) {
        TransBytes (out PosX, vBytes, NetDataType.DWORD);
        TransBytes (out PosY, vBytes, NetDataType.DWORD);
        TransBytes (out NPCID, vBytes, NetDataType.DWORD);
    }

}

 Core/NetworkPackage/ServerPack/HB1_Role/HB106_tagMCNotifyPlayerMove.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: fc7982354b8dd52459548536ebb5977d
timeCreated: 1537926821
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Fight/Actor/UserInputHandler.cs

@@ -42,7 +42,7 @@


    private void HandleKeyBoardInput()

    {

        if (WindowCenter.Instance.CheckOpen<GMInputWin>())

        if (WindowCenter.Instance.IsOpen<GMInputWin>())

        {

            return;

        }


 Fight/BossFakeLineUtility.cs

@@ -2,21 +2,26 @@
using System.Collections.Generic;
using UnityEngine;
using TableConfig;
using System;
using Snxxz.UI;

public class BossFakeLineUtility : Singleton<BossFakeLineUtility>
{
    int m_MakeFakeLineTimes = 0;
    public int makeFakeLineTimes
    {
    public int makeFakeLineTimes {
        get { return m_MakeFakeLineTimes; }
        set { m_MakeFakeLineTimes = Mathf.Clamp(value, 0, int.MaxValue); }
    }

    bool m_ShowFakeLine = false;
    public bool showFakeLine
    {
    public bool showFakeLine {
        get { return m_ShowFakeLine; }
        set { m_ShowFakeLine = value; }
    }

    public BossFakeLineUtility()
    {
        DTC0102_tagCDBPlayer.switchAccountEvent += OnAccountSwitch;
    }

    //这个值在初见boss和最后看见boss的时候记录，其值为time.time+1分钟，这段时间内告诉玩家其所在分线的boss的死亡情况，否则告诉玩家公共boss的死亡情况。
@@ -25,7 +30,7 @@

    public bool IsShuntBoss(int _bossId)
    {
        if (TimeUtility.OpenDay > GeneralConfig.Instance.bossShuntDays)
        if (TimeUtility.OpenDay >= GeneralConfig.Instance.bossShuntDays)
        {
            return false;
        }
@@ -63,5 +68,60 @@
        }
    }

    FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
    Dictionary<int, DateTime> bossKillTimes = new Dictionary<int, DateTime>();

    public void RecordBossKillTime(int npcId, DateTime time)
    {
        var key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "_", npcId);
        bossKillTimes[npcId] = time;
        LocalSave.SetString(key, time.ToString());
    }

    public bool IsBossKilledRecently(int npcId)
    {
        FindPreciousModel.BossInfo bossInfo;
        var totalCd = 0;
        if (findPreciousModel.TryGetBossInfo(npcId, out bossInfo))
        {
            totalCd = bossInfo.rebornTotalCd;
        }

        if (bossKillTimes.ContainsKey(npcId))
        {
            var killTime = bossKillTimes[npcId];
            if ((int)((DateTime.Now - killTime).TotalSeconds) < totalCd)
            {
                return true;
            }
        }

        var key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "_", npcId);
        var timeString = LocalSave.GetString(key);
        if (string.IsNullOrEmpty(timeString))
        {
            return false;
        }
        else
        {
            var tempTime = DateTime.Now;
            if (DateTime.TryParse(timeString, out tempTime))
            {
                if ((int)((DateTime.Now - tempTime).TotalSeconds) < totalCd)
                {
                    bossKillTimes[npcId] = tempTime;
                    return true;
                }
            }
        }

        return false;
    }


    private void OnAccountSwitch()
    {
        bossKillTimes.Clear();
    }

}

 Fight/GameActor/GA_NpcClientFunc.cs

@@ -69,7 +69,7 @@


                if (_configID > 0)

                {

                    if (!WindowCenter.Instance.CheckOpen<GuideDialogueWin>())

                    if (!WindowCenter.Instance.IsOpen<GuideDialogueWin>())

                    {

                        GuideDialogueModel _model = ModelCenter.Instance.GetModel<GuideDialogueModel>();

                        _model.dialogID = _configID;


 Fight/GameActor/GA_NpcCollect.cs

@@ -152,7 +152,7 @@


        CheckCanCollect();



        m_IsMainWinOpen = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        m_IsMainWinOpen = WindowCenter.Instance.IsOpen<MainInterfaceWin>();



        WindowCenter.Instance.windowAfterOpenEvent += CheckOpenCollectIcon;

        WindowCenter.Instance.windowAfterCloseEvent += AfterCloseMainWin;

@@ -222,7 +222,7 @@


        if (!m_IsMainWinOpen)

        {

            m_IsMainWinOpen = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

            m_IsMainWinOpen = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

            return;

        }




 Fight/MapTransferUtility.cs

@@ -126,7 +126,7 @@
    #region npc

    public int NpcID

    {

        get; private set;

        get; set;

    }

    #endregion



@@ -245,9 +245,31 @@


        MapModel _model = ModelCenter.Instance.GetModel<MapModel>();

        GActor _npc = null;



        // 加入判断是否世界BOSS判断

        WorldBossConfig _worldBoss = Config.Instance.Get<WorldBossConfig>(npcID);



        if (_findLocation)

        {

            var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);

            // 中立地图

            if (_mapConfig.Camp == 5 && _worldBoss != null)

            {

                if (_npcLocation.mapId == PlayerDatas.Instance.baseData.MapID)

                {

                    Send_WorldTransfer(_npcLocation.mapId,

                                       new Vector3(_hero.Pos.x * 2, 0, _hero.Pos.z * 2),

                                       MapTransferType.WorldTransport, 0, npcID);

                }

                else

                {

                    Send_WorldTransfer(_npcLocation.mapId,

                                       new Vector3(_mapConfig.BornPoints[0].x, 0, _mapConfig.BornPoints[0].y),

                                       MapTransferType.WorldTransport, 0, npcID);

                }

                return;

            }

        }



        FairyGrabBossConfig _fairyBoss = Config.Instance.Get<FairyGrabBossConfig>(npcID);

        bool _isBoss = _worldBoss != null || _fairyBoss != null;

        if (_isBoss && _findLocation)

@@ -382,7 +404,7 @@
            {

                if (_config.NPCType == (int)E_NpcType.OpenWorldMap)

                {

                    if (!WindowCenter.Instance.CheckOpen<WorldMapWin>())

                    if (!WindowCenter.Instance.IsOpen<WorldMapWin>())

                    {

                        WindowCenter.Instance.Open<WorldMapWin>();

                        if (_hero.State == E_ActorState.AutoRun)


 Fight/PreFightMission.cs

@@ -618,7 +618,7 @@


        if (m_CheckFaBaoWinOpen)

        {

            if (WindowCenter.Instance.CheckOpen<TreasureSelectWin>())

            if (WindowCenter.Instance.IsOpen<TreasureSelectWin>())

            {

                Transform _temp = WindowCenter.Instance.uiRoot.normalCanvas.Find("TreasureSelectWin/Container_Treasures");

                _temp.localScale = Vector3.zero;

@@ -878,7 +878,7 @@
             skillContainer.transform.localScale = Vector3.one;



             // 普攻引导

             if (WindowCenter.Instance.CheckOpen<NewGuideWin>() == true)

             if (WindowCenter.Instance.IsOpen<NewGuideWin>() == true)

             {

                 WindowCenter.Instance.Close<NewGuideWin>();

             }

@@ -1177,7 +1177,7 @@
            return;

        }



        if (WindowCenter.Instance.CheckOpen<NewGuideWin>())

        if (WindowCenter.Instance.IsOpen<NewGuideWin>())

        {

            WindowCenter.Instance.Close<NewGuideWin>();

        }


 Fight/Stage/Dungeon/DungeonStage.cs

@@ -196,14 +196,14 @@
                break;

            case 31080:

                {

                    if (!WindowCenter.Instance.CheckOpen<DungeonFairyLandWin>())

                    if (!WindowCenter.Instance.IsOpen<DungeonFairyLandWin>())

                    {

                        WindowCenter.Instance.Open<DungeonFairyLandWin>();

                    }

                }

                break;

            case 31150:

                if (!WindowCenter.Instance.CheckOpen<ElderGodAngerWin>())

                if (!WindowCenter.Instance.IsOpen<ElderGodAngerWin>())

                {

                    WindowCenter.Instance.Open<ElderGodAngerWin>();

                }


 Fight/Stage/Dungeon/MapTransfer.cs

@@ -86,7 +86,7 @@
        }

        else if (transportModel.TransportType == 2)

        {

            if (!WindowCenter.Instance.CheckOpen<WorldMapWin>())

            if (!WindowCenter.Instance.IsOpen<WorldMapWin>())

            {

                WindowCenter.Instance.Open<WorldMapWin>();

                if (_hero.State == E_ActorState.AutoRun)


 Fight/Stage/StageManager.cs

@@ -174,7 +174,7 @@
                case 2:

                    WindowCenter.Instance.DestoryWinsByStage(WindowCenter.WindowStage.Login);

                    WindowCenter.Instance.CloseOthers<LaunchBackGroundWin>();

                    if (!WindowCenter.Instance.CheckOpen<LaunchBackGroundWin>())

                    if (!WindowCenter.Instance.IsOpen<LaunchBackGroundWin>())

                    {

                        WindowCenter.Instance.Open<LaunchBackGroundWin>(true);

                    }

@@ -184,7 +184,7 @@
                case 1:

                    WindowCenter.Instance.DestoryWinsByStage(WindowCenter.WindowStage.Launch);

                    WindowCenter.Instance.CloseOthers<LaunchBackGroundWin>();

                    if (!WindowCenter.Instance.CheckOpen<LaunchBackGroundWin>())

                    if (!WindowCenter.Instance.IsOpen<LaunchBackGroundWin>())

                    {

                        WindowCenter.Instance.Open<LaunchBackGroundWin>(true);

                    }

@@ -194,7 +194,7 @@
                default:

                    WindowCenter.Instance.DestoryWinsByStage(WindowCenter.WindowStage.SelectRole);

                    WindowCenter.Instance.CloseOthers<LoadingWin>();

                    if (!WindowCenter.Instance.CheckOpen<LoadingWin>())

                    if (!WindowCenter.Instance.IsOpen<LoadingWin>())

                    {

                        LoadingWin.targetMapResId = currentMapResId;

                        WindowCenter.Instance.Open<LoadingWin>(true);


 System/Achievement/AchievementModel.cs

@@ -463,7 +463,7 @@
                                }

                                treasureModel.currentCategory = TreasureCategory.Human;

                                treasureModel.selectedTreasure = treasureId;

                                if (!WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

                                if (!WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

                                {

                                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureCollectSoul);

                                }


 System/Activity/ActivityModel.cs

@@ -85,7 +85,7 @@
                }

            }

            activityNotifies.Clear();

            if (WindowCenter.Instance.CheckOpen<ActivityNotifyWin>())

            if (WindowCenter.Instance.IsOpen<ActivityNotifyWin>())

            {

                WindowCenter.Instance.CloseImmediately<ActivityNotifyWin>();

            }

@@ -136,7 +136,7 @@
                {

                    mainStage = false;

                    activityNotifies.Clear();

                    if (WindowCenter.Instance.CheckOpen<ActivityNotifyWin>())

                    if (WindowCenter.Instance.IsOpen<ActivityNotifyWin>())

                    {

                        WindowCenter.Instance.CloseImmediately<ActivityNotifyWin>();

                    }

@@ -296,7 +296,7 @@


        private void NotifyActivity()

        {

            if (!WindowCenter.Instance.CheckOpen<ActivityNotifyWin>())

            if (!WindowCenter.Instance.IsOpen<ActivityNotifyWin>())

            {

                if (!NewBieCenter.Instance.inGuiding)

                {


 System/Activity/ActivityNotifyWin.cs

@@ -101,7 +101,7 @@
        {
            presentActivityType = _type;
            m_ActivityNotify.Init(_type, this);
            var _open = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
            var _open = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
            m_ActivityNotify.gameObject.SetActive(_open);
        }


 System/AssetVersion/InGameDownLoad.cs

@@ -482,7 +482,7 @@
            }

        }



        if (!WindowCenter.Instance.CheckOpen("MainInterfaceWin"))

        if (!WindowCenter.Instance.IsOpen("MainInterfaceWin"))

        {

            return false;

        }


 System/BlastFurnace/BlastFurnaceModel.cs

@@ -133,7 +133,7 @@


        if(isMakeDan)

        {

            if(!WindowCenter.Instance.CheckOpen<MakerDrugSuccessWin>())

            if(!WindowCenter.Instance.IsOpen<MakerDrugSuccessWin>())

            {

                WindowCenter.Instance.Open<MakerDrugSuccessWin>();

            }

@@ -141,7 +141,7 @@
        }

        else

        {

            if (WindowCenter.Instance.CheckOpen<MakerDrugSuccessWin>())

            if (WindowCenter.Instance.IsOpen<MakerDrugSuccessWin>())

            {

                WindowCenter.Instance.CloseImmediately<MakerDrugSuccessWin>();

            }

@@ -266,7 +266,7 @@
                {

                    if (makerItemID != 0)

                    {

                        if (!WindowCenter.Instance.CheckOpen<MakerDrugSuccessWin>())

                        if (!WindowCenter.Instance.IsOpen<MakerDrugSuccessWin>())

                        {

                            WindowCenter.Instance.Open<MakerDrugSuccessWin>();

                        }

@@ -274,7 +274,7 @@
                }

                else

                {

                    if (!WindowCenter.Instance.CheckOpen<MakerDrugFailWin>())

                    if (!WindowCenter.Instance.IsOpen<MakerDrugFailWin>())

                    {

                        WindowCenter.Instance.Open<MakerDrugFailWin>();

                    }

@@ -283,14 +283,14 @@
            case MakeType.Def_mitMWUpLevel:

                if (answer.Result == 1)

                {

                    if (!WindowCenter.Instance.CheckOpen<TreasureRefineSuccessWin>())

                    if (!WindowCenter.Instance.IsOpen<TreasureRefineSuccessWin>())

                    {

                        WindowCenter.Instance.Open<TreasureRefineSuccessWin>();

                    }

                }

                else

                {

                    if (!WindowCenter.Instance.CheckOpen<TreasureRefineFailWin>())

                    if (!WindowCenter.Instance.IsOpen<TreasureRefineFailWin>())

                    {

                        WindowCenter.Instance.Open<TreasureRefineFailWin>();

                    }


 System/BlastFurnace/GetEquipPathTips.cs

@@ -454,7 +454,29 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                        legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

            {


 System/BlastFurnace/GetEquipPathWin.cs

@@ -439,7 +439,29 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                        legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

            {


 System/BossShow/BossShowModel.cs

@@ -75,7 +75,7 @@
                ActiveBossShowCam(true);

                CameraController.Instance.CameraObject.enabled = false;



                if (WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

                if (WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

                {

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.CloseImmediately<TreasureLevelUpWin>();

@@ -319,7 +319,7 @@
            if (!_active)

            {

                CameraUtility.RemoveCullingMask(CameraManager.uiCamera, LayerUtility.UIEffectLayer);

                if (!WindowCenter.Instance.CheckOpen<BossShowWin>())

                if (!WindowCenter.Instance.IsOpen<BossShowWin>())

                {

                    WindowCenter.Instance.Open<BossShowWin>();

                }

@@ -327,7 +327,7 @@
            else

            {

                CameraUtility.AddCullingMask(CameraManager.uiCamera, LayerUtility.UIEffectLayer);

                if (WindowCenter.Instance.CheckOpen<BossShowWin>())

                if (WindowCenter.Instance.IsOpen<BossShowWin>())

                {

                    WindowCenter.Instance.Close<BossShowWin>();

                }

@@ -345,13 +345,13 @@


        private void ActiveDialogue(bool _show)

        {

            if (_show && !WindowCenter.Instance.CheckOpen<BossShowDialogueWin>())

            if (_show && !WindowCenter.Instance.IsOpen<BossShowDialogueWin>())

            {

                var _task = ModelCenter.Instance.GetModel<PlayerTaskDatas>();

                _task._TaskNow = actorShowModel.Dialogue;

                WindowCenter.Instance.Open<BossShowDialogueWin>();

            }

            else if (!_show && WindowCenter.Instance.CheckOpen<BossShowDialogueWin>())

            else if (!_show && WindowCenter.Instance.IsOpen<BossShowDialogueWin>())

            {

                WindowCenter.Instance.CloseImmediately<BossShowDialogueWin>();

            }


 System/Chat/ChatCenter.cs

@@ -605,7 +605,7 @@


        private void AutoPlayVoice()

        {

            if (voicePlaying || WindowCenter.Instance.CheckOpen<LoadingWin>()

            if (voicePlaying || WindowCenter.Instance.IsOpen<LoadingWin>()

                || !(StageManager.Instance.CurrentStage is DungeonStage))

            {

                return;

@@ -716,17 +716,17 @@


        private void CheckChatFloatOpen()

        {

            if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !WindowCenter.Instance.CheckOpen<LoadingWin>()

                && StageManager.Instance.CurrentStage is DungeonStage && !WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

            if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !WindowCenter.Instance.IsOpen<LoadingWin>()

                && StageManager.Instance.CurrentStage is DungeonStage && !WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

            {

                if (!WindowCenter.Instance.CheckOpen<ChatFloatWin>())

                if (!WindowCenter.Instance.IsOpen<ChatFloatWin>())

                {

                    WindowCenter.Instance.Open<ChatFloatWin>();

                }

            }

            else

            {

                if (WindowCenter.Instance.CheckOpen<ChatFloatWin>())

                if (WindowCenter.Instance.IsOpen<ChatFloatWin>())

                {

                    WindowCenter.Instance.CloseImmediately<ChatFloatWin>();

                }

@@ -762,7 +762,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()

                || StageManager.Instance.isLoading

                || NewBieCenter.Instance.inGuiding)

@@ -770,7 +770,7 @@
                return;

            }

            openChatAfterCollect = false;

            if (!WindowCenter.Instance.CheckOpen<ChatWin>())

            if (!WindowCenter.Instance.IsOpen<ChatWin>())

            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

                WindowCenter.Instance.Open<ChatWin>();


 System/Chat/ChatCtrl.cs

@@ -1029,15 +1029,15 @@
        switch (type)

        {

            case ChatInfoType.Team:

                if (!WindowCenter.Instance.CheckOpen<TeamChatWin>()

                    && (!WindowCenter.Instance.CheckOpen<ChatWin>() || presentChatType != ChatInfoType.Team))

                if (!WindowCenter.Instance.IsOpen<TeamChatWin>()

                    && (!WindowCenter.Instance.IsOpen<ChatWin>() || presentChatType != ChatInfoType.Team))

                {

                    unReadChatCounts[ChatInfoType.Team] = Mathf.Min(unReadChatCounts[ChatInfoType.Team] + 1, 99);

                }

                break;

            case ChatInfoType.Fairy:

                if (!WindowCenter.Instance.CheckOpen<FairyChatWin>()

                    && (!WindowCenter.Instance.CheckOpen<ChatWin>() || presentChatType != ChatInfoType.Fairy))

                if (!WindowCenter.Instance.IsOpen<FairyChatWin>()

                    && (!WindowCenter.Instance.IsOpen<ChatWin>() || presentChatType != ChatInfoType.Fairy))

                {

                    unReadChatCounts[ChatInfoType.Fairy] = Mathf.Min(unReadChatCounts[ChatInfoType.Fairy] + 1, 99);

                }


 System/Chat/ChatSendComponent.cs

@@ -214,7 +214,7 @@


        private void OnExtent()

        {

            if (!WindowCenter.Instance.CheckOpen<ChatExtentWin>())

            if (!WindowCenter.Instance.IsOpen<ChatExtentWin>())

            {

                WindowCenter.Instance.Open<ChatExtentWin>(true);

                if (parent != null)


 System/Chat/ChatTip.cs

@@ -145,7 +145,7 @@


    private void OnChatClick()

    {

        if (WindowCenter.Instance.CheckOpen<ChatWin>())

        if (WindowCenter.Instance.IsOpen<ChatWin>())

        {

            return;

        }

@@ -211,7 +211,7 @@


    void OnChatDataClick(ChatData data)

    {

        if (WindowCenter.Instance.CheckOpen<ChatWin>())

        if (WindowCenter.Instance.IsOpen<ChatWin>())

        {

            return;

        }


 System/Debug/DebugController.cs

@@ -57,7 +57,7 @@


        public void OpenGM()

        {

            if (!WindowCenter.Instance.CheckOpen<GMInputWin>())

            if (!WindowCenter.Instance.IsOpen<GMInputWin>())

            {

                WindowCenter.Instance.Open<GMInputWin>();

            }


 System/Dogz/DogzCell.cs

@@ -34,7 +34,7 @@
            var _dogzEquips = model.GetDogzEquips(_dogzCfg.ID);

            bool isActive = (_dogzEquips == null || _dogzEquips.Count < 5) ? false : true;

            m_DogzName.text = _dogzCfg.Name;

            m_DogzGrade.text = StringUtility.Contact("评分：", 100);

            m_DogzGrade.text = Language.Get("DogzFunc106", model.GetDogzScoreById(cell.index));

            redpointBehav.redpointId = model.GetSingleDogzRedpointById(_dogzCfg.ID).id;

            if (isActive)

            {


 System/Dogz/DogzItemCell.cs

@@ -44,6 +44,7 @@


            itemBaisc.gameObject.SetActive(true);

            itemBaisc.Init(model,true);

            itemBaisc.bindIcon.gameObject.SetActive(false);

            itemBaisc.cellBtn.RemoveAllListeners();

            itemBaisc.cellBtn.AddListener(()=>

            {


 System/Dogz/DogzModel.cs

@@ -26,6 +26,7 @@
            selectEquipPlacelist = new List<ItemModel>();

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

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

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

        }



        public void OnAfterPlayerDataInitialize()

@@ -56,7 +57,7 @@
        public int DogzPackGridCnt { get; private set; } //神兽物品背包格子数

        public int[] AddAssistItemCnt { get; private set; } //增加助战神兽总数的物品数量

        public Dictionary<int, int> m_DogzEquipStrenLimit { get; private set;} //神兽装备强化上限 品质 强化等级



        public string dogzScoreFormula { get; private set; } //神兽评分公式

        void ParseConfig()

        {

            var _dogzCfgs = Config.Instance.GetAllValues<DogzConfig>();

@@ -78,6 +79,8 @@
            m_DogzEquipStrenLimit = ConfigParse.GetDic<int, int>(_funcCfg.Numerical4);

            _funcCfg = Config.Instance.Get<FuncConfigConfig>("DogzPack");

            DogzPackGridCnt = int.Parse(_funcCfg.Numerical1);

            _funcCfg = Config.Instance.Get<FuncConfigConfig>("DogzGrade");

            dogzScoreFormula = _funcCfg.Numerical1;

        }

        /// <summary>

        /// 获得格子可以穿戴的装备限制  神兽Id  格子索引 

@@ -103,7 +106,7 @@
        /// </summary>

        /// <param name="_index"></param>

        /// <returns></returns>

        public static string GetDogzPartNameByIndex(int _index)

        public string GetDogzPartNameByIndex(int _index)

        {

            switch (_index)

            {

@@ -122,7 +125,7 @@
            }

        }



        public static string GetItemColorName(int _itemColor)

        public string GetItemColorName(int _itemColor)

        {

            switch (_itemColor)

            {

@@ -143,6 +146,73 @@
                    return string.Empty;

            }

        }



        public int GetDogzScoreById(int dogzId)

        {

            DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId);

            if (dogzConfig == null) return 0;

            Equation.Instance.Clear();

            Equation.Instance.AddKeyValue("FightPowerEx",dogzConfig.FightPowerEx);

            Equation.Instance.AddKeyValue("EquipGSFormula", GetDogzEquipScore(dogzId));

            GetDogzAttrDictById(dogzId);

            foreach(var key in m_DogzAttrDict.Keys)

            {

                PlayerPropertyConfig propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(key);

                if (propertyConfig != null)

                {

                    Equation.Instance.AddKeyValue(propertyConfig.Parameter, m_DogzAttrDict[key]);

                }

            }

            return Equation.Instance.Eval<int>(dogzScoreFormula);

        }

        public Dictionary<int, int> m_DogzAttrDict { get; private set; }

        public Dictionary<int, int> GetDogzAttrDictById(int dogzId)

        {

            m_DogzAttrDict.Clear();

            DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId);

            int[] baseAttrIds = dogzConfig.BaseAttrTypes;

            int[] baseAttrValues = dogzConfig.BaseAttrValues;

            for (int i = 0; i < baseAttrIds.Length; i++)

            {

                if (!m_DogzAttrDict.ContainsKey(baseAttrIds[i]))

                {

                    m_DogzAttrDict.Add(baseAttrIds[i], baseAttrValues[i]);

                }

                else

                {

                    m_DogzAttrDict[baseAttrIds[i]] += baseAttrValues[i];

                }

            }



            Dictionary<int, int> dogzStrenDict = beastModel.AllEnhancedProperties(dogzId);

            foreach (var key in dogzStrenDict.Keys)

            {

                if (!m_DogzAttrDict.ContainsKey(key))

                {

                    m_DogzAttrDict.Add(key, dogzStrenDict[key]);

                }

                else

                {

                    m_DogzAttrDict[key] += dogzStrenDict[key];

                }

            }

            return m_DogzAttrDict;

        }



        public int GetDogzEquipScore(int dogzId)

        {

            int score = 0;

            List<ItemModel> itemModels = GetDogzEquips(dogzId);

            if(itemModels != null)

            {

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

                {

                    score += itemModels[i].equipScore;

                }

            }

            return score;

        }



        #endregion



        public int GetAssistItemCnt()

@@ -451,11 +521,19 @@
            }

        }



        public void SendPutOnEquip(int index)

        public void SendPutOnEquip(List<int> indexlist)

        {

            if (indexlist == null || indexlist.Count < 1) return;



            CA5C0_tagCMDogzEquipItem dogzPutOn = new CA5C0_tagCMDogzEquipItem();

            dogzPutOn.DogzID = (byte)presentSelectDogz;

            dogzPutOn.EquipIndex = (byte)index;

            dogzPutOn.EquipIndexCount = (byte)indexlist.Count;

            byte[] indexBytes = new Byte[indexlist.Count];

            for(int i = 0; i < indexBytes.Length; i++)

            {

                indexBytes[i] = (byte)indexlist[i];

            }

            dogzPutOn.EquipIndexList = indexBytes;

            GameNetSystem.Instance.SendInfo(dogzPutOn);

        }



@@ -522,7 +600,7 @@
                    dogzItemList.Add(value);

                }

            }



            dogzItemList.Sort(CompareByDogzItemPack);

            return dogzItemList;

        }



@@ -540,6 +618,23 @@
            if (SelectDogzItemQuality == itemConfig.ItemColor && SelectDogzItemStart == itemConfig.StarLevel) return true;



            return false;

        }



        public int CompareByDogzItemPack(ItemModel start,ItemModel end)

        {

            int x = start.chinItemModel.EquipPlace;

            int y = end.chinItemModel.EquipPlace;

            if (x.CompareTo(y) != 0) return x.CompareTo(y);

            x = start.chinItemModel.ItemColor;

            y = end.chinItemModel.ItemColor;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);

            x = start.chinItemModel.StarLevel;

            y = end.chinItemModel.StarLevel;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);

            x = start.equipScore;

            y = end.equipScore;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);

            return 0;

        }



        public List<ItemModel> selectEquipPlacelist { get; private set; }

@@ -668,13 +763,24 @@
            bool isMaxAssistNum = GetAssistDogzCount() >= DogzAssistDefaultCnt ? true : false;

            if(!isMaxAssistNum)

            {

                int minAlreadyAssistId = 0;

                foreach (var dogzId in m_DogzEquipLimit.Keys)

                {

                    if (TryGetAssistDogzState(dogzId)

                        && ((minAlreadyAssistId < dogzId && minAlreadyAssistId != 0) || minAlreadyAssistId == 0))

                    {

                        minAlreadyAssistId = dogzId;

                    }

                }



                int maxDogzId = 0;

                foreach(var dogzId in m_DogzEquipLimit.Keys)

                {

                    var equips = GetDogzEquips(dogzId);

                    int equipNum = equips == null ? 0 : equips.Count;

                    if(equipNum >= 5 && maxDogzId < dogzId

                        && !TryGetAssistDogzState(dogzId))

                        && !TryGetAssistDogzState(dogzId)

                        && ((minAlreadyAssistId != 0 && dogzId > minAlreadyAssistId) || minAlreadyAssistId == 0))

                    {

                        maxDogzId = dogzId;

                    }

@@ -782,8 +888,7 @@
                foreach (var dogzId in m_DogzEquipLimit.Keys)

                {

                    if(TryGetAssistDogzState(dogzId)

                        && minAlreadyAssistId != 0

                        && minAlreadyAssistId < dogzId)

                        && ((minAlreadyAssistId < dogzId && minAlreadyAssistId != 0) || minAlreadyAssistId == 0))

                    {

                        minAlreadyAssistId = dogzId;

                    }


 System/Dogz/DogzPackWin.cs

@@ -21,6 +21,7 @@
        [SerializeField] Image m_DogzHeadIcon;

        [SerializeField] Button m_CloseBtn;

        [SerializeField] Button m_GetEquipBtn;

        [SerializeField] Button m_OneKeyPutBtn;

        [SerializeField] ScrollerController m_PackController;

        [SerializeField] Button qualitySelectBtn;

        [SerializeField] Button starSelectBtn;

@@ -55,6 +56,7 @@
        {

            m_CloseBtn.onClick.AddListener(CloseClick);

            m_GetEquipBtn.onClick.AddListener(GetEquipBtn);

            m_OneKeyPutBtn.AddListener(ClickOneKeyPutBtn);

            qualitySelectBtn.AddListener(ClickQualitySelect);

            starSelectBtn.AddListener(ClickStarSelect);

        }

@@ -125,8 +127,8 @@
                else

                {

                    var _itemColor = dogzModel.GetDogzEquipLimitByIndex(dogzModel.presentSelectDogz, i);

                    m_DogzUnEquipContents[i].text = StringUtility.Contact(DogzModel.GetItemColorName(_itemColor),

                        DogzModel.GetDogzPartNameByIndex(i));

                    m_DogzUnEquipContents[i].text = StringUtility.Contact(dogzModel.GetItemColorName(_itemColor),

                        dogzModel.GetDogzPartNameByIndex(i));

                    m_DogzUnEquipContents[i].color = UIHelper.GetUIColor(_itemColor);

                    m_DogzUnEquipBtns[i].DogzUnEquipBtn.RemoveAllListeners();

                    m_DogzUnEquipBtns[i].DogzUnEquipBtn.AddListener(() => { ClickEquipIndex(index); });

@@ -190,6 +192,24 @@
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DogzDungeon);

        }





        private void ClickOneKeyPutBtn()

        {

            List<int> indexlist = new List<int>();

            for(int i = 0; i < 5; i++)

            {

                dogzModel.GetDogzItemListByIndex(dogzModel.presentSelectDogz,i);

                if (dogzModel.selectEquipPlacelist.Count > 0)

                {

                    indexlist.Add(dogzModel.selectEquipPlacelist[0].itemInfo.ItemPlace);

                }

            }

            if(indexlist.Count > 0)

            {

                dogzModel.SendPutOnEquip(indexlist);

            }

        }



        private void ClickStarSelect()

        {

            starArrow.localRotation = Quaternion.Euler(0, 0, 0);


 System/Dogz/DogzWin.cs

@@ -74,7 +74,7 @@
        {

            ModelCenter.Instance.GetModel<GodBeastModel>().ItemPlace = equipIndex;

            funcBtnGroup.TriggerByOrder(order);

            if(WindowCenter.Instance.CheckOpen<DogzPackWin>())

            if(WindowCenter.Instance.IsOpen<DogzPackWin>())

            {

                WindowCenter.Instance.CloseImmediately<DogzPackWin>();

            }

@@ -102,11 +102,11 @@


        void CloseChild()

        {

            if (WindowCenter.Instance.CheckOpen<DogzActiveWin>())

            if (WindowCenter.Instance.IsOpen<DogzActiveWin>())

            {

                WindowCenter.Instance.CloseImmediately<DogzActiveWin>();

            }

            if (WindowCenter.Instance.CheckOpen<GodBeastReinforcementWin>())

            if (WindowCenter.Instance.IsOpen<GodBeastReinforcementWin>())

            {

                WindowCenter.Instance.CloseImmediately<GodBeastReinforcementWin>();

            }


 System/Dogz/SelectCell.cs

@@ -1,4 +1,5 @@
using EnhancedUI.EnhancedScroller;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



@@ -21,6 +22,7 @@
            nameTex.text = model.chinItemModel.ItemName;

            nameTex.color = UIHelper.GetUIColor(model.chinItemModel.ItemColor,true);

            itemBaisc.Init(model);

            itemBaisc.bindIcon.gameObject.SetActive(false);

            int strenLv = 0;

            if (model.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)

            {

@@ -39,7 +41,9 @@
            selectBtn.RemoveAllListeners();

            selectBtn.AddListener(()=>

            {

                dogzModel.SendPutOnEquip(model.itemInfo.ItemPlace);

                List<int> indexlist = new List<int>();

                indexlist.Add(model.itemInfo.ItemPlace);

                dogzModel.SendPutOnEquip(indexlist);

                WindowCenter.Instance.CloseImmediately<SelectDogzItemWin>();

            });

        }


 System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs

@@ -74,13 +74,13 @@
            var config = Config.Instance.Get<DogzDungeonConfig>(bossId);
            var npcConfig = Config.Instance.Get<NPCConfig>(bossId);

            DrawBossBaseInfo(config.PortraitID, npcConfig.charName, npcConfig.NPCLV, npcConfig.Realm);
            DrawBossBaseInfo(config.PortraitID, npcConfig.charName, npcConfig.NPCLV, npcConfig.ClientRealm);
            UpdateBossRebornCoolDown(isUnLocked);
            UpdateBossPortrait(interactorableState);
            OnSelected(bossId);

            model.boxSurplusChangeEvent -= OnGuardInfoUpdate;
            model.boxSurplusChangeEvent -= OnBoxInfoUpdate;
            model.eliteSurplusChangeEvent -= OnGuardInfoUpdate;
            model.dogzDungeonBox.refreshTimeEvent -= OnBoxRefreshTimeChange;
            model.dogzDungeonElite.refreshTimeEvent -= OnEliteRefreshTimeChange;

@@ -89,11 +89,11 @@
                case 1:
                case 2:
                    model.dogzDungeonBox.refreshTimeEvent += OnBoxRefreshTimeChange;
                    model.boxSurplusChangeEvent += OnGuardInfoUpdate;
                    model.boxSurplusChangeEvent += OnBoxInfoUpdate;
                    break;
                case 3:
                    model.dogzDungeonElite.refreshTimeEvent += OnEliteRefreshTimeChange;
                    model.boxSurplusChangeEvent += OnBoxInfoUpdate;
                    model.eliteSurplusChangeEvent += OnGuardInfoUpdate;
                    break;
            }

@@ -105,8 +105,8 @@
        {
            base.Dispose();
            model.bossSelectedEvent -= OnSelected;
            model.boxSurplusChangeEvent -= OnGuardInfoUpdate;
            model.boxSurplusChangeEvent -= OnBoxInfoUpdate;
            model.eliteSurplusChangeEvent -= OnGuardInfoUpdate;
            model.dogzDungeonBox.refreshTimeEvent -= OnBoxRefreshTimeChange;
            model.dogzDungeonElite.refreshTimeEvent -= OnEliteRefreshTimeChange;
        }
@@ -195,11 +195,11 @@
            m_Portrait.SetSprite(_icon);
            m_Portrait.SetNativeSize();

            if (m_Realm != null)
            if (m_Realm != null && m_RealmContainer != null)
            {
                if (Config.Instance.ContainKey<RealmConfig>(_realm))
                {
                    m_Realm.gameObject.SetActive(true);
                    m_RealmContainer.gameObject.SetActive(true);
                    var realmConfig = Config.Instance.Get<RealmConfig>(_realm);
                    if (realmConfig != null)
                    {
@@ -208,7 +208,7 @@
                }
                else
                {
                    m_Realm.gameObject.SetActive(false);
                    m_RealmContainer.gameObject.SetActive(false);
                }
            }
        }

 System/DogzDungeon/DogzDungeonModel.cs

@@ -293,7 +293,7 @@
                dogzDungeonElite.UpdateEliteRefreshTime(eliteRefreshSecond);
            }

            if (WindowCenter.Instance.CheckOpen("DogzDungeonWin"))
            if (WindowCenter.Instance.IsOpen("DogzDungeonWin"))
            {
                if (containBox)
                {
@@ -365,7 +365,6 @@
        public void UpdateBoxRefreshTime(int _seconds)
        {
            refreshTime = DateTime.Now + new TimeSpan(_seconds * TimeSpan.TicksPerSecond);
            DebugEx.Log("宝箱刷新时间:" + refreshTime);
            if (refreshTimeEvent != null)
            {
                refreshTimeEvent();
@@ -402,7 +401,6 @@
            {
                refreshTimeEvent();
            }
            DebugEx.Log("精英刷新时间:" + refreshTime);
        }

        public int GetAliveElite()

 System/Dungeon/DungeonFightWin.cs

@@ -310,7 +310,7 @@


        private void OnAncientBtn()

        {

            if (WindowCenter.Instance.CheckOpen<DungeonAncientAchieveWin>())

            if (WindowCenter.Instance.IsOpen<DungeonAncientAchieveWin>())

            {

                WindowCenter.Instance.CloseImmediately<DungeonAncientAchieveWin>();

            }


 System/Dungeon/DungeonModel.cs

@@ -484,7 +484,7 @@
            switch (_dungeon.mapId)

            {

                case RealmModel.REALM_DUNGEON_ID:

                    if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())

                    if (!WindowCenter.Instance.IsOpen<TeamFrameWin>())

                    {

                        var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);

@@ -492,7 +492,7 @@
                    }

                    break;

                default:

                    if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())

                    if (!WindowCenter.Instance.IsOpen<TeamFrameWin>())

                    {

                        var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(_dungeon.mapId, _dungeon.lineId);

@@ -790,7 +790,7 @@
            {

                case 31080:

                    {

                        if (!WindowCenter.Instance.CheckOpen<DungeonFairyLandWin>())

                        if (!WindowCenter.Instance.IsOpen<DungeonFairyLandWin>())

                        {

                            WindowCenter.Instance.Open<DungeonFairyLandWin>();

                        }

@@ -799,26 +799,26 @@
                    }

                    break;

                case 31150:

                    if (!WindowCenter.Instance.CheckOpen<ElderGodAngerWin>())

                    if (!WindowCenter.Instance.IsOpen<ElderGodAngerWin>())

                    {

                        WindowCenter.Instance.Open<ElderGodAngerWin>();

                    }

                    break;

                case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:

                    ModelCenter.Instance.GetModel<FairyLeagueModel>().UpdateFairyWarHelp(_mission);

                    if (!WindowCenter.Instance.CheckOpen<DungeonFairyLeagueMissionWin>())

                    if (!WindowCenter.Instance.IsOpen<DungeonFairyLeagueMissionWin>())

                    {

                        WindowCenter.Instance.Open<DungeonFairyLeagueMissionWin>();

                    }

                    break;

                case 31160:

                    if (!WindowCenter.Instance.CheckOpen<DungeonAncientTargetWin>())

                    if (!WindowCenter.Instance.IsOpen<DungeonAncientTargetWin>())

                    {

                        WindowCenter.Instance.Open<DungeonAncientTargetWin>();

                    }

                    break;

                case 31170:

                    if (!WindowCenter.Instance.CheckOpen<DungeonMultipleTaskWin>())

                    if (!WindowCenter.Instance.IsOpen<DungeonMultipleTaskWin>())

                    {

                        WindowCenter.Instance.Open<DungeonMultipleTaskWin>();

                    }

@@ -834,19 +834,19 @@
                    }

                    if (GetDungeonHintId(mapId, lineId) != 0)

                    {

                        if (!WindowCenter.Instance.CheckOpen<DungeonMissionHintWin>())

                        if (!WindowCenter.Instance.IsOpen<DungeonMissionHintWin>())

                        {

                            WindowCenter.Instance.Open<DungeonMissionHintWin>();

                        }



                        if (!WindowCenter.Instance.CheckOpen<DungeonFairyFeastHintWin>())

                        if (!WindowCenter.Instance.IsOpen<DungeonFairyFeastHintWin>())

                        {

                            WindowCenter.Instance.Open<DungeonFairyFeastHintWin>();

                        }

                    }

                    break;

                case DemonJarModel.DEMONJAR_MAPID:

                    if (!WindowCenter.Instance.CheckOpen<DemonJarDamageRankWin>())

                    if (!WindowCenter.Instance.IsOpen<DemonJarDamageRankWin>())

                    {

                        WindowCenter.Instance.Open<DemonJarDamageRankWin>();

                    }

@@ -856,12 +856,12 @@
                case HeavenBattleModel.HEAVEBATTLE_MAPID:

                    if (GetDungeonHintId(mapId, lineId) != 0)

                    {

                        if (!WindowCenter.Instance.CheckOpen<DungeonMissionHintWin>())

                        if (!WindowCenter.Instance.IsOpen<DungeonMissionHintWin>())

                        {

                            WindowCenter.Instance.Open<DungeonMissionHintWin>();

                        }



                        if (!WindowCenter.Instance.CheckOpen<XMZZMissionDetailsWin>())

                        if (!WindowCenter.Instance.IsOpen<XMZZMissionDetailsWin>())

                        {

                            WindowCenter.Instance.Open<XMZZMissionDetailsWin>();

                        }

@@ -870,12 +870,12 @@
                default:

                    if (GetDungeonHintId(mapId, lineId) != 0)

                    {

                        if (!WindowCenter.Instance.CheckOpen<DungeonMissionHintWin>())

                        if (!WindowCenter.Instance.IsOpen<DungeonMissionHintWin>())

                        {

                            WindowCenter.Instance.Open<DungeonMissionHintWin>();

                        }



                        if (!WindowCenter.Instance.CheckOpen<DungeonMissionDetailsWin>())

                        if (!WindowCenter.Instance.IsOpen<DungeonMissionDetailsWin>())

                        {

                            WindowCenter.Instance.Open<DungeonMissionDetailsWin>();

                        }

@@ -888,7 +888,7 @@
                updateMissionEvent();

            }



            if (m_Mission.grade > 0 && !WindowCenter.Instance.CheckOpen<DungeonGradeWin>())

            if (m_Mission.grade > 0 && !WindowCenter.Instance.IsOpen<DungeonGradeWin>())

            {

                WindowCenter.Instance.Open<DungeonGradeWin>();

            }

@@ -901,7 +901,7 @@
            switch (_dataMapId)

            {

                case DemonJarModel.DEMONJAR_MAPID:

                    if (!WindowCenter.Instance.CheckOpen<DemonJarDamageRankWin>())

                    if (!WindowCenter.Instance.IsOpen<DemonJarDamageRankWin>())

                    {

                        WindowCenter.Instance.Open<DemonJarDamageRankWin>();

                    }


 System/Dungeon/TargetBriefInfoWin.cs

@@ -34,7 +34,7 @@
            if (_show)

            {

                DemonJarBossLifeBarWin win;

                if (!WindowCenter.Instance.CheckOpen<DemonJarBossLifeBarWin>())

                if (!WindowCenter.Instance.IsOpen<DemonJarBossLifeBarWin>())

                {

                    win = WindowCenter.Instance.Open<DemonJarBossLifeBarWin>(true);

                }

@@ -49,7 +49,7 @@
        else

        {

            TargetBriefInfoWin win;

            if (!WindowCenter.Instance.CheckOpen<TargetBriefInfoWin>())

            if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

            {

                win = WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

            }

@@ -70,7 +70,7 @@
        if (dataMapId == DemonJarModel.DEMONJAR_MAPID)

        {

            DemonJarBossLifeBarWin win;

            if (!WindowCenter.Instance.CheckOpen<DemonJarBossLifeBarWin>())

            if (!WindowCenter.Instance.IsOpen<DemonJarBossLifeBarWin>())

            {

                win = WindowCenter.Instance.Open<DemonJarBossLifeBarWin>(true);

            }

@@ -87,7 +87,7 @@
            && PlayerDatas.Instance.hero.SelectTarget.ServerInstID == TargetBriefInfoWin.currentBossInstanceId)

            {

                TargetBriefInfoWin win;

                if (!WindowCenter.Instance.CheckOpen<TargetBriefInfoWin>())

                if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

                {

                    win = WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

                }

@@ -106,7 +106,7 @@
    static void OnShowPlayerLifeBar(uint _instanceId, bool _show)

    {

        TargetBriefInfoWin win;

        if (!WindowCenter.Instance.CheckOpen<TargetBriefInfoWin>())

        if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

        {

            win = WindowCenter.Instance.Open<TargetBriefInfoWin>(true);

        }


 System/FairyAu/FairyAuTaskWin.cs

@@ -133,7 +133,7 @@
        private void OnPlayerDie()

        {

            CloseImmediately();

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {



                WindowCenter.Instance.Open<MainInterfaceWin>();


 System/FairyAu/FairyGrabBossModel.cs

@@ -217,7 +217,7 @@
                return;

            }

            grabBossHintOpen = true;

            if (!WindowCenter.Instance.CheckOpen<FairyGrabBossHintWin>())

            if (!WindowCenter.Instance.IsOpen<FairyGrabBossHintWin>())

            {

                WindowCenter.Instance.Open<FairyGrabBossHintWin>();

            }

@@ -230,7 +230,7 @@
        void CloseGrabBossHint()

        {

            grabBossHintOpen = false;

            if (WindowCenter.Instance.CheckOpen<FairyGrabBossHintWin>())

            if (WindowCenter.Instance.IsOpen<FairyGrabBossHintWin>())

            {

                WindowCenter.Instance.CloseImmediately<FairyGrabBossHintWin>();

            }


 System/FairyAu/FairyModel.cs

@@ -420,7 +420,7 @@
        {

            fairyRequestRedPoint.count = 0;

            fairyRequestDict.Clear();

            if (WindowCenter.Instance.CheckOpen<FairyInviteWin>())

            if (WindowCenter.Instance.IsOpen<FairyInviteWin>())

            {

                WindowCenter.Instance.CloseImmediately<FairyInviteWin>();

            }

@@ -437,7 +437,7 @@
                _pak.TagPlayerID = (uint)fairyRequestDict[_fairyId].leaderId;

                _pak.IsOK = 1;

                GameNetSystem.Instance.SendInfo(_pak);

                if (WindowCenter.Instance.CheckOpen<FairyInviteWin>())

                if (WindowCenter.Instance.IsOpen<FairyInviteWin>())

                {

                    WindowCenter.Instance.CloseImmediately<FairyInviteWin>();

                }


 System/FairyAu/KingFairyModel.cs

@@ -187,7 +187,7 @@
            CA410_tagCGFamilyWarWinRewardAllot _pak = new CA410_tagCGFamilyWarWinRewardAllot();

            _pak.MemPlayerID = (uint)_memberId;

            GameNetSystem.Instance.SendInfo(_pak);

            if (WindowCenter.Instance.CheckOpen<KingFairyAllotWin>())

            if (WindowCenter.Instance.IsOpen<KingFairyAllotWin>())

            {

                WindowCenter.Instance.CloseImmediately<KingFairyAllotWin>();

            }


 System/FairyAu/PlayerRedPacketDatas.cs

@@ -193,7 +193,7 @@


    private void RedBagPoppingOpen()

    {

        if (_DicRedBag.ContainsKey(RedEnvelopeID) && WindowCenter.Instance.CheckOpen<RedBagTipsWin>())

        if (_DicRedBag.ContainsKey(RedEnvelopeID) && WindowCenter.Instance.IsOpen<RedBagTipsWin>())

        {

            var redBag = _DicRedBag[RedEnvelopeID];

            if (redBag.GetWay != 5 && redBag.GetWay != 0 && redBag.PlayerID == PlayerDatas.Instance.PlayerId && redBag.State == 1)


 System/FairyAu/UnionPanel.cs

@@ -162,19 +162,19 @@
        void CloseChildWin()

        {

            funcPanel.SetActive(false);

            if (WindowCenter.Instance.CheckOpen<FairyApplyWin>())

            if (WindowCenter.Instance.IsOpen<FairyApplyWin>())

            {

                WindowCenter.Instance.CloseImmediately<FairyApplyWin>();

            }

            if (WindowCenter.Instance.CheckOpen<FairyMemberWin>())

            if (WindowCenter.Instance.IsOpen<FairyMemberWin>())

            {

                WindowCenter.Instance.CloseImmediately<FairyMemberWin>();

            }

            if (WindowCenter.Instance.CheckOpen<FairyLeagueWin>())

            if (WindowCenter.Instance.IsOpen<FairyLeagueWin>())

            {

                WindowCenter.Instance.CloseImmediately<FairyLeagueWin>();

            }

            if (WindowCenter.Instance.CheckOpen<KingTempleWin>())

            if (WindowCenter.Instance.IsOpen<KingTempleWin>())

            {

                WindowCenter.Instance.CloseImmediately<KingTempleWin>();

            }


 System/FairylandCeremony/FairylandCeremonyWin.cs

@@ -127,19 +127,19 @@


        private void CloseChildWin()

        {

            if (WindowCenter.Instance.CheckOpen<CeremonyRechargeGiftWin>())

            if (WindowCenter.Instance.IsOpen<CeremonyRechargeGiftWin>())

            {

                WindowCenter.Instance.CloseImmediately<CeremonyRechargeGiftWin>();

            }

            if (WindowCenter.Instance.CheckOpen<CeremonyFirepartyWin>())

            if (WindowCenter.Instance.IsOpen<CeremonyFirepartyWin>())

            {

                WindowCenter.Instance.CloseImmediately<CeremonyFirepartyWin>();

            }

            if (WindowCenter.Instance.CheckOpen<CeremonyPeopleToHiWin>())

            if (WindowCenter.Instance.IsOpen<CeremonyPeopleToHiWin>())

            {

                WindowCenter.Instance.CloseImmediately<CeremonyPeopleToHiWin>();

            }

            if (WindowCenter.Instance.CheckOpen<CeremonyOutOfPrintWin>())

            if (WindowCenter.Instance.IsOpen<CeremonyOutOfPrintWin>())

            {

                WindowCenter.Instance.CloseImmediately<CeremonyOutOfPrintWin>();

            }


 System/FindPrecious/FindPreciousBossBriefInfoBehaviour.cs

@@ -25,6 +25,7 @@
        [SerializeField] protected ImageEx m_Portrait;

        [SerializeField] protected TextEx m_BossName;

        [SerializeField] protected TextEx m_BossLevel;

        [SerializeField] protected RectTransform m_RealmContainer;

        [SerializeField] protected Image m_Realm;

        [SerializeField] protected TimerBehaviour m_CoolDown;

        [SerializeField] protected Transform m_RefreshAtOnce;

@@ -90,11 +91,11 @@
            m_BossName.text = _name;

            m_BossLevel.text = Language.Get("Z1024", _level);



            if (m_Realm != null)

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

            {

                if (Config.Instance.ContainKey<RealmConfig>(_realm))

                {

                    m_Realm.gameObject.SetActive(true);

                    m_RealmContainer.gameObject.SetActive(true);

                    var realmConfig = Config.Instance.Get<RealmConfig>(_realm);

                    if (realmConfig != null)

                    {

@@ -103,7 +104,7 @@
                }

                else

                {

                    m_Realm.gameObject.SetActive(false);

                    m_RealmContainer.gameObject.SetActive(false);

                }

            }

        }


 System/FindPrecious/FindPreciousModel.cs

@@ -223,8 +223,13 @@
                BossInfo bossInfo;

                if (TryGetBossInfo(bossId, out bossInfo))

                {

                    bossInfo.deadLines.Clear();

                    bossInfo.deadLines.AddRange(bossLineInfo.DeadLineList);

                    bossInfo.lineToAlives.Clear();

                    for (var j = 0; j < bossLineInfo.LineIDList.Length; j++)

                    {

                        var line = bossLineInfo.LineIDList[j];

                        var state = bossLineInfo.StateList[j];

                        bossInfo.lineToAlives[line] = state == 1;

                    }

                }

            }

        }

@@ -499,7 +504,8 @@
            bool isCommunalAlive { get; set; }

            public List<BossKillRecord> killRecords = new List<BossKillRecord>();

            public DateTime refreshTime { get; private set; }

            public List<byte> deadLines = new List<byte>();

            public Dictionary<int, bool> lineToAlives = new Dictionary<int, bool>();

            public int rebornTotalCd { get; private set; }



            public BossInfo(int _id)

            {

@@ -509,6 +515,7 @@
            public void UpdateBossInfo(HA902_tagGCGameWorldBossInfo.tagBossInfoObj _bossInfo)

            {

                isCommunalAlive = _bossInfo.IsAlive == 1;

                rebornTotalCd = (int)_bossInfo.RefreshCD;

                killRecords.Clear();

                if (!string.IsNullOrEmpty(_bossInfo.KillRecord))

                {

@@ -534,14 +541,42 @@
                    {

                        return false;

                    }

                    else if ((BossFakeLineUtility.Instance.lastBossNpcID == bossId && Time.realtimeSinceStartup < BossFakeLineUtility.Instance.inMistakeForBossAliveOverTime)

                        && !IsLineBossDead(PlayerDatas.Instance.baseData.FBID))

                    else

                    {

                        var isMistakeBoss = BossFakeLineUtility.Instance.lastBossNpcID == bossId

                            && Time.realtimeSinceStartup < BossFakeLineUtility.Instance.inMistakeForBossAliveOverTime;

                        var isLineBossAlive = IsLineBossAlive(PlayerDatas.Instance.baseData.FBID);



                        if (isMistakeBoss && isLineBossAlive)

                    {

                        return true;

                    }

                    else

                    {

                        return isCommunalAlive;

                            var currentNeutralMap = false;

                            if (Config.Instance.ContainKey<WorldBossConfig>(bossId))

                            {

                                var worldBossConfig = Config.Instance.Get<WorldBossConfig>(bossId);

                                currentNeutralMap = worldBossConfig.MapID == PlayerDatas.Instance.baseData.MapID;

                                currentNeutralMap = currentNeutralMap && GeneralConfig.Instance.neutralMaps.Contains(worldBossConfig.MapID);

                            }



                            if (currentNeutralMap)

                            {

                                return isLineBossAlive;

                            }

                            else

                            {

                                if (BossFakeLineUtility.Instance.IsBossKilledRecently(bossId))

                                {

                                    return !IsAnyLineBossDead();

                                }

                                else

                                {

                                    return IsAnyLineBossAlive();

                                }

                            }

                        }

                    }

                }

                else

@@ -550,9 +585,35 @@
                }

            }



            bool IsLineBossDead(int _lineId)

            bool IsLineBossAlive(int _lineId)

            {

                return deadLines.Contains((byte)_lineId);

                return lineToAlives.ContainsKey(_lineId) && lineToAlives[_lineId];

            }



            bool IsAnyLineBossAlive()

            {

                foreach (var item in lineToAlives)

                {

                    if (item.Value)

                    {

                        return true;

                    }

                }



                return false;

            }



            bool IsAnyLineBossDead()

            {

                foreach (var item in lineToAlives)

                {

                    if (!item.Value)

                    {

                        return true;

                    }

                }



                return false;

            }



        }


 System/FindPrecious/FindPreciousSubscribeHintWin.cs

@@ -31,11 +31,11 @@

        protected override void OnPreOpen()
        {
            if (WindowCenter.Instance.CheckOpen<FindPreciousFrameWin>())
            if (WindowCenter.Instance.IsOpen<FindPreciousFrameWin>())
            {
                m_HintContent.text = Language.Get("FightTreasure_Focus");
            }
            else if (WindowCenter.Instance.CheckOpen<LootPreciousFrameWin>())
            else if (WindowCenter.Instance.IsOpen<LootPreciousFrameWin>())
            {
                m_HintContent.text = Language.Get("DemonJar_Focus");
            }

 System/FindPrecious/KillRecordsWin.cs

@@ -18,8 +18,7 @@
        [SerializeField] Text[] m_KillRecordDescriptions;
        [SerializeField] Button m_Close;

        FindPreciousModel m_Model;
        FindPreciousModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<FindPreciousModel>()); } }
        FindPreciousModel model { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }

        #region Built-in
        protected override void BindController()
@@ -54,10 +53,9 @@
            var records = model.GetBossKillRecords(model.ViewKillRecordsBoss);
            if (records == null)
            {
                for (int i = 0; i < m_KillTimes.Length; i++)
                foreach (var item in m_KillTimes)
                {
                    var behaviour = m_KillTimes[i];
                    behaviour.gameObject.SetActive(false);
                    item.gameObject.SetActive(false);
                }
            }
            else
@@ -79,10 +77,9 @@

            if (records == null)
            {
                for (int i = 0; i < m_KillRecordDescriptions.Length; i++)
                foreach (var item in m_KillRecordDescriptions)
                {
                    var behaviour = m_KillRecordDescriptions[i];
                    behaviour.gameObject.SetActive(false);
                    item.gameObject.SetActive(false);
                }
            }
            else

 System/FriendSystem/New/FriendsModel.cs

@@ -904,14 +904,14 @@


        if(!isJump)

        {

            if (WindowCenter.Instance.CheckOpen<ChatWin>())

            if (WindowCenter.Instance.IsOpen<ChatWin>())

            {

                ChatCtrl.Inst.OpenFriendWin();

            }

            else

            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.Friend;

                if (WindowCenter.Instance.CheckOpen<SocialWin>())

                if (WindowCenter.Instance.IsOpen<SocialWin>())

                {

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.CloseImmediately<SocialWin>();


 System/GeneralConfig/GeneralConfig.cs

@@ -77,6 +77,7 @@
    public int[] autoBuyItemPrices;



    public List<int> neutralMaps = new List<int>();

    public List<int> neutralBossMaps = new List<int>();



    public int demonJarRedPoint { get; private set; }

    public string LoadLV { get; private set; }

@@ -362,7 +363,8 @@
            lowHpRemind = GetInt("LowHpRemind");

            autoBuyItemIds = GetIntArray("BuyItemPrice", 1);

            autoBuyItemPrices = GetIntArray("BuyItemPrice", 2);

            neutralMaps.AddRange(GetIntArray("BossListMapID"));

            neutralMaps.AddRange(GetIntArray("MapLine", 4));

            neutralBossMaps.AddRange(GetIntArray("BossListMapID"));



            var _propertyIconCfg = Config.Instance.Get<FuncConfigConfig>("PropertyIcon");

            var _propertyIconJson = LitJson.JsonMapper.ToObject(_propertyIconCfg.Numerical1);


 System/HappyXB/HappyXBWin.cs

@@ -72,7 +72,7 @@
        {

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

                if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

                {

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                }


 System/HeavenBattle/BattlePrepareCoolDownWin.cs

@@ -100,7 +100,7 @@
        private void CloseWin()

        {

            CloseImmediately();

            if (!WindowCenter.Instance.CheckOpen<DungeonEndCoolDownWin>())

            if (!WindowCenter.Instance.IsOpen<DungeonEndCoolDownWin>())

            {

                WindowCenter.Instance.Open<DungeonEndCoolDownWin>();

            }


 System/HeavenBattle/HeavenBattleModel.cs

@@ -189,7 +189,7 @@
        {

            if(dailyQuestModel.GetQuestState(dailyConfig.ID) != DailyQuestModel.DailyQuestState.OutTime)

            {

                if (!WindowCenter.Instance.CheckOpen<HeavenBattleWin>())

                if (!WindowCenter.Instance.IsOpen<HeavenBattleWin>())

                {

                    var config = Config.Instance.Get<DailyQuestConfig>(dailyConfig.ID);

                    dungeonModel.currentDungeon = new Dungeon(config.RelatedID, 0);

@@ -228,12 +228,12 @@
        WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();

        battlePrepareTime = 3;

        IsBattlePrepare = true;

        if (WindowCenter.Instance.CheckOpen<DungeonEndCoolDownWin>())

        if (WindowCenter.Instance.IsOpen<DungeonEndCoolDownWin>())

        {

            WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();

        }



        if (!WindowCenter.Instance.CheckOpen<BattlePrepareCoolDownWin>())

        if (!WindowCenter.Instance.IsOpen<BattlePrepareCoolDownWin>())

        {

            WindowCenter.Instance.Open<BattlePrepareCoolDownWin>();

        }


 System/KnapSack/EquipDecomposeBehaviour.cs

@@ -31,7 +31,7 @@


        private void GotoDecompose()

        {

            if (!WindowCenter.Instance.CheckOpen<EquipDecomMailWin>())

            if (!WindowCenter.Instance.IsOpen<EquipDecomMailWin>())

            {

                WindowCenter.Instance.Open<EquipDecomMailWin>();

            }


 System/KnapSack/Logic/BoxGetItemModel.cs

@@ -49,13 +49,13 @@
                switch (showType)

                {

                    case BoxShowType.NoramalShow:

                        if (!WindowCenter.Instance.CheckOpen<BoxGetItemWin>())

                        if (!WindowCenter.Instance.IsOpen<BoxGetItemWin>())

                        {

                            WindowCenter.Instance.Open<BoxGetItemWin>();

                        }

                        break;

                    case BoxShowType.PrefectShow:

                        if (!WindowCenter.Instance.CheckOpen<BoxGetItemWin>())

                        if (!WindowCenter.Instance.IsOpen<BoxGetItemWin>())

                        {

                            WindowCenter.Instance.Open<BoxGetItemWin>();

                        }

@@ -166,7 +166,7 @@
            bool isSelectItem = IsSelectItemByID(itemId, out selectDict);

            if (isSelectItem)

            {

                if (!WindowCenter.Instance.CheckOpen<ChooseItemWin>())

                if (!WindowCenter.Instance.IsOpen<ChooseItemWin>())

                {

                    WindowCenter.Instance.Open<ChooseItemWin>();

                }


 System/KnapSack/Logic/EquipTip.cs

@@ -536,11 +536,32 @@
            legendAttr.SetActive(true);

            legendTitleText.text = Language.Get("EquipWin_LegendPropObj_Text_1");

            legendAttrDes.text = itemTipsModel.GetLegendAttr(itemAttrData);



            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                        legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -22,7 +22,10 @@
        public Dictionary<int, Dictionary<int, int>> legendAttrLvValuePreviewDict { get; private set; } // key 属性ID value 装备阶级，属性数值

        public Dictionary<int, int> wingsLegendAttrCntPreviewDict { get; private set; } //key 阶数 value属性数

        public Dictionary<int, Dictionary<int, List<int>>> wingsLegendAttrValuePreviewDict { get; private set; } //key 阶数 value 属性ID 属性数值



        public Dictionary<int, Dictionary<LegendAttrType, List<int>>> dogzLegendAttrIDPreviewDict { get; private set; } // key 装备位 value 属性类型，属性ID

        public Dictionary<int, Dictionary<int, int>> dogzLegendAttrColorValuePreviewDict { get; private set; } // key 属性ID value 装备品质，属性数值

        public Dictionary<string, Dictionary<LegendAttrType, int>> dogzLegendAttrCntPreviewDict { get; private set; } // key 品质+星级  value 属性条目数

        public Dictionary<int, List<int>> dogzLegendAttrTypeDict { get; private set; }

        public Dictionary<int, List<string>> guardDesDict { get; private set; }



        public Dictionary<int, PetInfoConfig> unlockPetDict { get; private set; }

@@ -113,6 +116,22 @@
                }

            }



            FuncConfigConfig dogzlegendAttrColor = Config.Instance.Get<FuncConfigConfig>("DogzLegendAttrColor");

            dogzLegendAttrTypeDict = new Dictionary<int, List<int>>();

            if (dogzlegendAttrColor != null)

            {

                JsonData jsonData = JsonMapper.ToObject(dogzlegendAttrColor.Numerical1);

                foreach (var key in jsonData.Keys)

                {

                    List<int> attrIDlist = new List<int>();

                    dogzLegendAttrTypeDict.Add(int.Parse(key), attrIDlist);

                    for (int i = 0; i < jsonData[key].Count; i++)

                    {

                        attrIDlist.Add((int)jsonData[key][i]);

                    }

                }

            }



            FuncConfigConfig legendAttrCountPreview = Config.Instance.Get<FuncConfigConfig>("LegendAttrCountPreview");

            JsonData legendAttrCntData = JsonMapper.ToObject(legendAttrCountPreview.Numerical1);

            legendAttrCntPreviewDict = new Dictionary<string, Dictionary<LegendAttrType, int>>();

@@ -128,6 +147,26 @@
                        for (i = 0; i < legendAttrCntData[color][star].Count; i++)

                        {

                            legendCntDic.Add((LegendAttrType)i, int.Parse(legendAttrCntData[color][star][i].ToString()));

                        }

                    }

                }

            }



            FuncConfigConfig dogzlegendAttrCountPreview = Config.Instance.Get<FuncConfigConfig>("DogzLegendAttrCountPreview");

            JsonData dogzlegendAttrCntData = JsonMapper.ToObject(dogzlegendAttrCountPreview.Numerical1);

            dogzLegendAttrCntPreviewDict = new Dictionary<string, Dictionary<LegendAttrType, int>>();

            foreach (var color in dogzlegendAttrCntData.Keys)

            {

                foreach (var star in dogzlegendAttrCntData[color].Keys)

                {

                    Dictionary<LegendAttrType, int> legendCntDic = new Dictionary<LegendAttrType, int>();

                    dogzLegendAttrCntPreviewDict.Add(StringUtility.Contact(color, star), legendCntDic);

                    if (dogzlegendAttrCntData[color][star].IsArray)

                    {

                        int i = 0;

                        for (i = 0; i < dogzlegendAttrCntData[color][star].Count; i++)

                        {

                            legendCntDic.Add((LegendAttrType)i, int.Parse(dogzlegendAttrCntData[color][star][i].ToString()));

                        }

                    }

                }

@@ -159,6 +198,32 @@
                }

            }



            FuncConfigConfig dogzlegendAttrRulePreview = Config.Instance.Get<FuncConfigConfig>("DogzLegendAttrRulePreview");

            JsonData dogzlegendAttrRuleData = JsonMapper.ToObject(dogzlegendAttrRulePreview.Numerical1);

            dogzLegendAttrIDPreviewDict = new Dictionary<int, Dictionary<LegendAttrType, List<int>>>();

            foreach (var itemPlace in dogzlegendAttrRuleData.Keys)

            {

                Dictionary<LegendAttrType, List<int>> legendIdDic = new Dictionary<LegendAttrType, List<int>>();

                dogzLegendAttrIDPreviewDict.Add(int.Parse(itemPlace.ToString()), legendIdDic);

                if (dogzlegendAttrRuleData[itemPlace].IsArray)

                {

                    int i = 0;

                    for (i = 0; i < dogzlegendAttrRuleData[itemPlace].Count; i++)

                    {

                        if (dogzlegendAttrRuleData[itemPlace][i].IsArray)

                        {

                            List<int> attrIdlist = new List<int>();

                            legendIdDic.Add((LegendAttrType)i, attrIdlist);

                            int j = 0;

                            for (j = 0; j < dogzlegendAttrRuleData[itemPlace][i].Count; j++)

                            {

                                attrIdlist.Add(int.Parse(dogzlegendAttrRuleData[itemPlace][i][j].ToString()));

                            }

                        }

                    }

                }

            }



            FuncConfigConfig legendAttrColorValuePreview = Config.Instance.Get<FuncConfigConfig>("LegendAttrValueByColorPreview");

            JsonData legendAttrColorData = JsonMapper.ToObject(legendAttrColorValuePreview.Numerical1);

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

@@ -174,6 +239,26 @@
                        if (legendAttrColorData[attrID][i].IsArray)

                        {

                            legendValueDic.Add(int.Parse(legendAttrColorData[attrID][i][0].ToString()), int.Parse(legendAttrColorData[attrID][i][1].ToString()));

                        }

                    }

                }

            }



            FuncConfigConfig dogzlegendAttrColorValuePreview = Config.Instance.Get<FuncConfigConfig>("DogzLegendAttrValueByColorPreview");

            JsonData dogzlegendAttrColorData = JsonMapper.ToObject(dogzlegendAttrColorValuePreview.Numerical1);

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

            foreach (var attrID in dogzlegendAttrColorData.Keys)

            {

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

                dogzLegendAttrColorValuePreviewDict.Add(int.Parse(attrID.ToString()), legendValueDic);

                if (dogzlegendAttrColorData[attrID].IsArray)

                {

                    int i = 0;

                    for (i = 0; i < dogzlegendAttrColorData[attrID].Count; i++)

                    {

                        if (dogzlegendAttrColorData[attrID][i].IsArray)

                        {

                            legendValueDic.Add(int.Parse(dogzlegendAttrColorData[attrID][i][0].ToString()), int.Parse(dogzlegendAttrColorData[attrID][i][1].ToString()));

                        }

                    }

                }

@@ -729,7 +814,11 @@
            switch (attrData.winType)

            {

                case ItemWinType.equipWin:

                    attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => { dogzModel.SendPutOnEquip(attrData.index); });

                    attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => {

                        List<int> indexlist = new List<int>();

                        indexlist.Add(attrData.index);

                        dogzModel.SendPutOnEquip(indexlist);

                    });

                    break;

            }

        }

@@ -1061,6 +1150,49 @@
            return s;

        }



        public string GetDogzLegendAttrCntPreview(ItemAttrData attrData)

        {

            string s = "";

            if (attrData.isCustom)

            {

                s = Language.Get("LegendAttPreview_MustTitle", attrData.legendDataDict.Count);

            }

            else

            {

                int attrCnt = 0;

                string attrCntKey = StringUtility.Contact(attrData.itemConfig.ItemColor, attrData.itemConfig.StarLevel);

                if (dogzLegendAttrCntPreviewDict.ContainsKey(attrCntKey))

                {

                    foreach (var key in dogzLegendAttrCntPreviewDict[attrCntKey].Keys)

                    {

                        switch (key)

                        {

                            case LegendAttrType.Normal:

                                attrCnt += dogzLegendAttrCntPreviewDict[attrCntKey][key];

                                break;

                            case LegendAttrType.Pursuit:

                                attrCnt += dogzLegendAttrCntPreviewDict[attrCntKey][key];

                                break;

                            case LegendAttrType.Fixed:

                                attrCnt += dogzLegendAttrCntPreviewDict[attrCntKey][key];

                                break;

                        }

                    }

                }



                if (attrData.itemConfig.StarLevel > 2)

                {

                    s = Language.Get("LegendAttPreview_MustTitle", attrCnt);

                }

                else

                {

                    s = Language.Get("LegendAttPreview_MightTitle", attrCnt);

                }

            }



            return s;

        }



        public string GetWingsLegendAttrCntPreview(ItemAttrData attrData)

        {

            string s = "";

@@ -1113,9 +1245,30 @@
                attrDict.Add(idlist[i], valuelist[i]);

            }



            if (itemConfig.EquipPlace != (int)RoleEquipType.retWing)

            switch (itemConfig.EquipPlace)

            {

                case 11:

                    break;

                case 1:

                case 2:

                case 3:

                case 4:

                case 5:

                case 6:

                case 7:

                case 8:

                case 9:

                case 10:

                case 12:

                idlist.Sort(CompareLegendAttrType);

                    break;

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    idlist.Sort(CompareDogzLegendAttrType);

                    break;

            }



            for (i = 0; i < idlist.Count; i++)

@@ -1231,12 +1384,9 @@
                     

                    }

             

                    if (itemConfig.EquipPlace != (int)RoleEquipType.retWing)

                    switch (itemConfig.EquipPlace)

                    {

                        s = GetTextColorByLegendType(GetLegendType(idlist[i]), s);

                    }

                    else

                    {

                        case 11:

                        foreach (var key in wingsLegendAttrColorDict.Keys)

                        {

                            if (key == idlist[i])

@@ -1252,6 +1402,27 @@
                                break;

                            }

                        }

                            break;

                        case 1:

                        case 2:

                        case 3:

                        case 4:

                        case 5:

                        case 6:

                        case 7:

                        case 8:

                        case 9:

                        case 10:

                        case 12:

                            s = GetTextColorByLegendType(GetLegendType(idlist[i]), s);

                            break;

                        case 101:

                        case 102:

                        case 103:

                        case 104:

                        case 105:

                            s = GetTextColorByLegendType(GetDogzLegendType(idlist[i]), s);

                            break;

                    }



                    if (attrSB.Length <= 0)

@@ -1277,11 +1448,32 @@
            return 0;

        }



        private int CompareDogzLegendAttrType(int start, int end)

        {

            int type1 = GetDogzLegendType(start);

            int type2 = GetDogzLegendType(end);

            if (type1.CompareTo(type2) != 0) return type1.CompareTo(type2);



            return 0;

        }



        private int GetLegendType(int id)

        {

            foreach (var key in equipLegendAttrTypeDict.Keys)

            {

                if (equipLegendAttrTypeDict[key].Contains(id))

                {

                    return key;

                }

            }

            return 0;

        }



        private int GetDogzLegendType(int id)

        {

            foreach (var key in dogzLegendAttrTypeDict.Keys)

            {

                if (dogzLegendAttrTypeDict[key].Contains(id))

                {

                    return key;

                }

@@ -1732,61 +1924,40 @@
            {

                if (isPreview)

                {

                    List<int> legendIdlist = new List<int>();

                    List<int> legendValuelist = new List<int>();

                    if (itemConfig.EquipPlace != (int)RoleEquipType.retWing)

                    List<int> legendIdlist = null;

                    List<int> legendValuelist = null;

                    switch(itemConfig.EquipPlace)

                    {

                        if (itemTipsModel.legendAttrIDPreviewDict.ContainsKey(itemConfig.EquipPlace))

                        {

                            foreach (var attrType in itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace].Keys)

                            {

                                switch (attrType)

                                {

                                    case LegendAttrType.Pursuit:

                                        legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                        case 11:

                            SetWingsLegendAttrPreview(out legendIdlist,out legendValuelist);

                                        break;

                                    case LegendAttrType.Fixed:

                                        legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                        case 1:

                        case 2:

                        case 3:

                        case 4:

                        case 5:

                        case 6:

                        case 7:

                        case 8:

                        case 9:

                        case 10:

                        case 12:

                            SetEquipLegendAttrPreview(out legendIdlist,out legendValuelist);

                            break;

                        case 101:

                        case 102:

                        case 103:

                        case 104:

                        case 105:

                            SetDogzEquipLegendAttrPreview(out legendIdlist, out legendValuelist);

                                        break;

                                }

                            }

                        }

                        int i = 0;

                        for (i = 0; i < legendIdlist.Count; i++)

                    if(legendIdlist != null && legendValuelist != null)

                        {

                            if (itemTipsModel.legendAttrColorValuePreviewDict.ContainsKey(legendIdlist[i]))

                            {

                                if (itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.ItemColor))

                                {

                                    legendValuelist.Add(itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]][itemConfig.ItemColor]);

                                }

                            }

                            else if (itemTipsModel.legendAttrLvValuePreviewDict.ContainsKey(legendIdlist[i]))

                            {

                                if (itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.LV))

                                {

                                    legendValuelist.Add(itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]][itemConfig.LV]);

                                }

                            }

                        }

                    }

                    else

                    {

                        if (itemTipsModel.wingsLegendAttrValuePreviewDict.ContainsKey(itemConfig.LV))

                        {

                            Dictionary<int, List<int>> attrIdDict = itemTipsModel.wingsLegendAttrValuePreviewDict[itemConfig.LV];

                            foreach (var attrId in attrIdDict.Keys)

                            {

                                legendIdlist.Add(attrId);

                                legendValuelist.Add(attrIdDict[attrId][0]);

                            }



                        }

                    }



                    if (legendIdlist.Count == legendValuelist.Count)

                    {

                        SetLegendData(legendIdlist, legendValuelist);

                        }

                    }

                }

                else

@@ -1864,6 +2035,94 @@
            this.extraInfos = extraInfos;

        }



        private void SetWingsLegendAttrPreview(out List<int> legendIdlist, out List<int> legendValuelist)

        {

            legendIdlist = new List<int>();

            legendValuelist = new List<int>();

            if (itemTipsModel.wingsLegendAttrValuePreviewDict.ContainsKey(itemConfig.LV))

            {

                Dictionary<int, List<int>> attrIdDict = itemTipsModel.wingsLegendAttrValuePreviewDict[itemConfig.LV];

                foreach (var attrId in attrIdDict.Keys)

                {

                    legendIdlist.Add(attrId);

                    legendValuelist.Add(attrIdDict[attrId][0]);

                }



            }

        }



        private void SetEquipLegendAttrPreview(out List<int> legendIdlist, out List<int> legendValuelist)

        {

            legendIdlist = new List<int>();

            legendValuelist = new List<int>();

            if (itemTipsModel.legendAttrIDPreviewDict.ContainsKey(itemConfig.EquipPlace))

            {

                foreach (var attrType in itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace].Keys)

                {

                    switch (attrType)

                    {

                        case LegendAttrType.Pursuit:

                            legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                        case LegendAttrType.Fixed:

                            legendIdlist.AddRange(itemTipsModel.legendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                    }

                }

            }

            int i = 0;

            for (i = 0; i < legendIdlist.Count; i++)

            {

                if (itemTipsModel.legendAttrColorValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.ItemColor))

                    {

                        legendValuelist.Add(itemTipsModel.legendAttrColorValuePreviewDict[legendIdlist[i]][itemConfig.ItemColor]);

                    }

                }

                else if (itemTipsModel.legendAttrLvValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.LV))

                    {

                        legendValuelist.Add(itemTipsModel.legendAttrLvValuePreviewDict[legendIdlist[i]][itemConfig.LV]);

                    }

                }

            }

        }



        private void SetDogzEquipLegendAttrPreview(out List<int> legendIdlist, out List<int> legendValuelist)

        {

            legendIdlist = new List<int>();

            legendValuelist = new List<int>();

            if (itemTipsModel.dogzLegendAttrIDPreviewDict.ContainsKey(itemConfig.EquipPlace))

            {

                foreach (var attrType in itemTipsModel.dogzLegendAttrIDPreviewDict[itemConfig.EquipPlace].Keys)

                {

                    switch (attrType)

                    {

                        case LegendAttrType.Pursuit:

                            legendIdlist.AddRange(itemTipsModel.dogzLegendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                        case LegendAttrType.Fixed:

                            legendIdlist.AddRange(itemTipsModel.dogzLegendAttrIDPreviewDict[itemConfig.EquipPlace][attrType]);

                            break;

                    }

                }

            }

            int i = 0;

            for (i = 0; i < legendIdlist.Count; i++)

            {

                if (itemTipsModel.dogzLegendAttrColorValuePreviewDict.ContainsKey(legendIdlist[i]))

                {

                    if (itemTipsModel.dogzLegendAttrColorValuePreviewDict[legendIdlist[i]].ContainsKey(itemConfig.ItemColor))

                    {

                        legendValuelist.Add(itemTipsModel.dogzLegendAttrColorValuePreviewDict[legendIdlist[i]][itemConfig.ItemColor]);

                    }

                }

            }

        }





        private StringBuilder _extraInfoBuider = new StringBuilder();

        private StringBuilder _allInfoDesBuider = new StringBuilder();

        public string GetExtraInfos()


 System/KnapSack/Logic/PackModelInterface.cs

@@ -297,19 +297,31 @@
            curEquipAttrDict.Clear();

            itemEffectDict.Clear();

            _equipGSFormulaDict.Clear();



            try

            {

                if (tagChinModel.Effect1 != 0)

                    itemEffectDict.Add(tagChinModel.Effect1, tagChinModel.EffectValueA1);

                {

                    ConvertAttrId(tagChinModel.Effect1, tagChinModel.EffectValueA1, itemEffectDict);

                }

                if (tagChinModel.Effect2 != 0)

                    itemEffectDict.Add(tagChinModel.Effect2, tagChinModel.EffectValueA2);

                {

                    ConvertAttrId(tagChinModel.Effect2, tagChinModel.EffectValueA2, itemEffectDict);

                }



                if (tagChinModel.Effect3 != 0)

                    itemEffectDict.Add(tagChinModel.Effect3, tagChinModel.EffectValueA3);

                {

                    ConvertAttrId(tagChinModel.Effect3, tagChinModel.EffectValueA3, itemEffectDict);

                }



                if (tagChinModel.Effect4 != 0)

                    itemEffectDict.Add(tagChinModel.Effect4, tagChinModel.EffectValueA4);

                {

                    ConvertAttrId(tagChinModel.Effect4, tagChinModel.EffectValueA4, itemEffectDict);

                }



                if (tagChinModel.Effect5 != 0)

                    itemEffectDict.Add(tagChinModel.Effect5, tagChinModel.EffectValueA5);

                {

                    ConvertAttrId(tagChinModel.Effect5, tagChinModel.EffectValueA5, itemEffectDict);

                }



            }

            catch (Exception ex)

@@ -399,6 +411,42 @@
            }

            return 0;

        }



        private void ConvertAttrId(int attrId,int attrValue,Dictionary<int,int> keyValues)

        {

            switch((AttrEnum)attrId)

            {

                case AttrEnum.ATK:

                    if(!keyValues.ContainsKey((int)AttrEnum.MinAtk))

                    {

                        keyValues.Add(((int)AttrEnum.MinAtk),attrValue);

                    }

                    else

                    {

                        keyValues[(int)AttrEnum.MinAtk] += attrValue;

                    }



                    if (!keyValues.ContainsKey((int)AttrEnum.MaxAtk))

                    {

                        keyValues.Add(((int)AttrEnum.MaxAtk), attrValue);

                    }

                    else

                    {

                        keyValues[(int)AttrEnum.MaxAtk] += attrValue;

                    }

                    break;

                default:

                    if (!keyValues.ContainsKey(attrId))

                    {

                        keyValues.Add(attrId, attrValue);

                    }

                    else

                    {

                        keyValues[attrId] += attrValue;

                    }

                    break;

            }

        }

        #endregion



        #region 主界面物品弹框展示


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -392,7 +392,7 @@
            switch (success.ItemID)

            {

                case 221:

                    if (WindowCenter.Instance.CheckOpen<KnapSackWin>())

                    if (WindowCenter.Instance.IsOpen<KnapSackWin>())

                    {

                        WindowCenter.Instance.CloseImmediately<KnapSackWin>();

                    }


 System/KnapSack/Logic/TreasureEffectModel.cs

@@ -88,7 +88,7 @@
            this.treasureId = id;

            this.vipLv = vipLv;

            SetTreasureEffectDes(out showType);

            if (!WindowCenter.Instance.CheckOpen<TreasureEffectWin>())

            if (!WindowCenter.Instance.IsOpen<TreasureEffectWin>())

            {

                WindowCenter.Instance.Open<TreasureEffectWin>();

            }


 System/KnapSack/New/KnapSackEventMgr.cs

@@ -58,23 +58,23 @@
    }

    public void HideItemPopWin()

    {

        if(WindowCenter.Instance.CheckOpen<EquipWin>())

        if(WindowCenter.Instance.IsOpen<EquipWin>())

        {

            HideEquipWin();

        }

        else if(WindowCenter.Instance.CheckOpen<WingsWin>())

        else if(WindowCenter.Instance.IsOpen<WingsWin>())

        {

            HideWingsWin();

        }

        else if(WindowCenter.Instance.CheckOpen<ItemInfoWin>())

        else if(WindowCenter.Instance.IsOpen<ItemInfoWin>())

        {

            HideItemWin();

        }

        else if(WindowCenter.Instance.CheckOpen<GuardianWin>())

        else if(WindowCenter.Instance.IsOpen<GuardianWin>())

        {

            HideGuardWin();  

        }

        else if (WindowCenter.Instance.CheckOpen<KingFairyChestWin>())

        else if (WindowCenter.Instance.IsOpen<KingFairyChestWin>())

        {

            WindowCenter.Instance.CloseImmediately<KingFairyChestWin>();

        }


 System/MainInterfacePanel/ChatFrame.cs

@@ -286,7 +286,7 @@
            if (PlayerDatas.Instance.hero.aiHandler.IsAuto())

            {

                AutoImg.SetActive(false);

                if (!WindowCenter.Instance.CheckOpen<ExperienceOpenWin>())

                if (!WindowCenter.Instance.IsOpen<ExperienceOpenWin>())

                {

                    WindowCenter.Instance.Open<ExperienceOpenWin>(true);

                }

@@ -294,7 +294,7 @@
            else

            {

                AutoImg.SetActive(true);

                if (WindowCenter.Instance.CheckOpen<ExperienceOpenWin>())

                if (WindowCenter.Instance.IsOpen<ExperienceOpenWin>())

                {

                    WindowCenter.Instance.CloseImmediately<ExperienceOpenWin>();

                }

@@ -409,7 +409,7 @@
            {

                if (!_hero.aiHandler.IsAuto())

                {

                    if (!WindowCenter.Instance.CheckOpen<ExperienceOpenWin>())

                    if (!WindowCenter.Instance.IsOpen<ExperienceOpenWin>())

                    {

                        WindowCenter.Instance.Open<ExperienceOpenWin>(true);

                    }

@@ -417,7 +417,7 @@
                }

                else

                {

                    if (WindowCenter.Instance.CheckOpen<ExperienceOpenWin>())

                    if (WindowCenter.Instance.IsOpen<ExperienceOpenWin>())

                    {

                        WindowCenter.Instance.CloseImmediately<ExperienceOpenWin>();

                    }


 System/MainInterfacePanel/CoinTaskTipModel.cs

@@ -113,11 +113,11 @@
    private IEnumerator PopupPanel()

    {

        yield return WaitingForSecondConst.WaitMS1500;

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

        {

            yield break;

        }

        if (WindowCenter.Instance.CheckOpen<TaskWin>())

        if (WindowCenter.Instance.IsOpen<TaskWin>())

        {

            yield break;

        }

@@ -126,7 +126,7 @@
        {

            IsPopup = true;

        }  

        if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

        if (WindowCenter.Instance.IsOpen<MainInterfaceWin>())

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.BountyInterface);

        }      

@@ -135,11 +135,11 @@
    private IEnumerator FairyAuTaskPanel()

    {

        yield return WaitingForSecondConst.WaitMS1500;

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

        if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing || WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

        {

            yield break;

        }

        if (WindowCenter.Instance.CheckOpen<FairyAuTaskWin>())

        if (WindowCenter.Instance.IsOpen<FairyAuTaskWin>())

        {

            yield break;

        }

@@ -148,7 +148,7 @@
        {

            IsFairy = true;

        }       

        if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

        if (WindowCenter.Instance.IsOpen<MainInterfaceWin>())

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionTask);

        }


 System/MainInterfacePanel/DefaultDialogueBoxWin.cs

@@ -69,7 +69,7 @@
        {

            base.LateUpdate();



            if (!WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>())

            if (!WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>())

            {

                return;

            }


 System/MainInterfacePanel/DialogueDuidanceWin.cs

@@ -102,11 +102,11 @@


        private void IsCloseWindow()

        {

            if (WindowCenter.Instance.CheckOpen<DungeonFightWin>())

            if (WindowCenter.Instance.IsOpen<DungeonFightWin>())

            {

                WindowCenter.Instance.CloseImmediately<DungeonFightWin>();

            }

            if (WindowCenter.Instance.CheckOpen<DungeonMissionDetailsWin>())

            if (WindowCenter.Instance.IsOpen<DungeonMissionDetailsWin>())

            {

                WindowCenter.Instance.CloseImmediately<DungeonMissionDetailsWin>();

            }

@@ -162,7 +162,7 @@
            {

                WindowCenter.Instance.Open<DungeonFightWin>();

            }

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

@@ -176,7 +176,7 @@
                return;

            }



            if (!WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

            if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())

            {

                return;

            }


 System/MainInterfacePanel/FeatureNoticeModel.cs

@@ -239,8 +239,8 @@
    {

        yield return new WaitForSeconds(0.7f);

        var inDungeon = IsDungeon();

        var IsOpenMaininterface = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        var IsOpenOffLineOnHook = WindowCenter.Instance.CheckOpen<OffLineOnHookWin>();

        var IsOpenMaininterface = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

        var IsOpenOffLineOnHook = WindowCenter.Instance.IsOpen<OffLineOnHookWin>();

        var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();

        var IsLoading = StageManager.Instance.isLoading;

        if (NewBieCenter.Instance.inGuiding || treasureModel.newGotShowing || inDungeon || !IsOpenMaininterface

@@ -260,11 +260,11 @@
                }

                string strKey = "FeatureNotice" + functionForecastConfig.FrameLevel + PlayerDatas.Instance.baseData.PlayerID;

                int type = LocalSave.GetInt(strKey);

                bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

                bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

                if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.FrameLevel && type == 0)

                {

                    LocalSave.SetInt(strKey, functionForecastConfig.FrameLevel);

                   var IsOpenFeatureNotice = WindowCenter.Instance.CheckOpen<FeatureNoticeWin>();

                   var IsOpenFeatureNotice = WindowCenter.Instance.IsOpen<FeatureNoticeWin>();

                    if (!IsOpenFeatureNotice)

                    {

                        WindowCenter.Instance.Close<MainInterfaceWin>();


 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -561,7 +561,7 @@
            if (taskmodel.BountyDic.ContainsKey(_taskID))

            {

                int bountyNumber = TaskAllocation.Instance.ForRingNumber();

                if (bountyNumber == 10 && !WindowCenter.Instance.CheckOpen<TaskWin>())

                if (bountyNumber == 10 && !WindowCenter.Instance.IsOpen<TaskWin>())

                {

                    if (coinTaskTip.IsPopup)

                    {

@@ -573,7 +573,7 @@
            if (taskmodel.FairyAuDic.ContainsKey(_taskID))

            {

                int FairyNumber = TaskAllocation.Instance.FairyAuNumber();

                if (FairyNumber == 10 && !WindowCenter.Instance.CheckOpen<FairyWearWin>())

                if (FairyNumber == 10 && !WindowCenter.Instance.IsOpen<FairyWearWin>())

                {

                    WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                    WindowCenter.Instance.Open<FairyAuTaskWin>();


 System/MainInterfacePanel/FunctionForecastWin.cs

@@ -33,7 +33,7 @@


        protected override void OnPreOpen()

        {

            if (WindowCenter.Instance.CheckOpen<CombatModeWin>())

            if (WindowCenter.Instance.IsOpen<CombatModeWin>())

            {

                WindowCenter.Instance.Close<CombatModeWin>();

            }


 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -203,7 +203,7 @@
                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//御剑山庄boss区域特殊处理（可切换状态）

                {

                    WindowCenter.Instance.Open<CombatModeWin>();

                    if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

                    if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                    {

                        WindowCenter.Instance.Close<FunctionForecastWin>();

                    }

@@ -218,7 +218,7 @@
                }



                WindowCenter.Instance.Open<CombatModeWin>();

                if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

                if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                {

                    WindowCenter.Instance.Close<FunctionForecastWin>();

                }


 System/MainInterfacePanel/HighSettingTip.cs

@@ -341,7 +341,7 @@


            _ColseBtn.gameObject.SetActive(true);

            _ShowBtn.gameObject.SetActive(false);

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                m_HighSettingFadeInFadeOut.FadeOut();//淡出

            }

@@ -351,7 +351,7 @@


        public void ColseButton()//向下

        {

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                _ShowBtn.gameObject.SetActive(true);

                _ColseBtn.gameObject.SetActive(false);

@@ -362,7 +362,7 @@
        }

        public void ColseButtonNow()//向下（立刻隐藏）

        {

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                _ShowBtn.gameObject.SetActive(true);

                _ColseBtn.gameObject.SetActive(false);

@@ -376,7 +376,7 @@


            _ColseBtn.gameObject.SetActive(true);

            _ShowBtn.gameObject.SetActive(false);

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)

            {

                m_HighSettingFadeInFadeOut.PositionNow();//立刻出现

            }


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -264,7 +264,7 @@
            if (inDungeon)

            {

                m_FunctionForecastTip.gameObject.SetActive(false);

                if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

                if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                {

                    WindowCenter.Instance.Close<FunctionForecastWin>();

                }

@@ -292,7 +292,7 @@
            }

            else

            {

                var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

                var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



                if (isNeutralMap)

                {

@@ -384,7 +384,7 @@
            PlayerTaskDatas.CompletionOfTaskEvent -= CompletionOfTaskEvent;

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;

            if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

            if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

            {

                WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();

            }

@@ -529,7 +529,7 @@
                }

            }

            var inDungeon = IsDungeon();

            var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



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

            {

@@ -566,7 +566,7 @@
             && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun

             && onMainModel.MoveBool)

            {

                if (!WindowCenter.Instance.CheckOpen("PathfindingIconWin"))

                if (!WindowCenter.Instance.IsOpen("PathfindingIconWin"))

                {

                    WindowCenter.Instance.Open<PathfindingIconWin>(true);

                }

@@ -574,7 +574,7 @@
            else

            {

                onMainModel.MoveBool = false;

                if (WindowCenter.Instance.CheckOpen("PathfindingIconWin"))

                if (WindowCenter.Instance.IsOpen("PathfindingIconWin"))

                {

                    WindowCenter.Instance.CloseImmediately<PathfindingIconWin>();

                }

@@ -582,9 +582,9 @@


            if (runeTowerModel.newPassFloor > 0 && !IsDungeon())

            {

                if (!WindowCenter.Instance.CheckOpen("NewBieWin") && !WindowCenter.Instance.CheckOpen("TreasureNewGotWin"))

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))

                {

                    if (!WindowCenter.Instance.CheckOpen("RuneNewGotWin"))

                    if (!WindowCenter.Instance.IsOpen("RuneNewGotWin"))

                    {

                        WindowCenter.Instance.Open<RuneNewGotWin>();

                    }

@@ -673,7 +673,7 @@
            var inDungeon = IsDungeon();



            bool IsBossBool = PlayerDatas.Instance.hero == null ? false : MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域

            var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



            if (!recordPositionBool)

            {

@@ -739,7 +739,7 @@
                }

                LeftImage.SetActive(false);

                RightImg.SetActive(true);

                if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

                if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                {

                    WindowCenter.Instance.Close<FunctionForecastWin>();

                }

@@ -761,7 +761,7 @@
        {

            var inDungeon = IsDungeon();

            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);

            var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);



            if (recordPositionBool)//显示功能入口

            {

@@ -1022,7 +1022,7 @@


        void CheckChatTipOpen()

        {

            bool _chatWinOpen = WindowCenter.Instance.CheckOpen<ChatWin>();

            bool _chatWinOpen = WindowCenter.Instance.IsOpen<ChatWin>();

            m_ChatTip.gameObject.SetActive(!_chatWinOpen);

            if (!_chatWinOpen)

            {


 System/MainInterfacePanel/PlayerMainDate.cs

@@ -193,7 +193,7 @@
    {

        if (ItemID == 221)

        {

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);

                WindowCenter.Instance.Open<MainInterfaceWin>();

@@ -354,7 +354,7 @@
                prowNum = power;

                if (!StrengthegingBool && StrengthegingAddFight == 0)

                {

                    if (WindowCenter.Instance.CheckOpen<PowerAddWin>())

                    if (WindowCenter.Instance.IsOpen<PowerAddWin>())

                    {

                        WindowCenter.Instance.CloseImmediately<PowerAddWin>();

                    }

@@ -383,7 +383,7 @@
        yield return new WaitForSeconds(0.5f);

        ProwNumAdd = StrengthegingAddFight;

        StrengthegingAddFight = 0;

        if (WindowCenter.Instance.CheckOpen<PowerAddWin>())

        if (WindowCenter.Instance.IsOpen<PowerAddWin>())

        {

            WindowCenter.Instance.CloseImmediately<PowerAddWin>();

        }

@@ -393,7 +393,7 @@
    public void FabaoPowerAdd(int power)

    {

        ProwNumAdd = power;

        if (WindowCenter.Instance.CheckOpen<PowerAddWin>())

        if (WindowCenter.Instance.IsOpen<PowerAddWin>())

        {

            WindowCenter.Instance.CloseImmediately<PowerAddWin>();

        }


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -312,8 +312,8 @@
        {

            return;

        }

        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        if (!WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>() && IsOpenMain)

        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

        if (!WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>() && IsOpenMain)

        {

            WindowCenter.Instance.Open<DefaultDialogueBoxWin>();

            WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -331,7 +331,7 @@
            return;

        }

        var config = Config.Instance.Get<StoryMissionsConfig>(taskID);

        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();

        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();

        var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;

        if (config != null)

        {

@@ -339,7 +339,7 @@
            {

                if (NPCid == config.NpcID[i])

                {

                    if (!WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>() && IsOpenMain

                    if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>() && IsOpenMain

                        && !treasureStageUpShow && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

                    {

                        WindowCenter.Instance.Close<MainInterfaceWin>();

@@ -348,7 +348,7 @@
                    return;

                }

            }

            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<TaskBoxBGMWin>();

@@ -365,7 +365,7 @@
        }

        else

        {

            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<TaskBoxBGMWin>();

@@ -1289,12 +1289,12 @@
            yield break;

        }



        if (WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

        if (WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

        {

            yield break;

        }



        if (WindowCenter.Instance.CheckOpen<MysteriousMissionWin>())

        if (WindowCenter.Instance.IsOpen<MysteriousMissionWin>())

        {

            yield break;

        }

@@ -1455,18 +1455,18 @@


    public static bool IsOPenAutoResolve()//任务面板不开启自动挂机状态

    {

        WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>();

        WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>();

        WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>();

        WindowCenter.Instance.IsOpen<DialogueDuidanceWin>();

        bool _bool = true;

        if (WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>())

        if (WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())

        {

            _bool = false;

        }

        else if (WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>())

        else if (WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>())

        {

            _bool = false;

        }

        else if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

        else if (WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())

        {

            _bool = false;

        }


 System/MainInterfacePanel/PowerAddWin.cs

@@ -121,7 +121,7 @@
        void CheckPosition()

        {

            var type = WindowType.None;

            if (WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

            if (WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

            {

                type = WindowType.TreasureLevelUp;

            }


 System/MainInterfacePanel/RechargeTipWin.cs

@@ -58,7 +58,7 @@
                return;

            }

         

            if (WindowCenter.Instance.CheckOpen<VipRechargeWin>())

            if (WindowCenter.Instance.IsOpen<VipRechargeWin>())

            {

                if (JumpVipPanel != null)

                {


 System/MainInterfacePanel/TaskAllocation.cs

@@ -133,7 +133,7 @@
                        if (Gold >= NeedMoney)

                        {

                            taskmodel.CompletionOfTask(TaskID);

                            if (WindowCenter.Instance.CheckOpen<SkillPanel>())

                            if (WindowCenter.Instance.IsOpen<SkillPanel>())

                            {

                                return;

                            }


 System/MainInterfacePanel/TaskBoxBGMWin.cs

@@ -329,7 +329,7 @@
        {

            // base.LateUpdate();

            GetMainSelfMotionLaupdate();

            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>())

            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())

            {

                return;

            }


 System/MainInterfacePanel/TaskListTip.cs

@@ -217,7 +217,7 @@
        {

            TaskScheduling();

            var inDungeon = IsDungeon();

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !inDungeon)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon)

            {

                TaskAddAndDelete();

            }

@@ -304,7 +304,7 @@
        {

            var inDungeon = IsDungeon();

            TaskScheduling();

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !inDungeon)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon)

            {

                DeleteSort(_IdTask);

            }


 System/MainInterfacePanel/TaskWin.cs

@@ -86,7 +86,7 @@
        private void OnPlayerDie()

        {

            CloseImmediately();

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }


 System/MainInterfacePanel/TipPanel.cs

@@ -51,7 +51,7 @@
        IEnumerator Co_GuideComplete()

        {

            yield return null;

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

                && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading)

            {

                IsOPenTip();

@@ -61,7 +61,7 @@
        IEnumerator Co_Load()

        {

            yield return WaitingForSecondConst.WaitMS500;

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding

                && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading

                && StageManager.Instance.CurrentStage is DungeonStage)

            {

@@ -78,7 +78,7 @@
        public void IsOPenTip()

        {

            var inDungeon = IsDungeon();

            if (loginAdModel.CheckOpen() || WindowCenter.Instance.CheckOpen<LoginAdWin>())//广告

            if (loginAdModel.CheckOpen() || WindowCenter.Instance.IsOpen<LoginAdWin>())//广告

            {



            }

@@ -91,8 +91,8 @@
            {

                firstTimeRechargeModel.OpenFirstChargeTrialWin();

            }

            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()

                && !WindowCenter.Instance.CheckOpen<OffLineOnHookWin>()) //灵宠坐骑推送

            else if(!WindowCenter.Instance.IsOpen<PetAndMountPushWin>()

                && !WindowCenter.Instance.IsOpen<OffLineOnHookWin>()) //灵宠坐骑推送

            {

                storeModel.SetPushPetAndMountWinState();

            }


 System/MainInterfacePanel/TopAnimationPlay.cs

@@ -115,7 +115,7 @@
        }

        private void LateUpdate()

        {

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                if (IsBool)

                {


 System/Market/MarketWin.cs

@@ -113,13 +113,13 @@
        }

        private void CloseChildWin()

        {

            if (WindowCenter.Instance.CheckOpen<MarketDealWin>()) {

            if (WindowCenter.Instance.IsOpen<MarketDealWin>()) {

                WindowCenter.Instance.CloseImmediately<MarketDealWin>();

            }

            if (WindowCenter.Instance.CheckOpen<MarketPutawayWin>()) {

            if (WindowCenter.Instance.IsOpen<MarketPutawayWin>()) {

                WindowCenter.Instance.CloseImmediately<MarketPutawayWin>();

            }

            if (WindowCenter.Instance.CheckOpen<MarketDealRecordWin>()) {

            if (WindowCenter.Instance.IsOpen<MarketDealRecordWin>()) {

                WindowCenter.Instance.CloseImmediately<MarketDealRecordWin>();

            }

        }


 System/Message/BattleHint.cs

@@ -31,7 +31,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<BattleHintWin>())

            if (!WindowCenter.Instance.IsOpen<BattleHintWin>())

            {

                WindowCenter.Instance.Open<BattleHintWin>();

            }


 System/Message/BossNotify.cs

@@ -33,7 +33,7 @@
                {

                    OnNotifyEvent();

                }

                if (!WindowCenter.Instance.CheckOpen<BossNotifyWin>())

                if (!WindowCenter.Instance.IsOpen<BossNotifyWin>())

                {

                    WindowCenter.Instance.Open<BossNotifyWin>();

                }


 System/Message/GMNotify.cs

@@ -100,7 +100,7 @@
            {

                return false;

            }

            if (WindowCenter.Instance.CheckOpen<LoadingWin>())

            if (WindowCenter.Instance.IsOpen<LoadingWin>())

            {

                return false;

            }


 System/Message/RichNormalEvent.cs

@@ -84,7 +84,7 @@
                    int _id = 0;

                    int.TryParse(href.mSplits["getway"], out _id);

                    ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(_id, 0, true);

                    if (!WindowCenter.Instance.CheckOpen<GetWaysWin>())

                    if (!WindowCenter.Instance.IsOpen<GetWaysWin>())

                    {

                        WindowCenter.Instance.Open<GetWaysWin>();

                    }


 System/Mount/MountWin.cs

@@ -377,7 +377,7 @@
                {

                    FuncConfigConfig _tagfun = Config.Instance.Get<FuncConfigConfig>("HorseUpItem");

                    ItemConfig _tagchine = Config.Instance.Get<ItemConfig>(int.Parse(_tagfun.Numerical1));

                    if (!WindowCenter.Instance.CheckOpen<RidingAndPetActivationWin>())

                    if (!WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>())

                    {

                        GetItemPath.SetChinItemModel(_tagchine.ID);

                    }

@@ -427,7 +427,7 @@
                    ScrollTip.ShowTip(Language.Get("HorseDan5_text"));

                    yield break;

                }

                else if (WindowCenter.Instance.CheckOpen<RidingAndPetActivationWin>())//打开骑宠激活界面结束方法

                else if (WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>())//打开骑宠激活界面结束方法

                {

                    m_AutoTrainBtn.gameObject.SetActive(true);

                    m_StopDomesticateBtn.gameObject.SetActive(false);

@@ -466,7 +466,7 @@
        public void FairyJadeDomesticate()

        {

            int NumberLv = AutoTrainTipsWin._Lvnumber;//等级所需的等级

            if (NumberLv > mountModel._DicHorse[signHorseID].Lv && !WindowCenter.Instance.CheckOpen<RidingAndPetActivationWin>() && AutoTrainTipsWin.IsFairy)

            if (NumberLv > mountModel._DicHorse[signHorseID].Lv && !WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>() && AutoTrainTipsWin.IsFairy)

            {

                m_AutoTrainBtn.gameObject.SetActive(false);

                m_StopDomesticateBtn.gameObject.SetActive(true);

@@ -480,7 +480,7 @@
            int NumberLv = AutoTrainTipsWin._Lvnumber;//等级所需的等级

            while (NumberLv > mountModel._DicHorse[signHorseID].Lv)

            {

                if (WindowCenter.Instance.CheckOpen<RidingAndPetActivationWin>())

                if (WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>())

                {

                    m_AutoTrainBtn.gameObject.SetActive(true);

                    m_StopDomesticateBtn.gameObject.SetActive(false);


 System/NetLink/NetLinkWin.cs

@@ -20,7 +20,7 @@
        {

            linkOverTime = _delay;



            if (!WindowCenter.Instance.CheckOpen<NetLinkWin>())

            if (!WindowCenter.Instance.IsOpen<NetLinkWin>())

            {

                WindowCenter.Instance.Open<NetLinkWin>(true);

            }

@@ -28,7 +28,7 @@


        public static void Hide()

        {

            if (WindowCenter.Instance.CheckOpen<NetLinkWin>())

            if (WindowCenter.Instance.IsOpen<NetLinkWin>())

            {

                WindowCenter.Instance.Close<NetLinkWin>();

            }


 System/OpenServerActivity/FeaturesType.cs

New file
@@ -0,0 +1,74 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, September 26, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using TableConfig;

namespace Snxxz.UI {

    public class FeaturesType:MonoBehaviour {
        [SerializeField] GameObject m_ImageSelected;//选中
        [SerializeField] Text m_Day;//天数

        [SerializeField] Text m_IconName;//名字
        [SerializeField] Image m_Icon;

        [SerializeField] Button  m_Button;

        public GameObject ImageSelected

        {

            get { return m_ImageSelected; }

            set { m_ImageSelected = value; }

        }
        public Button Button

        {

            get { return m_Button; }

            set { m_Button = value; }

        }
        public void  GetIsDays(int day)

        {

          
            var InsevenConfig = Config.Instance.Get<InSevenDaysConfig>(day);

            if (InsevenConfig == null)

            {

                return;

            }

            DayText(day);

            m_Icon.SetSprite(InsevenConfig.ICON);

            m_IconName.text = InsevenConfig.RewardName;

        }

        private void DayText(int Day)

        {

            switch (Day)

            {

                case 1:

                    m_Day.text = Language.Get("One_day");

                    break;

                case 2:

                    m_Day.text = Language.Get("Two_day");

                    break;

                case 3:

                    m_Day.text = Language.Get("Three_day");

                    break;

                case 4:

                    m_Day.text = Language.Get("Four_day");

                    break;

                case 5:

                    m_Day.text = Language.Get("Five_day");

                    break;

                case 6:

                    m_Day.text = Language.Get("Six_day");

                    break;

                case 7:

                    m_Day.text = Language.Get("Seven_day");

                    break;

            }

        }
    }

}




 System/OpenServerActivity/FeaturesType.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 770c2ea426fab8b40843ab35ef02bbf7
timeCreated: 1537947365
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/OpenServerActivity/InSevenDayWin.cs

@@ -8,6 +8,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TableConfig;
//开服七天登入礼包
namespace Snxxz.UI
{
@@ -18,8 +19,15 @@
        #region Built-in
        InSevenDayModel m_InSevenDayModel;
        InSevenDayModel inSevenDay { get { return m_InSevenDayModel ?? (m_InSevenDayModel = ModelCenter.Instance.GetModel<InSevenDayModel>()); } }
        private int SelectedDay = 1;

        [SerializeField] ScrollerController m_ScrollerController;

        [SerializeField] RewardInformation m_rewardInformation;
        [SerializeField] Text m_TextName;
        [SerializeField] Image m_ImageShow;

        [SerializeField] Image m_ImageShowCH;

        [SerializeField] Image m_ImageDay;

        [SerializeField] Image m_ImageTex1;

        [SerializeField] Image m_ImageTex2;
        protected override void BindController()
        {
        }
@@ -32,8 +40,11 @@
        {
            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
            InSevenDayModel.AwardMessageUpdate += AwardMessageUpdate;
            SelectedDays();
            ContentAssignment();
            OnCreateGridLineCell(m_ScrollerController);
            m_ScrollerController.JumpIndex(Jump());
            m_ScrollerController.JumpIndex(SelectedDay-1);

        }

        protected override void OnAfterOpen()
@@ -49,6 +60,7 @@
        private void AwardMessageUpdate()
        {
            m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见
            ContentAssignment();
        }

        protected override void OnAfterClose()
@@ -66,24 +78,71 @@
        }
        void OnRefreshGridCell(ScrollerDataType type, CellView cell)
        {
            RewardInformation rewardInformation = cell.GetComponent<RewardInformation>();
            FeaturesType featuresType = cell.GetComponent<FeaturesType>();
            int day = cell.index;
            rewardInformation.GetIsDays(day);

            featuresType.GetIsDays(day);
            if (day == SelectedDay)

            {

                featuresType.ImageSelected.SetActive(true);

            }

            else

            {

                featuresType.ImageSelected.SetActive(false);

            }
            featuresType.Button.SetListener(()=> 
            {

                SelectedDay = day;

                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

                ContentAssignment();

            });
        }


        private int Jump()
        private void SelectedDays()
        {
            foreach (var key in inSevenDay.RewardForDic.Keys)
            {
                if (inSevenDay.RewardForDic[key] == 0)
                if (inSevenDay.RewardForDic[key] == 0 || inSevenDay.RewardForDic[key] ==-1)
                {
                    return key-1;
                    SelectedDay = key;
                    return;
                }
            }
            return 0;
            SelectedDay = 1;
            return ;
        }
        private void ContentAssignment()

        {

            var InsevenConfig = Config.Instance.Get<InSevenDaysConfig>(SelectedDay);

            if (InsevenConfig == null)

            {

                return;

            }

            m_rewardInformation.GetIsDays(SelectedDay);

            m_TextName.text = InsevenConfig.RewardName;

            if (InsevenConfig.IsTitle == 1)

            {

                m_ImageShow.gameObject.SetActive(false);

                m_ImageShowCH.gameObject.SetActive(true);

                m_ImageShowCH.SetSprite(InsevenConfig.Image);

                m_ImageShowCH.SetNativeSize();

            }

            else

            {

                m_ImageShowCH.gameObject.SetActive(false);

                m_ImageShow.gameObject.SetActive(true);

                m_ImageShow.SetSprite(InsevenConfig.Image);

                m_ImageShow.SetNativeSize();

            }



            m_ImageDay.SetSprite(InsevenConfig.DayIcon);

            m_ImageDay.SetNativeSize();

            m_ImageTex1.SetSprite(InsevenConfig.ImgTxt1);

            m_ImageTex1.SetNativeSize();

            m_ImageTex2.SetSprite(InsevenConfig.ImgTxt2);

            m_ImageTex2.SetNativeSize();

        }

        #endregion

    }

 System/OpenServerActivity/OSRedEnvelopeModel.cs

@@ -449,7 +449,7 @@
        public int cacheAchievement = 0;

        public void RequestSendAchieveEnvelope(int _id)

        {

            if (!WindowCenter.Instance.CheckOpen<OSRedEnvelopeSendWin>())

            if (!WindowCenter.Instance.IsOpen<OSRedEnvelopeSendWin>())

            {

                cacheAchievement = _id;

                WindowCenter.Instance.Open<OSRedEnvelopeSendWin>();


 System/OpenServerActivity/OnlineRewardsModel.cs

@@ -71,7 +71,7 @@
        IsRedPointBool = true;

        OnlineRewardsPoint();

      

        if (WindowCenter.Instance.CheckOpen<OnlineRewardsWin>() && OnlineRewardsUpdate != null)

        if (WindowCenter.Instance.IsOpen<OnlineRewardsWin>() && OnlineRewardsUpdate != null)

        {

            OnlineRewardsUpdate();

        }


 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -56,7 +56,7 @@
            giftModel.SetDayRemind();

            Display();



            m_ContainerDisplay.gameObject.SetActive(!WindowCenter.Instance.CheckOpen<OffLineOnHookWin>());

            m_ContainerDisplay.gameObject.SetActive(!WindowCenter.Instance.IsOpen<OffLineOnHookWin>());

        }



        protected override void OnAfterOpen()


 System/OpenServerActivity/RedEnvelopeModel.cs

@@ -94,7 +94,7 @@
            }

            if (vNetData.RedPacketID == cacheEnvelopeId)

            {

                if (!WindowCenter.Instance.CheckOpen<RedDetailsTipsWin>())

                if (!WindowCenter.Instance.IsOpen<RedDetailsTipsWin>())

                {

                    envelopeSfx = vNetData.RedPacketID == envelopeSfx && self ? envelopeSfx : 0;

                    ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().redpackDetailId = (int)vNetData.RedPacketID;

@@ -258,7 +258,7 @@
                return;

            }

            if (!(StageManager.Instance.CurrentStage is DungeonStage)

                || WindowCenter.Instance.CheckOpen<LoadingWin>())

                || WindowCenter.Instance.IsOpen<LoadingWin>())

            {

                return;

            }


 System/Pet/PetAttributeMethods.cs

@@ -531,7 +531,7 @@
            int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, petmodel.petUpgradeToolId);

            if (haveCnt >= costNum)

            {

                if (WindowCenter.Instance.CheckOpen<RidingAndPetActivationWin>())

                if (WindowCenter.Instance.IsOpen<RidingAndPetActivationWin>())

                {

                    petAutoTrainText.text = Language.Get("PetWin_EvolveTrainBtn_6");

                    isAutoTrain = false;


 System/Pet/PetWin.cs

@@ -140,11 +140,11 @@


        void CloseChild()

        {

            if (WindowCenter.Instance.CheckOpen<PetAttributeWin>())

            if (WindowCenter.Instance.IsOpen<PetAttributeWin>())

            {

                WindowCenter.Instance.CloseImmediately<PetAttributeWin>();

            }

            if (WindowCenter.Instance.CheckOpen<MountWin>())

            if (WindowCenter.Instance.IsOpen<MountWin>())

            {

                WindowCenter.Instance.CloseImmediately<MountWin>();

            }


 System/PlayerDead/PlayerDeadModel.cs

@@ -160,7 +160,7 @@
                autoRebornTime = RebornConditions[3];

            }



            if(!WindowCenter.Instance.CheckOpen<RebornWin>())

            if(!WindowCenter.Instance.IsOpen<RebornWin>())

            {

                WindowCenter.Instance.Open<RebornWin>();

            }

@@ -191,14 +191,14 @@
                    case 31150:

                        if (dungeonModel.mission.score >= 100)

                        {

                            if(!WindowCenter.Instance.CheckOpen<ElderGodAreaExitWin>())

                            if(!WindowCenter.Instance.IsOpen<ElderGodAreaExitWin>())

                            {

                                WindowCenter.Instance.Open<ElderGodAreaExitWin>();

                            }

                        }

                        else

                        {

                            if (!WindowCenter.Instance.CheckOpen<ElderGodAreaRebornWin>())

                            if (!WindowCenter.Instance.IsOpen<ElderGodAreaRebornWin>())

                            {

                                WindowCenter.Instance.Open<ElderGodAreaRebornWin>();

                            }

@@ -207,14 +207,14 @@
                    case 31110:

                        if(dungeonModel.mission.leaderID != playerId)

                        {

                            if (!WindowCenter.Instance.CheckOpen<ReliveWin>())

                            if (!WindowCenter.Instance.IsOpen<ReliveWin>())

                            {

                                WindowCenter.Instance.Open<ReliveWin>();

                            }

                        }

                        break;

                    default:

                        if (!WindowCenter.Instance.CheckOpen<ReliveWin>())

                        if (!WindowCenter.Instance.IsOpen<ReliveWin>())

                        {

                            WindowCenter.Instance.Open<ReliveWin>();

                        }


 System/Realm/ActivateShow.cs

@@ -53,7 +53,7 @@
            fightPower = UIHelper.GetFightPower(propertyUpDict);

            titleIconKey = "UI_JH_3";



            if (!WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>())

            if (!WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())

            {

                WindowCenter.Instance.Open<RealmPropertyUpWin>();

            }

@@ -122,7 +122,7 @@


            titleIconKey = _beforeLv == 0 ? "UI_JH_12" : "UI_JH_6";



            if (!WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>())

            if (!WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())

            {

                WindowCenter.Instance.Open<RealmPropertyUpWin>();

            }

@@ -171,7 +171,7 @@
            fightPower = UIHelper.GetFightPower(propertyUpDict);

            titleIconKey = "XT_LD_01";



            if (!WindowCenter.Instance.CheckOpen<StoveUpgradWin>())

            if (!WindowCenter.Instance.IsOpen<StoveUpgradWin>())

            {

                WindowCenter.Instance.Open<StoveUpgradWin>();

            }

@@ -256,7 +256,7 @@
                        break;

                }

                fightPower = UIHelper.GetFightPower(propertyUpDict);

                if (!WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>())

                if (!WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())

                {

                    WindowCenter.Instance.Open<RealmPropertyUpWin>();

                }


 System/Realm/RealmBossShow.cs

@@ -54,7 +54,7 @@


        public void Open(int _realmLv)

        {

            if (!WindowCenter.Instance.CheckOpen<RealmBossShowWin>())

            if (!WindowCenter.Instance.IsOpen<RealmBossShowWin>())

            {

                WindowCenter.Instance.Open<RealmBossShowWin>(true);

            }


 System/Realm/RealmWin.cs

@@ -82,7 +82,7 @@


        private void CloseChildWin()

        {

            if (WindowCenter.Instance.CheckOpen<RealmUpWin>())

            if (WindowCenter.Instance.IsOpen<RealmUpWin>())

            {

                WindowCenter.Instance.CloseImmediately<RealmUpWin>();

            }


 System/Role/MagicianModel.cs

@@ -236,7 +236,7 @@
            if (serverInited && _beforeLv != _nowLv

                && (_beforeLv == 0 || TryGetUnlockSkill(_type, _beforeLv, _nowLv, out _skillId)))

            {

                if (WindowCenter.Instance.CheckOpen<MagicianWin>()

                if (WindowCenter.Instance.IsOpen<MagicianWin>()

                    && !NewBieCenter.Instance.inGuiding)

                {

                    ActivateShow.GodWeaponActivate(_type, _nowLv, _beforeLv);


 System/Role/MagicianWin.cs

@@ -387,7 +387,7 @@
                UpdateItems(GetItemIndex(model.selectType));

                if (m_PresentSelectItemCnt <= 0)

                {

                    if (!WindowCenter.Instance.CheckOpen<GetItemPathWin>())

                    if (!WindowCenter.Instance.IsOpen<GetItemPathWin>())

                    {

                        int[] items = model.GetLvUpItemByType(model.selectType);

                        ItemConfig itemCfg = Config.Instance.Get<ItemConfig>(items[model.selectItemIndex]);


 System/Role/RolePanel.cs

@@ -386,11 +386,11 @@
                OnDisableRole();

                m_RoleInfoRt.gameObject.SetActive(false);

            }

            if (WindowCenter.Instance.CheckOpen<MagicianWin>())

            if (WindowCenter.Instance.IsOpen<MagicianWin>())

            {

                WindowCenter.Instance.CloseImmediately<MagicianWin>();

            }

            if (WindowCenter.Instance.CheckOpen<MountWin>())

            if (WindowCenter.Instance.IsOpen<MountWin>())

            {

                WindowCenter.Instance.CloseImmediately<MountWin>();

            }


 System/RoleParticulars/RoleParticularModel.cs

@@ -583,13 +583,13 @@
            switch (viewPlayerType)

            {

                case 0:

                    if (!WindowCenter.Instance.CheckOpen<RoleParticularsWin>())

                    if (!WindowCenter.Instance.IsOpen<RoleParticularsWin>())

                    {

                        WindowCenter.Instance.Open<RoleParticularsWin>();

                    }

                    break;

                case 1:

                    if (!WindowCenter.Instance.CheckOpen<ViewFuncPowerWin>())

                    if (!WindowCenter.Instance.IsOpen<ViewFuncPowerWin>())

                    {

                        WindowCenter.Instance.Open<ViewFuncPowerWin>();

                    }


 System/RolePromote/RoleResourceCell.cs

@@ -60,7 +60,7 @@
                    resourceBtn.onClick.AddListener(() =>

                    {

                        getItemPathModel.SetChinItemModel(_tagChinItemModel.ID,0,true);

                        if (!WindowCenter.Instance.CheckOpen<GetWaysWin>())

                        if (!WindowCenter.Instance.IsOpen<GetWaysWin>())

                        {

                            WindowCenter.Instance.Open<GetWaysWin>();

                        }


 System/Rune/RuneModel.cs

@@ -1135,7 +1135,7 @@
        public event Action JumpToComposeEvent;

        public void JumpToRuneCompose()

        {

            if (WindowCenter.Instance.CheckOpen<RunePanel>())

            if (WindowCenter.Instance.IsOpen<RunePanel>())

            {

                if (JumpToComposeEvent != null)

                {


 System/Rune/RunePanel.cs

@@ -111,15 +111,15 @@


        private void CloseChild()

        {

            if (WindowCenter.Instance.CheckOpen<RuneMosaicWin>())

            if (WindowCenter.Instance.IsOpen<RuneMosaicWin>())

            {

                WindowCenter.Instance.CloseImmediately<RuneMosaicWin>();

            }

            if (WindowCenter.Instance.CheckOpen<RuneBreakWin>())

            if (WindowCenter.Instance.IsOpen<RuneBreakWin>())

            {

                WindowCenter.Instance.CloseImmediately<RuneBreakWin>();

            }

            if (WindowCenter.Instance.CheckOpen<RuneComposeWin>())

            if (WindowCenter.Instance.IsOpen<RuneComposeWin>())

            {

                WindowCenter.Instance.CloseImmediately<RuneComposeWin>();

            }


 System/Skill/SkillPanel.cs

@@ -120,10 +120,10 @@


        void CloseChild()

        {

            if (WindowCenter.Instance.CheckOpen<SkillAccordWin>()) {

            if (WindowCenter.Instance.IsOpen<SkillAccordWin>()) {

                WindowCenter.Instance.CloseImmediately<SkillAccordWin>();

            }

            if (WindowCenter.Instance.CheckOpen<SkillPassWin>()) {

            if (WindowCenter.Instance.IsOpen<SkillPassWin>()) {

                WindowCenter.Instance.CloseImmediately<SkillPassWin>();

            }

        }


 System/StartCoroutine/CoroutineMgr.cs

@@ -78,7 +78,7 @@
    IEnumerator MysteriousTask()

    {

        yield return WaitingForSecondConst.WaitMS500;

        if (!WindowCenter.Instance.CheckOpen<MysteriousMissionWin>())

        if (!WindowCenter.Instance.IsOpen<MysteriousMissionWin>())

        {

            WindowCenter.Instance.Open<MysteriousMissionWin>();

        }


 System/Store/Logic/BuyEquipTip.cs

@@ -503,7 +503,29 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                        legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

            {


 System/Store/StoreModel.cs

@@ -526,7 +526,7 @@
                    return;

                }

                BuySuccessModel.Instance.SetBuySuccessModel(chinModel.ID, (int)result.ItemCnt, tagStore.IsBind);

                if (!WindowCenter.Instance.CheckOpen<BuySuccessWin>())

                if (!WindowCenter.Instance.IsOpen<BuySuccessWin>())

                {

                    WindowCenter.Instance.Open<BuySuccessWin>();

                }

@@ -1169,7 +1169,7 @@


        if(CheckIsShowPush(isMustClose))

        {

            if (!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>())

            if (!WindowCenter.Instance.IsOpen<PetAndMountPushWin>())

            {

                WindowCenter.Instance.Open<PetAndMountPushWin>();

            }

@@ -1192,9 +1192,9 @@
            MapConfig curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

          

            if ((curMapConfig == null || curMapConfig.MapFBType != 0)

                || !WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

                || !WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                || NewBieCenter.Instance.inGuiding

                || WindowCenter.Instance.CheckOpen<FirstTimeRechargeWin>()

                || WindowCenter.Instance.IsOpen<FirstTimeRechargeWin>()

                || currentPushId == 0

                || !ModelCenter.Instance.GetModel<PlayerMainDate>().MainTopPanelShow)

            {


 System/Strengthening/CrystalSelectionWin.cs

@@ -42,7 +42,10 @@

        protected override void OnPreOpen()
        {
            m_TextDisplay.text = "你拥有" + godBeastModel.Crystal_ItemModel.itemInfo.ItemCount + "个强化水晶";
            string str = godBeastModel.Crystal_ItemModel.chinItemModel.ItemName;
         
            m_TextDisplay.text = string.Format(Language.Get("OwnQuantity_SH"), godBeastModel.Crystal_ItemModel.itemInfo.ItemCount, 
                UIHelper.GetTextColorByItemColor(godBeastModel.Crystal_ItemModel.chinItemModel.ItemColor, str, true));
            m_Slider.minValue = 0;
            m_Slider.maxValue = godBeastModel.Crystal_ItemModel.itemInfo.ItemCount;
            if (godBeastModel.Absorption_Dic.ContainsKey(godBeastModel.ItemInde))


 System/Strengthening/GodBeastAttributes.cs

@@ -207,10 +207,7 @@
                    m_BottomBox.SetActive(false);

                    m_Text_two.SetActive(false);

                    m_FrameNull.SetActive(false);

                    m_TextAttributes1.gameObject.SetActive(false);

                    m_TextAttributes2.gameObject.SetActive(false);

                    m_TextAttributesAdd1.gameObject.SetActive(false);

                    m_TextAttributesAdd2.gameObject.SetActive(false);

                    FullLevelAttributes();//设置满级属性

                    m_FullLevel.SetActive(true);

                    GodBeast_Number = GodBeastNumber;

                    GodBeast_Part = GodBeastPart;

@@ -496,6 +493,29 @@
            }



        }

        private void FullLevelAttributes()//设置满级属性

        {

            var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv);

            int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType);

            int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue);

            m_TextAttributesAdd1.gameObject.SetActive(false);

            m_TextAttributesAdd2.gameObject.SetActive(false);

            if (AttType.Length > 1)

            {

                m_TextAttributes1.gameObject.SetActive(true);

                m_TextAttributes2.gameObject.SetActive(true);

                string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;

                m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                m_TextAttributes2.text = StrName2 + ":" + AttValue[1];

            }

            else

            {

                m_TextAttributes2.gameObject.SetActive(false);

                string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

            }

        }

    }

}

 System/Strengthening/GodBeastEntry.cs

@@ -37,7 +37,7 @@
                {

                    if (itemModel[i].EquipPlace == godBeastPart)

                    {

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, itemModel[i].itemInfo.IsBind);

                        ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0, 0);//不显示绑定

                        m_itemCell.Init(ItemModel);

                        var itemConfig = Config.Instance.Get<ItemConfig>(itemModel[i].itemId);

                        var IudetDogzEquipPlus = itemModel[i].GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]


 System/Strengthening/GodBeastSlidingList.cs

@@ -334,19 +334,19 @@
            switch (Type)

            {

                case 0:

                    m_Label.text = "强化水晶";

                    m_Label.text = Language.Get("Crystal_SH");

                    break;

                case 2:

                    m_Label.text = "蓝色以下";

                    m_Label.text = Language.Get("BelowBlue_SH");

                    break;

                case 3:

                    m_Label.text = "紫色以下";

                    m_Label.text = Language.Get("BelowPurple_SH");

                    break;

                case 4:

                    m_Label.text = "橙色以下";

                    m_Label.text = Language.Get("BelowOrange_SH");

                    break;

                case 10:

                    m_Label.text = "全部";

                    m_Label.text = Language.Get("All_SH");

                    break;

                default:

                    break;


 System/SystemSetting/SetFreeTimeWin.cs

@@ -76,7 +76,7 @@
          

            curHour = hour;

            curMinute = minute;

            if(!WindowCenter.Instance.CheckOpen<SetFreeTimeWin>())

            if(!WindowCenter.Instance.IsOpen<SetFreeTimeWin>())

            {

                WindowCenter.Instance.Open<SetFreeTimeWin>();

            }


 System/SystemSetting/SettingEffectMgr.cs

@@ -146,7 +146,6 @@
    {

        if (!_isAutoHangUp)

        {

            DebugEx.Log("请开启自动挂机，否则无法出售");

            return;

        }

        DealBagItem();

@@ -225,7 +224,7 @@
    private int rebornPrice;

    private void OnPlayerDie()

    {

        if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())

        if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

        {

            WindowCenter.Instance.Close<FunctionForecastWin>();

        }


 System/SystemSetting/SystemSetWin.cs

@@ -253,7 +253,7 @@
        {

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

                if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

                {

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                }

@@ -261,7 +261,7 @@


            WindowCenter.Instance.CloseImmediately<SettingUpWin>();



            if (!WindowCenter.Instance.CheckOpen<LockedScreenWin>())

            if (!WindowCenter.Instance.IsOpen<LockedScreenWin>())

            {

                WindowCenter.Instance.Open<LockedScreenWin>();

            }


 System/Team/TeamData.cs

@@ -235,6 +235,21 @@
            members.Clear();

        }



        public int GetAnyNearByMember()

        {

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

            {

                var mapId = PlayerDatas.Instance.baseData.MapID;

                var lineId = PlayerDatas.Instance.baseData.FBID;

                if (members[i].mapId == mapId && members[i].lineId == lineId)

                {

                    return members[i].id;

                }

            }



            return 0;

        }



    }



    public class Teammate


 System/Team/TeamFrameWin.cs

@@ -47,12 +47,12 @@
            model.createTeamEvent -= OnCreateTeam;
            model.matchingStateChangeEvent -= OnMatchStateChange;

            if (WindowCenter.Instance.CheckOpen<MyTeamWin>())
            if (WindowCenter.Instance.IsOpen<MyTeamWin>())
            {
                WindowCenter.Instance.CloseImmediately<MyTeamWin>();
            }

            if (WindowCenter.Instance.CheckOpen<TeamListWin>())
            if (WindowCenter.Instance.IsOpen<TeamListWin>())
            {
                WindowCenter.Instance.CloseImmediately<TeamListWin>();
            }
@@ -92,7 +92,7 @@

        private void ShowTeamList()
        {
            if (WindowCenter.Instance.CheckOpen<MyTeamWin>())
            if (WindowCenter.Instance.IsOpen<MyTeamWin>())
            {
                WindowCenter.Instance.CloseImmediately<MyTeamWin>();
            }
@@ -103,7 +103,7 @@

        private void ShowMyTeam()
        {
            if (WindowCenter.Instance.CheckOpen<TeamListWin>())
            if (WindowCenter.Instance.IsOpen<TeamListWin>())
            {
                WindowCenter.Instance.CloseImmediately<TeamListWin>();
            }

 System/Team/TeamModel.cs

@@ -951,9 +951,9 @@
            {

                if (!oldInTeam && myTeam.inTeam)

                {

                    if (!WindowCenter.Instance.CheckOpen("NewBieWin") && !WindowCenter.Instance.CheckOpen("TreasureNewGotWin"))

                    if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))

                    {

                        if (!WindowCenter.Instance.CheckOpen("MyTeamWin"))

                        if (!WindowCenter.Instance.IsOpen("MyTeamWin"))

                        {

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

                        }

@@ -1036,7 +1036,7 @@
                    {

                        if (teamPrepare.OnlyCaptainerPrepared(mate.id))

                        {

                            if (!WindowCenter.Instance.CheckOpen<TeamPrepareWin>())

                            if (!WindowCenter.Instance.IsOpen<TeamPrepareWin>())

                            {

                                prepareBeginTime = DateTime.Now;

                                WindowCenter.Instance.Open<TeamPrepareWin>();


 System/Tip/ConfirmCancel.cs

@@ -20,7 +20,7 @@
            OnPopConfirmClickEvent = func;

            OnPopSingleConfirmEvent = null;

            IsSingleConfirm = false;

            if (!WindowCenter.Instance.CheckOpen<PopConfirmWin>())

            if (!WindowCenter.Instance.IsOpen<PopConfirmWin>())

            {

                WindowCenter.Instance.Open<PopConfirmWin>();

            }

@@ -33,7 +33,7 @@
            OnPopConfirmClickEvent = null;

            OnPopSingleConfirmEvent = func;

            IsSingleConfirm = true;

            if (!WindowCenter.Instance.CheckOpen<PopConfirmWin>())

            if (!WindowCenter.Instance.IsOpen<PopConfirmWin>())

            {

                WindowCenter.Instance.Open<PopConfirmWin>();

            }

@@ -47,7 +47,7 @@
            OnPopConfirmClickEvent = null;

            OnPopSingleConfirmEvent = func;

            IsSingleConfirm = true;

            if (!WindowCenter.Instance.CheckOpen<RealmPopConfirmWin>())

            if (!WindowCenter.Instance.IsOpen<RealmPopConfirmWin>())

            {

                WindowCenter.Instance.Open<RealmPopConfirmWin>();

            }

@@ -66,7 +66,7 @@
            toggleContent = toggleTxt;

            OnToggleConfirmEvent = func;

            toggleOpenState = _toggle;

            if (!WindowCenter.Instance.CheckOpen<ToggleConfirmWin>())

            if (!WindowCenter.Instance.IsOpen<ToggleConfirmWin>())

            {

                WindowCenter.Instance.Open<ToggleConfirmWin>();

            }

@@ -93,7 +93,7 @@
            iconNeedCnt = needCnt;

            iconToggleText = toggleTxt;

            OnIconToggleConfirmAct = func;

            if (!WindowCenter.Instance.CheckOpen<IconConfirmWin>())

            if (!WindowCenter.Instance.IsOpen<IconConfirmWin>())

            {

                WindowCenter.Instance.Open<IconConfirmWin>();

            }

@@ -106,7 +106,7 @@
        public static void ShowFairyLeagueGuide(Action<bool> func = null)

        {

            OnFairyLeagueGuideEvent = func;

            if (!WindowCenter.Instance.CheckOpen<FairyLeagueGuideSelectWin>())

            if (!WindowCenter.Instance.IsOpen<FairyLeagueGuideSelectWin>())

            {

                WindowCenter.Instance.Open<FairyLeagueGuideSelectWin>();

            }

@@ -124,7 +124,7 @@
            generalItemId = _itemId;

            generalItemCnt = _itemCnt;

            ItemConfirmEvent = func;

            if (!WindowCenter.Instance.CheckOpen<ItemConfirmWin>())

            if (!WindowCenter.Instance.IsOpen<ItemConfirmWin>())

            {

                WindowCenter.Instance.Open<ItemConfirmWin>();

            }


 System/Tip/ExperienceGetWin.cs

@@ -24,7 +24,7 @@


    static void OnGetNewExperience(int _source, int _billionsExperience, int _unitExperience)

    {

        if (!WindowCenter.Instance.CheckOpen<ExperienceGetWin>())

        if (!WindowCenter.Instance.IsOpen<ExperienceGetWin>())

        {

            WindowCenter.Instance.Open<ExperienceGetWin>(true);

        }


 System/Tip/FuncRules.cs

@@ -11,7 +11,7 @@
        public static void OpenFuncRule(string _ruleKey)
        {
            ruleKey = _ruleKey;
            if (!WindowCenter.Instance.CheckOpen<FuncRuleWin>()) {
            if (!WindowCenter.Instance.IsOpen<FuncRuleWin>()) {
                WindowCenter.Instance.Open<FuncRuleWin>();
            }
        }

 System/Tip/PlayerDetails.cs

@@ -32,7 +32,7 @@
            PlayerName = _package.PlayerName;
            IsInTeam = _package.IsInTeam;

            if (!WindowCenter.Instance.CheckOpen<PlayerDetailWin>())
            if (!WindowCenter.Instance.IsOpen<PlayerDetailWin>())
            {
                WindowCenter.Instance.Open<PlayerDetailWin>();
            }

 System/Tip/ScrollTip.cs

@@ -34,7 +34,7 @@
                OnTipReceiveEvent();

            }



            if (!WindowCenter.Instance.CheckOpen<ScrollTipWin>())

            if (!WindowCenter.Instance.IsOpen<ScrollTipWin>())

            {

                WindowCenter.Instance.Open<ScrollTipWin>();

            }


 System/Tip/ServerTipDetails.cs

@@ -26,7 +26,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<MarqueeWin>())

            if (!WindowCenter.Instance.IsOpen<MarqueeWin>())

            {

                WindowCenter.Instance.Open<MarqueeWin>();

            }

@@ -48,7 +48,7 @@
            yield return null;

            if (CheckOpenMarquee() && m_Marquees.Count > 0)

            {

                if (!WindowCenter.Instance.CheckOpen<MarqueeWin>())

                if (!WindowCenter.Instance.IsOpen<MarqueeWin>())

                {

                    WindowCenter.Instance.Open<MarqueeWin>();

                }

@@ -115,7 +115,7 @@
        public static void ShowTrumpetTip(ChatTrumpetData trumpetData)

        {

            queueTrumpetTips.Enqueue(trumpetData);

            if (!WindowCenter.Instance.CheckOpen<TrumpetWin>())

            if (!WindowCenter.Instance.IsOpen<TrumpetWin>())

            {

                WindowCenter.Instance.Open<TrumpetWin>();

            }


 System/Tip/SkillDetails.cs

@@ -68,7 +68,7 @@
                    infoList.Add(skillModel.Description);

                    break;

            }

            if (!WindowCenter.Instance.CheckOpen<SkillDetailsWin>())

            if (!WindowCenter.Instance.IsOpen<SkillDetailsWin>())

            {

                WindowCenter.Instance.Open<SkillDetailsWin>();

            }


 System/Tip/SpGetWin.cs

@@ -24,7 +24,7 @@

    static void OnGetNewSp(long _sp)
    {
        if (!WindowCenter.Instance.CheckOpen<SpGetWin>())
        if (!WindowCenter.Instance.IsOpen<SpGetWin>())
        {
            WindowCenter.Instance.Open<SpGetWin>(true);
        }

 System/Treasure/DragSelectComponent.cs

@@ -22,10 +22,10 @@
        private void LateUpdate()

        {

            if (Input.touchCount > 1 || NewBieCenter.Instance.inGuiding

                || WindowCenter.Instance.CheckOpen<TreasureNewStageWin>()

                || WindowCenter.Instance.CheckOpen<PotentialItemUseWin>()

                || WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>()

                || WindowCenter.Instance.CheckOpen<GetItemPathWin>())

                || WindowCenter.Instance.IsOpen<TreasureNewStageWin>()

                || WindowCenter.Instance.IsOpen<PotentialItemUseWin>()

                || WindowCenter.Instance.IsOpen<TreasureSoulActiveWin>()

                || WindowCenter.Instance.IsOpen<GetItemPathWin>())

            {

                m_StartDrag = false;

                return;


 System/Treasure/FairyTreasureCollectPanelPattern5.cs

@@ -260,11 +260,11 @@
                WindowCenter.Instance.CloseImmediately<TreasureLevelUpWin>();

                WindowCenter.Instance.Open<TreasureStageUpTriggerWin>(true);

                WindowCenter.Instance.Open<MainInterfaceWin>();

                if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

                if (WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())

                {

                    WindowCenter.Instance.CloseImmediately<DialogueDuidanceWin>();

                }

                if (WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>())

                if (WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())

                {

                    WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();

                }


 System/Treasure/TreasureExhibitionBehaviour.cs

@@ -54,7 +54,7 @@


        private void WindowAfterCloseEvent(Window _window)

        {

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                return;

            }


 System/Treasure/TreasureLevelUpWin.cs

@@ -254,7 +254,7 @@
                && _treasure.state == TreasureState.Collecting && model.serverInited)

            {

                UpdateStage();

                if (WindowCenter.Instance.CheckOpen<EffectToFaBaoWin>())

                if (WindowCenter.Instance.IsOpen<EffectToFaBaoWin>())

                {

                    WindowCenter.Instance.CloseImmediately<EffectToFaBaoWin>();

                }

@@ -266,7 +266,7 @@
            m_Init = true;

            m_DisplayContainer.gameObject.SetActive(true);

            UpdateStage();

            if (WindowCenter.Instance.CheckOpen<EffectToFaBaoWin>())

            if (WindowCenter.Instance.IsOpen<EffectToFaBaoWin>())

            {

                WindowCenter.Instance.CloseImmediately<EffectToFaBaoWin>();

            }

@@ -950,7 +950,7 @@
            var _index = m_Treasure.GetStageIndex(stage.stage);

            model.SetTreasureStageShow(m_Treasure.id, stage.stage);



            if (WindowCenter.Instance.CheckOpen<TreasureStageTipWin>())

            if (WindowCenter.Instance.IsOpen<TreasureStageTipWin>())

            {

                WindowCenter.Instance.CloseImmediately<TreasureStageTipWin>();

            }

@@ -1002,11 +1002,11 @@
                CloseImmediately();

                WindowCenter.Instance.Open<TreasureStageUpTriggerWin>(true);

                WindowCenter.Instance.Open<MainInterfaceWin>();

                if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

                if (WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())

                {

                    WindowCenter.Instance.CloseImmediately<DialogueDuidanceWin>();

                }

                if (WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>())

                if (WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())

                {

                    WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();

                }


 System/Treasure/TreasureMeridianBehaviour.cs

@@ -98,7 +98,7 @@
                    return;

                }

                model.selectedStage = m_TreasureStage.stage;

                if (!WindowCenter.Instance.CheckOpen<TreasureStageTipWin>())

                if (!WindowCenter.Instance.IsOpen<TreasureStageTipWin>())

                {

                    TreasureStageTipWin.SetTargetPosition(this.transform as RectTransform);

                    WindowCenter.Instance.Open<TreasureStageTipWin>();


 System/Treasure/TreasureModel.cs

@@ -303,9 +303,9 @@
        {

            if (serverInited)

            {

                if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

                if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

                {

                    if (!WindowCenter.Instance.CheckOpen<TreasureRegulusPopWin>())

                    if (!WindowCenter.Instance.IsOpen<TreasureRegulusPopWin>())

                    {

                        WindowCenter.Instance.Open<TreasureRegulusPopWin>();

                    }

@@ -880,9 +880,9 @@
                return;

            }

            if (!PreFightMission.Instance.IsFinished() || newGotTreasureId == 0

                || NewBieCenter.Instance.inGuiding || !WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

                || NewBieCenter.Instance.inGuiding || !WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWinLEqual(WindowType.Base)

                || WindowCenter.Instance.CheckOpen<TreasureNewGotWin>())

                || WindowCenter.Instance.IsOpen<TreasureNewGotWin>())

            {

                return;

            }

@@ -1301,7 +1301,7 @@
            treasureUnOpens.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1));

        }



        const string pattern = "\\\"[0-9]\\\":\\[[0-9|,]*\\]";

        const string pattern = "\\\"[0-9]+\\\":\\[[0-9|,]*\\]";

        private void ParseSkillLevelUpConfig()

        {

            try

@@ -1315,7 +1315,7 @@
                    var stringArray = match.Split(':');



                    var key = 0;

                    int.TryParse(Regex.Match(stringArray[0], "[0-9]").Value, out key);

                    int.TryParse(Regex.Match(stringArray[0], "[0-9]+").Value, out key);

                    var skillList = skillLevelUpTypes[key] = new List<int>();

                    var skillMatches = Regex.Matches(stringArray[1], "[0-9]{2,}");

                    for (int j = 0; j < skillMatches.Count; j++)


 System/Treasure/TreasureSoulModel.cs

@@ -187,7 +187,7 @@
                bool beforeActived = special.active;

                special.active = _data.State == 1;

                if (!beforeActived && special.active && serverInited

                    && !WindowCenter.Instance.CheckOpen<TreasureSoulWin>())

                    && !WindowCenter.Instance.IsOpen<TreasureSoulWin>())

                {

                    treasureSoulNewGotRedpoint.state = RedPointState.Simple;

                    newGotSoul = (int)_data.PriID;

@@ -214,8 +214,8 @@
                }



                if (beforeFinishCount < special.presentFinishCount && serverInited && special.active

                    && WindowCenter.Instance.CheckOpen<TreasureSoulWin>()

                    && !WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>()

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

                    && !WindowCenter.Instance.IsOpen<RealmPropertyUpWin>()

                    && !NewBieCenter.Instance.inGuiding)

                {

                    ActivateShow.TreasureSoulGetReward((int)_data.PriID, beforeFinishCount, special.presentFinishCount);

@@ -237,8 +237,8 @@
                        _specialData.presentFinishCount = (int)_data.Cnt;

                        UpdateRedpoint((int)TreasurePrivilege.StrengthenAdd);

                        if (beforeFinishCount < _specialData.presentFinishCount && serverInited && _specialData.active

                             && WindowCenter.Instance.CheckOpen<TreasureSoulWin>()

                             && !WindowCenter.Instance.CheckOpen<RealmPropertyUpWin>())

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

                             && !WindowCenter.Instance.IsOpen<RealmPropertyUpWin>())

                        {

                            ActivateShow.TreasureSoulGetReward((int)TreasurePrivilege.StrengthenAdd, 

                                beforeFinishCount, _specialData.presentFinishCount);


 System/Treasure/TreasureUnlockCell.cs

@@ -82,7 +82,7 @@
                            return;

                        }

                        model.selectedStage = treasureStage.stage;

                        if (!WindowCenter.Instance.CheckOpen<TreasureStageTipWin>())

                        if (!WindowCenter.Instance.IsOpen<TreasureStageTipWin>())

                        {

                            TreasureStageTipWin.SetTargetPosition(m_Button.transform as RectTransform);

                            WindowCenter.Instance.Open<TreasureStageTipWin>();


 System/Vip/FirstTimeRechargeModel.cs

@@ -52,7 +52,7 @@
        {

            if (_window is MainInterfaceWin)

            {

                if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))

                if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                {

                    WindowCenter.Instance.CloseImmediately<FirstTimeRechargeWin>();

                }

@@ -149,9 +149,9 @@


        private void windowBeforeOpenEvent(Window obj)

        {

            if ((!WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()) || obj is ChatWin)

            if ((!WindowCenter.Instance.IsOpen<MainInterfaceWin>() && WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()) || obj is ChatWin)

            {

                if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))

                if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                {

                    WindowCenter.Instance.Close<FirstTimeRechargeWin>();

                }

@@ -179,7 +179,7 @@
            }

            else if (IsOk && IsTryOut == 2)

            {

                if (WindowCenter.Instance.CheckOpen<FirstChargeTrialWin>())

                if (WindowCenter.Instance.IsOpen<FirstChargeTrialWin>())

                {

                    WindowCenter.Instance.Close<FirstChargeTrialWin>();

                }

@@ -203,9 +203,9 @@
            int second = (int)ts.TotalSeconds;

            if (CumulativeTime != 0 && PlayerDatas.Instance.baseData.LV <= FirstGoldTimeOut && PlayerDatas.Instance.baseData.coinPointTotal <= 0 && second > 0 /*&& !inDungeon*/ && CumulativeTime - second > 0)

            {

                if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()&& !WindowCenter.Instance.CheckOpen<ChatWin>())

                if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()&& !WindowCenter.Instance.IsOpen<ChatWin>())

                {

                    if (!WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))

                    if (!WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                    {

                        WindowCenter.Instance.Open<FirstTimeRechargeWin>();

                    }

@@ -234,7 +234,7 @@
                }

                else

                {

                    if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))

                    if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                    {

                        WindowCenter.Instance.Close<FirstTimeRechargeWin>();

                    }

@@ -242,7 +242,7 @@
            }

            else

            {

                if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))

                if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                {

                    WindowCenter.Instance.Close<FirstTimeRechargeWin>();

                }

@@ -261,7 +261,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<FirstChargeTrialWin>() && IsTryOut == 1)

            if (!WindowCenter.Instance.IsOpen<FirstChargeTrialWin>() && IsTryOut == 1)

            {

                WindowCenter.Instance.Open<FirstChargeTrialWin>();

            }


 System/Vip/FirstTimeRechargeWin.cs

@@ -181,12 +181,12 @@
            LocalSave.SetBool("FirstTimeRechargeBool", false);

            UI3DModelExhibition.Instance.StopShow();

            m_RewardInformationImage.SetActive(false);

            if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding)

            if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding)

            {

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

            }

            UI3DModelExhibition.Instance.StopShow();

            if (WindowCenter.Instance.CheckOpen<FirstTimeRechargeWin>())

            if (WindowCenter.Instance.IsOpen<FirstTimeRechargeWin>())

            {

                WindowCenter.Instance.CloseImmediately<FirstTimeRechargeWin>();

            }


 System/Vip/LimitedTimePackageModel.cs

@@ -132,7 +132,7 @@
    }

    public void OpenFreePlat(string Title, float RMBNum, string OrderInfo)

    {

        if (!WindowCenter.Instance.CheckOpen<GotoChargeWin>())

        if (!WindowCenter.Instance.IsOpen<GotoChargeWin>())

        {

            WindowCenter.Instance.Open<GotoChargeWin>(true);

        }


 System/Vip/LimitedTimePackageWin.cs

@@ -38,7 +38,7 @@
        {

            m_Close_Btn.AddListener(() => {

                Close();

                if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

                if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

                {

                    WindowCenter.Instance.Open <MainInterfaceWin>();

                }


 System/Vip/VipModel.cs

@@ -60,7 +60,7 @@
        {

            TimeMgr.Instance.UnRegister(TimeMgr.SyntonyType.VipExperirnceOverdue);

            m_VipExperienceTime = 0;

            if (WindowCenter.Instance.CheckOpen<GotoChargeWin>())

            if (WindowCenter.Instance.IsOpen<GotoChargeWin>())

            {

                WindowCenter.Instance.CloseImmediately<GotoChargeWin>();

            }

@@ -117,10 +117,10 @@
        {

            yield return WaitingForSecondConst.WaitMS1000;

            waitingJump = false;

            if (!NewBieCenter.Instance.inGuiding && !WindowCenter.Instance.CheckOpen<LoadingWin>()

            if (!NewBieCenter.Instance.inGuiding && !WindowCenter.Instance.IsOpen<LoadingWin>()

                && StageManager.Instance.CurrentStage is DungeonStage && !deadModel.playerIsDie)

            {

                if (!WindowCenter.Instance.CheckOpen<VipRechargeWin>())

                if (!WindowCenter.Instance.IsOpen<VipRechargeWin>())

                {

                    WindowJumpMgr.Instance.ClearJumpData();

                    WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.BaseAndCustom);

@@ -133,15 +133,15 @@
        private void OnChargeComplete()

        {

            m_ChargeReset = true;

            if (WindowCenter.Instance.CheckOpen<RechargeBoxWin>())

            if (WindowCenter.Instance.IsOpen<RechargeBoxWin>())

            {

                WindowCenter.Instance.CloseImmediately<RechargeBoxWin>();

            }

            if (WindowCenter.Instance.CheckOpen<SupremeRechargeWin>())

            if (WindowCenter.Instance.IsOpen<SupremeRechargeWin>())

            {

                WindowCenter.Instance.CloseImmediately<SupremeRechargeWin>();

            }

            if (WindowCenter.Instance.CheckOpen<FirstRechargeWin>())

            if (WindowCenter.Instance.IsOpen<FirstRechargeWin>())

            {

                WindowCenter.Instance.CloseImmediately<FirstRechargeWin>();

                WindowCenter.Instance.Open<MainInterfaceWin>();

@@ -540,7 +540,7 @@
        {

            vipWinType = type;

            var _order = (int)vipWinType;

            if (!WindowCenter.Instance.CheckOpen<VipRechargeWin>())

            if (!WindowCenter.Instance.IsOpen<VipRechargeWin>())

            {

                WindowCenter.Instance.Open<VipRechargeWin>(false, _order);

            }

@@ -708,7 +708,7 @@
            }

            m_ChargeReset = false;

            beforeCTGTime = DateTime.Now;

            if (!WindowCenter.Instance.CheckOpen<GotoChargeWin>())

            if (!WindowCenter.Instance.IsOpen<GotoChargeWin>())

            {

                WindowCenter.Instance.Open<GotoChargeWin>(true);

            }

@@ -731,7 +731,7 @@
            {

                SetViewedRechargeGift();

            }

            if (!WindowCenter.Instance.CheckOpen<RechargeBoxWin>())

            if (!WindowCenter.Instance.IsOpen<RechargeBoxWin>())

            {

                WindowCenter.Instance.Open<RechargeBoxWin>();

            }

@@ -820,11 +820,11 @@


        private void CheckOpenFirstRechargeWin()

        {

            if (WindowCenter.Instance.CheckOpen<TreasureNewGotWin>())

            if (WindowCenter.Instance.IsOpen<TreasureNewGotWin>())

            {

                return;

            }

            if (!NewBieCenter.Instance.inGuiding && WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !waitingJump)

            if (!NewBieCenter.Instance.inGuiding && WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !waitingJump)

            {

                if (PlayerDatas.Instance.baseData.coinPointTotal > 0 && !firstChargeRewardGet

                                && firstRechargeOpen && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())


 System/Vip/VipRechargeWin.cs

@@ -130,11 +130,11 @@


        private void CloseChildWin()

        {

            if (WindowCenter.Instance.CheckOpen<VipWin>())

            if (WindowCenter.Instance.IsOpen<VipWin>())

            {

                WindowCenter.Instance.CloseImmediately<VipWin>();

            }

            if (WindowCenter.Instance.CheckOpen<RechargeWin>())

            if (WindowCenter.Instance.IsOpen<RechargeWin>())

            {

                WindowCenter.Instance.CloseImmediately<RechargeWin>();

            }


 System/Voice/VoiceRecorder.cs

@@ -109,7 +109,7 @@
            return;

        }



        if (!WindowCenter.Instance.CheckOpen<MonitorVoiceWin>())

        if (!WindowCenter.Instance.IsOpen<MonitorVoiceWin>())

        {

            MonitorVoiceWin.audioSource = null;

            WindowCenter.Instance.Open<MonitorVoiceWin>(true);


 System/Welfare/AwardExchangeModel.cs

@@ -41,7 +41,7 @@
            if (Items == null || isLogin) return;



            getItems = Items;

            if(!WindowCenter.Instance.CheckOpen<ExchangeGetItemWin>())

            if(!WindowCenter.Instance.IsOpen<ExchangeGetItemWin>())

            {

                WindowCenter.Instance.Open<ExchangeGetItemWin>();

            }


 System/Welfare/WelfareWin.cs

@@ -161,23 +161,23 @@
        #endregion

        private void CloseChildWin()

        {

            if (WindowCenter.Instance.CheckOpen<SignInWin>())

            if (WindowCenter.Instance.IsOpen<SignInWin>())

            {

                WindowCenter.Instance.CloseImmediately<SignInWin>();

            }

            if (WindowCenter.Instance.CheckOpen<PrayerWin>())

            if (WindowCenter.Instance.IsOpen<PrayerWin>())

            {

                WindowCenter.Instance.CloseImmediately<PrayerWin>();

            }

            if (WindowCenter.Instance.CheckOpen<InSevenDayWin>())

            if (WindowCenter.Instance.IsOpen<InSevenDayWin>())

            {

                WindowCenter.Instance.CloseImmediately<InSevenDayWin>();

            }

            if (WindowCenter.Instance.CheckOpen<LevelGiftWin>())

            if (WindowCenter.Instance.IsOpen<LevelGiftWin>())

            {

                WindowCenter.Instance.CloseImmediately<LevelGiftWin>();

            }

            if (WindowCenter.Instance.CheckOpen<AwardExchangeWin>())

            if (WindowCenter.Instance.IsOpen<AwardExchangeWin>())

            {

                WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();

            }


 System/WindowBase/WindowCenter.cs

@@ -411,7 +411,7 @@
            }

        }



        public bool CheckOpen<T>() where T : Window

        public bool IsOpen<T>() where T : Window

        {

            T win = null;

            if (TryGetWindow(out win))

@@ -427,7 +427,7 @@
            }

        }



        public bool CheckOpen(string _windowName)

        public bool IsOpen(string _windowName)

        {

            if (windows.ContainsKey(_windowName) && windows[_windowName] != null)

            {

@@ -438,16 +438,6 @@
            {

                return false;

            }

        }



        public void PreCreateWindows()

        {

            m_PreCreateWindowNum = 0;

        }



        private void AsyncLoadWindowCallBack(bool _ok, UnityEngine.Object _object)

        {

            m_PreCreateWindowNum--;

        }



        public bool ExitAnyFullScreenOrMaskWin()


 System/WindowJump/WindowJumpMgr.cs

@@ -57,7 +57,7 @@
        for (int i = 0; i < windowKeys.Count; i++)

        {

            var key = windowKeys[i];

            if (WindowCenter.Instance.CheckOpen(key) && key != "NewBieWin")

            if (WindowCenter.Instance.IsOpen(key) && key != "NewBieWin")

            {

                if (!openWindows.ContainsKey(jumpPhase))

                {

@@ -943,7 +943,7 @@
                        case "RebornWin":

                            if (DeadModel.playerIsDie)

                            {

                                if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                {

                                    WindowCenter.Instance.Get(openWinlist[i]).Open();

                                }

@@ -952,7 +952,7 @@
                        case "ReliveWin":

                            if (DeadModel.playerIsDie)

                            {

                                if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                {

                                    WindowCenter.Instance.Get(openWinlist[i]).Open();

                                }

@@ -961,14 +961,14 @@
                        case "ElderGodAreaExitWin":

                            if (DeadModel.playerIsDie)

                            {

                                if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                {

                                    WindowCenter.Instance.Get(openWinlist[i]).Open();

                                }

                            }

                            break;

                        default:

                            if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                            if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                            {

                                WindowCenter.Instance.Get(openWinlist[i]).Open();

                            }

@@ -982,7 +982,7 @@
            case 2:

                openWinlist = openWindows[1];

                WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.SystemAndCustom);

                if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

                if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

                {

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                }

@@ -992,7 +992,7 @@
                    Window window = WindowCenter.Instance.Get(openWinlist[i]);

                    if (window != null && window.windowInfo.windowType == WindowType.Base)

                    {

                        if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                        if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                        {

                            WindowCenter.Instance.Get(openWinlist[i]).Open();

                        }

@@ -1005,7 +1005,7 @@
                            case "RebornWin":

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                {

                                    if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                    if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                    {

                                        WindowCenter.Instance.Get(openWinlist[i]).Open();

                                    }

@@ -1014,7 +1014,7 @@
                            case "ReliveWin":

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                {

                                    if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                    if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                    {

                                        WindowCenter.Instance.Get(openWinlist[i]).Open();

                                    }

@@ -1023,7 +1023,7 @@
                            case "ElderGodAreaExitWin":

                                if (SettingEffectMgr.Instance.isPlayerDie)

                                {

                                    if (!WindowCenter.Instance.CheckOpen(openWinlist[i]))

                                    if (!WindowCenter.Instance.IsOpen(openWinlist[i]))

                                    {

                                        WindowCenter.Instance.Get(openWinlist[i]).Open();

                                    }

@@ -1062,13 +1062,13 @@
    private void SecondRefresh()

    {

        if (DeadModel.playerIsDie 

            && WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

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

            && dungeonModel.dungeonFightStage != DungeonFightStage.ExitPrepare)

        {

            if (!WindowCenter.Instance.CheckOpen<RebornWin>()

               && !WindowCenter.Instance.CheckOpen<ReliveWin>()

               && !WindowCenter.Instance.CheckOpen<ElderGodAreaExitWin>()

               && !WindowCenter.Instance.CheckOpen<ElderGodAreaRebornWin>())

            if (!WindowCenter.Instance.IsOpen<RebornWin>()

               && !WindowCenter.Instance.IsOpen<ReliveWin>()

               && !WindowCenter.Instance.IsOpen<ElderGodAreaExitWin>()

               && !WindowCenter.Instance.IsOpen<ElderGodAreaRebornWin>())

            {

                ClearJumpData();

                DeadModel.PlayerDie(PlayerDatas.Instance.baseData.PlayerID);


 UI/Common/UI3DModelExhibition.cs

@@ -571,11 +571,11 @@
        {

            if (isShowinEquipment && ObjEquipment != null)

            {

                if (WindowCenter.Instance.CheckOpen("FirstTimeRechargeWin"))

                if (WindowCenter.Instance.IsOpen("FirstTimeRechargeWin"))

                {

                    ObjEquipment.transform.Rotate(WindowCenter.Instance.Get<FirstTimeRechargeWin>().RotateVector * 1f, Space.Self);

                }

                if (WindowCenter.Instance.CheckOpen("FirstChargeTrialWin"))

                if (WindowCenter.Instance.IsOpen("FirstChargeTrialWin"))

                {

                    ObjEquipment.transform.Rotate(WindowCenter.Instance.Get<FirstChargeTrialWin>().RotateVector * 1f, Space.Self);

                }


 Utility/GMCommand.cs

@@ -19,7 +19,7 @@
    {

        if (Input.GetKeyDown(KeyCode.F1))

        {

            if (!WindowCenter.Instance.CheckOpen<GMInputWin>())

            if (!WindowCenter.Instance.IsOpen<GMInputWin>())

            {

                WindowCenter.Instance.Open<GMInputWin>();

            }

@@ -31,7 +31,7 @@


        if (Input.GetKeyDown(KeyCode.F2))

        {

            if (!WindowCenter.Instance.CheckOpen<GMCmdPanel>())

            if (!WindowCenter.Instance.IsOpen<GMCmdPanel>())

            {

                WindowCenter.Instance.Open<GMCmdPanel>();

            }