snxxz_scripts.git

parent: 97fda2cd | 补丁 | 提交 | ignore whitespace

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

client_Zxw

2018-08-14 b36979b59d5825972f970d09b28e05ac45629132

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

7个文件已修改

	System/BlastFurnace/BlastFurnaceModel.cs	82 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/DandrugCell.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/LingDanTips.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/MakeDrugCell.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/PackSendQuestMgr.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/ImpactRankModel.cs	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OpenServerActivityWin.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/BlastFurnace/BlastFurnaceModel.cs

@@ -83,12 +83,14 @@
        treasureRefineDict.Clear();

        FuncOpen.Instance.OnFuncStateChangeEvent -= RefreshFuncOpenState;

        playerPack.RefreshItemCountAct -= RefreshMat;

        playerPack.RefreshItemSumUseCntAct -= RefreshItemUsce;

    }



    public void OnAfterPlayerDataInitialize()

    {

        playerPack.RefreshItemCountAct += RefreshMat;

        FuncOpen.Instance.OnFuncStateChangeEvent += RefreshFuncOpenState;

        playerPack.RefreshItemSumUseCntAct += RefreshItemUsce;

    }



    private void RefreshFuncOpenState(int funcId)

@@ -370,34 +372,64 @@
    /// <summary>

    /// 得到预览合成丹药的列表

    /// </summary>

    public List<int> GetPreviewMakeDruglist(AlchemyConfig alchemyModel)

    public Dictionary<int, int> GetPreviewMakeDruglist(AlchemyConfig alchemyModel)

    {

        JsonData jsonData = JsonMapper.ToObject(alchemyModel.AlchemPreviewItem);

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

        PreviewItemDict.Clear();

        if (jsonData.IsArray)

        {

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

            {

                int itemId = int.Parse(jsonData[i].ToString());

                drugIdlist.Add(itemId);

                if (jsonData[i].IsArray)

                {

                    int itemId = int.Parse(jsonData[i][0].ToString());

                    if (jsonData[i].Count > 1)

                    {

                        int effectId = int.Parse(jsonData[i][1].ToString());

                        PreviewItemDict.Add(itemId, effectId);

                    }

                    else

                    {

                        PreviewItemDict.Add(itemId, 0);

                    }

                }

            }

        }

        return drugIdlist;

        return PreviewItemDict;

    }



    public List<int> GetPreviewSpecMakeDruglist(AlchemySpecConfig alchemyModel)

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

    public Dictionary<int, int> GetPreviewSpecMakeDruglist(AlchemySpecConfig alchemyModel)

    {

        JsonData jsonData = JsonMapper.ToObject(alchemyModel.AlchemPreviewItem);

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

        PreviewItemDict.Clear();

        if (jsonData.IsArray)

        {

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

            {

                int itemId = int.Parse(jsonData[i].ToString());

                drugIdlist.Add(itemId);

                if(jsonData[i].IsArray)

                {

                    int itemId = int.Parse(jsonData[i][0].ToString());

                    if (jsonData[i].Count > 1)

                    {

                        int effectId = int.Parse(jsonData[i][1].ToString());

                        PreviewItemDict.Add(itemId,effectId);

                    }

                    else

                    {

                        PreviewItemDict.Add(itemId,0);

                    }

                }

            }

        }

        return drugIdlist;

        return PreviewItemDict;

    }



    public int GetEffectIdByItemId(int itemId)

    {

        int effectId = 0;

        PreviewItemDict.TryGetValue(itemId,out effectId);

        return effectId;

    }



    /// <summary>

