From ac768ff16351dcc78eb5ce1b948e3cedc632fcf1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Nov 2021 18:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=B8=E9=A9=BB=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DynamicActicity/TimeLimitUpHero.prefab | 108 +--- .../Prefabs/UI/DynamicActicity/page12.prefab | 91 ++- .../Prefabs/UI/DynamicActicity/page4.prefab | 108 +--- .../Prefabs/UI/Popup/GeneralPopup.prefab | 611 +++++++++--------- .../~Lua/Common/GlobalDefine.lua | 5 +- .../Modules/DynamicActivity/LingShouBaoGe.lua | 10 +- .../Modules/DynamicActivity/QianKunBox.lua | 17 +- .../DynamicActivity/TimeLimitUpHero.lua | 28 +- .../~Lua/Modules/Main/MainPanel.lua | 2 + .../~Lua/Modules/Player/JumpManager.lua | 3 + .../Popup/View/GeneralPopup_LingShouBaoGe.lua | 8 +- 11 files changed, 428 insertions(+), 563 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index dc3f74dff5..0dfa4054e9 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -788,7 +788,7 @@ GameObject: - component: {fileID: 3495672692266321227} - component: {fileID: 6198549988096519334} m_Layer: 5 - m_Name: Text + m_Name: recruitTime m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -810,7 +810,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: -9.06, y: 55.5} + m_AnchoredPosition: {x: -0.000002861023, y: 0} m_SizeDelta: {x: 373.47, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3495672692266321227 @@ -834,7 +834,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.93725497, g: 0.8588236, b: 0.6117647, a: 1} + m_Color: {r: 0.9490197, g: 0.89019614, b: 0.7411765, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -842,12 +842,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: 34 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -6179,85 +6179,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &2459637239066036949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2340145394641897298} - - component: {fileID: 3009354031286407570} - - component: {fileID: 1901485922050933127} - m_Layer: 5 - m_Name: Text1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2340145394641897298 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2459637239066036949} - 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: 5779984021338281634} - 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: -1.44, y: 8.7} - m_SizeDelta: {x: 358.24, y: 44.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3009354031286407570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2459637239066036949} - m_CullTransparentMesh: 0 ---- !u!114 &1901485922050933127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2459637239066036949} - 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.93725497, g: 0.8588236, b: 0.6117647, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A29\u592912\u5C0F\u65F6" --- !u!1 &2481034516746056857 GameObject: m_ObjectHideFlags: 0 @@ -14692,14 +14613,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8454968833166725087} - - {fileID: 2340145394641897298} m_Father: {fileID: 7816124763777208762} m_RootOrder: 5 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: 4.6, y: -736.6} - m_SizeDelta: {x: 574, y: 170} + m_AnchoredPosition: {x: 4.6, y: -700} + m_SizeDelta: {x: 600, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3325518073787234455 CanvasRenderer: @@ -14729,7 +14649,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: 8bc0409d8bb710b49bb67ad3cf8a3384, type: 3} + m_Sprite: {fileID: 21300000, guid: 50740b9a22150c2449fc4ccfc93e57c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15046,6 +14966,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6713471973551068685} m_Modifications: + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} propertyPath: m_LocalPosition.x @@ -15151,11 +15076,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, - type: 3} - propertyPath: m_Name - value: Fx_Circle 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} --- !u!224 &4573805909076432932 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab index 4063084a4f..baf20a5106 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab @@ -497,12 +497,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3309473831523017427} - m_RootOrder: 2 + 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: 0, y: -92} - m_SizeDelta: {x: 488.20996, y: 56.54004} + m_AnchoredPosition: {x: 0, y: -86.91} + m_SizeDelta: {x: 488.21, y: 46.36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5081912228173101585 CanvasRenderer: @@ -888,6 +888,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4093119420443537412} + - {fileID: 2986145042923130894} - {fileID: 4760716640094686627} - {fileID: 7483443096173258523} - {fileID: 77110672082599734} @@ -1505,7 +1506,7 @@ RectTransform: m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995} m_Children: [] m_Father: {fileID: 3309473831523017427} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4116,7 +4117,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3309473831523017427} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4348,12 +4349,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3309473831523017427} - m_RootOrder: 1 + m_RootOrder: 2 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: -35.186096} - m_SizeDelta: {x: 488.20996, y: 56.54004} + m_AnchoredPosition: {x: 0, y: -37.228} + m_SizeDelta: {x: 488.21, y: 52.456} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506206972616795122 CanvasRenderer: @@ -4550,6 +4551,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6935491676662411580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2986145042923130894} + - component: {fileID: 9015093950070026080} + - component: {fileID: 5779371240703501293} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2986145042923130894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6935491676662411580} + 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: 3309473831523017427} + 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: -96} + m_SizeDelta: {x: 574, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9015093950070026080 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6935491676662411580} + m_CullTransparentMesh: 0 +--- !u!114 &5779371240703501293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6935491676662411580} + 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: 8bc0409d8bb710b49bb67ad3cf8a3384, 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 &6979366608596709894 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index e97e588966..a33820c422 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -31892,85 +31892,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &5137797875355024280 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4090632566364352300} - - component: {fileID: 5717212285401709057} - - component: {fileID: 5675029552578409588} - m_Layer: 5 - m_Name: Text1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4090632566364352300 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5137797875355024280} - 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: 620342803655762403} - 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: -1.44, y: 8.7} - m_SizeDelta: {x: 358.24, y: 44.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5717212285401709057 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5137797875355024280} - m_CullTransparentMesh: 0 ---- !u!114 &5675029552578409588 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5137797875355024280} - 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.93725497, g: 0.8588236, b: 0.6117647, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A29\u592912\u5C0F\u65F6" --- !u!1 &5148792898794895009 GameObject: m_ObjectHideFlags: 0 @@ -32639,7 +32560,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: -9.06, y: 55.5} + m_AnchoredPosition: {x: -0.000002861023, y: 0} m_SizeDelta: {x: 373.47, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5010479664585235559 @@ -32663,7 +32584,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.93725497, g: 0.8588236, b: 0.6117647, a: 1} + m_Color: {r: 0.9490197, g: 0.89019614, b: 0.7411765, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -32671,12 +32592,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: 34 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -61671,19 +61592,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7820655198797091715} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: 8998886833164015041} - - {fileID: 4090632566364352300} m_Father: {fileID: 9092643564979373074} 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: 4.6, y: -736.6} - m_SizeDelta: {x: 574, y: 170} + m_AnchoredPosition: {x: 4.6, y: -700} + m_SizeDelta: {x: 600, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7646257826200924400 CanvasRenderer: @@ -61713,7 +61633,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: 8bc0409d8bb710b49bb67ad3cf8a3384, type: 3} + m_Sprite: {fileID: 21300000, guid: 50740b9a22150c2449fc4ccfc93e57c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -62370,6 +62290,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6979685406578874528} m_Modifications: + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} propertyPath: m_LocalPosition.x @@ -62475,11 +62400,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, - type: 3} - propertyPath: m_Name - value: Fx_Circle 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} --- !u!224 &184284645826008713 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index ca48fd1608..3d528f9cad 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -4024,7 +4024,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: 168.20007, y: -265.09998} + m_AnchoredPosition: {x: 168.20007, y: -286} m_SizeDelta: {x: 250, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7627351553251534106 @@ -8300,80 +8300,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4F5B\u7CFB\u795E\u5C06\u653B\u51FB\u52A0\u6210-25%" LanguageIndex: 11248 ---- !u!1 &1436324098848304967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6470320559930319460} - - component: {fileID: 8669164731678442173} - - component: {fileID: 7768855085919929622} - m_Layer: 5 - m_Name: Bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6470320559930319460 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436324098848304967} - 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: 457562493705846596} - 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: 0} - m_SizeDelta: {x: 52, y: 52} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8669164731678442173 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436324098848304967} - m_CullTransparentMesh: 0 ---- !u!114 &7768855085919929622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436324098848304967} - 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: d1e04308c0a66644a804a2800a96d3a2, 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 &1469616666550174944 GameObject: m_ObjectHideFlags: 0 @@ -10202,6 +10128,115 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &1753934194358308961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7650439555991256468} + - component: {fileID: 3408314938157967792} + - component: {fileID: 7759474807344362363} + - component: {fileID: 3183104989016318706} + m_Layer: 5 + m_Name: btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7650439555991256468 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753934194358308961} + 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: 5848081641554126402} + m_Father: {fileID: 1559021434442135747} + 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: 144, y: 144} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3408314938157967792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753934194358308961} + m_CullTransparentMesh: 0 +--- !u!114 &7759474807344362363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753934194358308961} + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &3183104989016318706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753934194358308961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &1786865886207471852 GameObject: m_ObjectHideFlags: 0 @@ -11586,7 +11621,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5848081641554126402 RectTransform: m_ObjectHideFlags: 0 @@ -11594,17 +11629,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984571390576273612} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 457562493705846596} - m_RootOrder: 1 + m_Father: {fileID: 7650439555991256468} + 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: 0} - m_SizeDelta: {x: 105, y: 98} + m_SizeDelta: {x: 144, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8177867798843472964 CanvasRenderer: @@ -11634,7 +11669,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: 4df0b51ed49908a4791aed4bd1447949, type: 3} + m_Sprite: {fileID: 21300000, guid: 0648f1198938fcb47a7c627fe1cda06c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12291,7 +12326,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: -208.4, y: -265.09998} + m_AnchoredPosition: {x: -208.4, y: -286} m_SizeDelta: {x: 250, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1858036223290632226 @@ -19552,6 +19587,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &3377238175967397195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 181032336286965007} + - component: {fileID: 4421939577702661859} + - component: {fileID: 617626234038767089} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &181032336286965007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377238175967397195} + 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: 72210568968635668} + m_RootOrder: 6 + 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: -214} + m_SizeDelta: {x: 920, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4421939577702661859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377238175967397195} + m_CullTransparentMesh: 0 +--- !u!114 &617626234038767089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377238175967397195} + 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: 19d5542f3ad36154883cfc2022d17e0a, 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 &3378558232872165276 GameObject: m_ObjectHideFlags: 0 @@ -24603,116 +24712,6 @@ RectTransform: m_AnchoredPosition: {x: -616, y: 9} m_SizeDelta: {x: 150, y: 180} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4243083436224165887 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 457562493705846596} - - component: {fileID: 4793205022994134770} - - component: {fileID: 7028097978740901962} - - component: {fileID: 7497344412273215888} - m_Layer: 5 - m_Name: btn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &457562493705846596 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243083436224165887} - 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: 6470320559930319460} - - {fileID: 5848081641554126402} - m_Father: {fileID: 1559021434442135747} - 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: -100} - m_SizeDelta: {x: 70, y: 70} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4793205022994134770 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243083436224165887} - m_CullTransparentMesh: 0 ---- !u!114 &7028097978740901962 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243083436224165887} - 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: 0 - 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: 7497344412273215888} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &7497344412273215888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4243083436224165887} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &4246380752068302721 GameObject: m_ObjectHideFlags: 0 @@ -28970,7 +28969,6 @@ GameObject: m_Component: - component: {fileID: 398040658319527181} - component: {fileID: 5522998564270194509} - - component: {fileID: 3142593034189258733} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -28994,8 +28992,8 @@ 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: 50} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5522998564270194509 CanvasRenderer: @@ -29005,35 +29003,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5207614429510402438} m_CullTransparentMesh: 0 ---- !u!114 &3142593034189258733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5207614429510402438} - 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: 0} - 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 &5237931646822284665 GameObject: m_ObjectHideFlags: 0 @@ -29951,86 +29920,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5402937203711883957} m_CullTransparentMesh: 0 ---- !u!1 &5430690737363144375 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5831092349843845482} - - component: {fileID: 2452288817159129135} - - component: {fileID: 589782847667429358} - m_Layer: 5 - m_Name: tip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5831092349843845482 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5430690737363144375} - 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: 72210568968635668} - 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: 212} - m_SizeDelta: {x: 384.31, y: 64.41} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2452288817159129135 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5430690737363144375} - m_CullTransparentMesh: 0 ---- !u!114 &589782847667429358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5430690737363144375} - 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.9607843, b: 0.827451, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u8BBE \u7F6E" - LanguageIndex: 11266 --- !u!1 &5440072960242780622 GameObject: m_ObjectHideFlags: 0 @@ -33868,6 +33757,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6339667101742805514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5583417592791797806} + - component: {fileID: 7267761898981438467} + - component: {fileID: 8358371779013352552} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5583417592791797806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339667101742805514} + 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: 72210568968635668} + 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: 0, y: -181} + m_SizeDelta: {x: 896.2, y: 103.95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7267761898981438467 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339667101742805514} + m_CullTransparentMesh: 0 +--- !u!114 &8358371779013352552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6339667101742805514} + 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.7411765, g: 0.7294118, b: 0.6117647, 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5305\u542B4\u661F\u6216\u66F4\u9AD8\u661F\u7EA7\u7684\u795E\u5C06" + LanguageIndex: 0 --- !u!1 &6346365484770467844 GameObject: m_ObjectHideFlags: 0 @@ -36634,14 +36603,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 398040658319527181} - - {fileID: 457562493705846596} + - {fileID: 7650439555991256468} m_Father: {fileID: 72210568968635668} - m_RootOrder: 2 + 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: 200, y: 300} + m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6793774740260687022 GameObject: @@ -40546,7 +40515,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6061433966782776785} - - component: {fileID: 413443157909320945} + - component: {fileID: 2329041612542434240} m_Layer: 5 m_Name: Root m_TagString: Untagged @@ -40561,19 +40530,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7602309562315589355} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: 72210568968635668} - m_RootOrder: 3 + m_RootOrder: 2 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: -5.7} - m_SizeDelta: {x: 900, y: 330} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 791.1, y: 324.3} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &413443157909320945 +--- !u!114 &2329041612542434240 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -40582,7 +40551,7 @@ MonoBehaviour: m_GameObject: {fileID: 7602309562315589355} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -40591,11 +40560,12 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 135, y: 135} + m_Spacing: {x: 50, y: 30} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &7623074386910263512 GameObject: m_ObjectHideFlags: 0 @@ -45582,11 +45552,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5421335955277268947} - - {fileID: 5831092349843845482} - {fileID: 1559021434442135747} - {fileID: 6061433966782776785} + - {fileID: 5583417592791797806} - {fileID: 1784494701510258493} - {fileID: 4207814885452220836} + - {fileID: 181032336286965007} m_Father: {fileID: 2925180131101153177} m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3e31d855b3..724166d45e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -673,7 +673,8 @@ RedPointType = { ContinuityRecharge = 204,--连续充值 VipPrivilege = 205,--特权 SevenDayCarnival = 206,--七日狂欢 - DynamicActivity = 208,--轮转活动 乾坤宝盒 限时召唤 + DynamicActivity = 208,--轮转活动 易经宝库、新将、 + StateActivity = 209,--固定活动 乾坤宝盒 限时召唤、灵兽 GiftPage = 2011, -- 礼包 DailyGift = 2012, -- 每日礼包 HERO_STAR_GIFT = 2013, --- 星级礼包 @@ -1113,6 +1114,7 @@ JumpType = { SiXiangXinFa = 113,--四象心法 likeability = 114, LingMaiMiJing = 118,--灵脉秘境 + StateActivity = 121,--固定活动,抽卡 BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 @@ -1578,6 +1580,7 @@ FUNCTION_OPEN_TYPE = { WEEK_CARD = 117, -- 周卡 LINGMAIMIJING = 118,--灵脉秘境 TailsmanSoul = 119, + ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index 9458d7bd11..676f53417c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -298,7 +298,7 @@ function LingShouBaoGe:TimeCountDown() local timeDown=CalculateSecondsNowTo_N_OClock(0) self.tip1.text = TimeToHMS(timeDown)..Language[10488] local timeDown2 = self.actData.endTime - GetTimeStamp() - self.leftTime.text = Language[10023]..TimeToFelaxible(timeDown2) + self.leftTime.text = "周一零点重置宝阁值" self.tip1.gameObject:SetActive((timeDown < timeDown2) and (self.freeTime == 0)) @@ -309,16 +309,8 @@ function LingShouBaoGe:TimeCountDown() self:Refresh() return end - if timeDown2 < 1 then - self.timer:Stop() - self.timer = nil - self.parent:ClosePanel() - return - end timeDown = timeDown - 1 - timeDown2 = timeDown2 -1 self.tip1.text = TimeToHMS(timeDown)..Language[10488] - self.leftTime.text = Language[10023]..TimeToFelaxible(timeDown2) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 4e648e1c3b..4d51e70762 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -25,7 +25,6 @@ function QianKunBox:InitComponent() --midDown self.midDown = Util.GetGameObject(self.gameObject,"midDown") self.midDowntips1 = Util.GetGameObject(self.midDown,"Text"):GetComponent("Text") - self.midDowntips2 = Util.GetGameObject(self.midDown,"Text1"):GetComponent("Text") --rightUp self.rightUp = Util.GetGameObject(self.gameObject,"rightUp") self.btnReward = Util.GetGameObject(self.rightUp,"reward") @@ -295,26 +294,14 @@ function QianKunBox:TimeCountDown() self.timer:Stop() self.timer = nil end - local timeDown=CalculateSecondsNowTo_N_OClock(0)--ActivityGiftManager.GetTaskRemainTime(ActivityTypeDef.FindFairy) - local endTime = ActivityGiftManager.GetTaskEndTime(self.actType) - PlayerManager.serverTime - self.midDowntips2.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime)) + local timeDown=CalculateSecondsNowTo_N_OClock(0) self.btnTime.text = TimeToHMS(timeDown).."后刷新" self.timer = Timer.New(function() + self.btnTime.text = TimeToHMS(timeDown).."后刷新" if timeDown < 1 then self:refreshBtnShow() return - else - self.btnTime.text = TimeToHMS(timeDown).."后刷新" end - if endTime < 1 then - self.timer:Stop() - self.timer = nil - self:OnShow(sortingOrder) - return - else - self.midDowntips2.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime)) - end - endTime = endTime - 1 timeDown = timeDown - 1 end, 1, -1, true) self.timer:Start() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index a1964abb98..ef5aff7224 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -46,8 +46,7 @@ function TimeLimitUpHero:InitComponent() self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --免费次数剩余刷新时间 self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限 - self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") --活动剩余时间 - self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") --保底剩余次数 + self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/recruitTime") :GetComponent("Text") --保底剩余次数 self.getBtn=Util.GetGameObject(self.gameObject,"nextlevel") self.slider = Util.GetGameObject(self.getBtn, "Slider"):GetComponent("Slider") @@ -62,6 +61,7 @@ function TimeLimitUpHero:InitComponent() self.textInfo1=Util.GetGameObject(self.btn_hero,"Text"):GetComponent("Text") self.textInfo1.text="选择神将" self.titleImg=Util.GetGameObject(self.gameObject,"Bg2/Image (3)"):GetComponent("Image") + self.titleImg.gameObject:SetActive(false) self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image") self.callTimeImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_28zi_zh") self.callTimeTxt=Util.GetGameObject(self.gameObject,"callTimeImg/Text"):GetComponent("Text") @@ -155,7 +155,7 @@ function TimeLimitUpHero:OnShow(_sortingOrder) end -- LogError(" actid===="..self.actId) wishConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",self.actId) - self.titleImg.sprite=self.spLoader:LoadSprite(self.actConfig.Icon[3]) + -- self.titleImg.sprite=self.spLoader:LoadSprite(self.actConfig.Icon[3]) Setting= ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1) self.freeTimesId=Setting.FreeTimes self.maxtimesId=Setting.MaxTimes @@ -306,27 +306,15 @@ function TimeLimitUpHero:TimeCountDown() self.timer:Stop() self.timer = nil end - local timeDown=CalculateSecondsNowTo_N_OClock(0)--ActivityGiftManager.GetTaskRemainTime(ActivityTypeDef.FindFairy) - local endTime = ActivityGiftManager.GetTaskEndTime(self.actType) - PlayerManager.serverTime - self.recruitTimeUpdate.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime)) + local timeDown=CalculateSecondsNowTo_N_OClock(0) self.timeupdate.text = TimeToHMS(timeDown).."后刷新" self.timer = Timer.New(function() - if timeDown < 1 then + self.timeupdate.text = TimeToHMS(timeDown).."后刷新" + timeDown = timeDown - 1 + if timeDown <= 0 then self:RefreshGetHeroTimes() return - else - self.timeupdate.text = TimeToHMS(timeDown).."后刷新" end - if endTime < 1 then - self.timer:Stop() - self.timer = nil - self:OnShow(sortingOrder) - return - else - self.recruitTimeUpdate.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime)) - end - endTime = endTime - 1 - timeDown = timeDown - 1 end, 1, -1, true) self.timer:Start() end @@ -351,7 +339,7 @@ function TimeLimitUpHero:RefreshNextLevelReward() end for n,m in ipairs(data1) do mission = ActivityGiftManager.GetActivityInfo(self.actId, m.Id) - if(mission.progress >= m.Values[1][1])then + if(mission.progress >= m.Values[1][1])then if mission.state == 0 then rewardItem = m curState = 2 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 475f4f4085..24fc95c617 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1088,6 +1088,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.UpGradePackagePanel) elseif id == 95 then UIManager.OpenPanel(UIName.TimeLimitSkinPanel) + elseif id == FUNCTION_OPEN_TYPE.ChouJiangRukou then + UIManager.OpenPanel(UIName.ActivityMainPanel,id) end else end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index c880bbd215..a8498e434d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -704,6 +704,9 @@ local jumpDic = { this.isOpen = false end end, + [JumpType.StateActivity] = function (data) + this.JumpActivity(JumpType.StateActivity,data[1]) + end, [JumpType.FightLevel] = function (data) UIManager.OpenPanel(UIName.FightLevelChapterPanel) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua index 7592f2af12..40c96d93d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua @@ -57,7 +57,7 @@ function this:OnShow(_parent,...) curMonsterId = _args[2] this.titleText.text=Language[11565] - this.tip.text = Language[11566] + this.tip.text = "长按头像可查看灵兽详情" local monsterData = ConfigManager.GetAllConfigsDataByKey(ConfigName.SpiritAnimalSummon,"ActivityID",ActData.activityId) @@ -96,7 +96,7 @@ function this:SetSingleMonster(item,i,data) itemViewGrid[i] = SubUIManager.Open(SubUIConfig.ItemView,icon.transform) end itemViewGrid[i].gameObject:SetActive(true) - itemViewGrid[i]:OnOpen(false, {data.FocusID,0},1.5,false,false,false,sortingOrder) + itemViewGrid[i]:OnOpen(false, {data.FocusID,0},1,false,false,false,sortingOrder) if curMonsterId == data.FocusID then btnGo:SetActive(true) @@ -115,6 +115,10 @@ function this:SetSingleMonster(item,i,data) curMonsterId = data.FocusID btnGo:SetActive(true) end) + LogYellow("data.FocusID:"..tostring(data.FocusID)) + Util.AddLongPressClick(btn,function () + itemViewGrid[i]:OnBtnCkickEvent(data.FocusID) + end, 0.5) end function this:OnClose()