snxxz_scripts.git

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

6926 子【策划】【2.0】魔族法宝 / 【2.0】【前端】魔族法宝挑战需求调整

client_linchunjie

2019-05-23 f2647352bb32a5bf57c1256633754acddf212b2d

6926 子 【策划】【2.0】魔族法宝 / 【2.0】【前端】魔族法宝挑战需求调整

2个文件已添加

5个文件已修改

	System/Dungeon/DemonTreasureDungeonVictoryWin.cs	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonFightWin.cs	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GeneralConfig/GeneralDefine.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/DemonDungeonChallengeConfirmWin.cs	119 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/DemonDungeonChallengeConfirmWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/DemonTreasureWin.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/WindowJump/WindowJumpMgr.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Dungeon/DemonTreasureDungeonVictoryWin.cs

@@ -18,6 +18,8 @@
        [SerializeField] Button m_ChallengeNextLevel;

        [SerializeField] Text m_ChallengeNextTimer;



        bool satisfyChallengeNext = false;



        TreasureModel model

        {

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

@@ -31,16 +33,30 @@


        protected override void Display()

        {

            satisfyChallengeNext = SatisfyChallengeNext();



            m_ChallengeNextLevel.gameObject.SetActive(satisfyChallengeNext);



            m_ContainerPoivt.gameObject.SetActive(true);



            base.DrawPassTime();

            base.RequireDungeonExit();



            DisplayDemonTreasureProperty();

        }



        protected override void DrawExitTimer(int seconds)

        {

            m_ExitTimer.text = Language.Get("DemonDungeonExit");

            m_ChallengeNextTimer.text = Language.Get("RuneDungeonVictory_Btn_Next_1", Mathf.Clamp(seconds, 0, int.MaxValue));

            if (satisfyChallengeNext)

            {

                m_ChallengeNextTimer.text = Language.Get("RuneDungeonVictory_Btn_Next_1", Mathf.Clamp(seconds, 0, int.MaxValue));

                m_ExitTimer.text = Language.Get("DemonDungeonExit");

            }

            else

            {

                m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp(seconds, 0, int.MaxValue));

                m_ChallengeNextTimer.text = Language.Get("DemonDungeonChallengeNext");

            }

        }



        private void DisplayDemonTreasureProperty()

@@ -71,7 +87,7 @@
            }

        }



        private void ChallengeNext()

        private bool SatisfyChallengeNext()

        {

            TreasureDungeon treasureDungeon;

            var result = dungeonModel.dungeonResult;

@@ -82,28 +98,29 @@
                {

                    if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)

                    {

                        model.DemonDungeonChallengeNext(result.lineID);

                        return true;

                    }

                    else

                    if (UIHelper.GetPropertyValue(PropertyType.DEF) >= dungeonInfo.defense)

                    {

                        ConfirmCancel.ShowRuneTowerPopConfirm(

                             Language.Get("DemonLackPowerTitle"),

                             Language.Get("DemonLackFightPower", dungeonInfo.fightPower),

                             (bool ok) =>

                             {

                                 if (ok)

                                 {

                                     model.DemonDungeonChallengeNext(result.lineID);

                                 }

                                 else

                                 {

                                     dungeonModel.ExitCurrentDungeon();

                                 }

                             }

                             );

                        return true;

                    }

                }

            }

            return false;

        }



        private void ChallengeNext()

        {

            TreasureDungeon treasureDungeon;

            var result = dungeonModel.dungeonResult;

            if (model.TryGetTreasureDungeon(41110, result.lineID, out treasureDungeon))

            {

                var dungeonInfo = treasureDungeon.Get(result.wheel + 1);

                if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                {

                    model.DemonDungeonChallengeNext(result.lineID);

                }

            }

        }



    }


 System/Dungeon/DungeonFightWin.cs

