| Fight/Stage/StageManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/BlastFurnace/DandrugCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Compose/New/ComposeToolsWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/FairyCallMemberBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/OperationLogCollect.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Stage/StageManager.cs
@@ -137,6 +137,12 @@ #if UNITY_EDITOR Debug.LogFormat("StageManager出现加载相同地图行为:" + mapResConfigID); #endif if (loadTimeOutCatcher != null) { loadTimeOutCatcher.Stop(); loadTimeOutCatcher = null; } ExceptionCatcher.ReportException("场景加载 Step1", StringUtility.Contact("StageManager出现加载相同地图行为:", mapResConfigID)); yield break; } @@ -418,6 +424,12 @@ { ModelCenter.Instance.GetModel<DungeonModel>().ExitCurrentDungeon(); } if (loadTimeOutCatcher != null) { loadTimeOutCatcher.Stop(); } loadTimeOutCatcher = null; } private void InitHero() System/BlastFurnace/DandrugCell.cs
@@ -35,6 +35,8 @@ get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } Color32 colorBlack = new Color32(64,28,6,255); public void SetDisplayModel(int index,int selectIndex) { AlchemyConfig alchemyModel = FurnaceModel.alchemyModellist[index]; @@ -59,7 +61,8 @@ } else { progressValue.text = UIHelper.GetTextColorByItemColor(TextColType.White, StringUtility.Contact(progress, "%")); progressValue.text = StringUtility.Contact(progress, "%"); progressValue.color = colorBlack; } }
@@ -254,7 +254,7 @@ private IEnumerator SetOffestPos() { yield return null; if (curThirdType != 0) if (curThirdType >= 5) { cellCtrl.JumpIndex(curThirdType*50, 0, EnhancedUI.EnhancedScroller.EnhancedScroller.TweenType.immediate); } System/FairyAu/FairyCallMemberBehaviour.cs
@@ -9,6 +9,9 @@ public class FairyCallMemberBehaviour : MonoBehaviour { [SerializeField] Button m_CallMember; [SerializeField] Text m_Timer; long lastTick = 0; FairyGrabBossModel model { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } @@ -21,13 +24,16 @@ { model.bossGrabHintEvent += BossGrabHintEvent; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo; GlobalTimeEvent.Instance.secondEvent += DisplayTimer; Display(); DisplayTimer(); } private void OnDisable() { model.bossGrabHintEvent -= BossGrabHintEvent; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo; GlobalTimeEvent.Instance.secondEvent -= DisplayTimer; } private void BossGrabHintEvent() @@ -78,9 +84,42 @@ } if (bossId != 0) { CAC05_tagCGCallupFamilyMemberToBoss pak = new CAC05_tagCGCallupFamilyMemberToBoss(); pak.NPCID = (uint)bossId; GameNetSystem.Instance.SendInfo(pak); var deltaTick = DateTime.Now.Ticks - lastTick; var ts = new TimeSpan(deltaTick); if (ts.TotalSeconds >= model.callMemberSeconds) { lastTick = DateTime.Now.Ticks; DisplayTimer(); CAC05_tagCGCallupFamilyMemberToBoss pak = new CAC05_tagCGCallupFamilyMemberToBoss(); pak.NPCID = (uint)bossId; GameNetSystem.Instance.SendInfo(pak); } else { SysNotifyMgr.Instance.ShowTip("FairyCallMemberCd"); } } } void DisplayTimer() { if (m_CallMember.gameObject.activeInHierarchy) { var ticks = DateTime.Now.Ticks - lastTick; var ts = new TimeSpan(ticks < 0 ? 0 : ticks); var seconds = (int)(model.callMemberSeconds - ts.TotalSeconds); if (seconds <= 0 && m_Timer.gameObject.activeSelf) { m_Timer.gameObject.SetActive(false); } else if (seconds > 0) { if (!m_Timer.gameObject.activeSelf) { m_Timer.gameObject.SetActive(true); } m_Timer.text = StringUtility.Contact(seconds, Language.Get("RealmWin_Bewrite_35")); } } } } Utility/OperationLogCollect.cs
@@ -130,7 +130,7 @@ } const string chatReportUrl = "http://monitor.secondworld.net.cn:12000/chat_receiver"; const string chatReportUrl = "http://monitor.secondworld.net.cn:12000/chat_receiver?"; public void ChatReport(string content, string channelName, string toPlayer) { #if !UNITY_EDITOR