@@ -699,6 +731,14 @@
        CheckRecycleStoreRed();

    }



    private void RefreshItemUsce(int id)

    {

        if(playerPack.CheckIsDrugById(id))

        {

            CheckMakerDandrugCondition();

        }

    }



    public void CheckMakerDandrugCondition()

    {

        for (int i = alchemyModellist.Count - 1; i > -1; i--)

@@ -726,7 +766,7 @@
            {

                if(!CheckNormalAlchemyIsReachMaxUse(alchemyModellist[i]))

                {

                    if (IsNormalMatEnough(alchemyModellist[i]))

                    if (IsNormalMatEnough(alchemyModellist[i]) && !IsHaveReachFull(alchemyModellist[i]))

                    {

                        danDrugRedPointlist[i].state = RedPointState.Simple;

                        return;

@@ -773,11 +813,29 @@
        return isEnough;

    }



    public bool IsHaveReachFull(AlchemyConfig alchemyConfig)

    {

        if (alchemyConfig == null) return false;

        List<int> previewlist = GetPreviewMakeDruglist(alchemyConfig).Keys.ToList();

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

        {

            if(playerPack.CheckIsDrugById(previewlist[i]))

            {

                AttrFruitConfig fruitConfig = ConfigManager.Instance.GetTemplate<AttrFruitConfig>(previewlist[i]);

                if(playerPack.IsReachMaxUseDrug(fruitConfig))

                {

                    return true;

                }

            }

        }

        return false;

    }



    public bool CheckNormalAlchemyIsReachMaxUse(AlchemyConfig alchemyConfig)

    {

        if (alchemyConfig == null) return false;



        List<int> previewlist = GetPreviewMakeDruglist(alchemyConfig);

        List<int> previewlist = GetPreviewMakeDruglist(alchemyConfig).Keys.ToList();

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

        {

            if(playerPack.CheckIsDrugById(previewlist[i]))


 System/BlastFurnace/DandrugCell.cs

@@ -1,5 +1,6 @@
using Snxxz.UI;

using System.Collections.Generic;

using System.Linq;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -59,7 +60,7 @@
            selectImg.SetActive(false);

        }



        List<int> previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemyModel);

        List<int> previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemyModel).Keys.ToList();

        bool isReach = true;

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

        {


 System/BlastFurnace/LingDanTips.cs

@@ -5,6 +5,7 @@
using System;

using Snxxz.UI;

using System.Collections;

using System.Linq;



namespace Snxxz.UI

{

@@ -134,7 +135,7 @@
                        isJumpToId = FurnaceModel.alchemyModellist[i].AlchemyID;

                        isMakeDan = true;

                        presentIndex = i;

                        _danDrugCtrl.JumpIndex(presentIndex);

                        _danDrugCtrl.JumpIndex(presentIndex - 1);

                        _danDrugCtrl.m_Scorller.RefreshActiveCellViews();

                        break;

                    }

@@ -177,7 +178,7 @@
                        }

                    }

                }

                _danDrugCtrl.JumpIndex(presentIndex);

                _danDrugCtrl.JumpIndex(presentIndex - 1);

                _danDrugCtrl.m_Scorller.RefreshActiveCellViews();

            }



