From eb1a9f29e527906124036775d200d4b498766de8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 7 Dec 2021 15:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=91=BD=E6=A0=BC=E3=80=91=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8C=89=E9=92=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Gem/GemPanel.prefab | 594 ++++++++++++++++++ .../~Lua/Message/HeroInfoProto_pb.lua | 42 ++ .../~Lua/Modules/Gem/GemPanel.lua | 16 +- .../~Lua/Modules/Net/NetManager.lua | 44 ++ 4 files changed, 694 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index 465795515a..c79aa85a58 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -3259,6 +3259,9 @@ RectTransform: - {fileID: 4108176206694323356} - {fileID: 1999210736443741565} - {fileID: 5276601212722401991} + - {fileID: 3510389700228728827} + - {fileID: 1686085877685189538} + - {fileID: 7782193515858276966} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4473,6 +4476,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5426357169219798583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4047537232156596976} + - component: {fileID: 4644082410398720607} + - component: {fileID: 3339296486058984534} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4047537232156596976 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426357169219798583} + 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_Children: [] + m_Father: {fileID: 3510389700228728827} + m_RootOrder: 0 + 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 &4644082410398720607 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426357169219798583} + m_CullTransparentMesh: 0 +--- !u!114 &3339296486058984534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426357169219798583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E00\u952E" --- !u!1 &5486885684943809627 GameObject: m_ObjectHideFlags: 0 @@ -4849,6 +4931,124 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5828927618677854148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3510389700228728827} + - component: {fileID: 1573150254723866947} + - component: {fileID: 6114652110631068621} + - component: {fileID: 1277296147953635033} + m_Layer: 5 + m_Name: onekey + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3510389700228728827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5828927618677854148} + 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_Children: + - {fileID: 4047537232156596976} + m_Father: {fileID: 4110496243653304681} + m_RootOrder: 6 + 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: -192, y: 486} + m_SizeDelta: {x: 160, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1573150254723866947 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5828927618677854148} + m_CullTransparentMesh: 0 +--- !u!114 &6114652110631068621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5828927618677854148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1277296147953635033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5828927618677854148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6114652110631068621} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5970820313915616443 GameObject: m_ObjectHideFlags: 0 @@ -5243,6 +5443,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6382226551633231777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2309249220423078124} + - component: {fileID: 1168931578098221954} + - component: {fileID: 8596175336195828953} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2309249220423078124 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6382226551633231777} + 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_Children: [] + m_Father: {fileID: 7782193515858276966} + m_RootOrder: 0 + 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 &1168931578098221954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6382226551633231777} + m_CullTransparentMesh: 0 +--- !u!114 &8596175336195828953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6382226551633231777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6279\u91CF45071" --- !u!1 &6393346944364413233 GameObject: m_ObjectHideFlags: 0 @@ -5731,6 +6010,124 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7072262491286894807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7782193515858276966} + - component: {fileID: 1852376128290785895} + - component: {fileID: 2988846199241347843} + - component: {fileID: 7257085442578418305} + m_Layer: 5 + m_Name: more + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7782193515858276966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7072262491286894807} + 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_Children: + - {fileID: 2309249220423078124} + m_Father: {fileID: 4110496243653304681} + m_RootOrder: 8 + 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: 397} + m_SizeDelta: {x: 281.9, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1852376128290785895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7072262491286894807} + m_CullTransparentMesh: 0 +--- !u!114 &2988846199241347843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7072262491286894807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &7257085442578418305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7072262491286894807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2988846199241347843} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &7107387932739456150 GameObject: m_ObjectHideFlags: 0 @@ -6221,6 +6618,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7680122959163341905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 959031967896791245} + - component: {fileID: 2186374916018537929} + - component: {fileID: 285096280643608637} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &959031967896791245 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7680122959163341905} + 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_Children: [] + m_Father: {fileID: 1686085877685189538} + m_RootOrder: 0 + 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 &2186374916018537929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7680122959163341905} + m_CullTransparentMesh: 0 +--- !u!114 &285096280643608637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7680122959163341905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5FEB\u901F45079" --- !u!1 &7688928944912621746 GameObject: m_ObjectHideFlags: 0 @@ -6316,6 +6792,124 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &7721680764636547806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1686085877685189538} + - component: {fileID: 352142788169976952} + - component: {fileID: 2388902285900750101} + - component: {fileID: 5099470345984017518} + m_Layer: 5 + m_Name: fast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1686085877685189538 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7721680764636547806} + 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_Children: + - {fileID: 959031967896791245} + m_Father: {fileID: 4110496243653304681} + m_RootOrder: 7 + 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: 145, y: 486} + m_SizeDelta: {x: 281.9, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &352142788169976952 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7721680764636547806} + m_CullTransparentMesh: 0 +--- !u!114 &2388902285900750101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7721680764636547806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5099470345984017518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7721680764636547806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2388902285900750101} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &7894865665767677504 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index ce00380ad3..498b6fa6e7 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -277,11 +277,15 @@ LIFESTONEUPREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPREQUEST_GRIDINDEX_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPREQUEST_CURGEMID_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPREQUEST_COSTSTONELIST_FIELD = protobuf.FieldDescriptor(); +LIFESTONEUPRESPONSE = protobuf.Descriptor(); +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD = protobuf.FieldDescriptor(); LIFEGRIDCHANGEREQUEST = protobuf.Descriptor(); LIFEGRIDCHANGEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); LIFEGRIDCHANGEREQUEST_POSITION_FIELD = protobuf.FieldDescriptor(); LIFEGRIDCHANGEREQUEST_INDEX_FIELD = protobuf.FieldDescriptor(); LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD = protobuf.FieldDescriptor(); +LIFEGRIDCHANGERESPONSE = protobuf.Descriptor(); +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD = protobuf.FieldDescriptor(); GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index" GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index" @@ -2765,6 +2769,24 @@ LIFESTONEUPREQUEST.enum_types = {} LIFESTONEUPREQUEST.fields = {LIFESTONEUPREQUEST_TYPE_FIELD, LIFESTONEUPREQUEST_GRIDID_FIELD, LIFESTONEUPREQUEST_GRIDINDEX_FIELD, LIFESTONEUPREQUEST_CURGEMID_FIELD, LIFESTONEUPREQUEST_COSTSTONELIST_FIELD} LIFESTONEUPREQUEST.is_extendable = false LIFESTONEUPREQUEST.extensions = {} +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.name = "lifeGridInfo" +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.full_name = ".rpc.protocols.LifeStoneUpResponse.lifeGridInfo" +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.number = 1 +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.index = 0 +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.label = 1 +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.has_default_value = false +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.default_value = nil +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.message_type = CommonProto_pb.LIFEGRIDINFO +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.type = 11 +LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.cpp_type = 10 + +LIFESTONEUPRESPONSE.name = "LifeStoneUpResponse" +LIFESTONEUPRESPONSE.full_name = ".rpc.protocols.LifeStoneUpResponse" +LIFESTONEUPRESPONSE.nested_types = {} +LIFESTONEUPRESPONSE.enum_types = {} +LIFESTONEUPRESPONSE.fields = {LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD} +LIFESTONEUPRESPONSE.is_extendable = false +LIFESTONEUPRESPONSE.extensions = {} LIFEGRIDCHANGEREQUEST_TYPE_FIELD.name = "type" LIFEGRIDCHANGEREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.LifeGridChangeRequest.type" LIFEGRIDCHANGEREQUEST_TYPE_FIELD.number = 1 @@ -2812,6 +2834,24 @@ LIFEGRIDCHANGEREQUEST.enum_types = {} LIFEGRIDCHANGEREQUEST.fields = {LIFEGRIDCHANGEREQUEST_TYPE_FIELD, LIFEGRIDCHANGEREQUEST_POSITION_FIELD, LIFEGRIDCHANGEREQUEST_INDEX_FIELD, LIFEGRIDCHANGEREQUEST_LIFESTONEID_FIELD} LIFEGRIDCHANGEREQUEST.is_extendable = false LIFEGRIDCHANGEREQUEST.extensions = {} +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.name = "lifeGridInfo" +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.full_name = ".rpc.protocols.LifeGridChangeResponse.lifeGridInfo" +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.number = 1 +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.index = 0 +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.label = 1 +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.has_default_value = false +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.default_value = nil +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.message_type = CommonProto_pb.LIFEGRIDINFO +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.type = 11 +LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD.cpp_type = 10 + +LIFEGRIDCHANGERESPONSE.name = "LifeGridChangeResponse" +LIFEGRIDCHANGERESPONSE.full_name = ".rpc.protocols.LifeGridChangeResponse" +LIFEGRIDCHANGERESPONSE.nested_types = {} +LIFEGRIDCHANGERESPONSE.enum_types = {} +LIFEGRIDCHANGERESPONSE.fields = {LIFEGRIDCHANGERESPONSE_LIFEGRIDINFO_FIELD} +LIFEGRIDCHANGERESPONSE.is_extendable = false +LIFEGRIDCHANGERESPONSE.extensions = {} AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST) CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST) @@ -2866,7 +2906,9 @@ HongmengHeroInfo = protobuf.Message(HONGMENGHEROINFO) HongmengInfoIndication = protobuf.Message(HONGMENGINFOINDICATION) HongmengSteleNewHandIndication = protobuf.Message(HONGMENGSTELENEWHANDINDICATION) LifeGridChangeRequest = protobuf.Message(LIFEGRIDCHANGEREQUEST) +LifeGridChangeResponse = protobuf.Message(LIFEGRIDCHANGERESPONSE) LifeStoneUpRequest = protobuf.Message(LIFESTONEUPREQUEST) +LifeStoneUpResponse = protobuf.Message(LIFESTONEUPRESPONSE) MergeSoulRequest = protobuf.Message(MERGESOULREQUEST) MergeSoulResponse = protobuf.Message(MERGESOULRESPONSE) OpenResonanceRequest = protobuf.Message(OPENRESONANCEREQUEST) diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index 664ae24940..e72614cb7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -19,6 +19,9 @@ function Gem:InitComponent() --页签 self.btnPractice = Util.GetGameObject(self.gameObject, "Tab/tab1") + self.onekey = Util.GetGameObject(self.gameObject, "onekey") + self.fast = Util.GetGameObject(self.gameObject, "fast") + self.more = Util.GetGameObject(self.gameObject, "more") end function Gem:BindEvent() @@ -28,8 +31,17 @@ function Gem:BindEvent() end) Util.AddClick(self.btnPractice, function() - UIManager.OpenPanel(UIName.PracticePanel) - self:ClosePanel() + NetManager.LifeStoneUpRequest() + end) + + Util.AddClick(self.onekey, function() + NetManager.LifeStoneUpRequest(2) + end) + Util.AddClick(self.fast, function() + NetManager.LifeStoneUpRequest(4,45079) + end) + Util.AddClick(self.more, function() + NetManager.LifeStoneUpRequest(2,45071) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 3cbb293f6a..213234b88b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6241,5 +6241,49 @@ function NetManager.ContinueBuyItemRequest(_goodId,fun) end) end +--命石合成 +function this.LifeStoneUpRequest(_type,_gridId,_gridIndex,_curGemId,_costStoneList,func) + local data = HeroInfoProto_pb.RidingSwardRewardRequest() + data.type = _type + data.gridId = _gridId + data.gridIndex = _gridIndex + data.curGemId = _curGemId + for i = 1, #_costStoneList do + data.costStoneList:append(_costStoneList[i]) + end + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.LifeStoneUpRequest , MessageTypeProto_pb.LifeStoneUpResponse , msg, function(buffer) + local data = buffer:DataByte() + local msg = HeroInfoProto_pb.LifeStoneUpResponse() + msg:ParseFromString(data) + if msg and msg.lifeGridInfo then + GemManager.myGemList[msg.lifeGridInfo.gridId][msg.lifeGridInfo.gridIndex] = msg.lifeGridInfo.itemId + end + if func then + func(msg) + end + end) +end + +--命石穿戴 +function this.LifeGridChangeRequest(_type,_gridId,_gridIndex,_curGemId,func) + local data = HeroInfoProto_pb.RidingSwardRewardRequest() + data.type = _type + data.position = _gridId + data.index = _gridIndex + data.lifeStoneId = _curGemId + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.LifeGridChangeRequest , MessageTypeProto_pb.LifeGridChangeResponse , msg, function(buffer) + local data = buffer:DataByte() + local msg = HeroInfoProto_pb.LifeGridChangeResponse() + msg:ParseFromString(data) + if msg and msg.lifeGridInfo then + GemManager.myGemList[msg.lifeGridInfo.gridId][msg.lifeGridInfo.gridIndex] = msg.lifeGridInfo.itemId + end + if func then + func(msg) + end + end) +end return this \ No newline at end of file