@@ -388,39 +388,23 @@
                    if (treasureModel.TryGetTreasureDungeon(41110, model.dungeonResult.lineID, out treasureDungeon)

                        && model.dungeonResult.isPass == 1)

                    {

                        if (!RuneTowerConfirmWin.waitConfirm)

                        var dungeonInfo = treasureDungeon.Get(model.dungeonResult.wheel + 1);

                        if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                        {

                            var dungeonInfo = treasureDungeon.Get(model.dungeonResult.wheel + 1);

                            if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                            if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower

                                || UIHelper.GetPropertyValue(PropertyType.DEF) >= dungeonInfo.defense)

                            {

                                if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)

                                {

                                    treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);

                                }

                                else

                                {

                                    ConfirmCancel.ShowRuneTowerPopConfirm(

                                            Language.Get("DemonLackPowerTitle"),

                                            Language.Get("DemonLackFightPower", dungeonInfo.fightPower),

                                            (bool ok) =>

                                            {

                                                if (ok)

                                                {

                                                    treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);

                                                }

                                                else

                                                {

                                                    model.ExitCurrentDungeon();

                                                }

                                            }

                                            );

                                }

                                treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);

                            }

                            else

                            {

                                model.ExitCurrentDungeon();

                            }

                        }

                        else

                        {

                            model.ExitCurrentDungeon();

                        }

                    }

                    else

                    {


 System/GeneralConfig/GeneralDefine.cs

@@ -193,6 +193,7 @@
    public static Dictionary<int, float> AtkTypeIncreasePushDis = new Dictionary<int, float>();

    public static Dictionary<int, CameraController.LookAtData> NpcDieSetCamera = new Dictionary<int, CameraController.LookAtData>();

    public static int BlueEquipJumpLevel { get; private set; }

    public static int[] defenseGetWays { get; private set; }



    public static void Init()

    {

@@ -789,6 +790,8 @@
                    NpcDieSetCamera[(int)_child[0]] = _lookAtData;

                }

            }



            defenseGetWays = GetIntArray("DefenseGetWays", 1);

        }

        catch (Exception ex)

        {


 System/Treasure/DemonDungeonChallengeConfirmWin.cs

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

//    [Author]:           第二世界

//    [  Date ]:           Thursday, May 23, 2019

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



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class DemonDungeonChallengeConfirmWin : Window

    {

        [SerializeField] Text m_Remind;

        [SerializeField] Button m_GetFightPower;

        [SerializeField] Button m_GetDefense;

        [SerializeField] Button m_Challenge;

        [SerializeField] Button m_Close;



        public static int treasureId = 0;



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

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_GetFightPower.AddListener(GetFightPower);

            m_GetDefense.AddListener(GetDefense);

            m_Challenge.AddListener(Challenge);

            m_Close.AddListener(CloseClick);

        }



        protected override void OnPreOpen()

        {

            Display();

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        void Display()

        {

            var fightPower = PlayerDatas.Instance.baseData.FightPoint;

            var defense = UIHelper.GetPropertyValue(PropertyType.DEF);

            var recommandPower = 0;

            var recommandDefense = 0;



            TreasureDungeon treasureDungeon;

            if (model.TryGetTreasureDungeon(treasureId, out treasureDungeon))

            {

                var dungeonInfo = treasureDungeon.Get(treasureDungeon.currentLevel + 1);

                if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))

                {

                    recommandPower = dungeonInfo.fightPower;

                    recommandDefense = dungeonInfo.defense;

                }

            }



            m_GetFightPower.gameObject.SetActive(fightPower < recommandPower);

            m_GetDefense.gameObject.SetActive(defense < recommandDefense);

            m_Challenge.gameObject.SetActive(fightPower >= recommandPower

                || defense >= recommandDefense);



            if (fightPower < recommandPower && defense < recommandDefense)

            {

                m_Remind.text = Language.Get("DemonDungeonNextError_1");

            }

            else if (fightPower < recommandPower)

            {

                m_Remind.text = Language.Get("DemonDungeonNextError_2");

            }

            else

            {

                m_Remind.text = Language.Get("DemonDungeonNextError_3");

            }

        }



        private void GetFightPower()

        {

            CloseImmediately();

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RolePromote);

        }



        private void Challenge()

        {

            var config = TreasureConfig.Get(treasureId);

            ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);

        }



        private void GetDefense()

        {

            CloseImmediately();

            RealmRecommandEquipGetWayWin.equipGetWays.Clear();

            RealmRecommandEquipGetWayWin.equipGetWays.AddRange(GeneralDefine.defenseGetWays);

            WindowCenter.Instance.Open<RealmRecommandEquipGetWayWin>();

        }

    }



}










 System/Treasure/DemonDungeonChallengeConfirmWin.cs.meta

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

 System/Treasure/DemonTreasureWin.cs

