diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index d0ab2ed8..cffde7a7 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -13645,6 +13645,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 141710023} m_CullTransparentMesh: 1 +--- !u!1 &142145192 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3011360593986977004, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + m_PrefabInstance: {fileID: 366819986} + m_PrefabAsset: {fileID: 0} --- !u!1 &147328306 GameObject: m_ObjectHideFlags: 0 @@ -15678,6 +15683,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 169164286} m_CullTransparentMesh: 1 +--- !u!114 &169550626 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3011360593088858227, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + m_PrefabInstance: {fileID: 366819986} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &170032779 GameObject: m_ObjectHideFlags: 0 @@ -29648,6 +29664,11 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &354071041 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3011360594037153532, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + m_PrefabInstance: {fileID: 366819986} + m_PrefabAsset: {fileID: 0} --- !u!1 &354232209 GameObject: m_ObjectHideFlags: 0 @@ -31328,6 +31349,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3011360592813189307, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_SizeDelta.x + value: 610.831 + objectReference: {fileID: 0} + - target: {fileID: 3011360592813189307, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 23.0988 + objectReference: {fileID: 0} - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -31376,6 +31405,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3011360593223604693, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_FillAmount + value: 0.35 + objectReference: {fileID: 0} - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -31408,6 +31441,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3011360593425406785, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -31488,6 +31525,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3011360593644270110, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -31564,6 +31605,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3011360593759919821, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -31616,6 +31661,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3011360593986977004, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -32375,8 +32424,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 414, y: -62.468117} - m_SizeDelta: {x: 458.6698, y: 111.4225} + m_AnchoredPosition: {x: 414, y: -53.69955} + m_SizeDelta: {x: 458.6698, y: 76.3482} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &373241424 MonoBehaviour: @@ -43601,6 +43650,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496367258} m_CullTransparentMesh: 1 +--- !u!1 &497486967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 497486968} + - component: {fileID: 497486970} + - component: {fileID: 497486969} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &497486968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497486967} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1762620546} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &497486969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497486967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8F6C\u589E\u8BBE\u7F6E" +--- !u!222 &497486970 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497486967} + m_CullTransparentMesh: 1 --- !u!1 &500752653 GameObject: m_ObjectHideFlags: 0 @@ -78751,8 +78880,8 @@ RectTransform: - {fileID: 1192041086} - {fileID: 1503882532} - {fileID: 892568005} - - {fileID: 1044820713} - {fileID: 1553952862} + - {fileID: 1044820713} m_Father: {fileID: 0} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -90147,7 +90276,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 914645750} - m_RootOrder: 23 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1044820714 MonoBehaviour: @@ -92351,10 +92480,10 @@ RectTransform: m_Father: {fileID: 1475159791} 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: 380.2, y: -893.5} - m_SizeDelta: {x: 284.18, y: 88.9345} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -159.79999, y: 66.5} + m_SizeDelta: {x: 284.18, y: 88.93451} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1073921389 MonoBehaviour: @@ -101249,6 +101378,28 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166984559} m_CullTransparentMesh: 1 +--- !u!1 &1167677821 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3011360593689822043, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + m_PrefabInstance: {fileID: 366819986} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1167677825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167677821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b635c919af2d1441a6277195fe9ba8a, type: 3} + m_Name: + m_EditorClassIdentifier: + levelNumber: {fileID: 169550626} + startmusk: + - {fileID: 142145192} + - {fileID: 1644543592} + - {fileID: 354071041} --- !u!1 &1168860692 GameObject: m_ObjectHideFlags: 0 @@ -101512,6 +101663,27 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171874113} m_CullTransparentMesh: 1 +--- !u!1 &1174488905 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3011360593414553568, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + m_PrefabInstance: {fileID: 366819986} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1174488907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174488905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a43295cbf28bf14e801eacd33af7090, type: 3} + m_Name: + m_EditorClassIdentifier: + prebtn: {fileID: 0} + nextbtn: {fileID: 0} + Levelfill: {fileID: 0} + levellist: [] --- !u!1 &1176037957 GameObject: m_ObjectHideFlags: 0 @@ -118105,10 +118277,10 @@ RectTransform: m_Father: {fileID: 1802660310} 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: 380.2, y: -893.5} - m_SizeDelta: {x: 284.18, y: 88.9345} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -159.79999, y: 66.5} + m_SizeDelta: {x: 284.18, y: 88.93451} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1377713375 MonoBehaviour: @@ -126664,7 +126836,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1475159789 MonoBehaviour: m_ObjectHideFlags: 0 @@ -133453,7 +133625,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6931136036260294093, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3} propertyPath: m_RootOrder - value: 24 + value: 23 objectReference: {fileID: 0} - target: {fileID: 6931136036260294093, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3} propertyPath: m_AnchorMax.x @@ -141503,6 +141675,11 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1644543592 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3011360593644270110, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + m_PrefabInstance: {fileID: 366819986} + m_PrefabAsset: {fileID: 0} --- !u!1 &1644680304 GameObject: m_ObjectHideFlags: 0 @@ -149384,7 +149561,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1762620546} m_Father: {fileID: 1437967302} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -151285,6 +151463,128 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1761151307} m_CullTransparentMesh: 1 +--- !u!1 &1762620545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1762620546} + - component: {fileID: 1762620549} + - component: {fileID: 1762620548} + - component: {fileID: 1762620547} + m_Layer: 5 + m_Name: DonatePassword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1762620546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1762620545} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 497486968} + m_Father: {fileID: 1736630864} + 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: -70.798, y: 0} + m_SizeDelta: {x: 212, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1762620547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1762620545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1762620548} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1762620548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1762620545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 575687ccea2f8da44af5133636bf8d45, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1762620549 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1762620545} + m_CullTransparentMesh: 1 --- !u!1001 &1763473015 PrefabInstance: m_ObjectHideFlags: 0 @@ -152536,10 +152836,10 @@ RectTransform: m_Father: {fileID: 472317890} 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: 380.2, y: -893.5} - m_SizeDelta: {x: 284.18, y: 88.9345} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -159.79999, y: 66.5} + m_SizeDelta: {x: 284.18, y: 88.93451} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1786410495 MonoBehaviour: @@ -153047,7 +153347,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 414, y: -390.2431} + m_AnchoredPosition: {x: 414, y: -381.47455} m_SizeDelta: {x: 725.2872, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1791333527 @@ -169065,10 +169365,10 @@ RectTransform: m_Father: {fileID: 1054453615} 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: 380.2, y: -893.5} - m_SizeDelta: {x: 284.18, y: 88.9345} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -159.79999, y: 66.5} + m_SizeDelta: {x: 284.18, y: 88.93451} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1956022999 MonoBehaviour: diff --git a/meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs b/meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs index 4ed68328..ad7f5781 100644 --- a/meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs +++ b/meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs @@ -49,7 +49,7 @@ public class WaterPanel : MonoBehaviour int minutes = currentTime.Minute; int seconds = currentTime.Second; - if (hours >= 20) + if (hours >= 20 && hours<=8) { TreeBg.texture = NightSp; } @@ -73,7 +73,7 @@ public class WaterPanel : MonoBehaviour PlaceOfBirthtext.text = playerinfo.island_name; } - public void Updated_interface(TreeInfo info) + public void Updated_interface(TreeInfo info)//更新生态树界面数据 { chart_title.text = info.Data.ChartTitle; stats1award.text = info.Data.Charts[0].Reward; @@ -96,7 +96,7 @@ public class WaterPanel : MonoBehaviour } - public void Updated_Tree(int i) + public void Updated_Tree(int i)//显示当前等级树木图片 { switch (i) @@ -138,13 +138,13 @@ public class WaterPanel : MonoBehaviour Treelist[4].SetActive(false); } - public void Updated_water(TreeInfo info) + public void Updated_water(TreeInfo info)//更新水滴数据 { waterCountText.text = info.Data.Water.ToString("F2"); } - public void Updated_petinfo(petBettleInfoResponse info) + public void Updated_petinfo(petBettleInfoResponse info)//更新宠物等级 { if (info.data.Info == null) { @@ -166,7 +166,7 @@ public class WaterPanel : MonoBehaviour } } public List shenxiao = new List(); - void ShowChineseZodiac(string name) + void ShowChineseZodiac(string name) //更新宠物显示 { for (int i = 0; i < shenxiao.Count; i++) { @@ -176,9 +176,6 @@ public class WaterPanel : MonoBehaviour } } - //鼠、牛、虎、兔、龙、蛇、马、羊、猴、鸡、狗、猪 - - } // Update is called once per frame diff --git a/meng_yao/Assets/script/Scene_jinshadao/BaoshiRoomcontroller.cs b/meng_yao/Assets/script/Scene_jinshadao/BaoshiRoomcontroller.cs index 92ed6573..1b3e9acd 100644 --- a/meng_yao/Assets/script/Scene_jinshadao/BaoshiRoomcontroller.cs +++ b/meng_yao/Assets/script/Scene_jinshadao/BaoshiRoomcontroller.cs @@ -89,49 +89,29 @@ public class BaoshiRoomcontroller : MonoBehaviour } - async void addman(int type, int number) - { - if (type == this.type) - { - GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买渔夫 - generateForFisherElf.Num = Num; - generateForFisherElf.Count = 1; - string userponse = await web.SendRequest(web.URL + "/Voucher/GenerateForFisherElf", "POST", JsonUtility.ToJson(generateForFisherElf)); - ids itemList = JsonUtility.FromJson(userponse); - Debug.Log(itemList.Ids[0]); - if (itemList.ErrorCode == 0) // 如果购买成功 - { - Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue); - - /* foreach (string item in itemList.Ids) - { - Use use = new Use(); // 使用渔夫 - use.Id = item; - string rect = await web.SendRequest(web.URL + "/Voucher/Use", "POST", JsonUtility.ToJson(use)); - Res res = JsonUtility.FromJson(userponse); - if (res.ErrorCode == 0) - { - - Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue); - //增加船只数量 - //ChangeShipNumber(1); - - - } - else - { - Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); - } - }*/ - - } - else// 如果购买失败 - { - Res res = JsonUtility.FromJson(userponse); - Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); - } - } - } + //async void addman(int type, int number) + //{ + // if (type == this.type) + // { + // GenerateForFisherElf generateForFisherElf = new GenerateForFisherElf(); // 购买渔夫 + // generateForFisherElf.Num = Num; + // generateForFisherElf.Count = 1; + // string userponse = await web.SendRequest(web.URL + "/Voucher/GenerateForFisherElf", "POST", JsonUtility.ToJson(generateForFisherElf)); + // ids itemList = JsonUtility.FromJson(userponse); + // Debug.Log(itemList.Ids[0]); + // if (itemList.ErrorCode == 0) // 如果购买成功 + // { + + // Res res = JsonUtility.FromJson(userponse); + // Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); + // } + // else// 如果购买失败 + // { + // Res res = JsonUtility.FromJson(userponse); + // Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); + // } + // } + //} public async void OnClick() { @@ -144,6 +124,7 @@ public class BaoshiRoomcontroller : MonoBehaviour if (await ActivationRoom()) { add_fish(); + Scene_baoshikuang.instance.updatanumber(); } } @@ -175,21 +156,22 @@ public class BaoshiRoomcontroller : MonoBehaviour fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos); } //使用代金卷 - async void UseShip() - { - Use use = new Use(); // 使用渔夫 - use.Id = listItem[0].Id; - string rect = await web.SendRequest(web.URL + "/Voucher/Use", "POST", JsonUtility.ToJson(use)); - Res res = JsonUtility.FromJson(rect); - if (res.ErrorCode == 0) - { - Promptmgr.Instance.PromptBubble("使用成功", Color.black, Color.blue); - } - else - { - Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); - } - } + //async void UseShip() + //{ + // Use use = new Use(); // 使用渔夫 + // use.Id = listItem[0].Id; + // string rect = await web.SendRequest(web.URL + "/Voucher/Use", "POST", JsonUtility.ToJson(use)); + // Res res = JsonUtility.FromJson(rect); + // if (res.ErrorCode == 0) + // { + + // Promptmgr.Instance.PromptBubble("使用成功", Color.black, Color.blue); + // } + // else + // { + // Promptmgr.Instance.PromptBubble(res.ErrorMessage, Color.black, Color.red); + // } + //} public async Task ActivationRoom() diff --git a/meng_yao/Assets/script/scene_Main/scene/Scene_baoshidao.cs b/meng_yao/Assets/script/scene_Main/scene/Scene_baoshidao.cs index 8133699d..23dd77f2 100644 --- a/meng_yao/Assets/script/scene_Main/scene/Scene_baoshidao.cs +++ b/meng_yao/Assets/script/scene_Main/scene/Scene_baoshidao.cs @@ -58,9 +58,23 @@ public class Scene_baoshidao : MonoBehaviour await Task.Delay(100); } } - - index++; } } + + public async void updatanumber()//更新购买船只后的数量 + { + List infos = await miner_jiekou.instance.GetMinerInfo(0); + + int index = 0; + foreach (MinngConfigData info in infos) + { + baoshidao_contorl go = lands[index].GetComponent(); + go.MaxShipNumber = info.activate_limit; + go.ShipNumber = info.activate_count; + index++; + } + } + + } diff --git a/meng_yao/Assets/script/scene_Main/scene/Scene_baoshikuang.cs b/meng_yao/Assets/script/scene_Main/scene/Scene_baoshikuang.cs index 8257a76a..05048626 100644 --- a/meng_yao/Assets/script/scene_Main/scene/Scene_baoshikuang.cs +++ b/meng_yao/Assets/script/scene_Main/scene/Scene_baoshikuang.cs @@ -55,14 +55,27 @@ public class Scene_baoshikuang : MonoBehaviour { for (int temp = 0; temp < info.activate_count; temp++) { - go.add_fish("1"); await Task.Delay(100); } } - index++; } } + + public async void updatanumber() + { + List infos = await miner_jiekou.instance.GetMinerInfo(1); + + int index = 0; + foreach (MinngConfigData info in infos) + { + BaoshiRoomcontroller go = lands[index].GetComponent(); + go.MaxShipNumber = info.activate_limit; + go.ShipNumber = info.activate_count; + index++; + } + } + } diff --git a/meng_yao/Assets/script/scene_Main/scene/scene_jingshadao.cs b/meng_yao/Assets/script/scene_Main/scene/scene_jingshadao.cs index 04081133..62d9cb03 100644 --- a/meng_yao/Assets/script/scene_Main/scene/scene_jingshadao.cs +++ b/meng_yao/Assets/script/scene_Main/scene/scene_jingshadao.cs @@ -58,4 +58,19 @@ public class scene_jingshadao : MonoBehaviour index++; } } + + public async void updatanumber()//更新购买船只后的数量 + { + List infos = await miner_jiekou.instance.GetMinerInfo(10); + + int index = 0; + foreach (MinngConfigData info in infos) + { + jishadao_contorl go = lands[index].GetComponent(); + go.MaxShipNumber = info.activate_limit; + go.ShipNumber = info.activate_count; + index++; + } + } + } diff --git a/meng_yao/Assets/script/scene_Main/ui/LevelsShow.cs b/meng_yao/Assets/script/scene_Main/ui/LevelsShow.cs new file mode 100644 index 00000000..5d4473f6 --- /dev/null +++ b/meng_yao/Assets/script/scene_Main/ui/LevelsShow.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEngine; +using UnityEngine.UI; + +public class LevelsShow : MonoBehaviour +{ + public Text levelNumber; + public List startmusk; + void Start() + { + + } + + public void showMusk(int count) + { + for (int i = 0; i < count; i++) + { + startmusk[i].SetActive(true); + } + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/meng_yao/Assets/script/scene_Main/ui/LevelsShow.cs.meta b/meng_yao/Assets/script/scene_Main/ui/LevelsShow.cs.meta new file mode 100644 index 00000000..6b154b14 --- /dev/null +++ b/meng_yao/Assets/script/scene_Main/ui/LevelsShow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b635c919af2d1441a6277195fe9ba8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/script/scene_Main/ui/MainSwitchLevels.cs b/meng_yao/Assets/script/scene_Main/ui/MainSwitchLevels.cs new file mode 100644 index 00000000..5173577c --- /dev/null +++ b/meng_yao/Assets/script/scene_Main/ui/MainSwitchLevels.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +public class MainSwitchLevels : MonoBehaviour +{ + public Button prebtn; + public Button nextbtn; + + public Image Levelfill; + public List levellist; + + + void Start() + { + + } + + + + + // Update is called once per frame + void Update() + { + + } +} diff --git a/meng_yao/Assets/script/scene_Main/ui/MainSwitchLevels.cs.meta b/meng_yao/Assets/script/scene_Main/ui/MainSwitchLevels.cs.meta new file mode 100644 index 00000000..e331ba43 --- /dev/null +++ b/meng_yao/Assets/script/scene_Main/ui/MainSwitchLevels.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a43295cbf28bf14e801eacd33af7090 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/script/scene_baoshidao/baoshidao_contorl.cs b/meng_yao/Assets/script/scene_baoshidao/baoshidao_contorl.cs index aa8bb226..2f627c55 100644 --- a/meng_yao/Assets/script/scene_baoshidao/baoshidao_contorl.cs +++ b/meng_yao/Assets/script/scene_baoshidao/baoshidao_contorl.cs @@ -113,6 +113,7 @@ public class baoshidao_contorl : MonoBehaviour { ScaleAni(OnBtnAni); add_fish(); + Scene_baoshidao.instance.updatanumber(); } diff --git a/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs b/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs index 7e47b310..fc40f0bf 100644 --- a/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs +++ b/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs @@ -53,11 +53,9 @@ public class jskPanel : mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 200) > 0) + if (!Generate1) { - lands[0].GetComponent().BuyActivation(); - } } @@ -66,7 +64,7 @@ public class jskPanel : mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 400) > 0) + if (!Generate1) { lands[1].GetComponent().BuyActivation(); @@ -78,7 +76,7 @@ public class jskPanel : mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0) + if (!Generate1) { lands[2].GetComponent().BuyActivation(); @@ -90,7 +88,7 @@ public class jskPanel : mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0) + if (!Generate1) { lands[3].GetComponent().BuyActivation(); } @@ -101,12 +99,11 @@ public class jskPanel : mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0) + if (!Generate1) { lands[4].GetComponent().BuyActivation(); } } - }); } diff --git a/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs b/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs index 21d86e34..e75ded4c 100644 --- a/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs +++ b/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs @@ -54,7 +54,7 @@ public class jishadao_buy :mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 200) > 0) + if (!Generate1) { lands[0].GetComponent().BuyActivation(); } @@ -65,12 +65,9 @@ public class jishadao_buy :mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 400) > 0) - { - + if (!Generate1) + { lands[1].GetComponent().BuyActivation(); - - } } @@ -79,10 +76,9 @@ public class jishadao_buy :mount { if (type == 1) { - if (!Generate1 && (PlayerManager.Instance.Coins - 600) > 0) + if (!Generate1) { lands[2].GetComponent().BuyActivation(); - } } diff --git a/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs b/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs index 6c677608..a207a867 100644 --- a/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs +++ b/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs @@ -111,7 +111,7 @@ public class jishadao_contorl : MonoBehaviour if (await ActivationRoom()) { add_fish(); - this.ShipNumber+=1; + scene_jingshadao.instance.updatanumber(); } } @@ -146,7 +146,7 @@ public class jishadao_contorl : MonoBehaviour MoveToFishingPos(); if (fishMan != null) { - Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red); + // Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red); Debug.Log("更新船"); return;