| Fight/PreFightMission.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainInterfaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainWin/SkillContainer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainWin/SkillTurnplate.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Skill/SkillAccordWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/PreFightMission.cs
@@ -202,10 +202,10 @@ _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress"); _temp.localScale = Vector3.zero; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a"); _temp.localScale = Vector3.zero; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp"); _temp.localScale = Vector3.zero; //_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a"); //_temp.localScale = Vector3.zero; //_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp"); //_temp.localScale = Vector3.zero; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/ChatTip"); _temp.localScale = Vector3.zero; @@ -235,7 +235,6 @@ skillContainer.skill4.transform.localScale = Vector3.zero; skillContainer.blinkSkill.transform.localScale = Vector3.zero; skillContainer.switchButton.gameObject.SetActive(false); skillContainer.skillTurnplate.drag = false; m_Is_Step_2_KillRockFinished = false; skillContainer.transform.localScale = Vector3.zero; @@ -1464,10 +1463,10 @@ _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress"); _temp.localScale = Vector3.one; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a"); _temp.localScale = Vector3.one; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp"); _temp.localScale = Vector3.one; //_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a"); //_temp.localScale = Vector3.one; //_temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp"); //_temp.localScale = Vector3.one; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/ChatTip"); _temp.localScale = Vector3.one; _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/LowSettingTip"); @@ -1497,7 +1496,6 @@ skillContainer.skill4.transform.localScale = Vector3.one; skillContainer.blinkSkill.transform.localScale = Vector3.one; skillContainer.switchButton.gameObject.SetActive(true); skillContainer.skillTurnplate.drag = true; skillContainer.transform.localScale = Vector3.one; WindowCenter.Instance.Close<NewGuideWin>(); @@ -1630,10 +1628,10 @@ _temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("InGameDownLoadProgress"); _temp.localScale = Vector3.one; _temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a"); _temp.localScale = Vector3.one; _temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp"); _temp.localScale = Vector3.one; //_temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("SkillButtonTip/Pivot/CastSkillTip/SwitchPan_a"); //_temp.localScale = Vector3.one; //_temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("SkillButtonTip/Pivot/CastSkillTip/Btn_SkillXp"); //_temp.localScale = Vector3.one; _temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("ChatTip"); _temp.localScale = Vector3.one; _temp = WindowCenter.Instance.Get<MainInterfaceWin>().transform.Find("LowSettingTip"); @@ -1663,7 +1661,6 @@ skillContainer.skill4.transform.localScale = Vector3.one; skillContainer.blinkSkill.transform.localScale = Vector3.one; skillContainer.switchButton.gameObject.SetActive(true); skillContainer.skillTurnplate.drag = true; skillContainer.transform.localScale = Vector3.one; WindowCenter.Instance.Close<NewGuideWin>(); System/MainInterfacePanel/MainInterfaceWin.cs
@@ -471,8 +471,8 @@ } else { var _effect = AchievementGuideEffectPool.Require(3); _effect.transform.SetParentEx(m_SkillContainer.skillXP.transform, Vector3.zero, Vector3.zero, Vector3.one); //var _effect = AchievementGuideEffectPool.Require(3); //_effect.transform.SetParentEx(m_SkillContainer.skillXP.transform, Vector3.zero, Vector3.zero, Vector3.one); } AchievementGoto.achievementType = 0; } System/MainWin/SkillContainer.cs
@@ -44,8 +44,8 @@ [SerializeField] SkillButton m_Skill7; public SkillButton skill7 { get { return m_Skill7; } } [SerializeField] SkillButton m_SkillXP; public SkillButton skillXP { get { return m_SkillXP; } } [SerializeField] SkillButton m_Skill8; public SkillButton skill8 { get { return m_Skill8; } } const int SKILL_COUNT_MAX = 8; Dictionary<int, int> indexSkillDataDict = new Dictionary<int, int>(); @@ -64,7 +64,7 @@ m_Skill5.AddDownListener(CastSkill5); m_Skill6.AddDownListener(CastSkill6); m_Skill7.AddDownListener(CastSkill7); m_SkillXP.AddDownListener(CastSkillXp); m_Skill8.AddDownListener(CastSkill8); m_BlinkSkill.AddUpListener(PrepareCastBlinkSkill); m_Skill1.AddUpListener(PrepareCastSkill1); @@ -74,11 +74,11 @@ m_Skill5.AddUpListener(PrepareCastSkill5); m_Skill6.AddUpListener(PrepareCastSkill6); m_Skill7.AddUpListener(PrepareCastSkill7); m_SkillXP.AddUpListener(PrepareCastSkillXp); m_Skill8.AddUpListener(PrepareCastSkill8); MainWinSkillController.Instance.InitSkill(); OnSkillRefresh(); HandleAchievement(); //HandleAchievement(); PlayerSkillDatas.OnRefreshSkill += OnSkillRefresh; } @@ -95,7 +95,7 @@ m_Skill5.RemoveAllListeners(); m_Skill6.RemoveAllListeners(); m_Skill7.RemoveAllListeners(); skillXP.RemoveAllListeners(); m_Skill8.RemoveAllListeners(); m_BlinkSkill.Dispose(); m_Skill1.Dispose(); @@ -105,13 +105,13 @@ m_Skill5.Dispose(); m_Skill6.Dispose(); m_Skill7.Dispose(); skillXP.Dispose(); m_Skill8.Dispose(); PlayerSkillDatas.OnRefreshSkill -= OnSkillRefresh; if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill) { AchievementGoto.achievementType = 0; } //if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill) //{ // AchievementGoto.achievementType = 0; //} } private void OnSkillRefresh() @@ -129,14 +129,11 @@ m_Skill5.Initialize(indexSkillDataDict[4]); m_Skill6.Initialize(indexSkillDataDict[5]); m_Skill7.Initialize(indexSkillDataDict[6]); m_Skill8.Initialize(indexSkillDataDict[7]); var blinkSkillData = PlayerDatas.Instance.skill.GetSKillById(190); m_BlinkSkill.Initialize(blinkSkillData == null ? 0 : blinkSkillData.id); var model = ModelCenter.Instance.GetModel<SkillModel>(); var skillXpId = model.GetXpSkillID(); var skillXpData = PlayerDatas.Instance.skill.GetSKillById(skillXpId); m_SkillXP.Initialize(skillXpData != null ? skillXpId : 0); } void SwitchTarget() @@ -241,19 +238,19 @@ } DoCastSkill(indexSkillDataDict[6]); } } void CastSkill8() { if (indexSkillDataDict[7] == 0) { DebugEx.Log("技能未解锁"); return; } void CastSkillXp() { var model = ModelCenter.Instance.GetModel<SkillModel>(); var skillXpId = model.GetXpSkillID(); if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null) { DebugEx.Log("技能未解锁"); return; } DoCastSkill(skillXpId); } DoCastSkill(indexSkillDataDict[7]); } void PrepareCastSkill1() { @@ -333,16 +330,15 @@ DoPrepareCast(indexSkillDataDict[6]); } void PrepareCastSkillXp() void PrepareCastSkill8() { var model = ModelCenter.Instance.GetModel<SkillModel>(); var skillXpId = model.GetXpSkillID(); if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null) { DebugEx.Log("技能未解锁"); return; } DoPrepareCast(skillXpId); if (indexSkillDataDict[7] == 0) { DebugEx.Log("技能未解锁"); return; } DoPrepareCast(indexSkillDataDict[7]); } void PrepareCastBlinkSkill() System/MainWin/SkillTurnplate.cs
@@ -9,28 +9,23 @@ { public class SkillTurnplate : SkillButtonInterface { [SerializeField] RectTransform m_SkillContainer; [SerializeField] Image m_SkillGroupSign; [SerializeField] float m_Sensitiveness; [SerializeField] float m_TimeLimit; [SerializeField, Header("是否可拖拽滑动")] bool m_Drag = true; public bool drag { get { return m_Drag; } set { m_Drag = value; } } [SerializeField] Button m_SkillGroupSign; [SerializeField] GameObject m_UpImg; [SerializeField] GameObject m_DownImg; [SerializeField] GameObject m_SkillGroup2; Vector2 startPoint = Vector2.zero; Vector2 endPoint = Vector2.zero; //Vector2 startPoint = Vector2.zero; //Vector2 endPoint = Vector2.zero; float startTime = 0f; float endTime = 0f; //float startTime = 0f; //float endTime = 0f; float m_TargetRotationZ = 0f; float refRotationZ = 0f; //float m_TargetRotationZ = 0f; //float refRotationZ = 0f; int groupIndex = 1; public int GroupIndex { get { return groupIndex; } } bool turnplating = false; //bool turnplating = false; TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } @@ -46,41 +41,46 @@ public void Init() { if (m_SkillGroupSign != null) { m_SkillGroupSign.gameObject.SetActive(IsSecondPanelAllow()); } m_SkillGroupSign.AddListener(ShowSkillGroup); m_SkillGroupSign.gameObject.SetActive(IsSecondPanelAllow()); SwitchGroup(groupIndex); } public void ShowSkillGroup() { SwitchGroup(groupIndex == 1 ? 2 : 1); } public override void OnPointerDown(PointerEventData eventData) { base.OnPointerDown(eventData); startTime = Time.time; startPoint = eventData.position; //startTime = Time.time; //startPoint = eventData.position; } public override void OnPointerUp(PointerEventData eventData) { base.OnPointerUp(eventData); endTime = Time.time; endPoint = eventData.position; //endTime = Time.time; //endPoint = eventData.position; if (IsValidGesture() && !turnplating && m_Drag) { if (IsSecondPanelAllow()) { var gesture = MathUtility.GetGestureDirection(startPoint, endPoint); Turn(gesture); } else { var config = TreasureConfig.Get(GeneralDefine.skillPanelUnLock); SysNotifyMgr.Instance.ShowTip("SkillPanel_Unlock", config.Name); } } //if (IsValidGesture() && !turnplating && m_Drag) //{ // if (IsSecondPanelAllow()) // { // var gesture = MathUtility.GetGestureDirection(startPoint, endPoint); // Turn(gesture); // } // else // { // var config = TreasureConfig.Get(GeneralDefine.skillPanelUnLock); // SysNotifyMgr.Instance.ShowTip("SkillPanel_Unlock", config.Name); // } //} } public void SwitchGroup(int _groupIndex) @@ -92,48 +92,53 @@ StopAllCoroutines(); groupIndex = _groupIndex; m_SkillContainer.transform.localEulerAngles = groupIndex == 1 ? Vector3.zero : new Vector3(0, 0, 180); if (m_SkillGroupSign != null) //m_SkillContainer.transform.localEulerAngles = groupIndex == 1 ? Vector3.zero : new Vector3(0, 0, 180); m_UpImg.SetActive(groupIndex == 1); m_DownImg.SetActive(groupIndex == 2); if (IsSecondPanelAllow()) { m_SkillGroupSign.SetSprite(groupIndex == 1 ? "Skill_Page_1" : "Skill_Page_2"); m_SkillGroup2.SetActive(groupIndex == 2); } } public bool Turn(GestureType _type = GestureType.Down) { if (turnplating) { return false; } if (groupIndex == 1) { groupIndex = 2; } else { groupIndex = 1; } if (m_SkillGroupSign != null) { m_SkillGroupSign.SetSprite(groupIndex == 1 ? "Skill_Page_1" : "Skill_Page_2"); } switch (_type) { case GestureType.Down: case GestureType.Left: m_TargetRotationZ = m_SkillContainer.localEulerAngles.z + 180f; StartCoroutine(Co_Turnplate(m_SkillContainer.localEulerAngles.z, m_TargetRotationZ)); break; case GestureType.Up: case GestureType.Right: m_TargetRotationZ = m_SkillContainer.localEulerAngles.z - 180f; StartCoroutine(Co_Turnplate(m_SkillContainer.localEulerAngles.z, m_TargetRotationZ)); break; } return true; //if (turnplating) //{ // return false; //} //if (groupIndex == 1) //{ // groupIndex = 2; //} //else //{ // groupIndex = 1; //} //if (m_SkillGroupSign != null) //{ // m_SkillGroupSign.SetSprite(groupIndex == 1 ? "Skill_Page_1" : "Skill_Page_2"); //} //switch (_type) //{ // case GestureType.Down: // case GestureType.Left: // m_TargetRotationZ = m_SkillContainer.localEulerAngles.z + 180f; // StartCoroutine(Co_Turnplate(m_SkillContainer.localEulerAngles.z, m_TargetRotationZ)); // break; // case GestureType.Up: // case GestureType.Right: // m_TargetRotationZ = m_SkillContainer.localEulerAngles.z - 180f; // StartCoroutine(Co_Turnplate(m_SkillContainer.localEulerAngles.z, m_TargetRotationZ)); // break; //} //return true; } bool IsSecondPanelAllow() @@ -142,33 +147,33 @@ return treasureModel.TryGetTreasure(GeneralDefine.skillPanelUnLock, out treasure) && treasure.state == TreasureState.Collected; } bool IsValidGesture() { if ((endTime - startTime) < m_TimeLimit && Vector2.Distance(startPoint, endPoint) > m_Sensitiveness) { return true; } //bool IsValidGesture() //{ // if ((endTime - startTime) < m_TimeLimit && Vector2.Distance(startPoint, endPoint) > m_Sensitiveness) // { // return true; // } return false; } // return false; //} IEnumerator Co_Turnplate(float _startZ, float _endZ) { turnplating = true; //IEnumerator Co_Turnplate(float _startZ, float _endZ) //{ // turnplating = true; float timer = 0f; float duration = 0.5f; while (timer < duration) { timer += Time.deltaTime; m_SkillContainer.localEulerAngles = new Vector3(0, 0, Mathf.Lerp(_startZ, _endZ, Mathf.Clamp01(timer / duration))); yield return null; } // float timer = 0f; // float duration = 0.5f; // while (timer < duration) // { // timer += Time.deltaTime; // m_SkillContainer.localEulerAngles = new Vector3(0, 0, Mathf.Lerp(_startZ, _endZ, Mathf.Clamp01(timer / duration))); // yield return null; // } m_SkillContainer.localEulerAngles = new Vector3(0, 0, _endZ); // m_SkillContainer.localEulerAngles = new Vector3(0, 0, _endZ); turnplating = false; } // turnplating = false; //} private void OnSwitchAccount() { System/Skill/SkillAccordWin.cs
@@ -70,22 +70,22 @@ m_LeftBtn.onClick.AddListener(flipActScroll.FlipLeft); m_RightBtn.onClick.AddListener(flipActScroll.FlipRight); m_AutoUseXp.onClick.AddListener(OnAutoUseXp); m_PageOneBtn.onClick.AddListener(() => { if (m_SkillTurnplate.GroupIndex != 1) { m_SkillTurnplate.Turn(GestureType.Left); UpdateSkillPage(); } }); m_PageTwoBtn.onClick.AddListener(() => { if (m_SkillTurnplate.GroupIndex != 2) { m_SkillTurnplate.Turn(GestureType.Right); UpdateSkillPage(); } }); //m_PageOneBtn.onClick.AddListener(() => //{ // if (m_SkillTurnplate.GroupIndex != 1) // { // m_SkillTurnplate.Turn(GestureType.Left); // UpdateSkillPage(); // } //}); //m_PageTwoBtn.onClick.AddListener(() => //{ // if (m_SkillTurnplate.GroupIndex != 2) // { // m_SkillTurnplate.Turn(GestureType.Right); // UpdateSkillPage(); // } //}); m_SkillMatch.AddListener(() => { WindowCenter.Instance.Open("SkillMatchWin");
