From eddaa95312ca6851092eb561fdf0aff40a8c4469 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 14 Jul 2020 11:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E5=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Operating/OperatingPanel.prefab | 772 +++++++++--------- .../~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Common/functions.lua | 10 + .../~Lua/Modules/Bag/BagManager.lua | 2 +- .../~Lua/Modules/Operating/OperatingPanel.lua | 2 +- .../~Lua/Modules/Operating/QianKunBox.lua | 25 +- 6 files changed, 398 insertions(+), 415 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index f9b1db6964..b5496a93ae 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -1726,14 +1726,13 @@ GameObject: m_Component: - component: {fileID: 224022179357799424} - component: {fileID: 222322333926077558} - - component: {fileID: 1089841089597066573} m_Layer: 5 m_Name: page_9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224022179357799424 RectTransform: m_ObjectHideFlags: 0 @@ -1745,7 +1744,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1074478667996733876} - {fileID: 1977291223005907331} + - {fileID: 4487371531364375038} - {fileID: 6434079741682880074} - {fileID: 2563449696537189548} - {fileID: 4644202541917292651} @@ -1768,35 +1769,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1952974219217892} m_CullTransparentMesh: 0 ---- !u!114 &1089841089597066573 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1952974219217892} - 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: b5bd695a718cb004a9c5aab8c2002de6, 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 &31891695288090872 GameObject: m_ObjectHideFlags: 0 @@ -4693,7 +4665,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3529412, g: 0.7725491, b: 0.54509807, a: 1} + m_Color: {r: 0.9960785, g: 0.9921569, b: 0.98823535, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4713,7 +4685,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u540E\u514D\u8D39" + m_Text: "\u540E\u5237\u65B0" LanguageIndex: 0 --- !u!1 &528939084555564578 GameObject: @@ -4862,8 +4834,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: 282, y: 47.9} - m_SizeDelta: {x: 350, y: 88.1} + m_AnchoredPosition: {x: 283.29, y: 88.25} + m_SizeDelta: {x: 314.11, y: 89.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3263545070456240358 CanvasRenderer: @@ -4893,7 +4865,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: ff5637e9faab7a34aba562bfd04648ae, type: 3} + m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5858,9 +5830,9 @@ RectTransform: m_Father: {fileID: 4693386617891966018} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 122, y: -38.17} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7522942682079678097 @@ -12637,6 +12609,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1460081428878498564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1526721708991906383} + - component: {fileID: 2384821098735305659} + - component: {fileID: 9211767636114076948} + m_Layer: 0 + m_Name: times + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1526721708991906383 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1460081428878498564} + 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: 6198020801691894436} + 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: -89.8, y: 1.3} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2384821098735305659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1460081428878498564} + m_CullTransparentMesh: 0 +--- !u!114 &9211767636114076948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1460081428878498564} + 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.64705884, g: 0.3529412, b: 0.07450981, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 28 + LanguageIndex: 0 --- !u!1 &1481800385001882369 GameObject: m_ObjectHideFlags: 0 @@ -13023,86 +13075,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7ED1\u5B9A\u624B\u673A\u5373\u53EF\u9886\u53D6\u8D85\u503C\u793C\u5305" ---- !u!1 &1589252998327775397 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7271727906694809469} - - component: {fileID: 1942958750420747603} - - component: {fileID: 4772847549610083738} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7271727906694809469 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589252998327775397} - 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: 8847150281984800688} - 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: -115.4, y: 0} - m_SizeDelta: {x: 100, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1942958750420747603 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589252998327775397} - m_CullTransparentMesh: 0 ---- !u!114 &4772847549610083738 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589252998327775397} - 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.3529412, g: 0.7686275, b: 0.54509807, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6B21" - LanguageIndex: 0 --- !u!1 &1593204547178022877 GameObject: m_ObjectHideFlags: 0 @@ -14335,7 +14307,7 @@ GameObject: m_Component: - component: {fileID: 6434079741682880074} m_Layer: 5 - m_Name: leftUp + m_Name: midDown m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -14352,15 +14324,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7342753533953962259} - {fileID: 187152867808059859} m_Father: {fileID: 224022179357799424} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 91.899994, y: 760.9} - m_SizeDelta: {x: 126.1, y: 216.1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.75, y: -707.47} + m_SizeDelta: {x: 439.07, y: 127.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1998002648371082974 GameObject: @@ -14923,7 +14894,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: 153.9, y: 0} + m_AnchoredPosition: {x: 144.4, y: -1} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2417102836726186479 @@ -14947,7 +14918,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3529412, g: 0.77647066, b: 0.54901963, a: 1} + m_Color: {r: 0.94117653, g: 0.8588236, b: 0.59607846, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -14955,8 +14926,8 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -14967,7 +14938,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "12\u592923\u5C0F\u65F6" + m_Text: "29\u592912\u5C0F\u65F6" LanguageIndex: 0 --- !u!1 &2106553203279699659 GameObject: @@ -16202,7 +16173,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: 4, y: 7.9} + m_AnchoredPosition: {x: 4, y: 1} m_SizeDelta: {x: 250, y: 76.34} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3659299109409655921 @@ -16262,9 +16233,9 @@ RectTransform: m_Father: {fileID: 2563449696537189548} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -83.9} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6956935737205087937 @@ -17761,86 +17732,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2699276169064063743 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8168139325732954708} - - component: {fileID: 2432631492222027241} - - component: {fileID: 3664568337199045105} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8168139325732954708 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2699276169064063743} - 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: 8847150281984800688} - 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: -15.8, y: 0} - m_SizeDelta: {x: 100, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2432631492222027241 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2699276169064063743} - m_CullTransparentMesh: 0 ---- !u!114 &3664568337199045105 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2699276169064063743} - 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: 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5185\u5FC5\u5F97\u91D1\u8272\u9B42\u5370" - LanguageIndex: 0 --- !u!1 &2729845090094623053 GameObject: m_ObjectHideFlags: 0 @@ -23589,7 +23480,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: -154.5, y: 466.2} + m_AnchoredPosition: {x: -154.5, y: 521} m_SizeDelta: {x: 220, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3721339623107179049 @@ -43576,9 +43467,9 @@ RectTransform: m_Father: {fileID: 2619250708224743012} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 117.8, y: -38.17} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1710377963916506075 @@ -44393,8 +44284,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 187152867808059859} - - component: {fileID: 6264999679292781386} - component: {fileID: 1713535215167173537} + - component: {fileID: 4972503048300434539} m_Layer: 5 m_Name: tips m_TagString: Untagged @@ -44416,36 +44307,13 @@ RectTransform: - {fileID: 6198020801691894436} - {fileID: 3843384133350247059} m_Father: {fileID: 6434079741682880074} - m_RootOrder: 1 + 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: 241.5, y: -61.525} - m_SizeDelta: {x: 483, y: 98} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.1, y: -27.3} + m_SizeDelta: {x: 574, y: 170} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6264999679292781386 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4555578794492988085} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 --- !u!222 &1713535215167173537 CanvasRenderer: m_ObjectHideFlags: 0 @@ -44454,6 +44322,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4555578794492988085} m_CullTransparentMesh: 0 +--- !u!114 &4972503048300434539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4555578794492988085} + 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 &4559972495826923337 GameObject: m_ObjectHideFlags: 0 @@ -45730,7 +45627,7 @@ RectTransform: - {fileID: 4074925447573260606} - {fileID: 6623889919160382159} m_Father: {fileID: 224022179357799424} - m_RootOrder: 3 + 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} @@ -45844,7 +45741,7 @@ RectTransform: - {fileID: 4405608164372076058} - {fileID: 6736986055209194195} m_Father: {fileID: 224022179357799424} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -45957,9 +45854,9 @@ RectTransform: m_Father: {fileID: 2619250708224743012} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40.15, y: -38.17} m_SizeDelta: {x: 80.3, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5638541037889376890 @@ -46510,6 +46407,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &5163407879258530794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1074478667996733876} + - component: {fileID: 6620774130892155227} + - component: {fileID: 2721337086866753316} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1074478667996733876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5163407879258530794} + 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: 224022179357799424} + 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: 54} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6620774130892155227 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5163407879258530794} + m_CullTransparentMesh: 0 +--- !u!114 &2721337086866753316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5163407879258530794} + 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: b5bd695a718cb004a9c5aab8c2002de6, 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 &5173767172553374501 GameObject: m_ObjectHideFlags: 0 @@ -46612,13 +46583,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1526721708991906383} m_Father: {fileID: 187152867808059859} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 8.4, y: 55.5} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6862162761333370600 @@ -46642,7 +46614,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.8980393, b: 0.8745099, a: 1} + m_Color: {r: 0.94117653, g: 0.8588236, b: 0.59607846, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -46650,19 +46622,19 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "100\u6B21\u5185\u5FC5\u5F97\u6A59\u8272\u9B42\u5370" + m_Text: "\u53EC\u5524 \u6B21\u5FC5\u5F97\u6A59\u8272\u9B42\u5370" LanguageIndex: 0 --- !u!1 &5223684190266925604 GameObject: @@ -47734,7 +47706,7 @@ RectTransform: - {fileID: 6138736749550206197} - {fileID: 4366565393557443327} m_Father: {fileID: 224022179357799424} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -49476,7 +49448,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: -431.7, y: 40.8} + m_AnchoredPosition: {x: -431.7, y: 93} m_SizeDelta: {x: 205, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4922396931153420442 @@ -49548,9 +49520,9 @@ RectTransform: m_Father: {fileID: 4693386617891966018} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 39.666668, y: -38.17} m_SizeDelta: {x: 69, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &532619474986438430 @@ -49751,8 +49723,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: -295.3, y: 47.9} - m_SizeDelta: {x: 350, y: 88.1} + m_AnchoredPosition: {x: -275.63, y: 82.09} + m_SizeDelta: {x: 320.23, y: 109.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6956912154996640306 CanvasRenderer: @@ -49782,7 +49754,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: ff5637e9faab7a34aba562bfd04648ae, type: 3} + m_Sprite: {fileID: 21300000, guid: 089545ebf4aee464e9b3f4c9287de2a2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -54957,9 +54929,9 @@ RectTransform: m_Father: {fileID: 2619250708224743012} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 193.55, y: -38.17} m_SizeDelta: {x: 76.5, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4296817861848931118 @@ -55628,7 +55600,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: 197.4, y: 655.3} + m_AnchoredPosition: {x: 197.4, y: 706} m_SizeDelta: {x: 200, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3993137306861254414 @@ -56063,17 +56035,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6443070876602176218} - 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: 4842692234251942271} - m_RootOrder: 3 + m_Father: {fileID: 4487371531364375038} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 23.8, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &656706684647381815 CanvasRenderer: @@ -56096,7 +56068,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6666667, g: 0.30980393, b: 0.23529413, a: 1} + m_Color: {r: 0.98823535, g: 0.8980393, b: 0.8745099, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -56110,7 +56082,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -56152,7 +56124,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 170} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6451843161533634523 @@ -57077,7 +57049,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: -295.3, y: -13.099976} + m_AnchoredPosition: {x: -268.8, y: -13.099976} m_SizeDelta: {x: 335, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8878468446849001572 @@ -57095,7 +57067,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6736651794094638034} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -66965,7 +66937,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: -18.5, y: 196.2} + m_AnchoredPosition: {x: -18.5, y: 252} m_SizeDelta: {x: 220, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6637697866254976849 @@ -68043,9 +68015,9 @@ RectTransform: m_Father: {fileID: 187152867808059859} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -66, y: 6.8} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7757148817204996626 @@ -68069,7 +68041,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3529412, g: 0.77647066, b: 0.54901963, a: 1} + m_Color: {r: 0.92549026, g: 0.8431373, b: 0.58431375, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -68077,19 +68049,19 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 31 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5269\u4F59\u65F6\u95F4:" + m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A" LanguageIndex: 0 --- !u!1 &7245194077747910023 GameObject: @@ -69236,15 +69208,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1100609183195889322} - - {fileID: 7271727906694809469} - - {fileID: 8168139325732954708} m_Father: {fileID: 5074210478507586219} 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: 282, y: -13.099976} - m_SizeDelta: {x: 335, y: 32} + m_AnchoredPosition: {x: 319, y: 34.4} + m_SizeDelta: {x: 214, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2653844543049602103 CanvasRenderer: @@ -69274,7 +69244,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: eeaca719eee3ca846a7a9e663b2f6e67, type: 3} + m_Sprite: {fileID: 21300000, guid: cc769968502bdcc4abbc1a7f789bfb2e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -69317,8 +69287,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: -145.3, y: 0} - m_SizeDelta: {x: 100, y: 30} + m_AnchoredPosition: {x: 2.45, y: 4.6} + m_SizeDelta: {x: 163.78, y: 73.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8650665345035014467 CanvasRenderer: @@ -69341,7 +69311,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3529412, g: 0.7686275, b: 0.54509807, a: 1} + m_Color: {r: 0.9803922, g: 0.8745099, b: 0.6039216, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -69350,18 +69320,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 30 + m_Text: "30\u6B21\u5185\u5FC5\u5F97\u91D1\u8272\u9B42\u5370" LanguageIndex: 0 --- !u!1 &7575173322058737628 GameObject: @@ -69630,9 +69600,8 @@ RectTransform: - {fileID: 4892335147064684432} - {fileID: 6437829896961728300} - {fileID: 5074210478507586219} - - {fileID: 241295741258955672} m_Father: {fileID: 224022179357799424} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -75089,80 +75058,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" ---- !u!1 &7971923701877632530 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7342753533953962259} - - component: {fileID: 7017721310618851353} - - component: {fileID: 7822111783947846866} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7342753533953962259 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7971923701877632530} - 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: 6434079741682880074} - 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: 152, y: 47} - m_SizeDelta: {x: 483, y: 98} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7017721310618851353 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7971923701877632530} - m_CullTransparentMesh: 0 ---- !u!114 &7822111783947846866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7971923701877632530} - 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: 040b2d02b8b551748b95d94345cbcfe6, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &8000889378704763060 GameObject: m_ObjectHideFlags: 0 @@ -75199,7 +75094,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: 415.9, y: 117.3} + m_AnchoredPosition: {x: 415.9, y: 171} m_SizeDelta: {x: 220, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8308723549855691737 @@ -75716,8 +75611,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: -53, y: 0} - m_SizeDelta: {x: 100, y: 30} + m_AnchoredPosition: {x: -34.6, y: -0.2} + m_SizeDelta: {x: 127.54, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2941437553828317552 CanvasRenderer: @@ -75740,7 +75635,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3529412, g: 0.7686275, b: 0.54509807, a: 1} + m_Color: {r: 0.9960785, g: 0.9921569, b: 0.98823535, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -75760,7 +75655,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 23:59:59 + m_Text: 17:20:01 LanguageIndex: 0 --- !u!1 &8143265360364927268 GameObject: @@ -75913,9 +75808,9 @@ RectTransform: m_Father: {fileID: 2563449696537189548} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -250.20001} m_SizeDelta: {x: 123, y: 123} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1237614083773060768 @@ -77166,6 +77061,81 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6982\u7387\u6709\u6548\u671F\uFF1A2020-0326~2020-04-01" +--- !u!1 &8505761381711264458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4487371531364375038} + - component: {fileID: 6071707797280984762} + - component: {fileID: 641989272795694685} + m_Layer: 5 + m_Name: limitdi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4487371531364375038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8505761381711264458} + 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: 241295741258955672} + m_Father: {fileID: 224022179357799424} + 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: -228.24, y: 853.51} + m_SizeDelta: {x: 625.72, y: 56.37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6071707797280984762 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8505761381711264458} + m_CullTransparentMesh: 0 +--- !u!114 &641989272795694685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8505761381711264458} + 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: 040b2d02b8b551748b95d94345cbcfe6, 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 &8522855170930229524 GameObject: m_ObjectHideFlags: 0 @@ -77728,11 +77698,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224022179357799424} - m_RootOrder: 0 + 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: 62.850006, y: -260.625} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 451, y: 856} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7355689627677859782 @@ -77865,9 +77835,9 @@ RectTransform: m_Father: {fileID: 4693386617891966018} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 207.33334, y: -38.17} m_SizeDelta: {x: 75, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6749233589532361498 @@ -80006,7 +79976,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: 0, y: -277} + m_AnchoredPosition: {x: 0, y: -221} m_SizeDelta: {x: 501, y: 472} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7007745767439990069 @@ -80230,11 +80200,11 @@ RectTransform: - {fileID: 7590589377025342497} - {fileID: 3943816002310360854} m_Father: {fileID: 224022179357799424} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -91, y: 723.5} + m_AnchoredPosition: {x: -90, y: 654} m_SizeDelta: {x: 150, y: 332.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1274504908117477529 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5561322430..8fb5237371 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -418,7 +418,7 @@ PanelType = { Talisman = {14}, -- 新法宝 Guild = {14, 16, 65}, -- 新法宝 TimelimitCall={87,16}, --限时召唤 - QianKunBox={16,1002},--乾坤包囊 + QianKunBox={1002,1003,16},--乾坤包囊 } diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index f2227aa131..bc60276c01 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1010,6 +1010,16 @@ function TimeToDHMS(second) local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) return string.format(Language[10548],day, hour, minute, sec) end + +--- 将一段时间转换为天时 +function TimeToDH(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) + return string.format("%d天%02d时",day, hour) +end + --- 将一段时间转换为时分秒 function TimeToHMS(t) if not t or t < 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index d1dfcb71b5..22ff28853f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -651,7 +651,7 @@ function this.GetTableByBackDropData(drop) -- TalismanManager.InitUpdateSingleTalismanData(itemdata.backData) -- end -- end - LogBlue("drop.soulEquip:"..#drop.soulEquip) + -- LogBlue("drop.soulEquip:"..#drop.soulEquip) if drop.soulEquip ~= nil and #drop.soulEquip > 0 then Log("drop.especialEquipId " .. #drop.soulEquip) for i = 1, #drop.soulEquip do diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index d7cd7bb308..64847cfcca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -203,7 +203,7 @@ function OperatingPanel:ShowTabContent(index) return elseif index == 11 then self.operatingContents[curContent]:OnShow(self.sortingOrder) - self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })--货币待修改 + self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) return end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua index 34f9e8f81f..11db1a6875 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua @@ -7,6 +7,7 @@ local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) +local lotterySpecialConfig = ConfigManager.GetConfig(ConfigName.LotterySpecialConfig) local orginLayer = 0 local bType={ @@ -29,10 +30,10 @@ function QianKunBox:InitComponent(gameObject) self.tabList = Util.GetGameObject(self.mainPanel,"bg/tabList") self.btnBack = Util.GetGameObject(self.mainPanel,"bg/btnBack") self.bottomBar = Util.GetGameObject(self.mainPanel,"bg/bottomBar") - --leftUp - self.leftUp = Util.GetGameObject(gameObject,"leftUp") - self.leftUptips1 = Util.GetGameObject(self.leftUp,"tips/tips1"):GetComponent("Text") - self.leftUpTime = Util.GetGameObject(self.leftUp,"tips/tips2/time"):GetComponent("Text") + --midDown + self.midDown = Util.GetGameObject(gameObject,"midDown") + self.leftUptips1 = Util.GetGameObject(self.midDown,"tips/tips1/times"):GetComponent("Text") + self.leftUpTime = Util.GetGameObject(self.midDown,"tips/tips2/time"):GetComponent("Text") self.btnHelp= Util.GetGameObject(gameObject,"btnHelp") self.helpPosition=self.btnHelp:GetComponent("RectTransform").localPosition --rightUp @@ -50,7 +51,8 @@ function QianKunBox:InitComponent(gameObject) self.btnTen1 = Util.GetGameObject(self.bottom,"btnTen1") self.btnTen2 = Util.GetGameObject(self.bottom,"btnTen2") self.btnTimes= Util.GetGameObject(self.bottom,"countDown/di2/time"):GetComponent("Text") - self.limit = Util.GetGameObject(self.bottom,"limit"):GetComponent("Text") + --limit + self.limit = Util.GetGameObject(gameObject,"limitdi/limit"):GetComponent("Text") --detail self.detail = Util.GetGameObject(gameObject,"detail") --shop @@ -65,9 +67,10 @@ function QianKunBox:BindEvent() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.QianKunBox,self.helpPosition.x,self.helpPosition.y) end) Util.AddClick(self.btnReward,function() - ActivityDetail.new(self.detail,2) + ActivityDetail.new(self.detail,2) end) Util.AddClick(self.btnStore,function() + -- Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnCurrencyChange,PanelType.QianKunStore) self.shop:SetActive(true) self.btnBack:SetActive(false) self.tabList:SetActive(false) @@ -130,7 +133,7 @@ function QianKunBox:refreshBtnShow() d=RecruitManager.GetExpendData(m.type) itemId=d[1] itemNum=d[2] - LogPink("itemId:"..itemId.." itemNum:"..itemNum) + -- LogPink("itemId:"..itemId.." itemNum:"..itemNum) icon.sprite=Util.LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name) info.text=m.isInfo num.text= tostring(itemNum) @@ -201,7 +204,7 @@ function QianKunBox:timeCountDown() self.shopData = ShopManager.GetShopDataByType(SHOP_TYPE.QIANKUNBOX_SHOP)--获取活动信息 self.leftUpTime.text = TimeToDHMS(self.shopData.endTime - GetTimeStamp())--活动结束的倒计时 self.timer = Timer.New(function() - self.leftUpTime.text = TimeToDHMS(self.shopData.endTime - GetTimeStamp()) + self.leftUpTime.text = TimeToDH(self.shopData.endTime - GetTimeStamp()) self.btnTime.text = TimeToHMS(timeDown) timeDown = timeDown -1 end, 1, -1, true) @@ -211,9 +214,9 @@ end function QianKunBox:refreshMagicNum() local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox) - LogYellow("ID:"..actData.activityId.." value"..actData.value) - self.leftUptips1.text = 100-math.floor(actData.value/1000)..Language[12226] - self.btnTimes.text = 30-actData.value%1000 + -- LogYellow("ID:"..actData.activityId.." value"..actData.value) + self.leftUptips1.text = lotterySpecialConfig[20].Count-math.floor(actData.value/1000) + self.btnTimes.text = tostring(lotterySpecialConfig[21].Count-actData.value%1000).."次内必得金色魂印" end function QianKunBox:OnSortingOrderChange(_sortingOrder)