update UI. add more developed feature into UI

This commit is contained in:
Chomper9981
2026-02-27 17:27:26 +07:00
parent ee4fe6891b
commit b73de9553e
15 changed files with 779 additions and 200 deletions
+481 -2
View File
@@ -218,6 +218,139 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &335905991743982376
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1572942396405590444}
- component: {fileID: 6524368999182548347}
- component: {fileID: 3967330152047649732}
- component: {fileID: 6939892946615024074}
m_Layer: 5
m_Name: ChangeSkillBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1572942396405590444
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 335905991743982376}
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: 3145908486618148274}
m_Father: {fileID: 3483809415181351540}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -718.8898, y: 36.854492}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6524368999182548347
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 335905991743982376}
m_CullTransparentMesh: 1
--- !u!114 &3967330152047649732
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 335905991743982376}
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: f0f6993d8df90de429f182e7d49a89f7, 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!114 &6939892946615024074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 335905991743982376}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3967330152047649732}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1890210201668811196}
m_TargetAssemblyTypeName: CECUIManager, Assembly-CSharp
m_MethodName: OnChangeSkillShortcut
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &427315709131599085
GameObject:
m_ObjectHideFlags: 0
@@ -490,6 +623,142 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &806379414455135824
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3424248442838442643}
- component: {fileID: 8575635143285857700}
- component: {fileID: 2564374985051604717}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3424248442838442643
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 806379414455135824}
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: 7306104429597638794}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8575635143285857700
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 806379414455135824}
m_CullTransparentMesh: 1
--- !u!114 &2564374985051604717
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 806379414455135824}
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:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
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_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 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 &921810299079476810
GameObject:
m_ObjectHideFlags: 0
@@ -1815,6 +2084,139 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2782657052243972202
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7306104429597638794}
- component: {fileID: 4294505687272824498}
- component: {fileID: 1230139452348518632}
- component: {fileID: 808265911987054922}
m_Layer: 5
m_Name: FlyBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7306104429597638794
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782657052243972202}
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: 3424248442838442643}
m_Father: {fileID: 3483809415181351540}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -791.8898, y: -64.69995}
m_SizeDelta: {x: 96, y: 96}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4294505687272824498
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782657052243972202}
m_CullTransparentMesh: 1
--- !u!114 &1230139452348518632
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782657052243972202}
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: 6080708437622403664, guid: 205ebb1fc3847174cb78c7574a2b5a7d, 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!114 &808265911987054922
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782657052243972202}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1230139452348518632}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1890210201668811196}
m_TargetAssemblyTypeName: CECUIManager, Assembly-CSharp
m_MethodName: OnClickFly
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: DlgTask
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &2872011510662580381
GameObject:
m_ObjectHideFlags: 0
@@ -3999,7 +4401,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -781, y: -66.70001}
m_AnchoredPosition: {x: -898.4271, y: -67.48236}
m_SizeDelta: {x: 85, y: 99}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6123887107398507141
@@ -4817,8 +5219,10 @@ RectTransform:
- {fileID: 984617901920738932}
- {fileID: 2783469216819378410}
- {fileID: 8913509984865075419}
- {fileID: 7306104429597638794}
- {fileID: 5823843793071880086}
- {fileID: 1462603449517194619}
- {fileID: 1572942396405590444}
- {fileID: 7020286574697807252}
- {fileID: 1491137607121893366}
- {fileID: 6742883814524417716}
@@ -4847,6 +5251,81 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_escapeBtn: {fileID: 2013061949432893537}
--- !u!1 &7352847439676120744
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3145908486618148274}
- component: {fileID: 7098900891199169049}
- component: {fileID: 6088460147805800063}
m_Layer: 5
m_Name: hitbox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3145908486618148274
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7352847439676120744}
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: 1572942396405590444}
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.4105263, y: 3.4105263}
m_SizeDelta: {x: 106.8, y: 70.421}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7098900891199169049
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7352847439676120744}
m_CullTransparentMesh: 1
--- !u!114 &6088460147805800063
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7352847439676120744}
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!1 &7629826959126060481
GameObject:
m_ObjectHideFlags: 0
@@ -7485,7 +7964,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 776624419558043962, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3}
propertyPath: m_text
value: 1162119
value: 44650
objectReference: {fileID: 0}
- target: {fileID: 848034462487949471, guid: 22d3972b131ebdb4288f9cbdf996d691, type: 3}
propertyPath: m_AnchorMax.y
@@ -3,6 +3,7 @@ using BrewMonster.Common;
using BrewMonster.Network;
using BrewMonster.Scripts;
using BrewMonster.Scripts.UI;
using BrewMonster.Scripts.Task.UI;
using CSNetwork.GPDataType;
using ModelRenderer.Scripts.GameData;
using PerfectWorld.Scripts.Managers;
@@ -16,15 +17,16 @@ using UnityEngine.UI;
namespace BrewMonster.Scripts.Managers
{
public class EC_InventoryUI : MonoBehaviour
public class EC_InventoryUI : MonoBehaviour, IRefreshLayout
{
[Header("Pack Buttons (assign in Inspector)")]
[SerializeField] private List<Button> inventoryPackButtons = new List<Button>(); // byPackage: 0
[SerializeField] private List<Button> equipmentPackButtons = new List<Button>(); // byPackage: 1
[SerializeField] private List<Button> fashionPackButtons = new List<Button>(); // byPackage: 3
[Header("Detail Panel (assign in Inspector)")]
[SerializeField] private GameObject detailPanelRoot;
[SerializeField] private ItemInfo detailPanelRoot;
[SerializeField] private Vector2 detailPanelOffset = new Vector2(20f, 0f);
[SerializeField] private bool hideDetailOnStart = true;
[SerializeField] private EC_UIUtility.TextOutlet nameText;
@@ -127,6 +129,7 @@ namespace BrewMonster.Scripts.Managers
{
// Ensure cached values are pushed when the UI is enabled
ApplyPendingCurrency();
ShowDetailPanel(false);
}
private void Update()
@@ -325,9 +328,9 @@ namespace BrewMonster.Scripts.Managers
currentSelectedEquipment = CreateEquipmentFromItemData(itemData);
// Position detail panel near the clicked item button
PositionDetailPanelNearButton(package, slot);
FillDetailPanel(package, itemData);
PositionDetailPanelNearButton(package, slot);
}
else
{
@@ -957,7 +960,7 @@ namespace BrewMonster.Scripts.Managers
private void ShowDetailPanel(bool show)
{
EC_UIUtility.ShowPanel(detailPanelRoot, show);
EC_UIUtility.ShowPanel(detailPanelRoot.gameObject, show);
}
private Button GetButtonForSlot(byte package, int slot)
@@ -1059,7 +1062,7 @@ namespace BrewMonster.Scripts.Managers
// Show panel first
// 先显示面板
ShowDetailPanel(true);
descriptionText.tmp.gameObject.GetComponent<ItemInfoText>()?.RefreshLayout();
}
@@ -1080,8 +1083,17 @@ namespace BrewMonster.Scripts.Managers
{
if (package == PKG_INVENTORY)
{
tmpText.text = "Equip";
equipButton.gameObject.SetActive(true);
//if item is @EC_IvtrEquip and is not equipped, show equip button
if(item is EC_IvtrEquip)
{
tmpText.text = "Equip";
equipButton.gameObject.SetActive(true);
}
else
{
tmpText.text = "Use";
equipButton.gameObject.SetActive(true);
}
}
else if (package == PKG_EQUIPMENT)
{
@@ -1098,8 +1110,16 @@ namespace BrewMonster.Scripts.Managers
{
if (package == PKG_INVENTORY)
{
buttonText.text = "Equip";
equipButton.gameObject.SetActive(true);
if(item is EC_IvtrEquip)
{
buttonText.text = "Equip";
equipButton.gameObject.SetActive(true);
}
else
{
buttonText.text = "Use";
equipButton.gameObject.SetActive(true);
}
}
else if (package == PKG_EQUIPMENT)
{
@@ -1265,5 +1285,16 @@ namespace BrewMonster.Scripts.Managers
draggedItemSourceSlot = -1;
draggedItemSourcePackage = 0;
}
public void RefreshLayout()
{
var rectTransform = GetComponent<RectTransform>();
if (rectTransform == null)
{
return;
}
rectTransform.ForceUpdateRectTransforms();
LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
}
}
}
@@ -512,7 +512,7 @@ namespace CSNetwork
{
_logger.Log(LogType.Debug,
$"Sending protocol: {protocol.GetType().Name} (Detail: {protocol.ToString})");
BMLogger.Log($"[GameSession] Sending protocol: {protocol.GetType().Name} (Type: {protocol.GetPType()})");
BMLogger.Log($"[GameSession] Sending protocol: {protocol.GetType().Name} (Type: {protocol.GetPType()}) + {protocol.ToString}");
_networkManager.Send(protocol);
complete?.Invoke();
}
@@ -965,13 +965,14 @@ namespace BrewMonster
// case CMD_BUYBOOTH: pHost.CmdBuyBooth(); break;
case (int)CommandID.CMD_PLAYPOSE: pHost.CmdStartPose((int)m_dwParam); break;
// case CMD_INVITETOFACTION: pHost.CmdInviteToFaction(); break;
// case CMD_FLY:
// {
// // Èç¹ûÆï³ËÒª·ÉÐУ¬ÔòÕâЩ action switcher£¬·ñÔò CmdFly
// if (!pHost.GetActionSwitcher() || !pHost.GetActionSwitcher().OnRideToFlyAction())
// pHost.CmdFly();
// break;
// }
case (int)CommandID.CMD_FLY:
{
// 如果骑乘要飞行,则这些 action switcher,否则 CmdFly
// If riding wants to fly, then these action switcher, otherwise CmdFly
// Call CmdFly(true) to match F4 key behavior
pHost.CmdFly(true);
break;
}
// case CMD_PICKUP: pHost.CmdPickup(); break;
// case CMD_GATHER: pHost.CmdGather(); break;
// case CMD_RUSHFLY: pHost.CmdRushFly(); break;
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace BrewMonster
{
public class CDlgSkillSubAction : MonoBehaviour
@@ -35,6 +35,7 @@ namespace BrewMonster
private void OnEnable()
{
OnShowDialog();
}
public void Init()
{
@@ -46,11 +47,13 @@ namespace BrewMonster
{
var orderTP = Instantiate(orderTemplate, orderContain);
orderTP.gameObject.SetActive(true);
SetupActionClickHandler(orderTP);
m_aActionInfo.Add(new ActionInfo
{
image = orderTP,
pLabel = orderTP.GetComponentInChildren<TextMeshProUGUI>()
});
}
}
for (int j = 0; j < 27; j++)
@@ -67,6 +70,8 @@ namespace BrewMonster
pLabel = actionTP.GetComponentInChildren<TextMeshProUGUI>()
});
}
//force refresh layout orderContain anc actionContain
//then refresh layout of this gameobject
}
public void OnShowDialog()
{
@@ -138,7 +143,7 @@ namespace BrewMonster
private void OnActionClicked(AUIImagePicture actionImage)
{
if (actionImage == null) return;
Debug.Log("OnActionClicked: " + actionImage.name);
// Get the shortcut from the action image / 从动作图像获取快捷方式
actionImage.Execute();
}
@@ -68,7 +68,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
if (!isNotCastSkill)
{
pSC.Execute();
SetInteract(false);
//SetInteract(false);
}
}
else
@@ -0,0 +1,25 @@
using UnityEngine;
using BrewMonster.Scripts.Task.UI;
using UnityEngine.UI;
namespace BrewMonster
{
public class ItemInfo : MonoBehaviour, IRefreshLayout
{
public void RefreshLayout()
{
var rectTransform = GetComponent<RectTransform>();
if (rectTransform == null)
{
return;
}
rectTransform.ForceUpdateRectTransforms();
LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
Debug.Log("ItemInfo RefreshLayout");
if (transform.parent &&
transform.parent.TryGetComponent<IRefreshLayout>(out var refreshLayout))
{
refreshLayout.RefreshLayout();
}
}
}
}
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: fc26b8fa93aea49b4abb8fe5455e51fe
@@ -0,0 +1,32 @@
using UnityEngine;
using BrewMonster.Scripts.Task.UI;
using UnityEngine.UI;
namespace BrewMonster
{
public class ItemInfoText : MonoBehaviour, IRefreshLayout
{
[SerializeField] private RectTransform _rectTransform;
private void Awake()
{
_rectTransform = GetComponent<RectTransform>();
}
public void RefreshLayout()
{
var rectTransform = _rectTransform;
if (rectTransform == null)
{
return;
}
rectTransform.ForceUpdateRectTransforms();
LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
if (transform.parent &&
transform.parent.TryGetComponent<IRefreshLayout>(out var refreshLayout))
{
refreshLayout.RefreshLayout();
Debug.Log("ItemInfoText RefreshLayout");
}
}
}
}
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 4cf21a97aa5c9445c9859afa14de01ad
@@ -22,6 +22,12 @@ namespace BrewMonster
actionButton.onClick.AddListener(OnActionButtonClicked);
learnedSkillButton.onClick.AddListener(OnLearnedSkillButtonClicked);
}
void OnEnable()
{
skillUIPanel.SetActive(true);
actionUIPanel.SetActive(false);
learnSkillUIPanel.SetActive(false);
}
private void OnLearnedSkillButtonClicked()
{
+11 -61
View File
@@ -12559,7 +12559,7 @@ MonoBehaviour:
- {fileID: 6415804096478650164}
- {fileID: 486249631205428665}
fashionPackButtons: []
detailPanelRoot: {fileID: 2900449705256812174}
detailPanelRoot: {fileID: 759109931263093524}
detailPanelOffset: {x: 20, y: 0}
hideDetailOnStart: 1
nameText:
@@ -19739,22 +19739,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 5834405183358786743}
m_Modifications:
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 636299721907915661, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -19785,7 +19769,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 825.53
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1546246053547542409, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_LocalPosition.x
@@ -19839,46 +19823,6 @@ PrefabInstance:
propertyPath: m_Name
value: item_info
objectReference: {fileID: 0}
- target: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -805.53
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_SizeDelta.y
value: 805.53
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
propertyPath: m_AnchoredPosition.y
value: -402.765
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -19917,11 +19861,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2900449705256812174 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6830833846243993097, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
--- !u!114 &759109931263093524 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8936108025019184019, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
m_PrefabInstance: {fileID: 8542071282636773511}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc26b8fa93aea49b4abb8fe5455e51fe, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6020258894941961325 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2668322321768899818, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
+117 -114
View File
@@ -365,10 +365,10 @@ RectTransform:
- {fileID: 6913810588620795676}
m_Father: {fileID: 3123930244098203053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -140.39}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5889574211483133077
CanvasRenderer:
@@ -728,10 +728,10 @@ RectTransform:
- {fileID: 1609651149174304326}
m_Father: {fileID: 3123930244098203053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -242.78}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &521924147895834695
CanvasRenderer:
@@ -1615,10 +1615,10 @@ RectTransform:
- {fileID: 1704697067466645826}
m_Father: {fileID: 3123930244098203053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3604148096459499892
CanvasRenderer:
@@ -2282,7 +2282,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_SizeDelta: {x: 143.9446, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6858302016506942629
CanvasRenderer:
@@ -2433,7 +2433,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_SizeDelta: {x: 143.9446, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7562352963284824378
CanvasRenderer:
@@ -2641,7 +2641,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2387395177775218455
RectTransform:
m_ObjectHideFlags: 0
@@ -2751,10 +2751,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8358568677657722128
CanvasRenderer:
@@ -3364,10 +3364,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7646717020914693947
CanvasRenderer:
@@ -3952,9 +3952,9 @@ RectTransform:
- {fileID: 5885063335678115690}
m_Father: {fileID: 1263498971758389975}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: -18.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1887848967215853843
@@ -4115,7 +4115,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 309.47, y: -95}
m_SizeDelta: {x: 618.94, y: 76}
m_SizeDelta: {x: 618.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2264175676541462108
CanvasRenderer:
@@ -4225,10 +4225,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 554, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1725305811772317814
CanvasRenderer:
@@ -4601,10 +4601,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 468, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3765304872596771789
CanvasRenderer:
@@ -4888,10 +4888,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 296, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9207107349168631693
CanvasRenderer:
@@ -5048,7 +5048,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -322.47, y: 365.44547}
m_SizeDelta: {x: 644.94, y: 703.38}
m_SizeDelta: {x: 644.94, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8275541816169387879
CanvasRenderer:
@@ -5186,6 +5186,7 @@ MonoBehaviour:
borderImage: {fileID: 5124956242307597890}
cooldownTime: 0
m_ClockCounter: {fileID: 0}
isNotCastSkill: 0
--- !u!222 &523329600507644709
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -6614,10 +6615,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 124, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1291961236682885550
CanvasRenderer:
@@ -6690,9 +6691,9 @@ RectTransform:
- {fileID: 5918073574760109704}
m_Father: {fileID: 1285542512886306091}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: -18.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1257159900126729527
@@ -6765,10 +6766,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2268981575541439631
CanvasRenderer:
@@ -6847,7 +6848,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 335.47, y: -98.4}
m_SizeDelta: {x: 618.94, y: 140.8}
m_SizeDelta: {x: 618.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2124054608285479539
CanvasRenderer:
@@ -7518,10 +7519,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 468, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &897642746592729160
CanvasRenderer:
@@ -8035,10 +8036,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7412806809519503430
CanvasRenderer:
@@ -8231,10 +8232,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 124, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8958294640541543931
CanvasRenderer:
@@ -8667,7 +8668,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_SizeDelta: {x: 143.9446, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5438050072468631381
CanvasRenderer:
@@ -9198,7 +9199,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_SizeDelta: {x: 143.9446, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3044764523714620351
CanvasRenderer:
@@ -9615,10 +9616,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8292637089760855876
CanvasRenderer:
@@ -9691,9 +9692,9 @@ RectTransform:
- {fileID: 3666972851124413242}
m_Father: {fileID: 1244895283146852732}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: -18.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4852245878945746775
@@ -9767,10 +9768,10 @@ RectTransform:
- {fileID: 7544910809585033678}
m_Father: {fileID: 3123930244098203053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382.5, y: -242.78}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2164606938053553701
CanvasRenderer:
@@ -10024,10 +10025,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4804628498516101234
CanvasRenderer:
@@ -10100,9 +10101,9 @@ RectTransform:
- {fileID: 7738777691134633714}
m_Father: {fileID: 332864778784360512}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: -18.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8557376726661632322
@@ -10253,7 +10254,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 335.47, y: -263.3}
m_SizeDelta: {x: 618.94, y: 133}
m_SizeDelta: {x: 618.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5943966890611580968
CanvasRenderer:
@@ -10892,6 +10893,7 @@ MonoBehaviour:
borderImage: {fileID: 6819612505585264736}
cooldownTime: 0
m_ClockCounter: {fileID: 0}
isNotCastSkill: 0
--- !u!114 &7693362874457494086
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11044,10 +11046,10 @@ RectTransform:
- {fileID: 7759567721800243228}
m_Father: {fileID: 3123930244098203053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382.5, y: -140.39}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2464100607009156610
CanvasRenderer:
@@ -11850,7 +11852,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 335.47, y: -530.58997}
m_SizeDelta: {x: 618.94, y: 345.58002}
m_SizeDelta: {x: 618.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9030098628201859511
CanvasRenderer:
@@ -12773,10 +12775,10 @@ RectTransform:
- {fileID: 1335544207958730177}
m_Father: {fileID: 3123930244098203053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382.5, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3020341225908238861
CanvasRenderer:
@@ -12859,7 +12861,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 309.47, y: -205.19}
m_SizeDelta: {x: 618.94, y: 280.78}
m_SizeDelta: {x: 618.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3138218988396077083
CanvasRenderer:
@@ -13121,7 +13123,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 309.47, y: -102.8}
m_SizeDelta: {x: 618.94, y: 76}
m_SizeDelta: {x: 618.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &965625795563076259
CanvasRenderer:
@@ -13376,9 +13378,9 @@ RectTransform:
- {fileID: 8641794091682467561}
m_Father: {fileID: 4902026760249267287}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: -18.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7759539851022153828
@@ -13477,6 +13479,7 @@ MonoBehaviour:
borderImage: {fileID: 3406708742645219522}
cooldownTime: 0
m_ClockCounter: {fileID: 0}
isNotCastSkill: 0
--- !u!222 &6263047871981887699
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -13534,7 +13537,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -13598,7 +13601,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -361.27, y: 365.44547}
m_SizeDelta: {x: 722.5344, y: 185.6}
m_SizeDelta: {x: 722.5344, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &74166521354270119
CanvasRenderer:
@@ -13714,7 +13717,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_SizeDelta: {x: 143.9446, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8934459415203184979
CanvasRenderer:
@@ -14558,10 +14561,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 296, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8186299737150272153
CanvasRenderer:
@@ -14665,7 +14668,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4958559450723387948
RectTransform:
m_ObjectHideFlags: 0
@@ -14778,7 +14781,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 45.94}
m_SizeDelta: {x: 143.9446, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8300893254371079820
CanvasRenderer:
@@ -14932,7 +14935,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 368.81186, y: -153.20001}
m_SizeDelta: {x: 685.6237, y: 64.8}
m_SizeDelta: {x: 685.6237, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8076001380599592139
CanvasRenderer:
@@ -15044,10 +15047,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 554, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4341901141596287823
CanvasRenderer:
@@ -15126,7 +15129,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 368.81186, y: -60.4}
m_SizeDelta: {x: 685.6237, y: 64.8}
m_SizeDelta: {x: 685.6237, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8659649200798903193
CanvasRenderer:
+30 -3
View File
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 4376431126769957786}
- component: {fileID: 2668322321768899818}
- component: {fileID: 5781139014276065127}
- component: {fileID: 4994198685823987946}
m_Layer: 5
m_Name: Text (TMP) (1)
m_TagString: Untagged
@@ -36,7 +37,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20, y: -402.765}
m_SizeDelta: {x: 400, y: 0}
m_SizeDelta: {x: 400, y: 805.53}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4376431126769957786
CanvasRenderer:
@@ -120,7 +121,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@@ -162,6 +163,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &4994198685823987946
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 124168344263491349}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4cf21a97aa5c9445c9859afa14de01ad, type: 3}
m_Name:
m_EditorClassIdentifier:
_rectTransform: {fileID: 8894405194986632892}
--- !u!1 &2412057975732520665
GameObject:
m_ObjectHideFlags: 0
@@ -704,13 +718,14 @@ GameObject:
- component: {fileID: 1086546571030594654}
- component: {fileID: 426204275254898644}
- component: {fileID: 4006058193329126604}
- component: {fileID: 8936108025019184019}
m_Layer: 5
m_Name: item_info
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1546246053547542409
RectTransform:
m_ObjectHideFlags: 0
@@ -811,6 +826,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &8936108025019184019
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830833846243993097}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc26b8fa93aea49b4abb8fe5455e51fe, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7370156420958780641
GameObject:
m_ObjectHideFlags: 0
+16
View File
@@ -519,6 +519,22 @@ public class CECUIManager : MonoSingleton<CECUIManager>
pSC.Execute();
}
}
public void OnClickFly()
{
CECHostPlayer hostPlayer = EC_Game.GetGameRun()?.GetHostPlayer();
if (hostPlayer != null)
{
hostPlayer.CmdFly(true);
}
}
public void OnChangeSkillShortcut()
{
CECHostPlayer hostPlayer = EC_Game.GetGameRun()?.GetHostPlayer();
if (hostPlayer != null)
{
hostPlayer.CycleSkillShortcuts();
}
}
/// <summary>
/// Handle second-click button click - triggers attack or move to NPC / 处理第二次点击按钮 - 触发攻击或移动到NPC