Commit 17fc9d06c81264539520163e285159ff04b1eeb1
1 parent
6b3c85b7
Exists in
master
and in
3 other branches
Added Share Progress Download Button
Showing
18 changed files
with
919 additions
and
55 deletions
Show diff stats
9.83 KB
@@ -0,0 +1,59 @@ | @@ -0,0 +1,59 @@ | ||
1 | +fileFormatVersion: 2 | ||
2 | +guid: 43464d7b3ab604b488e4dd27d0092647 | ||
3 | +timeCreated: 1485613022 | ||
4 | +licenseType: Free | ||
5 | +TextureImporter: | ||
6 | + fileIDToRecycleName: {} | ||
7 | + serializedVersion: 2 | ||
8 | + mipmaps: | ||
9 | + mipMapMode: 0 | ||
10 | + enableMipMap: 1 | ||
11 | + linearTexture: 0 | ||
12 | + correctGamma: 0 | ||
13 | + fadeOut: 0 | ||
14 | + borderMipMap: 0 | ||
15 | + mipMapFadeDistanceStart: 1 | ||
16 | + mipMapFadeDistanceEnd: 3 | ||
17 | + bumpmap: | ||
18 | + convertToNormalMap: 0 | ||
19 | + externalNormalMap: 0 | ||
20 | + heightScale: 0.25 | ||
21 | + normalMapFilter: 0 | ||
22 | + isReadable: 0 | ||
23 | + grayScaleToAlpha: 0 | ||
24 | + generateCubemap: 0 | ||
25 | + cubemapConvolution: 0 | ||
26 | + cubemapConvolutionSteps: 7 | ||
27 | + cubemapConvolutionExponent: 1.5 | ||
28 | + seamlessCubemap: 0 | ||
29 | + textureFormat: -1 | ||
30 | + maxTextureSize: 2048 | ||
31 | + textureSettings: | ||
32 | + filterMode: -1 | ||
33 | + aniso: -1 | ||
34 | + mipBias: -1 | ||
35 | + wrapMode: 1 | ||
36 | + nPOTScale: 0 | ||
37 | + lightmap: 0 | ||
38 | + rGBM: 0 | ||
39 | + compressionQuality: 50 | ||
40 | + allowsAlphaSplitting: 0 | ||
41 | + spriteMode: 1 | ||
42 | + spriteExtrude: 1 | ||
43 | + spriteMeshType: 1 | ||
44 | + alignment: 0 | ||
45 | + spritePivot: {x: 0.5, y: 0.5} | ||
46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
47 | + spritePixelsToUnits: 100 | ||
48 | + alphaIsTransparency: 1 | ||
49 | + spriteTessellationDetail: -1 | ||
50 | + textureType: 8 | ||
51 | + buildTargetSettings: [] | ||
52 | + spriteSheet: | ||
53 | + serializedVersion: 2 | ||
54 | + sprites: [] | ||
55 | + outline: [] | ||
56 | + spritePackingTag: | ||
57 | + userData: | ||
58 | + assetBundleName: | ||
59 | + assetBundleVariant: |
2.77 KB
@@ -0,0 +1,59 @@ | @@ -0,0 +1,59 @@ | ||
1 | +fileFormatVersion: 2 | ||
2 | +guid: 6495de8ff9a26c94e9d42fada0a56630 | ||
3 | +timeCreated: 1485613022 | ||
4 | +licenseType: Free | ||
5 | +TextureImporter: | ||
6 | + fileIDToRecycleName: {} | ||
7 | + serializedVersion: 2 | ||
8 | + mipmaps: | ||
9 | + mipMapMode: 0 | ||
10 | + enableMipMap: 1 | ||
11 | + linearTexture: 0 | ||
12 | + correctGamma: 0 | ||
13 | + fadeOut: 0 | ||
14 | + borderMipMap: 0 | ||
15 | + mipMapFadeDistanceStart: 1 | ||
16 | + mipMapFadeDistanceEnd: 3 | ||
17 | + bumpmap: | ||
18 | + convertToNormalMap: 0 | ||
19 | + externalNormalMap: 0 | ||
20 | + heightScale: 0.25 | ||
21 | + normalMapFilter: 0 | ||
22 | + isReadable: 0 | ||
23 | + grayScaleToAlpha: 0 | ||
24 | + generateCubemap: 0 | ||
25 | + cubemapConvolution: 0 | ||
26 | + cubemapConvolutionSteps: 7 | ||
27 | + cubemapConvolutionExponent: 1.5 | ||
28 | + seamlessCubemap: 0 | ||
29 | + textureFormat: -1 | ||
30 | + maxTextureSize: 2048 | ||
31 | + textureSettings: | ||
32 | + filterMode: -1 | ||
33 | + aniso: -1 | ||
34 | + mipBias: -1 | ||
35 | + wrapMode: 1 | ||
36 | + nPOTScale: 0 | ||
37 | + lightmap: 0 | ||
38 | + rGBM: 0 | ||
39 | + compressionQuality: 50 | ||
40 | + allowsAlphaSplitting: 0 | ||
41 | + spriteMode: 1 | ||
42 | + spriteExtrude: 1 | ||
43 | + spriteMeshType: 1 | ||
44 | + alignment: 0 | ||
45 | + spritePivot: {x: 0.5, y: 0.5} | ||
46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
47 | + spritePixelsToUnits: 100 | ||
48 | + alphaIsTransparency: 1 | ||
49 | + spriteTessellationDetail: -1 | ||
50 | + textureType: 8 | ||
51 | + buildTargetSettings: [] | ||
52 | + spriteSheet: | ||
53 | + serializedVersion: 2 | ||
54 | + sprites: [] | ||
55 | + outline: [] | ||
56 | + spritePackingTag: | ||
57 | + userData: | ||
58 | + assetBundleName: | ||
59 | + assetBundleVariant: |
9.27 KB
@@ -0,0 +1,59 @@ | @@ -0,0 +1,59 @@ | ||
1 | +fileFormatVersion: 2 | ||
2 | +guid: 175191f4d9e7cf646a595cd131ed8db5 | ||
3 | +timeCreated: 1485613021 | ||
4 | +licenseType: Free | ||
5 | +TextureImporter: | ||
6 | + fileIDToRecycleName: {} | ||
7 | + serializedVersion: 2 | ||
8 | + mipmaps: | ||
9 | + mipMapMode: 0 | ||
10 | + enableMipMap: 1 | ||
11 | + linearTexture: 0 | ||
12 | + correctGamma: 0 | ||
13 | + fadeOut: 0 | ||
14 | + borderMipMap: 0 | ||
15 | + mipMapFadeDistanceStart: 1 | ||
16 | + mipMapFadeDistanceEnd: 3 | ||
17 | + bumpmap: | ||
18 | + convertToNormalMap: 0 | ||
19 | + externalNormalMap: 0 | ||
20 | + heightScale: 0.25 | ||
21 | + normalMapFilter: 0 | ||
22 | + isReadable: 0 | ||
23 | + grayScaleToAlpha: 0 | ||
24 | + generateCubemap: 0 | ||
25 | + cubemapConvolution: 0 | ||
26 | + cubemapConvolutionSteps: 7 | ||
27 | + cubemapConvolutionExponent: 1.5 | ||
28 | + seamlessCubemap: 0 | ||
29 | + textureFormat: -1 | ||
30 | + maxTextureSize: 2048 | ||
31 | + textureSettings: | ||
32 | + filterMode: -1 | ||
33 | + aniso: -1 | ||
34 | + mipBias: -1 | ||
35 | + wrapMode: 1 | ||
36 | + nPOTScale: 0 | ||
37 | + lightmap: 0 | ||
38 | + rGBM: 0 | ||
39 | + compressionQuality: 50 | ||
40 | + allowsAlphaSplitting: 0 | ||
41 | + spriteMode: 1 | ||
42 | + spriteExtrude: 1 | ||
43 | + spriteMeshType: 1 | ||
44 | + alignment: 0 | ||
45 | + spritePivot: {x: 0.5, y: 0.5} | ||
46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
47 | + spritePixelsToUnits: 100 | ||
48 | + alphaIsTransparency: 1 | ||
49 | + spriteTessellationDetail: -1 | ||
50 | + textureType: 8 | ||
51 | + buildTargetSettings: [] | ||
52 | + spriteSheet: | ||
53 | + serializedVersion: 2 | ||
54 | + sprites: [] | ||
55 | + outline: [] | ||
56 | + spritePackingTag: | ||
57 | + userData: | ||
58 | + assetBundleName: | ||
59 | + assetBundleVariant: |
16.9 KB
@@ -0,0 +1,59 @@ | @@ -0,0 +1,59 @@ | ||
1 | +fileFormatVersion: 2 | ||
2 | +guid: 7d12ab31f4b8296418d8878fb52ca300 | ||
3 | +timeCreated: 1485613022 | ||
4 | +licenseType: Free | ||
5 | +TextureImporter: | ||
6 | + fileIDToRecycleName: {} | ||
7 | + serializedVersion: 2 | ||
8 | + mipmaps: | ||
9 | + mipMapMode: 0 | ||
10 | + enableMipMap: 1 | ||
11 | + linearTexture: 0 | ||
12 | + correctGamma: 0 | ||
13 | + fadeOut: 0 | ||
14 | + borderMipMap: 0 | ||
15 | + mipMapFadeDistanceStart: 1 | ||
16 | + mipMapFadeDistanceEnd: 3 | ||
17 | + bumpmap: | ||
18 | + convertToNormalMap: 0 | ||
19 | + externalNormalMap: 0 | ||
20 | + heightScale: 0.25 | ||
21 | + normalMapFilter: 0 | ||
22 | + isReadable: 0 | ||
23 | + grayScaleToAlpha: 0 | ||
24 | + generateCubemap: 0 | ||
25 | + cubemapConvolution: 0 | ||
26 | + cubemapConvolutionSteps: 7 | ||
27 | + cubemapConvolutionExponent: 1.5 | ||
28 | + seamlessCubemap: 0 | ||
29 | + textureFormat: -1 | ||
30 | + maxTextureSize: 2048 | ||
31 | + textureSettings: | ||
32 | + filterMode: -1 | ||
33 | + aniso: -1 | ||
34 | + mipBias: -1 | ||
35 | + wrapMode: 1 | ||
36 | + nPOTScale: 0 | ||
37 | + lightmap: 0 | ||
38 | + rGBM: 0 | ||
39 | + compressionQuality: 50 | ||
40 | + allowsAlphaSplitting: 0 | ||
41 | + spriteMode: 1 | ||
42 | + spriteExtrude: 1 | ||
43 | + spriteMeshType: 1 | ||
44 | + alignment: 0 | ||
45 | + spritePivot: {x: 0.5, y: 0.5} | ||
46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
47 | + spritePixelsToUnits: 100 | ||
48 | + alphaIsTransparency: 1 | ||
49 | + spriteTessellationDetail: -1 | ||
50 | + textureType: 8 | ||
51 | + buildTargetSettings: [] | ||
52 | + spriteSheet: | ||
53 | + serializedVersion: 2 | ||
54 | + sprites: [] | ||
55 | + outline: [] | ||
56 | + spritePackingTag: | ||
57 | + userData: | ||
58 | + assetBundleName: | ||
59 | + assetBundleVariant: |
11.3 KB
@@ -0,0 +1,59 @@ | @@ -0,0 +1,59 @@ | ||
1 | +fileFormatVersion: 2 | ||
2 | +guid: 1bddd19230af9fa498166ff735ac072e | ||
3 | +timeCreated: 1485613021 | ||
4 | +licenseType: Free | ||
5 | +TextureImporter: | ||
6 | + fileIDToRecycleName: {} | ||
7 | + serializedVersion: 2 | ||
8 | + mipmaps: | ||
9 | + mipMapMode: 0 | ||
10 | + enableMipMap: 1 | ||
11 | + linearTexture: 0 | ||
12 | + correctGamma: 0 | ||
13 | + fadeOut: 0 | ||
14 | + borderMipMap: 0 | ||
15 | + mipMapFadeDistanceStart: 1 | ||
16 | + mipMapFadeDistanceEnd: 3 | ||
17 | + bumpmap: | ||
18 | + convertToNormalMap: 0 | ||
19 | + externalNormalMap: 0 | ||
20 | + heightScale: 0.25 | ||
21 | + normalMapFilter: 0 | ||
22 | + isReadable: 0 | ||
23 | + grayScaleToAlpha: 0 | ||
24 | + generateCubemap: 0 | ||
25 | + cubemapConvolution: 0 | ||
26 | + cubemapConvolutionSteps: 7 | ||
27 | + cubemapConvolutionExponent: 1.5 | ||
28 | + seamlessCubemap: 0 | ||
29 | + textureFormat: -1 | ||
30 | + maxTextureSize: 2048 | ||
31 | + textureSettings: | ||
32 | + filterMode: -1 | ||
33 | + aniso: -1 | ||
34 | + mipBias: -1 | ||
35 | + wrapMode: 1 | ||
36 | + nPOTScale: 0 | ||
37 | + lightmap: 0 | ||
38 | + rGBM: 0 | ||
39 | + compressionQuality: 50 | ||
40 | + allowsAlphaSplitting: 0 | ||
41 | + spriteMode: 1 | ||
42 | + spriteExtrude: 1 | ||
43 | + spriteMeshType: 1 | ||
44 | + alignment: 0 | ||
45 | + spritePivot: {x: 0.5, y: 0.5} | ||
46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
47 | + spritePixelsToUnits: 100 | ||
48 | + alphaIsTransparency: 1 | ||
49 | + spriteTessellationDetail: -1 | ||
50 | + textureType: 8 | ||
51 | + buildTargetSettings: [] | ||
52 | + spriteSheet: | ||
53 | + serializedVersion: 2 | ||
54 | + sprites: [] | ||
55 | + outline: [] | ||
56 | + spritePackingTag: | ||
57 | + userData: | ||
58 | + assetBundleName: | ||
59 | + assetBundleVariant: |
Assets/Scenes/Main.unity
@@ -652,6 +652,77 @@ CanvasRenderer: | @@ -652,6 +652,77 @@ CanvasRenderer: | ||
652 | type: 2} | 652 | type: 2} |
653 | m_PrefabInternal: {fileID: 0} | 653 | m_PrefabInternal: {fileID: 0} |
654 | m_GameObject: {fileID: 152065638} | 654 | m_GameObject: {fileID: 152065638} |
655 | +--- !u!1 &160532051 | ||
656 | +GameObject: | ||
657 | + m_ObjectHideFlags: 0 | ||
658 | + m_PrefabParentObject: {fileID: 133590, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
659 | + m_PrefabInternal: {fileID: 0} | ||
660 | + serializedVersion: 4 | ||
661 | + m_Component: | ||
662 | + - 224: {fileID: 160532052} | ||
663 | + - 222: {fileID: 160532055} | ||
664 | + - 114: {fileID: 160532054} | ||
665 | + m_Layer: 5 | ||
666 | + m_Name: b_download | ||
667 | + m_TagString: progress | ||
668 | + m_Icon: {fileID: 0} | ||
669 | + m_NavMeshLayer: 0 | ||
670 | + m_StaticEditorFlags: 0 | ||
671 | + m_IsActive: 1 | ||
672 | +--- !u!224 &160532052 | ||
673 | +RectTransform: | ||
674 | + m_ObjectHideFlags: 0 | ||
675 | + m_PrefabParentObject: {fileID: 22474260, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
676 | + type: 2} | ||
677 | + m_PrefabInternal: {fileID: 0} | ||
678 | + m_GameObject: {fileID: 160532051} | ||
679 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
680 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
681 | + m_LocalScale: {x: 1, y: 1, z: 0} | ||
682 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
683 | + m_Children: [] | ||
684 | + m_Father: {fileID: 726443271} | ||
685 | + m_RootOrder: 2 | ||
686 | + m_AnchorMin: {x: 0.2, y: 0.22} | ||
687 | + m_AnchorMax: {x: 0.8, y: 0.8} | ||
688 | + m_AnchoredPosition: {x: 0, y: 0} | ||
689 | + m_SizeDelta: {x: 20, y: 20} | ||
690 | + m_Pivot: {x: 0.5, y: 0.5} | ||
691 | +--- !u!114 &160532054 | ||
692 | +MonoBehaviour: | ||
693 | + m_ObjectHideFlags: 0 | ||
694 | + m_PrefabParentObject: {fileID: 11451830, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
695 | + type: 2} | ||
696 | + m_PrefabInternal: {fileID: 0} | ||
697 | + m_GameObject: {fileID: 160532051} | ||
698 | + m_Enabled: 1 | ||
699 | + m_EditorHideFlags: 0 | ||
700 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
701 | + m_Name: | ||
702 | + m_EditorClassIdentifier: | ||
703 | + m_Material: {fileID: 0} | ||
704 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
705 | + m_RaycastTarget: 1 | ||
706 | + m_OnCullStateChanged: | ||
707 | + m_PersistentCalls: | ||
708 | + m_Calls: [] | ||
709 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
710 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
711 | + m_Sprite: {fileID: 21300000, guid: 175191f4d9e7cf646a595cd131ed8db5, type: 3} | ||
712 | + m_Type: 0 | ||
713 | + m_PreserveAspect: 1 | ||
714 | + m_FillCenter: 1 | ||
715 | + m_FillMethod: 4 | ||
716 | + m_FillAmount: 1 | ||
717 | + m_FillClockwise: 1 | ||
718 | + m_FillOrigin: 0 | ||
719 | +--- !u!222 &160532055 | ||
720 | +CanvasRenderer: | ||
721 | + m_ObjectHideFlags: 0 | ||
722 | + m_PrefabParentObject: {fileID: 22202710, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
723 | + type: 2} | ||
724 | + m_PrefabInternal: {fileID: 0} | ||
725 | + m_GameObject: {fileID: 160532051} | ||
655 | --- !u!1 &163763089 | 726 | --- !u!1 &163763089 |
656 | GameObject: | 727 | GameObject: |
657 | m_ObjectHideFlags: 0 | 728 | m_ObjectHideFlags: 0 |
@@ -1038,6 +1109,47 @@ RectTransform: | @@ -1038,6 +1109,47 @@ RectTransform: | ||
1038 | m_AnchoredPosition: {x: 0, y: 0} | 1109 | m_AnchoredPosition: {x: 0, y: 0} |
1039 | m_SizeDelta: {x: 0, y: 0} | 1110 | m_SizeDelta: {x: 0, y: 0} |
1040 | m_Pivot: {x: 0.5, y: 0.5} | 1111 | m_Pivot: {x: 0.5, y: 0.5} |
1112 | +--- !u!1 &210788815 | ||
1113 | +GameObject: | ||
1114 | + m_ObjectHideFlags: 0 | ||
1115 | + m_PrefabParentObject: {fileID: 0} | ||
1116 | + m_PrefabInternal: {fileID: 0} | ||
1117 | + serializedVersion: 4 | ||
1118 | + m_Component: | ||
1119 | + - 4: {fileID: 210788817} | ||
1120 | + - 114: {fileID: 210788816} | ||
1121 | + m_Layer: 0 | ||
1122 | + m_Name: ExportVideo | ||
1123 | + m_TagString: Untagged | ||
1124 | + m_Icon: {fileID: 0} | ||
1125 | + m_NavMeshLayer: 0 | ||
1126 | + m_StaticEditorFlags: 0 | ||
1127 | + m_IsActive: 1 | ||
1128 | +--- !u!114 &210788816 | ||
1129 | +MonoBehaviour: | ||
1130 | + m_ObjectHideFlags: 0 | ||
1131 | + m_PrefabParentObject: {fileID: 0} | ||
1132 | + m_PrefabInternal: {fileID: 0} | ||
1133 | + m_GameObject: {fileID: 210788815} | ||
1134 | + m_Enabled: 1 | ||
1135 | + m_EditorHideFlags: 0 | ||
1136 | + m_Script: {fileID: 11500000, guid: dfd8bc2e1d5564642b758cc106a78de2, type: 3} | ||
1137 | + m_Name: | ||
1138 | + m_EditorClassIdentifier: | ||
1139 | + screenManager: {fileID: 2131993094} | ||
1140 | +--- !u!4 &210788817 | ||
1141 | +Transform: | ||
1142 | + m_ObjectHideFlags: 0 | ||
1143 | + m_PrefabParentObject: {fileID: 0} | ||
1144 | + m_PrefabInternal: {fileID: 0} | ||
1145 | + m_GameObject: {fileID: 210788815} | ||
1146 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
1147 | + m_LocalPosition: {x: 283.18668, y: 134.66496, z: 0} | ||
1148 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
1149 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
1150 | + m_Children: [] | ||
1151 | + m_Father: {fileID: 0} | ||
1152 | + m_RootOrder: 6 | ||
1041 | --- !u!1 &212041959 | 1153 | --- !u!1 &212041959 |
1042 | GameObject: | 1154 | GameObject: |
1043 | m_ObjectHideFlags: 0 | 1155 | m_ObjectHideFlags: 0 |
@@ -1531,6 +1643,89 @@ CanvasRenderer: | @@ -1531,6 +1643,89 @@ CanvasRenderer: | ||
1531 | type: 2} | 1643 | type: 2} |
1532 | m_PrefabInternal: {fileID: 0} | 1644 | m_PrefabInternal: {fileID: 0} |
1533 | m_GameObject: {fileID: 268582950} | 1645 | m_GameObject: {fileID: 268582950} |
1646 | +--- !u!1 &291722901 | ||
1647 | +GameObject: | ||
1648 | + m_ObjectHideFlags: 0 | ||
1649 | + m_PrefabParentObject: {fileID: 133590, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
1650 | + m_PrefabInternal: {fileID: 0} | ||
1651 | + serializedVersion: 4 | ||
1652 | + m_Component: | ||
1653 | + - 224: {fileID: 291722902} | ||
1654 | + - 222: {fileID: 291722905} | ||
1655 | + - 114: {fileID: 291722904} | ||
1656 | + - 114: {fileID: 291722903} | ||
1657 | + m_Layer: 5 | ||
1658 | + m_Name: progress_bar | ||
1659 | + m_TagString: progress | ||
1660 | + m_Icon: {fileID: 0} | ||
1661 | + m_NavMeshLayer: 0 | ||
1662 | + m_StaticEditorFlags: 0 | ||
1663 | + m_IsActive: 0 | ||
1664 | +--- !u!224 &291722902 | ||
1665 | +RectTransform: | ||
1666 | + m_ObjectHideFlags: 0 | ||
1667 | + m_PrefabParentObject: {fileID: 22474260, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
1668 | + type: 2} | ||
1669 | + m_PrefabInternal: {fileID: 0} | ||
1670 | + m_GameObject: {fileID: 291722901} | ||
1671 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
1672 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
1673 | + m_LocalScale: {x: 1, y: 1, z: 0} | ||
1674 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
1675 | + m_Children: [] | ||
1676 | + m_Father: {fileID: 726443271} | ||
1677 | + m_RootOrder: 1 | ||
1678 | + m_AnchorMin: {x: 0.2, y: 0.22} | ||
1679 | + m_AnchorMax: {x: 0.8, y: 0.8} | ||
1680 | + m_AnchoredPosition: {x: 0, y: 0.000015258789} | ||
1681 | + m_SizeDelta: {x: 20, y: 20} | ||
1682 | + m_Pivot: {x: 0.5, y: 0.5} | ||
1683 | +--- !u!114 &291722903 | ||
1684 | +MonoBehaviour: | ||
1685 | + m_ObjectHideFlags: 0 | ||
1686 | + m_PrefabParentObject: {fileID: 0} | ||
1687 | + m_PrefabInternal: {fileID: 0} | ||
1688 | + m_GameObject: {fileID: 291722901} | ||
1689 | + m_Enabled: 1 | ||
1690 | + m_EditorHideFlags: 0 | ||
1691 | + m_Script: {fileID: 11500000, guid: f30ae3e7382215343aa581d1acb2c6a6, type: 3} | ||
1692 | + m_Name: | ||
1693 | + m_EditorClassIdentifier: | ||
1694 | +--- !u!114 &291722904 | ||
1695 | +MonoBehaviour: | ||
1696 | + m_ObjectHideFlags: 0 | ||
1697 | + m_PrefabParentObject: {fileID: 11451830, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
1698 | + type: 2} | ||
1699 | + m_PrefabInternal: {fileID: 0} | ||
1700 | + m_GameObject: {fileID: 291722901} | ||
1701 | + m_Enabled: 1 | ||
1702 | + m_EditorHideFlags: 0 | ||
1703 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
1704 | + m_Name: | ||
1705 | + m_EditorClassIdentifier: | ||
1706 | + m_Material: {fileID: 0} | ||
1707 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
1708 | + m_RaycastTarget: 1 | ||
1709 | + m_OnCullStateChanged: | ||
1710 | + m_PersistentCalls: | ||
1711 | + m_Calls: [] | ||
1712 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
1713 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
1714 | + m_Sprite: {fileID: 21300000, guid: 1bddd19230af9fa498166ff735ac072e, type: 3} | ||
1715 | + m_Type: 0 | ||
1716 | + m_PreserveAspect: 1 | ||
1717 | + m_FillCenter: 1 | ||
1718 | + m_FillMethod: 4 | ||
1719 | + m_FillAmount: 1 | ||
1720 | + m_FillClockwise: 1 | ||
1721 | + m_FillOrigin: 0 | ||
1722 | +--- !u!222 &291722905 | ||
1723 | +CanvasRenderer: | ||
1724 | + m_ObjectHideFlags: 0 | ||
1725 | + m_PrefabParentObject: {fileID: 22202710, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
1726 | + type: 2} | ||
1727 | + m_PrefabInternal: {fileID: 0} | ||
1728 | + m_GameObject: {fileID: 291722901} | ||
1534 | --- !u!1 &327739037 | 1729 | --- !u!1 &327739037 |
1535 | GameObject: | 1730 | GameObject: |
1536 | m_ObjectHideFlags: 0 | 1731 | m_ObjectHideFlags: 0 |
@@ -3141,53 +3336,53 @@ Animation: | @@ -3141,53 +3336,53 @@ Animation: | ||
3141 | m_GameObject: {fileID: 535548070} | 3336 | m_GameObject: {fileID: 535548070} |
3142 | m_Enabled: 1 | 3337 | m_Enabled: 1 |
3143 | serializedVersion: 3 | 3338 | serializedVersion: 3 |
3144 | - m_Animation: {fileID: 7400000, guid: 2411a6d385ad1a44ba0d38dba4ab34bd, type: 2} | 3339 | + m_Animation: {fileID: 7400000, guid: 38f686af87a268346bd6aa3d932bbbeb, type: 2} |
3145 | m_Animations: | 3340 | m_Animations: |
3146 | - - {fileID: 7400000, guid: ddcd1981236a36348bc816e65c1678d1, type: 2} | ||
3147 | - - {fileID: 7400000, guid: 9413ea9122513604a8929a9f4bf4be51, type: 2} | ||
3148 | - - {fileID: 7400000, guid: 7acdc7f1247d991449a7e890f8fc12dc, type: 2} | ||
3149 | - - {fileID: 7400000, guid: 3252d8c2bc4ff864ea67956fa3d3c538, type: 2} | ||
3150 | - - {fileID: 7400000, guid: 127a6503b4e31514ca9ded619d556c49, type: 2} | ||
3151 | - - {fileID: 7400000, guid: 1d7a65536341b5a4599722d7bbee7f6d, type: 2} | ||
3152 | - - {fileID: 7400000, guid: bf54eb6377302a94ca7e997abc0c0c1d, type: 2} | ||
3153 | - - {fileID: 7400000, guid: be2b9b938eaa20b4f806abcc6bbf332c, type: 2} | ||
3154 | - - {fileID: 7400000, guid: 9d7e3bc3c304f164f90c818effd135b9, type: 2} | ||
3155 | - - {fileID: 7400000, guid: 2411a6d385ad1a44ba0d38dba4ab34bd, type: 2} | ||
3156 | - - {fileID: 7400000, guid: f0cdda14b320f8647a5d7026489a5af9, type: 2} | ||
3157 | - - {fileID: 7400000, guid: 938686440df5af3498c5277529569881, type: 2} | ||
3158 | - - {fileID: 7400000, guid: ee03768448a708c47a178c0bcb215cef, type: 2} | ||
3159 | - - {fileID: 7400000, guid: 78839d8488af17f4e96e95e300ec2d5a, type: 2} | ||
3160 | - - {fileID: 7400000, guid: 9e2fcce41ab69504f9eee1c995e326ca, type: 2} | ||
3161 | - - {fileID: 7400000, guid: 89b83c453e89f134fac24d95502d7531, type: 2} | ||
3162 | - - {fileID: 7400000, guid: ee7a9c65d2f1d3b438b45d8ae61aa315, type: 2} | ||
3163 | - - {fileID: 7400000, guid: 49b5c595463d2e14eab17ff7ed55d965, type: 2} | ||
3164 | - - {fileID: 7400000, guid: db3b82a565a75ce4fbfeb0bff6b80b94, type: 2} | ||
3165 | - - {fileID: 7400000, guid: badb22c558504be438a5e3dd2ec10007, type: 2} | ||
3166 | - - {fileID: 7400000, guid: 4e33b946abeff8149bcfc858d767b4f3, type: 2} | ||
3167 | - - {fileID: 7400000, guid: bed17a769da3e914487da705d3b4de62, type: 2} | ||
3168 | - - {fileID: 7400000, guid: 7e47ede61f002114ca81bb190b13589a, type: 2} | ||
3169 | - - {fileID: 7400000, guid: 75cdd337245767c43ba4d80a5c96f0c3, type: 2} | ||
3170 | - - {fileID: 7400000, guid: 7f136b37cf15b3e4380962411093afc5, type: 2} | ||
3171 | - - {fileID: 7400000, guid: 6a6b1d67a96a0b745826f846495b3541, type: 2} | ||
3172 | - - {fileID: 7400000, guid: f41beee74758eca43afbb59bff694ff3, type: 2} | ||
3173 | - - {fileID: 7400000, guid: 5e0b56d8c46b01d4e8d05b0211da1305, type: 2} | ||
3174 | - - {fileID: 7400000, guid: f41fcec969a1975448bda94cfe8d148c, type: 2} | ||
3175 | - - {fileID: 7400000, guid: 881763d96061c9546bb76267ba20ca6f, type: 2} | ||
3176 | - - {fileID: 7400000, guid: 63d597e9f28fc45459154d947f7aaa75, type: 2} | ||
3177 | - - {fileID: 7400000, guid: ca77612a5245f4942823d031a3641519, type: 2} | ||
3178 | - - {fileID: 7400000, guid: 61fb392a4df3e1f4d950c70a6cf96227, type: 2} | ||
3179 | - - {fileID: 7400000, guid: fd82c04a57f486644a04f2a21bd5dcad, type: 2} | ||
3180 | - - {fileID: 7400000, guid: 1e8b309a50e4642409535d3c2a9336e7, type: 2} | ||
3181 | - - {fileID: 7400000, guid: b6989e7b354355845b8650deb15532ce, type: 2} | ||
3182 | - - {fileID: 7400000, guid: 0174ce0ce69e08042b62873daf99cb4a, type: 2} | ||
3183 | - - {fileID: 7400000, guid: 08be2dcc379b4e145b7b4db2a309328b, type: 2} | ||
3184 | - - {fileID: 7400000, guid: 1a6bfdec4c803b84994a113b977e7690, type: 2} | ||
3185 | - - {fileID: 7400000, guid: 41a7d8ddd33942744b471a7eccda1c2c, type: 2} | ||
3186 | - - {fileID: 7400000, guid: 34b27c0e99de504438b4d4328277a868, type: 2} | ||
3187 | - - {fileID: 7400000, guid: 99072f5e973a0114996f87370003faee, type: 2} | ||
3188 | - - {fileID: 7400000, guid: 393d3f6e67dc15f4992c77e23ca560b5, type: 2} | ||
3189 | - - {fileID: 7400000, guid: 89c9a9aedc3fc41429d1fd41861e95c9, type: 2} | ||
3190 | - - {fileID: 7400000, guid: 05d107bfff390d6429b1bbeef74ca8be, type: 2} | 3341 | + - {fileID: 7400000, guid: e3e04f008bbcfe640928721fbeaa99c9, type: 2} |
3342 | + - {fileID: 7400000, guid: 399366c12848c9d418b69044d4ab6136, type: 2} | ||
3343 | + - {fileID: 7400000, guid: 91a30ff12e1e9494aa21c956b944bc35, type: 2} | ||
3344 | + - {fileID: 7400000, guid: 29be4472ba935a3459af76853a3c353e, type: 2} | ||
3345 | + - {fileID: 7400000, guid: 4753f5d2ff057e648bc6faacb993143c, type: 2} | ||
3346 | + - {fileID: 7400000, guid: b07f3cd25a04b934f9a4a01528e2bd2e, type: 2} | ||
3347 | + - {fileID: 7400000, guid: 988e3c4326ce1a5458e8b2950903215d, type: 2} | ||
3348 | + - {fileID: 7400000, guid: 2ca58d24bad374849872a790e28c5329, type: 2} | ||
3349 | + - {fileID: 7400000, guid: 151fc83483705e444a747b6c250f9571, type: 2} | ||
3350 | + - {fileID: 7400000, guid: 379a557483b742e448b26a0e3d2bc9c0, type: 2} | ||
3351 | + - {fileID: 7400000, guid: e07d1ba46c83993468fdd18405aa72ec, type: 2} | ||
3352 | + - {fileID: 7400000, guid: d55110d47b5a4df46979b2c98f5f3201, type: 2} | ||
3353 | + - {fileID: 7400000, guid: e9a021f4441f2be4fb5143c11e9b3688, type: 2} | ||
3354 | + - {fileID: 7400000, guid: 42b184f4562bd4c448745f9d654a8cda, type: 2} | ||
3355 | + - {fileID: 7400000, guid: 58432825391c9034ea89724d84f0c982, type: 2} | ||
3356 | + - {fileID: 7400000, guid: 4fd89235b9eb61340adfbf9ec34d5df6, type: 2} | ||
3357 | + - {fileID: 7400000, guid: 553bc145139163640bb8e1fdff4a2a45, type: 2} | ||
3358 | + - {fileID: 7400000, guid: 8914e9454855d2b4ba773aeeb6e16268, type: 2} | ||
3359 | + - {fileID: 7400000, guid: c473b055273deae4283df28715e45e07, type: 2} | ||
3360 | + - {fileID: 7400000, guid: 29901f85ec9620e4e9151fca1239b633, type: 2} | ||
3361 | + - {fileID: 7400000, guid: c7ce8fa5e6f9ff74098c5eda970c71b0, type: 2} | ||
3362 | + - {fileID: 7400000, guid: 460956c551d137a4b84539b0b062df9f, type: 2} | ||
3363 | + - {fileID: 7400000, guid: 9d1d1f0695677c14e8395f930ca2a557, type: 2} | ||
3364 | + - {fileID: 7400000, guid: 163b0d8670532964fa2ae1ef96e92848, type: 2} | ||
3365 | + - {fileID: 7400000, guid: 744aeea7347e6134e90e03713f67a0b9, type: 2} | ||
3366 | + - {fileID: 7400000, guid: 41a0ca881067c97409207c537a0afd1c, type: 2} | ||
3367 | + - {fileID: 7400000, guid: 26386bf8ab9648e47896811e07bd91c2, type: 2} | ||
3368 | + - {fileID: 7400000, guid: ba71e00978ab8b147951fdb57d59134a, type: 2} | ||
3369 | + - {fileID: 7400000, guid: 166acb29e0762b84d962f751f1283281, type: 2} | ||
3370 | + - {fileID: 7400000, guid: 65cb74f95ca85ae42b219aa818ae70a6, type: 2} | ||
3371 | + - {fileID: 7400000, guid: 795f6c0aafd973d4c9e4cad6619a44ac, type: 2} | ||
3372 | + - {fileID: 7400000, guid: b65d557ae1993ac47b36e904ca7ec72c, type: 2} | ||
3373 | + - {fileID: 7400000, guid: 15ea6d9a3b5fe894eba65d0b9c40a1e7, type: 2} | ||
3374 | + - {fileID: 7400000, guid: e18bc8dab2616bb419a76413bf746ffb, type: 2} | ||
3375 | + - {fileID: 7400000, guid: 3c8272eabb52b9142ad2aa9d11937a3a, type: 2} | ||
3376 | + - {fileID: 7400000, guid: 03dd6e2b45753f84b9bb0214a5ca35f0, type: 2} | ||
3377 | + - {fileID: 7400000, guid: 5649cf8b8d43b8945a2e6ff739e9909e, type: 2} | ||
3378 | + - {fileID: 7400000, guid: 3223cdabcc5ef5e4d89828c2e89f5856, type: 2} | ||
3379 | + - {fileID: 7400000, guid: 4e18d4fbb7164394f94867b5d78ac4d1, type: 2} | ||
3380 | + - {fileID: 7400000, guid: ab6de21d5279acb479a39288cadcdea3, type: 2} | ||
3381 | + - {fileID: 7400000, guid: 8628ebcd14fe5db47ab8f3ac01bbd8f9, type: 2} | ||
3382 | + - {fileID: 7400000, guid: 8059100e83e60104db83b6e563f67423, type: 2} | ||
3383 | + - {fileID: 7400000, guid: 86d8571e8f4ce7c46b3f13f42a398ac3, type: 2} | ||
3384 | + - {fileID: 7400000, guid: 3fe3f40f6ec6d2d4689b37e695da22e2, type: 2} | ||
3385 | + - {fileID: 7400000, guid: 38f686af87a268346bd6aa3d932bbbeb, type: 2} | ||
3191 | m_WrapMode: 0 | 3386 | m_WrapMode: 0 |
3192 | m_PlayAutomatically: 1 | 3387 | m_PlayAutomatically: 1 |
3193 | m_AnimatePhysics: 0 | 3388 | m_AnimatePhysics: 0 |
@@ -4533,6 +4728,106 @@ MonoBehaviour: | @@ -4533,6 +4728,106 @@ MonoBehaviour: | ||
4533 | m_Spacing: 52 | 4728 | m_Spacing: 52 |
4534 | m_ChildForceExpandWidth: 0 | 4729 | m_ChildForceExpandWidth: 0 |
4535 | m_ChildForceExpandHeight: 0 | 4730 | m_ChildForceExpandHeight: 0 |
4731 | +--- !u!1 &726443270 | ||
4732 | +GameObject: | ||
4733 | + m_ObjectHideFlags: 0 | ||
4734 | + m_PrefabParentObject: {fileID: 127404, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
4735 | + m_PrefabInternal: {fileID: 0} | ||
4736 | + serializedVersion: 4 | ||
4737 | + m_Component: | ||
4738 | + - 224: {fileID: 726443271} | ||
4739 | + - 222: {fileID: 726443274} | ||
4740 | + - 114: {fileID: 726443273} | ||
4741 | + - 114: {fileID: 726443272} | ||
4742 | + - 114: {fileID: 726443275} | ||
4743 | + m_Layer: 5 | ||
4744 | + m_Name: container | ||
4745 | + m_TagString: Untagged | ||
4746 | + m_Icon: {fileID: 0} | ||
4747 | + m_NavMeshLayer: 0 | ||
4748 | + m_StaticEditorFlags: 0 | ||
4749 | + m_IsActive: 1 | ||
4750 | +--- !u!224 &726443271 | ||
4751 | +RectTransform: | ||
4752 | + m_ObjectHideFlags: 0 | ||
4753 | + m_PrefabParentObject: {fileID: 22468874, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
4754 | + type: 2} | ||
4755 | + m_PrefabInternal: {fileID: 0} | ||
4756 | + m_GameObject: {fileID: 726443270} | ||
4757 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
4758 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
4759 | + m_LocalScale: {x: 1, y: 1, z: 0} | ||
4760 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
4761 | + m_Children: | ||
4762 | + - {fileID: 1059619783} | ||
4763 | + - {fileID: 291722902} | ||
4764 | + - {fileID: 160532052} | ||
4765 | + m_Father: {fileID: 1530408465} | ||
4766 | + m_RootOrder: 0 | ||
4767 | + m_AnchorMin: {x: 0, y: 1.1} | ||
4768 | + m_AnchorMax: {x: 0.97, y: 1.6} | ||
4769 | + m_AnchoredPosition: {x: 0, y: 57.2} | ||
4770 | + m_SizeDelta: {x: 0, y: 0} | ||
4771 | + m_Pivot: {x: 1, y: 0} | ||
4772 | +--- !u!114 &726443272 | ||
4773 | +MonoBehaviour: | ||
4774 | + m_ObjectHideFlags: 0 | ||
4775 | + m_PrefabParentObject: {fileID: 0} | ||
4776 | + m_PrefabInternal: {fileID: 0} | ||
4777 | + m_GameObject: {fileID: 726443270} | ||
4778 | + m_Enabled: 1 | ||
4779 | + m_EditorHideFlags: 0 | ||
4780 | + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
4781 | + m_Name: | ||
4782 | + m_EditorClassIdentifier: | ||
4783 | + m_AspectMode: 2 | ||
4784 | + m_AspectRatio: 1 | ||
4785 | +--- !u!114 &726443273 | ||
4786 | +MonoBehaviour: | ||
4787 | + m_ObjectHideFlags: 0 | ||
4788 | + m_PrefabParentObject: {fileID: 11464616, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
4789 | + type: 2} | ||
4790 | + m_PrefabInternal: {fileID: 0} | ||
4791 | + m_GameObject: {fileID: 726443270} | ||
4792 | + m_Enabled: 1 | ||
4793 | + m_EditorHideFlags: 0 | ||
4794 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
4795 | + m_Name: | ||
4796 | + m_EditorClassIdentifier: | ||
4797 | + m_Material: {fileID: 0} | ||
4798 | + m_Color: {r: 0, g: 0, b: 0, a: 0.159} | ||
4799 | + m_RaycastTarget: 1 | ||
4800 | + m_OnCullStateChanged: | ||
4801 | + m_PersistentCalls: | ||
4802 | + m_Calls: [] | ||
4803 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
4804 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
4805 | + m_Sprite: {fileID: 21300000, guid: cf4c75f66de96f84086cf037ef21a437, type: 3} | ||
4806 | + m_Type: 0 | ||
4807 | + m_PreserveAspect: 1 | ||
4808 | + m_FillCenter: 1 | ||
4809 | + m_FillMethod: 4 | ||
4810 | + m_FillAmount: 1 | ||
4811 | + m_FillClockwise: 1 | ||
4812 | + m_FillOrigin: 0 | ||
4813 | +--- !u!222 &726443274 | ||
4814 | +CanvasRenderer: | ||
4815 | + m_ObjectHideFlags: 0 | ||
4816 | + m_PrefabParentObject: {fileID: 22208740, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
4817 | + type: 2} | ||
4818 | + m_PrefabInternal: {fileID: 0} | ||
4819 | + m_GameObject: {fileID: 726443270} | ||
4820 | +--- !u!114 &726443275 | ||
4821 | +MonoBehaviour: | ||
4822 | + m_ObjectHideFlags: 0 | ||
4823 | + m_PrefabParentObject: {fileID: 0} | ||
4824 | + m_PrefabInternal: {fileID: 0} | ||
4825 | + m_GameObject: {fileID: 726443270} | ||
4826 | + m_Enabled: 1 | ||
4827 | + m_EditorHideFlags: 0 | ||
4828 | + m_Script: {fileID: -146154839, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
4829 | + m_Name: | ||
4830 | + m_EditorClassIdentifier: | ||
4536 | --- !u!1 &813876601 | 4831 | --- !u!1 &813876601 |
4537 | GameObject: | 4832 | GameObject: |
4538 | m_ObjectHideFlags: 0 | 4833 | m_ObjectHideFlags: 0 |
@@ -4569,7 +4864,7 @@ RectTransform: | @@ -4569,7 +4864,7 @@ RectTransform: | ||
4569 | m_AnchorMin: {x: 0, y: 1.1} | 4864 | m_AnchorMin: {x: 0, y: 1.1} |
4570 | m_AnchorMax: {x: 0.97, y: 1.6} | 4865 | m_AnchorMax: {x: 0.97, y: 1.6} |
4571 | m_AnchoredPosition: {x: 0, y: 0} | 4866 | m_AnchoredPosition: {x: 0, y: 0} |
4572 | - m_SizeDelta: {x: -275.43857, y: 0} | 4867 | + m_SizeDelta: {x: -308.5243, y: 0} |
4573 | m_Pivot: {x: 1, y: 0} | 4868 | m_Pivot: {x: 1, y: 0} |
4574 | --- !u!114 &813876603 | 4869 | --- !u!114 &813876603 |
4575 | MonoBehaviour: | 4870 | MonoBehaviour: |
@@ -5111,7 +5406,7 @@ RectTransform: | @@ -5111,7 +5406,7 @@ RectTransform: | ||
5111 | m_Children: | 5406 | m_Children: |
5112 | - {fileID: 1164416486} | 5407 | - {fileID: 1164416486} |
5113 | m_Father: {fileID: 1620867682} | 5408 | m_Father: {fileID: 1620867682} |
5114 | - m_RootOrder: 4 | 5409 | + m_RootOrder: 5 |
5115 | m_AnchorMin: {x: 0, y: 0} | 5410 | m_AnchorMin: {x: 0, y: 0} |
5116 | m_AnchorMax: {x: 1, y: 1} | 5411 | m_AnchorMax: {x: 1, y: 1} |
5117 | m_AnchoredPosition: {x: 0, y: 0} | 5412 | m_AnchoredPosition: {x: 0, y: 0} |
@@ -5183,7 +5478,7 @@ RectTransform: | @@ -5183,7 +5478,7 @@ RectTransform: | ||
5183 | m_AnchorMin: {x: 0, y: 0} | 5478 | m_AnchorMin: {x: 0, y: 0} |
5184 | m_AnchorMax: {x: 1, y: 0} | 5479 | m_AnchorMax: {x: 1, y: 0} |
5185 | m_AnchoredPosition: {x: 0, y: 0} | 5480 | m_AnchoredPosition: {x: 0, y: 0} |
5186 | - m_SizeDelta: {x: 0, y: 95.14286} | 5481 | + m_SizeDelta: {x: 0, y: 106.57143} |
5187 | m_Pivot: {x: 1, y: 0} | 5482 | m_Pivot: {x: 1, y: 0} |
5188 | --- !u!114 &861767966 | 5483 | --- !u!114 &861767966 |
5189 | MonoBehaviour: | 5484 | MonoBehaviour: |
@@ -6659,6 +6954,142 @@ CanvasRenderer: | @@ -6659,6 +6954,142 @@ CanvasRenderer: | ||
6659 | type: 2} | 6954 | type: 2} |
6660 | m_PrefabInternal: {fileID: 0} | 6955 | m_PrefabInternal: {fileID: 0} |
6661 | m_GameObject: {fileID: 1053934344} | 6956 | m_GameObject: {fileID: 1053934344} |
6957 | +--- !u!1 &1059619782 | ||
6958 | +GameObject: | ||
6959 | + m_ObjectHideFlags: 0 | ||
6960 | + m_PrefabParentObject: {fileID: 133590, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
6961 | + m_PrefabInternal: {fileID: 0} | ||
6962 | + serializedVersion: 4 | ||
6963 | + m_Component: | ||
6964 | + - 224: {fileID: 1059619783} | ||
6965 | + - 222: {fileID: 1059619786} | ||
6966 | + - 114: {fileID: 1059619785} | ||
6967 | + - 114: {fileID: 1059619784} | ||
6968 | + m_Layer: 5 | ||
6969 | + m_Name: b_share | ||
6970 | + m_TagString: b_share | ||
6971 | + m_Icon: {fileID: 0} | ||
6972 | + m_NavMeshLayer: 0 | ||
6973 | + m_StaticEditorFlags: 0 | ||
6974 | + m_IsActive: 0 | ||
6975 | +--- !u!224 &1059619783 | ||
6976 | +RectTransform: | ||
6977 | + m_ObjectHideFlags: 0 | ||
6978 | + m_PrefabParentObject: {fileID: 22474260, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
6979 | + type: 2} | ||
6980 | + m_PrefabInternal: {fileID: 0} | ||
6981 | + m_GameObject: {fileID: 1059619782} | ||
6982 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
6983 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
6984 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
6985 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
6986 | + m_Children: [] | ||
6987 | + m_Father: {fileID: 726443271} | ||
6988 | + m_RootOrder: 0 | ||
6989 | + m_AnchorMin: {x: 0.2, y: 0.22} | ||
6990 | + m_AnchorMax: {x: 0.8, y: 0.8} | ||
6991 | + m_AnchoredPosition: {x: 0, y: 0} | ||
6992 | + m_SizeDelta: {x: 20, y: 20} | ||
6993 | + m_Pivot: {x: 0.5, y: 0.5} | ||
6994 | +--- !u!114 &1059619784 | ||
6995 | +MonoBehaviour: | ||
6996 | + m_ObjectHideFlags: 0 | ||
6997 | + m_PrefabParentObject: {fileID: 11431640, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
6998 | + type: 2} | ||
6999 | + m_PrefabInternal: {fileID: 0} | ||
7000 | + m_GameObject: {fileID: 1059619782} | ||
7001 | + m_Enabled: 1 | ||
7002 | + m_EditorHideFlags: 0 | ||
7003 | + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
7004 | + m_Name: | ||
7005 | + m_EditorClassIdentifier: | ||
7006 | + m_Navigation: | ||
7007 | + m_Mode: 0 | ||
7008 | + m_SelectOnUp: {fileID: 0} | ||
7009 | + m_SelectOnDown: {fileID: 0} | ||
7010 | + m_SelectOnLeft: {fileID: 0} | ||
7011 | + m_SelectOnRight: {fileID: 0} | ||
7012 | + m_Transition: 1 | ||
7013 | + m_Colors: | ||
7014 | + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
7015 | + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} | ||
7016 | + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} | ||
7017 | + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} | ||
7018 | + m_ColorMultiplier: 1 | ||
7019 | + m_FadeDuration: 0.1 | ||
7020 | + m_SpriteState: | ||
7021 | + m_HighlightedSprite: {fileID: 0} | ||
7022 | + m_PressedSprite: {fileID: 0} | ||
7023 | + m_DisabledSprite: {fileID: 0} | ||
7024 | + m_AnimationTriggers: | ||
7025 | + m_NormalTrigger: Normal | ||
7026 | + m_HighlightedTrigger: Highlighted | ||
7027 | + m_PressedTrigger: Pressed | ||
7028 | + m_DisabledTrigger: Disabled | ||
7029 | + m_Interactable: 1 | ||
7030 | + m_TargetGraphic: {fileID: 1059619785} | ||
7031 | + m_OnClick: | ||
7032 | + m_PersistentCalls: | ||
7033 | + m_Calls: | ||
7034 | + - m_Target: {fileID: 578311381} | ||
7035 | + m_MethodName: | ||
7036 | + m_Mode: 1 | ||
7037 | + m_Arguments: | ||
7038 | + m_ObjectArgument: {fileID: 0} | ||
7039 | + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine | ||
7040 | + m_IntArgument: 0 | ||
7041 | + m_FloatArgument: 0 | ||
7042 | + m_StringArgument: | ||
7043 | + m_BoolArgument: 0 | ||
7044 | + m_CallState: 2 | ||
7045 | + - m_Target: {fileID: 210788816} | ||
7046 | + m_MethodName: onClickShare | ||
7047 | + m_Mode: 1 | ||
7048 | + m_Arguments: | ||
7049 | + m_ObjectArgument: {fileID: 0} | ||
7050 | + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine | ||
7051 | + m_IntArgument: 0 | ||
7052 | + m_FloatArgument: 0 | ||
7053 | + m_StringArgument: | ||
7054 | + m_BoolArgument: 0 | ||
7055 | + m_CallState: 2 | ||
7056 | + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, | ||
7057 | + Culture=neutral, PublicKeyToken=null | ||
7058 | +--- !u!114 &1059619785 | ||
7059 | +MonoBehaviour: | ||
7060 | + m_ObjectHideFlags: 0 | ||
7061 | + m_PrefabParentObject: {fileID: 11451830, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
7062 | + type: 2} | ||
7063 | + m_PrefabInternal: {fileID: 0} | ||
7064 | + m_GameObject: {fileID: 1059619782} | ||
7065 | + m_Enabled: 1 | ||
7066 | + m_EditorHideFlags: 0 | ||
7067 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
7068 | + m_Name: | ||
7069 | + m_EditorClassIdentifier: | ||
7070 | + m_Material: {fileID: 0} | ||
7071 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
7072 | + m_RaycastTarget: 1 | ||
7073 | + m_OnCullStateChanged: | ||
7074 | + m_PersistentCalls: | ||
7075 | + m_Calls: [] | ||
7076 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
7077 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
7078 | + m_Sprite: {fileID: 21300000, guid: 43464d7b3ab604b488e4dd27d0092647, type: 3} | ||
7079 | + m_Type: 0 | ||
7080 | + m_PreserveAspect: 1 | ||
7081 | + m_FillCenter: 1 | ||
7082 | + m_FillMethod: 4 | ||
7083 | + m_FillAmount: 1 | ||
7084 | + m_FillClockwise: 1 | ||
7085 | + m_FillOrigin: 0 | ||
7086 | +--- !u!222 &1059619786 | ||
7087 | +CanvasRenderer: | ||
7088 | + m_ObjectHideFlags: 0 | ||
7089 | + m_PrefabParentObject: {fileID: 22202710, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
7090 | + type: 2} | ||
7091 | + m_PrefabInternal: {fileID: 0} | ||
7092 | + m_GameObject: {fileID: 1059619782} | ||
6662 | --- !u!1 &1069760790 | 7093 | --- !u!1 &1069760790 |
6663 | GameObject: | 7094 | GameObject: |
6664 | m_ObjectHideFlags: 0 | 7095 | m_ObjectHideFlags: 0 |
@@ -9275,7 +9706,7 @@ Canvas: | @@ -9275,7 +9706,7 @@ Canvas: | ||
9275 | m_Enabled: 1 | 9706 | m_Enabled: 1 |
9276 | serializedVersion: 2 | 9707 | serializedVersion: 2 |
9277 | m_RenderMode: 0 | 9708 | m_RenderMode: 0 |
9278 | - m_Camera: {fileID: 0} | 9709 | + m_Camera: {fileID: 1772891849} |
9279 | m_PlaneDistance: 100 | 9710 | m_PlaneDistance: 100 |
9280 | m_PixelPerfect: 0 | 9711 | m_PixelPerfect: 0 |
9281 | m_ReceivesEvents: 1 | 9712 | m_ReceivesEvents: 1 |
@@ -10496,6 +10927,54 @@ CanvasRenderer: | @@ -10496,6 +10927,54 @@ CanvasRenderer: | ||
10496 | type: 2} | 10927 | type: 2} |
10497 | m_PrefabInternal: {fileID: 0} | 10928 | m_PrefabInternal: {fileID: 0} |
10498 | m_GameObject: {fileID: 1516956730} | 10929 | m_GameObject: {fileID: 1516956730} |
10930 | +--- !u!1 &1530408464 | ||
10931 | +GameObject: | ||
10932 | + m_ObjectHideFlags: 0 | ||
10933 | + m_PrefabParentObject: {fileID: 0} | ||
10934 | + m_PrefabInternal: {fileID: 0} | ||
10935 | + serializedVersion: 4 | ||
10936 | + m_Component: | ||
10937 | + - 224: {fileID: 1530408465} | ||
10938 | + - 114: {fileID: 1530408466} | ||
10939 | + m_Layer: 5 | ||
10940 | + m_Name: layer_export | ||
10941 | + m_TagString: Untagged | ||
10942 | + m_Icon: {fileID: 0} | ||
10943 | + m_NavMeshLayer: 0 | ||
10944 | + m_StaticEditorFlags: 0 | ||
10945 | + m_IsActive: 1 | ||
10946 | +--- !u!224 &1530408465 | ||
10947 | +RectTransform: | ||
10948 | + m_ObjectHideFlags: 0 | ||
10949 | + m_PrefabParentObject: {fileID: 0} | ||
10950 | + m_PrefabInternal: {fileID: 0} | ||
10951 | + m_GameObject: {fileID: 1530408464} | ||
10952 | + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||
10953 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
10954 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
10955 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
10956 | + m_Children: | ||
10957 | + - {fileID: 726443271} | ||
10958 | + m_Father: {fileID: 1620867682} | ||
10959 | + m_RootOrder: 4 | ||
10960 | + m_AnchorMin: {x: 0, y: 0} | ||
10961 | + m_AnchorMax: {x: 1, y: 0} | ||
10962 | + m_AnchoredPosition: {x: 0, y: 0} | ||
10963 | + m_SizeDelta: {x: 0, y: 0} | ||
10964 | + m_Pivot: {x: 1, y: 0} | ||
10965 | +--- !u!114 &1530408466 | ||
10966 | +MonoBehaviour: | ||
10967 | + m_ObjectHideFlags: 0 | ||
10968 | + m_PrefabParentObject: {fileID: 0} | ||
10969 | + m_PrefabInternal: {fileID: 0} | ||
10970 | + m_GameObject: {fileID: 1530408464} | ||
10971 | + m_Enabled: 1 | ||
10972 | + m_EditorHideFlags: 0 | ||
10973 | + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
10974 | + m_Name: | ||
10975 | + m_EditorClassIdentifier: | ||
10976 | + m_AspectMode: 1 | ||
10977 | + m_AspectRatio: 3.5 | ||
10499 | --- !u!1 &1533000889 | 10978 | --- !u!1 &1533000889 |
10500 | GameObject: | 10979 | GameObject: |
10501 | m_ObjectHideFlags: 0 | 10980 | m_ObjectHideFlags: 0 |
@@ -10985,6 +11464,7 @@ RectTransform: | @@ -10985,6 +11464,7 @@ RectTransform: | ||
10985 | - {fileID: 1265043070} | 11464 | - {fileID: 1265043070} |
10986 | - {fileID: 1024302432} | 11465 | - {fileID: 1024302432} |
10987 | - {fileID: 861767965} | 11466 | - {fileID: 861767965} |
11467 | + - {fileID: 1530408465} | ||
10988 | - {fileID: 848083143} | 11468 | - {fileID: 848083143} |
10989 | m_Father: {fileID: 1414104007} | 11469 | m_Father: {fileID: 1414104007} |
10990 | m_RootOrder: 2 | 11470 | m_RootOrder: 2 |
@@ -11829,7 +12309,7 @@ Transform: | @@ -11829,7 +12309,7 @@ Transform: | ||
11829 | m_Children: | 12309 | m_Children: |
11830 | - {fileID: 2123885087} | 12310 | - {fileID: 2123885087} |
11831 | m_Father: {fileID: 0} | 12311 | m_Father: {fileID: 0} |
11832 | - m_RootOrder: 6 | 12312 | + m_RootOrder: 7 |
11833 | --- !u!20 &1772891849 | 12313 | --- !u!20 &1772891849 |
11834 | Camera: | 12314 | Camera: |
11835 | m_ObjectHideFlags: 0 | 12315 | m_ObjectHideFlags: 0 |
@@ -14998,6 +15478,10 @@ MonoBehaviour: | @@ -14998,6 +15478,10 @@ MonoBehaviour: | ||
14998 | connectionErrorText: {fileID: 163763091} | 15478 | connectionErrorText: {fileID: 163763091} |
14999 | pauseMenu: {fileID: 1024302431} | 15479 | pauseMenu: {fileID: 1024302431} |
15000 | repeatLayer: {fileID: 861767964} | 15480 | repeatLayer: {fileID: 861767964} |
15481 | + exportLayer: {fileID: 1530408464} | ||
15482 | + shareLayer: {fileID: 1059619782} | ||
15483 | + progressLayer: {fileID: 291722901} | ||
15484 | + downloadLayer: {fileID: 160532051} | ||
15001 | textButton: {fileID: 930426942} | 15485 | textButton: {fileID: 930426942} |
15002 | pauseButton: {fileID: 440527253} | 15486 | pauseButton: {fileID: 440527253} |
15003 | avatarCollider: {fileID: 535548073} | 15487 | avatarCollider: {fileID: 535548073} |
Assets/Scripts/Animation List/Dictionary.cs
@@ -88,7 +88,7 @@ namespace LAViD.VLibras.Dictionary | @@ -88,7 +88,7 @@ namespace LAViD.VLibras.Dictionary | ||
88 | PlayerLogger.Log("D", "AOLL", "Ready. Calling onLoad events."); | 88 | PlayerLogger.Log("D", "AOLL", "Ready. Calling onLoad events."); |
89 | 89 | ||
90 | this.onLoadListeners(); | 90 | this.onLoadListeners(); |
91 | - this.gameObject.SetActive(false); | 91 | + this.gameObject.GetComponent<Dictionary>().enabled = false; |
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 |
@@ -0,0 +1,23 @@ | @@ -0,0 +1,23 @@ | ||
1 | +using UnityEngine; | ||
2 | +using System.Collections; | ||
3 | + | ||
4 | +public class ExportVideo : MonoBehaviour { | ||
5 | + | ||
6 | + public ScreenManager screenManager; | ||
7 | + | ||
8 | + | ||
9 | + public void onClickShare() | ||
10 | + { | ||
11 | + Debug.Log("onClickShare pressed"); | ||
12 | + screenManager.changeExportStates(false, true,false); | ||
13 | + | ||
14 | + } | ||
15 | + | ||
16 | + public void onDownloadClick() | ||
17 | + { | ||
18 | + Debug.Log("Asking for permition to download"); | ||
19 | + } | ||
20 | + | ||
21 | + | ||
22 | + | ||
23 | +} |
@@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
1 | +fileFormatVersion: 2 | ||
2 | +guid: dfd8bc2e1d5564642b758cc106a78de2 | ||
3 | +timeCreated: 1485619912 | ||
4 | +licenseType: Free | ||
5 | +MonoImporter: | ||
6 | + serializedVersion: 2 | ||
7 | + defaultReferences: [] | ||
8 | + executionOrder: 0 | ||
9 | + icon: {instanceID: 0} | ||
10 | + userData: | ||
11 | + assetBundleName: | ||
12 | + assetBundleVariant: |
Assets/Scripts/UI/ScreenManager.cs
@@ -25,6 +25,12 @@ public class ScreenManager : MonoBehaviour { | @@ -25,6 +25,12 @@ public class ScreenManager : MonoBehaviour { | ||
25 | public Text connectionErrorText; | 25 | public Text connectionErrorText; |
26 | public GameObject pauseMenu; | 26 | public GameObject pauseMenu; |
27 | public GameObject repeatLayer; | 27 | public GameObject repeatLayer; |
28 | + public GameObject exportLayer; | ||
29 | + public GameObject shareLayer; | ||
30 | + public GameObject progressLayer; | ||
31 | + public GameObject downloadLayer; | ||
32 | + | ||
33 | + | ||
28 | 34 | ||
29 | public GameObject textButton; | 35 | public GameObject textButton; |
30 | public GameObject pauseButton; | 36 | public GameObject pauseButton; |
@@ -36,6 +42,8 @@ public class ScreenManager : MonoBehaviour { | @@ -36,6 +42,8 @@ public class ScreenManager : MonoBehaviour { | ||
36 | public Fadder regionPanel; | 42 | public Fadder regionPanel; |
37 | public Fadder shadow; | 43 | public Fadder shadow; |
38 | 44 | ||
45 | + | ||
46 | + | ||
39 | private bool exit = false; | 47 | private bool exit = false; |
40 | 48 | ||
41 | public void Update() | 49 | public void Update() |
@@ -267,19 +275,50 @@ public class ScreenManager : MonoBehaviour { | @@ -267,19 +275,50 @@ public class ScreenManager : MonoBehaviour { | ||
267 | this.repeatLayer.SetActive(active); | 275 | this.repeatLayer.SetActive(active); |
268 | } | 276 | } |
269 | 277 | ||
270 | - public void setTranslateButtonActive(bool active) | 278 | + public void setShareLayerState(bool active) |
279 | + | ||
280 | + { | ||
281 | + this.exportLayer.SetActive(active); | ||
282 | + this.shareLayer.SetActive(active); | ||
283 | + } | ||
284 | + | ||
285 | + public void setProgressLayerState(bool active) | ||
286 | + { | ||
287 | + this.exportLayer.SetActive(active); | ||
288 | + this.progressLayer.SetActive(active); | ||
289 | + } | ||
290 | + | ||
291 | + public void setDownloadLayerState(bool active) | ||
292 | + | ||
293 | + { | ||
294 | + this.exportLayer.SetActive(active); | ||
295 | + this.downloadLayer.SetActive(active); | ||
296 | + } | ||
297 | + | ||
298 | + public void setTranslateButtonActive(bool active) | ||
271 | { | 299 | { |
272 | this.textButton.SetActive(active); | 300 | this.textButton.SetActive(active); |
273 | this.pauseButton.SetActive( ! active); | 301 | this.pauseButton.SetActive( ! active); |
274 | } | 302 | } |
275 | 303 | ||
304 | + | ||
276 | public void changeStates(bool playing, bool paused, bool repeatable) | 305 | public void changeStates(bool playing, bool paused, bool repeatable) |
277 | { | 306 | { |
278 | setTranslateButtonActive( ! playing); | 307 | setTranslateButtonActive( ! playing); |
279 | setPauseMenuState(playing && paused); | 308 | setPauseMenuState(playing && paused); |
280 | setRepeatLayerState( ! playing && repeatable); | 309 | setRepeatLayerState( ! playing && repeatable); |
310 | + setShareLayerState(!playing && repeatable); | ||
311 | + | ||
281 | 312 | ||
282 | this.pauseButtonImage.switchAttribute(playing && paused); | 313 | this.pauseButtonImage.switchAttribute(playing && paused); |
283 | } | 314 | } |
284 | 315 | ||
316 | + public void changeExportStates(bool share, bool progress, bool download) | ||
317 | + { | ||
318 | + setShareLayerState(share); | ||
319 | + setProgressLayerState(progress); | ||
320 | + setDownloadLayerState(download); | ||
321 | + | ||
322 | + } | ||
323 | + | ||
285 | } | 324 | } |
ProjectSettings/ProjectSettings.asset
@@ -165,8 +165,8 @@ PlayerSettings: | @@ -165,8 +165,8 @@ PlayerSettings: | ||
165 | AndroidTargetDevice: 0 | 165 | AndroidTargetDevice: 0 |
166 | AndroidSplashScreenScale: 0 | 166 | AndroidSplashScreenScale: 0 |
167 | androidSplashScreen: {fileID: 0} | 167 | androidSplashScreen: {fileID: 0} |
168 | - AndroidKeystoreName: "C:/Users/\xCDcaro Magalh\xE3es/Downloads/keystore.keystore" | ||
169 | - AndroidKeyaliasName: vlibras | 168 | + AndroidKeystoreName: |
169 | + AndroidKeyaliasName: | ||
170 | AndroidTVCompatibility: 0 | 170 | AndroidTVCompatibility: 0 |
171 | AndroidIsGame: 0 | 171 | AndroidIsGame: 0 |
172 | androidEnableBanner: 0 | 172 | androidEnableBanner: 0 |
ProjectSettings/TagManager.asset