From 327fed6398165e44af42320fa3f28d843b0d18c3 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期四, 04 九月 2025 23:17:11 +0800 Subject: [PATCH] 117 【武将】武将系统 - 天赋部分,优化自动战斗 --- UI/MainWin.prefab | 40 +++++ UI/HeroGiftEatWin.prefab | 182 ++++++++++++++++++++++++++++++ UIComp/HeroShowBaseCell.prefab | 99 +++++++++++++--- Config/FuncOpenLV.txt | 2 4 files changed, 299 insertions(+), 24 deletions(-) diff --git a/Config/FuncOpenLV.txt b/Config/FuncOpenLV.txt index 007b1ff..eec40db 100644 --- a/Config/FuncOpenLV.txt +++ b/Config/FuncOpenLV.txt @@ -10,7 +10,7 @@ 81 35 0 0 绛惧埌 FuLiIcon_a 99 1 0 0 姝﹀皢鎷涘嫙 TY_GN_XB 102 20 0 0 鑱婂ぉ -108 0 0 1007 鑷姩鎸傛満 +108 0 0 1003 鑷姩鎸傛満 110 3 0 0 棣栧厖 113 3 0 0 鍏呭�� MoneyIcon_a 115 46 0 0 涓冨ぉ鐧婚檰濂栧姳 FuLiIcon_a diff --git a/UI/HeroGiftEatWin.prefab b/UI/HeroGiftEatWin.prefab index cfae144..d4dd16c 100644 --- a/UI/HeroGiftEatWin.prefab +++ b/UI/HeroGiftEatWin.prefab @@ -13,6 +13,7 @@ - component: {fileID: 2031843680812767358} - component: {fileID: 631711795948061990} - component: {fileID: 6224850690561940336} + - component: {fileID: 6723024433640511535} m_Layer: 5 m_Name: HeroGiftEatWin m_TagString: Untagged @@ -32,6 +33,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6053630003559928229} - {fileID: 9076360790198305369} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -106,6 +108,66 @@ m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 +--- !u!114 &6723024433640511535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725729790095644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93b6b3386d485e34580130c8aff973bb, type: 3} + m_Name: + m_EditorClassIdentifier: + uiLayer: 2 + uiName: + isMainUI: 0 + supportParentChildRelation: 1 + isPersistent: 0 + maxIdleRounds: 20 + openAnimationType: 0 + closeAnimationType: 0 + animeDuration: 0.2 + scaleOverInOutCurve: {fileID: 0} + animationEase: 6 + lastUsedRound: 0 + parentUI: {fileID: 0} + childrenUI: [] + _rectTransform: {fileID: 9076360790198305369} + openMask: 1 + clickEmptySpaceClose: 1 + screenMask: {fileID: 6505199432347972254} + heroShow: {fileID: 1186268937274082130} + giftCells: + - {fileID: 4103986066676542358} + - {fileID: 4309764215421185903} + - {fileID: 1136662707754037323} + - {fileID: 4038996126839329592} + - {fileID: 4102002776390890917} + - {fileID: 6977886983812717518} + - {fileID: 9073973033252147131} + - {fileID: 7216387104886048858} + addHeroBtn: {fileID: 6566283636004875341} + addHeroGo: {fileID: 7399329056054681252} + addHeroShow: {fileID: 2295103857008440856} + addGiftCells: + - {fileID: 2079294695433851529} + - {fileID: 4464648435985769798} + - {fileID: 5544565741334870942} + - {fileID: 541049319406898409} + - {fileID: 1026442983693628163} + - {fileID: 3712817800274228880} + - {fileID: 5632621881895711664} + - {fileID: 6109247421441722684} + addTip: {fileID: 960922749718664340} + addAttrGo: {fileID: 1329475510028574074} + addAttrTexts: + - {fileID: 8810314670892048925} + - {fileID: 7374151021633742974} + - {fileID: 5480258961013760016} + addGiftTip: {fileID: 2400187264272981985} + eatBtn: {fileID: 6343723528650349711} --- !u!1 &30606573940280047 GameObject: m_ObjectHideFlags: 0 @@ -2108,6 +2170,126 @@ m_PixelsPerUnitMultiplier: 1 m_Gray: 0 m_IconKey: +--- !u!1 &6505199432347972254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6053630003559928229} + - component: {fileID: 5301014908943851479} + - component: {fileID: 461292035834819833} + - component: {fileID: 6025786067967197763} + m_Layer: 5 + m_Name: ScreenMask(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6053630003559928229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6505199432347972254} + 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: 224477134459167860} + 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: 0, y: 0} + m_SizeDelta: {x: 2000, y: 4000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5301014908943851479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6505199432347972254} + m_CullTransparentMesh: 1 +--- !u!114 &461292035834819833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6505199432347972254} + 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: 0, g: 0, b: 0, a: 0.8862745} + 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 &6025786067967197763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6505199432347972254} + 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: 461292035834819833} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7361911926660389709 GameObject: m_ObjectHideFlags: 0 diff --git a/UI/MainWin.prefab b/UI/MainWin.prefab index 30aae90..5778acf 100644 --- a/UI/MainWin.prefab +++ b/UI/MainWin.prefab @@ -607,7 +607,7 @@ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2} m_Color: {r: 0.87058824, g: 0.83137256, b: 0.78431374, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -736,6 +736,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 m_Manager: {fileID: 6406231040930389010} m_SelectIcon: {fileID: 501064312268161665} m_UnSelectIcon: {fileID: 0} @@ -949,6 +950,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 --- !u!114 &4412339114084080469 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1131,6 +1133,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 m_Manager: {fileID: 6406231040930389010} m_SelectIcon: {fileID: 7319479036139057894} m_UnSelectIcon: {fileID: 0} @@ -2338,6 +2341,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 m_Manager: {fileID: 6406231040930389010} m_SelectIcon: {fileID: 0} m_UnSelectIcon: {fileID: 0} @@ -2401,7 +2405,7 @@ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2} m_Color: {r: 0.87058824, g: 0.83137256, b: 0.78431374, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -2868,6 +2872,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 m_Manager: {fileID: 6406231040930389010} m_SelectIcon: {fileID: 5244624952967470664} m_UnSelectIcon: {fileID: 0} @@ -3736,7 +3741,7 @@ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2} m_Color: {r: 0.87058824, g: 0.83137256, b: 0.78431374, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -4647,7 +4652,7 @@ m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 3 + m_AdditionalShaderChannelsFlag: 31 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -4734,6 +4739,7 @@ restImg: {fileID: 1123229593819071219} fightGo: {fileID: 2641793283833934288} fightHeroImg: {fileID: 8825578947036078729} + fightHeroScale: {fileID: 5320696884264168338} fightEffect: {fileID: 4015023341117372635} cdTween: {fileID: 4758933331910496722} hammerText: {fileID: 7716329250279013470} @@ -4906,6 +4912,7 @@ - component: {fileID: 7007534755669798843} - component: {fileID: 4421512128910320722} - component: {fileID: 8825578947036078729} + - component: {fileID: 5320696884264168338} m_Layer: 5 m_Name: heroimg m_TagString: Untagged @@ -4972,6 +4979,27 @@ m_PixelsPerUnitMultiplier: 1 m_Gray: 0 m_IconKey: +--- !u!114 &5320696884264168338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7321112521693007326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1d62b0928b057af4c955488a048ad8e7, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 11400000, guid: b8f340c68b94a404d83d70556e7fbfc2, type: 2} + from: {x: 0.66, y: 0.66, z: 0.66} + to: {x: 0.85, y: 0.85, z: 0.85} + delayMode: 2 + delay: 0 + duration: 0.15 + trigger: 0 + wrapMode: 3 + reversal: 0 --- !u!1 &7520549913801280180 GameObject: m_ObjectHideFlags: 0 @@ -5276,6 +5304,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 --- !u!114 &8147842632085624155 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5605,6 +5634,7 @@ customNegativeSound: 0 positiveSound: 0 negativeSound: 0 + pressedScale: 1.1 m_Manager: {fileID: 6406231040930389010} m_SelectIcon: {fileID: 3310279866895657993} m_UnSelectIcon: {fileID: 0} @@ -6049,7 +6079,7 @@ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2} m_Color: {r: 0.87058824, g: 0.83137256, b: 0.78431374, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/UIComp/HeroShowBaseCell.prefab b/UIComp/HeroShowBaseCell.prefab index 0660714..10d1988 100644 --- a/UIComp/HeroShowBaseCell.prefab +++ b/UIComp/HeroShowBaseCell.prefab @@ -30,15 +30,14 @@ m_Children: - {fileID: 9046987288423336908} - {fileID: 8330977735963725552} - - {fileID: 6598860590050294866} - {fileID: 3497291367917460648} - {fileID: 7103395602129824323} - - {fileID: 7432353648334000013} + - {fileID: 5664525047500422973} m_Father: {fileID: 0} 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: 40.58, y: -41.72} + m_AnchoredPosition: {x: 40.58, y: -41.4} m_SizeDelta: {x: 165, y: 223} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2245025965144604593 @@ -99,7 +98,7 @@ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2} m_Color: {r: 0.99607843, g: 0.25882354, b: 0.2784314, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -137,7 +136,7 @@ m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3} m_Name: m_EditorClassIdentifier: - OutlineColor: {r: 0.31764707, g: 0, b: 0, a: 0.5019608} + m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5} OutlineWidth: 10 --- !u!1 &3055958145692567075 GameObject: @@ -293,6 +292,70 @@ m_PixelsPerUnitMultiplier: 1 m_Gray: 0 m_IconKey: +--- !u!1 &4376415048515950074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5664525047500422973} + - component: {fileID: 1207930642709606690} + m_Layer: 5 + m_Name: layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5664525047500422973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376415048515950074} + 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: 6598860590050294866} + - {fileID: 7432353648334000013} + m_Father: {fileID: 224677353599006658} + 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: 0, y: -83.824974} + m_SizeDelta: {x: 158.19, y: 52.65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1207930642709606690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376415048515950074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &4683876664680460131 GameObject: m_ObjectHideFlags: 0 @@ -404,11 +467,11 @@ - {fileID: 4892335839171154891} - {fileID: 336996961160474022} - {fileID: 887397170505943313} - m_Father: {fileID: 224677353599006658} + m_Father: {fileID: 5664525047500422973} 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: -2, y: -72} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 103, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9217145789033473557 @@ -545,12 +608,12 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 224677353599006658} + m_Father: {fileID: 5664525047500422973} 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: 0, y: -100} - m_SizeDelta: {x: 146, y: 28} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 146, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6598429384103687094 CanvasRenderer: @@ -572,7 +635,7 @@ m_Script: {fileID: 11500000, guid: 8c90b724ae1ce3c4495afe6ba6005ae0, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2} m_Color: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -610,7 +673,7 @@ m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3} m_Name: m_EditorClassIdentifier: - OutlineColor: {r: 0.91764706, g: 0.14901961, b: 0.11764706, a: 0.5019608} + m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5} OutlineWidth: 10 --- !u!1 &7985465800584469506 GameObject: @@ -800,9 +863,9 @@ 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: 0, y: 50.3} + m_AnchoredPosition: {x: 0, y: -4.58} m_SizeDelta: {x: 158, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &8314736526655228890 CanvasRenderer: m_ObjectHideFlags: 0 -- Gitblit v1.8.0