From ef3e67645b848f52857e5bb6166d476dead4733b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 24 六月 2025 16:28:20 +0800
Subject: [PATCH] 0312 增加GM功能；封包接收去除旧代码；共用预制体改目录UIComp；共用UI颜色调整
---
Main/Utility/UIHelper.cs | 26 +++++---
Main/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs | 5 +
Main/Utility/EnumHelper.cs | 6 +-
Main/Utility/GMCommand.cs | 4 +
Main/System/Tip/ScrollTip.cs | 2
Main/Core/NetworkPackage/Socket/ClientSocket.cs | 2
Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs | 28 ---------
Main/System/Main/HomeWin.cs | 8 ++
Main/System/PhantasmPavilion/AvatarCell.cs | 46 ++++++--------
Main/System/GMCommand/GMInputWin.cs | 1
Main/ResModule/UILoader.cs | 4
11 files changed, 60 insertions(+), 72 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
index 3d87900..c444fec 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs
@@ -57,6 +57,11 @@
MainRedDot.Instance.Register();
StageManager.Instance.ToGameScene();
+
+ if (DebugUtility.Instance.debugAccount)
+ {
+ GMCommand.Instance.Begin();
+ }
//SettingMgr.Instance.SetIsRecordData(PlayerDatas.Instance.baseData.PlayerID.ToString());
diff --git a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
index df73d8a..aff3f24 100644
--- a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
+++ b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
@@ -159,12 +159,6 @@
// 瀹炰緥鍖栧苟寮鸿浆涓哄崗璁寘鍩虹被
var packageInstance = packageType.Assembly.CreateInstance(packageType.Name) as GameNetPackBasic;
packageInstance.ReadFromBytes(vBytes);// 瑙ｆ瀽鍐呭
- if (packageInstance.cmd == (ushort)0x03F0 || packageInstance.cmd == (ushort)0x1801)
- {
- byte[] vPyBody = new byte[vBytes.Length - 4];
- Array.Copy(vBytes, 4, vPyBody, 0, vPyBody.Length);
- packageInstance = TransForPyPack(vPyBody);
- }
packageInstance.socketType = socketType;
#if UNITY_EDITOR
@@ -182,27 +176,5 @@
}
- /// <summary>
- /// 瑙ｆ瀽PY鐨勬ā鎷熷寘
- /// </summary>
- /// <param name="vBytes"></param>
- /// <returns></returns>
- private static GameNetPackBasic TransForPyPack(byte[] vBytes)
- {
- GameNetPackBasic vNetPackInst = null;
- ushort vPackCmd = (ushort)((ushort)(vBytes[0] << 8) + vBytes[1]);
- // 涓诲伐绋嬪皝鍖�
- if (packageTable.ContainsKey(vPackCmd))
- {
- Type vNetPackType = packageTable[vPackCmd];
- vNetPackInst = vNetPackType.Assembly.CreateInstance(vNetPackType.Name) as GameNetPackBasic;
- vNetPackInst.ReadFromBytes(vBytes);// 瑙ｆ瀽鍐呭
- }
- else
- {
- Debug.Log("鏀跺埌鏈畾涔夌殑瑙ｅ寘鍗忚锛�" + vBytes[0].ToString("x2").ToUpper() + "," + vBytes[1].ToString("x2").ToUpper());
- }
- return vNetPackInst;
- }
}
diff --git a/Main/Core/NetworkPackage/Socket/ClientSocket.cs b/Main/Core/NetworkPackage/Socket/ClientSocket.cs
index 5f0ff0d..6639be3 100644
--- a/Main/Core/NetworkPackage/Socket/ClientSocket.cs
+++ b/Main/Core/NetworkPackage/Socket/ClientSocket.cs
@@ -262,7 +262,7 @@
static byte[] vCmdBytes = new byte[2];
/// <summary>
- /// 闃呰淇℃伅
+ /// 瑙ｆ瀽鏁版嵁鍖咃細 FFCC+灏佸寘闀垮害+灏佸寘锛堝皝鍖呭ご+鏁版嵁锛夌粨鏋勪綋鍐呭
/// </summary>
/// <param name="vBytes"></param>
private void ReadInfo(byte[] vBytes)
diff --git a/Main/ResModule/UILoader.cs b/Main/ResModule/UILoader.cs
index 68d1677..5a8d187 100644
--- a/Main/ResModule/UILoader.cs
+++ b/Main/ResModule/UILoader.cs
@@ -16,12 +16,12 @@
public static GameObject LoadPrefab(string _name)
{
- return ResManager.Instance.LoadAsset<GameObject>("Prefab", _name);
+ return ResManager.Instance.LoadAsset<GameObject>("UIComp", _name);
}
public static void UnLoadPrefab(string _assetName)
{
- ResManager.Instance.UnloadAsset("Prefab", _assetName);
+ ResManager.Instance.UnloadAsset("UIComp", _assetName);
}
public static Sprite LoadSprite(string _iconKey)
diff --git a/Main/System/GMCommand/GMInputWin.cs b/Main/System/GMCommand/GMInputWin.cs
index 8987326..42349e6 100644
--- a/Main/System/GMCommand/GMInputWin.cs
+++ b/Main/System/GMCommand/GMInputWin.cs
@@ -53,7 +53,6 @@
protected override void OnOpen()
{
- base.HandleOpen();
this.transform.SetAsLastSibling();
}
protected void LateUpdate()
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index c5f41f1..1341cba 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -8,6 +8,14 @@
/// </summary>
public class HomeWin : UIBase
{
+ [SerializeField] AvatarCell avatarCell;
+ [SerializeField] Text playerNameText;
+ [SerializeField] Text powerText;
+ [SerializeField] Text rankName;
+ [SerializeField] Text playerLevelText;
+ [SerializeField] Slider expSlider;
+ [SerializeField] Text goldText;
+ [SerializeField] Text diamondText;
/// <summary>
/// 鍒濆鍖栫粍浠�
/// </summary>
diff --git a/Main/System/PhantasmPavilion/AvatarCell.cs b/Main/System/PhantasmPavilion/AvatarCell.cs
index f10574b..5c08b7c 100644
--- a/Main/System/PhantasmPavilion/AvatarCell.cs
+++ b/Main/System/PhantasmPavilion/AvatarCell.cs
@@ -1,10 +1,16 @@
using System.Collections.Generic;
using UnityEngine;
+//澶村儚妯″潡锛堟敮鎸佸抚鍔ㄧ敾鍜岀壒鏁堬級
public class AvatarCell : MonoBehaviour
{
public float scale = 1.0f;
+ private void Awake()
+ {
+ LoadPrefab();
+
+ }
ImageEx m_BgImage;
public ImageEx bgImage
{
@@ -12,7 +18,6 @@
{
if (m_BgImage == null)
{
- LoadPrefab();
m_BgImage = this.GetComponent<ImageEx>("AvatarCell/Img_BG");
}
return m_BgImage;
@@ -26,7 +31,6 @@
{
if (m_AvatarImage == null)
{
- LoadPrefab();
m_AvatarImage = this.GetComponent<ImageEx>("AvatarCell/Img_Avatar");
}
return m_AvatarImage;
@@ -40,7 +44,6 @@
{
if (m_AvatarFrameImage == null)
{
- LoadPrefab();
m_AvatarFrameImage = this.GetComponent<ImageEx>("AvatarCell/Img_AvatarFrame");
}
return m_AvatarFrameImage;
@@ -54,7 +57,6 @@
{
if (m_button == null)
{
- LoadPrefab();
m_button = this.GetComponent<ButtonEx>("AvatarCell/Img_AvatarFrame");
}
return m_button;
@@ -68,7 +70,6 @@
{
if (m_AvatarUIFrame == null)
{
- LoadPrefab();
m_AvatarUIFrame = this.GetComponent<UIFrame>("AvatarCell/Img_Avatar");
}
return m_AvatarUIFrame;
@@ -82,7 +83,6 @@
{
if (m_AvatarFrameUIFrame == null)
{
- LoadPrefab();
m_AvatarFrameUIFrame = this.GetComponent<UIFrame>("AvatarCell/Img_AvatarFrame");
}
return m_AvatarFrameUIFrame;
@@ -96,7 +96,6 @@
{
if (m_AvatarUIEffect == null)
{
- LoadPrefab();
m_AvatarUIEffect = this.GetComponent<UIEffect>("AvatarCell/Img_Avatar");
}
return m_AvatarUIEffect;
@@ -110,7 +109,6 @@
{
if (m_AvatarFrameUIEffect == null)
{
- LoadPrefab();
m_AvatarFrameUIEffect = this.GetComponent<UIEffect>("AvatarCell/Img_AvatarFrame");
}
return m_AvatarFrameUIEffect;
@@ -122,6 +120,8 @@
protected void LoadPrefab()
{
+ if (prefab != null)
+ return;
var tmp = transform.Find("AvatarCell");
if (tmp != null)
@@ -129,25 +129,19 @@
prefab = tmp.gameObject;
return;
}
- if (prefab == null)
+ prefab = UIUtility.CreateWidget("AvatarCell", "AvatarCell");
+
+ prefab.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+ prefab.transform.SetAsFirstSibling();
+
+ RectTransform prefabRect = prefab.GetComponent<RectTransform>();
+ RectTransform parentRect = GetComponent<RectTransform>();
+ if (prefabRect != null && parentRect != null)
{
- prefab = UIUtility.CreateWidget("AvatarCell", "AvatarCell");
-
- if (prefab != null)
- {
- prefab.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
- prefab.transform.SetAsFirstSibling();
-
- RectTransform prefabRect = prefab.GetComponent<RectTransform>();
- RectTransform parentRect = GetComponent<RectTransform>();
- if (prefabRect != null && parentRect != null)
- {
- prefabRect.anchorMin = new Vector2(0.5f, 0.5f);
- prefabRect.anchorMax = new Vector2(0.5f, 0.5f);
- prefabRect.sizeDelta = new Vector2(parentRect.rect.width, parentRect.rect.height);
- prefabRect.localScale = new Vector3(scale, scale, scale);
- }
- }
+ prefabRect.anchorMin = new Vector2(0.5f, 0.5f);
+ prefabRect.anchorMax = new Vector2(0.5f, 0.5f);
+ prefabRect.sizeDelta = new Vector2(parentRect.rect.width, parentRect.rect.height);
+ prefabRect.localScale = new Vector3(scale, scale, scale);
}
}
diff --git a/Main/System/Tip/ScrollTip.cs b/Main/System/Tip/ScrollTip.cs
index b7cd12e..dbccf6d 100644
--- a/Main/System/Tip/ScrollTip.cs
+++ b/Main/System/Tip/ScrollTip.cs
@@ -59,7 +59,7 @@
ScrollTipDetail tip = null;
if (pool == null)
{
- var _prefab = ResManager.Instance.LoadAsset<GameObject>("Prefab", "Tip");// UILoader.LoadPrefab("Tip");
+ var _prefab = ResManager.Instance.LoadAsset<GameObject>("UIComp", "Tip");// UILoader.LoadPrefab("Tip");
pool = GameObjectPoolManager.Instance.RequestPool(_prefab);
}
if (pool != null)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 0dbdc97..5252008 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -703,14 +703,14 @@
default23,
default24,
default25,
- default26,
- default27,
+ default26, // 254 鎴橀敜
+ default27,
default28,
default29,
default30,
default31,
default32,
- default33,
+ default33, // 261 缁撴櫠
default34, // 262 鍑瘉绉垎
default35, // 263 鑱氶瓊绮惧崕
default36, // 264 Boss鏈�缁堜激瀹冲姞鎴�
diff --git a/Main/Utility/GMCommand.cs b/Main/Utility/GMCommand.cs
index 67159b3..5ee129a 100644
--- a/Main/Utility/GMCommand.cs
+++ b/Main/Utility/GMCommand.cs
@@ -2,6 +2,10 @@
public class GMCommand : SingletonMonobehaviour<GMCommand>
{
+ public void Begin()
+ {
+ }
+
private void Update()
{
if (Input.GetKeyDown(KeyCode.F1))
diff --git a/Main/Utility/UIHelper.cs b/Main/Utility/UIHelper.cs
index 14e5385..22002a9 100644
--- a/Main/Utility/UIHelper.cs
+++ b/Main/Utility/UIHelper.cs
@@ -498,14 +498,14 @@
#endregion
- #region 鏂囧瓧鑹插��
+ #region 鏂囧瓧鑹插�� Bright 鍜� Dark鎸囪儗鏅壊绯绘槸鏄庤繕鏄殫锛屾殫搴曚寒瀛楋紝浜簳鏆楀瓧鐨勮鍒�
public static readonly Color s_BrightPinkColor = new Color32(246, 64, 141, 255);
public static readonly Color s_BrightRedColor = new Color32(255, 3, 3, 255);
public static readonly Color s_BrightPurpleColor = new Color32(218, 72, 213, 255);
public static readonly Color s_BrightBlueColor = new Color32(0, 107, 227, 255); //006BE3FF
public static readonly Color s_BrightOrangeColor = new Color32(255, 103, 1, 255); //FF6701FF
public static readonly Color s_BrightWhiteColor = new Color32(104, 104, 104, 255); //686868
- public static readonly Color s_BrightGreenColor = new Color32(16, 157, 6, 255); //109d06
+ public static readonly Color s_BrightGreenColor = new Color32(36, 139, 18, 255); //248b12
public static readonly Color s_DarkPinkColor = new Color32(255, 124, 124, 255);
public static readonly Color s_DarkRedColor = new Color32(250, 1, 1, 255);
@@ -513,13 +513,13 @@
public static readonly Color s_DarkBlueColor = new Color32(49, 206, 251, 255);//31cefb
public static readonly Color s_DarkOrangeColor = new Color32(248, 152, 59, 255);
public static readonly Color s_DarkWhiteColor = new Color32(247, 247, 247, 255);
- public static readonly Color s_DarkGreenColor = new Color32(53, 225, 34, 255); //35e122
+ public static readonly Color s_DarkGreenColor = new Color32(42, 227, 55, 255);//2ae337
- public static readonly Color s_NavyBrown = new Color32(64, 28, 6, 255);//401c06
+ public static readonly Color s_NavyBrown = new Color32(110, 76, 49, 255);//6e4c31
public static readonly Color s_Black = new Color32(0, 0, 0, 255);
public static readonly Color s_NavyYellow = new Color32(255, 239, 71, 255);
- public static readonly Color s_LightGreen = new Color32(141, 220, 17, 255);//8ddc11
- public static readonly Color s_LightYellow = new Color32(255, 244, 205, 255); //fff4cd
+ public static readonly Color s_LightGreen = new Color32(42, 227, 55, 255);//2ae337
+ public static readonly Color s_LightYellow = new Color32(245, 246, 230, 255); //f5f6e6
public static readonly Color s_Gray = new Color32(204, 204, 204, 255);
public static readonly Color s_Gold = new Color32(255, 239, 71, 255);//ffef47
public static readonly Color s_EarthYellow = new Color32(248, 152, 59, 255);//f8983b
@@ -622,6 +622,7 @@
public static Color GetUIColor(TextColType type, bool bright = false)
{
+ //Bright 鍜� Dark鎸囪儗鏅壊绯绘槸鏄庤繕鏄殫锛屾殫搴曚寒瀛楋紝浜簳鏆楀瓧鐨勮鍒�
switch (type)
{
case TextColType.None:
@@ -685,13 +686,13 @@
case TextColType.Green:
return StringUtility.Contact("<color=#", bright ? "109d06" : "35e122", ">", msg, "</color>");
case TextColType.NavyBrown:
- return StringUtility.Contact("<color=#", "401c06", ">", msg, "</color>");
+ return StringUtility.Contact("<color=#", "6e4c31", ">", msg, "</color>");
case TextColType.DarkGreen:
return StringUtility.Contact("<color=#", "109d06", ">", msg, "</color>");
case TextColType.Black:
return StringUtility.Contact("<color=#", "000000", ">", msg, "</color>");
case TextColType.LightYellow:
- return StringUtility.Contact("<color=#", "fff4cd", ">", msg, "</color>");
+ return StringUtility.Contact("<color=#", "f5f646", ">", msg, "</color>");
case TextColType.LightGreen:
return StringUtility.Contact("<color=#", "8ddc11", ">", msg, "</color>");
case TextColType.Gray:
@@ -1070,8 +1071,13 @@
}
case 41:
{
- //绗﹀嵃绮惧崕
- return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.RuneSplinters);
+ //鎴橀敜
+ return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.default26);
+ }
+ case 42:
+ {
+ //缁撴櫠
+ return PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.default33);
}
case 43:
{
--
Gitblit v1.8.0