snxxz_scripts.git

parent: 5876edcb | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2018-11-08 b918b2343d62d267aad5890f04b38ac318d7d297

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

6个文件已修改

	System/Dungeon/DungeonAncientAchieveWin.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonAncientKingWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyAuTaskWin.cs	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyCallMemberBehaviour.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyGrabBossWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/MainInterfaceWin.cs	64 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Dungeon/DungeonAncientAchieveWin.cs

@@ -27,7 +27,8 @@

        protected override void OnPreOpen()
        {
            m_AchieveTargetBehaviour.Init(31160);
            m_AchieveTargetBehaviour.Init(31160);

            MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;
        }

        protected override void OnAfterOpen()
@@ -35,14 +36,21 @@
        }

        protected override void OnPreClose()
        {
        }

        {

            MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;
        }



        protected override void OnAfterClose()
        {
        }
        }

        #endregion
   
        private void OnChangeFuncBtnPosEvent(bool open, float _speed)

        {

            if (open)

            {

                CloseImmediately();

            }

        }
    }

}

 System/Dungeon/DungeonAncientKingWin.cs

@@ -36,6 +36,7 @@
        protected override void OnPreOpen()

        {

            model.updateMissionEvent -= UpdateTargets;

            MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;

            UpdateTargets();

            DisplayAward();

        }

@@ -47,6 +48,7 @@
        protected override void OnPreClose()

        {

            model.updateMissionEvent -= UpdateTargets;

            MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;

        }



        protected override void OnAfterClose()

@@ -84,6 +86,14 @@
                }

            }

        }



        private void OnChangeFuncBtnPosEvent(bool open, float _speed)

        {

            if (open)

            {

                CloseImmediately();

            }

        }

    }



}


 System/FairyAu/FairyAuTaskWin.cs

@@ -26,7 +26,8 @@
        [SerializeField] RichText ObjectiveText;//任务目标

        [SerializeField] Text RoundText;//任务环数

        [SerializeField] Transform _Grid;

        [SerializeField] Text _ReceiveImageText;

        [SerializeField] GameObject m_ReceiveImageObj;//领奖倒计时1

        [SerializeField] Text _ReceiveImageText;//领奖倒计时2

        [SerializeField] Transform m_GridLeft;//左侧奖励

        [SerializeField] Slider m_Slider;//进度条 



@@ -78,11 +79,12 @@
            int GetCylinderNumber = TaskAllocation.Instance.FairyAuNumber();//获取仙盟总环数

            if (coinTaskTip.IsFairy && GetCylinderNumber == 10 && vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1)

            {

                m_ReceiveImageObj.SetActive(true);

                _ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_1"), Second);

            }

            else

            {

                _ReceiveImageText.text = Language.Get("TaskBoxWin_BtnGetReward_Text_1");

                m_ReceiveImageObj.SetActive(false);

            }



        }

@@ -152,7 +154,7 @@
            if (coinTaskTip.IsFairy)

            {

                coinTaskTip.IsFairy = false;

                _ReceiveImageText.text = Language.Get("TaskBoxWin_BtnGetReward_Text_1");

                m_ReceiveImageObj.SetActive(false);

            }

        }

        void FinishButton()//立即完成按钮

@@ -274,15 +276,20 @@
            if (TaskAllocation.Instance.FairyAuNumber() >= 10)

            {

                Btn_Leave.gameObject.SetActive(false);

                RoundText.text = "10/10";

                int total = TaskAllocation.Instance.FairyAuAllNumber();

                total = Mathf.CeilToInt((float)total / 10);

                RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(total), 10);

               // RoundText.text = "10/10";

                Btn_Finish.gameObject.SetActive(false);

            }

            else

            {

                Btn_Leave.gameObject.SetActive(true);

                Btn_Finish.gameObject.SetActive(true);



                RoundText.text = (TaskAllocation.Instance.FairyAuNumber() + 1) + "/10";

                int total = TaskAllocation.Instance.FairyAuAllNumber();

                total = Mathf.CeilToInt((float)total / 10);

                RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(total), (TaskAllocation.Instance.FairyAuNumber() + 1));

               // RoundText.text = (TaskAllocation.Instance.FairyAuNumber() + 1) + "/10";

            }

            Text_FinishRound.text = TaskAllocation.Instance.FairyAuAllNumber() + "/70";



