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

【UI重制】战斗结算界面重制

main
chenyuqi 2024-08-06 13:40:53 +08:00
parent b21ea89f4b
commit c72cd80525
9 changed files with 204 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/LevelSettle/UIPassGame.prefab
View File

@ -622,7 +622,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -3495,7 +3495,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -6566,7 +6566,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3252725360067228033
RectTransform:
m_ObjectHideFlags: 0
@ -6658,7 +6658,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -7348,7 +7348,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -7468,7 +7468,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7088865053505302421
RectTransform:
m_ObjectHideFlags: 0
@ -7560,7 +7560,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -9046,7 +9046,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}

111
ProjectNLD/Assets/Art/UI/Prefab/LevelSceneUI/UI_OccupiedBar.prefab
View File

@ -1257,9 +1257,10 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8381487466162496696}
- component: {fileID: 1985405050611257597}
- component: {fileID: 2660966694272791517}
- component: {fileID: 6640006250275851584}
- component: {fileID: 6793180350657564946}
- component: {fileID: 2905720204560913623}
m_Layer: 5
m_Name: PhxhScrollView
m_TagString: Untagged
@ -1287,40 +1288,6 @@ RectTransform:
m_AnchoredPosition: {x: -18.870483, y: -21.3004}
m_SizeDelta: {x: 651.6, y: 258.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1985405050611257597
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811521453267881390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9f9de67925f950347af7cb5c19023db8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 6797695736965061699}
m_Horizontal: 1
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 2581244301865439219}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
defaultItemSize: {x: 0, y: 0}
itemTemplate: {fileID: 0}
layoutType: 1
poolSize: 0
--- !u!222 &2660966694272791517
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1359,6 +1326,60 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &6793180350657564946
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811521453267881390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 6797695736965061699}
m_Horizontal: 0
m_Vertical: 0
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 2581244301865439219}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_HorizontalScrollbarSpacing: 0
m_VerticalScrollbarSpacing: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2905720204560913623
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3811521453267881390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2afdea96f23d9c24daa7ca2362138277, type: 3}
m_Name:
m_EditorClassIdentifier:
firstArrow: {fileID: 0}
endArrow: {fileID: 0}
dir: 1
isShowArrow: 0
lines: 1
squareSpacing: 5
cell: {fileID: 0}
Spacing: {x: 0, y: 0}
row: 0
col: 0
paddingTop: 0
paddingLeft: 0
--- !u!1 &4157986604127559174
GameObject:
m_ObjectHideFlags: 0
@ -2384,9 +2405,9 @@ RectTransform:
- {fileID: 7572892614214770591}
m_Father: {fileID: 6797695736965061699}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 351.3, y: -111.73334}
m_SizeDelta: {x: 594, y: 51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8753139055569252016
@ -3051,9 +3072,9 @@ RectTransform:
- {fileID: 3188666501659345366}
m_Father: {fileID: 6797695736965061699}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 351.3, y: -197.96667}
m_SizeDelta: {x: 594, y: 51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2957508780601181034
@ -3132,9 +3153,9 @@ RectTransform:
- {fileID: 306763367573363432}
m_Father: {fileID: 6797695736965061699}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 351.3, y: -25.5}
m_SizeDelta: {x: 594, y: 51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8595666398011054598
@ -3422,7 +3443,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.024510356, y: 0.00041962}
m_AnchoredPosition: {x: 0.00015609246, y: 0.00041962}
m_SizeDelta: {x: 0, y: 258.7}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7921340029038069185

8
ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.Audio.cs
View File

@ -34,4 +34,12 @@ public partial class SROptions
{
AudioManager.Instance.AudioMgrObj.StopAll();
}
[Category("音频")]
[DisplayName("多个音频同时播放")]
public async void PlayMany()
{
var audioID = AudioManager.Instance.PlayAudio("");
}
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Reward/RewardManager.cs
View File

@ -192,8 +192,8 @@ public class RewardItemList
public class RewardItem
{
public readonly int ID;
public readonly int Count;
public int ID;
public int Count;
private DataItem _config;
public bool Valid => _config != null;

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

@ -632,6 +632,12 @@ public class Team
return count;
}
//获取角色索引
public int GetCharacterIdx(uint id)
{
return Array.IndexOf(_characterIDs, id) + 1;
}
}
public class TeamEditStoreData

44
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightSceneUI/UIOccupyItemNode.cs Normal file
View File

@ -0,0 +1,44 @@
using System;
using Gameplay.Fight.Capture;
using TMPro;
using UnityEngine.UI;
public class UIOccupyItemNode: UINode
{
private CaptureInst _capture;
public Image imgProcess;
public Image imgLogo;
public Image imgCharacter;
public Image imgVehicle;
public Image imgTime;
public TMP_Text txtOccupy;
private void Awake()
{
_GetComponents();
}
private void Update()
{
}
private void _GetComponents()
{
imgProcess = _GetComponent<Image>("Image_YellowBar");
imgLogo = _GetComponent<Image>("Image_Logo");
imgCharacter = _GetComponent<Image>("Image_Person");
imgVehicle = _GetComponent<Image>("Image_Tank");
imgTime = _GetComponent<Image>("Image_Time");
}
#region API
public void SetData(CaptureInst data)
{
_capture = data;
}
#endregion
}

3
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightSceneUI/UIOccupyItemNode.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 03695d51a6c34fe5a7ad9763d59220d4
timeCreated: 1719474174

76
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UIPassGameController.cs
View File

