From a845f2f72e883b0c0ca4deac7bbdac671b2d8ed5 Mon Sep 17 00:00:00 2001 From: shurongsen <1799096798@qq.com> Date: Tue, 5 Nov 2024 17:31:45 +0800 Subject: [PATCH] add --- .../Resources/Prefabs/AssetsPanel.prefab | 5 +- .../cultivation_diamond_mines_slices.unity | 49 ++- .../cultivation_gem_island_slices.unity | 325 ++++++++++++++++++ meng_yao/Assets/communal/web/web.cs | 6 +- .../script/ConnactServer/Get_a_voucher.cs | 10 +- .../Assets/script/ConnactServer/InitInfo.cs | 1 + meng_yao/Assets/script/JumpScene/jinTols.cs | 14 +- meng_yao/Assets/script/Panel/AssestPanel.cs | 4 +- .../Assets/script/Panel/eco_tree/PromptBtn.cs | 37 +- 9 files changed, 434 insertions(+), 17 deletions(-) diff --git a/meng_yao/Assets/Resources/Prefabs/AssetsPanel.prefab b/meng_yao/Assets/Resources/Prefabs/AssetsPanel.prefab index 4ab80c996..19b8a4e13 100644 --- a/meng_yao/Assets/Resources/Prefabs/AssetsPanel.prefab +++ b/meng_yao/Assets/Resources/Prefabs/AssetsPanel.prefab @@ -142,7 +142,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 06714f7bbbfda194c915911ae3113649, type: 3} + m_Sprite: {fileID: 21300000, guid: 3987eea29d3d1e74c9b5a8917835d83e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1071,6 +1071,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 21c091287355b794bba54c08c0a11ab5, type: 3} m_Name: m_EditorClassIdentifier: + is_one: 0 Stone: {fileID: 4284489241411994666} Coin: {fileID: 4284489241406162018} Ore: {fileID: 4284489240705305073} @@ -1141,7 +1142,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b30603fb7e98e0744899b0bf2872d6d9, type: 3} + m_Sprite: {fileID: 21300000, guid: 06714f7bbbfda194c915911ae3113649, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/meng_yao/Assets/Scenes/cultivation_diamond_mines_slices.unity b/meng_yao/Assets/Scenes/cultivation_diamond_mines_slices.unity index 47042e817..ef89b3c37 100644 --- a/meng_yao/Assets/Scenes/cultivation_diamond_mines_slices.unity +++ b/meng_yao/Assets/Scenes/cultivation_diamond_mines_slices.unity @@ -2238,6 +2238,34 @@ PrefabInstance: propertyPath: m_Name value: return_btn objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 469608099} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnMouseDown + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: jinTols, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2326,13 +2354,32 @@ PrefabInstance: propertyPath: m_Text value: "\u517B\u6210" objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1906224345288813973, guid: 638b7f7423db411419568d073208d929, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 638b7f7423db411419568d073208d929, type: 3} --- !u!224 &469608097 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} m_PrefabInstance: {fileID: 469608096} m_PrefabAsset: {fileID: 0} +--- !u!1 &469608098 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8631885451795898582, guid: 638b7f7423db411419568d073208d929, type: 3} + m_PrefabInstance: {fileID: 469608096} + m_PrefabAsset: {fileID: 0} +--- !u!114 &469608099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 469608098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0aa1a67aaeea08f4a9b5eb87a9b19df8, type: 3} + m_Name: + m_EditorClassIdentifier: + scene: develop_the_main_interface_slices --- !u!1 &474228117 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity b/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity index f3f066cf9..ca9d1fccb 100644 --- a/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity +++ b/meng_yao/Assets/Scenes/cultivation_gem_island_slices.unity @@ -1052,6 +1052,159 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &100984118 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1670380918} + m_Modifications: + - target: {fileID: 8631885451795898582, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_Name + value: return_btn + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 100984121} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnMouseDown + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: jinTols, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_SizeDelta.x + value: 228 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_SizeDelta.y + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_Text + value: "\u517B\u6210" + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1906224345288813973, guid: 638b7f7423db411419568d073208d929, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 638b7f7423db411419568d073208d929, type: 3} +--- !u!224 &100984119 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3} + m_PrefabInstance: {fileID: 100984118} + m_PrefabAsset: {fileID: 0} +--- !u!1 &100984120 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8631885451795898582, guid: 638b7f7423db411419568d073208d929, type: 3} + m_PrefabInstance: {fileID: 100984118} + m_PrefabAsset: {fileID: 0} +--- !u!114 &100984121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 100984120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0aa1a67aaeea08f4a9b5eb87a9b19df8, type: 3} + m_Name: + m_EditorClassIdentifier: + scene: develop_the_main_interface_slices --- !u!1 &109717917 GameObject: m_ObjectHideFlags: 0 @@ -1146,6 +1299,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 794613308} + - {fileID: 1670380918} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5078,6 +5232,112 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1307536296 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1670380918} + m_Modifications: + - target: {fileID: 4259686296874773441, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_Text + value: "\u5B9D\u77F3\u5C9B\u5C7F\u73A9\u6CD5\u89C4\u5219\uFF1A\n3.\u8FD8\u6CA1\u60F3\u597D\u5360\u4F4D\u7528\n3.\u8FD8\u6CA1\u60F3\u597D\u5360\u4F4D\u7528\n3.\u8FD8\u6CA1\u60F3\u597D\u5360\u4F4D\u7528\n3.\u8FD8\u6CA1\u60F3\u597D\u5360\u4F4D\u7528" + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_SizeDelta.x + value: 274 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_SizeDelta.y + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4259686297134952241, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + propertyPath: m_Name + value: Gameplay + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} +--- !u!224 &1307536297 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4259686297134952240, guid: 30ca1a163d31ca6468b9eac94c6acdf6, type: 3} + m_PrefabInstance: {fileID: 1307536296} + m_PrefabAsset: {fileID: 0} --- !u!1 &1312121261 GameObject: m_ObjectHideFlags: 0 @@ -7446,6 +7706,71 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1670380917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1670380918} + - component: {fileID: 1670380919} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1670380918 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670380917} + 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: 100984119} + - {fileID: 1307536297} + m_Father: {fileID: 109717921} + 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: 50, y: -50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1670380919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670380917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 0 + m_Top: 20 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1704329311 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/communal/web/web.cs b/meng_yao/Assets/communal/web/web.cs index a8b1dc73c..268ccaf1f 100644 --- a/meng_yao/Assets/communal/web/web.cs +++ b/meng_yao/Assets/communal/web/web.cs @@ -13,7 +13,7 @@ public class web : MonoBehaviour public static async Task SendRequest(string url, string method = "GET", string jsonData = "{}") { - Debug.Log(url + "启动web"); + //Debug.Log(url + "启动web"); using (UnityWebRequest request = new UnityWebRequest(url, method)) { // 设置下载处理器 @@ -46,8 +46,8 @@ public class web : MonoBehaviour if (request.result == UnityWebRequest.Result.ConnectionError || request.result == UnityWebRequest.Result.ProtocolError) { - Debug.LogError($"Error: {request.error}"); - Promptmgr.Instance.PromptBubble("网络异常",Color.black,Color.red); + Debug.LogError($"Error: {request.error}" + url); + Promptmgr.Instance.PromptBubble(request.error, Color.black,Color.red); return null; } else diff --git a/meng_yao/Assets/script/ConnactServer/Get_a_voucher.cs b/meng_yao/Assets/script/ConnactServer/Get_a_voucher.cs index b85efd1c1..36ed8f6ac 100644 --- a/meng_yao/Assets/script/ConnactServer/Get_a_voucher.cs +++ b/meng_yao/Assets/script/ConnactServer/Get_a_voucher.cs @@ -16,11 +16,14 @@ public class Get_a_voucher : mount void Start() { - // InvokeRepeating("ExecuteTask", 1.0f, 1.0f); + this.InvokeRepeating("ExecuteTask", 1.0f, 1.0f); } - + void OnDestroy() + { + CancelInvoke("ExecuteTask"); + } public async void iii() { //Login login = new Login(); @@ -34,9 +37,6 @@ public class Get_a_voucher : mount string daijinjuanponse = await web.SendRequest(web.URL + "/Voucher/GetList", "POST"); //Debug.Log("用户所有代金卷" + daijinjuanponse); AllVocherItemRes itemList = JsonUtility.FromJson(daijinjuanponse); - //Debug.Log(itemList.List.Length); - - //Debug.Log(itemList.List.Length); } diff --git a/meng_yao/Assets/script/ConnactServer/InitInfo.cs b/meng_yao/Assets/script/ConnactServer/InitInfo.cs index 4802e4188..dcbf8a8c7 100644 --- a/meng_yao/Assets/script/ConnactServer/InitInfo.cs +++ b/meng_yao/Assets/script/ConnactServer/InitInfo.cs @@ -105,6 +105,7 @@ public class InfoData public string Name; public float Gold; public float Gem; + public float Ore; public float Forge; public float Water; public int Level; diff --git a/meng_yao/Assets/script/JumpScene/jinTols.cs b/meng_yao/Assets/script/JumpScene/jinTols.cs index 9c41ad39c..d5750b7ee 100644 --- a/meng_yao/Assets/script/JumpScene/jinTols.cs +++ b/meng_yao/Assets/script/JumpScene/jinTols.cs @@ -4,7 +4,8 @@ using UnityEngine; using DG.Tweening; public class jinTols : MonoBehaviour { - private void OnMouseDown() + public string scene; + public void OnMouseDown() { //SceneManager.LoadScene(JumpScene.cultivation_Jinsha_mine_slices); transform.DOScale(new Vector3(0.5f, 0.5f, 0.5f), 0.3f).SetEase(Ease.OutBack); @@ -15,8 +16,15 @@ public class jinTols : MonoBehaviour IEnumerator Magnify() { transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBack); - Promptmgr.Instance.PromptBubble("功能未开放"); - //OnSceneMouseBTN(); + if (string.IsNullOrEmpty(scene)) + { + Promptmgr.Instance.PromptBubble("功能未开放"); + } + else + { + SceneGuodu.instance.SlideInAndLoadScene(scene); + } + return null; } diff --git a/meng_yao/Assets/script/Panel/AssestPanel.cs b/meng_yao/Assets/script/Panel/AssestPanel.cs index 4b986e6b1..08f5e4569 100644 --- a/meng_yao/Assets/script/Panel/AssestPanel.cs +++ b/meng_yao/Assets/script/Panel/AssestPanel.cs @@ -34,10 +34,12 @@ public class AssestPanel : MonoBehaviour { string userponse = await web.SendRequest(web.URL + "/Player/GetInfo", "POST"); - //Debug.Log(userponse.ToString()); + Debug.Log(userponse.ToString()); infopyler res = JsonUtility.FromJson(userponse); SetCoinText(res.Info.Gold); SetStoneText(res.Info.Gem); + SetOreText(res.Info.Ore); + SetForgingText(res.Info.Forge); } diff --git a/meng_yao/Assets/script/Panel/eco_tree/PromptBtn.cs b/meng_yao/Assets/script/Panel/eco_tree/PromptBtn.cs index 81c7e1cce..151bff7e5 100644 --- a/meng_yao/Assets/script/Panel/eco_tree/PromptBtn.cs +++ b/meng_yao/Assets/script/Panel/eco_tree/PromptBtn.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; @@ -13,12 +14,44 @@ public class PromptBtn : MonoBehaviour Text.SetActive(false); btn.onClick.AddListener(OnClickBtn); } - - void OnClickBtn() + void Update() { + // 如果在PC上，检测鼠标左键点击 + if (Application.platform == RuntimePlatform.WindowsPlayer || + Application.platform == RuntimePlatform.OSXPlayer || + Application.platform == RuntimePlatform.LinuxPlayer || + Application.platform == RuntimePlatform.WindowsEditor || + Application.platform == RuntimePlatform.OSXEditor) + { + if (Input.GetMouseButtonDown(0)) // 鼠标左键按下 + { + Text.SetActive(false); + TextIsShow = false; + // 在这里添加PC的逻辑 + } + } + + // 如果在移动设备上，检测触摸输入 + if (Application.platform == RuntimePlatform.Android || + Application.platform == RuntimePlatform.IPhonePlayer) + { + if (Input.touchCount > 0) + { + Touch touch = Input.GetTouch(0); + if (touch.phase == TouchPhase.Began) + { + Text.SetActive(false); + TextIsShow = false; + // 在这里添加移动设备的逻辑 + } + } + } + } + async void OnClickBtn(){ if (!TextIsShow) { Text.SetActive(true); + await Task.Delay(500); TextIsShow = true; } else