snxxz_scripts.git

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

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

client_Hale

2019-06-24 cf865cc9e1ebdf98bed317f8020c786618f23ba7

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

6个文件已修改

	System/Skill/TreasureSkillWin.cs	128 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/SystemSetting/SystemSetWin.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/SystemSetting/SystemSetting.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/ClientTreasureDungeonStage.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/NormalDialogueWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/TreasureFindHost/TreasureFindHostModel.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Skill/TreasureSkillWin.cs

@@ -26,9 +26,15 @@
        [SerializeField] FunctionUnlockFlyObjectTarget m_FlyTarget;

        [SerializeField] Image m_DragSkillIcon;



        [SerializeField] float m_DisappearTime = 1f;



        FunctionUnlockFlyObject flyObject;



        public static int autoSelectSkill = 0;



        int functionGuideId = 0;



        float functionGuideTime = 0f;



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



@@ -64,6 +70,8 @@


            model.selectActivePriority = false;



            functionGuideId = 0;



            m_DragSkillIcon.gameObject.SetActive(false);



            if (flyObject != null)

@@ -98,6 +106,14 @@


        protected override void OnAfterOpen()

        {

            TreasureSkill treasureSkill;

            if (model.TryGetSkill(model.selectSkill, out treasureSkill))

            {

                if (treasureSkill.expertSelectRedpoint.state == RedPointState.Simple)

                {

                    PlaySelectGuide(true);

                }

            }

        }



        protected override void OnPreClose()

@@ -302,6 +318,15 @@
            DisplayExpertSkill();



            TryStartGuide();



            TreasureSkill treasureSkill;

            if (model.TryGetSkill(model.selectSkill, out treasureSkill))

            {

                if (treasureSkill.expertSelectRedpoint.state == RedPointState.Simple)

                {

                    PlaySelectGuide(true);

                }

            }

        }



        private void SkillLevelUpRefresh(int id)

@@ -430,49 +455,67 @@
                var expertSkill = 0;

                if (model.ExistAnyActiveExpert(model.selectSkill, out expertSkill))

                {

                    if (NewBieCenter.Instance.inGuiding)

                    {

                        return;

                    }



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

                    TreasureSkill treasureSkill;

                    if (model.TryGetSkill(model.selectSkill, out treasureSkill))

                    {

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

                        {

                            var level = 0;

                            if (model.TryGetExpertActiveLevel(treasureSkill.potentials[i].id, out level)

                                && level > 0)

                            {

                                indexs.Add(i);

                            }

                        }

                    }



                    if (indexs.Count == 0)

                    {

                        return;

                    }



                    var index = indexs[UnityEngine.Random.Range(0, indexs.Count)];

                    switch (index)

                    {

                        case 0:

                            NewBieCenter.Instance.StartNewBieGuide(65);

                            break;

                        case 1:

                            NewBieCenter.Instance.StartNewBieGuide(63);

                            break;

                        case 2:

                            NewBieCenter.Instance.StartNewBieGuide(64);

                            break;

                    }

                    PlaySelectGuide();

                }

                else

                {

                    SysNotifyMgr.Instance.ShowTip("NoneOfAnyActiveExpert");

                }

            }

        }



        private void PlaySelectGuide(bool disappear = false)

        {

            if (NewBieCenter.Instance.inGuiding)

            {

                return;

            }



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

            TreasureSkill treasureSkill;

            if (model.TryGetSkill(model.selectSkill, out treasureSkill))

            {

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

                {

                    var level = 0;

                    if (model.TryGetExpertActiveLevel(treasureSkill.potentials[i].id, out level)

                        && level > 0)

                    {

                        indexs.Add(i);

                    }

                }

            }



            if (indexs.Count == 0)

            {

                return;

            }



            var index = indexs[UnityEngine.Random.Range(0, indexs.Count)];

            functionGuideTime = Time.time;

            switch (index)

            {

                case 0:

                    if (disappear)

                    {

                        functionGuideId = 65;

                    }

                    NewBieCenter.Instance.StartNewBieGuide(65);

                    break;

                case 1:

                    if (disappear)

                    {

                        functionGuideId = 63;

                    }

                    NewBieCenter.Instance.StartNewBieGuide(63);

                    break;

                case 2:

                    if (disappear)

                    {

                        functionGuideId = 64;

                    }

                    NewBieCenter.Instance.StartNewBieGuide(64);

                    break;

            }

        }



