diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab index 8d3fef79bf..3d51142970 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab @@ -34,7 +34,7 @@ RectTransform: 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: -133.8} + m_AnchoredPosition: {x: 0, y: -130} m_SizeDelta: {x: 462, y: 149} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2261458947074405167 @@ -74,6 +74,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1971226929422209655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3066869718726212392} + - component: {fileID: 6893239012773098356} + - component: {fileID: 7188573581264723070} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3066869718726212392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971226929422209655} + 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: 8329884962036650588} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1.9400024, y: 11.7599945} + m_SizeDelta: {x: -106.53, y: -23.509998} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6893239012773098356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971226929422209655} + m_CullTransparentMesh: 0 +--- !u!114 &7188573581264723070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971226929422209655} + 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: 0 + 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: 7b4370c7a3b9b9d43bf44e61f417724a, 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 &2031780158348929598 GameObject: m_ObjectHideFlags: 0 @@ -221,13 +295,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1058732650776365064} + m_Father: {fileID: 4857275258040740634} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0006713867, y: 0} - m_SizeDelta: {x: 24, y: 20} + 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: 1058, y: 1730} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3185371786180165057 CanvasRenderer: @@ -279,7 +353,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!1 &4690853349369262873 +--- !u!1 &3492201459980204313 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -287,54 +361,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1058732650776365064} - - component: {fileID: 189837394594666668} - - component: {fileID: 4696817990465081718} - - component: {fileID: 750224708655725078} + - component: {fileID: 5996894655896650309} + - component: {fileID: 3318509693345522322} + - component: {fileID: 5030609735381338291} m_Layer: 5 - m_Name: bg + m_Name: NoneImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1058732650776365064 +--- !u!224 &5996894655896650309 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4690853349369262873} + m_GameObject: {fileID: 3492201459980204313} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 163.6} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 292383046426468324} - - {fileID: 1915107041368105942} - - {fileID: 406736504860049708} - m_Father: {fileID: 5665718498097657906} - m_RootOrder: 0 + - {fileID: 1571689631556293182} + m_Father: {fileID: 4857275258040740634} + m_RootOrder: 3 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: -20.6} - m_SizeDelta: {x: -46, y: -210} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 5.9987, y: 92} + m_SizeDelta: {x: 579, y: 768.7} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &189837394594666668 +--- !u!222 &3318509693345522322 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4690853349369262873} + m_GameObject: {fileID: 3492201459980204313} m_CullTransparentMesh: 0 ---- !u!114 &4696817990465081718 +--- !u!114 &5030609735381338291 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4690853349369262873} + m_GameObject: {fileID: 3492201459980204313} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -348,7 +419,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: d59ff4e348a69dd45bbd0200e84e635f, type: 3} + m_Sprite: {fileID: 21300000, guid: e1eb5a78b93294840889587d72740102, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -357,19 +428,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &750224708655725078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4690853349369262873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 --- !u!1 &4719672612350285489 GameObject: m_ObjectHideFlags: 0 @@ -475,7 +533,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 768048749102897584} - - {fileID: 4857275258040740634} + - {fileID: 3066869718726212392} m_Father: {fileID: 5665718498097657906} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -563,6 +621,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5665718498097657906} + - component: {fileID: 8668567247206929178} + - component: {fileID: 8236284942855804201} m_Layer: 5 m_Name: btnRoot m_TagString: Untagged @@ -581,7 +641,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1058732650776365064} + - {fileID: 4857275258040740634} - {fileID: 5333837363576207506} - {fileID: 8329884962036650588} - {fileID: 3086266629382961749} @@ -593,6 +653,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8668567247206929178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340862063794165982} + m_CullTransparentMesh: 0 +--- !u!114 &8236284942855804201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6340862063794165982} + 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: 0 + 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: e5174d678f0c29d4b807e5fae001249f, 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 &6531145027874733707 GameObject: m_ObjectHideFlags: 0 @@ -604,6 +701,7 @@ GameObject: - component: {fileID: 4857275258040740634} - component: {fileID: 8890730762987158791} - component: {fileID: 2198781733884664743} + - component: {fileID: 2370921431435215492} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -621,14 +719,18 @@ RectTransform: 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: 8329884962036650588} - m_RootOrder: 1 + m_Children: + - {fileID: 292383046426468324} + - {fileID: 1915107041368105942} + - {fileID: 406736504860049708} + - {fileID: 5996894655896650309} + m_Father: {fileID: 5665718498097657906} + 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: -1.9400024, y: 11.7599945} - m_SizeDelta: {x: -106.53, y: -23.509998} + m_AnchoredPosition: {x: 0, y: -21} + m_SizeDelta: {x: -29, y: -185.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8890730762987158791 CanvasRenderer: @@ -658,7 +760,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: 7b4370c7a3b9b9d43bf44e61f417724a, type: 3} + m_Sprite: {fileID: 21300000, guid: d59ff4e348a69dd45bbd0200e84e635f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -667,6 +769,19 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2370921431435215492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6531145027874733707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &6783067781988425480 GameObject: m_ObjectHideFlags: 0 @@ -702,7 +817,7 @@ RectTransform: 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: 1080, y: 1920} + m_SizeDelta: {x: 1296, y: 2304} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1615546810509227993 CanvasRenderer: @@ -741,6 +856,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7271862538318837030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8524821620687076111} + - component: {fileID: 5189287443793682060} + - component: {fileID: 2377131506171319441} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8524821620687076111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7271862538318837030} + 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: 1571689631556293182} + 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.79999995, y: 15.299999} + m_SizeDelta: {x: 229.5, y: 64.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5189287443793682060 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7271862538318837030} + m_CullTransparentMesh: 0 +--- !u!114 &2377131506171319441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7271862538318837030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 0 + 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 51 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6682\u65E0\u6D88\u606F" + LanguageIndex: 0 --- !u!1 &7311530429622308950 GameObject: m_ObjectHideFlags: 0 @@ -770,7 +965,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1058732650776365064} + m_Father: {fileID: 4857275258040740634} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -815,6 +1010,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7673862214966570665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1571689631556293182} + - component: {fileID: 1780836391218922074} + - component: {fileID: 6777481393889401014} + m_Layer: 5 + m_Name: TextImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1571689631556293182 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673862214966570665} + 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: 8524821620687076111} + m_Father: {fileID: 5996894655896650309} + 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: -265, y: 210} + m_SizeDelta: {x: 402, y: 234} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1780836391218922074 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673862214966570665} + m_CullTransparentMesh: 0 +--- !u!114 &6777481393889401014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7673862214966570665} + 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: 0 + 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: 88785b6606f773e43bfb8d365c2689ab, 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 &7705492895448595525 GameObject: m_ObjectHideFlags: 0 @@ -878,12 +1148,12 @@ Canvas: m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 - m_OverrideSorting: 0 + m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 200 m_TargetDisplay: 0 --- !u!114 &3619477401438851125 MonoBehaviour: @@ -950,7 +1220,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000004099007} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &921486100088032325 @@ -1008,7 +1278,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1915107041368105942 RectTransform: m_ObjectHideFlags: 0 @@ -1021,12 +1291,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9193158905020371500} - m_Father: {fileID: 1058732650776365064} + m_Father: {fileID: 4857275258040740634} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0006713867, y: 0.000024796} + m_AnchoredPosition: {x: -0.0006713867, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.50000006, y: 0.5} --- !u!222 &3006324354038409040 diff --git a/Assets/ManagedResources/~Lua/Common/define.lua b/Assets/ManagedResources/~Lua/Common/define.lua index 280252190f..213b154fd7 100644 --- a/Assets/ManagedResources/~Lua/Common/define.lua +++ b/Assets/ManagedResources/~Lua/Common/define.lua @@ -28,6 +28,7 @@ imageDownloadMgr = App.ImageDownloadMgr PoolMgr = App.ObjectPoolMgr WWW = UnityEngine.WWW Sprite = UnityEngine.Sprite +Texture2D = UnityEngine.Texture2D GameObject = UnityEngine.GameObject Camera = UnityEngine.Camera Input = UnityEngine.Input diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua index 572f484577..0cd288520a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua @@ -14,7 +14,11 @@ function TaiChuMiJuanPanel:InitComponent() this.title = Util.GetGameObject(this.btnRoot, "title") this.grid = Util.GetGameObject(this.btnRoot, "bg/circle/root") this.backBtn = Util.GetGameObject(this.btnRoot, "backBtn") + this.NoneImage = Util.GetGameObject(this.btnRoot, "bg/NoneImage") + this.cir = Util.GetGameObject(this.btnRoot, "bg/circle") this.itemPres = {} + + this.upview = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft }) end --绑定事件(用于子类重写) @@ -41,22 +45,34 @@ end --界面打开时调用(用于子类重写) function TaiChuMiJuanPanel:OnShow(...) - for i = 1, math.max(#this.itemPres,#this.data) do - if not this.data[i] then - this.itemPres[i].go.gameObject:SetActive(false) - else - if not this.itemPres[i] then - this.itemPres[i] = {} - this.itemPres[i].go = newObjToParent(this.itemPre,this.grid) - this.itemPres[i].bg = Util.GetGameObject(this.itemPres[i].go, "bg"):GetComponent("Image") + if not this.upview then + this.upview = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft }) + end + this.upview:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) + if not this.data or #this.data < 1 then + this.NoneImage.gameObject:SetActive(true) + this.cir.gameObject:SetActive(false) + else + this.NoneImage.gameObject:SetActive(false) + this.cir.gameObject:SetActive(true) + for i = 1, math.max(#this.itemPres,#this.data) do + if not this.data[i] then + this.itemPres[i].go.gameObject:SetActive(false) + else + if not this.itemPres[i] then + this.itemPres[i] = {} + this.itemPres[i].go = newObjToParent(this.itemPre,this.grid) + this.itemPres[i].bg = Util.GetGameObject(this.itemPres[i].go, "bg"):GetComponent("Image") + end + this.itemPres[i].go.gameObject:SetActive(true) + this.itemPres[i].bg.sprite = this.data[i].sprite + Util.AddOnceClick(this.itemPres[i].go,function() + SDKMgr:OpenWeb(this.data[i].linkAddress) + end) end - this.itemPres[i].go.gameObject:SetActive(true) - this.itemPres[i].bg.sprite = this.data[i].sprite - Util.AddOnceClick(this.itemPres[i].go,function() - SDKMgr:OpenWeb(this.data[i].linkAddress) - end) end end + end --界面关闭时调用(用于子类重写) @@ -68,6 +84,8 @@ end function TaiChuMiJuanPanel:OnDestroy() this.spLoader:Destroy() this.itemPres = {} + SubUIManager.Close(this.upview) + this.upview = nil end return TaiChuMiJuanPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 51dd44d827..f5bf962b70 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -18,37 +18,33 @@ this.NiuQiIndex = 1 this.TaiChuMiJuanData = {} function this.SetTaiChuMiJuanData(msg,fun) local datas - if not msg or #msg.secretvolume < 1 then + if not msg or not msg.secretvolume or #msg.secretvolume < 1 then ---------------------------------------------测试数据 - datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, - [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"}, - [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"}, - [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"}, - [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"}, - [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"}, - [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"}, - [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20200412/3062717289_23_800_349.jpg"}, - } - -- if fun then - -- fun(msg) - -- end + -- datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, + -- [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"}, + -- [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"}, + -- [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"}, + -- [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"}, + -- [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"}, + -- [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"}, + -- [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20200412/3062717289_23_800_349.jpg"}, + -- } + if fun then + fun(msg) + end + return else datas = msg.secretvolume end coroutine.start(function() for k,v in ipairs(datas) do - local str = v.windowLink - local www = WWW.New(str) - coroutine.www(www) - local tex2d = www.texture - local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0)); - if not this.TaiChuMiJuanData[v.id] then - this.TaiChuMiJuanData[v.id] = {} - this.TaiChuMiJuanData[v.id].id = v.id - this.TaiChuMiJuanData[v.id].linkAddress = v.strategyLink - this.TaiChuMiJuanData[v.id].windowLink = v.windowLink - this.TaiChuMiJuanData[v.id].sprite = m_sprite - end + this.GetATaiChuMiJuanData(v) + --local time = 0 + while(not DynamicActivityManager.GetwwwProgress()) do + coroutine.wait(0.01) + --time = time + 0.01 + end + --LogGreen("k:"..k.." time:"..time) end if fun then fun(msg) @@ -69,6 +65,9 @@ function this.GetATaiChuMiJuanData(data) local www = WWW.New(str) coroutine.www(www) local tex2d = www.texture + if not tex2d then + tex2d = Texture2D.whiteTexture() + end local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0)); if not this.TaiChuMiJuanData[data.id] then this.TaiChuMiJuanData[data.id] = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index b1c5e0c8a5..5c266ccc29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -296,56 +296,55 @@ end --绑定事件(用于子类重写) function this:BindEvent() Util.AddOnceClick(this.taiChuMiJuanBtn,function() - -- NetManager.TaiChuSecretvolumeRequest(function(msg) - -- local data = {} - -- if #msg.secretvolume < 1 then - -- LogGreen("该功能暂未开放") - -- return - -- end - -- coroutine.start(function() - - -- for k,v in ipairs(msg.secretvolume) do - -- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) - -- while(not DynamicActivityManager.GetwwwProgress()) do - -- coroutine.wait(0.01) - -- end - -- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) - -- table.insert(data,isContinue) - -- end - -- table.sort(data,function(a,b) - -- return a.id < b.id - -- end) - -- UIManager.OpenPanel(UIName.taiChuMiJuan,data) - -- end) - -- end) - ----------------------------------------------------------- 测试数据 - local data = {} - local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, - [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"}, - [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"}, - [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"}, - [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"}, - [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"}, - [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"}, - [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://dfzximg01.dftoutiao.com/minimodify/20210810/640x427_611230bb2fc8e.png"}, - [9] = {id = 9,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=ef71759530174eb7a644f43a1c82fc41_s&infoId=IC003K1PNC70DBQ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-da593f41724ecf38354bb712398cfca6.jpg?time=1628672089&signature=6EABA2FF759B313F41F158D7AD8FDF6A"}, - } + NetManager.TaiChuSecretvolumeRequest(function(msg) + local data = {} + if not msg or not msg.secretvolume or #msg.secretvolume < 1 then + UIManager.OpenPanel(UIName.taiChuMiJuan,data) + return + end coroutine.start(function() - for k,v in ipairs(datas) do + for k,v in ipairs(msg.secretvolume) do local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) - local time = 0 while(not DynamicActivityManager.GetwwwProgress()) do coroutine.wait(0.01) - time = time + 0.01 end isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) table.insert(data,isContinue) end table.sort(data,function(a,b) return a.id < b.id - end) + end) UIManager.OpenPanel(UIName.taiChuMiJuan,data) end) + end) + ----------------------------------------------------------- 测试数据 + -- local data = {} + -- local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, + -- [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"}, + -- [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"}, + -- [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"}, + -- [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"}, + -- [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"}, + -- [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"}, + -- [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://dfzximg01.dftoutiao.com/minimodify/20210810/640x427_611230bb2fc8e.png"}, + -- [9] = {id = 9,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=ef71759530174eb7a644f43a1c82fc41_s&infoId=IC003K1PNC70DBQ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-da593f41724ecf38354bb712398cfca6.jpg?time=1628672089&signature=6EABA2FF759B313F41F158D7AD8FDF6A"}, + -- } + -- coroutine.start(function() + -- for k,v in ipairs(datas) do + -- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + -- local time = 0 + -- while(not DynamicActivityManager.GetwwwProgress()) do + -- coroutine.wait(0.01) + -- time = time + 0.01 + -- end + -- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + -- table.insert(data,isContinue) + -- end + -- table.sort(data,function(a,b) + -- return a.id < b.id + -- end) + -- UIManager.OpenPanel(UIName.taiChuMiJuan,data) + -- end) end) Util.AddOnceClick(this.btnEndLess,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index c2ab24ba6a..518387d86c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5464,18 +5464,18 @@ end --请求太初秘卷 function NetManager.TaiChuSecretvolumeRequest(func) - DynamicActivityManager.SetTaiChuMiJuanData(nil,func) --测试用 --- local data=PlayerInfoProto_pb.TaiChuSecretvolumeRequest() --- local msg = data:SerializeToString() --- Network:SendMessageWithCallBack(MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_REQUEST, MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_RESPONS, msg, function(buffer) --- local data = buffer:DataByte() --- local msg = PlayerInfoProto_pb.TaiChuSecretvolumeResponse() --- msg:ParseFromString(data) --- for k,v in ipairs(msg.secretvolume) do --- LogGreen("id:"..v.id.." strategyLink:"..v.strategyLink.." windowLink:"..v.windowLink) --- end --- DynamicActivityManager.SetTaiChuMiJuanData(msg,func) --- end) + --DynamicActivityManager.SetTaiChuMiJuanData(nil,func) --测试用 + local data=PlayerInfoProto_pb.TaiChuSecretvolumeRequest() + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_REQUEST, MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_RESPONSE, msg, function(buffer) + local data = buffer:DataByte() + local msg = PlayerInfoProto_pb.TaiChuSecretvolumeResponse() + msg:ParseFromString(data) + -- for k,v in ipairs(msg.secretvolume) do + -- LogGreen("id:"..v.id.." strategyLink:"..v.strategyLink.." windowLink:"..v.windowLink) + -- end + DynamicActivityManager.SetTaiChuMiJuanData(msg,func) + end) end return this \ No newline at end of file