@ -340,7 +340,7 @@ public class UIPassGameController : UIWindow
private void _RefreshAimInfo()
{
var levelInfo = LevelManager.Instance.GetLevelInfoByID(_levelID);
//var levelInfo = LevelManager.Instance.GetLevelInfoByID(_levelID);
var levelCfg = TableManager.Instance.Tables.Level.GetOrDefault(_levelID);
var levelRewardID = new List<List<int>>(3);
if (levelCfg != null)
@ -350,49 +350,40 @@ public class UIPassGameController : UIWindow
levelRewardID.Add(new List<int>(levelCfg.StarRewardID3));
}
var txtContent = "";
for (int i = 0; i < _aimObjList.Count; i++)
{
var txtContent = "";
var aimObj = _aimObjList[i];
var txtDesc = CommonUtils.GetComponent<TMP_Text>(aimObj, "TextDescribe");
var isFinish = LevelManager.Instance.CurrentLevel.GetStarIsSuccess(i);
TMP_Text txtGetItem;
if (isFinish)
{
txtGetItem = CommonUtils.GetComponent<TMP_Text>(aimObj, "TextGetItem");
}
else
{
txtGetItem = CommonUtils.GetComponent<TMP_Text>(aimObj, "TextGetItemFailed");
}
var txtGetItem = CommonUtils.GetComponent<TMP_Text>(aimObj, "TextGetItem");
var txtGetItemFailed = CommonUtils.GetComponent<TMP_Text>(aimObj, "TextGetItemFailed");
txtGetItem.gameObject.SetActive(isFinish);
txtGetItemFailed.gameObject.SetActive(!isFinish);
txtDesc.text = LevelManager.Instance.CurrentLevel.GetStarTargetLocalization(i);
// if (levelCfg != null)
// {
// var levelRewardL = levelRewardID[i];
// if (levelRewardL.Count > 0)
// {
//
// for (int j = 0; j < levelRewardL.Count; j++)
// {
// var reward = RewardManager.Instance.Get(levelRewardL[j]);
// var itemList = reward.ItemList;
// for (int n = 0; n < itemList.Count; n++)
// {
// var list = itemList.Get();
// var itemID = list[n].ID;
// var itemCfg = TableManager.Instance.Tables.Item.GetOrDefault(itemID);
// if (itemCfg != null)
// {
// var name = CommonUtils.GetLocalizeText(itemCfg.NameLocal);
// txtContent += name + "+" + list[n].Count;
// }
// }
// }
// }
// }
if (levelCfg != null)
{
var levelRewardL = levelRewardID[i];
if (levelRewardL.Count > 0)
{
var itemList = CommonUtils.GetFilterRewardItemList(levelRewardL);
for (int n = 0; n < itemList.Count; n++)
{
var list = itemList[n];
var itemID = list.ID;
var itemCfg = TableManager.Instance.Tables.Item.GetOrDefault(itemID);
if (itemCfg != null)
{
var name = CommonUtils.GetLocalizeText(itemCfg.NameLocal);
txtContent += name + "x" + list.Count;
}
}
}
}
txtGetItem.text = txtContent;
txtGetItemFailed.text = txtContent;
}
}
@ -434,7 +425,7 @@ public class UIPassGameController : UIWindow
}
}
private void _RefreshHead(int idx)
private async void _RefreshHead(int idx)
{
var item = _itemHeadList[idx];
if (idx >= _charIDs.Count)
@ -453,6 +444,19 @@ public class UIPassGameController : UIWindow
headNode.Refresh(false);
}
var txtTeamIdx = CommonUtils.GetComponent<TMP_Text>(item, "Image_SerialNumber/Text_Number");
var team = LevelManager.Instance.SettleData.Team;
var teamIdx = team.GetCharacterIdx(uid);
txtTeamIdx.text = teamIdx.ToString();
var imgPro = CommonUtils.GetComponent<Image>(item, "ImageProfessionRect/ImageProfession");
var job = CommonUtils.GetProfessionByUid(uid);
var jobData = TableManager.Instance.Tables.JobAttri.GetOrDefault((int)job);
var spritePath = jobData.IconPath;
var sprite = await LoadAssetAsync<Sprite>(spritePath);
imgPro.sprite = sprite;
//txtTeamIdx.text =
var txtExpAdd = CommonUtils.GetComponent<TMP_Text>(item, "ImageHeroEXpEmpty/TextHeroEXPUp");
var imgExpProcess = CommonUtils.GetComponent<Image>(item, "ImageHeroEXpEmpty/ImageHeroEXpFull");
var txtLv = CommonUtils.GetComponent<TMP_Text>(item, "TextHeroLV");

27
ProjectNLD/Assets/Code/Scripts/Gameplay/Utils/CommonUtils.cs
View File

@ -1766,6 +1766,33 @@ namespace Gameplay
return list;
}
public static List<RewardItem> GetFilterRewardItemList(List<int> rewardIDList)
{
var list = new List<RewardItem>();
for (int i = 0; i < rewardIDList.Count; i++)
{
var reward = RewardManager.Instance.Get(rewardIDList[i]);
var itemList = reward.ItemList.Get();
for (int j = 0; j < itemList.Count; j++)
{
var item = itemList[i];
if (CheckItemIsClientDisplay(item.ID))
{
var it = list.Find(t => t.ID == item.ID);
if (it == null)
{
list.Add(new(item.ID, item.Count));
continue;
}
it.Count += item.Count;
}
}
}
return list;
}
public static List<Item> GetFilterRewardItemList(List<Item> itemList)
{
var retItemList = new List<Item>();