This commit is contained in:
Relintai 2018-05-29 22:15:20 +02:00
parent 5ab0b2caa6
commit 50ac3bd94f
20 changed files with 10425 additions and 202 deletions

View File

@ -609,6 +609,7 @@ c) A jogképesség mindig a fogamzástól kezdõdik.\\
%42. %42.
\begin{tcolorbox}[title={42. Kérdés}] \begin{tcolorbox}[title={42. Kérdés}]
Melyik állítás igaz? Melyik állítás igaz?
\tcblower
a) A bíróság korlátozhatja a természetes személy jogképességét.\\ a) A bíróság korlátozhatja a természetes személy jogképességét.\\
b) A Ptk. nem korlátozhatja az ember cselekvõképességét.\\ b) A Ptk. nem korlátozhatja az ember cselekvõképességét.\\
\uline {c) Aki cselekvõképes, az önállóan köthet szerzõdést}.\\ \uline {c) Aki cselekvõképes, az önállóan köthet szerzõdést}.\\
@ -905,7 +906,7 @@ c) A társulási szabadság érvényre jutását.\\
Hányféle társasági formában alapítható gazdasági társaság? Sorolja is fel õket. Hányféle társasági formában alapítható gazdasági társaság? Sorolja is fel õket.
\tcblower \tcblower
a) 3, a következõk:\\ a) 3, a következõk:\\
\uline {-b) 4, a következõk: Kkt., Bt., Kft., Zrt.}\\ \uline {b) 4, a következõk: Kkt., Bt., Kft., Zrt.}\\
c) 5, a következõk:\\ c) 5, a következõk:\\
d) Egyik fenti válasz sem megfelelõ. d) Egyik fenti válasz sem megfelelõ.
\end{tcolorbox} \end{tcolorbox}
@ -1927,7 +1928,7 @@ d) Fogyasztói szerzõdés esetén a fogyasztót 14 napon belül elállási jog
Az érvénytelenségnek hányféle formája van a polgári jogban, és melyek ezek? Az érvénytelenségnek hányféle formája van a polgári jogban, és melyek ezek?
\tcblower \tcblower
a) 3, éspedig a következõk:\\ a) 3, éspedig a következõk:\\
\uline {-b) 2, éspedig a következõk: semmisség, megtámadhatóság}\\ \uline {b) 2, éspedig a következõk: semmisség, megtámadhatóság}\\
c) 1, éspedig a következõ:\\ c) 1, éspedig a következõ:\\
d) A polgári jogban nem létezik az érvénytelenség fogalma. d) A polgári jogban nem létezik az érvénytelenség fogalma.
\end{tcolorbox} \end{tcolorbox}

View File

