Cjw/Zqdn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成基础版本，开始优化数值跳动显示，玩家加入流程

Browse Source
This commit is contained in:
SD-20250415ABSO\Administrator 2025-04-24 21:08:10 +08:00
parent 11e94dd99b
commit 1330fce198
4 changed files with 130 additions and 1091 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1008
UnityProject/Assets/AssetRaw/UI/H_Item.prefab
View File

File diff suppressed because it is too large Load Diff

7
UnityProject/Assets/AssetRaw/UI/H_Item.prefab.meta
View File

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

130
UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
View File

@ -1224,6 +1224,9 @@ GameObject:
m_Component:
- component: {fileID: 903966777167520147}
- component: {fileID: 8156066108206093086}
- component: {fileID: 7909533077594497422}
- component: {fileID: 2844124311124363085}
- component: {fileID: 3768121639935594581}
m_Layer: 5
m_Name: m_rectHPanel
m_TagString: Untagged
@ -1277,6 +1280,57 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!222 &7909533077594497422
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2340854399478894676}
m_CullTransparentMesh: 1
--- !u!114 &2844124311124363085
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2340854399478894676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3768121639935594581
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2340854399478894676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &3176873002882724063
GameObject:
m_ObjectHideFlags: 0
@ -1645,6 +1699,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 903966777167520147}
- {fileID: 8930060087937031299}
m_Father: {fileID: 1508900408836313865}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1806,6 +1861,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5904522426565324794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8930060087937031299}
- component: {fileID: 9067940855249392470}
- component: {fileID: 7318191538509757720}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8930060087937031299
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5904522426565324794}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6282578790962902355}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 16, y: -654}
m_SizeDelta: {x: 1210, y: 92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9067940855249392470
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5904522426565324794}
m_CullTransparentMesh: 1
--- !u!114 &7318191538509757720
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5904522426565324794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6e658336532116a4db63aef49f6faef9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6872840646026330029
GameObject:
m_ObjectHideFlags: 0

76
UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
View File

@ -111,7 +111,6 @@ namespace GameLogic
{
base.RegisterEvent();
GameEvent.AddEventListener(EventConts.RestGameBattle, RestGameBattleFunc);
GameEvent.AddEventListener<long>(EventConts.UpdateHItem, UpdateHItemFunc);
GameEvent.AddEventListener<UnitPlayerData>(EventConts.AddPlayer, AddPlayerFunc);
GameEvent.AddEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
}
@ -121,7 +120,6 @@ namespace GameLogic
{
base.OnDestroy();
GameEvent.RemoveEventListener(EventConts.RestGameBattle, RestGameBattleFunc);
GameEvent.RemoveEventListener<long>(EventConts.UpdateHItem, UpdateHItemFunc);
GameEvent.RemoveEventListener<UnitPlayerData>(EventConts.AddPlayer, AddPlayerFunc);
GameEvent.RemoveEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
}
@ -176,17 +174,6 @@ namespace GameLogic
}
private void UpdateHItemFunc(long allValue)
{
//for (int i = 0; i < m_rect_List.childCount; i++)
//{
// if (m_rect_List.GetChild(i) != null)
// {
// m_rect_List.GetChild(i).GetComponent<HItemActor>().OnUpdate(allValue);
// }
//}
}
/// <summary>
/// 收到游戏重开的消息
/// </summary>
@ -208,31 +195,6 @@ namespace GameLogic
//DataGameSceneManager.Instance.SetGameState(true);
}
/// <summary>
/// 重置横版列表
/// </summary>
private void RestHItemFunc()
{
//if (EventConts.gameStateType == GameStateType.团队赛)
//{
// // 移除旧的
// for (int i = 0; i < m_rect_List.childCount; i++)
// {
// m_rect_List.GetChild(i).GetComponent<HItemActor>().OnRemove();
// }
// // 生成新的
// for (int i = 0; i < EventConts.MaxPlayerIds; i++)
// {
// CreateHItem(i.ToString());
// }
//}
//else if (EventConts.gameStateType == GameStateType.个人赛)
//{
//}
}
/// <summary>
@ -272,22 +234,12 @@ namespace GameLogic
// Populate the list with HItemActors and their scores
for (int i = 0; i < m_rectHPanel.childCount; i++)
{
// var child = m_rectHPanel.GetChild(i);
// if (child != null)
// {
// var hItemActor = child.GetComponent<ActorHItem>();
// long score = hItemActor.GetAllPower(); // Assume GetScore() returns the score of the actor
// hItemActors.Add((hItemActor, score));
// }
if (i < DataGameSceneManager.Instance.m_TeamSortList.Count)
{
var hItemActor = DataGameSceneManager.Instance.m_TeamSortList[i];
long score = hItemActor.GetAllPower(); // Assume GetScore() returns the score of the actor
hItemActors.Add((hItemActor, score));
}
}
// Sort the list based on scores in descending order
@ -303,34 +255,6 @@ namespace GameLogic
targetPositions[rectTransform] = targetPosition;
}
// if (hItemActors.Count > 0)
// {
// UpdateTopActorTest(hItemActors[0].actor.m_Actor);
// }
// else
// {
// UpdateTopActorTest(null);
// }
}
private void CreateHItem(string oid)
{
//int i = m_rect_List.childCount;
//var go = GameModule.Resource.LoadAsset<GameObject>("H_Item");
//var item = GameObject.Instantiate(go);
//item.transform.SetParent(m_rect_List);
//item.transform.localScale = Vector3.one;
//var r = item.GetComponent<RectTransform>();
//// 计算位置
//r.anchorMin = new Vector2(0.5f, 0.5f);
//r.anchorMax = new Vector2(0.5f, 0.5f);
//r.anchoredPosition = new Vector2(0, 151 - i * 50.5945f);
//r.localPosition = new Vector3(r.localPosition.x, r.localPosition.y, 0);
//HItemActor hItemActor = item.GetComponent<HItemActor>();
//hItemActor.OnInit(oid);
}
}