| Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonSuppliesLackWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FindPrecious/DemonJarWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TipPanel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerActivityWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/StrengtheningSripts.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowBase/WindowAsyncLoad.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI/HUD/HeadUpName.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI/HUD/LifeBar.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs
@@ -6,7 +6,7 @@ public partial class ItemCompoundConfig : ConfigBase, IConfigPostProcess { private static Dictionary<int, Dictionary<int, Dictionary<int, List<ItemCompoundConfig>>>> allComposeModelDict = new Dictionary<int, Dictionary<int, Dictionary<int, List<ItemCompoundConfig>>>>(); static Dictionary<int, List<ItemCompoundConfig>> ticketComposeDict = new Dictionary<int, List<ItemCompoundConfig>>(); public void OnConfigParseCompleted() { if (!allComposeModelDict.ContainsKey(firstType)) @@ -43,6 +43,21 @@ } } } if (firstType == (int)ComposeFuncType.Ticket) { var makeItemArray = ConfigParse.GetMultipleStr<int>(makeID); for (int i = 0; i < makeItemArray.Length; i++) { List<ItemCompoundConfig> list = null; if (!ticketComposeDict.TryGetValue(makeItemArray[i], out list)) { list = new List<ItemCompoundConfig>(); ticketComposeDict.Add(makeItemArray[i], list); } list.Add(this); } } } @@ -105,6 +120,11 @@ return null; } public static bool TryGetTicketCompose(int _ticketId, out List<ItemCompoundConfig> list) { return ticketComposeDict.TryGetValue(_ticketId, out list); } } }
@@ -23,11 +23,14 @@ [SerializeField] TextEx m_TicketNeed; [SerializeField] Text m_LackContentTip; [SerializeField] Text m_LackMoneyTip; [SerializeField] Text m_ConfirmLabel; [SerializeField] Button m_Confirm; [SerializeField] Button m_Close; [SerializeField] Button m_TicketCompose; DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } } ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } } #region Built-in protected override void BindController() @@ -38,6 +41,7 @@ { m_Confirm.AddListener(Confirm); m_Close.AddListener(CloseClick); m_TicketCompose.AddListener(TicketCompose); } protected override void OnPreOpen() @@ -50,9 +54,11 @@ m_TicketOwn.text = own.ToString(); m_TicketNeed.text = StringUtility.Contact("/", lackItem.count); m_TicketOwn.colorType = own >= lackItem.count ? TextColType.White : TextColType.Red; m_TicketCompose.gameObject.SetActive(own < lackItem.count && CanComposeTicket(lackType)); m_LackContentTip.text = GetLackContentTip(lackType); m_LackMoneyTip.gameObject.SetActive(own < lackItem.count); m_ConfirmLabel.text = GetConfirmLabel(lackType); if (own < lackItem.count) { @@ -117,6 +123,22 @@ else { ConfirmTodo(lackType); } } private void TicketCompose() { switch (lackType) { case LackType.ElderGodArea: WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeTicketIce); break; case LackType.FairyLand: WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeTicketFairy); break; case LackType.SingleIceCrystal: WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeTicketGod); break; } } @@ -271,6 +293,34 @@ } } private string GetConfirmLabel(LackType _lackType) { switch (_lackType) { case LackType.PersonalBoss: case LackType.Kylin: case LackType.IceCrystal: return Language.Get("ConfirmTarget"); case LackType.ElderGodArea: case LackType.FairyLand: case LackType.SingleIceCrystal: return Language.Get("W_CertainInto"); default: return Language.Get("ConfirmTarget"); } } private bool CanComposeTicket(LackType _lackType) { var lackItem = GetLackItem(lackType); List<ItemCompoundConfig> list; if (ItemCompoundConfig.TryGetTicketCompose(lackItem.id, out list)) { return composeModel.IsComposeTicketByType(list[0].secondType); } return false; } public enum LackType { PersonalBoss, System/FindPrecious/DemonJarWin.cs
@@ -65,6 +65,7 @@ { model.bossSelectedEvent += OnBossSelected; findPreciousModel.bossSubscribeChangeEvent += OnSubscribeBoss; dungeonModel.dungeonRecordChangeEvent += OnRemaintimeUpdate; dungeonModel.countRemainTimeChangeEvent += OnRemaintimeUpdate; dungeonModel.updateDungeonBuyCnt += OnBuyTimesOk; model.doubleAwardChangeEvent += OnDoubleAwardChange; @@ -75,6 +76,7 @@ guideChallenge = false; model.bossSelectedEvent -= OnBossSelected; findPreciousModel.bossSubscribeChangeEvent -= OnSubscribeBoss; dungeonModel.dungeonRecordChangeEvent -= OnRemaintimeUpdate; dungeonModel.countRemainTimeChangeEvent -= OnRemaintimeUpdate; dungeonModel.updateDungeonBuyCnt -= OnBuyTimesOk; model.doubleAwardChangeEvent -= OnDoubleAwardChange; System/MainInterfacePanel/TipPanel.cs
@@ -21,7 +21,7 @@ LoginAdModel loginAdModel { get { return ModelCenter.Instance.GetModel<LoginAdModel>(); } } FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } } LimitedTimePackageItemClassModel limitedTimePackageItemClassModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } } public TipPanel() { WindowCenter.Instance.windowAfterOpenEvent += windowBeforeOpen; @@ -77,20 +77,6 @@ { WindowCenter.Instance.Open<OffLineOnHookWin>(); onHookModel.IsOpenOffLineOnHookBool = false; } else if (ModelCenter.Instance.GetModel<OSGiftModel>().CheckOpen() || WindowCenter.Instance.CheckOpen<OpenServerGiftWin>())//超值礼包 { } else if (limitedTimePackageItemClassModel.IsShowPanel)//限时礼包 { limitedTimePackageItemClassModel.IsShowPanel = false; if (!WindowCenter.Instance.CheckOpen<LimitedTimePackageWin>()) { WindowCenter.Instance.Open<LimitedTimePackageWin>(); } } else if (firstTimeRechargeModel.IsTryOut == 1 && !inDungeon)//装备试用 { System/OpenServerActivity/OpenServerActivityWin.cs
@@ -68,6 +68,7 @@ { TimeUtility.OnServerOpenDayRefresh += OnStepServerDayEvent; OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent; OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent; for (int i = 0; i < m_SortArray.Count; i++) { m_ActivitySpreadDict[m_SortArray[i]] = false; @@ -119,6 +120,7 @@ { TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent; OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent; OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent; CloseOtherWin(); WindowCenter.Instance.Open<MainInterfaceWin>(); impactRankModel.gotoImpactRankType = 0; @@ -478,6 +480,44 @@ m_ActivityCtrl.m_Scorller.RefreshActiveCellViews(); } } private void OperationStartEvent(Operation type, int state) { switch (type) { case Operation.MultipleExp: if (state == 1 && !alreadyOpenActivitys.Contains(5)) { alreadyOpenActivitys.Add(5); UpdateFunctionBtns(); } break; case Operation.ConsumeRebate: if (state == 0 && !alreadyOpenActivitys.Contains(1)) { alreadyOpenActivitys.Add(1); UpdateFunctionBtns(); } break; case Operation.FlashSale: if (state == 0 && !alreadyOpenActivitys.Contains(4)) { alreadyOpenActivitys.Add(4); UpdateFunctionBtns(); } break; case Operation.BossReborn: break; case Operation.GiftPackage: break; case Operation.FairyCeremony: break; case Operation.MultipRealmPoint: break; case Operation.max: break; } } } }
@@ -99,6 +99,9 @@ [SerializeField] GameObject m_ImageBGObj; public float _Delaytime = 0.1f;//延迟时间 public float _Contracttime = 0.15f;//发包时间 private bool IsGuide=false; void Awake() { @@ -164,12 +167,26 @@ private void OnEnable() { IsGuide = NewBieCenter.Instance.inGuiding&&NewBieCenter.Instance.currentGuide==10; _effects = true; _open = true; _money = PlayerDatas.Instance.baseData.allSliver; PlayerStrengthengDatas.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息 PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshMoney;//金钱的刷新 Initialize(); WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeCloseEvent; } private void windowBeforeCloseEvent(Window obj) { if (obj as GetItemPathWin) { if (IsGuide) { NewBieCenter.Instance.StartNewBieGuide(92); IsGuide = false; } } } void Start() @@ -212,8 +229,6 @@ _position -= 444; _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_position/(1076.0f-444)); _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_Scrobar.verticalNormalizedPosition+(50/(1076.0f-444))); //Mathf.Clamp01(1 - type * 0.1f + type * 4); //_Scrobar.verticalNormalizedPosition = (float)type / (float)_content.childCount; } else { @@ -411,11 +426,17 @@ else if (_theType == 2) { MessageWin.Inst.ShowFixedTip(Language.Get("Z1013"));//请佩戴装备 if (IsGuide) { NewBieCenter.Instance.StartNewBieGuide(92); IsGuide = false; } } else if (_theType == 3) { MessageWin.Inst.ShowFixedTip(Language.Get("Z1012"));//装备强化满级 } } IEnumerator AutomaticRein()//自动强化开始的协程 @@ -430,10 +451,6 @@ _tagEPlus.ItemIndex = (ushort)_tag; _tagEPlus.PackType = 1; GameNetSystem.Instance.SendInfo(_tagEPlus);//向服务器发送装备位 //if (NewBieCenter.Instance.inGuiding) //{ // yield break; //} } yield return new WaitForSeconds(_Contracttime); } @@ -481,14 +498,16 @@ _GridGreenB.gameObject.SetActive(true); DisplayPromoteLv(_tag); _UIEffect1D.StopImediatly(); //int _index = _wear.IndexOf(_tag);//得到所处数组的位置 //_wear.RemoveAt(_index);//删除数组所处下标的元素 //_fullLevel.Add(_tag);//给数组添加元素 FullLevel(_tag); _wear.Clear(); _notWear.Clear(); _fullLevel.Clear(); TheEquipment(); if (IsGuide) { NewBieCenter.Instance.StartNewBieGuide(92); IsGuide = false; } _automaticBtn.gameObject.SetActive(true);//自动强化按钮 _strengBtn.interactable = true;//强化按钮 _StrengImage.color = new Color32(51, 8, 0, 255); @@ -1202,6 +1221,7 @@ StopBtn();//停止强化关闭携程 PlayerStrengthengDatas.Event_Ha3b3 -= EquipPartStar;//刷新服务器关于装备信息 PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshMoney;//金钱的刷新 WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeCloseEvent; int playerLv = PlayerDatas.Instance.baseData.LV; if (playerLv >= 150) { System/WindowBase/WindowAsyncLoad.cs
@@ -45,6 +45,7 @@ var task = taskQueue[i]; if (task.windowName == _name) { task.Dispose(); taskQueue.Remove(task); break; } @@ -66,6 +67,11 @@ currentTask = null; } for (int i = 0; i < taskQueue.Count; i++) { var task = taskQueue[i]; task.Dispose(); } taskQueue.Clear(); NetLinkWin.Hide(); } @@ -116,6 +122,14 @@ } } public void RemoveTask(Task _task) { if (tasks.Contains(_task)) { tasks.Remove(_task); } } public void NotifyTaskState(Task _task) { bool allReady = true; @@ -155,9 +169,9 @@ callBack = _callBack; } public void Bind(TaskGroup _task) public void Bind(TaskGroup _taskGroup) { taskGroup = _task; taskGroup = _taskGroup; } public void Report(bool _ok, UnityEngine.Object _object) @@ -179,6 +193,10 @@ public void Dispose() { callBack = null; if (taskGroup != null) { taskGroup.RemoveTask(this); } } public void Done() UI/HUD/HeadUpName.cs
@@ -102,6 +102,19 @@ } } public void SetFunctionalNpcRealm(int _realm) { m_Realm.gameObject.SetActive(true); m_PlayerName.alignment = TextAnchor.MiddleLeft; var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(_realm); if (realmConfig != null) { m_Realm.SetSprite(realmConfig.Img); SetImageMaterialTexture(realmConfig.Img); } } public void SetTitle(uint _titleId) { titleId = _titleId; @@ -180,7 +193,7 @@ public void SetNPCName(string _name) { SetRealm(0); SetFunctionalNpcRealm(0); m_PlayerName.text = _name; SyncPosition(true); } @@ -190,7 +203,7 @@ var config = ConfigManager.Instance.GetTemplate<NPCConfig>(_id); if (config != null) { SetRealm(config.Realm); SetFunctionalNpcRealm(config.Realm); m_PlayerName.text = config.charName; }
@@ -133,6 +133,7 @@ this.transform.localScale = Vector3.one; hideTime = Time.time + hideInterval; multipleSlider.ResetValue(value); SyncPosition(true); } public void Show(ulong _hp, ulong _maxHp)