@@ -421,9 +422,9 @@
        private void CreateRandomLineCell()

        {

            if(chooseSpecModel == null)

                previewDanlist = FurnaceModel.GetPreviewMakeDruglist(curAlchemyModel);

                previewDanlist = FurnaceModel.GetPreviewMakeDruglist(curAlchemyModel).Keys.ToList();

            else

                previewDanlist = FurnaceModel.GetPreviewSpecMakeDruglist(chooseSpecModel);

                previewDanlist = FurnaceModel.GetPreviewSpecMakeDruglist(chooseSpecModel).Keys.ToList();



            _randomLineCtrl.Refresh();

            if (previewDanlist.Count > 0)

@@ -452,9 +453,20 @@
                GameObject randomCell = cell.transform.GetChild(i).gameObject;

                ItemCell itemCell = randomCell.transform.Find("ItemCell1").GetComponent<ItemCell>();

                GameObject fullImg = randomCell.transform.Find("FullImg").gameObject;

                UIEffect effect = randomCell.transform.Find("UIEffect").GetComponent<UIEffect>();

                if (previewIndex <= previewDanlist.Count - 1)

                {

                    int itemId = previewDanlist[previewIndex];

                    int effectId = FurnaceModel.GetEffectIdByItemId(itemId);

                    if(effectId != 0)

                    {

                        effect.effect = effectId;

                        effect.gameObject.SetActive(true);

                    }

                    else

                    {

                        effect.gameObject.SetActive(false);

                    }

                    randomCell.SetActive(true);

                    ItemCellModel cellModel = new ItemCellModel(itemId);

                    itemCell.Init(cellModel);


 System/KnapSack/Logic/MakeDrugCell.cs

@@ -21,6 +21,7 @@
        [SerializeField] Button useBtn;

        [SerializeField] Image useBtnBG;

        [SerializeField] Text useBtnText;

        [SerializeField] GameObject reachMaxUse;



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

        StringBuilder attrSB = new StringBuilder();

@@ -137,6 +138,7 @@
            useBtn.RemoveAllListeners();

            if (useNum < fruitConfig.MaxUseCnt)

            {

                reachMaxUse.SetActive(false);

                useBtnText.text = Language.Get("KnapS103");

                useBtn.AddListener(ClickMakeUseBtn);

                useBtn.gameObject.SetActive(true);

@@ -153,21 +155,8 @@
            }

            else

            {

                useBtnBG.material = MaterialUtility.GetInstantiatedSpriteGrayMaterial();

                useBtn.gameObject.SetActive(false);

                //if (haveCnt > 0)

                //{

                //    useBtnBG.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                //    useBtn.gameObject.SetActive(true);

                //    useBtnText.color = brightColor;

                //    useBtnText.text = Language.Get("BlastFurnace113");

                //    useBtn.AddListener(ClickRecycle);

                //}

                //else

                //{

                    
                //}

              
                reachMaxUse.SetActive(true);

            }

            

          


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -111,6 +111,12 @@
            if (sendItemModel == null) return;



            sendItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(sendItemModel.itemInfo.ItemID);

            if(sendItemConfig.JobLimit / 100 != PlayerDatas.Instance.baseData.Job)

            {

                SysNotifyMgr.Instance.ShowTip("GeRen_lhs_31379");

                return;

            }



            itemIndex = sendItemModel.itemInfo.ItemPlace;

            List<int> putOnlimitList = sendItemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetCancelUseLimit);

            if (putOnlimitList != null)


 System/OpenServerActivity/ImpactRankModel.cs

@@ -648,7 +648,18 @@


        private void OperationEndEvent(Operation type, int state)

        {

            if (type == Operation.FlashSale && state == 0)

            if ((type == Operation.FlashSale || type == Operation.BossReborn

                || type == Operation.ConsumeRebate || type == Operation.GiftPackage

                || type == Operation.MultipRealmPoint)

                && state == 0)

            {

                if (openServerActivityStateChange != null)

                {

                    openServerActivityStateChange();

                }

            }

            if ((type == Operation.MultipleExp)

                && state == 1)

            {

                if (openServerActivityStateChange != null)

                {

@@ -659,7 +670,18 @@


        private void OperationStartEvent(Operation type, int state)

        {

            if (type == Operation.FlashSale && state == 0)

            if ((type == Operation.FlashSale || type == Operation.BossReborn

                || type == Operation.ConsumeRebate || type == Operation.GiftPackage

                || type == Operation.MultipRealmPoint)

                && state == 0)

            {

                if (openServerActivityStateChange != null)

                {

                    openServerActivityStateChange();

                }

            }

            if ((type == Operation.MultipleExp)

                && state == 1)

            {

                if (openServerActivityStateChange != null)

                {

@@ -753,19 +775,6 @@
        public bool IsFlashSaleOpen()

        {

            return flashSaleModel.IsOpen;

        }



        public bool IsFlashSaleTitle()

        {

            if (IsImpactRankOpen() || IsRedEnvelopeOpen() || IsTimeLimitGiftOpen())

            {

                return false;

            }

            if (IsFlashSaleOpen())

            {

                return true;

            }

            return false;

        }



        public bool IsConsumeRebateOpen()


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -58,6 +58,7 @@
        protected override void AddListeners()

        {

            m_ActivityCtrl.OnRefreshCell += OnOpenServerActivityRefresh;

            m_ActivityCtrl.OnGetDynamicSize += OnGetDynamicSize;

            m_BtnClose.onClick.AddListener(CloseClick);

        }



@@ -266,6 +267,22 @@
            }

        }



        private bool OnGetDynamicSize(ScrollerDataType type, int index, out float height)

        {

            height = 74;

            var sort = index;

            if (type == ScrollerDataType.Header)

            {

                if (!m_ActivitySpreadDict.ContainsKey(sort) || !m_ActivitySpreadDict[sort]

                    || (sort != 2 && sort != 0))

                {

                    height = 80;

                    return true;

                }

            }

            return false;

        }



        private void RefreshOpenActivityCell(OpenServerActivityCell _cell)

        {

            OperationBase operationBase;

			@@ -83,12 +83,14 @@
			treasureRefineDict.Clear();
			FuncOpen.Instance.OnFuncStateChangeEvent -= RefreshFuncOpenState;
			playerPack.RefreshItemCountAct -= RefreshMat;
			playerPack.RefreshItemSumUseCntAct -= RefreshItemUsce;
			}

			public void OnAfterPlayerDataInitialize()
			{
			playerPack.RefreshItemCountAct += RefreshMat;
			FuncOpen.Instance.OnFuncStateChangeEvent += RefreshFuncOpenState;
			playerPack.RefreshItemSumUseCntAct += RefreshItemUsce;
			}

			private void RefreshFuncOpenState(int funcId)
			@@ -370,34 +372,64 @@
			/// <summary>
			/// 得到预览合成丹药的列表
			/// </summary>
			public List<int> GetPreviewMakeDruglist(AlchemyConfig alchemyModel)
			public Dictionary<int, int> GetPreviewMakeDruglist(AlchemyConfig alchemyModel)
			{
			JsonData jsonData = JsonMapper.ToObject(alchemyModel.AlchemPreviewItem);
			List<int> drugIdlist = new List<int>();
			PreviewItemDict.Clear();
			if (jsonData.IsArray)
			{
			for (int i = 0; i < jsonData.Count; i++)
			{
			int itemId = int.Parse(jsonData[i].ToString());
			drugIdlist.Add(itemId);
			if (jsonData[i].IsArray)
			{
			int itemId = int.Parse(jsonData[i][0].ToString());
			if (jsonData[i].Count > 1)
			{
			int effectId = int.Parse(jsonData[i][1].ToString());
			PreviewItemDict.Add(itemId, effectId);
			}
			else
			{
			PreviewItemDict.Add(itemId, 0);
			}
			}
			}
			}
			return drugIdlist;
			return PreviewItemDict;
			}

			public List<int> GetPreviewSpecMakeDruglist(AlchemySpecConfig alchemyModel)
			Dictionary<int, int> PreviewItemDict = new Dictionary<int, int>();
			public Dictionary<int, int> GetPreviewSpecMakeDruglist(AlchemySpecConfig alchemyModel)
			{
			JsonData jsonData = JsonMapper.ToObject(alchemyModel.AlchemPreviewItem);
			List<int> drugIdlist = new List<int>();
			PreviewItemDict.Clear();
			if (jsonData.IsArray)
			{
			for (int i = 0; i < jsonData.Count; i++)
			{
			int itemId = int.Parse(jsonData[i].ToString());
			drugIdlist.Add(itemId);
			if(jsonData[i].IsArray)
			{
			int itemId = int.Parse(jsonData[i][0].ToString());
			if (jsonData[i].Count > 1)
			{
			int effectId = int.Parse(jsonData[i][1].ToString());
			PreviewItemDict.Add(itemId,effectId);
			}
			else
			{
			PreviewItemDict.Add(itemId,0);
			}
			}
			}
			}
			return drugIdlist;
			return PreviewItemDict;
			}

			public int GetEffectIdByItemId(int itemId)
			{
			int effectId = 0;
			PreviewItemDict.TryGetValue(itemId,out effectId);
			return effectId;
			}

			/// <summary>
			@@ -699,6 +731,14 @@
			CheckRecycleStoreRed();
			}

			private void RefreshItemUsce(int id)
			{
			if(playerPack.CheckIsDrugById(id))
			{
			CheckMakerDandrugCondition();
			}
			}

			public void CheckMakerDandrugCondition()
			{
			for (int i = alchemyModellist.Count - 1; i > -1; i--)
			@@ -726,7 +766,7 @@
			{
			if(!CheckNormalAlchemyIsReachMaxUse(alchemyModellist[i]))
			{
			if (IsNormalMatEnough(alchemyModellist[i]))
			if (IsNormalMatEnough(alchemyModellist[i]) && !IsHaveReachFull(alchemyModellist[i]))
			{
			danDrugRedPointlist[i].state = RedPointState.Simple;
			return;
			@@ -773,11 +813,29 @@
			return isEnough;
			}

			public bool IsHaveReachFull(AlchemyConfig alchemyConfig)
			{
			if (alchemyConfig == null) return false;
			List<int> previewlist = GetPreviewMakeDruglist(alchemyConfig).Keys.ToList();
			for(int i = 0; i < previewlist.Count; i++)
			{
			if(playerPack.CheckIsDrugById(previewlist[i]))
			{
			AttrFruitConfig fruitConfig = ConfigManager.Instance.GetTemplate<AttrFruitConfig>(previewlist[i]);
			if(playerPack.IsReachMaxUseDrug(fruitConfig))
			{
			return true;
			}
			}
			}
			return false;
			}

			public bool CheckNormalAlchemyIsReachMaxUse(AlchemyConfig alchemyConfig)
			{
			if (alchemyConfig == null) return false;

			List<int> previewlist = GetPreviewMakeDruglist(alchemyConfig);
			List<int> previewlist = GetPreviewMakeDruglist(alchemyConfig).Keys.ToList();
			for(int i = 0; i < previewlist.Count; i++)
			{
			if(playerPack.CheckIsDrugById(previewlist[i]))

			@@ -1,5 +1,6 @@
			using Snxxz.UI;
			using System.Collections.Generic;
			using System.Linq;
			using TableConfig;
			using UnityEngine;
			using UnityEngine.UI;
			@@ -59,7 +60,7 @@
			selectImg.SetActive(false);
			}

			List<int> previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemyModel);
			List<int> previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemyModel).Keys.ToList();
			bool isReach = true;
			for(int i = 0; i < previewDanlist.Count; i++)
			{

			@@ -5,6 +5,7 @@
			using System;
			using Snxxz.UI;
			using System.Collections;
			using System.Linq;

			namespace Snxxz.UI
			{
			@@ -134,7 +135,7 @@
			isJumpToId = FurnaceModel.alchemyModellist[i].AlchemyID;
			isMakeDan = true;
			presentIndex = i;
			_danDrugCtrl.JumpIndex(presentIndex);
			_danDrugCtrl.JumpIndex(presentIndex - 1);
			_danDrugCtrl.m_Scorller.RefreshActiveCellViews();
			break;
			}
			@@ -177,7 +178,7 @@
			}
			}
			}
			_danDrugCtrl.JumpIndex(presentIndex);
			_danDrugCtrl.JumpIndex(presentIndex - 1);
			_danDrugCtrl.m_Scorller.RefreshActiveCellViews();
			}

			@@ -421,9 +422,9 @@
			private void CreateRandomLineCell()
			{
			if(chooseSpecModel == null)
			previewDanlist = FurnaceModel.GetPreviewMakeDruglist(curAlchemyModel);
			previewDanlist = FurnaceModel.GetPreviewMakeDruglist(curAlchemyModel).Keys.ToList();
			else
			previewDanlist = FurnaceModel.GetPreviewSpecMakeDruglist(chooseSpecModel);
			previewDanlist = FurnaceModel.GetPreviewSpecMakeDruglist(chooseSpecModel).Keys.ToList();

			_randomLineCtrl.Refresh();
			if (previewDanlist.Count > 0)
			@@ -452,9 +453,20 @@
			GameObject randomCell = cell.transform.GetChild(i).gameObject;
			ItemCell itemCell = randomCell.transform.Find("ItemCell1").GetComponent<ItemCell>();
			GameObject fullImg = randomCell.transform.Find("FullImg").gameObject;
			UIEffect effect = randomCell.transform.Find("UIEffect").GetComponent<UIEffect>();
			if (previewIndex <= previewDanlist.Count - 1)
			{
			int itemId = previewDanlist[previewIndex];
			int effectId = FurnaceModel.GetEffectIdByItemId(itemId);
			if(effectId != 0)
			{
			effect.effect = effectId;
			effect.gameObject.SetActive(true);
			}
			else
			{
			effect.gameObject.SetActive(false);
			}
			randomCell.SetActive(true);
			ItemCellModel cellModel = new ItemCellModel(itemId);
			itemCell.Init(cellModel);

			@@ -21,6 +21,7 @@
			[SerializeField] Button useBtn;
			[SerializeField] Image useBtnBG;
			[SerializeField] Text useBtnText;
			[SerializeField] GameObject reachMaxUse;

			Dictionary<int, int> attrDict = new Dictionary<int, int>();
			StringBuilder attrSB = new StringBuilder();
			@@ -137,6 +138,7 @@
			useBtn.RemoveAllListeners();
			if (useNum < fruitConfig.MaxUseCnt)
			{
			reachMaxUse.SetActive(false);
			useBtnText.text = Language.Get("KnapS103");
			useBtn.AddListener(ClickMakeUseBtn);
			useBtn.gameObject.SetActive(true);
			@@ -153,21 +155,8 @@
			}
			else
			{
			useBtnBG.material = MaterialUtility.GetInstantiatedSpriteGrayMaterial();
			useBtn.gameObject.SetActive(false);
			//if (haveCnt > 0)
			//{
			// useBtnBG.material = MaterialUtility.GetUIDefaultGraphicMaterial();
			// useBtn.gameObject.SetActive(true);
			// useBtnText.color = brightColor;
			// useBtnText.text = Language.Get("BlastFurnace113");
			// useBtn.AddListener(ClickRecycle);
			//}
			//else
			//{

			//}

			reachMaxUse.SetActive(true);
			}

			@@ -111,6 +111,12 @@
			if (sendItemModel == null) return;

			sendItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(sendItemModel.itemInfo.ItemID);
			if(sendItemConfig.JobLimit / 100 != PlayerDatas.Instance.baseData.Job)
			{
			SysNotifyMgr.Instance.ShowTip("GeRen_lhs_31379");
			return;
			}

			itemIndex = sendItemModel.itemInfo.ItemPlace;
			List<int> putOnlimitList = sendItemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetCancelUseLimit);
			if (putOnlimitList != null)

			@@ -648,7 +648,18 @@

			private void OperationEndEvent(Operation type, int state)
			{
			if (type == Operation.FlashSale && state == 0)
			if ((type == Operation.FlashSale \|\| type == Operation.BossReborn
			\|\| type == Operation.ConsumeRebate \|\| type == Operation.GiftPackage
			\|\| type == Operation.MultipRealmPoint)
			&& state == 0)
			{
			if (openServerActivityStateChange != null)
			{
			openServerActivityStateChange();
			}
			}
			if ((type == Operation.MultipleExp)
			&& state == 1)
			{
			if (openServerActivityStateChange != null)
			{
			@@ -659,7 +670,18 @@

			private void OperationStartEvent(Operation type, int state)
			{
			if (type == Operation.FlashSale && state == 0)
			if ((type == Operation.FlashSale \|\| type == Operation.BossReborn
			\|\| type == Operation.ConsumeRebate \|\| type == Operation.GiftPackage
			\|\| type == Operation.MultipRealmPoint)
			&& state == 0)
			{
			if (openServerActivityStateChange != null)
			{
			openServerActivityStateChange();
			}
			}
			if ((type == Operation.MultipleExp)
			&& state == 1)
			{
			if (openServerActivityStateChange != null)
			{
			@@ -753,19 +775,6 @@
			public bool IsFlashSaleOpen()
			{
			return flashSaleModel.IsOpen;
			}

			public bool IsFlashSaleTitle()
			{
			if (IsImpactRankOpen() \|\| IsRedEnvelopeOpen() \|\| IsTimeLimitGiftOpen())
			{
			return false;
			}
			if (IsFlashSaleOpen())
			{
			return true;
			}
			return false;
			}

			public bool IsConsumeRebateOpen()

			@@ -58,6 +58,7 @@
			protected override void AddListeners()
			{
			m_ActivityCtrl.OnRefreshCell += OnOpenServerActivityRefresh;
			m_ActivityCtrl.OnGetDynamicSize += OnGetDynamicSize;
			m_BtnClose.onClick.AddListener(CloseClick);
			}

			@@ -266,6 +267,22 @@
			}
			}

			private bool OnGetDynamicSize(ScrollerDataType type, int index, out float height)
			{
			height = 74;
			var sort = index;
			if (type == ScrollerDataType.Header)
			{
			if (!m_ActivitySpreadDict.ContainsKey(sort) \|\| !m_ActivitySpreadDict[sort]
			\|\| (sort != 2 && sort != 0))
			{
			height = 80;
			return true;
			}
			}
			return false;
			}

			private void RefreshOpenActivityCell(OpenServerActivityCell _cell)
			{
			OperationBase operationBase;