From eb07cfa694e1c3245ded48b4a76c691ba9a08047 Mon Sep 17 00:00:00 2001 From: "SD-20250415ABSO\\Administrator" Date: Thu, 24 Apr 2025 22:49:42 +0800 Subject: [PATCH] 123 --- .../Assets/AssetRaw/UI/UIGameBattle.prefab | 299 +++++++++++++++++- .../HotFix/GameLogic/Actor/ActorHItem.cs | 38 ++- 2 files changed, 328 insertions(+), 9 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 32b76c82..d2c77ce4 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -302,7 +302,7 @@ GameObject: - component: {fileID: 6455509018076431060} - component: {fileID: 5008647702931026399} m_Layer: 5 - m_Name: TmpValue + m_Name: m_tmpValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -424,6 +424,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &619971104440922582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8010860323348911180} + - component: {fileID: 1305560110852435988} + - component: {fileID: 9024784270059981669} + m_Layer: 5 + m_Name: m_rectCar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8010860323348911180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619971104440922582} + 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: + - {fileID: 5645085182591318069} + m_Father: {fileID: 1814839733780877975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 600, y: 0.8253114} + m_SizeDelta: {x: 151.1919, y: 72.0505} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &1305560110852435988 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619971104440922582} + m_CullTransparentMesh: 1 +--- !u!114 &9024784270059981669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619971104440922582} + 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: f602b4f90c80ffb42b32186d8075f24d, 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 &900172331572250168 GameObject: m_ObjectHideFlags: 0 @@ -645,7 +721,7 @@ GameObject: - component: {fileID: 5164661564043509363} - component: {fileID: 7628184747201228492} m_Layer: 5 - m_Name: HeadBg + m_Name: HeadItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -822,7 +898,7 @@ GameObject: - component: {fileID: 4685188954278798137} - component: {fileID: 4093117778049352650} m_Layer: 5 - m_Name: ImgValue + m_Name: m_imgValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -841,6 +917,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4871076593613299986} + - {fileID: 8010860323348911180} m_Father: {fileID: 8086681985000168470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1331,6 +1408,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &3121624785819966891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 723487191200688913} + - component: {fileID: 6705509483898808470} + - component: {fileID: 8152058606312674378} + 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 &723487191200688913 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3121624785819966891} + 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: 2729579121250304069} + 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: -3.6, y: 7.3} + m_SizeDelta: {x: 270, y: 368} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6705509483898808470 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3121624785819966891} + m_CullTransparentMesh: 1 +--- !u!114 &8152058606312674378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3121624785819966891} + 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: 2d5c694fc8d2bed46996062763ed3b36, 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 &3176873002882724063 GameObject: m_ObjectHideFlags: 0 @@ -1548,7 +1700,7 @@ GameObject: - component: {fileID: 4991538220359157427} - component: {fileID: 6917488015079132726} m_Layer: 5 - m_Name: TmpSign + m_Name: m_tmpSign m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1797,7 +1949,7 @@ GameObject: - component: {fileID: 2424025201224710725} - component: {fileID: 3408328990952130626} m_Layer: 5 - m_Name: ImgSign + m_Name: m_imgSign m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1861,6 +2013,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5818212637391323579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5645085182591318069} + - component: {fileID: 2935469788889109837} + - component: {fileID: 3133149053487241148} + m_Layer: 5 + m_Name: m_tmpAllValue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5645085182591318069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5818212637391323579} + 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: 8010860323348911180} + 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: 115.85028, y: -7.8843174} + m_SizeDelta: {x: 104.891, y: 38.5293} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2935469788889109837 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5818212637391323579} + m_CullTransparentMesh: 1 +--- !u!114 &3133149053487241148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5818212637391323579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 1982 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 0d31a1ad97de02943ab92c2d32b88a3e, type: 2} + m_sharedMaterial: {fileID: -1876281447957755805, guid: 0d31a1ad97de02943ab92c2d32b88a3e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5904522426565324794 GameObject: m_ObjectHideFlags: 0 @@ -1965,7 +2251,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 723487191200688913} m_Father: {fileID: 1508900408836313865} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 466556c0..208fe34a 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -1,14 +1,31 @@ using System.Collections; using System.Collections.Generic; using TEngine; +using TMPro; using UnityEngine; +using UnityEngine.UI; namespace GameLogic { public class ActorHItem : UIWidget { - - + #region 脚本工具生成的代码 + private Image m_imgSign; + private TextMeshProUGUI m_tmpSign; + private Image m_imgValue; + private TextMeshProUGUI m_tmpValue; + private RectTransform m_rectCar; + private TextMeshProUGUI m_tmpAllValue; + protected override void ScriptGenerator() + { + m_imgSign = FindChildComponent("Mid/m_imgSign"); + m_tmpSign = FindChildComponent("Mid/m_imgSign/m_tmpSign"); + m_imgValue = FindChildComponent("Mid/m_imgValue"); + m_tmpValue = FindChildComponent("Mid/m_imgValue/m_tmpValue"); + m_rectCar = FindChildComponent("Mid/m_imgValue/m_rectCar"); + m_tmpAllValue = FindChildComponent("Mid/m_imgValue/m_rectCar/m_tmpAllValue"); + } + #endregion public int m_Index; private long m_AllScore; @@ -19,11 +36,26 @@ namespace GameLogic } + protected override void OnUpdate() + { + base.OnUpdate(); + } + public void OnInit(int i) { m_Index = i; - m_AllScore = 100 * i; + + int assetsId = (i + 1) % 10 == 0 ? 1 : (i + 1) % 10; + + + m_imgSign.sprite = GameModule.Resource.LoadAsset("zjm_mz_" + assetsId); + m_imgValue.sprite = GameModule.Resource.LoadAsset("zjm_jdt_" + assetsId); + m_tmpSign.text = DataGameSceneManager.Instance.m_Strs[i]; + m_tmpAllValue.text = m_AllScore.ToString(); } + + + public long GetAllPower() { return m_AllScore;