snxxz_scripts.git

parent: 01847478 | 补丁 | 提交 | ignore whitespace

client_linchunjie

2019-03-08 4615dbd370be8bcbdc2610b731419d63193776ee

AllianceBoss

2个文件已添加

5个文件已修改

	System/Activity/ActivityModel.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestModel.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestWin.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonData.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/AllianceBossVictoryWin.cs	111 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/AllianceBossVictoryWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/EnumHelper.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Activity/ActivityModel.cs

@@ -13,6 +13,7 @@
    {

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

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

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

        public override void Init()

        {

            var dic = DailyQuestConfig.GetValues();

@@ -284,6 +285,15 @@
                        }

                    }

                    break;

                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    {

                        if (allianceBossModel.isActivityOver)

                        {

                            return true;

                        }

                    }

                    break;

            }

            if (config.UnLockFuncID != 0)

            {


 System/DailyQuest/DailyQuestModel.cs

@@ -90,8 +90,8 @@
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

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

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



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

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

        public event Action<int> activeValueRewardGotEvent;

        public event Action<int> dailyQuestProgressUpdateEvent;

        public event Action totalActiveValueUpdateEvent;

@@ -116,6 +116,7 @@
            fairyModel.guardSkyCompleteEvent += GuardSkyCompleteEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyInfo;

            allianceBossModel.allianceBossStateRefresh += AllianceBossStateRefresh;

        }



        public override void UnInit()

@@ -127,6 +128,7 @@
            fairyModel.guardSkyCompleteEvent -= GuardSkyCompleteEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyInfo;

            allianceBossModel.allianceBossStateRefresh -= AllianceBossStateRefresh;

        }



        public void OnPlayerLoginOk()

@@ -228,6 +230,8 @@
                case DailyQuestType.FairyFeast:

                case DailyQuestType.FairyTask:

                case DailyQuestType.FairyGrabBoss:

                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    return defaultUnlock && PlayerDatas.Instance.baseData.FamilyId > 0;

                case DailyQuestType.RuneTowerSweep:

                    return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;

@@ -493,6 +497,12 @@
        {

            UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);

            UpdateDailyActionRedpoint((int)DailyQuestType.FairyLeague);

        }



        private void AllianceBossStateRefresh()

        {

            UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss1);

            UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss2);

        }



        private void OnPlayerDataRefresh(PlayerDataType _refreshType)

@@ -829,6 +839,13 @@
                        return DailyQuestState.Normal;

                    }

                    break;

                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    if (allianceBossModel.isActivityOver)

                    {

                        return DailyQuestState.Completed;

                    }

                    break;

            }



            var completedTimes = GetDailyQuestCompletedTimes(_dailyQuestId);

