diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index 9407b0de05..1f87a4c9dc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -1354,7 +1354,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 5a2a0a611997b3944ba75981c8085ee5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2023,7 +2023,7 @@ RectTransform: - {fileID: 6214102878020123065} - {fileID: 6373659894630592187} m_Father: {fileID: 4861732001835339994} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2045,7 +2045,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &771717322046565802 RectTransform: m_ObjectHideFlags: 0 @@ -2060,13 +2060,13 @@ RectTransform: - {fileID: 5706396837637235873} - {fileID: 2767643966195102060} - {fileID: 3990209054754088391} - - {fileID: 843413399951429141} + - {fileID: 6387665801071181898} - {fileID: 1832744935859849533} - {fileID: 4547322584561196795} - {fileID: 963549149463528190} - {fileID: 8225507923881533074} m_Father: {fileID: 4861732001835339994} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2522,10 +2522,10 @@ RectTransform: m_Father: {fileID: 865909649873836560} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 179.5, y: -37.5} - m_SizeDelta: {x: 75, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3385190789731403730 CanvasRenderer: @@ -2843,7 +2843,7 @@ RectTransform: - {fileID: 5580186678272886395} - {fileID: 2392403711252525724} m_Father: {fileID: 4861732001835339994} - m_RootOrder: 5 + 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} @@ -3284,10 +3284,10 @@ RectTransform: m_Father: {fileID: 8645294579701598529} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -82.15} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &848985538316811060 CanvasRenderer: @@ -3779,10 +3779,10 @@ RectTransform: m_Father: {fileID: 3908445306704867997} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -104.7} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6105261017678981020 CanvasRenderer: @@ -3853,10 +3853,10 @@ RectTransform: m_Father: {fileID: 256931815944643907} 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: 14.5, y: -14.5} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1271570584172040396 CanvasRenderer: @@ -5274,6 +5274,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &946389761835322293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115202374252480050} + - component: {fileID: 487370610581639410} + - component: {fileID: 3847002274720694503} + m_Layer: 5 + m_Name: Text1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1115202374252480050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 946389761835322293} + 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: 9166658845325727682} + 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 &487370610581639410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 946389761835322293} + m_CullTransparentMesh: 0 +--- !u!114 &3847002274720694503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 946389761835322293} + 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 &967786628292146681 GameObject: m_ObjectHideFlags: 0 @@ -6253,10 +6332,10 @@ RectTransform: m_Father: {fileID: 256931815944643907} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -82.15} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5771984718345980949 CanvasRenderer: @@ -10934,7 +11013,7 @@ ParticleSystem: --- !u!199 &4026277983322118074 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -12217,7 +12296,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -83.02002} - m_SizeDelta: {x: 29, y: 119.2} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3351238965715829192 MonoBehaviour: @@ -12288,11 +12367,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4861732001835339994} - 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} - m_AnchoredPosition: {x: 250.2, y: -750.3} + m_AnchoredPosition: {x: 242.9, y: -653} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8556495867214217867 @@ -12384,10 +12463,10 @@ RectTransform: m_Father: {fileID: 256931815944643907} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -37.05} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6606966826223360989 CanvasRenderer: @@ -12731,10 +12810,10 @@ RectTransform: m_Father: {fileID: 3908445306704867997} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -37.05} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2747640047943409104 CanvasRenderer: @@ -12935,94 +13014,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &1928919737615483525 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 843413399951429141} - - component: {fileID: 8909111986023102589} - m_Layer: 5 - m_Name: Slider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &843413399951429141 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1928919737615483525} - 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: 6387665801071181898} - - {fileID: 5297959391583021777} - - {fileID: 8422893780256158036} - m_Father: {fileID: 771717322046565802} - 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: -2.93, y: -76.91} - m_SizeDelta: {x: 868.64, y: 44.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8909111986023102589 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1928919737615483525} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, 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: 3996503397521001364} - m_FillRect: {fileID: 4767532767712870908} - m_HandleRect: {fileID: 1624737059154682731} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &1966540838384116746 GameObject: m_ObjectHideFlags: 0 @@ -13904,10 +13895,10 @@ RectTransform: m_Father: {fileID: 8645294579701598529} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -59.6} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4038596017855710722 CanvasRenderer: @@ -14060,7 +14051,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -108.880005} - m_SizeDelta: {x: 29, y: 119.2} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2528069000549957389 MonoBehaviour: @@ -14300,6 +14291,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "0\u59290\u65F6" +--- !u!1 &2361143311724532957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6509449872347664063} + - component: {fileID: 2270725406989026347} + - component: {fileID: 8720533687938510278} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6509449872347664063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2361143311724532957} + 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: 9166658845325727682} + 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: -9.06, y: 55.5} + m_SizeDelta: {x: 373.47, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2270725406989026347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2361143311724532957} + m_CullTransparentMesh: 0 +--- !u!114 &8720533687938510278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2361143311724532957} + 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: 34 + 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: "\u53EC\u552428\u6B21\u5FC5\u5F97UP\u795E\u5C06" --- !u!1 &2385461764820287707 GameObject: m_ObjectHideFlags: 0 @@ -16230,10 +16300,10 @@ RectTransform: m_Father: {fileID: 9169938052652378160} 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: 46, y: -37.5} - m_SizeDelta: {x: 92, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7576367435209257744 CanvasRenderer: @@ -21400,7 +21470,7 @@ ParticleSystem: --- !u!199 &1335144838161731503 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21644,10 +21714,10 @@ RectTransform: m_Father: {fileID: 8645294579701598529} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -37.05} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111272115308872923 CanvasRenderer: @@ -22132,7 +22202,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: 264.6, y: -690} + m_AnchoredPosition: {x: 264.6, y: -588} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8697572413935661989 @@ -28105,7 +28175,7 @@ ParticleSystem: --- !u!199 &3478638013891207890 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28681,10 +28751,10 @@ RectTransform: m_Father: {fileID: 8645294579701598529} 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: 14.5, y: -14.5} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3240991912704273796 CanvasRenderer: @@ -28831,7 +28901,7 @@ RectTransform: - {fileID: 8430994577056978463} - {fileID: 2167077263011411568} m_Father: {fileID: 4861732001835339994} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -29265,7 +29335,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -12.96, y: 5.91} - m_SizeDelta: {x: 217, y: 75} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4340293503976776403 MonoBehaviour: @@ -29339,7 +29409,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: -266.7, y: -607} + m_AnchoredPosition: {x: -269.5, y: -510.2} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1895046513237343849 @@ -29513,7 +29583,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: 320.6, y: -571.9} + m_AnchoredPosition: {x: 319, y: -467.6} m_SizeDelta: {x: 214, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7938715518478234858 @@ -34668,7 +34738,7 @@ ParticleSystem: --- !u!199 &7935500073970882351 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34806,80 +34876,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" ---- !u!1 &4118699120585596572 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1624737059154682731} - - component: {fileID: 4430993178392327900} - - component: {fileID: 3996503397521001364} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1624737059154682731 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4118699120585596572} - 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: 8422893780256158036} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4430993178392327900 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4118699120585596572} - m_CullTransparentMesh: 0 ---- !u!114 &3996503397521001364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4118699120585596572} - 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: 10913, guid: 0000000000000000f000000000000000, type: 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 &4135332052051939834 GameObject: m_ObjectHideFlags: 0 @@ -39531,7 +39527,7 @@ ParticleSystem: --- !u!199 &8340592425251791152 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39966,42 +39962,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4317428957546752029 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5297959391583021777} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5297959391583021777 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4317428957546752029} - 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: 4767532767712870908} - m_Father: {fileID: 843413399951429141} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4327272365732836536 GameObject: m_ObjectHideFlags: 0 @@ -40544,10 +40504,10 @@ RectTransform: m_Father: {fileID: 3908445306704867997} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -59.6} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7039602054935919188 CanvasRenderer: @@ -40893,42 +40853,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5185\u5BB9\u8BE6\u60C5" ---- !u!1 &4537891607004404621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8422893780256158036} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8422893780256158036 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4537891607004404621} - 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: 1624737059154682731} - m_Father: {fileID: 843413399951429141} - 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, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4543000166555694592 GameObject: m_ObjectHideFlags: 0 @@ -41037,7 +40961,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -41173,17 +41097,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4559972495826923337} - 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: 843413399951429141} - m_RootOrder: 0 + m_Children: + - {fileID: 4767532767712870908} + m_Father: {fileID: 771717322046565802} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -38.7, y: -76.910034} + m_SizeDelta: {x: -283, y: -937.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1531783935696122457 CanvasRenderer: @@ -41750,10 +41675,10 @@ RectTransform: m_Father: {fileID: 865909649873836560} 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: 33.5, y: -37.5} - m_SizeDelta: {x: 67, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7103487418462813873 CanvasRenderer: @@ -41910,10 +41835,10 @@ RectTransform: m_Father: {fileID: 865909649873836560} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.5, y: -37.5} - m_SizeDelta: {x: 75, y: 75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7809564018559934362 CanvasRenderer: @@ -42733,7 +42658,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4861732001835339994 RectTransform: m_ObjectHideFlags: 0 @@ -42748,6 +42673,7 @@ RectTransform: - {fileID: 8776679390866583475} - {fileID: 6250758639763570433} - {fileID: 6542442513767726618} + - {fileID: 9166658845325727682} - {fileID: 2943178877559612817} - {fileID: 4292995407537679364} - {fileID: 133406343278040831} @@ -43214,10 +43140,10 @@ RectTransform: m_Father: {fileID: 256931815944643907} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -59.6} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8389494249282173091 CanvasRenderer: @@ -44636,6 +44562,82 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6055420643399230361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9166658845325727682} + - component: {fileID: 82962969014761975} + - component: {fileID: 7834348782055831887} + m_Layer: 5 + m_Name: recruitTimesUpdate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9166658845325727682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6055420643399230361} + 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: 6509449872347664063} + - {fileID: 1115202374252480050} + m_Father: {fileID: 4861732001835339994} + 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: -766.5} + m_SizeDelta: {x: 574, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &82962969014761975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6055420643399230361} + m_CullTransparentMesh: 0 +--- !u!114 &7834348782055831887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6055420643399230361} + 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 &6073959108311092099 GameObject: m_ObjectHideFlags: 0 @@ -50137,7 +50139,7 @@ ParticleSystem: --- !u!199 &6752594429674840321 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50530,10 +50532,10 @@ RectTransform: m_Father: {fileID: 3908445306704867997} 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: 14.5, y: -14.5} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3682801623919796499 CanvasRenderer: @@ -56901,7 +56903,7 @@ ParticleSystem: --- !u!199 &3319074951465041593 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56998,7 +57000,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: -261.3, y: -683} + m_AnchoredPosition: {x: -261.3, y: -588} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3104692846594389402 @@ -57243,15 +57245,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6842092240212916903} - 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: 5297959391583021777} + m_Father: {fileID: 6387665801071181898} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -57284,11 +57286,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: e9e281c5fb3c9ab4f8c7d5777e7fe83b, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 + m_FillMethod: 0 + m_FillAmount: 0 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -61936,7 +61938,7 @@ ParticleSystem: --- !u!199 &3115939239216534075 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -62338,10 +62340,10 @@ RectTransform: m_Father: {fileID: 3908445306704867997} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -82.15} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7360715433817600458 CanvasRenderer: @@ -62418,7 +62420,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -9.6, y: 9.39} - m_SizeDelta: {x: 267, y: 75} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2920749518122637498 MonoBehaviour: @@ -62747,7 +62749,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9921569, g: 0.98823535, b: 0.9803922, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -69063,7 +69065,7 @@ ParticleSystem: --- !u!199 &1887912736600313456 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69498,10 +69500,10 @@ RectTransform: m_Father: {fileID: 256931815944643907} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -104.7} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1599280539285444261 CanvasRenderer: @@ -70019,10 +70021,10 @@ RectTransform: m_Father: {fileID: 9169938052652378160} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 129.5, y: -37.5} - m_SizeDelta: {x: 75, y: 75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &402439565318443126 CanvasRenderer: @@ -70565,7 +70567,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -71531,10 +71533,10 @@ RectTransform: m_Father: {fileID: 8645294579701598529} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.5, y: -104.7} - m_SizeDelta: {x: 29, y: 29} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6271151026396174460 CanvasRenderer: @@ -72569,7 +72571,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -99.77991} - m_SizeDelta: {x: 29, y: 119.2} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3299539370615829798 MonoBehaviour: @@ -72948,10 +72950,10 @@ RectTransform: m_Father: {fileID: 9169938052652378160} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 217, y: -37.5} - m_SizeDelta: {x: 100, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1893471185777391941 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 98c5b727a8..a60005e115 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -235,6 +235,13 @@ function this.GetActivityTypeInfo(type) end) return missionData end + +function this.GetActivityValueInfo(type, Id) + if this.mission[type] then + LogBlue("this.mission[type].value:"..this.mission[type].value) + return this.mission[type].value + end +end function this.GetActivityInfo(type, Id) if this.mission[type] then for _, missInfo in pairs(this.mission[type].mission) do @@ -244,7 +251,7 @@ function this.GetActivityInfo(type, Id) end else Log(string.format(Language[10001], type, Id)) - return nil + return nil,0 end end function this.SetActivityInfo(type, Id, state) @@ -1022,9 +1029,11 @@ end function this.GetTimeStartToEnd(type) local info= ActivityGiftManager.GetActivityTypeInfo(type) - local startTime= this.GetTimeShow(info.StartTime) - local endtime= this.GetTimeShow(info.Endtime) - return startTime.."-"..endtime + LogBlue(info.endTime) + LogBlue(info.startTime) + local startTime= this.GetTimeShow(info.startTime) + local endtime= this.GetTimeShow(info.endTime) + return startTime.."~"..endtime end ---时间格式化接口 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua index e16b6bd415..61219e1e72 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua @@ -15,7 +15,7 @@ function RewardPreview:InitComponent(gameObject) self.itemGrid=Util.GetGameObject(self.gameObject,"itemGrid") self.itemPre=Util.GetGameObject(self.gameObject,"itemprefab") self.curtimes=Util.GetGameObject(self.gameObject,"tip1"):GetComponent("Text") - self.slider=Util.GetGameObject(self.gameObject,"Slider"):GetComponent("Slider") + self.slider=Util.GetGameObject(self.gameObject,"Background/Fill"):GetComponent("Image") end function RewardPreview:BindEvent() @@ -26,22 +26,25 @@ function RewardPreview:OnShow() self.gameObject:SetActive(true) local maxtimesId=lotterySetting[RecruitType.TimeLimitSingle].MaxTimes; curtimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) + self.slider.fillAmount =self: CalculateInterval(curtimes) self: RefreshRewarid() self.curtimes.text=Language[12181]..curtimes end function RewardPreview:RefreshRewarid() local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) - data= ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curActivityId) + data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curActivityId) local tmp=0 + --间隔的总次数 比如:30 60 120 210 300 count=(60-30)+ (120 - 60)+ (210 - 120)+ (300 - 210)= 300 - 30 =270 local count=0 - for n,m in ipairs(data) do - if n~=1 then - count = count + m.Values[1][1]-tmp - end - tmp = m.Values[1][1] - self.slider.value = curtimes / m.Values[1][1] - end + -- for n,m in ipairs(data) do + -- if n~=1 then + -- count = count + m.Values[1][1]-tmp + -- end + -- tmp = m.Values[1][1] + -- --self.slider.fillAmount = curtimes / m.Values[1][1] + -- end + count = data[#data].Values[1][1] tmp=0 local position = 0 local width = self.itemPre.transform:GetComponent("RectTransform").sizeDelta.x @@ -58,18 +61,53 @@ function RewardPreview:RefreshRewarid() local o= SubUIManager.Open(SubUIConfig.ItemView,listPre[n].transform) o:OnOpen(false, {m.Reward[1][1], m.Reward[1][2]}, 1.1, true) o.gameObject:SetActive(true) - Util.GetGameObject(listPre[n].gameObject,"progress"):GetComponent("Text") .text=m.Values[1][1] + Util.GetGameObject(listPre[n].gameObject,"progress"):GetComponent("Text").text=m.Values[1][1] + local tempinterval = (m.Values[1][1] - tmp) / count * interval if n==1 then - listPre[n].transform:GetComponent("RectTransform").anchoredPosition3D = Vector3.zero - position = 0 - else - local tempinterval = (m.Values[1][1] - tmp) / count * interval - position = tempinterval + width + position - listPre[n].transform:GetComponent("RectTransform").anchoredPosition3D=Vector3.New(position,0,0) + position = tempinterval + else + position = tempinterval + width + position end + listPre[n].transform:GetComponent("RectTransform").anchoredPosition3D=Vector3.New(position,0,0) tmp=m.Values[1][1] end + end +end + +function RewardPreview:CalculateInterval(count) + local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + local data= ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curActivityId) + local interval = 0 + LogBlue(#data) + for n,m in ipairs(data) do + LogBlue(n.." "..m.Values[1][1]) + end + if count>=data[1].Values[1][1] then + interval=0.099 + if count>=data[2].Values[1][1] then + interval=0.3 + if count>=data[3].Values[1][1] then + interval=0.54 + if count>=data[4].Values[1][1] then + interval=0.75 + if count>=data[5].Values[1][1] then + interval=1 + else + interval = 0.75+ (count - data[4].Values[1][1]) * (1-0.75)/(data[5].Values[1][1]-data[4].Values[1][1]) + end + else + interval = 0.54+ (count -data[3].Values[1][1])*(0.75-0.54)/(data[4].Values[1][1]-data[3].Values[1][1]) + end + else + interval = 0.3+ (count -data[2].Values[1][1])*(0.54-0.3)/(data[3].Values[1][1]-data[2].Values[1][1]) + end + else + interval = 0.099+ (count -data[1].Values[1][1])*(0.3-0.099)/(data[2].Values[1][1]-data[1].Values[1][1]) end + else + interval = count*0.001 + end + return interval end function RewardPreview:OnHide() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index ac0e16886c..97d6c27a07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -54,8 +54,8 @@ function TimeLimitedCall:InitComponent(gameObject) self.hero2 = Util.GetGameObject(self.gameObject,"Bg/hero2") self.hero3 = Util.GetGameObject(self.gameObject,"Bg/hero3") - self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") - self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") + self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") --时间 + self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") --剩余次数 end function TimeLimitedCall:BindEvent() @@ -66,7 +66,7 @@ function TimeLimitedCall:BindEvent() Util.AddClick(self.activityBtn, function() secectTab=1 self:RefreshTabBtn() - ActivityDetail.new(self.detail) + ActivityDetail.new(self.detail,1) end) Util.AddClick(self.rewardBtn, function() @@ -183,10 +183,37 @@ function TimeLimitedCall:RefreshNextLevelReward() RewardPreview.new(self.reward) end) end + + local reMaintimes = ActivityGiftManager.GetActivityValueInfo(curActivityId) + LogBlue(ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count) + reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count - reMaintimes + LogBlue("reMaintimes:"..reMaintimes) + self.recruitTimesUpdate.text = string.format("召唤%s次必得UP神将",reMaintimes) + + local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) + LogBlue(info.endTime) + LogBlue(info.startTime) + info = info.endTime - info.startTime + info = self:TimeToDHMS(info) + self.recruitTimeUpdate.text = string.format("活动剩余时间:"..info) +end +--- 将一段时间转换为天时分秒 +function TimeLimitedCall:TimeToDHMS(second) + local day = math.floor(second / (24 * 3600)) + local minute = math.floor(second / 60) % 60 + local sec = second % 60 + local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) + if day <= 0 and hour <= 0 then + return string.format("%s分%s秒",minute, sec) + else + return string.format("%s天%s小时",day, hour) + end end function TimeLimitedCall:GetMissionStateById(num,activityId) + LogBlue("activityId:"..activityId.. ",num:"..num) local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据 + LogBlue(mission.progress.." "..mission.state) return mission.progress,mission.state end