| Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/PackSendQuestMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/BatchUseModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/OfflineHangUpUseWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/OfflineHangUpUseWin.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/EquipSuit/PlayerSuitModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/EquipSuitTips.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/WingsRefined.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowJump/WindowJumpMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -497,6 +497,7 @@ ExcuteBuildLevels(); ExcuteBuildGraphic(); ExcuteBuildUI(); ExcuteBuildBuiltIn(); AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate); @@ -539,6 +540,9 @@ private void ExcuteBuildBuiltIn() { BuiltInResourceSetting.SetLaunchBackGround(publishers.Split('|')[0], (BuildTarget)m_UserData.m_BuildTarget); BuiltInResourceSetting.SetLoginBackGround(publishers.Split('|')[0], (BuildTarget)m_UserData.m_BuildTarget); BuiltInResourceSetting.SetLoginLogo(publishers.Split('|')[0], (BuildTarget)m_UserData.m_BuildTarget); ExcuteBuildAsset("builtin"); }
@@ -824,7 +824,25 @@ return; } if (useItemModel.itemInfo.ItemID == fairyModel.changeFairyNameItem) if(itemModel.itemId == 952) { int maxUseCnt = GetOfflineMaxNum(itemModel); if(maxUseCnt <= 1) { if (!CheckIsMaxOfflineTime(maxUseCnt,itemModel)) { SendMakeUseQuest(itemModel.itemInfo.ItemPlace); } } else { BatchUseModel.Instance.SetOfflineUseModel(itemModel.itemInfo.ItemGUID); WindowCenter.Instance.Open<OfflineHangUpUseWin>(); } return; } if (itemModel.itemInfo.ItemID == fairyModel.changeFairyNameItem) { if (PlayerDatas.Instance.fairyData.HasFairy) { @@ -867,12 +885,6 @@ { switch (itemModel.itemInfo.ItemID) { case 952: if (!CheckIsMaxOfflineTime(itemModel)) { SendMakeUseQuest(itemModel.itemInfo.ItemPlace); } break; case RoleRenameWin.renameToolId: WindowCenter.Instance.Open<RoleRenameWin>(); break; @@ -888,29 +900,47 @@ } } } private bool CheckIsMaxOfflineTime(ItemModel itemModel) public int GetOfflineMaxNum(ItemModel itemModel) { int willTime = HangUpSetModel.Instance.offlinePluginTime + itemModel.chinItemModel.EffectValueA1; if (HangUpSetModel.Instance.offlinePluginTime >= HangUpSetModel.Instance.maxOfflinePluginTime) int remainOffline = HangUpSetModel.Instance.maxOfflinePluginTime - HangUpSetModel.Instance.offlinePluginTime; int maxUseCnt = 0; if (remainOffline > 0) { int extraCnt = remainOffline % itemModel.chinItemModel.EffectValueA1 > 0 ? 1 : 0; maxUseCnt = remainOffline / itemModel.chinItemModel.EffectValueA1 + extraCnt; if (maxUseCnt > itemModel.itemInfo.ItemCount) { return itemModel.itemInfo.ItemCount; } } return maxUseCnt; } public bool CheckIsMaxOfflineTime(int useNum, ItemModel itemModel) { int remainOffline = HangUpSetModel.Instance.maxOfflinePluginTime - HangUpSetModel.Instance.offlinePluginTime; if (remainOffline <= 0) { SysNotifyMgr.Instance.ShowTip("OfflinePluginTime"); return true; } else if (willTime > HangUpSetModel.Instance.maxOfflinePluginTime) else { int willTime = HangUpSetModel.Instance.offlinePluginTime + itemModel.chinItemModel.EffectValueA1 * useNum; if (willTime > HangUpSetModel.Instance.maxOfflinePluginTime) { ConfirmCancel.ShowPopConfirm(Language.Get("OfflinePluginTime102"), Language.Get("OfflinePluginTime101"), (bool isOk) => { if (isOk) { SendMakeUseQuest(itemModel.itemInfo.ItemPlace); SendMakeUseQuest(itemModel.itemInfo.ItemPlace,useNum); } }); return true; } } return false; } public void SendMakeUseQuest(int index, int useCnt = 1, int extra = 0) { ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,index); System/KnapSack/New/BatchUseModel.cs
@@ -51,5 +51,13 @@ storeConfig = null; } #endregion #region 离线挂机服使用数据 public string offlineGuid { get; private set; } public void SetOfflineUseModel(string guid) { this.offlineGuid = guid; } #endregion } } System/KnapSack/New/OfflineHangUpUseWin.cs
New file @@ -0,0 +1,136 @@ using System; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class OfflineHangUpUseWin : Window { [SerializeField] Slider _batchUseSlider; [SerializeField] Text _number; [SerializeField] Button _addBtn; [SerializeField] Button _reduceBtn; [SerializeField] Button _useBtn; [SerializeField] Button _closeBtn; [SerializeField] Text offlineText; private ItemModel itemModel; PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } #region Built-in protected override void BindController() { } protected override void AddListeners() { _addBtn.onClick.AddListener(OnClickAddBtn); _reduceBtn.onClick.AddListener(OnClickReduceBtn); _useBtn.onClick.AddListener(OnClickBatchUseBtn); _closeBtn.onClick.AddListener(CloseClick); _batchUseSlider.onValueChanged.AddListener(delegate { OnUseValueChange(); }); } protected override void OnPreOpen() { Display(); } protected override void OnAfterOpen() { } protected override void OnPreClose() { } protected override void OnAfterClose() { } #endregion public void Display() { itemModel = playerPack.GetItemModelByGUID(BatchUseModel.Instance.offlineGuid); if (itemModel == null) return; int maxOfflineNum = PackSendQuestMgr.Instance.GetOfflineMaxNum(itemModel); _batchUseSlider.maxValue = maxOfflineNum; _batchUseSlider.minValue = 1; _batchUseSlider.value = _batchUseSlider.minValue; OnUseValueChange(); } public void OnUseValueChange() { _number.text = Mathf.Ceil(_batchUseSlider.value).ToString(); UpdateOfflineTime(); } public void UpdateOfflineTime() { if (itemModel == null) return; offlineText.text = GetOfflinePluginTime(); } public void OnClickAddBtn() { if (_batchUseSlider.value < _batchUseSlider.maxValue) { _batchUseSlider.value++; } } public void OnClickReduceBtn() { if (_batchUseSlider.value > _batchUseSlider.minValue) { _batchUseSlider.value--; } } public void OnClickBatchUseBtn() { if (itemModel == null) return; bool isMax = PackSendQuestMgr.Instance.CheckIsMaxOfflineTime((int)Mathf.Ceil(_batchUseSlider.value), itemModel); if(!isMax) { PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (int)Mathf.Ceil(_batchUseSlider.value)); } CloseClick(); } public string GetOfflinePluginTime() { TimeSpan timeSpan = TimeSpan.FromSeconds(HangUpSetModel.Instance.offlinePluginTime); string s = ""; if (timeSpan.Hours > 0) { s = Language.Get("ItemOverdue103", timeSpan.Hours); } if (timeSpan.Minutes > 0) { s = StringUtility.Contact(s, Language.Get("ItemOverdue104", timeSpan.Minutes)); } if (s == "") { s = Language.Get("ItemOverdue104", 0); } int addHour = (itemModel.chinItemModel.EffectValueA1 / 3600)* (int)Mathf.Ceil(_batchUseSlider.value); s = StringUtility.Contact(s,"+", Language.Get("ItemOverdue103",addHour)); return s; } } } System/KnapSack/New/OfflineHangUpUseWin.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 5682063d28a2b244db79c05ce7f0075e timeCreated: 1540449836 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/Strengthening/EquipSuit/PlayerSuitModel.cs
@@ -110,6 +110,13 @@ CheckTypeBtnRedPointCondition(); } #region 处理跳转数据 public void SetJumpModel(int suitType) { EquipSuitTips.E_SuitType = (SuitType)suitType; } #endregion private void RefreshFuncOpenState(int funcId) { if (funcId != (int)FuncOpenEnum.Suit) @@ -1004,7 +1011,7 @@ } #endregion #region 成就前往数据 public SuitType jumpToSuitType { get; private set;} public int jumpToGroupType { get; private set; } //1.防具 2.仙器 public int jumpToEquipPlace { get; private set; } @@ -1026,6 +1033,7 @@ jumpToGroupType = 0; jumpToEquipPlace = 0; } #endregion public int GetMakerEquipPlace() { System/Strengthening/EquipSuitTips.cs
@@ -138,6 +138,8 @@ } else { if(!WindowJumpMgr.Instance.IsJumpState) { E_SuitType = SuitType.LowSuit; bool isSwitch = true; foreach(var red in SuitModel.suitCellRedPointDict.Values) @@ -153,6 +155,7 @@ E_SuitType = SuitType.HighSuit; } } } equipPartlist = SuitModel.GetEquipOrderlist(E_SuitType); CreateEquipSuitCell(); StartCoroutine(SetOffestPos()); System/Strengthening/WingsRefined.cs
@@ -282,10 +282,15 @@ ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing); var WingItem = Config.Instance.Get<WingRefineExpConfig>(itemModel.itemId); if (itemModel == null || WingItem == null) if (itemModel == null) { return; } var WingItem = Config.Instance.Get<WingRefineExpConfig>(itemModel.itemId); if (WingItem == null) { return; } int YRefiningRatioMin = 0;//预览生命比值 int YRefiningRatioMax = 0;//预览生命比值 float _RefiningDegreesMin = 0; System/WindowJump/WindowJumpMgr.cs
@@ -47,6 +47,8 @@ ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } } ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } } MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } } PlayerSuitModel suitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } } public bool IsJumpState { get; private set; } public int jumpPhase { get; private set;} public int jumpType { get; private set; } @@ -119,7 +121,13 @@ case JumpUIType.StrengthFunc5: case JumpUIType.EquipWashType2: case JumpUIType.StrengthFunc1Type2: case JumpUIType.EquipSuitType2: SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID); break; case JumpUIType.EquipHighSuit: case JumpUIType.EquipLowSuit: int suitType = 0; int.TryParse(_tagWinSearchModel.SelectActive,out suitType); suitModel.SetJumpModel(suitType); SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID); break; case JumpUIType.ComposeFunc1: @@ -1188,7 +1196,7 @@ StrengthFunc2 = 13, StrengthFunc3 = 14, StrengthFunc4 = 15, EquipSuitType2 = 241, //套装界面 EquipLowSuit = 241, //普通套装界面 StrengthFunc5 = 16, EquipWashType2 = 239, //装备洗练界面 ComposeFunc1 = 17, @@ -1395,6 +1403,7 @@ DogzFunc2Type2 = 251, //神兽强化界面 BindGoldWheel = 252, //绑玉转盘界面 FlashRushToBuy = 253, //精彩活动—限时抢购界面 EquipHighSuit = 254, //强化套装界面 DhszTs = 1001,//定海神针功法提升界面 HyqTs = 1002,//皓月枪功法提升界面 GyzTs = 1003,//鬼牙刃功法提升界面
