Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【战斗】修改战斗前和战斗内立绘展示

main
chenyuqi 2024-03-20 19:58:18 +08:00
parent 5cab3e06fd
commit bd83514e82
16 changed files with 1786 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium SDF.asset (Stored with Git LFS)
View File

Binary file not shown.

1542
ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UIPosterAndSkillInfo.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1d0cb61373d7745438b4c47688e7d62f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UITeamFight.prefab
View File

@ -819,7 +819,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7654477066102010246
RectTransform:
m_ObjectHideFlags: 0
@ -6395,7 +6395,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8797797722769182732
RectTransform:
m_ObjectHideFlags: 0

3
ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
View File

@ -78,6 +78,7 @@ public partial class UIManager
_WindowMeta(UINameConst.UI_BuyDiamond, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_LevelDetail, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_DailyBonus, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UIFightPoster, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UINoticeTwo, UIWindowLayer.Waiting);
@ -104,6 +105,8 @@ public static class UINameConst
public static readonly string UIDefeatGame = "LevelSceneUI/LevelSettle/UIDefeatGame";
public static readonly string UIPassGame = "LevelSceneUI/LevelSettle/UIPassGame";
public static readonly string UIFightScene = "LevelSceneUI/UIFightScene";
public static readonly string UIFightPoster = "LevelSceneUI/UIPosterAndSkillInfo";
public static readonly string UISelectCharacter = "MainScene/ShowCharacter/UISelectCharacter";
public static readonly string UIShowAllCharacterSort = "MainScene/UIShowAllCharacterSort";
public static readonly string UI_Cultivate = "MainScene/ShowCharacter/UI_Cultivate";

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/BattleState.cs
View File

@ -460,6 +460,7 @@ namespace Gameplay.Level
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, false);
}
@ -469,6 +470,7 @@ namespace Gameplay.Level
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, true);
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Level/State/PrepareState.cs
View File

@ -208,6 +208,7 @@ namespace Gameplay.Level
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
}
}
@ -267,6 +268,7 @@ namespace Gameplay.Level
if (!TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = true;
TeamManager.Instance.OpenFightPosterUI(characterIDHere);
}
}
}
@ -383,6 +385,7 @@ namespace Gameplay.Level
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, false);
}
@ -392,6 +395,7 @@ namespace Gameplay.Level
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
EventManager.Instance.Send(EventManager.EventName.ToFightModelDragSuc, true);
}

13
ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs Normal file
View File

@ -0,0 +1,13 @@
using Framework;
public partial class TeamManager
{
public async void OpenFightPosterUI(uint uid)
{
await UIManager.Instance.OpenWindow(UINameConst.UIFightPoster, uid);
}
public void CloseFightPosterUI()
{
UIManager.Instance.CloseWindow(UINameConst.UIFightPoster);
}
}

3
ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a5eca23f43b145fa87b6ed0973351254
timeCreated: 1710932595

6
ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.cs
View File

