From c0e6cb2a0ce840bd594d05c7e2cf0a185c312fa0 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 20 十一月 2025 21:27:48 +0800
Subject: [PATCH] 262 幻境阁系统-客户端
---
Main/System/PhantasmPavilion/AvatarHelper.cs | 83 ++++++++++++-----------------------------
1 files changed, 24 insertions(+), 59 deletions(-)
diff --git a/Main/System/PhantasmPavilion/AvatarHelper.cs b/Main/System/PhantasmPavilion/AvatarHelper.cs
index bafbb2a..68fb411 100644
--- a/Main/System/PhantasmPavilion/AvatarHelper.cs
+++ b/Main/System/PhantasmPavilion/AvatarHelper.cs
@@ -1,39 +1,21 @@
public static class AvatarHelper
{
-
public static AvatarModel GetAvatarModel(int playerId, int face, int facePic, int job = 0)
{
bool isMyself = playerId == PlayerDatas.Instance.PlayerId;
- return isMyself ? GetMyAvatarModel() : GetOtherAvatarModel(face, facePic, job);
- }
-
- //鑾峰彇澶村儚淇℃伅锛堝鏋滆〃涓笉瀛樺湪锛岃繑鍥為粯璁ょ殑锛�
- public static AvatarModel GetOtherAvatarModel(int face, int facePic, int job = 0)
- {
- int nowFace = GetOtherAvatarID(face, job);
- int nowfacePic = GetOtherAvatarFrameID(facePic, job);
- int faceEffectID = GetAvatarEffectID(nowFace);
- int facePicEffectID = GetAvatarFrameDefaultID(nowfacePic);
- return new AvatarModel(nowFace, nowfacePic, faceEffectID, facePicEffectID);
- }
-
- //鑾峰彇鎴戠殑澶村儚淇℃伅锛堝鏋滆〃涓笉瀛樺湪 鎴� 宸茶繃鏈燂紝杩斿洖榛樿鐨勶級
- public static AvatarModel GetMyAvatarModel()
- {
- int nowFace = GetMyAvatarID();
- int nowfacePic = GetMyAvatarFrameID();
- int faceEffectID = GetAvatarEffectID(nowFace);
- int facePicEffectID = GetAvatarFrameDefaultID(nowfacePic);
- return new AvatarModel(nowFace, nowfacePic, faceEffectID, facePicEffectID);
- }
-
- public static AvatarModel GetDefaultAvatarModel(int job = 0)
- {
- int nowFace = GetAvatarDefaultID(job);
- int nowfacePic = GetAvatarFrameDefaultID(job);
- int faceEffectID = GetAvatarEffectID(nowFace);
- int facePicEffectID = GetAvatarFrameDefaultID(nowfacePic);
- return new AvatarModel(nowFace, nowfacePic, faceEffectID, facePicEffectID);
+ int nowFace;
+ int nowfacePic;
+ if (isMyself)
+ {
+ nowFace = GetMyAvatarID();
+ nowfacePic = GetMyAvatarFrameID();
+ }
+ else
+ {
+ nowFace = GetOtherAvatarID(face, job);
+ nowfacePic = GetOtherAvatarFrameID(facePic, job);
+ }
+ return new AvatarModel(playerId, nowFace, nowfacePic);
}
public static int GetAvatarID(int playerId, int nowID, int job)
@@ -51,60 +33,43 @@
// 鑾峰彇鍏朵粬鐜╁澶村儚id(灏佸寘涓殑id鍦ㄨ〃涓笉瀛樺湪鏄剧ず榛樿鐨�)
public static int GetOtherAvatarID(int nowID, int job)
{
- if (PlayerFaceConfig.HasKey(nowID))
- return nowID;
- return PhantasmPavilionModel.Instance.TryGetDefaultID(PhantasmPavilionTab.Avatar, job, out int defaultID) ? defaultID : 0;
+ int defaultID = GetAvatarDefaultID(job);
+ return PlayerFaceConfig.HasKey(nowID) ? nowID : defaultID;
}
public static int GetOtherAvatarFrameID(int nowID, int job)
{
- if (PlayerFaceConfig.HasKey(nowID))
- return nowID;
- return PhantasmPavilionModel.Instance.TryGetDefaultID(PhantasmPavilionTab.AvatarFrame, job, out int defaultID) ? defaultID : 0;
+ int defaultID = GetAvatarFrameDefaultID(job);
+ return PlayerFacePicConfig.HasKey(nowID) ? nowID : defaultID;
}
//杩斿洖鐜╁澶村儚id(褰撳墠瑁呭鐨勮繃鏈熶簡鏄剧ず榛樿鐨�)
public static int GetMyAvatarID()
{
- PhantasmPavilionModel.Instance.TryGetNowShowID(PhantasmPavilionTab.Avatar, out int defaultID);
- return defaultID;
+ return PhantasmPavilionManager.Instance.TryGetNowShowID(PhantasmPavilionType.Face, out int defaultID) ? defaultID : 0;
}
public static int GetMyAvatarFrameID()
{
- PhantasmPavilionModel.Instance.TryGetNowShowID(PhantasmPavilionTab.AvatarFrame, out int defaultID);
- return defaultID;
+ int job = PlayerDatas.Instance.baseData.Job;
+ return PhantasmPavilionManager.Instance.TryGetNowShowID(PhantasmPavilionType.FacePic, out int defaultID) ? defaultID : 0;
}
//鏍规嵁job 鐩存帴杩斿洖瀵瑰簲鐨勯粯璁ゅご鍍廼d
public static int GetAvatarDefaultID(int job)
{
- PhantasmPavilionModel.Instance.TryGetDefaultID(PhantasmPavilionTab.Avatar, job, out int defaultID);
- return defaultID;
+ return PhantasmPavilionManager.Instance.TryGetDefaultID(PhantasmPavilionType.Face, job, out int defaultID) ? defaultID : 0;
}
+ //鏍规嵁job 鐩存帴杩斿洖瀵瑰簲鐨勯粯璁ゅご鍍忔id
public static int GetAvatarFrameDefaultID(int job)
{
- PhantasmPavilionModel.Instance.TryGetDefaultID(PhantasmPavilionTab.AvatarFrame, job, out int defaultID);
- return defaultID;
+ return PhantasmPavilionManager.Instance.TryGetDefaultID(PhantasmPavilionType.FacePic, job, out int defaultID) ? defaultID : 0;
}
- public static int GetAvatarEffectID(int id)
- {
- PhantasmPavilionModel.Instance.TryGetEffectID(PhantasmPavilionTab.Avatar, id, out int effectID);
- return effectID;
- }
-
- public static int GetAvatarFrameEffectID(int id)
- {
- PhantasmPavilionModel.Instance.TryGetEffectID(PhantasmPavilionTab.AvatarFrame, id, out int effectID);
- return effectID;
- }
-
- //鑾峰彇鎸囧畾澶村儚搴曞浘鍝佽川
public static int GetAvatarBgColor(int faceID)
{
- int defaultColor = 1;//榛樿鍝佽川鏄櫧鑹�
+ int defaultColor = 1;
if (!PlayerFaceConfig.HasKey(faceID))
return defaultColor;
return PlayerFaceConfig.Get(faceID).BgColor;
--
Gitblit v1.8.0