@ -609,6 +609,7 @@ c) A jogképesség mindig a fogamzástól kezdõdik.\\
%42. %42.
\begin{tcolorbox}[title={42. Kérdés}] \begin{tcolorbox}[title={42. Kérdés}]
Melyik állítás igaz? Melyik állítás igaz?
\tcblower
a) A bíróság korlátozhatja a természetes személy jogképességét.\\ a) A bíróság korlátozhatja a természetes személy jogképességét.\\
b) A Ptk. nem korlátozhatja az ember cselekvõképességét.\\ b) A Ptk. nem korlátozhatja az ember cselekvõképességét.\\
\uline {c) Aki cselekvõképes, az önállóan köthet szerzõdést}.\\ \uline {c) Aki cselekvõképes, az önállóan köthet szerzõdést}.\\
@ -905,7 +906,7 @@ c) A társulási szabadság érvényre jutását.\\
Hányféle társasági formában alapítható gazdasági társaság? Sorolja is fel õket. Hányféle társasági formában alapítható gazdasági társaság? Sorolja is fel õket.
\tcblower \tcblower
a) 3, a következõk:\\ a) 3, a következõk:\\
\uline {-b) 4, a következõk: Kkt., Bt., Kft., Zrt.}\\ \uline {b) 4, a következõk: Kkt., Bt., Kft., Zrt.}\\
c) 5, a következõk:\\ c) 5, a következõk:\\
d) Egyik fenti válasz sem megfelelõ. d) Egyik fenti válasz sem megfelelõ.
\end{tcolorbox} \end{tcolorbox}
@ -1927,7 +1928,7 @@ d) Fogyasztói szerzõdés esetén a fogyasztót 14 napon belül elállási jog
Az érvénytelenségnek hányféle formája van a polgári jogban, és melyek ezek? Az érvénytelenségnek hányféle formája van a polgári jogban, és melyek ezek?
\tcblower \tcblower
a) 3, éspedig a következõk:\\ a) 3, éspedig a következõk:\\
\uline {-b) 2, éspedig a következõk: semmisség, megtámadhatóság}\\ \uline {b) 2, éspedig a következõk: semmisség, megtámadhatóság}\\
c) 1, éspedig a következõ:\\ c) 1, éspedig a következõ:\\
d) A polgári jogban nem létezik az érvénytelenség fogalma. d) A polgári jogban nem létezik az érvénytelenség fogalma.
\end{tcolorbox} \end{tcolorbox}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b4d0211b181976240afdb82983fa4c36
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6d015cadea38e06419f38f02b17034a9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,76 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: ParticleMat
m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: de2448215a548734ab610975d7f71fa7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ba06540e114a16a4ca2cb175592010aa
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: de2448215a548734ab610975d7f71fa7
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 5
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 3de5cbc5256dd3e458717bafee492eb4
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,94 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1703704215239982}
m_IsPrefabParent: 1
--- !u!1 &1703704215239982
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4985462802470486}
- component: {fileID: 20559744325412960}
- component: {fileID: 124797401959755692}
- component: {fileID: 81804554491975886}
m_Layer: 0
m_Name: Main Camera 1
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4985462802470486
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1703704215239982}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20559744325412960
Camera:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1703704215239982}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0.44705883}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &81804554491975886
AudioListener:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1703704215239982}
m_Enabled: 1
--- !u!124 &124797401959755692
Behaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1703704215239982}
m_Enabled: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5c55306bcc00ea344a3cc1a80c381350
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -50,8 +50,8 @@ Camera:
m_GameObject: {fileID: 1756720928186462} m_GameObject: {fileID: 1756720928186462}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 1 m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_BackGroundColor: {r: 0.050980393, g: 0.047058824, b: 0, a: 0}
m_NormalizedViewPortRect: m_NormalizedViewPortRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0

File diff suppressed because it is too large Load Diff

View File

@ -294,46 +294,6 @@ Prefab:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114296029424908284, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114296029424908284, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114451661483695722, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114451661483695722, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114516035810252784, guid: 856e34ca2a0940d4485e8bf7ece07636, - target: {fileID: 114516035810252784, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2} type: 2}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -344,36 +304,6 @@ Prefab:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114125219064817606, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114125219064817606, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114976982665801258, guid: 856e34ca2a0940d4485e8bf7ece07636, - target: {fileID: 114976982665801258, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2} type: 2}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -384,6 +314,86 @@ Prefab:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114125219064817606, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114125219064817606, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114451661483695722, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114451661483695722, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114296029424908284, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114296029424908284, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114096735093609612, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114173062727473642, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114173062727473642, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114827693395229746, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114164360000452872, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114476594045200410, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114753993251736394, guid: 856e34ca2a0940d4485e8bf7ece07636, - target: {fileID: 114753993251736394, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2} type: 2}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -394,6 +404,331 @@ Prefab:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224106335225601898, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224284955253454526, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224235844471873738, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224184219304057936, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224836438976007922, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224252867083368616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224333746695899820, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224853550833776616, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224133230707058828, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224656438575154426, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224387966081393810, guid: 856e34ca2a0940d4485e8bf7ece07636,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 856e34ca2a0940d4485e8bf7ece07636, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0

View File

