diff --git a/Assets/Scenes/康养仿真/KYFZ.unity b/Assets/Scenes/康养仿真/KYFZ.unity
index b88bacd..3603a34 100644
--- a/Assets/Scenes/康养仿真/KYFZ.unity
+++ b/Assets/Scenes/康养仿真/KYFZ.unity
@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
- m_LightingDataAsset: {fileID: 0}
+ m_LightingDataAsset: {fileID: 112000000, guid: fa2908fabf7d90a4993bca7e40e7dfb2, type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: e1b19b4f26af44b419e07abe70ac110f, type: 2}
--- !u!196 &4
NavMeshSettings:
@@ -3527,7 +3527,7 @@ RectTransform:
- {fileID: 1185205142}
- {fileID: 230859516}
m_Father: {fileID: 1797272768}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4430,7 +4430,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 31d99d2764d03b8429ddb17ea1f14935, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 66ba03daca1bcca4b87aa42dbb7412d4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -6987,12 +6987,12 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797272768}
- m_RootOrder: 0
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 394.5, y: 0}
- m_SizeDelta: {x: 1820, y: 980}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.000015259, y: 240.1}
+ m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &273364725
MonoBehaviour:
@@ -7063,14 +7063,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.59607846}
+ 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: 0}
+ m_Sprite: {fileID: 21300000, guid: 66ba03daca1bcca4b87aa42dbb7412d4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -9789,7 +9789,7 @@ RectTransform:
- {fileID: 576630423}
- {fileID: 1779373965}
m_Father: {fileID: 1797272768}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12885,7 +12885,7 @@ RectTransform:
m_Children:
- {fileID: 459670029}
m_Father: {fileID: 1984713712}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13431,7 +13431,7 @@ RectTransform:
m_Children:
- {fileID: 65666309}
m_Father: {fileID: 1984713712}
- m_RootOrder: 1
+ 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}
@@ -13916,7 +13916,7 @@ RectTransform:
m_Children:
- {fileID: 1005292385}
m_Father: {fileID: 1984713712}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -17444,7 +17444,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: fa769b85b5aaeb0408784c3772e5b192, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 66ba03daca1bcca4b87aa42dbb7412d4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -18284,7 +18284,7 @@ RectTransform:
m_Children:
- {fileID: 1264234074}
m_Father: {fileID: 1984713712}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -19034,12 +19034,12 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1984713712}
- m_RootOrder: 0
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 102.08768, y: 1.3424988}
- m_SizeDelta: {x: 1918.7754, y: 1085.8008}
+ m_AnchoredPosition: {x: 226, y: 220}
+ m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &771775333
MonoBehaviour:
@@ -19110,15 +19110,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.1764706}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 66ba03daca1bcca4b87aa42dbb7412d4, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -20536,7 +20536,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 31d99d2764d03b8429ddb17ea1f14935, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 66ba03daca1bcca4b87aa42dbb7412d4, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -23638,7 +23638,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1984713712}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27263,15 +27263,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1864921334}
+ m_Children: []
m_Father: {fileID: 1436856581}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.00091552734, y: 0.0003047}
- m_SizeDelta: {x: 520, y: 484}
+ m_AnchoredPosition: {x: 211.46, y: 187.79}
+ m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1177076189
MonoBehaviour:
@@ -27342,15 +27341,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 66ba03daca1bcca4b87aa42dbb7412d4, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -27785,7 +27784,7 @@ RectTransform:
- {fileID: 606985307}
- {fileID: 13072748}
m_Father: {fileID: 1797272768}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -28533,7 +28532,7 @@ RectTransform:
m_Children:
- {fileID: 799883112}
m_Father: {fileID: 739089626}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -30300,7 +30299,7 @@ RectTransform:
m_Children:
- {fileID: 1099043645}
m_Father: {fileID: 1797272768}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -31185,7 +31184,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1393629332
RectTransform:
m_ObjectHideFlags: 0
@@ -36988,7 +36987,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1738432953
RectTransform:
m_ObjectHideFlags: 0
@@ -38673,12 +38672,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 273364724}
- {fileID: 1341279394}
- {fileID: 1199021606}
- {fileID: 387184344}
- {fileID: 119489969}
- {fileID: 1856859204}
+ - {fileID: 273364724}
m_Father: {fileID: 2016132456}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -39689,7 +39688,7 @@ RectTransform:
- {fileID: 180463614}
- {fileID: 636294375}
m_Father: {fileID: 1797272768}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -39881,141 +39880,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858352676}
m_CullTransparentMesh: 1
---- !u!1 &1864921333
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1864921334}
- - component: {fileID: 1864921336}
- - component: {fileID: 1864921335}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1864921334
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1864921333}
- 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: 1177076188}
- 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 &1864921335
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1864921333}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u5173\u95ED\u9762\u677F"
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: aa6d9312790d7c04c9f686f601a84aa2, type: 2}
- m_sharedMaterial: {fileID: 4842467400815856506, guid: 9e28b7edb1758c84d8d99f826bd555b3, type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4281479730
- m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 24
- m_fontSizeBase: 24
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 1
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!222 &1864921336
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1864921333}
- m_CullTransparentMesh: 1
--- !u!1 &1877271918
GameObject:
m_ObjectHideFlags: 0
@@ -42047,18 +41911,18 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 771775332}
- {fileID: 544638987}
- {fileID: 991918343}
- {fileID: 536961733}
- {fileID: 739089626}
- {fileID: 568618343}
+ - {fileID: 771775332}
m_Father: {fileID: 2016132456}
m_RootOrder: 13
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: -99.18575, y: -0.0000076294}
+ m_AnchoredPosition: {x: -0.000022888, y: -0.0000076294}
m_SizeDelta: {x: 553.9643, y: 524.3073}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1984713713
@@ -42765,7 +42629,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 217, y: 187.79}
+ m_AnchoredPosition: {x: 0.00091553, y: 187.79}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2005327120
@@ -43279,7 +43143,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!114 &2016132453
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/康养仿真/TipMangner.cs b/Assets/Scripts/康养仿真/TipMangner.cs
index 117f905..b084dc8 100644
--- a/Assets/Scripts/康养仿真/TipMangner.cs
+++ b/Assets/Scripts/康养仿真/TipMangner.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
+using static System.Net.Mime.MediaTypeNames;
public class TipMangner : MonoBehaviour
{
@@ -31,6 +32,7 @@ public class TipMangner : MonoBehaviour
// Start is called before the first frame update
void Start()
{
+ text.text = tips[0];
Next_BTn.onClick.AddListener(() =>
{
Next();