diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/_DEMO/_Tenkoku_Demo_Scene.unity b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/_DEMO/_Tenkoku_Demo_Scene.unity index 5fcb098f..ec842aae 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/_DEMO/_Tenkoku_Demo_Scene.unity +++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/_DEMO/_Tenkoku_Demo_Scene.unity @@ -1250,7 +1250,7 @@ MonoBehaviour: showSounds: 0 showConfigTime: 0 showConfigAtmos: 0 - showConfigWeather: 0 + showConfigWeather: 1 showIBL: 0 allowMultiLights: 0 skyBrightness: 0.6 @@ -1654,7 +1654,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 27827656 + randSeed: 1223580171 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &76575456 diff --git a/Assets/3rdParty/ZCalendar/Scripts/ZCalendarDemo.cs b/Assets/3rdParty/ZCalendar/Scripts/ZCalendarDemo.cs index cbbabbec..79e507e9 100644 --- a/Assets/3rdParty/ZCalendar/Scripts/ZCalendarDemo.cs +++ b/Assets/3rdParty/ZCalendar/Scripts/ZCalendarDemo.cs @@ -55,7 +55,7 @@ public class ZCalendarDemo : MonoBehaviour private void ZCalendar_ChoiceDayEvent(ZCalendarDayItem obj) { Debug.Log($"选择的日期：{obj.Day}"); - day_txt.text = obj.Day.ToString(); + day_txt.text = obj.Day.ToString()+"日"; } /// diff --git a/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs b/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs index 4ea61205..3441ceec 100644 --- a/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs +++ b/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs @@ -111,8 +111,8 @@ namespace ZTools { txtYear.text = year + "骞"; txtMonth.text = month + "鏈"; - year_txt.text=year.ToString(); - month_txt.text=month.ToString(); + year_txt.text=year.ToString()+"骞"; + month_txt.text=month.ToString()+"鏈"; } } } diff --git a/Assets/GameAssets/UI/姘村嵃.png b/Assets/GameAssets/UI/姘村嵃.png new file mode 100644 index 00000000..b925e660 Binary files /dev/null and b/Assets/GameAssets/UI/姘村嵃.png differ diff --git a/Assets/GameAssets/UI/姘村嵃.png.meta b/Assets/GameAssets/UI/姘村嵃.png.meta new file mode 100644 index 00000000..af5d4613 --- /dev/null +++ b/Assets/GameAssets/UI/姘村嵃.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 7912110c0c1bb5049a214486cb6df39a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 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: Windows Store Apps + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/UI/鐜璁剧疆.png b/Assets/GameAssets/UI/鐜璁剧疆.png new file mode 100644 index 00000000..8406422a Binary files /dev/null and b/Assets/GameAssets/UI/鐜璁剧疆.png differ diff --git a/Assets/GameAssets/UI/鐜璁剧疆.png.meta b/Assets/GameAssets/UI/鐜璁剧疆.png.meta new file mode 100644 index 00000000..7de247dd --- /dev/null +++ b/Assets/GameAssets/UI/鐜璁剧疆.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 75ec25dea72ec364ca1c6c546f849ddf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 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: Windows Store Apps + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UIPanel/environment_configuration.prefab b/Assets/Resources/UIPanel/Environmentconfiguration.prefab similarity index 93% rename from Assets/Resources/UIPanel/environment_configuration.prefab rename to Assets/Resources/UIPanel/Environmentconfiguration.prefab index e3e9b756..b6c9e7df 100644 --- a/Assets/Resources/UIPanel/environment_configuration.prefab +++ b/Assets/Resources/UIPanel/Environmentconfiguration.prefab @@ -1,317 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &278209372 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 278209373} - - component: {fileID: 278209375} - - component: {fileID: 278209374} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &278209373 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278209372} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1582875492} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 142, y: 0} - m_SizeDelta: {x: 100, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &278209375 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278209372} - m_CullTransparentMesh: 0 ---- !u!114 &278209374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 278209372} - 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: 0.990566, g: 0.9672036, b: 0.9672036, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 70 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5E74" ---- !u!1 &645056198 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 645056199} - - component: {fileID: 645056201} - - component: {fileID: 645056200} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &645056199 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645056198} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1415801766} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 118, y: 0} - m_SizeDelta: {x: 120, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &645056201 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645056198} - m_CullTransparentMesh: 0 ---- !u!114 &645056200 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645056198} - 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: 0.9811321, g: 0.9579922, b: 0.9579922, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 70 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5206" ---- !u!1 &855311076 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 855311077} - - component: {fileID: 855311079} - - component: {fileID: 855311078} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &855311077 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 855311076} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1747331146} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 118, y: 0} - m_SizeDelta: {x: 120, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &855311079 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 855311076} - m_CullTransparentMesh: 0 ---- !u!114 &855311078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 855311076} - 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: 0.9811321, g: 0.9579922, b: 0.9579922, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 70 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u65F6" ---- !u!1 &967395793 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 967395794} - - component: {fileID: 967395796} - - component: {fileID: 967395795} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &967395794 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 967395793} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1704071694} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 111, y: 0} - m_SizeDelta: {x: 100, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &967395796 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 967395793} - m_CullTransparentMesh: 0 ---- !u!114 &967395795 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 967395793} - 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: 0.9811321, g: 0.93948025, b: 0.93948025, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 70 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u65E5" --- !u!1 &1111770429 GameObject: m_ObjectHideFlags: 0 @@ -340,15 +28,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0} - m_Children: - - {fileID: 1415554606} + m_Children: [] m_Father: {fileID: 6623670425880737214} m_RootOrder: 6 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: 168.8, y: 182.76} - m_SizeDelta: {x: 120, y: 90} + m_AnchoredPosition: {x: 100.4, y: 161} + m_SizeDelta: {x: 149.16177, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1111770432 CanvasRenderer: @@ -379,7 +66,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -391,7 +78,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &1415554605 +--- !u!1 &1563486065 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -399,57 +86,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1415554606} - - component: {fileID: 1415554608} - - component: {fileID: 1415554607} + - component: {fileID: 1563486066} + - component: {fileID: 1563486068} + - component: {fileID: 1563486067} m_Layer: 5 - m_Name: Text + m_Name: Tips1_text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1415554606 +--- !u!224 &1563486066 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415554605} + m_GameObject: {fileID: 1563486065} 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_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] - m_Father: {fileID: 1111770430} - m_RootOrder: 0 + m_Father: {fileID: 767881268021807301} + m_RootOrder: 11 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: 111, y: 0} - m_SizeDelta: {x: 100, y: 90} + m_AnchoredPosition: {x: -4, y: -213} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1415554608 +--- !u!222 &1563486068 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415554605} + m_GameObject: {fileID: 1563486065} m_CullTransparentMesh: 0 ---- !u!114 &1415554607 +--- !u!114 &1563486067 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415554605} + m_GameObject: {fileID: 1563486065} 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: 0.9811321, g: 0.93948025, b: 0.93948025, a: 1} + m_Color: {r: 0.9811321, g: 0.96724814, b: 0.96724814, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -457,90 +144,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 7 - m_MaxSize: 70 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6708" ---- !u!1 &1415801765 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1415801766} - - component: {fileID: 1415801768} - - component: {fileID: 1415801767} - m_Layer: 5 - m_Name: points_txt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1415801766 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415801765} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0} - m_Children: - - {fileID: 645056199} - m_Father: {fileID: 6623670425880737214} - m_RootOrder: 10 - 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: 214, y: 145.1} - m_SizeDelta: {x: 120, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1415801768 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415801765} - m_CullTransparentMesh: 0 ---- !u!114 &1415801767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415801765} - 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: 0.9622642, g: 0.9395693, b: 0.9395693, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 70 + m_MaxSize: 60 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -576,15 +184,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0} - m_Children: - - {fileID: 278209373} + m_Children: [] m_Father: {fileID: 6623670425880737214} 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: 93.1, y: 182.76} - m_SizeDelta: {x: 200, y: 90} + m_AnchoredPosition: {x: 43.9, y: 161} + m_SizeDelta: {x: 229.42767, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1582875494 CanvasRenderer: @@ -615,7 +222,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -655,15 +262,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0} - m_Children: - - {fileID: 967395794} + m_Children: [] m_Father: {fileID: 6623670425880737214} m_RootOrder: 7 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: 234.9, y: 182.76} - m_SizeDelta: {x: 120, y: 90} + m_AnchoredPosition: {x: 143, y: 161} + m_SizeDelta: {x: 132.14722, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1704071696 CanvasRenderer: @@ -694,7 +300,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -724,7 +330,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1747331146 RectTransform: m_ObjectHideFlags: 0 @@ -735,15 +341,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0} - m_Children: - - {fileID: 855311077} + m_Children: [] m_Father: {fileID: 6623670425880737214} m_RootOrder: 9 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: 135.7, y: 145.1} - m_SizeDelta: {x: 120, y: 90} + m_AnchoredPosition: {x: 249.56, y: 162.9} + m_SizeDelta: {x: 237.57611, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1747331148 CanvasRenderer: @@ -774,7 +379,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -798,8 +403,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 02b6eda7913a5d048b1f08b3b5261ca7, type: 3} m_Name: m_EditorClassIdentifier: - H_txt: {fileID: 1747331147} - M_txt2: {fileID: 1415801767} + time_text: {fileID: 1747331147} + when: 0 + points: 0 --- !u!1 &1889660908 GameObject: m_ObjectHideFlags: 0 @@ -866,10 +472,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 7 + m_MinSize: 0 m_MaxSize: 70 m_Alignment: 4 m_AlignByGeometry: 0 @@ -914,7 +520,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: 92.4, y: 150.6} + m_AnchoredPosition: {x: 187.6, y: 162.5} m_SizeDelta: {x: 19, y: 19} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2102688384 @@ -1009,6 +615,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c1bfc2e54a1a6114d9ffaae024b197bb, type: 3} m_Name: m_EditorClassIdentifier: + when_text: {fileID: 1747331147} calendar_btn: {fileID: 2102688382} calendar_panl: {fileID: 8632464829370408819} isp: 1 @@ -1303,7 +910,7 @@ GameObject: - component: {fileID: 767881266481711633} - component: {fileID: 767881266481711632} m_Layer: 5 - m_Name: Button + m_Name: quxiao_brnn8 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1316,16 +923,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 767881266481711634} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 767881267251227858} - m_RootOrder: 13 + m_Father: {fileID: 767881268021807301} + m_RootOrder: 9 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: 100, y: -250} + m_AnchoredPosition: {x: 100, y: -270} m_SizeDelta: {x: 138, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &767881266481711638 @@ -1642,7 +1249,7 @@ RectTransform: m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 767881268021807301} - 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} @@ -1678,7 +1285,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -1851,8 +1458,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -128.1, y: 163} - m_SizeDelta: {x: 113.78772, y: 20} + m_AnchoredPosition: {x: -161, y: 163} + m_SizeDelta: {x: 82.00226, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &767881266625851591 MonoBehaviour: @@ -1980,7 +1587,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2112,8 +1719,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 9.0000305, y: -0.5} - m_SizeDelta: {x: 300, y: 120} + m_AnchoredPosition: {x: 19, y: -0.5} + m_SizeDelta: {x: 280, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &767881266713249694 CanvasRenderer: @@ -2144,7 +1751,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2222,7 +1829,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2265,7 +1872,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 767881268021807301} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2548,7 +2155,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -3090,7 +2697,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -3211,8 +2818,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6, y: 163} - m_SizeDelta: {x: 113.78772, y: 20} + m_AnchoredPosition: {x: -55, y: 163} + m_SizeDelta: {x: 87.299866, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &767881267169914854 MonoBehaviour: @@ -3327,7 +2934,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -3405,7 +3012,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -3695,9 +3302,8 @@ RectTransform: - {fileID: 767881267208857549} - {fileID: 767881266428941959} - {fileID: 767881267873672431} - - {fileID: 767881266481711635} m_Father: {fileID: 767881268021807301} - 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} @@ -3807,7 +3413,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4111,7 +3717,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4305,7 +3911,7 @@ RectTransform: - {fileID: 767881268385063359} - {fileID: 767881267210959974} m_Father: {fileID: 767881268021807301} - m_RootOrder: 6 + 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} @@ -4483,7 +4089,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4789,7 +4395,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: 9.0000305, y: -0.5} + m_AnchoredPosition: {x: 18, y: -0.5} m_SizeDelta: {x: 300, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &767881267609202704 @@ -4821,7 +4427,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4993,7 +4599,7 @@ RectTransform: m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 767881268021807301} - 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} @@ -5029,7 +4635,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5462,7 +5068,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5540,7 +5146,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5693,7 +5299,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5705,84 +5311,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u9633\u5149\u4EAE\u5EA6\uFF1A" ---- !u!1 &767881267918612329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 767881267918612334} - - component: {fileID: 767881267918612332} - - component: {fileID: 767881267918612335} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &767881267918612334 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 767881267918612329} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} - m_Children: [] - m_Father: {fileID: 767881268021807301} - 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: 98, y: -30} - m_SizeDelta: {x: 500, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &767881267918612332 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 767881267918612329} - m_CullTransparentMesh: 0 ---- !u!114 &767881267918612335 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 767881267918612329} - 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: 0.9528302, g: 0.93934673, b: 0.93934673, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 100 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 100 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u73AF\u5883\u8BBE\u7F6E" --- !u!1 &767881267941032450 GameObject: m_ObjectHideFlags: 0 @@ -5849,7 +5377,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5964,7 +5492,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 767881267918612334} - {fileID: 767881266743434709} - {fileID: 767881268485621923} - {fileID: 767881267251227858} @@ -5974,6 +5501,9 @@ RectTransform: - {fileID: 767881268501722870} - {fileID: 767881268364505354} - {fileID: 9122881021864585789} + - {fileID: 767881266481711635} + - {fileID: 8929732180791581995} + - {fileID: 1563486066} m_Father: {fileID: 6623670425880737214} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6085,7 +5615,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -6163,7 +5693,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -6351,7 +5881,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -6431,7 +5961,7 @@ RectTransform: - {fileID: 767881268321876109} - {fileID: 767881268382026542} m_Father: {fileID: 767881268021807301} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6487,18 +6017,7 @@ MonoBehaviour: m_Value: 10 m_OnValueChanged: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_MethodName: SetLightValue - m_Mode: 0 - 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 + m_Calls: [] --- !u!1 &767881268382026537 GameObject: m_ObjectHideFlags: 0 @@ -6675,7 +6194,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -6717,12 +6236,12 @@ RectTransform: m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 767881268021807301} - m_RootOrder: 2 + 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: 60, y: -100} - m_SizeDelta: {x: 400, y: 150} + m_AnchoredPosition: {x: 52, y: -100} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &767881268485621921 CanvasRenderer: @@ -6753,7 +6272,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -6778,7 +6297,7 @@ GameObject: - component: {fileID: 767881268501722868} - component: {fileID: 767881268501722871} m_Layer: 5 - m_Name: Button + m_Name: queren_btnn8 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6796,7 +6315,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 767881268021807301} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6883,6 +6402,80 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1555150801390935512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8929732180791581995} + - component: {fileID: 8275113622140236961} + - component: {fileID: 7970129852364719010} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8929732180791581995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555150801390935512} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 767881268021807301} + m_RootOrder: 10 + 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: -231, y: 289} + m_SizeDelta: {x: 88, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8275113622140236961 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555150801390935512} + m_CullTransparentMesh: 0 +--- !u!114 &7970129852364719010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555150801390935512} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 75ec25dea72ec364ca1c6c546f849ddf, 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!1 &6623670425880737213 GameObject: m_ObjectHideFlags: 0 @@ -6893,7 +6486,7 @@ GameObject: m_Component: - component: {fileID: 6623670425880737214} m_Layer: 5 - m_Name: environment_configuration + m_Name: Environmentconfiguration m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6920,7 +6513,6 @@ RectTransform: - {fileID: 1704071694} - {fileID: 2102688381} - {fileID: 1747331146} - - {fileID: 1415801766} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6959,7 +6551,7 @@ RectTransform: m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 767881268021807301} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6995,7 +6587,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 70 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 diff --git a/Assets/Resources/UIPanel/environment_configuration.prefab.meta b/Assets/Resources/UIPanel/Environmentconfiguration.prefab.meta similarity index 100% rename from Assets/Resources/UIPanel/environment_configuration.prefab.meta rename to Assets/Resources/UIPanel/Environmentconfiguration.prefab.meta diff --git a/Assets/Resources/UIPanel/scenario_name.prefab b/Assets/Resources/UIPanel/Scenarioname.prefab similarity index 91% rename from Assets/Resources/UIPanel/scenario_name.prefab rename to Assets/Resources/UIPanel/Scenarioname.prefab index e5426410..e8086b0f 100644 --- a/Assets/Resources/UIPanel/scenario_name.prefab +++ b/Assets/Resources/UIPanel/Scenarioname.prefab @@ -322,8 +322,10 @@ GameObject: - component: {fileID: 2015720087859465411} - component: {fileID: 2015720087859465421} - component: {fileID: 2015720087859465410} + - component: {fileID: 7962244611046349254} + - component: {fileID: -4901456093005628639} m_Layer: 5 - m_Name: scenario_name + m_Name: Scenarioname m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -387,3 +389,31 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7962244611046349254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015720087859465408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowSwitchOff: 0 +--- !u!114 &-4901456093005628639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015720087859465408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb53714a701e1764f92c389d49c805b2, type: 3} + m_Name: + m_EditorClassIdentifier: + options_toggle: {fileID: 7962244611046349254} + setingname: {fileID: 2015720087197738237} + Toggle: {fileID: 2015720086882145408} diff --git a/Assets/Resources/UIPanel/scenario_name.prefab.meta b/Assets/Resources/UIPanel/Scenarioname.prefab.meta similarity index 100% rename from Assets/Resources/UIPanel/scenario_name.prefab.meta rename to Assets/Resources/UIPanel/Scenarioname.prefab.meta diff --git a/Assets/Resources/UIPanel/scenario_name1.prefab b/Assets/Resources/UIPanel/scenario_name1.prefab index 6f417d0a..4148ea0e 100644 --- a/Assets/Resources/UIPanel/scenario_name1.prefab +++ b/Assets/Resources/UIPanel/scenario_name1.prefab @@ -343,7 +343,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000025749, y: 0} + m_AnchoredPosition: {x: 0.000022888184, y: 0} m_SizeDelta: {x: 484.47107, y: 93.33334} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &274852808228692912 diff --git a/Assets/Temp/Scripts/Calendarbtn.cs b/Assets/Temp/Scripts/Calendarbtn.cs index 87822f8f..e54310a3 100644 --- a/Assets/Temp/Scripts/Calendarbtn.cs +++ b/Assets/Temp/Scripts/Calendarbtn.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; public class Calendarbtn : MonoBehaviour { - + public Text when_text;//鏃堕棿鏂囨湰 public Button calendar_btn; public RectTransform calendar_panl; public bool isp=true; @@ -16,6 +16,7 @@ public class Calendarbtn : MonoBehaviour if (isp==true) { calendar_panl.gameObject.SetActive(true); + when_text.gameObject.SetActive(true); } }); } diff --git a/Assets/Temp/Scripts/Environmentconfiguration.cs b/Assets/Temp/Scripts/Environmentconfiguration.cs new file mode 100644 index 00000000..b8de8c50 --- /dev/null +++ b/Assets/Temp/Scripts/Environmentconfiguration.cs @@ -0,0 +1,27 @@ +锘縰sing System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Environmentconfiguration : MonoBehaviour +{ + public Dropdown the_wind; + public Dropdown direction; + public float rain; + void Start() + { + + } + void Update() + { + + } + public void Rainvalue(float value) + { + rain = value; + } + public void Sonwvalue(float value) + { + + } +} diff --git a/Assets/Temp/Scripts/Environmentconfiguration.cs.meta b/Assets/Temp/Scripts/Environmentconfiguration.cs.meta new file mode 100644 index 00000000..36d9a11e --- /dev/null +++ b/Assets/Temp/Scripts/Environmentconfiguration.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9d820764724107e4097f0013318f0197 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Temp/Scripts/Managementtxt.cs b/Assets/Temp/Scripts/Managementtxt.cs index b8bfa8b5..95f84951 100644 --- a/Assets/Temp/Scripts/Managementtxt.cs +++ b/Assets/Temp/Scripts/Managementtxt.cs @@ -161,8 +161,37 @@ public class Thinkingfile /// public string Field_Char3 ; /// - /// + /// 璁剧疆澶╂皵鐨勭被 /// + public Environment Environment { get; set; } +} +[Serializable] +public class Environment +{ + /// + /// 鏃堕棿 + /// + public string Time { get; set; } + /// + /// 闆 + /// + public string Rain { get; set; } + /// + /// 闆 + /// + public string Snow { get; set; } + /// + /// 椋庨 + /// + public string WindSpeed { get; set; } + /// + /// 椋庡悜 + /// + public string WindDir { get; set; } + /// + /// 闃冲厜寮哄害 + /// + public string Light { get; set; } } [Serializable] public class Traininginformation diff --git a/Assets/Temp/Scripts/Scenarioname.cs b/Assets/Temp/Scripts/Scenarioname.cs new file mode 100644 index 00000000..022e6b04 --- /dev/null +++ b/Assets/Temp/Scripts/Scenarioname.cs @@ -0,0 +1,25 @@ +锘縰sing System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Scenarioname : MonoBehaviour +{ + public ToggleGroup options_toggle; + public Text setingname; + public Toggle Toggle; + + public void Scenario(string name,ToggleGroup group,Action cation) + { + setingname.text = name; + Toggle.group = group; + Toggle.onValueChanged.AddListener((isOn) => + { + if (isOn) + { + cation?.Invoke(); + } + }); + } +} diff --git a/Assets/Temp/Scripts/Scenarioname.cs.meta b/Assets/Temp/Scripts/Scenarioname.cs.meta new file mode 100644 index 00000000..ee8fc158 --- /dev/null +++ b/Assets/Temp/Scripts/Scenarioname.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fb53714a701e1764f92c389d49c805b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index 5bcd5ac7..d158643a 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -102,10 +102,7 @@ public class Scenariopage : MonoBehaviour //List data1 = new List(); public Slider yangguang;//闃冲厜鐨勬粦鍔ㄦ潯 public Text yangguang_text; //鏄剧ず闃冲厜鐨勬粦鍔ㄦ暟鍊 - public Text subject_text;//鎯冲畾鏂囦欢涓嬬殑绉戠洰鏂囨湰 - public Text subject1_text;//鎯冲畾鏂囦欢涓嬬殑绉戠洰鏂囨湰 - public Button settings1_btnn;//绉戠洰璁粌璁剧疆鎸夐挳 - public Button settings_btnn;//绉戠洰璁粌璁剧疆鎸夐挳 + public Image basic_information_iamg1;//璁粌绉戠洰鍩烘湰淇℃伅椤甸潰 public Text xunkian_txt;//鏄剧ず鐨勬兂瀹氱殑鍚嶅瓧 public Text time_txt;//鏄剧ず鍩烘湰淇℃伅鐨勮缁冩椂闂 @@ -116,12 +113,23 @@ public class Scenariopage : MonoBehaviour public Button cancel_bton2;//璁粌绉戠洰鍩烘湰淇℃伅鍙栨秷鎸夐挳 public GameObject scenario_name;//鎯冲畾缂栬緫鐨勯璁句綋 public Transform weizhi;//鐢熸垚鐨勪綅缃 - private List textlist1 = new List();//瀛樻斁鐢熸垚鎯冲畾鏂囦欢鐨勫悕瀛 + [SerializeField] List togglelist = new List();//瀛樻斁鎯冲畾鏂囦欢涓嬬殑鎵撳嬀鎸夐挳 public ToggleGroup togglezujian;//鑾峰彇toggle缁勪欢 public Underneath underneath;//鎯冲畾鏂囦欢涓嬬殑绉戠洰棰勮浣 public Transform scenario_file_iamg;//鐢熸垚鐨勯璁句綋鐨勪綅缃 [SerializeField] List underneathList = new List(); + public GameObject scenarname;//鎯冲畾鍚嶇О + public Scenarioname scenar_name;//鎯冲畾鍚嶇О + [SerializeField] List scenarList = new List(); + public Text year_text;//骞 + public Text month_text;//鏈 + public Text day_text;//澶 + public Text when_text;//鏃 + public Environmentconfiguration Environmentconfiguration; + public Slider Slider;//澶╂皵鍙樺寲鐨勬粦鍔ㄦ潯 + public Text tips_text;//鐜缂栬緫鎻愮ず鏂囨湰 + [SerializeField] List environments = new List(); void Start() { @@ -129,7 +137,7 @@ public class Scenariopage : MonoBehaviour StartCoroutine(Post1(url, (bol, str) => { Scenario(bol, str); - })); + })); Scenario();//鎯冲畾鏂囦欢 Basic();//鍩烘湰淇℃伅鎸夐挳 Scenariofile();//鎯冲畾鏂囦欢涓嬮潰鎸夐挳 @@ -139,11 +147,11 @@ public class Scenariopage : MonoBehaviour GameMain.tiao = false; SceneManager.LoadScene("SampleScene"); }); - SetLightValue(1f); + //SetLightValue(1f); queding.onClick.AddListener(() => { - SetWindValue(); - SetWindDirection(); + //SetWindValue(); + //SetWindDirection(); environment_configuration1.gameObject.SetActive(false); }); Jiben();//鍩烘湰淇℃伅纭鍙栨秷鎸夐挳 @@ -166,6 +174,7 @@ public class Scenariopage : MonoBehaviour }); verify_bton2.onClick.AddListener(() => { + Scenariofile_panl.gameObject.SetActive(false); basic_information_iamg1.gameObject.SetActive(false); }); cancel_bton2.onClick.AddListener(() => @@ -182,7 +191,7 @@ public class Scenariopage : MonoBehaviour }); queren_btnn3.onClick.AddListener(() => { - //Singlechoice(); + contingency_list_panl.gameObject.SetActive(false); Scenariofile_panl.gameObject.SetActive(true); }); @@ -208,8 +217,11 @@ public class Scenariopage : MonoBehaviour }); } - void Update() + void LateUpdate() { + tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0.0f, 1.0f, 1 - Slider.value / 10); + SetWindDirection(); + SetWindValue(); tiem_text.text = tiem_slider.value.ToString("0") + "s"; smash_text.text = smash_slider.value.ToString("0") + "s"; distance_text.text = distance_slider.value.ToString("f1") + "km"; @@ -305,32 +317,36 @@ public class Scenariopage : MonoBehaviour if (bol) { Debug.Log(str); - scen = JsonMapper.ToObject(str); + scen = JsonMapper.ToObject(str);//瑙ｆ瀽鏈澶栧眰鐨勬兂瀹氬悕绉癹son鏂囦欢 for (int i = 0; i < scen.data.Count; i++) { - Traininginformation temp = new Traininginformation(); - temp = Jsonanalyze.FromJson(scen.data[i].VirtualPath); - data1.Add(temp); + Traininginformation temp = new Traininginformation();//鎺ユ敹json瑙ｆ瀽鐨勬柊瀵硅薄杩欐牱鎺ユ敹瀵硅薄灏变笉浼氳瑕嗙洊锛屽洜涓烘瘡娆￠兘鏄渶瑕佷竴涓柊鐨勫璞 + temp = Jsonanalyze.FromJson(scen.data[i].VirtualPath);//瑙ｆ瀽閲岄潰瀛楃涓瞛son鏂囦欢 + data1.Add(temp);//鎶婂璞℃坊鍔犲埌瀵硅薄閾捐〃涓 } - if (scen.state) + if (scen.state)//濡傛灉state杩欎釜bool鍊间负true杩涙潵 { - Debug.Log("鍑犳"); - for (int i = 0; i < data1.Count; i++) + if (scenarList.Count > 0)//濡傛灉鎯冲畾閾捐〃鐨勬暟閲忛噺澶т簬闆朵釜杩涘叆 { - int index = i; - Instantiate(scenario_name, weizhi); - Text text = transform.GetChild(0).transform.GetChild(10).transform.GetChild(4).transform.GetChild(0).transform.GetChild(0).transform.GetChild(i).transform.GetChild(1).GetComponent(); - text.text = scen.data[i].Name.ToString(); - Toggle toggle = GameObject.Find("Canvas1").transform.GetChild(0).transform.GetChild(10).transform.GetChild(4).transform.GetChild(0).transform.GetChild(0).transform.GetChild(i).transform.GetChild(0).GetComponent(); - toggle.group = togglezujian; - toggle.onValueChanged.AddListener((isOn) => + for (int j = 0; j < scenarList.Count; j++)//寰幆涓涓嬪搴旂殑鍒楄〃 { - if (isOn) - { - Singlechoice(data1[index]); - } + Destroy(scenarList[j].gameObject);//鍒犻櫎閾捐〃姣忎竴涓墿浣 + } + scenarList.Clear();//娓呯┖閾捐〃 + } + + for (int i = 0; i < data1.Count; i++)//寰幆涓涓嬪璞＄殑涓暟 + { + int index = i;//鐢ㄤ竴涓煎幓鎺ユ敹寰幆鐨勬暟鍊硷紝鍥犱负鐢ㄤ簬鎸夐挳杩欎簺鎿嶄綔鍙兘浼氳瑕嗙洊锛屽緱涓嶅埌瀵瑰簲鐨勫 + Scenarioname scenarioname = Instantiate(scenar_name, weizhi);//鐢熸垚鎯冲畾鍚嶇О棰勮浣撳拰浣嶇疆 + //杩欐槸棰勮浣撳搴旂殑绫诲幓鎺ユ敹 + scenarioname.Scenario(scen.data[index].Name.ToString(), togglezujian, () =>//浼犲搴旂殑鍊煎埌鏂囨湰 + { + + Singlechoice(data1[index]);//鎶婄浉瀵瑰簲鐨勫璞′紶鍒版柟娉曚腑 + }); - togglelist.Add(toggle); + scenarList.Add(scenarioname);//鎶婂璞℃坊鍔犲埌閾捐〃涓 } } @@ -338,29 +354,29 @@ public class Scenariopage : MonoBehaviour } - private void Singlechoice(Traininginformation ti) + private void Singlechoice(Traininginformation ti)//鐢ㄧ浉搴旂被瀵硅薄鍘绘帴鏀 { - if (underneathList.Count > 0) + if (underneathList.Count > 0)//濡傛灉閾捐〃鐨勪釜鏁板ぇ浜庨浂杩涘叆 { - for (int i = 0; i < underneathList.Count; i++) + for (int i = 0; i < underneathList.Count; i++)//寰幆閾捐〃鐨勪釜鏁 { - Destroy(underneathList[i].gameObject); + Destroy(underneathList[i].gameObject);//鎶婇摼琛ㄥ搴旂殑涓暟涓涓鍒犻櫎 } - underneathList.Clear(); + underneathList.Clear();//娓呴櫎閾捐〃 } - for (int f = 0; f < ti.subjectsInfo.Count; f++) + for (int f = 0; f < ti.subjectsInfo.Count; f++)//寰幆瀵瑰簲閾捐〃瀵瑰簲鐨勪釜鏁 { - int index = f; - Underneath underneathItem = Instantiate(underneath, scenario_file_iamg); - underneathItem.SetValue(ti.subjectsInfo[index].subjectName, (() => + int index = f;//鐢ㄦ暟鍘绘帴鏀秄or寰幆 + Underneath underneathItem = Instantiate(underneath, scenario_file_iamg);//鎶婂厠闅嗗璞＄敓鎴愰璁句綋锛岀敤鐩稿簲瀵硅薄鍘绘帴鏀 + underneathItem.SetValue(ti.subjectsInfo[index].subjectName, (() =>//浼犲搴旂殑鍊肩粰鏂囨湰 { - OnUnderNeathSetBtn(ti.subjectsInfo[index].subjectName, ti.subjectsInfo[index].SubTime.ToString(), ti.subjectsInfo[index].mode, ti.subjectsInfo[index].index.ToString()); + OnUnderNeathSetBtn(ti.subjectsInfo[index].subjectName, ti.subjectsInfo[index].SubTime.ToString(), ti.subjectsInfo[index].mode, ti.subjectsInfo[index].seatInfos.Count.ToString()); })); - underneathList.Add(underneathItem); + underneathList.Add(underneathItem);//鎶婄敓鎴愬璞″姞鍏ラ摼琛ㄤ腑 } } - public void OnUnderNeathSetBtn(string _name, string _time, string _trainModel, string deviceCount) + public void OnUnderNeathSetBtn(string _name, string _time, string _trainModel, string deviceCount)//鎺ユ敹闇瑕佷紶鐨勫搴斿 { xunkian_txt.text = _name; time_txt.text = _time; @@ -371,12 +387,13 @@ public class Scenariopage : MonoBehaviour public IEnumerator Post1(string url, System.Action action) { - WWWForm form = new WWWForm(); + WWWForm form = new WWWForm();//缃戠粶閫氫俊 UnityWebRequest request = UnityWebRequest.Post(url, form); yield return request.SendWebRequest(); if (request.isNetworkError || request.isHttpError) { action(false, null); + Debug.Log("缃戠粶璇锋眰澶辫触浜"); } else { @@ -395,7 +412,7 @@ public class Scenariopage : MonoBehaviour /// /// 妯″瀷椤甸潰鐨勭浉浜掕烦杞 /// - + /// private void Moxingxuanze() { quan_btn.onClick.AddListener(() => @@ -468,17 +485,66 @@ public class Scenariopage : MonoBehaviour /// /// 鐜鐣岄潰纭鍙栨秷鎸夐挳 /// + public string tmie; private void Huanjin() { huanjin_btn.onClick.AddListener(() => { - environment_configuration1.gameObject.SetActive(false); + if (year_text.text.Length>=1) + { + tmie = year_text.text + " " + month_text.text + " " + day_text.text + " " + when_text.text; + PlayerPrefs.GetString("time", "" + tmie + ""); + PlayerPrefs.GetString("RainAmt", "" + tenkokuModule.weather_RainAmt + ""); + PlayerPrefs.GetString("SnowAmt", "" + tenkokuModule.weather_SnowAmt + ""); + PlayerPrefs.GetString("WindAmt", "" + tenkokuModule.weather_WindAmt + ""); + PlayerPrefs.GetString("WindDir", "" + tenkokuModule.weather_WindDir + ""); + PlayerPrefs.GetString("OvercastAmt", "" + tenkokuModule.weather_OvercastAmt + ""); + Debug.Log(tmie);//鏃ユ湡鏃堕棿 + Debug.Log(tenkokuModule.weather_RainAmt);//闆ㄧ殑澶у皬 + Debug.Log(tenkokuModule.weather_SnowAmt);//闆殑澶у皬 + Debug.Log(tenkokuModule.weather_WindAmt);//椋庨熺殑澶у皬 + Debug.Log(tenkokuModule.weather_WindDir.ToString("0"));//椋庡悜 + Debug.Log(tenkokuModule.weather_OvercastAmt.ToString("f2"));//鐧藉ぉ榛戝 + StartCoroutine(Post()); + environment_configuration1.gameObject.SetActive(false); + } + else + { + tips_text.text = "璇疯緭鍏ユ棩鏈"; + Invoke("Tips", 1.5f); + } + }); huanjin_btn1.onClick.AddListener(() => { environment_configuration1.gameObject.SetActive(false); }); } + + IEnumerator Post() + { + Environment warther = new Environment(); + warther.Time = tmie; + warther.Rain = tenkokuModule.weather_RainAmt.ToString(); + warther.Snow = tenkokuModule.weather_SnowAmt.ToString(); + warther.WindSpeed =tenkokuModule.weather_WindAmt.ToString(); + warther.WindDir = tenkokuModule.weather_WindDir.ToString("0"); + warther.Light =tenkokuModule.weather_OvercastAmt.ToString("f2"); + // environments.Add(warther); + string json = JsonUtility.ToJson(warther); + WWWForm w =new WWWForm(); + w.AddField("http://172.16.1.254:48888/Handler/Thinkingfile.ashx?action=update_env&Id=1698025363002&data=",json); + yield return w; + + + + } + + public void Tips() + { + tips_text.text = null; + } + /// /// 鍩烘湰淇℃伅纭畾鍙栨秷鎸夐挳 /// @@ -547,10 +613,12 @@ public class Scenariopage : MonoBehaviour //} }); } - + public string whater; public void SetRainValue(float value) { tenkokuModule.weather_RainAmt = Mathf.Lerp(0.0f, 1.0f, value); + whater = tenkokuModule.weather_RainAmt.ToString(); + Debug.Log(whater); } public void SetSnowValue(float value) { @@ -560,7 +628,42 @@ public class Scenariopage : MonoBehaviour public void SetWindValue() { //tenkokuModule.weather_WindAmt = Mathf.Lerp(0.0f, 1.0f, value); - tenkokuModule.weather_WindAmt = windDrop.value * 0.1f; + //tenkokuModule.weather_OvercastAmt = windDrop.value * 0.1f; + float tempEintAmt = 0; + switch (windDrop.value) + { + case 1: + tempEintAmt = 0.1f; + break; + case 2: + tempEintAmt = 0.2f; + break; + case 3: + tempEintAmt = 0.3f; + break; + case 4: + tempEintAmt = 0.4f; + break; + case 5: + tempEintAmt = 0.5f; + break; + case 6: + tempEintAmt = 0.6f; + break; + case 7: + tempEintAmt = 0.7f; + break; + case 8: + tempEintAmt = 0.8f; + break; + case 9: + tempEintAmt = 0.9f; + break ; + case 10: + tempEintAmt = 1.0f; + break; + } + tenkokuModule.weather_WindAmt = Mathf.Lerp(0.1f, 1.0f, tempEintAmt); } public void SetWindDirection() @@ -593,14 +696,15 @@ public class Scenariopage : MonoBehaviour tempWindDir = 1f; break; } - tenkokuModule.weather_WindDir = Mathf.Lerp(0.0f, 1.0f, tempWindDir); + tenkokuModule.weather_WindDir = Mathf.Lerp(0.0f, 365.0f, tempWindDir); } - public void SetLightValue(float value) - { - float valueTemp = 1 - value; - tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0.0f, 1.0f, valueTemp); - } + //public void SetLightValue(float value) + //{ + // float valueTemp = 1 - value; + // tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0.0f, 1.0f, valueTemp); + // Debug.Log(tenkokuModule.weather_OvercastAmt); + //} diff --git a/Assets/Temp/Scripts/TimeHM.cs b/Assets/Temp/Scripts/TimeHM.cs index 92795a1f..41363e84 100644 --- a/Assets/Temp/Scripts/TimeHM.cs +++ b/Assets/Temp/Scripts/TimeHM.cs @@ -6,17 +6,19 @@ using UnityEngine.UI; public class TimeHM : MonoBehaviour { - public Text H_txt; - public Text M_txt2; + public Text time_text; + public int when; + public int points; void Start() { - + } // Update is called once per frame void Update() { - H_txt.text = DateTime.Now.Hour.ToString(); - M_txt2.text = DateTime.Now.Minute.ToString(); + when = DateTime.Now.Hour; + points = DateTime.Now.Minute; + time_text.text =string.Format("{0:D2} : {1:D2}", when, points); } } diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index b8144498..2ea26f1c 100644 --- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity +++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.17237645, g: 0.3035558, b: 0.59096897, a: 1} + m_IndirectSpecularColor: {r: 0.1674825, g: 0.3072167, b: 0.6407015, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -7385,7 +7385,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 63705482} - m_LocalRotation: {x: 0.32006606, y: 0.8835044, z: -0.3215693, w: 0.11649448} + m_LocalRotation: {x: 0.04870571, y: 0.96239877, z: -0.2668968, w: 0.01350725} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 250, y: 250, z: 250} m_Children: @@ -10949,7 +10949,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 198973212} - m_LocalRotation: {x: 0.3551778, y: -0.088278964, z: 0.90314263, w: -0.2244749} + m_LocalRotation: {x: 0.5820598, y: -0.26764658, z: 0.6976174, w: -0.32078305} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 250, y: 250, z: 250} m_Children: @@ -17376,7 +17376,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 250950117} - m_LocalRotation: {x: 0.26877093, y: -0.09560168, z: 0.02681943, w: 0.9580727} + m_LocalRotation: {x: 0.34009627, y: 0.18404482, z: -0.06805869, w: 0.9196902} m_LocalPosition: {x: -13.70872, y: 9.276348, z: -11.36977} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -34899,6 +34899,18 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!114 &525088262 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1111770431, guid: a573eabe79e49f740807bf8ae0ff45cc, + type: 3} + m_PrefabInstance: {fileID: 852395022} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &526064391 GameObject: m_ObjectHideFlags: 0 @@ -39976,6 +39988,18 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!114 &556762712 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1582875493, guid: a573eabe79e49f740807bf8ae0ff45cc, + type: 3} + m_PrefabInstance: {fileID: 852395022} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &557990030 GameObject: m_ObjectHideFlags: 0 @@ -52753,15 +52777,10 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 767881268364505355, guid: a573eabe79e49f740807bf8ae0ff45cc, - type: 3} - propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1864715518} - target: {fileID: 6623670425880737213, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3} propertyPath: m_Name - value: environment_configuration + value: Environmentconfiguration objectReference: {fileID: 0} - target: {fileID: 6623670425880737213, guid: a573eabe79e49f740807bf8ae0ff45cc, type: 3} @@ -67848,7 +67867,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1242063470} - m_LocalRotation: {x: -0.48308477, y: -0.1414339, z: -0.8588409, w: -0.09496297} + m_LocalRotation: {x: -0.5309479, y: -0.10330634, z: -0.8163098, w: -0.20263344} m_LocalPosition: {x: 0.5529245, y: 0, z: 0} m_LocalScale: {x: 1.1074, y: 1.10745, z: 1.10745} m_Children: [] @@ -68517,7 +68536,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264004773} - m_LocalRotation: {x: 0.8179122, y: 0.26846567, z: -0.48348847, w: -0.1586968} + m_LocalRotation: {x: -0.55311304, y: -0.25175774, z: 0.7228043, w: 0.32899526} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 250, y: 250, z: 250} m_Children: @@ -72960,7 +72979,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452191771} - m_LocalRotation: {x: 0.07761813, y: -0.92022926, z: -0.30204952, w: -0.23647335} + m_LocalRotation: {x: 0.054615375, y: 0.9022099, z: 0.4106544, w: -0.11998983} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -84948,6 +84967,18 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!114 &1563486067 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1563486067, guid: a573eabe79e49f740807bf8ae0ff45cc, + type: 3} + m_PrefabInstance: {fileID: 852395022} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1566281223 GameObject: m_ObjectHideFlags: 0 @@ -92727,7 +92758,7 @@ MonoBehaviour: enableFog: 1 autoFog: 1 showColors: 0 - showConfig: 0 + showConfig: 1 showCelSet: 0 showTimer: 1 showSounds: 0 @@ -92745,9 +92776,9 @@ MonoBehaviour: fadeDistance: 0.19999999 fogObscurance: 0 setRotation: 180 - setLatitude: 40 - setLongitude: 0 - setTZOffset: 0 + setLatitude: 31 + setLongitude: -19 + setTZOffset: 1 enableDST: 0 sunSize: 0.02 sunBright: 1 @@ -92788,18 +92819,18 @@ MonoBehaviour: sunlightObject: {fileID: 1242063471} sunSphereObject: {fileID: 198973213} moonlightObject: {fileID: 639984703} - moonLightAmt: 0.919686 - moonPhase: 0.54015696 + moonLightAmt: 0.9705016 + moonPhase: 0.4852508 ambientCol: {r: 1, g: 1, b: 1, a: 1} colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1} colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1} colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8} colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1} - colorHorizon: {r: 0.68610847, g: 0.9356758, b: 1.1343884, a: 1.2} - colorHorizonLow: {r: 0.68610847, g: 0.9356758, b: 1.1343884, a: 1.2} + colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} + colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1} colorClouds: {r: 1, g: 1, b: 1, a: 1} - colorHighlightClouds: {r: 1, g: 0.94209427, b: 0.6867151, a: 1} + colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1} colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1} colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1} displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]' @@ -92918,7 +92949,7 @@ MonoBehaviour: weather_lightningDir: 110 weather_lightningRange: 180 lightningColor: {r: 0.6898789, g: 0.78019774, b: 0.8088235, a: 0.5019608} - ecldiff: -136.51448 + ecldiff: -138.07584 fogDist: 0.9009 atmosphereDensity: 0.5 horizonDensity: 2 @@ -93137,7 +93168,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1138608500 + randSeed: 64287171 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -93153,22 +93184,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dstOffset: 0 - tzOffset: 0 + tzOffset: -1 yamt: 0 eclipticoffset: 0 - day: -355322.6 + day: -355322.56 y: 1027 m: 3 D: 6 UT: 9.5 - LT: 19.920052 - local_latitude: 40 - local_longitude: -0 + LT: 22.1888 + local_latitude: 31 + local_longitude: 19 Epoch: 2000 iteration: 1000 moonPos: -1 - azimuth: 331.02682 - altitude: -35.84308 + azimuth: 15.001258 + altitude: -48.446754 moonApogee: 1 ecl: 23.565903 --- !u!4 &1820978575 @@ -94502,12 +94533,14 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} + scen: + state: 0 + message: + data: [] + data1: [] + subjectsInfoItemms: [] yangguang: {fileID: 1882774958} yangguang_text: {fileID: 1213515519} - subject_text: {fileID: 0} - subject1_text: {fileID: 0} - settings1_btnn: {fileID: 0} - settings_btnn: {fileID: 0} basic_information_iamg1: {fileID: 226935391} xunkian_txt: {fileID: 1555487165} time_txt: {fileID: 451282783} @@ -94524,13 +94557,22 @@ MonoBehaviour: underneath: {fileID: 4518214261586103517, guid: f0f515f746fc8da44b20b61b62d70079, type: 3} scenario_file_iamg: {fileID: 808973579} - scenariolisttext: [] - scenariobtnlist: [] underneathList: [] - currentThinkName: - kaiguan: 1 - kaiguan2: 1 - guan: 1 + scenarname: {fileID: 2015720087859465408, guid: c16d0eddd7898ba4992e722f6656ea31, + type: 3} + scenar_name: {fileID: -4901456093005628639, guid: c16d0eddd7898ba4992e722f6656ea31, + type: 3} + scenarList: [] + year_text: {fileID: 556762712} + month_text: {fileID: 525088262} + day_text: {fileID: 1936075359} + when_text: {fileID: 2076915513} + Environmentconfiguration: {fileID: 0} + Slider: {fileID: 1882774958} + tips_text: {fileID: 1563486067} + environments: [] + tmie: + whater: --- !u!1 &1869198089 GameObject: m_ObjectHideFlags: 0 @@ -97030,6 +97072,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1936075359 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1704071695, guid: a573eabe79e49f740807bf8ae0ff45cc, + type: 3} + m_PrefabInstance: {fileID: 852395022} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1937018212 GameObject: m_ObjectHideFlags: 0 @@ -114643,6 +114697,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2076215628} m_CullTransparentMesh: 0 +--- !u!114 &2076915513 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1747331147, guid: a573eabe79e49f740807bf8ae0ff45cc, + type: 3} + m_PrefabInstance: {fileID: 852395022} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2078354450 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scenes/SampleScene.unity b/Assets/Zion/Scenes/SampleScene.unity index c369cf34..d7867e83 100644 --- a/Assets/Zion/Scenes/SampleScene.unity +++ b/Assets/Zion/Scenes/SampleScene.unity @@ -666,6 +666,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305941370} m_CullTransparentMesh: 0 +--- !u!1 &371022982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 371022983} + - component: {fileID: 371022985} + - component: {fileID: 371022984} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &371022983 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371022982} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1240925094} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 366, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &371022984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371022982} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7912110c0c1bb5049a214486cb6df39a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &371022985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371022982} + m_CullTransparentMesh: 0 --- !u!224 &421013631 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3263964912550011672, guid: c57206d8b4c25124a855fec64c26cd1e, @@ -1638,6 +1712,7 @@ RectTransform: - {fileID: 1126413265} - {fileID: 1067383904} - {fileID: 305941371} + - {fileID: 371022983} m_Father: {fileID: 884735634} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}