@@ -304,7 +311,8 @@
        {

            Btn_Finish.gameObject.SetActive(false);

            Btn_Leave.gameObject.SetActive(true);

            RoundText.text = "0/10";

            RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(0),0);

           // RoundText.text = "0/10";

            Text_FinishRound.text = "0/70";

            m_Slider.value = 0f;

            string strINfor = taskmodel.SpecialTask[_taskID].InforList;

@@ -323,7 +331,8 @@
            Btn_Receive.interactable = false;

            Btn_Finish.gameObject.SetActive(false);

            Btn_Leave.gameObject.SetActive(false);

            RoundText.text = "10/10";

            RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(7), 10);

            //RoundText.text = "10/10";

            Text_FinishRound.text = "70/70";

            m_Slider.value = 1f;

            ObjectiveText.text = Language.Get("CompleteTheXianmengMission_Z");

@@ -442,6 +451,38 @@
            }

           

        }

        private string  SetNumberOfRounds(int num)

        {

            string Str = String.Empty;

            switch (num)

            {

                case 0:

                    Str = Language.Get("Num_CHS_1");

                    return Str;

                case 1:

                    Str = Language.Get("Num_CHS_1");

                    return Str;

                case 2:

                    Str = Language.Get("Num_CHS_2");

                    return Str;

                case 3:

                    Str = Language.Get("Num_CHS_3");

                    return Str;

                case 4:

                    Str = Language.Get("Num_CHS_4");

                    return Str;

                case 5:

                    Str = Language.Get("Num_CHS_5");

                    return Str;

                case 6:

                    Str = Language.Get("Num_CHS_6");

                    return Str;

                case 7:

                    Str = Language.Get("Num_CHS_7");

                    return Str;

            }

            return Str;

        }

    }



}


 System/FairyAu/FairyCallMemberBehaviour.cs

@@ -29,7 +29,7 @@
            GlobalTimeEvent.Instance.secondEvent += DisplayTimer;

            Display();

            DisplayTimer();

            DisplayEffect();

            //DisplayEffect();

        }



        public void UnInit()

@@ -52,7 +52,7 @@
        void Display()

        {

            m_CallMember.gameObject.SetActive(CheckCallMember());

            DisplayEffect();

            //DisplayEffect();

        }



        bool CheckCallMember()

@@ -115,14 +115,14 @@
                if (seconds <= 0 && m_Timer.gameObject.activeSelf)

                {

                    m_Timer.gameObject.SetActive(false);

                    DisplayEffect();

                    //DisplayEffect();

                }

                else if (seconds > 0)

                {

                    if (!m_Timer.gameObject.activeSelf)

                    {

                        m_Timer.gameObject.SetActive(true);

                        DisplayEffect();

                        //DisplayEffect();

                    }

                    m_Timer.text = StringUtility.Contact(seconds, Language.Get("RealmWin_Bewrite_35"));

                }


 System/FairyAu/FairyGrabBossWin.cs

@@ -208,7 +208,7 @@
                    SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver");

                }

                WindowJumpMgr.Instance.ClearJumpData();

                WindowCenter.Instance.Close<PetWin>();

                WindowCenter.Instance.Close<LootPreciousFrameWin>();

                MapTransferUtility.Instance.MoveToNPC(model.selectBoss);

            }

            else


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -85,7 +85,7 @@
        [SerializeField] Button m_SendRedbagBtn;

        [SerializeField] Button WishingAwardImg;

        [SerializeField] Button m_GotoFairyGrabBoss;

        [SerializeField] Button m_FlyToFairyGrabBoss;

        //[SerializeField] Button m_FlyToFairyGrabBoss;



        [SerializeField] Transform m_EffectTask;//任务完成特效播放位置

        private int m_CollectNPCID;

