| Fight/MapTransferUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairylandCeremony/CeremonyCoolTime.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairylandCeremony/CeremonyCoolTime.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairylandCeremony/CeremonyFirepartyWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairylandCeremony/ToHiTaskCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/BoxGetItemWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/BatchBuyWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/BatchBuyWin.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/BatchUseModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowJump/WindowJumpMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/MapTransferUtility.cs
@@ -359,6 +359,8 @@ var mapId = _npcLocation.mapId; var position = new Vector3(_mapConfig.BornPoints[0].x, 0, _mapConfig.BornPoints[0].y); Send_WorldTransfer(mapId, position, MapTransferType.WorldTransport, (byte)_lineID, npcID); forceMove = true; if (BossFakeLineUtility.Instance.IsShuntBoss(npcID)) { System/FairylandCeremony/CeremonyCoolTime.cs
New file @@ -0,0 +1,35 @@ using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class CeremonyCoolTime : MonoBehaviour { [SerializeField] Text m_Time; private void OnEnable() { GlobalTimeEvent.Instance.secondEvent += RefreshSecond; RefreshSecond(); } private void OnDisable() { GlobalTimeEvent.Instance.secondEvent -= RefreshSecond; } private void RefreshSecond() { int seconds = OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.FairyCeremony); if (seconds > 0) { m_Time.text = StringUtility.Contact("<color=#8DDC11FF>", TimeUtility.SecondsToHMS(seconds), "</color>"); } else { m_Time.text = UIHelper.GetTextColorByItemColor(TextColType.Red, Language.Get("XMZZ110")); } } } } System/FairylandCeremony/CeremonyCoolTime.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: b611da4d8aa2ca943b69485ca6f3d2a6 timeCreated: 1538223260 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/FairylandCeremony/CeremonyFirepartyWin.cs
@@ -18,6 +18,8 @@ ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } } PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } StoreConfig storeConfig; protected override void BindController() { @@ -110,15 +112,8 @@ SysNotifyMgr.Instance.ShowTip("BagFull"); return; } storeModel.OnClickShopCell(storeConfig); } if(ceremonyModel.CheckIsBuyFireCondi(storeConfig)) { ModelCenter.Instance.GetModel<StoreModel>().SendBuyShopItem(storeConfig,1); } else { WindowCenter.Instance.Open<RechargeTipWin>(); } } } } System/FairylandCeremony/ToHiTaskCell.cs
@@ -29,6 +29,7 @@ public void Init(AllPeoplePartyConfig taskConfig) { activeNameText.gameObject.SetActive(false); this.taskConfig = taskConfig; activeIcon.SetSprite(taskConfig.IconKey); SetTaskState(ceremonyModel.GetPeopleTaskTimesById(taskConfig.ID),taskConfig.TotalTimes); System/KnapSack/Logic/BoxGetItemWin.cs
@@ -66,6 +66,11 @@ ShowUICtrl(); } protected override void OnActived() { UpdateFireEffect(); } protected override void OnAfterOpen() { this.transform.SetAsLastSibling(); @@ -91,6 +96,33 @@ private void RefreshGetIem(int useId, int useCnt, BoxGetItemInfo[] info) { ShowUICtrl(); } private void UpdateFireEffect() { if (BoxModel.getItems == null) return; bool isFireBox = false; foreach (var key in ceremonyModel.fireDict.Keys) { StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(ceremonyModel.fireDict[key]); if (storeConfig != null) { if (storeConfig.ItemID == BoxModel.itemId) { isFireBox = true; if (!fireEffect.IsPlaying) { fireEffect.Play(); return; } } } } if(!isFireBox) { fireEffect.Stop(); } } private void ShowUICtrl() @@ -125,27 +157,6 @@ else { getCoinsText.gameObject.SetActive(false); } foreach(var key in ceremonyModel.fireDict.Keys) { StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(ceremonyModel.fireDict[key]); if(storeConfig != null) { if(storeConfig.ItemID == BoxModel.itemId) { if (!fireEffect.IsPlaying) { fireEffect.Play(); return; } } } } if (fireEffect.IsPlaying) { fireEffect.Stop(); } }
New file @@ -0,0 +1,178 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, September 08, 2017 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using TableConfig; namespace Snxxz.UI { public class BatchBuyWin : Window { #region 成员变量 private Text _itemName; private Slider _splitSlider; private Text _number; private Button _addBtn; private Button _reduceBtn; private Button _splitBtn; private Button _closeBtn; private ItemCell _itemCell; #endregion ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } PlayerBuffDatas _buffModel; PlayerBuffDatas Buffmodel { get { return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } } StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } } #region Built-in protected override void BindController() { _itemName = transform.Find("ItemNameText").GetComponent<Text>(); _number = transform.Find("SplitSlider/Background/Fill/SplitIcon/NumBG/NumText").GetComponent<Text>(); _splitSlider = transform.Find("SplitSlider").GetComponent<Slider>(); _addBtn = transform.Find("Addbtn").GetComponent<Button>(); _splitBtn = transform.Find("Usebtn").GetComponent<Button>(); _reduceBtn = transform.Find("Reducebtn").GetComponent<Button>(); _closeBtn = transform.Find("Closebtn").GetComponent<Button>(); _itemCell = transform.Find("ItemCell").GetComponent<ItemCell>(); } protected override void AddListeners() { _splitSlider.onValueChanged.RemoveAllListeners(); _addBtn.onClick.RemoveAllListeners(); _reduceBtn.onClick.RemoveAllListeners(); _splitBtn.onClick.RemoveAllListeners(); _closeBtn.onClick.RemoveAllListeners(); _splitSlider.onValueChanged.AddListener( delegate { OnSplitValueChange(); } ); _addBtn.onClick.AddListener(OnClickAddBtn); _reduceBtn.onClick.AddListener(OnClickReduceBtn); _splitBtn.onClick.AddListener(OnClickBatchUseBtn); _closeBtn.onClick.AddListener(OnClickCloseBtn); } protected override void OnPreOpen() { //OpenBatchWin(itemInfoModel.CurItemModel); OpenBatchWin(); } protected override void OnAfterOpen() { } protected override void OnPreClose() { BatchUseModel.Instance.ClearBatchBuyModel(); } protected override void OnAfterClose() { } #endregion private void OpenBatchWin() { if (BatchUseModel.Instance.storeConfig == null) return; InitPanel(); } public void InitPanel() { ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(BatchUseModel.Instance.storeConfig.ItemID); if (itemConfig == null) return; ItemCellModel cellModel = new ItemCellModel(itemConfig.ID); _itemCell.Init(cellModel); _itemName.text = itemConfig.ItemName; _splitSlider.minValue = 1; _splitSlider.maxValue = itemConfig.PackCount; OnSplitValueChange(); } public void OnSplitValueChange() { _number.text = Mathf.Ceil(_splitSlider.value).ToString(); } public void OnClickAddBtn() { if (_splitSlider.value < _splitSlider.maxValue) { _splitSlider.value++; } } public void OnClickReduceBtn() { if (_splitSlider.value > _splitSlider.minValue) { _splitSlider.value--; } } public void OnClickBatchUseBtn() { if (BatchUseModel.Instance.storeConfig == null) return; if(BatchUseModel.Instance.CheckIsBuy(BatchUseModel.Instance.storeConfig, (int)_splitSlider.value)) { storeModel.SendBuyShopItem(BatchUseModel.Instance.storeConfig, (int)_splitSlider.value); OnClickCloseBtn(); } else { WindowCenter.Instance.Open<RechargeTipWin>(); } } public void OnClickCloseBtn() { Close(); } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: b189f464e250e4545973fbd542fab701 timeCreated: 1538221287 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/KnapSack/New/BatchUseModel.cs
@@ -2,11 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using TableConfig; namespace Snxxz.UI { public class BatchUseModel : Singleton<BatchUseModel> { #region 批量使用数据 public string guid{ get; private set; } public void SetBatchModel(string guid) { @@ -22,5 +24,32 @@ this.extraPrams = extraUseInfo; this.maxValue = maxValue; } #endregion #region 批量购买数据 public StoreConfig storeConfig { get; private set; } public void SetBatchBuyModel(StoreConfig _storeConfig) { if (_storeConfig == null) return; storeConfig = _storeConfig; WindowCenter.Instance.Open<BatchBuyWin>(); } public bool CheckIsBuy(StoreConfig storeConfig, int buyNum = 1) { ulong price = (ulong)(storeConfig.MoneyNumber * buyNum); if (UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= price) { return true; } return false; } public void ClearBatchBuyModel() { storeConfig = null; } #endregion } } System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -538,6 +538,29 @@ int IndexOf = GroupLowIndexList.IndexOf(highBtnRecord.Index); if (IndexOf == 0) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.FairyCeremony))//精灵盛典 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest); } else//------第三层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 1) { var _funcOrder = 0; if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//精彩活动 { @@ -562,9 +585,8 @@ } } } else if (IndexOf == 1) else if (IndexOf == 2) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//限时礼包 { @@ -586,8 +608,9 @@ } } } else if (IndexOf == 2) else if (IndexOf == 3) { bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时特惠 @@ -609,33 +632,12 @@ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 3) { bool Isopen = impactRankModel.IsInImpactRank; if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//全民冲榜 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest); } else//------第三层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 4) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))//精灵盛典 bool Isopen = impactRankModel.IsInImpactRank; if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//全民冲榜 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { System/WindowJump/WindowJumpMgr.cs
@@ -338,6 +338,16 @@ } } break; case JumpUIType.CeremonyRecharge: case JumpUIType.CeremonyFire: case JumpUIType.CeremonyPeopleToHi: case JumpUIType.CeremonyOutof: if (!OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.FairyCeremony)) { SysNotifyMgr.Instance.ShowTip("InOperationTimeError"); return; } break; } DebugEx.Log("WindowJumpTo" + jumpType); @@ -773,6 +783,12 @@ dungeonModel.selectedTrialDungeon = dungeon; SetJumpLogic<TrialDungeonEntranceWin>(_tagWinSearchModel.TABID); break; case JumpUIType.CeremonyRecharge: case JumpUIType.CeremonyFire: case JumpUIType.CeremonyPeopleToHi: case JumpUIType.CeremonyOutof: SetJumpLogic<FairylandCeremonyWin>(_tagWinSearchModel.TABID); break; case JumpUIType.FaBaoSoul_BenYuan: case JumpUIType.FaBaoSoul_FengMo: case JumpUIType.FaBaoSoul_Strength: @@ -1108,6 +1124,7 @@ //Match curMatch = regex.Match("4**（abc）？789Y0649"); } } @@ -1330,6 +1347,10 @@ EquipCompose2 = 236, //装备合成-龙魂红三 EquipCompose3 = 237, //装备合成-灵瑶红二 EquipCompose4 = 238, //装备合成-灵瑶红三 CeremonyRecharge = 244, //仙界盛典充值大礼界面 CeremonyFire = 245, //仙界盛典烟花狂欢界面 CeremonyPeopleToHi = 246, //仙界盛典全民来嗨界面 CeremonyOutof = 247, //仙界盛典绝版降临界面 DhszTs = 1001,//定海神针功法提升界面 HyqTs = 1002,//皓月枪功法提升界面 GyzTs = 1003,//鬼牙刃功法提升界面
