Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -398,6 +398,7 @@ EditorGUILayout.Space(); ClientPackage.auditOutTime = EditorGUILayout.TextField("AppStore Review OutTime",ClientPackage.auditOutTime, GUILayout.Height(20)); publishers = EditorGUILayout.TextField("Publishers", publishers, GUILayout.Height(50)); EditorGUILayout.Space(); Core/GameEngine/Login/Launch.cs
@@ -138,19 +138,22 @@ #if UNITY_IOS && !UNITY_EDITOR m_CurrentStage = LaunchStage.ClientVersion; if (!Application.isEditor || InGameDownTestUtility.enable) if (!VersionUtility.Instance.InIosAuditTime()) { VersionUtility.Instance.RequestVersionCheck(); progressBuf = progress; timer = 0f; duration = 1f; while (!VersionUtility.Instance.completed) m_CurrentStage = LaunchStage.ClientVersion; if (!Application.isEditor || InGameDownTestUtility.enable) { timer += Time.deltaTime; progress = Mathf.Clamp(progressBuf + timer / duration * 0.1f, progressBuf, progressBuf + 0.1f); yield return null; VersionUtility.Instance.RequestVersionCheck(); progressBuf = progress; timer = 0f; duration = 1f; while (!VersionUtility.Instance.completed) { timer += Time.deltaTime; progress = Mathf.Clamp(progressBuf + timer / duration * 0.1f, progressBuf, progressBuf + 0.1f); yield return null; } } }
@@ -95,27 +95,40 @@ [SerializeField] string m_BanHao; public string banHao { get { return m_BanHao; } } [SerializeField] string m_AuditOutTime; public string auditOutTime { get { return m_AuditOutTime; } set { m_AuditOutTime = value; } } public void Read(string _data) { var dataStrings = _data.Split('\t'); m_AppId = dataStrings[2]; m_VersionAuthority = (VersionAuthority)int.Parse(dataStrings[3]); m_Version = dataStrings[4]; m_ClientPackageFlag = dataStrings[5]; m_Branch = int.Parse(dataStrings[6]); m_AssetAccess = (InstalledAsset)int.Parse(dataStrings[7]); m_PartAssetPackage = int.Parse(dataStrings[8]) == 1; m_ProductName = dataStrings[9]; m_BundleIdentifier = dataStrings[10]; m_KeystoreFileName = dataStrings[11]; m_KeystorePassword = dataStrings[12]; m_KeystoreAlias = dataStrings[13]; m_KeystoreAliasPassword = dataStrings[14]; m_AppleDeveloperTeamID = dataStrings[15]; m_DebugVersion = int.Parse(dataStrings[16]) == 1; m_IsBanShu = int.Parse(dataStrings[17]) == 1; m_LogoPosition = dataStrings[18].Vector3Parse(); m_BanHao = dataStrings[19]; try { m_AppId = dataStrings[2]; m_VersionAuthority = (VersionAuthority)int.Parse(dataStrings[3]); m_Version = dataStrings[4]; m_ClientPackageFlag = dataStrings[5]; m_Branch = int.Parse(dataStrings[6]); m_AssetAccess = (InstalledAsset)int.Parse(dataStrings[7]); m_PartAssetPackage = int.Parse(dataStrings[8]) == 1; m_ProductName = dataStrings[9]; m_BundleIdentifier = dataStrings[10]; m_KeystoreFileName = dataStrings[11]; m_KeystorePassword = dataStrings[12]; m_KeystoreAlias = dataStrings[13]; m_KeystoreAliasPassword = dataStrings[14]; m_AppleDeveloperTeamID = dataStrings[15]; m_DebugVersion = int.Parse(dataStrings[16]) == 1; m_IsBanShu = int.Parse(dataStrings[17]) == 1; m_LogoPosition = dataStrings[18].Vector3Parse(); m_BanHao = dataStrings[19]; } catch (System.Exception ex) { DebugEx.Log(ex); } } #if UNITY_EDITOR @@ -170,6 +183,7 @@ _to.m_ClientPackageFlag = _from.m_ClientPackageFlag; _to.m_LogoPosition = _from.m_LogoPosition; _to.m_BanHao = _from.m_BanHao; _to.m_AuditOutTime = _from.m_AuditOutTime; } /// <summary> System/ClientVersion/VersionUtility.cs
@@ -249,8 +249,6 @@ private void OnMaoErVersionCheckResult(bool ok, string result) { Debug.LogFormat("猫耳强更请求返回结果 result：{0}：{1}", ok, result); if (ok) { try @@ -281,6 +279,27 @@ } } public bool InIosAuditTime() { DateTime dateTime; try { if (DateTime.TryParse(VersionConfig.Get().auditOutTime, out dateTime)) { return DateTime.Now < dateTime; } else { return false; } } catch (System.Exception ex) { return false; } } public class VersionInfo { public int ForceCount; 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
@@ -111,14 +111,7 @@ return; } if(ceremonyModel.CheckIsBuyFireCondi(storeConfig)) { ModelCenter.Instance.GetModel<StoreModel>().SendBuyShopItem(storeConfig,1); } else { WindowCenter.Instance.Open<RechargeTipWin>(); } BatchUseModel.Instance.SetBatchBuyModel(storeConfig); } } } System/KnapSack/New/BatchBuyWin.cs
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,12 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using TableConfig; namespace Snxxz.UI { public class BatchUseModel : Singleton<BatchUseModel> { public string guid{ get; private set; } { #region 批量使用数据 public string guid { get; private set; } public void SetBatchModel(string guid) { extraPrams = 0; @@ -15,12 +17,39 @@ this.guid = guid; } public int extraPrams { get; private set;} public int maxValue { get; private set;} public void SetExtraInfo(int extraUseInfo,int maxValue) { this.extraPrams = extraUseInfo; public int extraPrams { get; private set; } public int maxValue { get; private set; } public void SetExtraInfo(int extraUseInfo, int maxValue) { 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/TaskListTip.cs
@@ -219,7 +219,11 @@ var inDungeon = IsDungeon(); if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon) { TaskAddAndDelete(); if (MissionState != 0) { TaskAddAndDelete(MissionID); } } TaskJump(MissionID); } @@ -243,33 +247,55 @@ } SetLength(); } private void TaskAddAndDelete() private void TaskAddAndDelete(int TaskID) { //for (int i = 0; i < Content.childCount; i++) //{ // GameObject childObj = Content.GetChild(i).gameObject; // TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); // if (i < _list.Count) // { // if (!childObj.activeSelf) // { // childObj.SetActive(true); // } // childObjTaskType.TaskID = _list[i]; // childObjTaskType.IsGameObjectName(_list[i]); // childObjTaskType.IsMysteriousTask(); // childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]); // } // else // { // childObjTaskType.ClearTaskName(); // if (childObj.activeSelf) // { // childObj.SetActive(false); // } // } //} for (int i = 0; i < Content.childCount; i++) { GameObject childObj = Content.GetChild(i).gameObject; TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); if (i < _list.Count) { if (!childObj.activeSelf) GameObject obj = Content.GetChild(i).gameObject; TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); if (childObjTaskType.TaskID == TaskID) { childObj.SetActive(true); return; } childObjTaskType.TaskID = _list[i]; childObjTaskType.IsGameObjectName(_list[i]); childObjTaskType.IsMysteriousTask(); childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]); } else { childObjTaskType.ClearTaskName(); if (childObj.activeSelf) if (childObjTaskType.TaskID == 0) { childObj.SetActive(false); obj.SetActive(true); childObjTaskType.TaskID = TaskID; childObjTaskType.IsGameObjectName(TaskID); childObjTaskType.IsMysteriousTask(); obj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(TaskID); } } } ChangeSort();//关于任务变更排序 SetLength(); }
@@ -20,10 +20,6 @@ OpenServerActivityCenter.Instance.Register(7, this); OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent; } public bool IsShowPanel = false; private const int Redpoint_key1 = 20907; public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//限时礼包红点 public bool IsOpen @@ -52,7 +48,6 @@ public void OnBeforePlayerDataInitialize() { IsShowPanel = false; DicBuyPackage.Clear(); } public override void UnInit() @@ -115,8 +110,7 @@ bool Isbool = IsExpired(); if (day != GetDayOfYear && IsExpired()) { LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear); IsShowPanel = true; // LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear); redPointStre1.state = RedPointState.Simple; } else System/Vip/LimitedTimePackageWin.cs
@@ -58,9 +58,10 @@ protected override void OnAfterOpen() { if (limitedTimePackageItemModel.IsShowPanel) if (limitedTimePackageItemModel.redPointStre1.state == RedPointState.Simple) { limitedTimePackageItemModel.IsShowPanel = false; int GetDayOfYear = DateTime.Now.DayOfYear; LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear); limitedTimePackageItemModel.IsShowTip(); }
@@ -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,//鬼牙刃功法提升界面
