From 23ea66ee0899ab8834431546bd134137fd408bed Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 26 五月 2025 15:58:48 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建
---
/dev/null | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/Main/Message/MessageWin.cs b/Main/Message/MessageWin.cs
deleted file mode 100644
index a5e7f3d..0000000
--- a/Main/Message/MessageWin.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-using CJ.Wait;
-using System;
-
-using System.Text.RegularExpressions;
-using DG.Tweening;
-namespace vnxbqy.UI
-{
-
- public class MessageWin : UIBase
- {
- [SerializeField] RectTransform m_ContainerNormalHint;
- [SerializeField] RichText m_NormalHint;
- [SerializeField] RectTransform m_ContainerChatHint;
- [SerializeField] RichText m_NormalChatHint; //鏄剧ず鍦ㄨ亰澶╃晫闈㈢殑浣嶇疆
-
- [SerializeField] RectTransform m_ContainerServerTip;
- [SerializeField] ScaleTween m_ServerTipScaleTween;
- [SerializeField] PositionTween m_ServerTipPositionTween;
- [SerializeField] RichText m_ServerTip;
- [SerializeField, Header("鍏ㄦ湇骞挎挱鍋滅暀鏃堕棿")] float m_ServerTipKeepTime = 1.5f;
-
- [SerializeField] RectTransform m_ContainerGM;
- [SerializeField] Text m_GmRichText;
- [SerializeField] ScrollerController m_ScrollControl;
- [SerializeField] Toggle m_AutoPopToggle;
- [SerializeField] Toggle m_AutoRefreshToggle;
- [SerializeField] Button m_GMClose;
-
- bool m_ServerTipPrepared = true;
-
- protected override void OnPreOpen()
- {
- m_ServerTipPrepared = true;
-
-#if UNITY_EDITOR
- m_ContainerGM.SetActive(VersionConfig.Get().debugVersion);
-#else
- m_ContainerGM.SetActive(false);
-#endif
- ServerTipDetails.normalHintRefresh += CheckNormalHint;
- ServerTipDetails.serverHintRefresh += CheckServerHint;
- ServerTipDetails.gmMessageRefresh += DisplayGM;
- ServerTipDetails.gmOpenEvent += GmOpenEvent;
- ServerTipDetails.chatHintRefresh += CheckChatHint;
- CheckNormalHint();
- CheckChatHint();
- CheckServerHint();
- DisplayGM(string.Empty);
-
- if (ServerTipDetails.requireOpenGM)
- {
- if (hasOnFrom)
- {
- OnGMOpen();
- }
- ServerTipDetails.requireOpenGM = false;
- }
-
- m_ContainerNormalHint.OnWaitCompelete(OnHintDisplayComplete);
- m_ContainerChatHint.OnWaitCompelete(OnHintDisplayComplete);
- m_ScrollControl.OnRefreshCell += OnRefreshGmCell;
- m_ScrollControl.OnGetDynamicSize += OnGetDynamicSize;
- m_ScrollControl.lockType = EnhanceLockType.LockVerticalBottom;
- m_GMClose.onClick.AddListener(OnGMClose);
- }
-
- protected override void OnPreClose()
- {
- ServerTipDetails.normalHintRefresh -= CheckNormalHint;
- ServerTipDetails.serverHintRefresh -= CheckServerHint;
- ServerTipDetails.gmMessageRefresh -= DisplayGM;
- ServerTipDetails.gmOpenEvent -= GmOpenEvent;
- ServerTipDetails.chatHintRefresh -= CheckChatHint;
- }
-
-
- private void GmOpenEvent()
- {
- if (ServerTipDetails.requireOpenGM)
- {
- OnGMOpen();
- ServerTipDetails.requireOpenGM = false;
- }
- }
-
- void CheckNormalHint()
- {
- var hint = ServerTipDetails.RequireNormalHint();
- if (hint != null)
- {
- DisplayNormalHint(hint);
- }
- }
-
- void DisplayNormalHint(SystemHintData hint)
- {
- transform.SetAsLastSibling();
- m_NormalHint.SetExtenalData(hint.extentionData);
- m_NormalHint.text = hint.message;
- if (!m_ContainerNormalHint.gameObject.activeInHierarchy)
- {
- m_ContainerNormalHint.SetActive(true);
- }
- m_ContainerNormalHint.DoWaitRestart();
- }
-
- private void OnHintDisplayComplete(Component com)
- {
- com.DoWaitStop();
- com.SetActive(false);
- }
-
- void CheckServerHint()
- {
- if (!m_ServerTipPrepared)
- {
- return;
- }
- var hint = ServerTipDetails.RequireServerTip();
- if (hint != null && gameObject.activeInHierarchy)
- {
- DisplayServerHint(hint);
- }
- else
- {
- DisableServerTip();
- }
- }
-
- public void DisplayServerHint(SystemHintData hint)
- {
- transform.SetAsLastSibling();
- m_ServerTipPrepared = false;
- if (!m_ServerTipScaleTween.gameObject.activeSelf)
- {
- m_ServerTipScaleTween.SetActive(true);
- }
- m_ServerTipScaleTween.SetStartState();
- m_ServerTipPositionTween.SetStartState();
- m_ContainerServerTip.SetActive(true);
- m_ServerTip.SetExtenalData(hint.extentionData);
- m_ServerTip.text = hint.message;
- m_ServerTipScaleTween.Play();
- TimeMgr.Instance.Register(m_ServerTip, ServerTipStartHide, m_ServerTipKeepTime + m_ServerTipScaleTween.duration);
- }
-
- private void ServerTipStartHide(Component comp)
- {
- m_ServerTipPositionTween.Play();
- TimeMgr.Instance.Register(m_ServerTipPositionTween, ServerTipTweenComplete, m_ServerTipPositionTween.duration);
- }
-
- private void ServerTipTweenComplete(Component comp)
- {
- m_ServerTipPrepared = true;
- DisableServerTip();
- CheckServerHint();
- }
-
- private void DisableServerTip()
- {
- TimeMgr.Instance.UnRegister(m_ServerTip);
- TimeMgr.Instance.UnRegister(m_ServerTipPositionTween);
- m_ContainerServerTip.SetActive(false);
- m_ServerTipScaleTween.Stop();
- m_ServerTipPositionTween.Stop();
- m_ServerTipScaleTween.SetStartState();
- m_ServerTipPositionTween.SetStartState();
- }
-
-
- #region GM
- readonly Regex autoPopRegex = new Regex("鍙傛暟閿欒|鎵цGM鍛戒护閿欒|^###");
- void DisplayGM(string latest)
- {
- if (!string.IsNullOrEmpty(latest))
- {
- if (m_AutoPopToggle.isOn && hasOnFrom)
- {
- RectTransform rt = m_ContainerGM;
- Vector3 pos = new Vector3(hasOnFrom ? -rt.sizeDelta.x / 2 : rt.sizeDelta.x / 2, 0, 0);
- rt.DOLocalMove(pos, 1.0f);
- hasOnFrom = !hasOnFrom;
- m_GMClose.SetActive(!hasOnFrom);
- }
- }
- if (m_ScrollControl.GetNumberOfCells(m_ScrollControl.m_Scorller) >= 300)
- {
- m_ScrollControl.m_Scorller.RefreshActiveCellViews();
- return;
- }
- m_ScrollControl.Refresh();
- for (int i = 0; i < ServerTipDetails.gmMessages.Count; i++)
- {
- m_ScrollControl.AddCell(ScrollerDataType.Normal, i);
- }
- m_ScrollControl.Restart();
- if (autoPopRegex.IsMatch(latest))
- {
- if (hasOnFrom)
- {
- OnGMOpen();
- }
- }
- }
-
- private void OnRefreshGmCell(ScrollerDataType type, CellView cell)
- {
- if (cell.index < ServerTipDetails.gmMessages.Count)
- {
- Text text = cell.transform.Find("Text").GetComponent<Text>();
- text.text = ServerTipDetails.gmMessages[cell.index];
- }
- }
-
- private bool OnGetDynamicSize(ScrollerDataType type, int index, out float height)
- {
- var msg = index < ServerTipDetails.gmMessages.Count ? ServerTipDetails.gmMessages[index] : string.Empty;
- height = m_GmRichText.cachedTextGeneratorForLayout.GetPreferredHeight(msg,
- m_GmRichText.GetGenerationSettings(new Vector2(m_GmRichText.rectTransform.rect.size.x, 0.0f)))
- / m_GmRichText.pixelsPerUnit;
- height += 5;
- return true;
- }
-
- private void OnGMClose()
- {
- if (!hasOnFrom)
- {
- RectTransform rt = m_ContainerGM;
- Vector3 pos = new Vector3(hasOnFrom ? -rt.sizeDelta.x / 2 : rt.sizeDelta.x / 2, 0, 0);
- rt.DOLocalMove(pos, 1.0f);
- hasOnFrom = !hasOnFrom;
- m_GMClose.SetActive(!hasOnFrom);
- }
- }
- #endregion
-
- private void OnDisable()
- {
- m_ContainerNormalHint.SetActive(false);
- m_ContainerChatHint.SetActive(false);
- DisableServerTip();
- StopAllCoroutines();
- }
-
- private Vector3 gmTo = new Vector3(442, 0, 0);
- private Vector3 gmFrom = new Vector3(892, 0, 0);
- private bool hasOnFrom = true;
- public void OnGMOpen()
- {
- RectTransform rt = m_ContainerGM;
- Vector3 pos = new Vector3(hasOnFrom ? -rt.sizeDelta.x / 2 : rt.sizeDelta.x / 2, 0, 0);
- rt.DOLocalMove(pos, 1.0f);
- hasOnFrom = !hasOnFrom;
- m_GMClose.SetActive(!hasOnFrom);
- }
-
- void CheckChatHint()
- {
- var hint = ServerTipDetails.RequireChatHint();
- if (hint != null)
- {
- DisplayChatHint(hint);
- }
- }
-
- void DisplayChatHint(SystemHintData hint)
- {
- // if (!WindowCenter.Instance.IsOpen<ChatWin>())
- // {
- // return;
- // }
- // if (!m_ContainerChatHint.gameObject.activeInHierarchy)
- // {
- // m_ContainerChatHint.gameObject.SetActive(true);
- // }
- // m_NormalChatHint.SetExtenalData(hint.extentionData);
- // m_NormalChatHint.text = hint.message;
- // m_ContainerChatHint.DoWaitRestart();
- }
- }
-}
-
diff --git a/Main/Message/MessageWin.cs.meta b/Main/Message/MessageWin.cs.meta
deleted file mode 100644
index db5da62..0000000
--- a/Main/Message/MessageWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 5b46b0146160b5f47a20899a65da3af8
-timeCreated: 1499772891
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/Message/SysNotifyMgr.cs b/Main/Message/SysNotifyMgr.cs
deleted file mode 100644
index 249e0a7..0000000
--- a/Main/Message/SysNotifyMgr.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-锘縰sing vnxbqy.UI;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-using UnityEngine;
-using UnityEngine.UI;
-
-
-public class SysNotifyMgr : SingletonMonobehaviour<SysNotifyMgr>
-
-{
- /// <summary>
- /// 鏈嶅姟绔笅鍙戠殑鏁版嵁
- /// </summary>
- private H0212_tagNotifyCode.tagNotifyStr[] sysNotifyMsg;
-
- private ArrayList tipInfoList = new ArrayList();
-
- private Dictionary<string, Func<string, ArrayList, bool>> notifyConditionDict = new Dictionary<string, Func<string, ArrayList, bool>>();
-
- public event Action<string, ArrayList> sysNotifyEvent;
-
- public event Action<string> OnSystemNotifyEvent;
- /// <summary>
- /// UserData鍘荤┖鏍煎鐞�
- /// </summary>
- public static Regex s_UserDataSpaceRegex = new Regex(@"'([0-9]+)':[ ]+\[(.*?)\]", RegexOptions.Singleline);
-
- private void Awake()
- {
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInitializeEvent;
- //StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
- //StartCoroutine(Co_Instance());
- }
-
- IEnumerator Co_Instance()
- {
- yield return null;
- // var instance = BattleHint.Instance;
- }
-
- private void LateUpdate()
- {
-#if UNITY_EDITOR
- if (Input.GetKeyDown(KeyCode.F3))
- {
- ServerTipDetails.OpenGMPanel();
- }
-#endif
- }
-
- protected override void OnDestroy()
- {
- base.OnDestroy();
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= BeforePlayerDataInitializeEvent;
- //StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;
- }
-
- private void OnStageLoadFinish()
- {
- //ServerTipDetails.OnStageLoadFinish();
- //BattleHint.Instance.OnStageLoadFinish();
- }
-
- private void BeforePlayerDataInitializeEvent()
- {
- // ScrollTip.m_Hints.Clear();
- ServerTipDetails.ClearHint();
- }
-
- public void ReceiveNotifyCode(H0212_tagNotifyCode vNetData)
- {
- if (vNetData != null)
- {
- sysNotifyMsg = vNetData.Pars;
-
- tipInfoList.Clear();
- for (int i = 0; i < sysNotifyMsg.Length; i++)
- {
- if (sysNotifyMsg[i].Len != 0)
- {
- var _msg = sysNotifyMsg[i].Msg;
- _msg = _msg.Replace(" ", string.Empty);
- tipInfoList.Add(_msg);
- }
- else
- {
- tipInfoList.Add(sysNotifyMsg[i].MsgInt);
- }
- }
-
- if (sysNotifyEvent != null)
- {
- sysNotifyEvent(vNetData.Msg, tipInfoList);
- }
-
- GetSysMsg(vNetData.Msg);
- }
- }
-
- void GetSysMsg(string key)
- {
- ///鏍规嵁key浠庣郴缁熶俊鎭〃鍙栧埌娑堟伅绫诲瀷
- SysInfoConfig cfg = SysInfoConfig.Get(key);
- if (cfg == null)
- {
-#if UNITY_EDITOR
- string hint = Language.Get("L1093", key);
- //ScrollTip.ShowTip(hint);
- //ChatCtrl.Inst.RevChatInfo(hint);
-#endif
- }
- else
- {
- if (!string.IsNullOrEmpty(cfg.richText))
- {
- if (notifyConditionDict.ContainsKey(cfg.key))
- {
- try
- {
- if (!notifyConditionDict[cfg.key](cfg.key, tipInfoList))
- {
- return;
- }
- }
- catch (Exception e)
- {
- Debug.Log(e.StackTrace);
- }
- }
- AnalysisSysmsg(cfg);
- }
- if (OnSystemNotifyEvent != null)
- {
- OnSystemNotifyEvent(cfg.key);
- }
- }
- }
-
- public void RegisterCondition(string key, Func<string, ArrayList, bool> condition)
- {
- if (!notifyConditionDict.ContainsKey(key))
- {
- notifyConditionDict.Add(key, condition);
- }
- }
-
- public void ShowTip(string key, params object[] msg)
- {
- SysInfoConfig cfg = SysInfoConfig.Get(key);
- if (cfg != null)
- {
- tipInfoList.Clear();
- tipInfoList.AddRange(msg);
- AnalysisSysmsg(cfg);
- }
- }
-
- void AnalysisSysmsg(SysInfoConfig cfg)
- {
- SysNotifySound(cfg.sound);
- SysNotifyFx(cfg.effect);
- SysNotifyRichText(cfg.type, cfg.richText, cfg.order);
- }
-
- void SysNotifySound(string msg)
- {
- //DesignDebug.Log("闊虫晥淇℃伅" + msg);
- }
-
- void SysNotifyFx(string msg)
- {
- //DesignDebug.Log("鐗规晥淇℃伅" + msg);
- }
-
- void SysNotifyRichText(int[] type, string msg, int order = 0)
- {
- if (type == null || type.Length == 0)
- {
- return;
- }
- for (int i = 0; i < type.Length; i++)
- {
- // switch ((SysNotifyType)type[i])
- // {
- // case SysNotifyType.SysFixedTip:
- // case SysNotifyType.SysFixedTip1:
- // case SysNotifyType.SysScrollTip:
- // case SysNotifyType.SysIntervalFixedTip:
- // case SysNotifyType.SysMarqueeTip:
- // case SysNotifyType.SysRealmTip:
- // if (!PreFightMission.Instance.IsFinished())
- // {
- // continue;
- // }
- // break;
- // }
- switch ((SysNotifyType)type[i])
- {
- case SysNotifyType.SysFixedTip:
- ServerTipDetails.DisplayNormalTip(msg, tipInfoList);
- break;
- case SysNotifyType.SysChatWin:
- ServerTipDetails.DisplayChatTip(msg, tipInfoList);
- break;
- // case SysNotifyType.SysFixedTip1:
- // case SysNotifyType.SysScrollTip:
- // ScrollTip.ShowTip(msg, tipInfoList, order);
- // break;
- case SysNotifyType.SysIntervalFixedTip:
- ServerTipDetails.ShowServerTip(msg, tipInfoList, order);
- break;
- // case SysNotifyType.SysMarqueeTip:
- // ServerTipDetails.ShowMarquee(msg, tipInfoList,order);
- // break;
- // case SysNotifyType.SysChanelTip:
- // ChatCtrl.Inst.RevChatInfo(msg, tipInfoList);
- // break;
- // case SysNotifyType.SysFairyQuestionTip:
- // ChatCtrl.Inst.RevChatInfo(msg, tipInfoList, ChatInfoType.FairyQuestion);
- // break;
- // case SysNotifyType.SysFairyTip:
- // ChatCtrl.Inst.RevChatInfo(msg, tipInfoList, ChatInfoType.FairyTip);
- // break;
- // case SysNotifyType.SysTeamTip:
- // ChatCtrl.Inst.RevChatInfo(msg, tipInfoList, ChatInfoType.TeamTip);
- // break;
- // case SysNotifyType.SysRealmTip:
- // if (OnSysTipEvent != null)
- // {
- // OnSysTipEvent(type[i], msg, tipInfoList);
- // }
- // break;
- // case SysNotifyType.SysEvenKill:
- // BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList);
- // break;
- // case SysNotifyType.SysFactionTip:
- // ChatCtrl.Inst.RevChatInfo(msg, tipInfoList, ChatInfoType.default2);
- // break;
-
- }
- }
-
- }
-
- #region 浜嬩欢
- public static event Action<int, string, ArrayList> OnSysTipEvent;
- #endregion
-
- public enum SysNotifyType
- {
- SysFixedTip = 1,//鍥哄畾鎻愮ず
- SysScrollTip = 2,//婊氬姩鎻愮ず
- SysIntervalFixedTip = 4,//鍏ㄦ湇鍥哄畾娑堟伅鎻愮ず
- SysMarqueeTip = 5,//璺戦┈鐏�
- SysChatWin = 6, //鑱婂ぉ浣嶇疆鐨勬彁绀�
- SysEvenKill = 7,//涓婂彜鎴樺満杩炴潃鎻愮ず
- SysFixedTip1 = 11,//鍥哄畾鎻愮ず2
- SysChanelTip = 20,//绯荤粺棰戦亾鏄剧ず
- SysFairyQuestionTip = 31,//浠欑洘棰戦亾闂瓟鎻愮ず
- SysFairyTip = 32,//浠欑洘棰戦亾淇℃伅鎻愮ず
- SysTeamTip = 41,//闃熶紞棰戦亾鎻愮ず
- SysFactionTip = 51, //闃佃惀棰戦亾鎻愮ず
- SysRealmTip = 100,//澧冪晫鎻愮ず
-
- //鍚庣画IL寮�鍙戞坊鍔犻璁�
- default1 = 200,
- default2,
- default3,
- default4,
- default5,
- default6,
- default7,
- default8,
- default9,
- default10,
- }
-
- public int Compare(SystemHintData x, SystemHintData y)
- {
- if (x.order.CompareTo(y.order) != 0)
- {
- return -x.order.CompareTo(y.order);
- }
- return x.appendTime.CompareTo(y.appendTime);
- }
-}
-
-public class SystemHintData
-{
- public DateTime appendTime;
- public string message;
- public ArrayList extentionData;
- public int order;
-}
diff --git a/Main/Message/SysNotifyMgr.cs.meta b/Main/Message/SysNotifyMgr.cs.meta
deleted file mode 100644
index 4af8b6b..0000000
--- a/Main/Message/SysNotifyMgr.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 8db32490b6c76984da5e96b4639531fc
-timeCreated: 1505706548
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
--
Gitblit v1.8.0