diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab index 7ea5ff5989..f2ecd87913 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab @@ -35,10 +35,10 @@ RectTransform: m_Father: {fileID: 2725026369425992905} 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.9, y: 0} - m_SizeDelta: {x: 1190.7, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 2.6, y: 0} + m_SizeDelta: {x: 112.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6558828224914611059 CanvasRenderer: @@ -295,10 +295,10 @@ RectTransform: m_Father: {fileID: 5740362498108735469} 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_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 586.9, y: 258.4} + m_SizeDelta: {x: 0, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1263709503531673971 MonoBehaviour: @@ -602,7 +602,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -370.21, y: -22.12} + m_AnchoredPosition: {x: -453, y: -22.12} m_SizeDelta: {x: 189.77, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &451198132591237739 @@ -681,7 +681,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: -418, y: 13.6} + m_AnchoredPosition: {x: -381.2, y: 13.6} m_SizeDelta: {x: 197.3, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2653750295411799607 @@ -980,7 +980,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -146.14996, y: 4.3} + m_AnchoredPosition: {x: -235.57, y: 4.3} m_SizeDelta: {x: 258.36, y: 73.2} m_Pivot: {x: 0.5, y: 1} --- !u!222 &511742467412540718 @@ -1096,7 +1096,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: 60.7, y: -22.12} + m_AnchoredPosition: {x: 100.4, y: -22.12} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &2478351568014048460 @@ -1331,10 +1331,10 @@ RectTransform: m_Father: {fileID: 2725026369425992905} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 292.85004, y: -521.2} - m_SizeDelta: {x: 1080, y: 148} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -521.2} + m_SizeDelta: {x: 0, y: -1772} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1415097990844297663 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index 0f66e28d6c..b7f65f1fb1 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -4036,6 +4036,7 @@ GameObject: - component: {fileID: 6148922240571101437} - component: {fileID: 6150398696814194559} - component: {fileID: 6329370645310369793} + - component: {fileID: 7944196165316879664} m_Layer: 5 m_Name: GeneralInfoPopup m_TagString: Untagged @@ -4110,6 +4111,20 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &7944196165316879664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216717847381140135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} + m_Name: + m_EditorClassIdentifier: + bgList: + - {fileID: 8107894537552319360} --- !u!1 &6216888323491765455 GameObject: m_ObjectHideFlags: 0 @@ -4844,10 +4859,10 @@ RectTransform: m_Father: {fileID: 6150816739817875349} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1208765871042465929 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index 253cd2de7d..ec693df38a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -37,14 +37,14 @@ function ExploreMainPanel:InitComponent() local dv2 if v2.x ~= lastx and v2.y ~= lasty then lastx = v2.x - dv2 = Vector2.New(math.clamp(v2.x + av2.x, -210, 210), math.clamp(v2.y + av2.y, -637, 637)) - if (v2.x + av2.x < 210 and v2.x + av2.x > -210) or (v2.y + av2.y < 637 and v2.y + av2.y > -637) then + dv2 = Vector2.New(math.clamp(v2.x + av2.x, -210, 210), math.clamp(v2.y + av2.y, -468, 468)) + if (v2.x + av2.x < 210 and v2.x + av2.x > -210) or (v2.y + av2.y < 468 and v2.y + av2.y > -468) then self.moveTween:Rebound(3, 0.1) end elseif v2.y ~= lasty then lasty = v2.y - dv2 = Vector2.New(av2.x,math.clamp(v2.y + av2.y, -637, 637)) - if v2.y + av2.y < 637 and v2.y + av2.y > -637 then + dv2 = Vector2.New(av2.x,math.clamp(v2.y + av2.y, -468, 468)) + if v2.y + av2.y < 468 and v2.y + av2.y > -468 then self.moveTween:Rebound(2, 0.1) end elseif v2.y ~= lasty then