@@ -888,6 +905,13 @@
            var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();

            switch (type)

            {

                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    if (!PlayerDatas.Instance.fairyData.HasFairy)

                    {

                        return Language.Get("DailyQuestWin_Participate");

                    }

                    break;

                case DailyQuestType.GuardSky:

                    if (!PlayerDatas.Instance.fairyData.HasFairy)

                    {


 System/DailyQuest/DailyQuestWin.cs

@@ -191,7 +191,7 @@
            switch ((DailyQuestType)_id)

            {

                case DailyQuestType.FairyLand:

                 GotoNormalDungeon(_id);

                    GotoNormalDungeon(_id);

                    break;

                case DailyQuestType.IceCrystal:

                    WindowCenter.Instance.Open<IceCrystalVeinWin>();              

@@ -315,14 +315,18 @@
                    WindowCenter.Instance.Close<DailyQuestWin>();

                    WindowCenter.Instance.Open<CrossServerWin>();

                    break;

                case DailyQuestType.JadeDynastyBoss:

                    WindowCenter.Instance.Close<DailyQuestWin>();

                    WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);

                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    GotoNormalDungeon(_id);

                    break;

                case DailyQuestType.JadeDynastyTower:

                    WindowCenter.Instance.Close<DailyQuestWin>();

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

                    break;

                //case DailyQuestType.JadeDynastyBoss:

                //    WindowCenter.Instance.Close<DailyQuestWin>();

                //    WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);

                //    break;

                //case DailyQuestType.JadeDynastyTower:

                //    WindowCenter.Instance.Close<DailyQuestWin>();

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

                //    break;

                default:

                    CSharpCallLua.GotoLuaDailyQuest(_id);

                    break;


 System/Dungeon/DungeonData.cs

@@ -55,6 +55,7 @@
        public int runeMagicEssence;

        public ServerItem[] itemInfo;

        public ServerItem[] succItemInfo;

        public ServerItem[] AuctionItem;

        public int[] xianyuanCoin;

        public int sp;

        public int startRewardLineID;

@@ -62,6 +63,7 @@
        public int leaderID;

        public int wheel;

        public Dictionary<string, AssistPlayer> helpPlayer;

        public int myMenberCnt;



        public long totalExp

        {


 System/FairyAu/AllianceBossVictoryWin.cs

New file
@@ -0,0 +1,111 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Friday, March 08, 2019

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class AllianceBossVictoryWin : DungeonVictoryWin

    {

        [SerializeField] Transform m_ContainerTopThree;

        [SerializeField] Image m_Rank;

        [SerializeField] Transform m_ContainerOutThree;

        [SerializeField] Text m_AllianceRank;

        [SerializeField] Text m_AllianceParticipate;

        [SerializeField] Transform m_ContainerAuctionReward;

        [SerializeField] Transform m_ContainerNoneReward;

        [SerializeField] DemonJarRewardBehaviour[] m_AuctionItems;

        [SerializeField] DemonJarRewardBehaviour[] m_MyItems;

        [SerializeField] Button m_GotoAuction;



        protected override void AddListeners()

        {

            base.AddListeners();

            m_GotoAuction.AddListener(GotoAuction);

        }



        protected override void Display()

        {

            m_ContainerPoivt.gameObject.SetActive(true);

            base.RequireDungeonExit();

            DisplayAlliance();

            DisplayAutionItems();

            DisplayMyItems();

        }



        void DisplayAlliance()

        {

            var result = dungeonModel.dungeonResult;



            bool top3 = result.rank <= 3 && result.rank > 0;



            m_ContainerTopThree.gameObject.SetActive(top3);

            m_ContainerOutThree.gameObject.SetActive(!top3);

            if (top3)

            {

                m_Rank.SetSprite(StringUtility.Contact("AllianceBossRank_", result.rank));

            }

            m_AllianceRank.text = Language.Get("AllianceBossRank", result.rank);

            m_AllianceParticipate.text = Language.Get("AllianceParticipate", result.myMenberCnt);

        }



        void DisplayAutionItems()

        {

            var result = dungeonModel.dungeonResult;

            var existAuctionItem = result.AuctionItem != null && result.AuctionItem.Length > 0;

            m_ContainerAuctionReward.gameObject.SetActive(existAuctionItem);

            m_ContainerNoneReward.gameObject.SetActive(!existAuctionItem);

            if (existAuctionItem)

            {

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

                {

                    if (i < result.AuctionItem.Length)

                    {

                        var serverItem = result.AuctionItem[i];

                        m_AuctionItems[i].gameObject.SetActive(true);

                        m_AuctionItems[i].Display(new Item(serverItem.ItemID, serverItem.Count, serverItem.IsBind == 1));

                    }

                    else

                    {

                        m_AuctionItems[i].gameObject.SetActive(false);

                    }

                }

            }

        }



        void DisplayMyItems()

        {

            var result = dungeonModel.dungeonResult;

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

            {

                if (result.itemInfo != null && i < result.itemInfo.Length)

                {

                    var serverItem = result.itemInfo[i];

                    m_MyItems[i].gameObject.SetActive(true);

                    m_MyItems[i].Display(new Item(serverItem.ItemID, serverItem.Count, serverItem.IsBind == 1));

                }

                else

                {

                    m_MyItems[i].gameObject.SetActive(false);

                }

            }

        }



        private void GotoAuction()

        {



        }

    }



}










 System/FairyAu/AllianceBossVictoryWin.cs.meta

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

 Utility/EnumHelper.cs

@@ -327,8 +327,10 @@
    DungeonAssist = 29,

    GatherSoulDungeon = 30,

    CrossServerPk = 31,

    JadeDynastyBoss = 32,

    JadeDynastyTower = 33,

    AllianceBoss1 = 32,

    AllianceBoss2 = 33,

    //JadeDynastyBoss = 32,--诛仙功能暂时关闭

    //JadeDynastyTower = 33,

}



public enum ActivityPrepareType

			@@ -13,6 +13,7 @@
			{
			HeavenBattleModel battleModel { get { return ModelCenter.Instance.GetModel<HeavenBattleModel>(); } }
			FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
			AllianceBossModel allianceBossModel { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } }
			public override void Init()
			{
			var dic = DailyQuestConfig.GetValues();
			@@ -284,6 +285,15 @@
			}
			}
			break;
			case DailyQuestType.AllianceBoss1:
			case DailyQuestType.AllianceBoss2:
			{
			if (allianceBossModel.isActivityOver)
			{
			return true;
			}
			}
			break;
			}
			if (config.UnLockFuncID != 0)
			{

			@@ -90,8 +90,8 @@
			DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
			TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
			FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }

			FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
			AllianceBossModel allianceBossModel { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } }
			public event Action<int> activeValueRewardGotEvent;
			public event Action<int> dailyQuestProgressUpdateEvent;
			public event Action totalActiveValueUpdateEvent;
			@@ -116,6 +116,7 @@
			fairyModel.guardSkyCompleteEvent += GuardSkyCompleteEvent;
			PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
			PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyInfo;
			allianceBossModel.allianceBossStateRefresh += AllianceBossStateRefresh;
			}

			public override void UnInit()
			@@ -127,6 +128,7 @@
			fairyModel.guardSkyCompleteEvent -= GuardSkyCompleteEvent;
			PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
			PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyInfo;
			allianceBossModel.allianceBossStateRefresh -= AllianceBossStateRefresh;
			}

			public void OnPlayerLoginOk()
			@@ -228,6 +230,8 @@
			case DailyQuestType.FairyFeast:
			case DailyQuestType.FairyTask:
			case DailyQuestType.FairyGrabBoss:
			case DailyQuestType.AllianceBoss1:
			case DailyQuestType.AllianceBoss2:
			return defaultUnlock && PlayerDatas.Instance.baseData.FamilyId > 0;
			case DailyQuestType.RuneTowerSweep:
			return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;
			@@ -493,6 +497,12 @@
			{
			UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);
			UpdateDailyActionRedpoint((int)DailyQuestType.FairyLeague);
			}

			private void AllianceBossStateRefresh()
			{
			UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss1);
			UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss2);
			}

			private void OnPlayerDataRefresh(PlayerDataType _refreshType)
			@@ -829,6 +839,13 @@
			return DailyQuestState.Normal;
			}
			break;
			case DailyQuestType.AllianceBoss1:
			case DailyQuestType.AllianceBoss2:
			if (allianceBossModel.isActivityOver)
			{
			return DailyQuestState.Completed;
			}
			break;
			}

			var completedTimes = GetDailyQuestCompletedTimes(_dailyQuestId);
			@@ -888,6 +905,13 @@
			var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
			switch (type)
			{
			case DailyQuestType.AllianceBoss1:
			case DailyQuestType.AllianceBoss2:
			if (!PlayerDatas.Instance.fairyData.HasFairy)
			{
			return Language.Get("DailyQuestWin_Participate");
			}
			break;
			case DailyQuestType.GuardSky:
			if (!PlayerDatas.Instance.fairyData.HasFairy)
			{

			@@ -191,7 +191,7 @@
			switch ((DailyQuestType)_id)
			{
			case DailyQuestType.FairyLand:
			GotoNormalDungeon(_id);
			GotoNormalDungeon(_id);
			break;
			case DailyQuestType.IceCrystal:
			WindowCenter.Instance.Open<IceCrystalVeinWin>();
			@@ -315,14 +315,18 @@
			WindowCenter.Instance.Close<DailyQuestWin>();
			WindowCenter.Instance.Open<CrossServerWin>();
			break;
			case DailyQuestType.JadeDynastyBoss:
			WindowCenter.Instance.Close<DailyQuestWin>();
			WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);
			case DailyQuestType.AllianceBoss1:
			case DailyQuestType.AllianceBoss2:
			GotoNormalDungeon(_id);
			break;
			case DailyQuestType.JadeDynastyTower:
			WindowCenter.Instance.Close<DailyQuestWin>();
			WindowCenter.Instance.Open<TowerWin>(false, 1);
			break;
			//case DailyQuestType.JadeDynastyBoss:
			// WindowCenter.Instance.Close<DailyQuestWin>();
			// WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);
			// break;
			//case DailyQuestType.JadeDynastyTower:
			// WindowCenter.Instance.Close<DailyQuestWin>();
			// WindowCenter.Instance.Open<TowerWin>(false, 1);
			// break;
			default:
			CSharpCallLua.GotoLuaDailyQuest(_id);
			break;

			@@ -55,6 +55,7 @@
			public int runeMagicEssence;
			public ServerItem[] itemInfo;
			public ServerItem[] succItemInfo;
			public ServerItem[] AuctionItem;
			public int[] xianyuanCoin;
			public int sp;
			public int startRewardLineID;
			@@ -62,6 +63,7 @@
			public int leaderID;
			public int wheel;
			public Dictionary<string, AssistPlayer> helpPlayer;
			public int myMenberCnt;

			public long totalExp
			{

New file
			@@ -0,0 +1,111 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Friday, March 08, 2019
			//--------------------------------------------------------

			using System;
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;
			using UnityEngine.UI;

			namespace Snxxz.UI
			{

			public class AllianceBossVictoryWin : DungeonVictoryWin
			{
			[SerializeField] Transform m_ContainerTopThree;
			[SerializeField] Image m_Rank;
			[SerializeField] Transform m_ContainerOutThree;
			[SerializeField] Text m_AllianceRank;
			[SerializeField] Text m_AllianceParticipate;
			[SerializeField] Transform m_ContainerAuctionReward;
			[SerializeField] Transform m_ContainerNoneReward;
			[SerializeField] DemonJarRewardBehaviour[] m_AuctionItems;
			[SerializeField] DemonJarRewardBehaviour[] m_MyItems;
			[SerializeField] Button m_GotoAuction;

			protected override void AddListeners()
			{
			base.AddListeners();
			m_GotoAuction.AddListener(GotoAuction);
			}

			protected override void Display()
			{
			m_ContainerPoivt.gameObject.SetActive(true);
			base.RequireDungeonExit();
			DisplayAlliance();
			DisplayAutionItems();
			DisplayMyItems();
			}

			void DisplayAlliance()
			{
			var result = dungeonModel.dungeonResult;

			bool top3 = result.rank <= 3 && result.rank > 0;

			m_ContainerTopThree.gameObject.SetActive(top3);
			m_ContainerOutThree.gameObject.SetActive(!top3);
			if (top3)
			{
			m_Rank.SetSprite(StringUtility.Contact("AllianceBossRank_", result.rank));
			}
			m_AllianceRank.text = Language.Get("AllianceBossRank", result.rank);
			m_AllianceParticipate.text = Language.Get("AllianceParticipate", result.myMenberCnt);
			}

			void DisplayAutionItems()
			{
			var result = dungeonModel.dungeonResult;
			var existAuctionItem = result.AuctionItem != null && result.AuctionItem.Length > 0;
			m_ContainerAuctionReward.gameObject.SetActive(existAuctionItem);
			m_ContainerNoneReward.gameObject.SetActive(!existAuctionItem);
			if (existAuctionItem)
			{
			for (int i = 0; i < m_AuctionItems.Length; i++)
			{
			if (i < result.AuctionItem.Length)
			{
			var serverItem = result.AuctionItem[i];
			m_AuctionItems[i].gameObject.SetActive(true);
			m_AuctionItems[i].Display(new Item(serverItem.ItemID, serverItem.Count, serverItem.IsBind == 1));
			}
			else
			{
			m_AuctionItems[i].gameObject.SetActive(false);
			}
			}
			}
			}

			void DisplayMyItems()
			{
			var result = dungeonModel.dungeonResult;
			for (int i = 0; i < m_MyItems.Length; i++)
			{
			if (result.itemInfo != null && i < result.itemInfo.Length)
			{
			var serverItem = result.itemInfo[i];
			m_MyItems[i].gameObject.SetActive(true);
			m_MyItems[i].Display(new Item(serverItem.ItemID, serverItem.Count, serverItem.IsBind == 1));
			}
			else
			{
			m_MyItems[i].gameObject.SetActive(false);
			}
			}
			}

			private void GotoAuction()
			{

			}
			}

			}

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

			@@ -327,8 +327,10 @@
			DungeonAssist = 29,
			GatherSoulDungeon = 30,
			CrossServerPk = 31,
			JadeDynastyBoss = 32,
			JadeDynastyTower = 33,
			AllianceBoss1 = 32,
			AllianceBoss2 = 33,
			//JadeDynastyBoss = 32,--诛仙功能暂时关闭
			//JadeDynastyTower = 33,
			}

			public enum ActivityPrepareType