@ -16,7 +16,7 @@ using Constants = Framework.Constants;
using EventManager = Framework.EventManager;
//队伍管理器
public class TeamManager
public partial class TeamManager
{
private static TeamManager m_instance;
private TeamManager()
@ -899,10 +899,10 @@ public class SingleTeamCharacterInfo
private bool _isInLevel = false; //是否被创建到战场中，没有的话不能取到各种值
//测试数据
private uint m_uid;
private uint m_uid; //战场中生成的UID
private CharacType m_type;
public readonly uint OutUid; //战场中生成的UID
public readonly uint OutUid; //养成界面的UID
public enum CharacType
{

112
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs Normal file
View File

@ -0,0 +1,112 @@
using System.Collections;
using System.Collections.Generic;
using cfg.CharacterCfg;
using cfg.SkillCfg;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UIElements;
using Button = UnityEngine.UI.Button;
using Image = UnityEngine.UI.Image;
using Toggle = UnityEngine.UI.Toggle;
using ScrollView = PhxhSDK.PhxhScrollView;
using Framework;
using Gameplay;
using PhxhSDK;
public class UIPosterAndSkillInfoController : UIWindow
{
//UI GameObj
///Auto Gen Start///
public Button Button_SkillInfoBg;
public Image Image_UI_PosterShadow;
public Image Image_StandPaintting;
public Image Image_CharacterLogo;
public Image Image_SkillInfoLogo;
public TMP_Text Text_SkillName;
public TMP_Text Text_SkillCD;
public TMP_Text Text_SkillCDSecond;
public TMP_Text Text_SkillInfoDes;
public Image Image_Profession;
public TMP_Text Text_CharacterName;
public TMP_Text Text_EnglishName;
///Auto Gen End///
private uint _fightUid;
private CharacterDataInfo _data;
// deal with input data
public override void PreLoad(object data = null)
{
if (data != null)
{
_fightUid = (uint)data;
var singleCharData = TeamManager.Instance.GetSingleCharacByUid(_fightUid);
_data = CharacterDataInfoManager.Instance.DataDic[singleCharData.OutUid];;
}
}
// Use this for initialization
public override void OnInit()
{
//bind UI GameObj
UIPosterAndSkillInfoBinder.GetComponents(this);
}
//invoke when open window
protected override void OnShowWindow(object data = null)
{
_RefreshPoster();
_RefreshInfo();
_RefreshSkill();
}
//invoke when reload window
protected override void OnReloadWindow(object data = null)
{
}
//invoke when close window
protected override void OnHideWindow()
{
}
//invoke when destroy
public override void OnRelease()
{
base.OnRelease();
}
private async void _RefreshPoster()
{
var path = CommonUtils.GetCharacterPicPath(_data.Cfg.RoleID,CommonUtils.ECharacterPicPathType.Poster);
Image_StandPaintting.sprite = await AssetManager.Instance.LoadAssetAsync<Sprite>(path);
}
private async void _RefreshInfo()
{
var cfg = _data.Cfg;
var professionData = TableManager.Instance.Tables.JobAttri.GetOrDefault((int)cfg.Job);
Image_Profession.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(professionData.IconPath);
Text_CharacterName.text = CommonUtils.GetLocalizeText(cfg.Name);
Text_EnglishName.text = CommonUtils.GetLocalizeText(cfg.NickName);
}
private void _RefreshSkill()
{
var singleUnitData = TeamManager.Instance.GetSingleCharacByUid(_fightUid);
var skillID = CommonUtils.GetGameUnitUltraSkillID(singleUnitData.OutUid);
DataSkill skillData = TableManager.Instance.Tables.SkillConfig?.Get(skillID);
if (skillData != null)
{
Text_SkillName.text = CommonUtils.GetLocalizeText(skillData.Name);
Text_SkillCD.text = CommonUtils.GetLocalizeText("time_sec", skillData.CDTime);
Text_SkillInfoDes.text = CommonUtils.GetLocalizeText(skillData.SkillDesc);
}
}
}

11
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPosterAndSkillInfoController.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 42fb6b56cdc6c444b868392d6e23aa5a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

35
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs
View File

@ -191,7 +191,7 @@ public class UITeamFightController : UIWindow
{
if (LevelManager.Instance.CurrentLevel.IsPreparing())
{
GameObj_SkillInfo.gameObject.SetActive(false);
//GameObj_SkillInfo.gameObject.SetActive(false);
Image_ReserveFold.gameObject.SetActive(false);
RefreshWaitList();
RefreshOnFightList();
@ -441,6 +441,7 @@ public class UITeamFightController : UIWindow
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
if (LevelManager.Instance.CurrentLevel.IsInBattle())
@ -499,7 +500,7 @@ public class UITeamFightController : UIWindow
void RefreshToFightSelect(uint uid)
{
RefreshSkillInfo();
GameObj_SkillInfo.SetActive(true);
//GameObj_SkillInfo.SetActive(true);
SetSelectFightItem(uid);
}
@ -700,7 +701,7 @@ public class UITeamFightController : UIWindow
if(TeamManager.Instance.SelectID == uid)
{
RefreshSkillInfo();
GameObj_SkillInfo.SetActive(false);
//GameObj_SkillInfo.SetActive(false);
TeamManager.Instance.SetSelectID();
SetSelectFightUid();
}
@ -752,7 +753,7 @@ public class UITeamFightController : UIWindow
if (LevelManager.Instance.CurrentLevel.IsPreparing())
{
RefreshSkillInfo();
GameObj_SkillInfo.SetActive(true);
//GameObj_SkillInfo.SetActive(true);
SetSelectFightItem(uid);
}
else if (LevelManager.Instance.CurrentLevel.IsInBattle())
@ -765,7 +766,7 @@ public class UITeamFightController : UIWindow
void RefreshFightBack(uint uid)
{
RefreshWaitList(true);
GameObj_SkillInfo.SetActive(false);
//GameObj_SkillInfo.SetActive(false);
SetSelectFightItem(uid, true);
}
@ -845,6 +846,7 @@ public class UITeamFightController : UIWindow
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
}
@ -956,7 +958,7 @@ public class UITeamFightController : UIWindow
if (TeamManager.Instance.SelectID == uid)
{
RefreshSkillInfo();
GameObj_SkillInfo.SetActive(false);
//GameObj_SkillInfo.SetActive(false);
TeamManager.Instance.SetSelectID();
SetSelectFightUid();
}
@ -1137,6 +1139,7 @@ public class UITeamFightController : UIWindow
{
await UniTask.DelayFrame(2);
TeamManager.IsHideAllUI = true;
TeamManager.Instance.OpenFightPosterUI(uid);
}
}
@ -1176,7 +1179,7 @@ public class UITeamFightController : UIWindow
LevelManager.Instance.CurrentLevel.SelectUnit(uid);
comp.RefreshSelect(true);
GameObj_SkillInfo.SetActive(true);
//GameObj_SkillInfo.SetActive(true);
}
else if (uid != selectFightUid)
{
@ -1191,7 +1194,7 @@ public class UITeamFightController : UIWindow
if (TeamManager.Instance.GetFightList().Contains(uid))
{
SetSelectFightUid();
GameObj_SkillInfo.SetActive(false);
//GameObj_SkillInfo.SetActive(false);
TeamManager.Instance.SelectToWait(uid);
FightToWait(uid);
return;
@ -1384,7 +1387,7 @@ public class UITeamFightController : UIWindow
RefreshFightSelect(uid);
RefreshSkillInfo(uid);
GameObj_SkillInfo.gameObject.SetActive(true);
//GameObj_SkillInfo.gameObject.SetActive(true);
_skillPutUid = uid;
EnterPutSkill(uid);
}
@ -1394,7 +1397,7 @@ public class UITeamFightController : UIWindow
TeamManager.Instance.SetSelectID(uid);
selectFightUid = uid;
RefreshFightSelect(uid);
GameObj_SkillInfo.SetActive(true);
//GameObj_SkillInfo.SetActive(true);
RefreshSkillInfo();
}
@ -1413,7 +1416,7 @@ public class UITeamFightController : UIWindow
if (m_curSkillState == SkillPutState.Dragging)
{
SetSelectFightItem(Constants.INVALID_UINT_ID, true);
GameObj_SkillInfo.gameObject.SetActive(false);
//GameObj_SkillInfo.gameObject.SetActive(false);
ExitPutSkill();
}
}
@ -1476,6 +1479,7 @@ public class UITeamFightController : UIWindow
if (!TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = true;
TeamManager.Instance.OpenFightPosterUI(uid);
}
}
@ -1512,7 +1516,7 @@ public class UITeamFightController : UIWindow
if (m_curSkillState == SkillPutState.Dragging)
{
SetSelectFightItem(Constants.INVALID_UINT_ID, true);
GameObj_SkillInfo.gameObject.SetActive(false);
//GameObj_SkillInfo.gameObject.SetActive(false);
ExitPutSkill();
}
return;
@ -1558,7 +1562,7 @@ public class UITeamFightController : UIWindow
void ClearSelectFight()
{
SetSelectFightUid();
GameObj_SkillInfo.SetActive(false);
//GameObj_SkillInfo.SetActive(false);
foreach (var go in m_fightItemList)
{
var comp = go.GetComponent<UIHeadItemNodeBase>();
@ -1639,6 +1643,7 @@ public class UITeamFightController : UIWindow
if (!TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = true;
TeamManager.Instance.OpenFightPosterUI(uid);
}
}
}
@ -1681,6 +1686,7 @@ public class UITeamFightController : UIWindow
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
EventManager.Instance.Send(EventManager.EventName.UI_END_USE_SKILL, true);
}
@ -1713,6 +1719,7 @@ public class UITeamFightController : UIWindow
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
if (!LevelManager.Instance.CurrentLevel.IsInBattle())
@ -1723,7 +1730,7 @@ public class UITeamFightController : UIWindow
_skillPutUid = Constants.INVALID_UINT_ID;
SetSelectFightItem(Constants.INVALID_UINT_ID, true);
GameObj_SkillInfo.gameObject.SetActive(false);
//GameObj_SkillInfo.gameObject.SetActive(false);
// if (m_curSkillState == SkillPutState.Dragging)
// {
// DebugUtil.LogError("没有退出技能释放！！！");

