This commit is contained in:
commit
222a5948b7
|
|
@ -1654,7 +1654,7 @@ MonoBehaviour:
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
randSeed: 1223580171
|
randSeed: 498133484
|
||||||
isDoingTransition: 0
|
isDoingTransition: 0
|
||||||
minimumHeight: 0
|
minimumHeight: 0
|
||||||
--- !u!114 &76575456
|
--- !u!114 &76575456
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
|
@ -6,7 +6,7 @@ TextureImporter:
|
||||||
serializedVersion: 11
|
serializedVersion: 11
|
||||||
mipmaps:
|
mipmaps:
|
||||||
mipMapMode: 0
|
mipMapMode: 0
|
||||||
enableMipMap: 1
|
enableMipMap: 0
|
||||||
sRGBTexture: 1
|
sRGBTexture: 1
|
||||||
linearTexture: 0
|
linearTexture: 0
|
||||||
fadeOut: 0
|
fadeOut: 0
|
||||||
|
|
@ -34,13 +34,13 @@ TextureImporter:
|
||||||
filterMode: -1
|
filterMode: -1
|
||||||
aniso: -1
|
aniso: -1
|
||||||
mipBias: -100
|
mipBias: -100
|
||||||
wrapU: -1
|
wrapU: 1
|
||||||
wrapV: -1
|
wrapV: 1
|
||||||
wrapW: -1
|
wrapW: -1
|
||||||
nPOTScale: 1
|
nPOTScale: 0
|
||||||
lightmap: 0
|
lightmap: 0
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
spriteMode: 0
|
spriteMode: 1
|
||||||
spriteExtrude: 1
|
spriteExtrude: 1
|
||||||
spriteMeshType: 1
|
spriteMeshType: 1
|
||||||
alignment: 0
|
alignment: 0
|
||||||
|
|
@ -49,9 +49,9 @@ TextureImporter:
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
alphaIsTransparency: 0
|
alphaIsTransparency: 1
|
||||||
spriteTessellationDetail: -1
|
spriteTessellationDetail: -1
|
||||||
textureType: 0
|
textureType: 8
|
||||||
textureShape: 1
|
textureShape: 1
|
||||||
singleChannelComponent: 0
|
singleChannelComponent: 0
|
||||||
maxTextureSizeSet: 0
|
maxTextureSizeSet: 0
|
||||||
|
|
@ -71,13 +71,49 @@ TextureImporter:
|
||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID:
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
internalID: 0
|
internalID: 0
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
|
@ -6,7 +6,7 @@ TextureImporter:
|
||||||
serializedVersion: 11
|
serializedVersion: 11
|
||||||
mipmaps:
|
mipmaps:
|
||||||
mipMapMode: 0
|
mipMapMode: 0
|
||||||
enableMipMap: 1
|
enableMipMap: 0
|
||||||
sRGBTexture: 1
|
sRGBTexture: 1
|
||||||
linearTexture: 0
|
linearTexture: 0
|
||||||
fadeOut: 0
|
fadeOut: 0
|
||||||
|
|
@ -34,13 +34,13 @@ TextureImporter:
|
||||||
filterMode: -1
|
filterMode: -1
|
||||||
aniso: -1
|
aniso: -1
|
||||||
mipBias: -100
|
mipBias: -100
|
||||||
wrapU: -1
|
wrapU: 1
|
||||||
wrapV: -1
|
wrapV: 1
|
||||||
wrapW: -1
|
wrapW: -1
|
||||||
nPOTScale: 1
|
nPOTScale: 0
|
||||||
lightmap: 0
|
lightmap: 0
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
spriteMode: 0
|
spriteMode: 1
|
||||||
spriteExtrude: 1
|
spriteExtrude: 1
|
||||||
spriteMeshType: 1
|
spriteMeshType: 1
|
||||||
alignment: 0
|
alignment: 0
|
||||||
|
|
@ -49,9 +49,9 @@ TextureImporter:
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
alphaIsTransparency: 0
|
alphaIsTransparency: 1
|
||||||
spriteTessellationDetail: -1
|
spriteTessellationDetail: -1
|
||||||
textureType: 0
|
textureType: 8
|
||||||
textureShape: 1
|
textureShape: 1
|
||||||
singleChannelComponent: 0
|
singleChannelComponent: 0
|
||||||
maxTextureSizeSet: 0
|
maxTextureSizeSet: 0
|
||||||
|
|
@ -71,13 +71,49 @@ TextureImporter:
|
||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID:
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
internalID: 0
|
internalID: 0
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
|
|
@ -1,5 +1,97 @@
|
||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &1072734215
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1072734216}
|
||||||
|
- component: {fileID: 1072734218}
|
||||||
|
- component: {fileID: 1072734217}
|
||||||
|
- component: {fileID: 1881851039179044101}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: auto_text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1072734216
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1072734215}
|
||||||
|
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: 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: 152.8, y: 160}
|
||||||
|
m_SizeDelta: {x: 800, y: 120}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1072734218
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1072734215}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1072734217
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1072734215}
|
||||||
|
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.96724814, b: 0.96724814, 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: 60
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 0
|
||||||
|
m_MaxSize: 60
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text:
|
||||||
|
--- !u!114 &1881851039179044101
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1072734215}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 7acfba70dcc2e8144997db2bbb3d1318, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
time: {fileID: 1072734217}
|
||||||
--- !u!1 &1111770429
|
--- !u!1 &1111770429
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -503,7 +595,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &2102688381
|
--- !u!224 &2102688381
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1432,7 +1524,6 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 767881266625851588}
|
- component: {fileID: 767881266625851588}
|
||||||
- component: {fileID: 767881266625851591}
|
- component: {fileID: 767881266625851591}
|
||||||
- component: {fileID: 767881266625851590}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Toggle
|
m_Name: Toggle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -1503,24 +1594,11 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 767881267869610542}
|
m_TargetGraphic: {fileID: 767881267869610542}
|
||||||
toggleTransition: 1
|
toggleTransition: 1
|
||||||
graphic: {fileID: 767881266399930350}
|
graphic: {fileID: 767881266399930350}
|
||||||
m_Group: {fileID: 767881266625851590}
|
m_Group: {fileID: 6667825991472349258}
|
||||||
onValueChanged:
|
onValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_IsOn: 0
|
m_IsOn: 1
|
||||||
--- !u!114 &767881266625851590
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 767881266625851585}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_AllowSwitchOff: 0
|
|
||||||
--- !u!1 &767881266630056118
|
--- !u!1 &767881266630056118
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2863,11 +2941,11 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 767881267307086369}
|
m_TargetGraphic: {fileID: 767881267307086369}
|
||||||
toggleTransition: 1
|
toggleTransition: 1
|
||||||
graphic: {fileID: 767881267390343749}
|
graphic: {fileID: 767881267390343749}
|
||||||
m_Group: {fileID: 767881266625851590}
|
m_Group: {fileID: 6667825991472349258}
|
||||||
onValueChanged:
|
onValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_IsOn: 1
|
m_IsOn: 0
|
||||||
--- !u!1 &767881267172371457
|
--- !u!1 &767881267172371457
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4683,8 +4761,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 8.36, y: -7.6}
|
m_AnchoredPosition: {x: 8.36, y: -2.5774}
|
||||||
m_SizeDelta: {x: 16.712036, y: 35.19275}
|
m_SizeDelta: {x: 16.712036, y: 45.237854}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &767881267678591000
|
--- !u!114 &767881267678591000
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
@ -4859,7 +4937,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 2}
|
m_AnchoredPosition: {x: 0, y: 2}
|
||||||
m_SizeDelta: {x: 0, y: 150}
|
m_SizeDelta: {x: 0, y: 170.71362}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &767881267758097689
|
--- !u!222 &767881267758097689
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -5474,6 +5552,7 @@ GameObject:
|
||||||
- component: {fileID: 767881268021807301}
|
- component: {fileID: 767881268021807301}
|
||||||
- component: {fileID: 767881268021807307}
|
- component: {fileID: 767881268021807307}
|
||||||
- component: {fileID: 767881268021807306}
|
- component: {fileID: 767881268021807306}
|
||||||
|
- component: {fileID: 6667825991472349258}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Image
|
m_Name: Image
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -5549,6 +5628,19 @@ MonoBehaviour:
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &6667825991472349258
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 767881268021807300}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_AllowSwitchOff: 0
|
||||||
--- !u!1 &767881268062031176
|
--- !u!1 &767881268062031176
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -5583,8 +5675,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 4.9999847, y: -0.5000057}
|
m_AnchoredPosition: {x: -3.678, y: -1.25}
|
||||||
m_SizeDelta: {x: 770, y: 120}
|
m_SizeDelta: {x: 827.8534, y: 125}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &767881268062031183
|
--- !u!222 &767881268062031183
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -5739,7 +5831,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 28}
|
m_SizeDelta: {x: 0, y: 40.082947}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!1 &767881268137516304
|
--- !u!1 &767881268137516304
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -5805,7 +5897,7 @@ MonoBehaviour:
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: 6c0e6084a0fcaff4f89b783bbe5b4bff, type: 3}
|
m_Sprite: {fileID: 21300000, guid: a3bb89c9bf65c344182fa7a8a5c5ff40, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
@ -6513,6 +6605,7 @@ RectTransform:
|
||||||
- {fileID: 1704071694}
|
- {fileID: 1704071694}
|
||||||
- {fileID: 2102688381}
|
- {fileID: 2102688381}
|
||||||
- {fileID: 1747331146}
|
- {fileID: 1747331146}
|
||||||
|
- {fileID: 1072734216}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ GameObject:
|
||||||
- component: {fileID: 7901942762635028178}
|
- component: {fileID: 7901942762635028178}
|
||||||
- component: {fileID: 4518214261586103517}
|
- component: {fileID: 4518214261586103517}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: underneath
|
m_Name: Underneath
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
|
@ -110,9 +110,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7901942762468014403}
|
- {fileID: 7901942762468014403}
|
||||||
- {fileID: 7901942763149566989}
|
- {fileID: 7901942763149566989}
|
||||||
- {fileID: 7901942764366188392}
|
|
||||||
- {fileID: 7901942763373534467}
|
- {fileID: 7901942763373534467}
|
||||||
- {fileID: 7901942763214542357}
|
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -290,124 +288,6 @@ MonoBehaviour:
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
--- !u!1 &7901942763214542354
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 7901942763214542357}
|
|
||||||
- component: {fileID: 7901942763214542358}
|
|
||||||
- component: {fileID: 7901942763214542359}
|
|
||||||
- component: {fileID: 7901942763214542356}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Button
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &7901942763214542357
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942763214542354}
|
|
||||||
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: 7901942762635028179}
|
|
||||||
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}
|
|
||||||
m_AnchoredPosition: {x: 108, y: 0}
|
|
||||||
m_SizeDelta: {x: 19, y: 19}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &7901942763214542358
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942763214542354}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &7901942763214542359
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942763214542354}
|
|
||||||
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: 99eed431e50c98747987d7977b87cb8e, type: 3}
|
|
||||||
m_Type: 0
|
|
||||||
m_PreserveAspect: 0
|
|
||||||
m_FillCenter: 1
|
|
||||||
m_FillMethod: 4
|
|
||||||
m_FillAmount: 1
|
|
||||||
m_FillClockwise: 1
|
|
||||||
m_FillOrigin: 0
|
|
||||||
m_UseSpriteMesh: 0
|
|
||||||
m_PixelsPerUnitMultiplier: 1
|
|
||||||
--- !u!114 &7901942763214542356
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942763214542354}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Navigation:
|
|
||||||
m_Mode: 3
|
|
||||||
m_SelectOnUp: {fileID: 0}
|
|
||||||
m_SelectOnDown: {fileID: 0}
|
|
||||||
m_SelectOnLeft: {fileID: 0}
|
|
||||||
m_SelectOnRight: {fileID: 0}
|
|
||||||
m_Transition: 1
|
|
||||||
m_Colors:
|
|
||||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
|
||||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
|
||||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
|
||||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
|
||||||
m_ColorMultiplier: 1
|
|
||||||
m_FadeDuration: 0.1
|
|
||||||
m_SpriteState:
|
|
||||||
m_HighlightedSprite: {fileID: 0}
|
|
||||||
m_PressedSprite: {fileID: 0}
|
|
||||||
m_SelectedSprite: {fileID: 21300000, guid: bb0fdf4dc2b95964db131777ed884626, type: 3}
|
|
||||||
m_DisabledSprite: {fileID: 0}
|
|
||||||
m_AnimationTriggers:
|
|
||||||
m_NormalTrigger: Normal
|
|
||||||
m_HighlightedTrigger: Highlighted
|
|
||||||
m_PressedTrigger: Pressed
|
|
||||||
m_SelectedTrigger: Selected
|
|
||||||
m_DisabledTrigger: Disabled
|
|
||||||
m_Interactable: 1
|
|
||||||
m_TargetGraphic: {fileID: 7901942763214542359}
|
|
||||||
m_OnClick:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!1 &7901942763373534464
|
--- !u!1 &7901942763373534464
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -439,7 +319,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7901942762635028179}
|
m_Father: {fileID: 7901942762635028179}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -526,121 +406,3 @@ MonoBehaviour:
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
--- !u!1 &7901942764366188393
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 7901942764366188392}
|
|
||||||
- component: {fileID: 7901942764366188397}
|
|
||||||
- component: {fileID: 7901942764366188394}
|
|
||||||
- component: {fileID: 7901942764366188395}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Button
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &7901942764366188392
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942764366188393}
|
|
||||||
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: 7901942762635028179}
|
|
||||||
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}
|
|
||||||
m_AnchoredPosition: {x: 48, y: 0}
|
|
||||||
m_SizeDelta: {x: 13, y: 21}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!222 &7901942764366188397
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942764366188393}
|
|
||||||
m_CullTransparentMesh: 0
|
|
||||||
--- !u!114 &7901942764366188394
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942764366188393}
|
|
||||||
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: 9e30eeb34580cd54b922d639d9d37bee, type: 3}
|
|
||||||
m_Type: 0
|
|
||||||
m_PreserveAspect: 0
|
|
||||||
m_FillCenter: 1
|
|
||||||
m_FillMethod: 4
|
|
||||||
m_FillAmount: 1
|
|
||||||
m_FillClockwise: 1
|
|
||||||
m_FillOrigin: 0
|
|
||||||
m_UseSpriteMesh: 0
|
|
||||||
m_PixelsPerUnitMultiplier: 1
|
|
||||||
--- !u!114 &7901942764366188395
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 7901942764366188393}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Navigation:
|
|
||||||
m_Mode: 3
|
|
||||||
m_SelectOnUp: {fileID: 0}
|
|
||||||
m_SelectOnDown: {fileID: 0}
|
|
||||||
m_SelectOnLeft: {fileID: 0}
|
|
||||||
m_SelectOnRight: {fileID: 0}
|
|
||||||
m_Transition: 2
|
|
||||||
m_Colors:
|
|
||||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
|
||||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
|
||||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
|
||||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
|
||||||
m_ColorMultiplier: 1
|
|
||||||
m_FadeDuration: 0.1
|
|
||||||
m_SpriteState:
|
|
||||||
m_HighlightedSprite: {fileID: 0}
|
|
||||||
m_PressedSprite: {fileID: 0}
|
|
||||||
m_SelectedSprite: {fileID: 21300000, guid: 9fb33bdce957bf4469be0461bc19acfd, type: 3}
|
|
||||||
m_DisabledSprite: {fileID: 0}
|
|
||||||
m_AnimationTriggers:
|
|
||||||
m_NormalTrigger: Normal
|
|
||||||
m_HighlightedTrigger: Highlighted
|
|
||||||
m_PressedTrigger: Pressed
|
|
||||||
m_SelectedTrigger: Selected
|
|
||||||
m_DisabledTrigger: Disabled
|
|
||||||
m_Interactable: 1
|
|
||||||
m_TargetGraphic: {fileID: 7901942764366188394}
|
|
||||||
m_OnClick:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2867c644cac2f7b488d4acbc11bd2ea4
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -49,7 +49,9 @@ public class Login_panl : MonoBehaviour
|
||||||
main_panl.gameObject.SetActive(true);
|
main_panl.gameObject.SetActive(true);
|
||||||
Main_page.gameObject.SetActive(false);
|
Main_page.gameObject.SetActive(false);
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (username_input.text.Length == 0 || password_input.text.Length == 0)
|
if (username_input.text.Length == 0 || password_input.text.Length == 0)
|
||||||
{
|
{
|
||||||
|
|
@ -83,6 +85,7 @@ public class Login_panl : MonoBehaviour
|
||||||
//user.user_id = jd["data"]["user_id"].ToString();
|
//user.user_id = jd["data"]["user_id"].ToString();
|
||||||
//user.login_name = jd["data"]["login_name"].ToString();
|
//user.login_name = jd["data"]["login_name"].ToString();
|
||||||
//user.real_name = jd["data"]["real_name"].ToString();
|
//user.real_name = jd["data"]["real_name"].ToString();
|
||||||
|
|
||||||
//user.role_code = jd["data"]["role_code"].ToString();
|
//user.role_code = jd["data"]["role_code"].ToString();
|
||||||
//user.real_name = jd["data"]["real_name"].ToString() ;
|
//user.real_name = jd["data"]["real_name"].ToString() ;
|
||||||
PlayerPrefs.SetString("user_id", user.user_id);
|
PlayerPrefs.SetString("user_id", user.user_id);
|
||||||
|
|
@ -117,7 +120,7 @@ public class Login_panl : MonoBehaviour
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(request.downloadHandler.text))//相应服务器信息不为空
|
if (!string.IsNullOrEmpty(request.downloadHandler.text))//判断相应服务器信息不为空
|
||||||
action(true, request.downloadHandler.text);//request.downloadHandler.text服务器相应的信息
|
action(true, request.downloadHandler.text);//request.downloadHandler.text服务器相应的信息
|
||||||
else
|
else
|
||||||
action(false, null);
|
action(false, null);
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,7 @@ public class Thinkingfile
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 设置天气的类
|
/// 设置天气的类
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Environment Environment { get; set; }
|
// public Environment Environment { get; set; }
|
||||||
}
|
}
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public class Environment
|
public class Environment
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,21 @@
|
||||||
using LitJson;
|
using LitJson;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Security.Principal;
|
||||||
using Tenkoku.Core;
|
using Tenkoku.Core;
|
||||||
using UnityEditor.Animations;
|
using UnityEditor.Animations;
|
||||||
|
using UnityEditor.VersionControl;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Networking;
|
using UnityEngine.Networking;
|
||||||
|
using UnityEngine.Rendering.PostProcessing;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using YL;
|
||||||
using static NetMQ.NetMQSelector;
|
using static NetMQ.NetMQSelector;
|
||||||
|
using static UnityEditor.ShaderData;
|
||||||
|
|
||||||
public class Scenariopage : MonoBehaviour
|
public class Scenariopage : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
@ -90,15 +96,13 @@ public class Scenariopage : MonoBehaviour
|
||||||
public Image contingency_list_panl;//想定列表面板
|
public Image contingency_list_panl;//想定列表面板
|
||||||
public Button off_btnn5;//关闭按钮
|
public Button off_btnn5;//关闭按钮
|
||||||
public Button queren_btnn3;//确认按钮
|
public Button queren_btnn3;//确认按钮
|
||||||
private string url = "http://172.16.1.254:48888/Handler/Thinkingfile.ashx?action=all";
|
private string url = "http://172.16.1.254:48888/Handler/Thinkingfile.ashx?action=all";//想定Wbe接口
|
||||||
public List<Text> textlist = new List<Text>();
|
//public List<Text> textlist = new List<Text>();
|
||||||
|
[SerializeField]
|
||||||
|
Editinformation scen = new Editinformation();
|
||||||
|
[SerializeField]
|
||||||
|
List<Traininginformation> data1 = new List<Traininginformation>();
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
public Editinformation scen = new Editinformation();
|
|
||||||
[SerializeField]
|
|
||||||
public List<Traininginformation> data1 = new List<Traininginformation>();
|
|
||||||
[SerializeField]
|
|
||||||
List<SubjectsInfoItemm> subjectsInfoItemms = new List<SubjectsInfoItemm>();
|
|
||||||
//List<Traininginformation> data1 = new List<Traininginformation>();
|
//List<Traininginformation> data1 = new List<Traininginformation>();
|
||||||
public Slider yangguang;//阳光的滑动条
|
public Slider yangguang;//阳光的滑动条
|
||||||
public Text yangguang_text; //显示阳光的滑动数值
|
public Text yangguang_text; //显示阳光的滑动数值
|
||||||
|
|
@ -129,7 +133,26 @@ public class Scenariopage : MonoBehaviour
|
||||||
public Environmentconfiguration Environmentconfiguration;
|
public Environmentconfiguration Environmentconfiguration;
|
||||||
public Slider Slider;//天气变化的滑动条
|
public Slider Slider;//天气变化的滑动条
|
||||||
public Text tips_text;//环境编辑提示文本
|
public Text tips_text;//环境编辑提示文本
|
||||||
[SerializeField] List<Environment> environments = new List<Environment>();
|
//[SerializeField] List<Environment> environments = new List<Environment>();
|
||||||
|
[SerializeField] string rainamt;//天气雨的传值
|
||||||
|
[SerializeField] string snowamt;//天气雪的传值
|
||||||
|
[SerializeField] string windamt;//风的等级的传值
|
||||||
|
[SerializeField] string winddir;//雪的等级的传值
|
||||||
|
public string Name1;
|
||||||
|
public string practicemode;
|
||||||
|
public Text scenarioname_text;//基本信息的想定名称
|
||||||
|
public Text practricemode_text;//基本信息模式
|
||||||
|
public int time;
|
||||||
|
public int quantity;
|
||||||
|
public Text time1_text;//相对训练的时间
|
||||||
|
public Text quantity_text;//基本信息页面设备数量
|
||||||
|
public Toggle xitong;//系统时间勾选
|
||||||
|
public Toggle shodo;//手动设置时间
|
||||||
|
public Button hand_btn;//手动设置按钮
|
||||||
|
public Text auto_text;//自动时间文本
|
||||||
|
public bool isptime=false;//时间显示判断文本
|
||||||
|
public bool kaiguan=false;
|
||||||
|
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
@ -164,6 +187,44 @@ public class Scenariopage : MonoBehaviour
|
||||||
TZYM();//弹窗
|
TZYM();//弹窗
|
||||||
Dixaing();//想定列表按钮
|
Dixaing();//想定列表按钮
|
||||||
Settingbtn();//科目训练按钮三
|
Settingbtn();//科目训练按钮三
|
||||||
|
Timesetting();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Timesetting()
|
||||||
|
{
|
||||||
|
xitong.onValueChanged.AddListener((ison) =>
|
||||||
|
{
|
||||||
|
if (ison)
|
||||||
|
{
|
||||||
|
year_text.gameObject.SetActive(false);
|
||||||
|
month_text.gameObject.SetActive(false);
|
||||||
|
day_text.gameObject.SetActive(false);
|
||||||
|
when_text.gameObject.SetActive(false);
|
||||||
|
hand_btn.gameObject.SetActive(false);
|
||||||
|
auto_text.gameObject.SetActive(true);
|
||||||
|
kaiguan=false;
|
||||||
|
tmie=null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
shodo.onValueChanged.AddListener((ison) =>
|
||||||
|
{
|
||||||
|
if (ison)
|
||||||
|
{
|
||||||
|
auto_text.gameObject.SetActive(false);
|
||||||
|
hand_btn.gameObject.SetActive(true);
|
||||||
|
year_text.gameObject.SetActive(true);
|
||||||
|
month_text.gameObject.SetActive(true);
|
||||||
|
day_text.gameObject.SetActive(true);
|
||||||
|
//time_text.gameObject.SetActive(true);
|
||||||
|
if (isptime==true)
|
||||||
|
{
|
||||||
|
when_text.gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
isptime=true;
|
||||||
|
kaiguan = true;
|
||||||
|
tmie = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Settingbtn()
|
private void Settingbtn()
|
||||||
|
|
@ -174,7 +235,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
});
|
});
|
||||||
verify_bton2.onClick.AddListener(() =>
|
verify_bton2.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
Scenariofile_panl.gameObject.SetActive(false);
|
//Scenariofile_panl.gameObject.SetActive(false);
|
||||||
basic_information_iamg1.gameObject.SetActive(false);
|
basic_information_iamg1.gameObject.SetActive(false);
|
||||||
});
|
});
|
||||||
cancel_bton2.onClick.AddListener(() =>
|
cancel_bton2.onClick.AddListener(() =>
|
||||||
|
|
@ -260,13 +321,13 @@ public class Scenariopage : MonoBehaviour
|
||||||
model_panl.gameObject.SetActive(false);
|
model_panl.gameObject.SetActive(false);
|
||||||
Scenariofile_panl.gameObject.SetActive(false);
|
Scenariofile_panl.gameObject.SetActive(false);
|
||||||
object_list_panl.gameObject.SetActive(true);
|
object_list_panl.gameObject.SetActive(true);
|
||||||
duixiang = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
object_list_panl.gameObject.SetActive(false);
|
|
||||||
duixiang = true;
|
|
||||||
}
|
}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
// object_list_panl.gameObject.SetActive(false);
|
||||||
|
// duixiang = true;
|
||||||
|
//}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -279,6 +340,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
model_panl.gameObject.SetActive(false);
|
model_panl.gameObject.SetActive(false);
|
||||||
ScrollView_unpack.gameObject.SetActive(false);
|
ScrollView_unpack.gameObject.SetActive(false);
|
||||||
object_list_panl.gameObject.SetActive(false);
|
object_list_panl.gameObject.SetActive(false);
|
||||||
|
scenario = true;
|
||||||
contingency_list_panl.gameObject.SetActive(true);
|
contingency_list_panl.gameObject.SetActive(true);
|
||||||
});
|
});
|
||||||
//想定文件下的保存按钮
|
//想定文件下的保存按钮
|
||||||
|
|
@ -312,6 +374,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
select_device_iamg.gameObject.SetActive(false);
|
select_device_iamg.gameObject.SetActive(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
public string Id;
|
||||||
void Scenario(bool bol, string str)
|
void Scenario(bool bol, string str)
|
||||||
{
|
{
|
||||||
if (bol)
|
if (bol)
|
||||||
|
|
@ -342,9 +405,13 @@ public class Scenariopage : MonoBehaviour
|
||||||
//这是预设体对应的类去接收
|
//这是预设体对应的类去接收
|
||||||
scenarioname.Scenario(scen.data[index].Name.ToString(), togglezujian, () =>//传对应的值到文本
|
scenarioname.Scenario(scen.data[index].Name.ToString(), togglezujian, () =>//传对应的值到文本
|
||||||
{
|
{
|
||||||
|
Id = scen.data[index].Id;
|
||||||
|
Name1 = scen.data[index].Name;
|
||||||
|
practicemode = scen.data[index].PracticeMode;
|
||||||
|
time = 0;
|
||||||
|
quantity = 0;
|
||||||
Singlechoice(data1[index]);//把相对应的对象传到方法中
|
Singlechoice(data1[index]);//把相对应的对象传到方法中
|
||||||
|
Basicinformation();
|
||||||
});
|
});
|
||||||
scenarList.Add(scenarioname);//把对象添加到链表中
|
scenarList.Add(scenarioname);//把对象添加到链表中
|
||||||
}
|
}
|
||||||
|
|
@ -372,8 +439,23 @@ public class Scenariopage : MonoBehaviour
|
||||||
{
|
{
|
||||||
OnUnderNeathSetBtn(ti.subjectsInfo[index].subjectName, ti.subjectsInfo[index].SubTime.ToString(), ti.subjectsInfo[index].mode, ti.subjectsInfo[index].seatInfos.Count.ToString());
|
OnUnderNeathSetBtn(ti.subjectsInfo[index].subjectName, ti.subjectsInfo[index].SubTime.ToString(), ti.subjectsInfo[index].mode, ti.subjectsInfo[index].seatInfos.Count.ToString());
|
||||||
}));
|
}));
|
||||||
|
time += ti.subjectsInfo[index].SubTime;
|
||||||
|
quantity +=ti.subjectsInfo[index].seatInfos.Count;
|
||||||
underneathList.Add(underneathItem);//把生成对象加入链表中
|
underneathList.Add(underneathItem);//把生成对象加入链表中
|
||||||
}
|
}
|
||||||
|
//Debug.LogError(time);
|
||||||
|
//Debug.LogError(quantity);
|
||||||
|
Train();
|
||||||
|
}
|
||||||
|
private void Train()
|
||||||
|
{
|
||||||
|
time1_text.text = time.ToString();
|
||||||
|
quantity_text.text = quantity.ToString();
|
||||||
|
}
|
||||||
|
private void Basicinformation()
|
||||||
|
{
|
||||||
|
scenarioname_text.text = Name1;
|
||||||
|
practricemode_text.text = practicemode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnUnderNeathSetBtn(string _name, string _time, string _trainModel, string deviceCount)//接收需要传的对应值
|
public void OnUnderNeathSetBtn(string _name, string _time, string _trainModel, string deviceCount)//接收需要传的对应值
|
||||||
|
|
@ -469,43 +551,44 @@ public class Scenariopage : MonoBehaviour
|
||||||
{
|
{
|
||||||
environment_configuration1.gameObject.SetActive(false);
|
environment_configuration1.gameObject.SetActive(false);
|
||||||
object_list_panl.gameObject.SetActive(false);
|
object_list_panl.gameObject.SetActive(false);
|
||||||
basic_information_iamg.gameObject.SetActive(false);
|
basic_information_iamg1.gameObject.SetActive(false);
|
||||||
model_panl.gameObject.SetActive(true);
|
model_panl.gameObject.SetActive(true);
|
||||||
select_device_iamg.gameObject.SetActive(true);
|
select_device_iamg.gameObject.SetActive(true);
|
||||||
model = false;
|
//model = false;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
model_panl.gameObject.SetActive(false);
|
|
||||||
select_device_iamg.gameObject.SetActive(false);
|
|
||||||
model = true;
|
|
||||||
}
|
}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
// model_panl.gameObject.SetActive(false);
|
||||||
|
// select_device_iamg.gameObject.SetActive(false);
|
||||||
|
// model = true;
|
||||||
|
//}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 环境界面确认取消按钮
|
/// 环境界面确认取消按钮
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string tmie;
|
public string tmie;//接收环境的界面日期时间
|
||||||
private void Huanjin()
|
private void Huanjin()
|
||||||
{
|
{
|
||||||
huanjin_btn.onClick.AddListener(() =>
|
huanjin_btn.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
if (year_text.text.Length>=1)
|
if (year_text.text.Length >= 1||auto_text.text.Length>=1)
|
||||||
|
{
|
||||||
|
Rain(tenkokuModule.weather_RainAmt.ToString());
|
||||||
|
Snow(tenkokuModule.weather_SnowAmt.ToString());
|
||||||
|
WindAmt(tenkokuModule.weather_WindAmt.ToString("f1"));
|
||||||
|
WindDir(tenkokuModule.weather_WindDir);
|
||||||
|
//Debug.LogError(tenkokuModule.weather_WindAmt);
|
||||||
|
//tmie = year_text.text + " " + month_text.text + " " + day_text.text + " " + when_text.text;
|
||||||
|
if (kaiguan==false)
|
||||||
|
{
|
||||||
|
tmie = auto_text.text;
|
||||||
|
}
|
||||||
|
if (kaiguan==true)
|
||||||
{
|
{
|
||||||
tmie = year_text.text + " " + month_text.text + " " + day_text.text + " " + when_text.text;
|
tmie = year_text.text + " " + month_text.text + " " + day_text.text + " " + when_text.text;
|
||||||
PlayerPrefs.GetString("time", "" + tmie + "");
|
}
|
||||||
PlayerPrefs.GetString("RainAmt", "" + tenkokuModule.weather_RainAmt + "");
|
Passbyvalue();//给接口传值
|
||||||
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);
|
environment_configuration1.gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -520,26 +603,176 @@ public class Scenariopage : MonoBehaviour
|
||||||
environment_configuration1.gameObject.SetActive(false);
|
environment_configuration1.gameObject.SetActive(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
void Passbyvalue()
|
||||||
IEnumerator Post()
|
|
||||||
{
|
{
|
||||||
Environment warther = new Environment();
|
string url = "http://172.16.1.254:48888/Handler/Thinkingfile.ashx?action=update_env";//获取需要传值的接口
|
||||||
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;
|
|
||||||
|
|
||||||
|
|
||||||
|
Environment Environment = new Environment();//需要传值对应类
|
||||||
|
//把需要传的值对象参数对应
|
||||||
|
Environment.Time = "" + tmie + "";
|
||||||
|
Environment.Rain = "" + rainamt + "";
|
||||||
|
Environment.Snow = "" + snowamt + "";
|
||||||
|
Environment.WindSpeed = "" + windamt + "";
|
||||||
|
Environment.WindDir = "" + winddir + "";
|
||||||
|
Environment.Light = "" + Slider.value.ToString("0") + "";
|
||||||
|
string res = JsonMapper.ToJson(Environment);//利用插件LitJson将类对象转为json
|
||||||
|
Debug.LogError(res);
|
||||||
|
Dictionary<string, string> formDic = new Dictionary<string, string>();
|
||||||
|
formDic.Add("Id", "" + Id + "");
|
||||||
|
formDic.Add("data", res);
|
||||||
|
//formDic.Add("file",tex.ToString());
|
||||||
|
StartCoroutine(PostData(url, formDic, getInfo)); //协程调用网络通信
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void getInfo(bool b, string s)
|
||||||
|
{
|
||||||
|
Debug.LogError(b);
|
||||||
|
Debug.LogError(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static IEnumerator PostData(string url, Dictionary<string, string> keyValuePairs, System.Action<bool, string> action)
|
||||||
|
{
|
||||||
|
WWWForm form = new WWWForm();
|
||||||
|
|
||||||
|
foreach (var item in keyValuePairs)
|
||||||
|
{
|
||||||
|
form.AddField(item.Key, item.Value);//把字典的键值对存到from
|
||||||
|
//Debug.LogError(item.Key + " " + item.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
UnityWebRequest request = UnityWebRequest.Post(url, form);
|
||||||
|
yield return request.SendWebRequest();//发送请求
|
||||||
|
if (request.isNetworkError || request.isHttpError)
|
||||||
|
{
|
||||||
|
print("cannot get data:" + request.responseCode);
|
||||||
|
action(false, null);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(request.downloadHandler.text))
|
||||||
|
action(true, request.downloadHandler.text);
|
||||||
|
else
|
||||||
|
action(false, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Rain(string rain)
|
||||||
|
{
|
||||||
|
switch (rain)
|
||||||
|
{
|
||||||
|
case "0":
|
||||||
|
rainamt = "无";
|
||||||
|
break;
|
||||||
|
case "0.25":
|
||||||
|
rainamt = "小雨";
|
||||||
|
break;
|
||||||
|
case "0.5":
|
||||||
|
rainamt = "中雨";
|
||||||
|
break;
|
||||||
|
case "0.75":
|
||||||
|
rainamt = "大雨";
|
||||||
|
break;
|
||||||
|
case "1":
|
||||||
|
rainamt = "暴雨";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private void Snow(string sonw)
|
||||||
|
{
|
||||||
|
switch (sonw)
|
||||||
|
{
|
||||||
|
case "0":
|
||||||
|
snowamt = "无";
|
||||||
|
break;
|
||||||
|
case "0.25":
|
||||||
|
snowamt = "小雪";
|
||||||
|
break;
|
||||||
|
case "0.5":
|
||||||
|
snowamt = "中雪";
|
||||||
|
break;
|
||||||
|
case "0.75":
|
||||||
|
snowamt = "大雪";
|
||||||
|
break;
|
||||||
|
case "1":
|
||||||
|
snowamt = "暴雪";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private void WindAmt(string windamt1)
|
||||||
|
{
|
||||||
|
switch (windamt1)
|
||||||
|
{
|
||||||
|
case "0.2":
|
||||||
|
windamt = "1";
|
||||||
|
break;
|
||||||
|
case "0.3":
|
||||||
|
windamt = "2";
|
||||||
|
break;
|
||||||
|
case "0.4":
|
||||||
|
windamt = "3";
|
||||||
|
break;
|
||||||
|
case "0.5":
|
||||||
|
windamt = "4";
|
||||||
|
break;
|
||||||
|
case "0.6":
|
||||||
|
windamt = "5";
|
||||||
|
break;
|
||||||
|
case "0.7":
|
||||||
|
windamt = "6";
|
||||||
|
break;
|
||||||
|
case "0.8":
|
||||||
|
windamt = "7";
|
||||||
|
break;
|
||||||
|
case "0.9":
|
||||||
|
windamt = "8";
|
||||||
|
break;
|
||||||
|
case "1.0":
|
||||||
|
windamt = "9";
|
||||||
|
break;
|
||||||
|
case "1.1":
|
||||||
|
windamt = "10";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Debug.LogError(windamt);
|
||||||
|
}
|
||||||
|
private void WindDir(float wind)
|
||||||
|
{
|
||||||
|
switch (wind)
|
||||||
|
{
|
||||||
|
case 45:
|
||||||
|
winddir = "东";
|
||||||
|
break;
|
||||||
|
case 90:
|
||||||
|
winddir = "南";
|
||||||
|
break;
|
||||||
|
case 135:
|
||||||
|
winddir = "西";
|
||||||
|
break;
|
||||||
|
case 180:
|
||||||
|
winddir = "北";
|
||||||
|
break;
|
||||||
|
case 225f:
|
||||||
|
winddir = "东南";
|
||||||
|
break;
|
||||||
|
case 270f:
|
||||||
|
winddir = "东北";
|
||||||
|
break;
|
||||||
|
case 315f:
|
||||||
|
winddir = "西南";
|
||||||
|
break;
|
||||||
|
case 360f:
|
||||||
|
winddir = "西北";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
public void Tips()
|
public void Tips()
|
||||||
{
|
{
|
||||||
tips_text.text = null;
|
tips_text.text = null;
|
||||||
|
|
@ -603,22 +836,21 @@ public class Scenariopage : MonoBehaviour
|
||||||
if (scenario == true)
|
if (scenario == true)
|
||||||
{
|
{
|
||||||
ScrollView_unpack.gameObject.SetActive(true);
|
ScrollView_unpack.gameObject.SetActive(true);
|
||||||
//scenario = false;
|
scenario = false;
|
||||||
}
|
}
|
||||||
//else
|
else if(scenario == false)
|
||||||
//{
|
{
|
||||||
// ScrollView_unpack.gameObject.SetActive(false);
|
ScrollView_unpack.gameObject.SetActive(false);
|
||||||
// Scenariofile_panl.gameObject.SetActive(false);
|
scenario = true;
|
||||||
// scenario = true;
|
}
|
||||||
//}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
public string whater;
|
|
||||||
public void SetRainValue(float value)
|
public void SetRainValue(float value)
|
||||||
{
|
{
|
||||||
tenkokuModule.weather_RainAmt = Mathf.Lerp(0.0f, 1.0f, value);
|
tenkokuModule.weather_RainAmt = Mathf.Lerp(0.0f, 1.0f, value);
|
||||||
whater = tenkokuModule.weather_RainAmt.ToString();
|
|
||||||
Debug.Log(whater);
|
|
||||||
}
|
}
|
||||||
public void SetSnowValue(float value)
|
public void SetSnowValue(float value)
|
||||||
{
|
{
|
||||||
|
|
@ -628,42 +860,46 @@ public class Scenariopage : MonoBehaviour
|
||||||
public void SetWindValue()
|
public void SetWindValue()
|
||||||
{
|
{
|
||||||
//tenkokuModule.weather_WindAmt = Mathf.Lerp(0.0f, 1.0f, value);
|
//tenkokuModule.weather_WindAmt = Mathf.Lerp(0.0f, 1.0f, value);
|
||||||
//tenkokuModule.weather_OvercastAmt = windDrop.value * 0.1f;
|
|
||||||
float tempEintAmt = 0;
|
float tempEintAmt = 0;
|
||||||
switch (windDrop.value)
|
switch (windDrop.value)
|
||||||
{
|
{
|
||||||
case 1:
|
case 0:
|
||||||
tempEintAmt = 0.1f;
|
tempEintAmt = 0.1f;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 1:
|
||||||
tempEintAmt = 0.2f;
|
tempEintAmt = 0.2f;
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 2:
|
||||||
tempEintAmt = 0.3f;
|
tempEintAmt = 0.3f;
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 3:
|
||||||
tempEintAmt = 0.4f;
|
tempEintAmt = 0.4f;
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 4:
|
||||||
tempEintAmt = 0.5f;
|
tempEintAmt = 0.5f;
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 5:
|
||||||
tempEintAmt = 0.6f;
|
tempEintAmt = 0.6f;
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 6:
|
||||||
tempEintAmt = 0.7f;
|
tempEintAmt = 0.7f;
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 7:
|
||||||
tempEintAmt = 0.8f;
|
tempEintAmt = 0.8f;
|
||||||
break;
|
break;
|
||||||
case 9:
|
case 8:
|
||||||
tempEintAmt = 0.9f;
|
tempEintAmt = 0.9f;
|
||||||
break;
|
break;
|
||||||
case 10:
|
case 9:
|
||||||
|
|
||||||
tempEintAmt = 1.0f;
|
tempEintAmt = 1.0f;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
tenkokuModule.weather_WindAmt = Mathf.Lerp(0.1f, 1.0f, tempEintAmt);
|
//Debug.LogError(windDrop.value);
|
||||||
|
tenkokuModule.weather_WindAmt = Mathf.Lerp(0.1f, 1.1f, tempEintAmt);
|
||||||
|
Debug.Log(tenkokuModule.weather_WindAmt);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetWindDirection()
|
public void SetWindDirection()
|
||||||
|
|
@ -671,40 +907,36 @@ public class Scenariopage : MonoBehaviour
|
||||||
float tempWindDir = 0;
|
float tempWindDir = 0;
|
||||||
switch (windDir.value)
|
switch (windDir.value)
|
||||||
{
|
{
|
||||||
case 1:
|
case 0:
|
||||||
tempWindDir = 0.125f;
|
tempWindDir = 0.125f;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 1:
|
||||||
tempWindDir = 0.25f;
|
tempWindDir = 0.25f;
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 2:
|
||||||
tempWindDir = 0.375f;
|
tempWindDir = 0.375f;
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 3:
|
||||||
tempWindDir = 0.5f;
|
tempWindDir = 0.5f;
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 4:
|
||||||
tempWindDir = 0.625f;
|
tempWindDir = 0.625f;
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 5:
|
||||||
tempWindDir = 0.75f;
|
tempWindDir = 0.75f;
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 6:
|
||||||
tempWindDir = 0.875f;
|
tempWindDir = 0.875f;
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 7:
|
||||||
tempWindDir = 1f;
|
tempWindDir = 1f;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
tenkokuModule.weather_WindDir = Mathf.Lerp(0.0f, 365.0f, tempWindDir);
|
//Debug.LogError(windDir.value);
|
||||||
|
tenkokuModule.weather_WindDir = Mathf.Lerp(0.0f, 360.0f, tempWindDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
//public void SetLightValue(float value)
|
|
||||||
//{
|
|
||||||
// float valueTemp = 1 - value;
|
|
||||||
// tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0.0f, 1.0f, valueTemp);
|
|
||||||
// Debug.Log(tenkokuModule.weather_OvercastAmt);
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ public class Underneath : MonoBehaviour
|
||||||
subjectName.text = name;
|
subjectName.text = name;
|
||||||
settingBtn.onClick.AddListener(() =>
|
settingBtn.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
Debug.Log("ewewewew");
|
//Debug.Log("ewewewew");
|
||||||
callback?.Invoke();
|
callback?.Invoke();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue