From 97990f03641f40860f8569fdafc7ff384226a3ec Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 4 Dec 2023 18:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E6=A0=BC=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Gem/GemBoxLvUpPopup.prefab | 285 ++++++++++++++---- .../Prefabs/UI/Gem/GemPanel.prefab | 122 +++++++- .../UI/SecretBox/WishGemBuyTenPanel.prefab | 6 +- .../Modules/Battle/View/Unit/MonsterView.lua | 2 +- .../~Lua/Modules/Gem/GemBoxLvUpPopup.lua | 18 +- .../~Lua/Modules/Gem/GemPanel.lua | 34 +-- 6 files changed, 383 insertions(+), 84 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab index d36c3f0c12..a0a4ad5341 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab @@ -4797,15 +4797,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5170586462047760277} - {fileID: 6597790191152956091} + - {fileID: 5170586462047760277} m_Father: {fileID: 7737089187294849575} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 540, y: 0} - m_SizeDelta: {x: 934, y: 0} + m_SizeDelta: {x: 640.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6640115634245778325 CanvasRenderer: @@ -4822,7 +4822,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350799669303168361} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4835,8 +4835,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 91946b3b0479aa942aad9f24ee0d3481, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b58cf19a281322746aeaf19b377e9cda, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4858,7 +4858,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 300 + m_MinHeight: -1 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 @@ -9623,6 +9623,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &650308535318925863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5641341370736926859} + - component: {fileID: 5774044368214880523} + - component: {fileID: 2454072733596109780} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5641341370736926859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650308535318925863} + 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: 7085274020404979449} + m_RootOrder: 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: 0, y: 13.1} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5774044368214880523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650308535318925863} + m_CullTransparentMesh: 0 +--- !u!114 &2454072733596109780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650308535318925863} + 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.9803922, g: 0.38823533, b: 0.027450982, 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: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 6 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7B49\u7EA7\u63D0\u5347" --- !u!1 &764868362587421553 GameObject: m_ObjectHideFlags: 0 @@ -19212,7 +19291,7 @@ GameObject: m_Component: - component: {fileID: 7332227241694253759} - component: {fileID: 5550550010298785768} - - component: {fileID: 7540729115008835500} + - component: {fileID: 1600800788083209830} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -19247,7 +19326,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385113594212697845} m_CullTransparentMesh: 0 ---- !u!114 &7540729115008835500 +--- !u!114 &1600800788083209830 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -19256,7 +19335,7 @@ MonoBehaviour: m_GameObject: {fileID: 1385113594212697845} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -19267,15 +19346,20 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3a9fb1bf7ee31a6438e7b672e429a199, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70B9\u51FB\u4EFB\u610F\u4F4D\u7F6E\u7EE7\u7EED" --- !u!1 &2087952570442067650 GameObject: m_ObjectHideFlags: 0 @@ -28765,6 +28849,81 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &2323619589250030483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7085274020404979449} + - component: {fileID: 8922043846312088817} + - component: {fileID: 888074858739237181} + m_Layer: 0 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7085274020404979449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323619589250030483} + 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: 5641341370736926859} + m_Father: {fileID: 6597790191152956091} + m_RootOrder: 3 + 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: 19, y: 464} + m_SizeDelta: {x: 487, y: 123} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8922043846312088817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323619589250030483} + m_CullTransparentMesh: 0 +--- !u!114 &888074858739237181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323619589250030483} + 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: 21300000, guid: 51aba957240b4344d81615d7728d655a, 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 --- !u!1 &2841686423104909331 GameObject: m_ObjectHideFlags: 0 @@ -43208,7 +43367,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 300} + m_AnchoredPosition: {x: 0, y: 621} m_SizeDelta: {x: 850, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1871788054020293439 @@ -43239,7 +43398,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f9d3aeb2c05fab54b9a7b86580b791c2, type: 3} + m_Sprite: {fileID: 21300000, guid: bc4d8a1b4626356438151ea0411bf650, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -57393,7 +57552,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 @@ -62230,12 +62389,13 @@ RectTransform: - {fileID: 6029451728155945466} - {fileID: 2014265167144349535} - {fileID: 8185143751801866355} + - {fileID: 7085274020404979449} m_Father: {fileID: 8382917858394193692} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -36} + m_AnchoredPosition: {x: 0, y: 98.6} m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2195462212714158329 @@ -67026,6 +67186,7 @@ GameObject: - component: {fileID: 996668960266660396} - component: {fileID: 5491981783893712385} - component: {fileID: 509381093297553123} + - component: {fileID: 139155780417058821} m_Layer: 5 m_Name: CongratulationPopup_Practice m_TagString: Untagged @@ -67046,11 +67207,11 @@ RectTransform: m_Children: - {fileID: 3486346050417423225} m_Father: {fileID: 8382917858394193692} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 467, y: 0} + m_AnchoredPosition: {x: 320.25, y: 0} m_SizeDelta: {x: 692, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &996668960266660396 @@ -67081,7 +67242,7 @@ MonoBehaviour: m_ChildAlignment: 1 m_Spacing: 10 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 + m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 1 --- !u!114 &509381093297553123 @@ -67098,6 +67259,35 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &139155780417058821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7781109591683827435} + 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: 21300000, guid: b58cf19a281322746aeaf19b377e9cda, 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 --- !u!1 &7817483174650557725 GameObject: m_ObjectHideFlags: 0 @@ -76714,14 +76904,14 @@ GameObject: m_Component: - component: {fileID: 2014265167144349535} - component: {fileID: 7122967647224115990} - - component: {fileID: 4355120918966698400} + - component: {fileID: 7445261948152313869} m_Layer: 0 m_Name: npc m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2014265167144349535 RectTransform: m_ObjectHideFlags: 0 @@ -76731,15 +76921,15 @@ RectTransform: m_GameObject: {fileID: 8510111860438971041} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -133.97247} - m_LocalScale: {x: 0.58, y: 0.58, z: 0.58} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6597790191152956091} m_RootOrder: 1 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: 100, y: 100} + m_AnchoredPosition: {x: 36, y: 0} + m_SizeDelta: {x: 518, y: 808} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7122967647224115990 CanvasRenderer: @@ -76749,7 +76939,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8510111860438971041} m_CullTransparentMesh: 0 ---- !u!114 &4355120918966698400 +--- !u!114 &7445261948152313869 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -76758,10 +76948,10 @@ MonoBehaviour: m_GameObject: {fileID: 8510111860438971041} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -76769,24 +76959,15 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - skeletonDataAsset: {fileID: 11400000, guid: 0b8d869abebd950408130be472135dbc, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: idle1 - startingLoop: 1 - timeScale: 1 - freeze: 0 - unscaledTime: 0 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 + m_Sprite: {fileID: 21300000, guid: f01466e4da31c924fb34bb23a5a615a0, 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 --- !u!1 &8900741506493077836 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index 22644b8512..75ce8bfc15 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -12511,7 +12511,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 1667185510311058365} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -12644,7 +12644,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 3680083790724970215} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -19268,6 +19268,123 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -762.8} m_SizeDelta: {x: 1082, y: 237.6} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3605646519401239884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 698657076834694289} + - component: {fileID: 1791639404391938665} + - component: {fileID: 2338064105658822537} + - component: {fileID: 2717563519865218078} + m_Layer: 5 + m_Name: btn_close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &698657076834694289 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3605646519401239884} + 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: 4110496243653304681} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 36, y: 89} + m_SizeDelta: {x: 79, y: 175} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1791639404391938665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3605646519401239884} + m_CullTransparentMesh: 0 +--- !u!114 &2338064105658822537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3605646519401239884} + 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: 21300000, guid: 8561d25febfc8bc428011c49f29d126b, 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 +--- !u!114 &2717563519865218078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3605646519401239884} + 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: 2338064105658822537} + 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 &3863041144812996131 GameObject: m_ObjectHideFlags: 0 @@ -19638,6 +19755,7 @@ RectTransform: - {fileID: 1576026675} - {fileID: 260925511} - {fileID: 669145492} + - {fileID: 698657076834694289} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab index 9035ba2aea..e52bdba027 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab @@ -25554,7 +25554,7 @@ RectTransform: 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: 278, y: 273} + m_AnchoredPosition: {x: 304, y: 273} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &95898727214963940 @@ -59850,7 +59850,7 @@ RectTransform: 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: 278.00003, y: 0} + m_AnchoredPosition: {x: 304, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &95546387973799674 @@ -113461,7 +113461,7 @@ RectTransform: 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: -105, y: 575} + m_AnchoredPosition: {x: -105, y: 534} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &95702871535070054 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua index af24bb31d0..b0c73ccfa5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua @@ -234,7 +234,7 @@ function MonsterView:OnSkillCastStart(skill) self.RoleLiveGOTran3 = self.RoleLiveGO3:GetComponent("RectTransform") self.RoleLiveGOGraphic3.AnimationState:SetAnimation(0, "attack", true) self.RoleLiveGOTran3.sizeDelta = Vector2.New(1000, 1000) - self.castingNameNode:GetComponent("Image").sprite = self.spLoader:LoadSprite("c_swhs_00000_t9") + self.castingNameNode:GetComponent("Text").text = "身外化身" local eid = BattleManager.GetCombatIdBySkin(skill.id, skill.owner.skinId) self.combat = BattleManager.GetSkillCombat(eid) else diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemBoxLvUpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemBoxLvUpPopup.lua index 604ea3e8c6..04e0042c12 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemBoxLvUpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemBoxLvUpPopup.lua @@ -3,10 +3,10 @@ require("Base/BasePanel") GemBoxLvUpPopup = Inherit(BasePanel) local this = GemBoxLvUpPopup local sorting = 0 -local SkeletonGraphic -local idleFunc = function() - SkeletonGraphic.AnimationState:SetAnimation(0, "idle2", true) -end +-- local SkeletonGraphic +-- local idleFunc = function() +-- SkeletonGraphic.AnimationState:SetAnimation(0, "idle2", true) +-- end --子模块脚本 local contentScripts = { @@ -24,9 +24,11 @@ function GemBoxLvUpPopup:InitComponent() this.effect = Util.GetGameObject(this.gameObject,"Contents/Pages/Shows/UI_effect_FightEndLvUp") this.roleEffect=Util.GetGameObject(self.transform, "Contents/Pages/Shows/npc") this.roleEffect.gameObject:SetActive(true) - SkeletonGraphic = this.roleEffect:GetComponent("SkeletonGraphic") - SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idleFunc + --SkeletonGraphic = this.roleEffect:GetComponent("SkeletonGraphic") + --SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idleFunc this.info=Util.GetGameObject(this.gameObject,"Contents/Pages/CongratulationPopup_Practice/Text1"):GetComponent("Text") + Util.GetGameObject(this.gameObject,"Mask/Text"):GetComponent("Text").text="点击任意位置继续" + Util.GetGameObject(self.transform, "Contents/Pages/Shows/title/Text"):GetComponent("Text").text="等级提升" --子模块脚本初始化 -- for key, value in pairs(contentScripts) do -- value.view:InitComponent(Util.GetGameObject(this.contents, value.panelName)) @@ -68,7 +70,7 @@ function GemBoxLvUpPopup:OnOpen(...) local args={...} this.effect:SetActive(true) this.info.text="宝箱等级已达到"..args[1].."级" - local SkeletonGraphic = this.roleEffect:GetComponent("SkeletonGraphic") + --local SkeletonGraphic = this.roleEffect:GetComponent("SkeletonGraphic") -- for key, value in pairs(contentPrefabs) do -- value.gameObject:SetActive(false) -- end @@ -90,7 +92,7 @@ function GemBoxLvUpPopup:OnDestroy() -- for key, value in pairs(contentScripts) do -- value.view:OnDestroy() -- end - SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idleFunc + --SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idleFunc end return GemBoxLvUpPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index 39ee581bed..695c0c24ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -20,13 +20,13 @@ local drawType={ } local TabBox = require("Modules/Common/TabBox") local _TabData={ - [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31", name="修行", type=0,funcId=136 }, - [2] = { default = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32", name="命格", type=1, funcId=144 }, - [3] = { default = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33", name="高级命格", type=2,funcId=145}, + --[1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31", name="修行", type=0,funcId=136 }, + [1] = { default = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32", name="命格", type=1, funcId=144 }, + [2] = { default = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33", name="高级命格", type=2,funcId=145}, } local TabAdapter=nil local SwitchView=nil -local curType=0 +local curType=1 local activityId=0 local progresss=0 local wishLv=0 @@ -92,19 +92,13 @@ function Gem:InitComponent() end --切换视图 SwitchView=function(_index) - if _index==1 then - UIManager.OpenPanel(UIName.PracticePanel) - self:ClosePanel() - else - local isOpen=CheckFunctionOpen(_TabData[_index].funcId) - local tip=GetFunctionOpenTip(_TabData[_index].funcId) - if not isOpen then - PopupTipPanel.ShowTip(tip) - return - end - self:UpdatePanelData(_TabData[_index].type) + local isOpen=CheckFunctionOpen(_TabData[_index].funcId) + local tip=GetFunctionOpenTip(_TabData[_index].funcId) + if not isOpen then + PopupTipPanel.ShowTip(tip) + return end - + self:UpdatePanelData(_TabData[_index].type) end self.TabCtrl = TabBox.New() self.TabCtrl:SetTabAdapter(TabAdapter) @@ -133,7 +127,7 @@ function Gem:InitComponent() for i=1,8 do self.propertyList[i]=Util.GetGameObject(self.gameObject, "pro/name ("..i..")"):GetComponent("Text") end - + self.btn_close=Util.GetGameObject(self.gameObject,"btn_close") self.infoTxt=Util.GetGameObject(self.gameObject,"lotteryInfo"):GetComponent("Text") end @@ -146,8 +140,11 @@ function Gem:BindEvent() Util.AddClick(self.btn_box, function() UIManager.OpenPanel(UIName.GemRewardInfoPanel,curType,wishLv,progresss,activityId) end) + Util.AddClick(self.btn_close, function() + UIManager.OpenPanel(UIName.PracticePanel) + self:ClosePanel() + end) - Util.AddClick(self.additionBtn, function() local tempData = GemManager.GetSortAttri() if #tempData > 0 then @@ -223,6 +220,7 @@ function Gem:UpdatePanelData(_type) else self.boxLv.text="高级命格等级:"..wishLv end + LogError("_type==============================".._type) self.infoTxt.text="今日抽取上限:"..GemNewManager.gemLottery[_type].."/"..drawLimit[_type] LogError("nextnum==="..nextNum.." progersss=="..progresss) if nextNum==0 and progresss~=0 then