2
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs
View File

@ -313,6 +313,7 @@ public class UI_StartBtn_CMSBtnController : UIWindow{
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
EventManager.Instance.Send(EventManager.EventName.INFIGHT_PLAYER_SKILL_RELEASE, data);
GoCancelSkill.SetActive(false);
@ -346,6 +347,7 @@ public class UI_StartBtn_CMSBtnController : UIWindow{
if (TeamManager.IsHideAllUI)
{
TeamManager.IsHideAllUI = false;
TeamManager.Instance.CloseFightPosterUI();
}
}

48
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs Normal file
View File

@ -0,0 +1,48 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using Framework;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UIElements;
using Button = UnityEngine.UI.Button;
using Image = UnityEngine.UI.Image;
using Toggle = UnityEngine.UI.Toggle;
using ScrollView = PhxhSDK.PhxhScrollView;
public class UIPosterAndSkillInfoBinder
{
public static void GetComponents(UIPosterAndSkillInfoController window)
{
window.Button_SkillInfoBg = window.GetComponent<Button>("GameObj_SkillInfo/Button_SkillInfoBg");
window.Image_UI_PosterShadow = window.GetComponent<Image>("GameObj_SkillInfo/Image_UI_PosterShadow");
window.Image_StandPaintting = window.GetComponent<Image>("GameObj_SkillInfo/Image_StandPaintting");
window.Image_CharacterLogo = window.GetComponent<Image>("GameObj_SkillInfo/Image_StandPaintting/ImageBG/Image_CharacterLogo");
window.Image_SkillInfoLogo = window.GetComponent<Image>("GameObj_SkillInfo/Image_StandPaintting/ImageBG/Image_SkillInfoLogo");
window.Text_SkillName = window.GetComponent<TMP_Text>("GameObj_SkillInfo/Image_StandPaintting/ImageBG/Image_SkillInfoLogo/Text_SkillName");
window.Text_SkillCD = window.GetComponent<TMP_Text>("GameObj_SkillInfo/Image_StandPaintting/ImageBG/ImageSkillCDLogo/Text_SkillCD");
window.Text_SkillCDSecond = window.GetComponent<TMP_Text>("GameObj_SkillInfo/Image_StandPaintting/ImageBG/ImageSkillCDLogo/Text_SkillCDSecond");
window.Text_SkillInfoDes = window.GetComponent<TMP_Text>("GameObj_SkillInfo/Image_StandPaintting/ImageBG/Text_SkillInfoDes");
window.Image_Profession = window.GetComponent<Image>("GameObj_SkillInfo/Image_StandPaintting/Image_Profession");
window.Text_CharacterName = window.GetComponent<TMP_Text>("GameObj_SkillInfo/Image_StandPaintting/Image_Profession/Text_CharacterName");
window.Text_EnglishName = window.GetComponent<TMP_Text>("GameObj_SkillInfo/Image_StandPaintting/Image_Profession/Text_EnglishName");
}
/****** 定义变量语句 ******
public Button Button_SkillInfoBg;
public Image Image_UI_PosterShadow;
public Image Image_StandPaintting;
public Image Image_CharacterLogo;
public Image Image_SkillInfoLogo;
public TMP_Text Text_SkillName;
public TMP_Text Text_SkillCD;
public TMP_Text Text_SkillCDSecond;
public TMP_Text Text_SkillInfoDes;
public Image Image_Profession;
public TMP_Text Text_CharacterName;
public TMP_Text Text_EnglishName;
****** End ******/
}

11
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIPosterAndSkillInfoBinder.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 06ebb0bf561eace47a67943a5b176630
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: