| System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/LowSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainInterfaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainPositionTween.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainWin/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Role/RoleModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/MainInterfacePanel/HighSettingTip.cs
@@ -2,19 +2,15 @@ // [Author]: 第二世界 // [ Date ]: Friday, September 08, 2017 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine; using UnityEngine.UI; using System; using System.Collections.Generic; //顶层面板框按钮 namespace Snxxz.UI { public class HighSettingTip : MonoBehaviour { [SerializeField] Button _DaTreasureBtn;//打宝按钮 [SerializeField] Button m_LootPrecious;//夺宝 [SerializeField] Button _MarketBtn;//市场按钮 @@ -100,13 +96,13 @@ void MarketButton()//市场按钮 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<AuctionHouseWin>(); } void OpenService()//开服活动 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<OpenServerActivityWin>(); } @@ -114,7 +110,7 @@ { if (FuncOpen.Instance.IsFuncOpen(79)) { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<StoreWin>(); } else @@ -125,12 +121,14 @@ void WelfareButton()//福利按钮 { HighSettingFadeInFadeOut.SetAutoCloseTimer(); WelfareCenter.Instance.OpenWelfare(); } void DaTreasureButton()//打宝按钮 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 111) { @@ -144,7 +142,7 @@ void LootPreciousButton()//夺宝 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1); } @@ -156,17 +154,16 @@ return; } HighSettingFadeInFadeOut.SetAutoCloseTimer(); switch (m_RechargetBtnBehaviour.state) { case 1: if (!NewBieCenter.Instance.inGuiding) { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<FirstRechargeWin>(true); } break; case 3: WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<VipRechargeWin>(false, 0); break; } @@ -174,69 +171,62 @@ void RuneTaButton()//符印塔 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<TowerWin>(false, 0); } void OnClickHappyXBBtn()//寻宝 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<HappyXBWin>(); } void OnClickFindHostBtn()//仙宝寻主 { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<TreasureFindHostWin>(); } void OnClickElfFestivalBtn() { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<FairylandCeremonyWin>(); } void OnClickCrossServerBtn()//跨服PK { int limitlv = FuncOpenLVConfig.Get(157).LimitLV; HighSettingFadeInFadeOut.SetAutoCloseTimer(); if (FuncOpen.Instance.IsFuncOpen(157) && TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross) { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<CrossServerWin>(); } else { WindowCenter.Instance.Open<CrossServerWin>(); //if (PlayerDatas.Instance.baseData.LV < limitlv) //{ // SysNotifyMgr.Instance.ShowTip("CrossMatching14", limitlv); //} //else //{ // SysNotifyMgr.Instance.ShowTip("CrossMatching15", crossServerModel.afterOpenDayOpenCross); //} } } private void OpenHazyRegion() { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<HazyRegionFrameWin>(); } void OnClickOpenServiceBtn() { HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<AchievementActivityWin>(); } void OnClickNewYearBtn() { WindowCenter.Instance.Close<MainInterfaceWin>(); HighSettingFadeInFadeOut.SetAutoCloseTimer(); WindowCenter.Instance.Open<NewYearFairylandCeremonyWin>(); } private void RefreshOSCEffect() { HighSettingFadeInFadeOut.SetAutoCloseTimer(); var _open = ModelCenter.Instance.GetModel<ImpactRankModel>().OSCEffectOpen; if (_open && !m_OSCEffect.IsPlaying) { @@ -250,6 +240,7 @@ private void OnStoreFuncOpen() { HighSettingFadeInFadeOut.SetAutoCloseTimer(); RefreshStoreEffect(); }
@@ -40,7 +40,6 @@ _Synthesis1Btn.onClick.AddListener(Synthesis1Button); _Rune1Btn.onClick.AddListener(Rune1Button); _Pet1Btn.onClick.AddListener(Pet1Button); //_RealmBtn.onClick.AddListener(OnRealmButton); _SetUp1Btn.onClick.AddListener(SetUp1Btn); _RankingListBtn.onClick.AddListener(RankingListButton); m_BagualuBtn.AddListener(OnClickBagualuBtn); @@ -67,19 +66,19 @@ void Role1Button() { MainPositionTween.SetRecoverToSkillTimer(); ModelCenter.Instance.GetModel<RoleModel>().OpenRolePanel(); } void OnClickBagualuBtn() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<AlchemyBaseWin>(); } void SkillButton() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); var skillModel = ModelCenter.Instance.GetModel<SkillModel>(); var treasureSkillModel = ModelCenter.Instance.GetModel<TreasureSkillModel>(); @@ -106,13 +105,14 @@ void OpenTreasure() { MainPositionTween.SetRecoverToSkillTimer(); if (!treasureModel.SatisfyEntranceOpen()) { treasureModel.DisplayEntranceLimitHint(); return; } WindowCenter.Instance.Close<MainInterfaceWin>(); if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Human) != 0) { treasureModel.currentCategory = TreasureCategory.Human; @@ -137,57 +137,56 @@ private void GodBeastBtn() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<DogzWin>(); } void Strengthen1Button() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<EquipFrameWin>(false, EquipFrameWin.GetRedpointFunction()); } void OpenEquip() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<RealmEquipWin>(); } void Asuram1Button() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); ModelCenter.Instance.GetModel<FairyModel>().GotoFairyWin(); } void Synthesis1Button() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<ComposeWin>(); } void Rune1Button() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<RunePanel>(); } void Pet1Button() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<PetWin>(); } void SetUp1Btn() { WindowCenter.Instance.Close<MainInterfaceWin>(); MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<SettingUpWin>(); //DesignDebug.Log("设置按钮"); } void RankingListButton()//排行榜 { MainPositionTween.SetRecoverToSkillTimer(); WindowCenter.Instance.Open<RankFrameWin>(); WindowCenter.Instance.Close<MainInterfaceWin>(); }
@@ -339,7 +339,8 @@ m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = !MainPositionTween.isDefaultState, immediately = false immediately = false, manual = true, } ); } System/MainInterfacePanel/MainPositionTween.cs
@@ -122,9 +122,18 @@ public static bool isDefaultState { get; private set; } public static event Action<bool> switchFunctionStateEvent; float resetToDefaultTimer = 0; static float resetToDefaultTimer = 0; public static void SetRecoverToSkillTimer() { resetToDefaultTimer = 20f; } public void SwitchFunctions(SwitchParam switchParams) { if (switchParams.manual && switchParams.showDefault) { resetToDefaultTimer = 0f; } ProcessSwitch(switchParams); } @@ -182,7 +191,11 @@ break; } var rightBottomState = switchParams.showDefault && !isGuiding && !treasureModel.newGotShowing ? RightBottomState.Skill : RightBottomState.Function; var rightBottomState = resetToDefaultTimer <= 0f && switchParams.showDefault && !isGuiding && !treasureModel.newGotShowing ? RightBottomState.Skill : RightBottomState.Function; switch (rightBottomState) { case RightBottomState.Function: @@ -212,7 +225,7 @@ } isDefaultState = rightBottomState == RightBottomState.Skill; resetToDefaultTimer = !isDefaultState ? 7f : 0f; resetToDefaultTimer = !isDefaultState ? 20f : 0f; m_RayMask.gameObject.SetActive(!isDefaultState); if (switchParams.immediately) @@ -242,11 +255,7 @@ return; } SwitchFunctions(new SwitchParam() { immediately = false, showDefault = true, }); resetToDefaultTimer = 0.0001f; } private void OnSwitchAccount() @@ -277,6 +286,7 @@ { public bool showDefault; public bool immediately; public bool manual; } } System/MainWin/HighSettingFadeInFadeOut.cs
@@ -28,13 +28,18 @@ State state = State.Closed; float closeTimer = 0f; static float closeTimer = 0f; int openedFunctionCount = 0; TreasureFindHostModel hostModel { get { return ModelCenter.Instance.GetModel<TreasureFindHostModel>(); } } LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } } ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } } OpenServiceAchievementModel OpenServerModel { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } } public static void SetAutoCloseTimer() { closeTimer = 20f; } void Start() { @@ -114,7 +119,7 @@ DisplayArrow(state); if (state == State.Opened) { closeTimer = GeneralDefine.mainWinTopCloseTime; SetAutoCloseTimer(); } } @@ -154,7 +159,7 @@ DisplayArrow(state); if (state == State.Opened) { closeTimer = GeneralDefine.mainWinTopCloseTime; SetAutoCloseTimer(); } }
@@ -112,7 +112,6 @@ { functionOrder = 4; } WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<RolePanel>(false, functionOrder); } }