@@ -504,6 +547,15 @@
                    m_DragSkillIcon.gameObject.SetActive(false);

                }

            }



            if (functionGuideId != 0)

            {

                if (Time.time - functionGuideTime >= m_DisappearTime)

                {

                    NewBieCenter.Instance.FinishNewBieGuide(functionGuideId);

                    functionGuideId = 0;

                }

            }

        }



        [Serializable]


 System/SystemSetting/SystemSetWin.cs

@@ -277,7 +277,8 @@
                    GameNetSystem.Instance.LoginOut();

                    break;

                case VersionAuthority.Release:

                    SDKUtility.Instance.FreePlatformLoginout();

                    GameNetSystem.Instance.LoginOut();

                    loginModel.sdkLogined = false;

                    break;

            }

        }


 System/SystemSetting/SystemSetting.cs

@@ -52,7 +52,7 @@


    public float GetSoundEffect()

    {

        return LocalSave.GetFloat(SOUND_EFFECT_KEY, .55f);

        return LocalSave.GetFloat(SOUND_EFFECT_KEY, .8f);

    }



    public void SetGameFps(GameFps _frame)


 System/Treasure/ClientTreasureDungeonStage.cs

@@ -14,6 +14,7 @@
    int dialogueNpcId = 0;
    int[] speakTypes = null;
    string[] dialogues = null;

    int[] musics = null;

    int autoDialogueSecond = 10;



    static GA_NpcClientFunc m_Npc;
@@ -37,6 +38,7 @@
            dialogueNpcId = int.Parse(funcConfig.Numerical1);

            speakTypes = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2);

            dialogues = ConfigParse.GetMultipleStr(funcConfig.Numerical3);

            musics = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical4);



            funcConfig = FuncConfigConfig.Get("TaskContinue");

            autoDialogueSecond = int.Parse(funcConfig.Numerical2);

@@ -107,6 +109,7 @@
            speakTypes = speakTypes,

            npcId = dialogueNpcId,

            autoSeconds = autoDialogueSecond,

            musics = musics,

        };

        WindowCenter.Instance.Open<NormalDialogueWin>();

    }


 System/Treasure/NormalDialogueWin.cs

@@ -132,6 +132,11 @@
            m_ContainerNpc.gameObject.SetActive(speakType == 0);

            m_ContainerPlayer.gameObject.SetActive(speakType == 1);



            if (customDialogueInfo.musics != null && dialogueIndex < customDialogueInfo.musics.Length)

            {

                SoundPlayer.Instance.PlayNpcAudio(customDialogueInfo.musics[dialogueIndex]);

            }





            var displayReward = dialogueIndex == customDialogueInfo.dialogues.Length - 1 && customDialogueInfo.items != null;

            m_ContainerReward.gameObject.SetActive(displayReward);

@@ -222,6 +227,7 @@
        public int npcId;

        public int[] speakTypes;

        public string[] dialogues;

        public int[] musics;

        public int autoSeconds;

        public List<Item> items;

    }


 System/TreasureFindHost/TreasureFindHostModel.cs

