From 1653402fa89ac16e2e033cca397dee7980a36a8e Mon Sep 17 00:00:00 2001 From: shurongsen <1799096798@qq.com> Date: Mon, 11 Nov 2024 12:04:41 +0800 Subject: [PATCH] add --- .../preform/gui/item_button_Agree.prefab | 620 ++++++++++++++++++ .../preform/gui/item_button_Agree.prefab.meta | 7 + meng_yao/Assets/Resources/yunduo1.prefab | 2 +- meng_yao/Assets/Resources/yunduo2.prefab | 2 +- meng_yao/Assets/Resources/yunduo3.prefab | 2 +- meng_yao/Assets/Scenes/loading.unity | 4 +- meng_yao/Assets/Scenes/main_scene.unity | 163 +++-- .../fish_shipAnimation/fisherman_1.prefab | 2 +- .../fish_shipAnimation/fisherman_3.prefab | 2 +- .../fish_shipAnimation/fisherman_5.prefab | 2 +- .../input_box_pop_up_window.cs | 6 +- .../Assets/res/main_slices/img_jdt003.png | Bin 0 -> 1120 bytes .../res/main_slices/img_jdt003.png.meta | 123 ++++ .../Assets/script/ConnactServer/Logo_in.cs | 162 +++-- .../Assets/script/Manager/AnimatoinManager.cs | 4 +- .../Assets/script/Manager/JinbiAnimatoin.cs | 62 ++ .../script/Manager/JinbiAnimatoin.cs.meta | 11 + .../Assets/script/Panel/Main_AsstePanel.cs | 4 +- 18 files changed, 1068 insertions(+), 110 deletions(-) create mode 100644 meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab create mode 100644 meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab.meta create mode 100644 meng_yao/Assets/res/main_slices/img_jdt003.png create mode 100644 meng_yao/Assets/res/main_slices/img_jdt003.png.meta create mode 100644 meng_yao/Assets/script/Manager/JinbiAnimatoin.cs create mode 100644 meng_yao/Assets/script/Manager/JinbiAnimatoin.cs.meta diff --git a/meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab b/meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab new file mode 100644 index 000000000..cba7d6890 --- /dev/null +++ b/meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab @@ -0,0 +1,620 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5842859359856450511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5842859359856450510} + - component: {fileID: 5842859359856450509} + - component: {fileID: 5842859359856450508} + - component: {fileID: 6166053713130049486} + m_Layer: 5 + m_Name: item_button_Agree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5842859359856450510 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359856450511} + 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: 5842859360156286593} + - {fileID: 5842859360270671267} + m_Father: {fileID: 0} + 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: 272.05, y: -168.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5842859359856450509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359856450511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 106 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5842859359856450508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359856450511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &6166053713130049486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359856450511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5f05f4b390610b45b78dd10cb4e88c0, type: 3} + m_Name: + m_EditorClassIdentifier: + boxType: + Name: + textName: + prompt: + prompt2: + is_required: 0 + content: + Type: 0 + icon: {fileID: 0} + icon2: {fileID: 0} + goldNumerobj: + nametext1: + numbertext1: + nametext2: + numbertext2: + widthnum: -1 + WidthHeight: -1 + Num: 0 + details: + button_0_text: + button_1_text: + textobj: {fileID: 0} + promptobj: {fileID: 0} + promptobj2: {fileID: 0} + contentobj: {fileID: 0} + iconobj: {fileID: 0} + iconobj2: {fileID: 0} + goldNumerobj: {fileID: 0} + nametextobj1: {fileID: 0} + numbertextobj1: {fileID: 0} + nametextobj2: {fileID: 0} + numbertextobj2: {fileID: 0} + WidthObj: {fileID: 0} +--- !u!1 &5842859359900850614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5842859359900850613} + - component: {fileID: 5842859359900850619} + - component: {fileID: 5842859359900850612} + - component: {fileID: 8761031929982800742} + - component: {fileID: 8761031929620623811} + 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 &5842859359900850613 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359900850614} + 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: 5842859360156286593} + 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!222 &5842859359900850619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359900850614} + m_CullTransparentMesh: 1 +--- !u!114 &5842859359900850612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359900850614} + 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E0D\u540C\u610F" +--- !u!114 &8761031929982800742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359900850614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &8761031929620623811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859359900850614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!1 &5842859360156286594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5842859360156286593} + - component: {fileID: 5842859360156286598} + - component: {fileID: 5842859360156286599} + - component: {fileID: 5842859360156286592} + m_Layer: 5 + m_Name: Button (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5842859360156286593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360156286594} + 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: 5842859359900850613} + m_Father: {fileID: 5842859359856450510} + 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_SizeDelta: {x: 212, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5842859360156286598 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360156286594} + m_CullTransparentMesh: 1 +--- !u!114 &5842859360156286599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360156286594} + 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: d9b229f8f623a0b40868c79de8b652c7, 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!114 &5842859360156286592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360156286594} + 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: 2 + 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: 21300000, guid: 6a72c16112e68f943bebd62c97dd914c, type: 3} + 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: 5842859360156286599} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6166053713130049486} + m_TargetAssemblyTypeName: input_box_pop_up_window_item, Assembly-CSharp + m_MethodName: onClikeAsync + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &5842859360270671292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5842859360270671267} + - component: {fileID: 5842859360270671264} + - component: {fileID: 5842859360270671265} + - component: {fileID: 5842859360270671266} + m_Layer: 5 + m_Name: Button (Legacy) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5842859360270671267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360270671292} + 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: 5842859360535408817} + m_Father: {fileID: 5842859359856450510} + 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_SizeDelta: {x: 212, y: 95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5842859360270671264 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360270671292} + m_CullTransparentMesh: 1 +--- !u!114 &5842859360270671265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360270671292} + 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: 70a088c2b9ec1f64686b6962c5b01d66, 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!114 &5842859360270671266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360270671292} + 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: 5842859360270671265} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6166053713130049486} + m_TargetAssemblyTypeName: input_box_pop_up_window_item, Assembly-CSharp + m_MethodName: onClikeAsync + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 +--- !u!1 &5842859360535408818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5842859360535408817} + - component: {fileID: 5842859360535408823} + - component: {fileID: 5842859360535408816} + - component: {fileID: 8761031929982800743} + - component: {fileID: 8761031928609456141} + 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 &5842859360535408817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360535408818} + 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: 5842859360270671267} + 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!222 &5842859360535408823 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360535408818} + m_CullTransparentMesh: 1 +--- !u!114 &5842859360535408816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360535408818} + 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u540C\u610F" +--- !u!114 &8761031929982800743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360535408818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &8761031928609456141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842859360535408818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 diff --git a/meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab.meta b/meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab.meta new file mode 100644 index 000000000..c54b77677 --- /dev/null +++ b/meng_yao/Assets/Resources/preform/gui/item_button_Agree.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b75adc063cc85584c9ca5f73a2d64140 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Resources/yunduo1.prefab b/meng_yao/Assets/Resources/yunduo1.prefab index 6bd816454..67c47cd11 100644 --- a/meng_yao/Assets/Resources/yunduo1.prefab +++ b/meng_yao/Assets/Resources/yunduo1.prefab @@ -73,7 +73,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: e23270122b82eb446a90e15c95c7e40f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/meng_yao/Assets/Resources/yunduo2.prefab b/meng_yao/Assets/Resources/yunduo2.prefab index 3dea89fb6..e03f11a65 100644 --- a/meng_yao/Assets/Resources/yunduo2.prefab +++ b/meng_yao/Assets/Resources/yunduo2.prefab @@ -73,7 +73,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 9c12067653da8a548b5a57a2ce63e059, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/meng_yao/Assets/Resources/yunduo3.prefab b/meng_yao/Assets/Resources/yunduo3.prefab index 49216829c..48f218f39 100644 --- a/meng_yao/Assets/Resources/yunduo3.prefab +++ b/meng_yao/Assets/Resources/yunduo3.prefab @@ -73,7 +73,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: a1b0a6bad1a05d7478fd2fd42fb5a158, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/meng_yao/Assets/Scenes/loading.unity b/meng_yao/Assets/Scenes/loading.unity index f527fdf35..46775ca3a 100644 --- a/meng_yao/Assets/Scenes/loading.unity +++ b/meng_yao/Assets/Scenes/loading.unity @@ -1028,6 +1028,8 @@ MonoBehaviour: sceneslider: {fileID: 2057344806} logo_inbtn: {fileID: 603807337} loadSpeed: 0.5 + timerDuration: 2 + smoothingSpeed: 0.1 --- !u!114 &1125672643 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1927,7 +1929,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 1 + m_Value: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] diff --git a/meng_yao/Assets/Scenes/main_scene.unity b/meng_yao/Assets/Scenes/main_scene.unity index 1323295b4..84536c0de 100644 --- a/meng_yao/Assets/Scenes/main_scene.unity +++ b/meng_yao/Assets/Scenes/main_scene.unity @@ -833,7 +833,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5269\u4F59\uFF1A2" + m_text: "\u6355\u9C7C\u603B\u6570\uFF1A120" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} @@ -3470,7 +3470,7 @@ GameObject: m_Component: - component: {fileID: 209635799} - component: {fileID: 209635798} - - component: {fileID: 209635797} + - component: {fileID: 209635800} m_Layer: 0 m_Name: Map (1) m_TagString: Untagged @@ -3478,19 +3478,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &209635797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 209635796} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1691587b1992984caa500263cc35577, type: 3} - m_Name: - m_EditorClassIdentifier: - time: 0 --- !u!114 &209635798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3527,6 +3514,19 @@ Transform: m_Father: {fileID: 1812336600} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &209635800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209635796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8377bcd7956b0534fa79030607efb68c, type: 3} + m_Name: + m_EditorClassIdentifier: + time: 0 --- !u!1 &224024015 GameObject: m_ObjectHideFlags: 0 @@ -5262,7 +5262,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -230.96689, y: -144} + m_AnchoredPosition: {x: -253, y: -144} m_SizeDelta: {x: 461.93384, y: 184.25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &307502445 @@ -6595,7 +6595,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284489241320985138, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.x - value: 284 + value: 269.09003 objectReference: {fileID: 0} - target: {fileID: 4284489241320985138, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.y @@ -6703,35 +6703,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 269.09003 objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 428 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43 objectReference: {fileID: 0} - target: {fileID: 4284489242025471100, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_IsActive @@ -6753,7 +6753,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -43 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3011360594389648164} + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: AsClick + objectReference: {fileID: 0} + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Main_AsstePanel, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8135626679275082075, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 44085837872364204, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} m_SourcePrefab: {fileID: 100100000, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} --- !u!1 &426210771 GameObject: @@ -10503,7 +10532,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5269\u4F59\uFF1A6" + m_text: "\u6355\u9C7C\u603B\u6570\uFF1A120" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} @@ -11531,7 +11560,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 614710715} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -23.359999, y: -26.710001, z: 0.047099948} + m_LocalPosition: {x: -0.15999985, y: -58.51, z: 0.047099948} m_LocalScale: {x: 1.0471, y: 1.0471, z: 1.0471} m_ConstrainProportionsScale: 0 m_Children: @@ -15785,7 +15814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_AnchorMin.x @@ -15793,7 +15822,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_SizeDelta.x @@ -15833,11 +15862,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 296.47998 objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -172.2863 objectReference: {fileID: 0} - target: {fileID: 3229315116778200709, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15851,6 +15880,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3229315116901912394, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} + propertyPath: m_FontData.m_MinSize + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3229315116901912394, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} + propertyPath: m_FontData.m_FontSize + value: 25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c5e8245d9cbdb3e4087ffdb8a6161e5a, type: 3} --- !u!1 &994170084 @@ -16844,7 +16881,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_AnchorMin.x @@ -16852,7 +16889,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_SizeDelta.x @@ -16892,11 +16929,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 164 objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -102.43335 objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18295,6 +18332,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3011360594389648164} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: AsClick + objectReference: {fileID: 0} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Main_AsstePanel, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4517297728151630613, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} --- !u!224 &1266140510 stripped @@ -19121,7 +19186,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5269\u4F59\uFF1A28" + m_text: "\u6355\u9C7C\u603B\u6570\uFF1A120" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} @@ -19148,7 +19213,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 3.8 + m_fontSize: 2.3 m_fontSizeBase: 4 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -19482,7 +19547,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426278617} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -23.4, y: -26.2, z: -10} + m_LocalPosition: {x: -0.2, y: -58, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -19805,7 +19870,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -306, y: -263} + m_AnchoredPosition: {x: -329, y: -263} m_SizeDelta: {x: 564.48, y: 229.58606} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1507366027 @@ -22948,7 +23013,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_AnchorMin.x @@ -22956,7 +23021,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_SizeDelta.x @@ -22996,11 +23061,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 486.9962 objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -57.493267 objectReference: {fileID: 0} - target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -23746,7 +23811,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1812336600 Transform: m_ObjectHideFlags: 0 @@ -26941,6 +27006,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 3011360592633729035, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 705fcc4638dd2e54fb3eb11f58ffcffa, type: 3} - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -27085,6 +27154,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -530 objectReference: {fileID: 0} + - target: {fileID: 3011360593223604693, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} + propertyPath: m_FillAmount + value: 0.291 + objectReference: {fileID: 0} - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y value: 1 diff --git a/meng_yao/Assets/animation/fish_shipAnimation/fisherman_1.prefab b/meng_yao/Assets/animation/fish_shipAnimation/fisherman_1.prefab index c9d6f78ea..bd2d1a0d9 100644 --- a/meng_yao/Assets/animation/fish_shipAnimation/fisherman_1.prefab +++ b/meng_yao/Assets/animation/fish_shipAnimation/fisherman_1.prefab @@ -390,7 +390,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 10:02 + m_text: 1/30 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} diff --git a/meng_yao/Assets/animation/fish_shipAnimation/fisherman_3.prefab b/meng_yao/Assets/animation/fish_shipAnimation/fisherman_3.prefab index 6d6e27951..a3d07157c 100644 --- a/meng_yao/Assets/animation/fish_shipAnimation/fisherman_3.prefab +++ b/meng_yao/Assets/animation/fish_shipAnimation/fisherman_3.prefab @@ -200,7 +200,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 10:02 + m_text: 1/30 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} diff --git a/meng_yao/Assets/animation/fish_shipAnimation/fisherman_5.prefab b/meng_yao/Assets/animation/fish_shipAnimation/fisherman_5.prefab index 6d4fb3668..5ddcb63c5 100644 --- a/meng_yao/Assets/animation/fish_shipAnimation/fisherman_5.prefab +++ b/meng_yao/Assets/animation/fish_shipAnimation/fisherman_5.prefab @@ -184,7 +184,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 10:02 + m_text: 1/30 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8f169cd16f459346964aab720dd2321, type: 2} m_sharedMaterial: {fileID: -119483755500966471, guid: c8f169cd16f459346964aab720dd2321, type: 2} diff --git a/meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs b/meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs index 7112c706f..20d4916f1 100644 --- a/meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs +++ b/meng_yao/Assets/communal/ugui/input_box_pop_up_window/input_box_pop_up_window.cs @@ -189,7 +189,11 @@ public class input_box_pop_up_window : MonoBehaviour } else if (boxType.Type == 11) { - prefab = Resources.Load("preform/gui/item_button_sure");//道具换另外的道具 + prefab = Resources.Load("preform/gui/item_button_sure");//单独确认按钮 + } + else if (boxType.Type == 12) + { + prefab = Resources.Load("preform/gui/item_button_Agree");//用户隐私协议同意或者不同意 } GameObject ranking_list_item = Instantiate(prefab, Vector3.zero, Quaternion.identity); diff --git a/meng_yao/Assets/res/main_slices/img_jdt003.png b/meng_yao/Assets/res/main_slices/img_jdt003.png new file mode 100644 index 0000000000000000000000000000000000000000..0adb01cef00ebb7c1519c511ee9f2c349c88a571 GIT binary patch literal 1120 zcmeAS@N?(olHy`uVBq!ia0y~yU_1t7D{!y@$qtSiOhAgUILO_JVcj{ImkbOnQl2i3 zAr*0N@1FJ(4wO0m@xSCcF_E1s0=N`~YI(c3Gqx}L#P-1LL!^uODQ*dcJnu-3r-mvL zPTWmO8qZUq>Get>I}U{g1||-L3E}~2Vh00M zR&1SRBzanbMZkf9k!6nBf+=#bb7seyL{865=4n67yV9pP#HGqdErkcD2dI%x#N*eR z<^U5Z+l|q)flB!HS1fgnd;eDcN0{*Jy4{>V5ur1ofWN8H*Va? zyMOQJ)mKZHBDo=+e9Bd_^O}%8ux*6Ax}=bg00XKd6AKQ^J}@ChSZUh=59>pdV4nO zNP@y@K~iIlfcwhrA9ubydB^4EF^>n!lEU>|K$aJ*beO#U;XdF{7r(`qMb_kKLJ z`pUb*S3b&4zj~|)tX)9Ed%=g$Ro6@(F8$fx`A0bUTWMBCiqjUk=UZlPijnLArK$%( zjWIvmy7xqPo!xVCYT@DYrgdBL-~V}56Egi?&a_^Tl7OfMd)KCJzy0pH)Xn9`9!_)= z{QK~WN$l^Z*^A5%+h=Xq4o-_i9 z8;ZcHxLCSW1HH}Mnk?SPgOlBQt~+0DADz@|_}go$LSOiImQqmshw2tw&NScF`|;Dx zl`Ms;s>B0rKyDRm40^u!mf5j4!O40Zll`vityif!&-th#B|Cr(;H=hspdH(B3N+B9h`u)hq;; z-`XbhRSBe8z<~44l&ccl%@+3*7IA^2T?>(oR{y=l|ED`vfXB5dYPII>lRuz2D4lD? s#)_P(gDJUgy%$rIjzO~R1J*|SNTnkN?o$;qfkg&`r>mdKI;Vst0CM8fF#rGn literal 0 HcmV?d00001 diff --git a/meng_yao/Assets/res/main_slices/img_jdt003.png.meta b/meng_yao/Assets/res/main_slices/img_jdt003.png.meta new file mode 100644 index 000000000..ad3552d01 --- /dev/null +++ b/meng_yao/Assets/res/main_slices/img_jdt003.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 705fcc4638dd2e54fb3eb11f58ffcffa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/script/ConnactServer/Logo_in.cs b/meng_yao/Assets/script/ConnactServer/Logo_in.cs index c79ec732a..27d0f246f 100644 --- a/meng_yao/Assets/script/ConnactServer/Logo_in.cs +++ b/meng_yao/Assets/script/ConnactServer/Logo_in.cs @@ -15,9 +15,8 @@ public class Logo_in : mount public Slider sceneslider; public Button logo_inbtn; public float loadSpeed = 0.5f; // 填充速度 - private float progress = 0f; - private bool isLoading = false; - + public float timerDuration = 2f; // 剩余30%进度的时间 + public float smoothingSpeed = 0.1f; public override void Awake() { @@ -32,12 +31,42 @@ public class Logo_in : mount sceneslider.value = 0f; // 初始值设为0 } - login_in_screen(); - + Privacy_Policy_screen(); + } + + + public void Privacy_Policy_screen() + { + List boxTypes = new List(); + boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 9, widthnum = 700, WidthHeight = 650, content = "在您使用我们(萌妖)服务前，请您务必审慎阅读、充分理解腾讯游戏用户协议隐私保护指引和儿童隐私保护指引的各条款，了解我们对您个人信息的处理规则。同时，您应特别注意前述协议中免除或者限制我们责任的条款、对您权利进行限制的条款、约定争议解决方式和司法管辖的条款。如您已详细阅读并同意 萌妖出击游戏用户协议、隐私保护指引和儿童隐私保护指引，请点击“同意”开始使用我们的服务。" }); + boxTypes.Add(new BoxType {Name = "submit", textName = " 取消确定 ", Type = 12 }); + GameObject gameObject = add_pop_up(true);//生成弹窗母体 + List gameObjects = gameObject.GetComponent().updateUI(boxTypes, "用户协议和隐私保护指引");//测试输入框回调处理 + gameObjects[1].GetComponent().register_click(async (BoxType boxType, int type) =>//登录确定或取消 + { + if (type == 0) + { + + } + else if (type == 1) + { + login_in_screen(); + gameObject.GetComponent().destroy(); + } + }); + } + + public void Real_name_screen() + { + List boxTypes = new List(); + boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 9, widthnum = 700, WidthHeight = 650, content = "在您使用我们(萌妖)服务前，请您务必审慎阅读、充分理解腾讯游戏用户协议隐私保护指引和儿童隐私保护指引的各条款，了解我们对您个人信息的处理规则。同时，您应特别注意前述协议中免除或者限制我们责任的条款、对您权利进行限制的条款、约定争议解决方式和司法管辖的条款。如您已详细阅读并同意 萌妖出击游戏用户协议、隐私保护指引和儿童隐私保护指引，请点击“同意”开始使用我们的服务。" }); + boxTypes.Add(new BoxType { Name = "submit", textName = " 取消确定 ", Type = 12 }); + GameObject gameObject = add_pop_up(true);//生成弹窗母体 + List gameObjects = gameObject.GetComponent().updateUI(boxTypes, "实名认证");//测试输入框回调处理 + } - public void login_in_screen()//登录界面 @@ -47,7 +76,6 @@ public class Logo_in : mount boxTypes.Add(new BoxType { Name = "account_number", textName = " 手机号", prompt = "请输入手机号", Type = 1, is_required = true }); boxTypes.Add(new BoxType { Name = "verification_code", textName = " 验证码", prompt = "请输入验证码", Type = 0, is_required = true }); boxTypes.Add(new BoxType { Name = "submit", textName = " 取消确定 ", Type = 5 }); - boxTypes.Add(new BoxType { Name = "submit", textName = " 取消确定 ", Type = 11 }); GameObject gameObject = add_pop_up(true);//生成弹窗母体 List gameObjects = gameObject.GetComponent().updateUI(boxTypes, "登录");//测试输入框回调处理 @@ -64,74 +92,102 @@ public class Logo_in : mount { if (type == 0)//注册 { - Login login = new Login(); - login.Phone = boxTypes[0].content; - //register.Code = boxTypes[0].content; - string jsonString = JsonUtility.ToJson(login); - string response = await web.SendRequest(web.URL+"/Player/Register", "POST", jsonString); - Debug.Log(response); + //Login login = new Login(); + //login.Phone = boxTypes[0].content; + ////register.Code = boxTypes[0].content; + //string jsonString = JsonUtility.ToJson(login); + //string response = await web.SendRequest(web.URL+"/Player/Register", "POST", jsonString); + //Debug.Log(response); } else if (type == 1)//登录 { - Login login = new Login(); - login.Phone = boxTypes[0].content; - Debug.Log(boxTypes[0].content); - //register.Code = boxTypes[0].content; - string jsonString = JsonUtility.ToJson(login); - string response = await web.SendRequest(web.URL+"/Player/Login", "POST", jsonString); - Debug.Log(response); + //Login login = new Login(); + //login.Phone = boxTypes[0].content; + //Debug.Log(boxTypes[0].content); + ////register.Code = boxTypes[0].content; + //string jsonString = JsonUtility.ToJson(login); + //string response = await web.SendRequest(web.URL+"/Player/Login", "POST", jsonString); + //Debug.Log(response); - Rootobject root = JsonUtility.FromJson(response); + //Rootobject root = JsonUtility.FromJson(response); - if (root.ErrorMessage=="" && boxTypes[0].content!= "") - { - gameObject.SetActive(false); - Promptmgr.Instance.PromptBubble("登录成功"); - isLoading = true; - } - else - { - Promptmgr.Instance.PromptBubble("登录失败,请先注册"); - } + //if (root.ErrorMessage=="" && boxTypes[0].content!= "") + //{ + // gameObject.SetActive(false); + // Promptmgr.Instance.PromptBubble("登录成功"); + // isLoading = true; + //} + //else + //{ + // Promptmgr.Instance.PromptBubble("登录失败,请先注册"); + //} + + gameObject.SetActive(false); + Promptmgr.Instance.PromptBubble("登录成功"); + + StartCoroutine(LoadSceneWithProgress()); } }); - gameObjects[3].GetComponent().register_click(async (BoxType boxType, int type) =>//登录确定或取消 - { - gameObject.SetActive(false); - Promptmgr.Instance.PromptBubble("登录成功"); - isLoading = true; - }); } - // Update is called once per frame - void Update() + IEnumerator LoadSceneWithProgress() { - // 模拟进度条填充，可以改为你的实际加载逻辑 - if (isLoading && progress < 1f) - { - progress += loadSpeed * Time.deltaTime; - sceneslider.value = progress; - } + // 异步加载场景 + AsyncOperation asyncLoad = SceneManager.LoadSceneAsync(JumpScene.main_scene); - // 当进度条填满后，进行场景跳转 - if (progress >= 1f && isLoading) + // 确保加载完毕前场景不会自动切换 + asyncLoad.allowSceneActivation = false; + + float displayProgress = 0f; + + // 当场景未加载完成时，持续更新进度条 + while (!asyncLoad.isDone) { - LoadNextScene(); + // 获取加载进度，将异步加载进度映射到0-0.7范围内 + float targetProgress = Mathf.Clamp01(asyncLoad.progress / 0.9f) * 0.7f; + + // 平滑推进进度条显示 + displayProgress = Mathf.MoveTowards(displayProgress, targetProgress, smoothingSpeed * Time.deltaTime); + sceneslider.value = displayProgress; + + // 强制刷新UI + yield return new WaitForSeconds(0.02f); // 等待更短的时间确保UI更新 + + // 当异步加载到90%，开启计时器 + if (asyncLoad.progress >= 0.9f) + { + StartCoroutine(CompleteProgressWithTimer(asyncLoad)); + yield break; + } } } - private void LoadNextScene() + IEnumerator CompleteProgressWithTimer(AsyncOperation asyncLoad) { - // 这里使用场景管理器进行跳转 - SceneManager.LoadScene(JumpScene.main_scene); - } + float elapsedTime = 0f; + float startProgress = 0.7f; + float targetProgress = 1f; - + while (elapsedTime < timerDuration) + { + elapsedTime += Time.deltaTime; + float newProgress = Mathf.Lerp(startProgress, targetProgress, elapsedTime / timerDuration); + sceneslider.value = newProgress; + + yield return new WaitForSeconds(0.02f); // 控制刷新频率 + } + + // 确保进度条达到100% + sceneslider.value = 1f; + + yield return new WaitForSeconds(0.5f); // 短暂延迟后允许场景切换 + asyncLoad.allowSceneActivation = true; + } } diff --git a/meng_yao/Assets/script/Manager/AnimatoinManager.cs b/meng_yao/Assets/script/Manager/AnimatoinManager.cs index bd74582ed..63b071633 100644 --- a/meng_yao/Assets/script/Manager/AnimatoinManager.cs +++ b/meng_yao/Assets/script/Manager/AnimatoinManager.cs @@ -19,7 +19,7 @@ public class AnimatoinManager : MonoBehaviour { GameObject fi = Instantiate((GameObject)Resources.Load("fish_1")); float x = Random.Range(-5, 5); - float y = Random.Range(-9, 9); + float y = Random.Range(-49,-67); fi.transform.position = new Vector3(x,y,0); Destroy(fi, 2f); } @@ -30,7 +30,7 @@ public class AnimatoinManager : MonoBehaviour { GameObject fi = Instantiate(Resources.Load("yunduo" + Random.Range(1, 4))); float x = Random.Range(-11, -18); - float y = Random.Range(-9,9); + float y = Random.Range(-49,-67); fi.transform.position = new Vector3(x,y,0); Destroy(fi,10f); } diff --git a/meng_yao/Assets/script/Manager/JinbiAnimatoin.cs b/meng_yao/Assets/script/Manager/JinbiAnimatoin.cs new file mode 100644 index 000000000..580af846e --- /dev/null +++ b/meng_yao/Assets/script/Manager/JinbiAnimatoin.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class JinbiAnimatoin : MonoBehaviour +{ + public float time = 0f; + private float speed = 10f; + private float yuntime = 0f; + + // Start is called before the first frame update + private void Start() + { + + } + + private void Playanim() + { + GameObject fi = Instantiate((GameObject)Resources.Load("fish_1")); + float x = Random.Range(-5, 5); + float y = Random.Range(-12, -40); + fi.transform.position = new Vector3(x, y, 0); + Destroy(fi, 2f); + } + + private void Moveyunduo() + { + for (int i = 0; i < Random.Range(1, 4); i++) + { + GameObject fi = Instantiate(Resources.Load("yunduo" + Random.Range(1, 4))); + float x = Random.Range(-11, -18); + float y = Random.Range(-12, -40); + fi.transform.position = new Vector3(x, y, 0); + Destroy(fi, 10f); + } + + + } + + + private void Update() + { + time += Time.deltaTime; + yuntime += Time.deltaTime; + if (time > 5f) + { + time = 0; + for (int i = 0; i < Random.Range(1, 4); i++) + { + Playanim(); + } + + } + + if (yuntime > 10f) + { + yuntime = 0; + Moveyunduo(); + } + + } +} diff --git a/meng_yao/Assets/script/Manager/JinbiAnimatoin.cs.meta b/meng_yao/Assets/script/Manager/JinbiAnimatoin.cs.meta new file mode 100644 index 000000000..9d1e52d19 --- /dev/null +++ b/meng_yao/Assets/script/Manager/JinbiAnimatoin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8377bcd7956b0534fa79030607efb68c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/script/Panel/Main_AsstePanel.cs b/meng_yao/Assets/script/Panel/Main_AsstePanel.cs index f00a86be6..f15957143 100644 --- a/meng_yao/Assets/script/Panel/Main_AsstePanel.cs +++ b/meng_yao/Assets/script/Panel/Main_AsstePanel.cs @@ -28,7 +28,7 @@ public class Main_AsstePanel : MonoBehaviour Coin.text = PlayerManager.Instance.Coins.ToString(); Ore.text = PlayerManager.Instance.Ore.ToString(); Promptmgr.Main_AsstePanel.is_one = true; - Promptmgr.Main_AsstePanel.InvokeRepeating("Tloding", 1.0f, 1.0f); + // Promptmgr.Main_AsstePanel.InvokeRepeating("Tloding", 1.0f, 1.0f); } @@ -44,7 +44,7 @@ public class Main_AsstePanel : MonoBehaviour } - private void AsClick() + public void AsClick() { Debug.Log("点击资产明细按钮"); AssetDetails.gameObject.SetActive(true);