@ -18,6 +18,9 @@ public class Quiz : MonoBehaviour {
[SerializeField] [SerializeField]
bool randomOrder = true; bool randomOrder = true;
[SerializeField]
bool randomQuestionOrder = true;
[SerializeField] [SerializeField]
TextMeshProUGUI questionTextField; TextMeshProUGUI questionTextField;
@ -30,9 +33,18 @@ public class Quiz : MonoBehaviour {
[SerializeField] [SerializeField]
Button nextQuestionButton; Button nextQuestionButton;
[SerializeField]
Toggle orderOffToggle;
[SerializeField]
Toggle randomQuestionOrderToggle;
[SerializeField] [SerializeField]
List<QuizInput> inputs; List<QuizInput> inputs;
[SerializeField]
List<string> answerPrefixes;
[SerializeField] [SerializeField]
TextAsset data; TextAsset data;
@ -63,6 +75,8 @@ public class Quiz : MonoBehaviour {
[SerializeField] [SerializeField]
int badAnswer = 0; int badAnswer = 0;
bool badAnswerMarked = false;
// Use this for initialization // Use this for initialization
void Awake() { void Awake() {
entries = SimpleTexFormatParser.Parse(data.text); entries = SimpleTexFormatParser.Parse(data.text);
@ -109,14 +123,17 @@ public class Quiz : MonoBehaviour {
return; return;
} }
badAnswerMarked = false;
selectedAnswer = -1; selectedAnswer = -1;
ResetGUI();
++currentQuestionIndex; ++currentQuestionIndex;
ResetGUI();
if (currentQuestionIndex >= entries.Count) if (currentQuestionIndex >= entries.Count)
{ {
GameFinished(); GameFinished();
return;
} }
SetQuestion(entries[order[currentQuestionIndex]]); SetQuestion(entries[order[currentQuestionIndex]]);
@ -131,12 +148,17 @@ public class Quiz : MonoBehaviour {
if (questionState == QuestionState.Answers) if (questionState == QuestionState.Answers)
{ {
if (currentQuestion.IsValid && currentQuestion.answerId != selectedAnswer) if (!badAnswerMarked)
{ {
inputs[selectedAnswer].incorrectImage.gameObject.SetActive(true); if (currentQuestion.IsValid && !currentQuestion.IsAnswerCorrect(selectedAnswer))
} {
inputs[selectedAnswer].incorrectImage.gameObject.SetActive(true);
}
inputs[currentQuestion.answerId].correctImage.gameObject.SetActive(true); inputs[currentQuestion.AnswerID].correctImage.gameObject.SetActive(true);
badAnswerMarked = true;
}
return; return;
} }
@ -145,7 +167,7 @@ public class Quiz : MonoBehaviour {
if (selectedAnswer != -1) if (selectedAnswer != -1)
{ {
if (currentQuestion.IsValid && currentQuestion.answerId != selectedAnswer) if (currentQuestion.IsValid && !currentQuestion.IsAnswerCorrect(selectedAnswer))
{ {
inputs[selectedAnswer].incorrectImage.gameObject.SetActive(true); inputs[selectedAnswer].incorrectImage.gameObject.SetActive(true);
@ -170,11 +192,18 @@ public class Quiz : MonoBehaviour {
return; ; return; ;
} }
inputs[currentQuestion.answerId].correctImage.gameObject.SetActive(true); inputs[currentQuestion.AnswerID].correctImage.gameObject.SetActive(true);
badAnswerMarked = true;
} }
public void SetQuestion(QuizEntry e) public void SetQuestion(QuizEntry e, bool randomize = true)
{ {
if (randomize)
{
e.RandomizeOrder(randomQuestionOrder);
}
currentQuestion = e; currentQuestion = e;
questionState = QuestionState.Question; questionState = QuestionState.Question;
@ -188,7 +217,16 @@ public class Quiz : MonoBehaviour {
break; break;
} }
inputs[i].text.text = currentQuestion.answers[i]; string ca = "";
if (answerPrefixes.Count > i)
{
ca += answerPrefixes[i];
}
ca += currentQuestion.GetAnswer(i);
inputs[i].text.text = ca;
} }
} }
@ -209,9 +247,9 @@ public class Quiz : MonoBehaviour {
public void Save() public void Save()
{ {
string save = ""; string save = "V2;";
save += currentQuestionIndex + ";" + selectedAnswer + ";" + goodAnswer + ";" + badAnswer + ";" + (int)state + ";" + (int)questionState; save += randomOrder + ";" + randomQuestionOrder + ";" + currentQuestionIndex + ";" + currentQuestion.GetSaveString() + ";" + selectedAnswer + ";" + goodAnswer + ";" + badAnswer + ";" + (int)state + ";" + (int)questionState;
for (int i = 0; i < order.Count; i++) for (int i = 0; i < order.Count; i++)
{ {
@ -241,21 +279,34 @@ public class Quiz : MonoBehaviour {
try try
{ {
currentQuestionIndex = int.Parse(indices[0]); int index = -1;
selectedAnswer = int.Parse(indices[1]);
goodAnswer = int.Parse(indices[2]); if (!indices[++index].Equals("V2"))
badAnswer = int.Parse(indices[3]); {
questionState = (QuestionState)int.Parse(indices[5]); return false;
state = (QuizState)int.Parse(indices[4]); }
SetupRandomOrderGUI(bool.Parse(indices[++index]));
randomQuestionOrder = bool.Parse(indices[++index]);
SetupRandomQuestionOrderGUI(randomQuestionOrder);
currentQuestionIndex = int.Parse(indices[++index]);
string currentQuestionSaveString = indices[++index];
selectedAnswer = int.Parse(indices[++index]);
goodAnswer = int.Parse(indices[++index]);
badAnswer = int.Parse(indices[++index]);
questionState = (QuestionState)int.Parse(indices[++index]);
state = (QuizState)int.Parse(indices[++index]);
for (int i = 6; i < indices.Length; i++) for (int i = ++index; i < indices.Length; i++)
{ {
order.Add(int.Parse(indices[i])); order.Add(int.Parse(indices[i]));
} }
entries[order[currentQuestionIndex]].loadOrderFromString(currentQuestionSaveString);
ResetGUI(); ResetGUI();
SetQuestion(entries[order[currentQuestionIndex]]); SetQuestion(entries[order[currentQuestionIndex]], false);
questionState = (QuestionState)int.Parse(indices[5]); questionState = (QuestionState)int.Parse(indices[5]);
@ -288,4 +339,22 @@ public class Quiz : MonoBehaviour {
{ {
randomOrder = on; randomOrder = on;
} }
public void SetupRandomOrderGUI(bool order)
{
if (!order)
{
orderOffToggle.isOn = true;
}
}
public void SetRandomQuestionOrder(bool on)
{
randomQuestionOrder = on;
}
public void SetupRandomQuestionOrderGUI(bool order)
{
randomQuestionOrderToggle.isOn = order;
}
} }

View File

@ -4,9 +4,20 @@ using UnityEngine;
[System.Serializable] [System.Serializable]
public class QuizEntry { public class QuizEntry {
//public bool remap = true;
public string question; public string question;
public List<string> answers; public List<string> answers;
public int answerId; public int answerId;
public int remappedAnswerId;
public List<int> order = new List<int>();
public int AnswerID
{
get
{
return remappedAnswerId;
}
}
public bool IsValid { get { return answerId != -1; } } public bool IsValid { get { return answerId != -1; } }
@ -22,4 +33,72 @@ public class QuizEntry {
this.answers = answers; this.answers = answers;
this.answerId = answerId; this.answerId = answerId;
} }
public void RandomizeOrder(bool remap = true)
{
order.Clear();
for (int i = 0; i < answers.Count; i++)
{
order.Add(i);
}
if (remap)
{
order.Shuffle();
}
for (int i = 0; i < order.Count; i++)
{
if (order[i] == answerId)
{
remappedAnswerId = i;
break;
}
}
}
public string GetAnswer(int index)
{
return answers[order[index]];
}
public int GetAnswerID(int index)
{
return order[index];
}
public bool IsAnswerCorrect(int answerId)
{
int ra = order[answerId];
return this.answerId == ra;
}
public string GetSaveString()
{
if (order.Count == 0)
{
return "";
}
string ss = order[0].ToString();
for (int i = 1; i < order.Count; i++)
{
ss += ":" + order[i];
}
return ss;
}
public void loadOrderFromString(string str)
{
string[] os = str.Split(':');
for (int i = 0; i < os.Length; i++)
{
order.Add(int.Parse(os[i]));
}
}
} }

View File

@ -85,6 +85,8 @@ public class SimpleTexFormatParser {
qe.answerId = indexj; qe.answerId = indexj;
} }
answ = answ.Substring(3);
qe.answers.Add(answ); qe.answers.Add(answ);
++indexj; ++indexj;

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 40b38aeb1e52a234ba09cfe148835a22
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -44,8 +44,8 @@ PlayerSettings:
m_HolographicTrackingLossScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024 defaultScreenWidth: 1024
defaultScreenHeight: 768 defaultScreenHeight: 768
defaultScreenWidthWeb: 960 defaultScreenWidthWeb: 700
defaultScreenHeightWeb: 600 defaultScreenHeightWeb: 700
m_StereoRenderingPath: 0 m_StereoRenderingPath: 0
m_ActiveColorSpace: 0 m_ActiveColorSpace: 0
m_MTRendering: 1 m_MTRendering: 1