Skip to content

Commit

Permalink
11.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@Craft374
Craft374 committed Nov 20, 2022
1 parent 5de936a commit df88319
Show file tree
Hide file tree
Showing 10 changed files with 447 additions and 73 deletions.
186 changes: 151 additions & 35 deletions Assets/Scenes/Main.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,13 +588,13 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 252076523}
m_Enabled: 0
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.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5019608}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand All @@ -603,18 +603,18 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 76f831161c59c5440a1d0fd40a1808cc, type: 3}
m_FontSize: 90
m_FontStyle: 2
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 9
m_MinSize: 0
m_MaxSize: 90
m_Alignment: 0
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Enter text...
m_Text: 00:00 ~ 12:59
--- !u!222 &252076526
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -694,7 +694,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00 ~ 12:59
m_Text:
--- !u!222 &265307767
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1604,7 +1604,7 @@ GameObject:
- component: {fileID: 744533984}
- component: {fileID: 744533983}
m_Layer: 5
m_Name: Image
m_Name: backimage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -1650,7 +1650,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 5debebe71f2823c49a4318764fa12730, type: 3}
m_Sprite: {fileID: 21300000, guid: dda7c02a80b13374a8d12018175218ec, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1952,13 +1952,13 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 875092138}
m_Enabled: 0
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.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5019608}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand All @@ -1967,18 +1967,18 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 76f831161c59c5440a1d0fd40a1808cc, type: 3}
m_FontSize: 90
m_FontStyle: 2
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 9
m_MinSize: 2
m_MaxSize: 90
m_Alignment: 0
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: AA:AA
m_Text: 00:00 ~ 12:59
--- !u!222 &875092141
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2201,7 +2201,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 516767012}
m_TargetAssemblyTypeName: CalendarController, Assembly-CSharp
m_MethodName: Notetest
m_MethodName: Timefield2
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 927325618}
Expand All @@ -2217,7 +2217,7 @@ MonoBehaviour:
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.6745098}
m_Text: 00:00 ~ 12:59
m_Text:
m_CaretBlinkRate: 0.3
m_CaretWidth: 1
m_ReadOnly: 0
Expand Down Expand Up @@ -2301,7 +2301,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00 ~ 12:59
m_Text:
--- !u!222 &1078339197
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2660,7 +2660,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 516767012}
m_TargetAssemblyTypeName: CalendarController, Assembly-CSharp
m_MethodName: Notetest
m_MethodName: Timefield3
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 1407780126}
Expand All @@ -2676,7 +2676,7 @@ MonoBehaviour:
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.6745098}
m_Text: 00:00 ~ 12:59
m_Text:
m_CaretBlinkRate: 0.3
m_CaretWidth: 1
m_ReadOnly: 0
Expand Down Expand Up @@ -2727,7 +2727,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 800}
m_SizeDelta: {x: 100, y: 100}
m_SizeDelta: {x: 709.8, y: 226.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1410794825
MonoBehaviour:
Expand Down Expand Up @@ -2987,7 +2987,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_Mode: -1
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
Expand Down Expand Up @@ -3033,7 +3033,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 516767012}
m_TargetAssemblyTypeName: CalendarController, Assembly-CSharp
m_MethodName: Notetest
m_MethodName: Timefield1
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 1783397536}
Expand All @@ -3049,7 +3049,7 @@ MonoBehaviour:
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.6745098}
m_Text: 00:00 ~ 12:59
m_Text:
m_CaretBlinkRate: 0.3
m_CaretWidth: 1
m_ReadOnly: 0
Expand Down Expand Up @@ -3107,13 +3107,13 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1903332277}
m_Enabled: 0
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.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5019608}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand All @@ -3122,18 +3122,18 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 76f831161c59c5440a1d0fd40a1808cc, type: 3}
m_FontSize: 90
m_FontStyle: 2
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 9
m_MinSize: 2
m_MaxSize: 90
m_Alignment: 0
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Enter text...
m_Text: 00:00 ~ 12:59
--- !u!222 &1903332280
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3424,10 +3424,126 @@ PrefabInstance:
propertyPath: m_Name
value: CalendarController
objectReference: {fileID: 0}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: bgi
value:
objectReference: {fileID: 744533981}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: BGImage
value:
objectReference: {fileID: 744533983}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: sprites.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: sprites.Array.data[0]
value:
objectReference: {fileID: 21300000, guid: 39ed94ab694a049418871bef165353fd, type: 3}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: sprites.Array.data[1]
value:
objectReference: {fileID: 21300000, guid: dda7c02a80b13374a8d12018175218ec, type: 3}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: sprites.Array.data[2]
value:
objectReference: {fileID: 21300000, guid: 5d159d04b05f27d42871d85ddb905c56, type: 3}
- target: {fileID: 114000011685215380, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: sprites.Array.data[3]
value:
objectReference: {fileID: 21300000, guid: 5debebe71f2823c49a4318764fa12730, type: 3}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_NormalColor.a
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_NormalColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_NormalColor.g
value: 0.92222625
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_NormalColor.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_PressedColor.a
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_DisabledColor.a
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_DisabledColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_DisabledColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_DisabledColor.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_SelectedColor.a
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_SelectedColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_SelectedColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_SelectedColor.r
value: 0.53181934
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_HighlightedColor.a
value: 0.05882353
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_HighlightedColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_HighlightedColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982789314, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Colors.m_HighlightedColor.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982986818, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Color.a
propertyPath: m_Type
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012982986818, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 083acb3802acecd42a088b8887ac8c80, type: 3}
- target: {fileID: 114000012982986818, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Color.a
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114000012982986818, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114000012982986818, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114000012982986818, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224000012321101736, guid: 2855101cfa69cda4b974c42668d8a825, type: 3}
propertyPath: m_Pivot.x
value: 0.5
Expand Down Expand Up @@ -3821,7 +3937,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00 ~ 12:59
m_Text:
--- !u!222 &2122509754
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
Binary file added Assets/img/fall.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit df88319

Please sign in to comment.