@@ -111,26 +111,23 @@
        {

            foreach (var findHostEquip in treasureInfo.findHostEquips)

            {

                var equipGuid = equipModel.GetEquip(new Int2(findHostEquip.level, findHostEquip.place));

                if (!string.IsNullOrEmpty(equipGuid))

                var equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(findHostEquip.level, findHostEquip.place));

                var itemModel = packModel.GetItemByIndex(PackType.Equip, equipIndex);

                if (itemModel != null)

                {

                    var itemModel = packModel.GetItemByGuid(equipGuid);

                    if (itemModel != null)

                    if (itemModel.config.ItemColor >= findHostEquip.itemColor)

                    {

                        if (itemModel.config.ItemColor >= findHostEquip.itemColor)

                        if (findHostEquip.isSuit)

                        {

                            if (findHostEquip.isSuit)

                            {

                                if (ItemLogicUtility.Instance.IsSuitEquip(itemModel.itemId))

                                {

                                    return true;

                                }

                            }

                            else

                            if (ItemLogicUtility.Instance.IsSuitEquip(itemModel.itemId))

                            {

                                return true;

                            }

                        }

                        else

                        {

                            return true;

                        }

                    }

                }

            }

			@@ -26,9 +26,15 @@
			[SerializeField] FunctionUnlockFlyObjectTarget m_FlyTarget;
			[SerializeField] Image m_DragSkillIcon;

			[SerializeField] float m_DisappearTime = 1f;

			FunctionUnlockFlyObject flyObject;

			public static int autoSelectSkill = 0;

			int functionGuideId = 0;

			float functionGuideTime = 0f;

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

			@@ -64,6 +70,8 @@

			model.selectActivePriority = false;

			functionGuideId = 0;

			m_DragSkillIcon.gameObject.SetActive(false);

			if (flyObject != null)
			@@ -98,6 +106,14 @@

			protected override void OnAfterOpen()
			{
			TreasureSkill treasureSkill;
			if (model.TryGetSkill(model.selectSkill, out treasureSkill))
			{
			if (treasureSkill.expertSelectRedpoint.state == RedPointState.Simple)
			{
			PlaySelectGuide(true);
			}
			}
			}

			protected override void OnPreClose()
			@@ -302,6 +318,15 @@
			DisplayExpertSkill();

			TryStartGuide();

			TreasureSkill treasureSkill;
			if (model.TryGetSkill(model.selectSkill, out treasureSkill))
			{
			if (treasureSkill.expertSelectRedpoint.state == RedPointState.Simple)
			{
			PlaySelectGuide(true);
			}
			}
			}

			private void SkillLevelUpRefresh(int id)
			@@ -430,49 +455,67 @@
			var expertSkill = 0;
			if (model.ExistAnyActiveExpert(model.selectSkill, out expertSkill))
			{
			if (NewBieCenter.Instance.inGuiding)
			{
			return;
			}

			List<int> indexs = new List<int>();
			TreasureSkill treasureSkill;
			if (model.TryGetSkill(model.selectSkill, out treasureSkill))
			{
			for (int i = 0; i < treasureSkill.potentials.Count; i++)
			{
			var level = 0;
			if (model.TryGetExpertActiveLevel(treasureSkill.potentials[i].id, out level)
			&& level > 0)
			{
			indexs.Add(i);
			}
			}
			}

			if (indexs.Count == 0)
			{
			return;
			}

			var index = indexs[UnityEngine.Random.Range(0, indexs.Count)];
			switch (index)
			{
			case 0:
			NewBieCenter.Instance.StartNewBieGuide(65);
			break;
			case 1:
			NewBieCenter.Instance.StartNewBieGuide(63);
			break;
			case 2:
			NewBieCenter.Instance.StartNewBieGuide(64);
			break;
			}
			PlaySelectGuide();
			}
			else
			{
			SysNotifyMgr.Instance.ShowTip("NoneOfAnyActiveExpert");
			}
			}
			}

			private void PlaySelectGuide(bool disappear = false)
			{
			if (NewBieCenter.Instance.inGuiding)
			{
			return;
			}

			List<int> indexs = new List<int>();
			TreasureSkill treasureSkill;
			if (model.TryGetSkill(model.selectSkill, out treasureSkill))
			{
			for (int i = 0; i < treasureSkill.potentials.Count; i++)
			{
			var level = 0;
			if (model.TryGetExpertActiveLevel(treasureSkill.potentials[i].id, out level)
			&& level > 0)
			{
			indexs.Add(i);
			}
			}
			}

			if (indexs.Count == 0)
			{
			return;
			}

			var index = indexs[UnityEngine.Random.Range(0, indexs.Count)];
			functionGuideTime = Time.time;
			switch (index)
			{
			case 0:
			if (disappear)
			{
			functionGuideId = 65;
			}
			NewBieCenter.Instance.StartNewBieGuide(65);
			break;
			case 1:
			if (disappear)
			{
			functionGuideId = 63;
			}
			NewBieCenter.Instance.StartNewBieGuide(63);
			break;
			case 2:
			if (disappear)
			{
			functionGuideId = 64;
			}
			NewBieCenter.Instance.StartNewBieGuide(64);
			break;
			}
			}

			@@ -504,6 +547,15 @@
			m_DragSkillIcon.gameObject.SetActive(false);
			}
			}

			if (functionGuideId != 0)
			{
			if (Time.time - functionGuideTime >= m_DisappearTime)
			{
			NewBieCenter.Instance.FinishNewBieGuide(functionGuideId);
			functionGuideId = 0;
			}
			}
			}

			[Serializable]

			@@ -277,7 +277,8 @@
			GameNetSystem.Instance.LoginOut();
			break;
			case VersionAuthority.Release:
			SDKUtility.Instance.FreePlatformLoginout();
			GameNetSystem.Instance.LoginOut();
			loginModel.sdkLogined = false;
			break;
			}
			}

			@@ -52,7 +52,7 @@

			public float GetSoundEffect()
			{
			return LocalSave.GetFloat(SOUND_EFFECT_KEY, .55f);
			return LocalSave.GetFloat(SOUND_EFFECT_KEY, .8f);
			}

			public void SetGameFps(GameFps _frame)

			@@ -14,6 +14,7 @@
			int dialogueNpcId = 0;
			int[] speakTypes = null;
			string[] dialogues = null;
			int[] musics = null;
			int autoDialogueSecond = 10;

			static GA_NpcClientFunc m_Npc;
			@@ -37,6 +38,7 @@
			dialogueNpcId = int.Parse(funcConfig.Numerical1);
			speakTypes = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2);
			dialogues = ConfigParse.GetMultipleStr(funcConfig.Numerical3);
			musics = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical4);

			funcConfig = FuncConfigConfig.Get("TaskContinue");
			autoDialogueSecond = int.Parse(funcConfig.Numerical2);
			@@ -107,6 +109,7 @@
			speakTypes = speakTypes,
			npcId = dialogueNpcId,
			autoSeconds = autoDialogueSecond,
			musics = musics,
			};
			WindowCenter.Instance.Open<NormalDialogueWin>();
			}

			@@ -132,6 +132,11 @@
			m_ContainerNpc.gameObject.SetActive(speakType == 0);
			m_ContainerPlayer.gameObject.SetActive(speakType == 1);

			if (customDialogueInfo.musics != null && dialogueIndex < customDialogueInfo.musics.Length)
			{
			SoundPlayer.Instance.PlayNpcAudio(customDialogueInfo.musics[dialogueIndex]);
			}


			var displayReward = dialogueIndex == customDialogueInfo.dialogues.Length - 1 && customDialogueInfo.items != null;
			m_ContainerReward.gameObject.SetActive(displayReward);
			@@ -222,6 +227,7 @@
			public int npcId;
			public int[] speakTypes;
			public string[] dialogues;
			public int[] musics;
			public int autoSeconds;
			public List<Item> items;
			}

			@@ -111,26 +111,23 @@
			{
			foreach (var findHostEquip in treasureInfo.findHostEquips)
			{
			var equipGuid = equipModel.GetEquip(new Int2(findHostEquip.level, findHostEquip.place));
			if (!string.IsNullOrEmpty(equipGuid))
			var equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(findHostEquip.level, findHostEquip.place));
			var itemModel = packModel.GetItemByIndex(PackType.Equip, equipIndex);
			if (itemModel != null)
			{
			var itemModel = packModel.GetItemByGuid(equipGuid);
			if (itemModel != null)
			if (itemModel.config.ItemColor >= findHostEquip.itemColor)
			{
			if (itemModel.config.ItemColor >= findHostEquip.itemColor)
			if (findHostEquip.isSuit)
			{
			if (findHostEquip.isSuit)
			{
			if (ItemLogicUtility.Instance.IsSuitEquip(itemModel.itemId))
			{
			return true;
			}
			}
			else
			if (ItemLogicUtility.Instance.IsSuitEquip(itemModel.itemId))
			{
			return true;
			}
			}
			else
			{
			return true;
			}
			}
			}
			}