@@ -187,30 +187,15 @@
                }

            }



            if (fightPower < recommandPower && defense < recommandDefense)

            if (fightPower < recommandPower || defense < recommandDefense)

            {

                SysNotifyMgr.Instance.ShowTip("TreasureDungeonGotoError_1");

                DemonDungeonChallengeConfirmWin.treasureId = model.selectedTreasure;

                WindowCenter.Instance.Open<DemonDungeonChallengeConfirmWin>();

                return;

            }



            var config = TreasureConfig.Get(model.selectedTreasure);

            if (fightPower < recommandPower && model.selectedTreasure != 201)

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("DemonLackPowerTitle"), Language.Get("DemonLackFightPower", recommandPower)

                    , (bool isOk) =>

                     {

                         if (isOk)

                         {

                             model.collectingDemon = model.selectedTreasure;

                             dungeonModel.SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);

                         }

                     });

            }

            else

            {

                model.collectingDemon = model.selectedTreasure;

                dungeonModel.SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);

            }

            dungeonModel.SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);

        }



        private void Display()


 System/WindowJump/WindowJumpMgr.cs

@@ -738,6 +738,9 @@
                ModelCenter.Instance.GetModel<EquipModel>().SelectSet(equipLevel);

                SetJumpLogic<RealmEquipWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.RolePromote:

                SetJumpLogic<RolePromoteWin>(_tagWinSearchModel.TABID);

                break;

            default:

                DebugEx.Log("未添加此跳转界面：" + jumpType);

                IsJumpState = false;

