Skip to content

Commit

Permalink
Last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
insearcher committed Jun 16, 2019
1 parent 270341d commit 6d7a5d0
Show file tree
Hide file tree
Showing 34 changed files with 188 additions and 57 deletions.
82 changes: 38 additions & 44 deletions .idea/.idea.mcs-hack/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

144 changes: 138 additions & 6 deletions Assets/Frolov/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Display: {fileID: 0}
targetCamera: {fileID: 10}
screenShotURL: http://172.20.10.2:5000/abs
screenShotURL: http://192.168.43.38:5000/abs
ageIcon: {fileID: 1215566717}
bottomButtons: {fileID: 936505683}
mainPage: {fileID: 564575520}
Expand Down Expand Up @@ -3667,7 +3667,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -6107,7 +6107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -6822,7 +6822,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -9757,6 +9757,137 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1346492569
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1346492570}
- component: {fileID: 1346492573}
- component: {fileID: 1346492572}
- component: {fileID: 1346492571}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1346492570
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346492569}
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: 1572935428}
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}
m_AnchoredPosition: {x: 8.1, y: -703.5}
m_SizeDelta: {x: 674.7, y: 304.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1346492571
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346492569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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: 0}
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: 1346492572}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 12}
m_MethodName: OK
m_Mode: 1
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_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1346492572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346492569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!222 &1346492573
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346492569}
m_CullTransparentMesh: 0
--- !u!1 &1379133311
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -11273,6 +11404,7 @@ RectTransform:
- {fileID: 918001072}
- {fileID: 845432769}
- {fileID: 1897287690}
- {fileID: 1346492570}
m_Father: {fileID: 1139610221}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -14127,7 +14259,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1897030275
RectTransform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -15887,7 +16019,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
Expand Down
13 changes: 9 additions & 4 deletions Assets/SALEY/SALEY/Scripts/ImageSender/ImageGetter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,21 @@ IEnumerator UploadPNG(byte[] image)
{
if (a >= 18)
{
ageIcon.SetActive(true);
bottomButtons.SetActive(true);
mainPage.SetActive(true);
logPage.SetActive(false);
OK();
}
}
}
}
}

public void OK()
{
ageIcon.SetActive(true);
bottomButtons.SetActive(true);
mainPage.SetActive(true);
logPage.SetActive(false);
}

public void SetGrabTrue()
{
if (!grab)
Expand Down
Binary file modified Library/LastBuild.buildreport
Binary file not shown.
Binary file modified Library/PlayerDataCache/iOS/Data/Managed/Assembly-CSharp.dll
Binary file not shown.
Binary file not shown.
Binary file modified Library/PlayerDataCache/iOS/Data/Managed/Unity.TextMeshPro.dll
Binary file not shown.
Binary file modified Library/PlayerDataCache/iOS/Data/Managed/Unity.Timeline.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 6d7a5d0

Please sign in to comment.