@@ -179,7 +179,7 @@
            m_SendRedbagBtn.AddListener(SendRedpacketBtn);

            WishingAwardImg.AddListener(ClickWishAward);

            m_GotoFairyGrabBoss.AddListener(GotoFairyGrabBoss);

            m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);

            //m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);

        }



        protected override void OnPreOpen()

@@ -1142,36 +1142,36 @@
            }

        }



        private void FlyToFairyGrabBoss()

        {

            if (fairyGrabBossModel.cacheGotoBossId != 0)

            {

                var error = 0;

                if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))

                {

                    var bossInfoConfig = Config.Instance.Get<BossInfoConfig>(fairyGrabBossModel.cacheGotoBossId);

                    var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId);

                    var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;

                    if (bossInfoConfig != null)

                    {

                        if (freeFly || flyItemCount > 0)

                        {

                            MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId);

                        }

                        else

                        {

                            FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;

                            FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;

                            WindowCenter.Instance.Open<FlyShoseConfirmwin>();

                        }

                    }

                }

                else

                {

                    fairyGrabBossModel.DisplayErrorTip(error);

                }

            }

        }

        //private void FlyToFairyGrabBoss()

        //{

        //    if (fairyGrabBossModel.cacheGotoBossId != 0)

        //    {

        //        var error = 0;

        //        if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))

        //        {

        //            var bossInfoConfig = Config.Instance.Get<BossInfoConfig>(fairyGrabBossModel.cacheGotoBossId);

        //            var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId);

        //            var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;

        //            if (bossInfoConfig != null)

        //            {

        //                if (freeFly || flyItemCount > 0)

        //                {

        //                    MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId);

        //                }

        //                else

        //                {

        //                    FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;

        //                    FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;

        //                    WindowCenter.Instance.Open<FlyShoseConfirmwin>();

        //                }

        //            }

        //        }

        //        else

        //        {

        //            fairyGrabBossModel.DisplayErrorTip(error);

        //        }

        //    }

        //}



        private void FlyShoesUseCallback()

        {

			@@ -27,7 +27,8 @@

			protected override void OnPreOpen()
			{
			m_AchieveTargetBehaviour.Init(31160);
			m_AchieveTargetBehaviour.Init(31160);
			MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;
			}

			protected override void OnAfterOpen()
			@@ -35,14 +36,21 @@
			}

			protected override void OnPreClose()
			{
			}

			{
			MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;
			}

			protected override void OnAfterClose()
			{
			}
			}
			#endregion

			private void OnChangeFuncBtnPosEvent(bool open, float _speed)
			{
			if (open)
			{
			CloseImmediately();
			}
			}
			}

			}

			@@ -36,6 +36,7 @@
			protected override void OnPreOpen()
			{
			model.updateMissionEvent -= UpdateTargets;
			MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;
			UpdateTargets();
			DisplayAward();
			}
			@@ -47,6 +48,7 @@
			protected override void OnPreClose()
			{
			model.updateMissionEvent -= UpdateTargets;
			MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;
			}

			protected override void OnAfterClose()
			@@ -84,6 +86,14 @@
			}
			}
			}

			private void OnChangeFuncBtnPosEvent(bool open, float _speed)
			{
			if (open)
			{
			CloseImmediately();
			}
			}
			}

			}

			@@ -26,7 +26,8 @@
			[SerializeField] RichText ObjectiveText;//任务目标
			[SerializeField] Text RoundText;//任务环数
			[SerializeField] Transform _Grid;
			[SerializeField] Text _ReceiveImageText;
			[SerializeField] GameObject m_ReceiveImageObj;//领奖倒计时1
			[SerializeField] Text _ReceiveImageText;//领奖倒计时2
			[SerializeField] Transform m_GridLeft;//左侧奖励
			[SerializeField] Slider m_Slider;//进度条

			@@ -78,11 +79,12 @@
			int GetCylinderNumber = TaskAllocation.Instance.FairyAuNumber();//获取仙盟总环数
			if (coinTaskTip.IsFairy && GetCylinderNumber == 10 && vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1)
			{
			m_ReceiveImageObj.SetActive(true);
			_ReceiveImageText.text = string.Format(Language.Get("TaskContinueCount_1"), Second);
			}
			else
			{
			_ReceiveImageText.text = Language.Get("TaskBoxWin_BtnGetReward_Text_1");
			m_ReceiveImageObj.SetActive(false);
			}

			}
			@@ -152,7 +154,7 @@
			if (coinTaskTip.IsFairy)
			{
			coinTaskTip.IsFairy = false;
			_ReceiveImageText.text = Language.Get("TaskBoxWin_BtnGetReward_Text_1");
			m_ReceiveImageObj.SetActive(false);
			}
			}
			void FinishButton()//立即完成按钮
			@@ -274,15 +276,20 @@
			if (TaskAllocation.Instance.FairyAuNumber() >= 10)
			{
			Btn_Leave.gameObject.SetActive(false);
			RoundText.text = "10/10";
			int total = TaskAllocation.Instance.FairyAuAllNumber();
			total = Mathf.CeilToInt((float)total / 10);
			RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(total), 10);
			// RoundText.text = "10/10";
			Btn_Finish.gameObject.SetActive(false);
			}
			else
			{
			Btn_Leave.gameObject.SetActive(true);
			Btn_Finish.gameObject.SetActive(true);

			RoundText.text = (TaskAllocation.Instance.FairyAuNumber() + 1) + "/10";
			int total = TaskAllocation.Instance.FairyAuAllNumber();
			total = Mathf.CeilToInt((float)total / 10);
			RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(total), (TaskAllocation.Instance.FairyAuNumber() + 1));
			// RoundText.text = (TaskAllocation.Instance.FairyAuNumber() + 1) + "/10";
			}
			Text_FinishRound.text = TaskAllocation.Instance.FairyAuAllNumber() + "/70";

			@@ -304,7 +311,8 @@
			{
			Btn_Finish.gameObject.SetActive(false);
			Btn_Leave.gameObject.SetActive(true);
			RoundText.text = "0/10";
			RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(0),0);
			// RoundText.text = "0/10";
			Text_FinishRound.text = "0/70";
			m_Slider.value = 0f;
			string strINfor = taskmodel.SpecialTask[_taskID].InforList;
			@@ -323,7 +331,8 @@
			Btn_Receive.interactable = false;
			Btn_Finish.gameObject.SetActive(false);
			Btn_Leave.gameObject.SetActive(false);
			RoundText.text = "10/10";
			RoundText.text = Language.Get("FairyAuTaskWin_Text2", SetNumberOfRounds(7), 10);
			//RoundText.text = "10/10";
			Text_FinishRound.text = "70/70";
			m_Slider.value = 1f;
			ObjectiveText.text = Language.Get("CompleteTheXianmengMission_Z");
			@@ -442,6 +451,38 @@
			}

			}
			private string SetNumberOfRounds(int num)
			{
			string Str = String.Empty;
			switch (num)
			{
			case 0:
			Str = Language.Get("Num_CHS_1");
			return Str;
			case 1:
			Str = Language.Get("Num_CHS_1");
			return Str;
			case 2:
			Str = Language.Get("Num_CHS_2");
			return Str;
			case 3:
			Str = Language.Get("Num_CHS_3");
			return Str;
			case 4:
			Str = Language.Get("Num_CHS_4");
			return Str;
			case 5:
			Str = Language.Get("Num_CHS_5");
			return Str;
			case 6:
			Str = Language.Get("Num_CHS_6");
			return Str;
			case 7:
			Str = Language.Get("Num_CHS_7");
			return Str;
			}
			return Str;
			}
			}

			}

			@@ -29,7 +29,7 @@
			GlobalTimeEvent.Instance.secondEvent += DisplayTimer;
			Display();
			DisplayTimer();
			DisplayEffect();
			//DisplayEffect();
			}

			public void UnInit()
			@@ -52,7 +52,7 @@
			void Display()
			{
			m_CallMember.gameObject.SetActive(CheckCallMember());
			DisplayEffect();
			//DisplayEffect();
			}

			bool CheckCallMember()
			@@ -115,14 +115,14 @@
			if (seconds <= 0 && m_Timer.gameObject.activeSelf)
			{
			m_Timer.gameObject.SetActive(false);
			DisplayEffect();
			//DisplayEffect();
			}
			else if (seconds > 0)
			{
			if (!m_Timer.gameObject.activeSelf)
			{
			m_Timer.gameObject.SetActive(true);
			DisplayEffect();
			//DisplayEffect();
			}
			m_Timer.text = StringUtility.Contact(seconds, Language.Get("RealmWin_Bewrite_35"));
			}

			@@ -208,7 +208,7 @@
			SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver");
			}
			WindowJumpMgr.Instance.ClearJumpData();
			WindowCenter.Instance.Close<PetWin>();
			WindowCenter.Instance.Close<LootPreciousFrameWin>();
			MapTransferUtility.Instance.MoveToNPC(model.selectBoss);
			}
			else

			@@ -85,7 +85,7 @@
			[SerializeField] Button m_SendRedbagBtn;
			[SerializeField] Button WishingAwardImg;
			[SerializeField] Button m_GotoFairyGrabBoss;
			[SerializeField] Button m_FlyToFairyGrabBoss;
			//[SerializeField] Button m_FlyToFairyGrabBoss;

			[SerializeField] Transform m_EffectTask;//任务完成特效播放位置
			private int m_CollectNPCID;
			@@ -179,7 +179,7 @@
			m_SendRedbagBtn.AddListener(SendRedpacketBtn);
			WishingAwardImg.AddListener(ClickWishAward);
			m_GotoFairyGrabBoss.AddListener(GotoFairyGrabBoss);
			m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);
			//m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);
			}

			protected override void OnPreOpen()
			@@ -1142,36 +1142,36 @@
			}
			}

			private void FlyToFairyGrabBoss()
			{
			if (fairyGrabBossModel.cacheGotoBossId != 0)
			{
			var error = 0;
			if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
			{
			var bossInfoConfig = Config.Instance.Get<BossInfoConfig>(fairyGrabBossModel.cacheGotoBossId);
			var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId);
			var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;
			if (bossInfoConfig != null)
			{
			if (freeFly \|\| flyItemCount > 0)
			{
			MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId);
			}
			else
			{
			FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;
			FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;
			WindowCenter.Instance.Open<FlyShoseConfirmwin>();
			}
			}
			}
			else
			{
			fairyGrabBossModel.DisplayErrorTip(error);
			}
			}
			}
			//private void FlyToFairyGrabBoss()
			//{
			// if (fairyGrabBossModel.cacheGotoBossId != 0)
			// {
			// var error = 0;
			// if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
			// {
			// var bossInfoConfig = Config.Instance.Get<BossInfoConfig>(fairyGrabBossModel.cacheGotoBossId);
			// var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralDefine.flyBootItemId);
			// var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;
			// if (bossInfoConfig != null)
			// {
			// if (freeFly \|\| flyItemCount > 0)
			// {
			// MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId);
			// }
			// else
			// {
			// FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;
			// FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;
			// WindowCenter.Instance.Open<FlyShoseConfirmwin>();
			// }
			// }
			// }
			// else
			// {
			// fairyGrabBossModel.DisplayErrorTip(error);
			// }
			// }
			//}

			private void FlyShoesUseCallback()
			{