@@ -1683,6 +1686,7 @@
    FullServerAuction = 319,

    AlchemyNormal = 320,

    AlchemyFairy = 321,

    RolePromote = 322,



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

			@@ -18,6 +18,8 @@
			[SerializeField] Button m_ChallengeNextLevel;
			[SerializeField] Text m_ChallengeNextTimer;

			bool satisfyChallengeNext = false;

			TreasureModel model
			{
			get { return ModelCenter.Instance.GetModel<TreasureModel>(); }
			@@ -31,16 +33,30 @@

			protected override void Display()
			{
			satisfyChallengeNext = SatisfyChallengeNext();

			m_ChallengeNextLevel.gameObject.SetActive(satisfyChallengeNext);

			m_ContainerPoivt.gameObject.SetActive(true);

			base.DrawPassTime();
			base.RequireDungeonExit();

			DisplayDemonTreasureProperty();
			}

			protected override void DrawExitTimer(int seconds)
			{
			m_ExitTimer.text = Language.Get("DemonDungeonExit");
			m_ChallengeNextTimer.text = Language.Get("RuneDungeonVictory_Btn_Next_1", Mathf.Clamp(seconds, 0, int.MaxValue));
			if (satisfyChallengeNext)
			{
			m_ChallengeNextTimer.text = Language.Get("RuneDungeonVictory_Btn_Next_1", Mathf.Clamp(seconds, 0, int.MaxValue));
			m_ExitTimer.text = Language.Get("DemonDungeonExit");
			}
			else
			{
			m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp(seconds, 0, int.MaxValue));
			m_ChallengeNextTimer.text = Language.Get("DemonDungeonChallengeNext");
			}
			}

			private void DisplayDemonTreasureProperty()
			@@ -71,7 +87,7 @@
			}
			}

			private void ChallengeNext()
			private bool SatisfyChallengeNext()
			{
			TreasureDungeon treasureDungeon;
			var result = dungeonModel.dungeonResult;
			@@ -82,28 +98,29 @@
			{
			if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)
			{
			model.DemonDungeonChallengeNext(result.lineID);
			return true;
			}
			else
			if (UIHelper.GetPropertyValue(PropertyType.DEF) >= dungeonInfo.defense)
			{
			ConfirmCancel.ShowRuneTowerPopConfirm(
			Language.Get("DemonLackPowerTitle"),
			Language.Get("DemonLackFightPower", dungeonInfo.fightPower),
			(bool ok) =>
			{
			if (ok)
			{
			model.DemonDungeonChallengeNext(result.lineID);
			}
			else
			{
			dungeonModel.ExitCurrentDungeon();
			}
			}
			);
			return true;
			}
			}
			}
			return false;
			}

			private void ChallengeNext()
			{
			TreasureDungeon treasureDungeon;
			var result = dungeonModel.dungeonResult;
			if (model.TryGetTreasureDungeon(41110, result.lineID, out treasureDungeon))
			{
			var dungeonInfo = treasureDungeon.Get(result.wheel + 1);
			if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))
			{
			model.DemonDungeonChallengeNext(result.lineID);
			}
			}
			}

			}

			@@ -388,39 +388,23 @@
			if (treasureModel.TryGetTreasureDungeon(41110, model.dungeonResult.lineID, out treasureDungeon)
			&& model.dungeonResult.isPass == 1)
			{
			if (!RuneTowerConfirmWin.waitConfirm)
			var dungeonInfo = treasureDungeon.Get(model.dungeonResult.wheel + 1);
			if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))
			{
			var dungeonInfo = treasureDungeon.Get(model.dungeonResult.wheel + 1);
			if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))
			if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower
			\|\| UIHelper.GetPropertyValue(PropertyType.DEF) >= dungeonInfo.defense)
			{
			if (PlayerDatas.Instance.baseData.FightPoint >= dungeonInfo.fightPower)
			{
			treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);
			}
			else
			{
			ConfirmCancel.ShowRuneTowerPopConfirm(
			Language.Get("DemonLackPowerTitle"),
			Language.Get("DemonLackFightPower", dungeonInfo.fightPower),
			(bool ok) =>
			{
			if (ok)
			{
			treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);
			}
			else
			{
			model.ExitCurrentDungeon();
			}
			}
			);
			}
			treasureModel.DemonDungeonChallengeNext(model.dungeonResult.lineID);
			}
			else
			{
			model.ExitCurrentDungeon();
			}
			}
			else
			{
			model.ExitCurrentDungeon();
			}
			}
			else
			{

			@@ -193,6 +193,7 @@
			public static Dictionary<int, float> AtkTypeIncreasePushDis = new Dictionary<int, float>();
			public static Dictionary<int, CameraController.LookAtData> NpcDieSetCamera = new Dictionary<int, CameraController.LookAtData>();
			public static int BlueEquipJumpLevel { get; private set; }
			public static int[] defenseGetWays { get; private set; }

			public static void Init()
			{
			@@ -789,6 +790,8 @@
			NpcDieSetCamera[(int)_child[0]] = _lookAtData;
			}
			}

			defenseGetWays = GetIntArray("DefenseGetWays", 1);
			}
			catch (Exception ex)
			{

New file
			@@ -0,0 +1,119 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Thursday, May 23, 2019
			//--------------------------------------------------------

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

			namespace Snxxz.UI
			{

			public class DemonDungeonChallengeConfirmWin : Window
			{
			[SerializeField] Text m_Remind;
			[SerializeField] Button m_GetFightPower;
			[SerializeField] Button m_GetDefense;
			[SerializeField] Button m_Challenge;
			[SerializeField] Button m_Close;

			public static int treasureId = 0;

			TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			m_GetFightPower.AddListener(GetFightPower);
			m_GetDefense.AddListener(GetDefense);
			m_Challenge.AddListener(Challenge);
			m_Close.AddListener(CloseClick);
			}

			protected override void OnPreOpen()
			{
			Display();
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			}

			protected override void OnAfterClose()
			{
			}
			#endregion

			void Display()
			{
			var fightPower = PlayerDatas.Instance.baseData.FightPoint;
			var defense = UIHelper.GetPropertyValue(PropertyType.DEF);
			var recommandPower = 0;
			var recommandDefense = 0;

			TreasureDungeon treasureDungeon;
			if (model.TryGetTreasureDungeon(treasureId, out treasureDungeon))
			{
			var dungeonInfo = treasureDungeon.Get(treasureDungeon.currentLevel + 1);
			if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))
			{
			recommandPower = dungeonInfo.fightPower;
			recommandDefense = dungeonInfo.defense;
			}
			}

			m_GetFightPower.gameObject.SetActive(fightPower < recommandPower);
			m_GetDefense.gameObject.SetActive(defense < recommandDefense);
			m_Challenge.gameObject.SetActive(fightPower >= recommandPower
			\|\| defense >= recommandDefense);

			if (fightPower < recommandPower && defense < recommandDefense)
			{
			m_Remind.text = Language.Get("DemonDungeonNextError_1");
			}
			else if (fightPower < recommandPower)
			{
			m_Remind.text = Language.Get("DemonDungeonNextError_2");
			}
			else
			{
			m_Remind.text = Language.Get("DemonDungeonNextError_3");
			}
			}

			private void GetFightPower()
			{
			CloseImmediately();
			WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RolePromote);
			}

			private void Challenge()
			{
			var config = TreasureConfig.Get(treasureId);
			ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);
			}

			private void GetDefense()
			{
			CloseImmediately();
			RealmRecommandEquipGetWayWin.equipGetWays.Clear();
			RealmRecommandEquipGetWayWin.equipGetWays.AddRange(GeneralDefine.defenseGetWays);
			WindowCenter.Instance.Open<RealmRecommandEquipGetWayWin>();
			}
			}

			}

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

			@@ -187,30 +187,15 @@
			}
			}

			if (fightPower < recommandPower && defense < recommandDefense)
			if (fightPower < recommandPower \|\| defense < recommandDefense)
			{
			SysNotifyMgr.Instance.ShowTip("TreasureDungeonGotoError_1");
			DemonDungeonChallengeConfirmWin.treasureId = model.selectedTreasure;
			WindowCenter.Instance.Open<DemonDungeonChallengeConfirmWin>();
			return;
			}

			var config = TreasureConfig.Get(model.selectedTreasure);
			if (fightPower < recommandPower && model.selectedTreasure != 201)
			{
			ConfirmCancel.ShowPopConfirm(Language.Get("DemonLackPowerTitle"), Language.Get("DemonLackFightPower", recommandPower)
			, (bool isOk) =>
			{
			if (isOk)
			{
			model.collectingDemon = model.selectedTreasure;
			dungeonModel.SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);
			}
			});
			}
			else
			{
			model.collectingDemon = model.selectedTreasure;
			dungeonModel.SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);
			}
			dungeonModel.SingleChallenge(TreasureModel.TREASURE_DATAMAPID, config.LineId);
			}

			private void Display()

			@@ -738,6 +738,9 @@
			ModelCenter.Instance.GetModel<EquipModel>().SelectSet(equipLevel);
			SetJumpLogic<RealmEquipWin>(_tagWinSearchModel.TABID);
			break;
			case JumpUIType.RolePromote:
			SetJumpLogic<RolePromoteWin>(_tagWinSearchModel.TABID);
			break;
			default:
			DebugEx.Log("未添加此跳转界面：" + jumpType);
			IsJumpState = false;
			@@ -1683,6 +1686,7 @@
			FullServerAuction = 319,
			AlchemyNormal = 320,
			AlchemyFairy = 321,
			RolePromote = 322,

			DhszTs = 1001,//定海神针功法提升界面
			HyqTs = 1002,//皓月枪功法提升界面