diff --git a/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_tanchuangdi.png.meta b/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_tanchuangdi.png.meta index dee25b049c..0836613487 100644 --- a/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_tanchuangdi.png.meta +++ b/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_tanchuangdi.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 552, z: 0, w: 548} + spriteBorder: {x: 0, y: 86, z: 0, w: 130} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index f5a38c4477..ed2fdeecac 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -3636,7 +3636,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4319954644975728847 RectTransform: m_ObjectHideFlags: 0 @@ -3654,10 +3654,10 @@ RectTransform: m_Father: {fileID: 1828482313430278523} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -107.5} - m_SizeDelta: {x: 550, y: 215} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 275, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4780749988992621811 CanvasRenderer: @@ -3682,8 +3682,8 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 95 - m_Bottom: 20 + m_Top: 110 + m_Bottom: 200 m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 0 @@ -5738,10 +5738,10 @@ RectTransform: m_Father: {fileID: 4319954644975728847} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -145} - m_SizeDelta: {x: 550, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &902351682421173202 CanvasRenderer: @@ -5784,7 +5784,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 40 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -6314,7 +6314,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &490982664025559419 RectTransform: m_ObjectHideFlags: 0 @@ -6330,8 +6330,8 @@ RectTransform: m_Father: {fileID: 1828482313430278523} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -8712,7 +8712,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -43} + m_AnchoredPosition: {x: 285.7, y: -52} m_SizeDelta: {x: 265.96, y: 54.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6716157028514333187 @@ -8730,7 +8730,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5990311461964822248} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -11609,7 +11609,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.85490197, g: 0.5882353, b: 0.28627452, a: 1} + m_Color: {r: 0.93725497, g: 0.8745099, b: 0.7686275, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -11862,7 +11862,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -50} + m_AnchoredPosition: {x: 295, y: -50} m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4336837941257793494 @@ -11886,7 +11886,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4716981, g: 0.4716981, b: 0.4716981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua index c5a0a715e6..589098b8ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua @@ -52,7 +52,7 @@ function this:OnShow(_parent,...) local str = PracticeManager.GetSingleAddition(adddata) this.addTextList[i]:GetComponent("Text").text = str if data.State == 1 then - this.addTextList[i]:GetComponent("Text").text = string.format("%s",str) + this.addTextList[i]:GetComponent("Text").text = string.format("%s",str) end end -- 背景透明