diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_xiafangshese.png.meta b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_xiafangshese.png.meta index 7d88a2b3bc..4ef47413fc 100644 --- a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_xiafangshese.png.meta +++ b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_xiafangshese.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 0, y: 33, z: 0, w: 1009} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab index 3bf25b945f..2c613c25bd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -803,7 +803,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.47058824} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1301,7 +1301,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: 0, y: -110} + m_AnchoredPosition: {x: 0, y: -120} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3911837538267459738 @@ -1325,7 +1325,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.84518933, b: 0.5424528, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1333,7 +1333,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: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1382,9 +1382,9 @@ RectTransform: m_Father: {fileID: 6850922993451196723} m_RootOrder: 2 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: 66} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -1010} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2023000477176167605 @@ -1747,7 +1747,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -71, y: 31} + m_AnchoredPosition: {x: -71, y: 133} m_SizeDelta: {x: 142, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4981120022815816689 @@ -1943,10 +1943,10 @@ RectTransform: m_Father: {fileID: 6850922993451196723} m_RootOrder: 1 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: 338} - m_SizeDelta: {x: 900, y: 409.4} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -738} + m_SizeDelta: {x: 900, y: 409.40002} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &266310563125355196 MonoBehaviour: @@ -2152,9 +2152,9 @@ RectTransform: m_Father: {fileID: 6850922993451196723} 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: 40} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -498} m_SizeDelta: {x: 400, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5531974297461846052 @@ -2186,12 +2186,12 @@ 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 40 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -2517,6 +2517,7 @@ RectTransform: - {fileID: 6519283982156503390} - {fileID: 7195258467448432129} - {fileID: 3437912122982792725} + - {fileID: 3788628340771187763} m_Father: {fileID: 4174680264755851285} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2718,6 +2719,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4733259119870160053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7495295360531372156} + - component: {fileID: 1538736123447017152} + - component: {fileID: 4921338676621292414} + m_Layer: 5 + m_Name: Add + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7495295360531372156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4733259119870160053} + 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: 6519283982156503390} + 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: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1538736123447017152 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4733259119870160053} + m_CullTransparentMesh: 0 +--- !u!114 &4921338676621292414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4733259119870160053} + 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: 3d49dff9e68d99042b98190141718524, 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 &4909600330203765279 GameObject: m_ObjectHideFlags: 0 @@ -3113,10 +3188,10 @@ RectTransform: m_Father: {fileID: 3833216474249514191} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 154.7} - m_SizeDelta: {x: 0, y: 309.4} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -49} + m_SizeDelta: {x: 0, y: 309.40002} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7003818794342462763 MonoBehaviour: @@ -3591,7 +3666,7 @@ RectTransform: 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.000015258789} + m_AnchoredPosition: {x: 0, y: 0.000056996225} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8538351718761414328 @@ -3615,7 +3690,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.7372549, g: 0.6784314, b: 0.5803922, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3623,11 +3698,11 @@ 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_FontSize: 30 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -3635,7 +3710,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u65AF\u5927\u6797\u548C\u53D1\u6325\u6CD5\u5F8B\u53D1\u54C8\u5965\u5170\n\u591A\u548C\u5B89\u5FBD\u7684\u8EAB\u4EFD\u54C8\u8FEA\u65AF\u54C8\n\u554A\u53D1\uFF1B\u6848\u4F8B\u6536\u96C6\u7684\u5206\u914D\u62C9\u7684\u8BBE\u8BA1\u5F00\u53D1\u554A\u62C9\u4F38\uFF1B\u7075\u517D\u6309\u7406\u8BF4\u5FB7\u53E4\u62C9\u5F88\u5FEB\u6536\u5230\n\u4E86\u9ED1\u6697\u52BF\u529B\u5230\u4ED8\u54C8\uFF1B\u7231\u597D\u5C31\u662F\n\u5BF9\u65B9\uFF1B\u62C9\u706B\u5C71\u7684\u53D1\u54C8\u5C81\u7684\u5965\u5229\u5F17\u548C\u6848\u4F8B\uFF1B\u6848\n\u4F8B\u548C\u7B2C\u4E09\u65B9\u62C9\u56DE\u662F\u5426a\n\u65AF\u5927\u6797\u548C\u53D1\u6325\u6CD5\u5F8B\u53D1\u54C8\u5965\u5170\u591A\u548C\u5B89\u5FBD\u7684\u8EAB\u4EFD\u54C8\u8FEA\u65AF\u54C8\n\u554A\u53D1\uFF1B\u6848\u4F8B\u6536\u96C6\u7684\u5206\u914D\u62C9\u7684\u8BBE\u8BA1\u5F00\u53D1\u554A\u62C9\u4F38\uFF1B\u7075\u517D\u6309\u7406\u8BF4\u5FB7\u53E4\u62C9\u5F88\u5FEB\u6536\u5230\n\u4E86\u9ED1\u6697\u52BF\u529B\u5230\u4ED8\u54C8\uFF1B\u7231\u597D\u5C31\u662F\n\u5BF9\u65B9\uFF1B\u62C9\u706B\u5C71\u7684\u53D1\u54C8\u5C81\u7684\u5965\u5229\u5F17\u548C\u6848\u4F8B\uFF1B\u6848\n\u4F8B\u548C\u7B2C\u4E09\u65B9\u62C9\u56DE\u662F\u5426a" + m_Text: "\u9644\u8EAB\u7684\u795E\u5C06\u9020\u6210\u767E\u5206\u6BD4\u4F24\u5BB3\u65F6\u670950%\u6982\u7387\u7729\u6655\u4F24\u5BB3\u76EE\u6807\u6301\u7EED1\u56DE\u5408" LanguageIndex: 0 --- !u!114 &4140096687870795747 MonoBehaviour: @@ -3725,6 +3800,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6036202669925937730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3788628340771187763} + - component: {fileID: 5883452607808381357} + - component: {fileID: 4517315707376442402} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3788628340771187763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6036202669925937730} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1454935628721121603} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0.5, y: 0} + m_SizeDelta: {x: 2, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5883452607808381357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6036202669925937730} + m_CullTransparentMesh: 0 +--- !u!114 &4517315707376442402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6036202669925937730} + 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: 42360778b6c8e754d80f838f915640db, 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 &6085222902071849605 GameObject: m_ObjectHideFlags: 0 @@ -4456,7 +4605,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.47058824} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4657,10 +4806,10 @@ RectTransform: m_Father: {fileID: 7150009681660735616} m_RootOrder: 1 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: 538} - m_SizeDelta: {x: 1080, y: 1076} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -2099} + m_SizeDelta: {x: 0, y: 1250.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1453650305500795601 CanvasRenderer: @@ -4691,7 +4840,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: c9531c1614bb4db4d82718e71afa284e, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4757,7 +4906,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6392157, g: 0.54901963, b: 0.42352945, a: 1} + m_Color: {r: 0.7264151, g: 0.61608225, b: 0.46257564, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5141,13 +5290,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7406895938718554231} + - {fileID: 7495295360531372156} m_Father: {fileID: 1454935628721121603} 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: -15} - m_SizeDelta: {x: 180, y: 177} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3786470217147903557 CanvasRenderer: @@ -5177,7 +5327,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: 4b37eafa1c7a12b409da8502635ce041, type: 3} + m_Sprite: {fileID: 21300000, guid: 3613214422dc01a4eab262c0ed1b8afe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5318,7 +5468,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6392157, g: 0.54901963, b: 0.42352945, a: 1} + m_Color: {r: 0.7294118, g: 0.61960787, b: 0.4627451, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 4d7d92744e..227f0809a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -239,12 +239,7 @@ end function PracticeImprint:Animation(num) if num == 1 then--打开神印信息界面 - -- LogGreen("Input.mousePosition:"..tostring(Input.mousePosition)) - -- if Input.mousePosition.y > UIManager.UIWidth/2 then - -- self.Scrollgrid:GetComponent("RectTransform").pivot = Vector2.New(1,1) - -- else - -- self.Scrollgrid:GetComponent("RectTransform").pivot = Vector2.New(0,0) - -- end + self:Animation2() self.ImprintInfo:SetActive(true) if trigger == true then self.ImprintContent:GetComponent("RectTransform").localPosition = Vector3.New(0,-1200,0) @@ -275,6 +270,10 @@ function PracticeImprint:Animation(num) end end +function PracticeImprint:Animation2() + +end + function PracticeImprint:OnClose() if self.tween1 then self.tween1:Kill()