bugfix, ui update, dice animation

This commit is contained in:
2023-04-12 21:22:45 +02:00
parent 6ab0139ea7
commit 2f1c758137
15 changed files with 2206 additions and 140 deletions

View File

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

View File

@@ -0,0 +1,171 @@
fileFormatVersion: 2
guid: 91e2a85519f4f5d438dd117f0f58ced1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
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: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1251,7 +1251,7 @@ RectTransform:
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: 509.34, y: 4}
m_AnchoredPosition: {x: 508.31998, y: 225.5}
m_SizeDelta: {x: 196.67, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &83085751
@@ -3794,7 +3794,7 @@ RectTransform:
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: 509.34, y: -34}
m_AnchoredPosition: {x: 510, y: 184.1}
m_SizeDelta: {x: 196.67, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &191744301
@@ -4111,6 +4111,8 @@ MonoBehaviour:
- {fileID: 21300000, guid: 8d8a82287846c3d4892b15d8ab640d68, type: 3}
hely1: {fileID: 1620774317}
hely2: {fileID: 921900544}
animacio1: {fileID: 0}
animacio2: {fileID: 0}
dice1btnBtn: {fileID: 1620774314}
dice2btnBtn: {fileID: 921900541}
diceResult: 0000000000000000
@@ -4880,7 +4882,7 @@ RectTransform:
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: 509.34, y: 41}
m_AnchoredPosition: {x: 509.99, y: 261.5}
m_SizeDelta: {x: 196.67, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &235549632
@@ -8265,7 +8267,7 @@ RectTransform:
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: 509.34, y: -163.4}
m_AnchoredPosition: {x: 511.01, y: -215.7}
m_SizeDelta: {x: 196.66, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &401176107
@@ -17715,7 +17717,7 @@ RectTransform:
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: 509.34, y: -107}
m_AnchoredPosition: {x: 509.97998, y: 142.1}
m_SizeDelta: {x: 196.66, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &824033280
@@ -19513,7 +19515,7 @@ RectTransform:
- {fileID: 1379644799}
- {fileID: 1177305937}
- {fileID: 1221921131}
- {fileID: 947787406}
- {fileID: 2063388576}
- {fileID: 248016068}
- {fileID: 235549631}
- {fileID: 1377405324}
@@ -19526,6 +19528,7 @@ RectTransform:
- {fileID: 274472944}
- {fileID: 824033279}
- {fileID: 138684709}
- {fileID: 1413966190}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -21452,18 +21455,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947787405}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 891272366}
m_RootOrder: 21
m_Father: {fileID: 2063388576}
m_RootOrder: 0
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: 507.67, y: -262.1}
m_SizeDelta: {x: 200, y: 29.98}
m_AnchoredPosition: {x: 0.000011444, y: 0}
m_SizeDelta: {x: 160.96, y: 29.98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &947787407
MonoBehaviour:
@@ -21494,8 +21497,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -21512,13 +21515,13 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 18
m_fontSizeBase: 18
m_fontSize: 20
m_fontSizeBase: 20
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_fontStyle: 1
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
@@ -21548,7 +21551,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_margin: {x: 2.5, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@@ -27141,7 +27144,7 @@ RectTransform:
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: 509.34, y: 80}
m_AnchoredPosition: {x: 510, y: -135.76}
m_SizeDelta: {x: 196.67, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1177305938
@@ -31619,7 +31622,7 @@ RectTransform:
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: 509.34, y: -225.35007}
m_AnchoredPosition: {x: 509.34, y: -255.9}
m_SizeDelta: {x: 200, y: 32.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1379644800
@@ -31878,7 +31881,7 @@ RectTransform:
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: 509.34, y: -73}
m_AnchoredPosition: {x: 510, y: -177.8}
m_SizeDelta: {x: 196.66, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1393612613
@@ -32778,6 +32781,83 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1412092646}
m_CullTransparentMesh: 1
--- !u!1 &1413966189
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1413966190}
- component: {fileID: 1413966192}
- component: {fileID: 1413966191}
m_Layer: 5
m_Name: UzenetMezoBg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1413966190
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1413966189}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1479459478}
m_Father: {fileID: 891272366}
m_RootOrder: 34
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: 508.51, y: -6.33}
m_SizeDelta: {x: 198.33, y: 205.24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1413966191
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1413966189}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8867924, g: 0.8867924, b: 0.8867924, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1413966192
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1413966189}
m_CullTransparentMesh: 1
--- !u!1 &1428119973
GameObject:
m_ObjectHideFlags: 0
@@ -33780,6 +33860,141 @@ RectTransform:
m_AnchoredPosition: {x: 20, y: 45.4}
m_SizeDelta: {x: 18.7, y: 21.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1479459477
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1479459478}
- component: {fileID: 1479459480}
- component: {fileID: 1479459479}
m_Layer: 5
m_Name: fpsText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1479459478
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1479459477}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1413966190}
m_RootOrder: 0
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: -0.0012636, y: -0.0000038147}
m_SizeDelta: {x: 198.33, y: 205.24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1479459479
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1479459477}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Uzenetek ide jonnek
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSizeBase: 20
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1479459480
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1479459477}
m_CullTransparentMesh: 1
--- !u!1 &1481990761
GameObject:
m_ObjectHideFlags: 0
@@ -35542,12 +35757,12 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_Sprite: {fileID: 21300000, guid: 91e2a85519f4f5d438dd117f0f58ced1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_Size: {x: 6, y: 5}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@@ -35561,8 +35776,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1559678231}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -40.2, y: 0.78821117, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -40.29, y: 1.181, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
@@ -48173,6 +48388,83 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2056361759}
m_CullTransparentMesh: 1
--- !u!1 &2063388575
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2063388576}
- component: {fileID: 2063388578}
- component: {fileID: 2063388577}
m_Layer: 5
m_Name: FpsBG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2063388576
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2063388575}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 947787406}
m_Father: {fileID: 891272366}
m_RootOrder: 21
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: 208.85, y: -185.71}
m_SizeDelta: {x: 160.96, y: 29.98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2063388577
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2063388575}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &2063388578
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2063388575}
m_CullTransparentMesh: 1
--- !u!1 &2070386153
GameObject:
m_ObjectHideFlags: 0

View File

@@ -440,7 +440,7 @@ GameObject:
- component: {fileID: 1310690305}
- component: {fileID: 1310690304}
m_Layer: 5
m_Name: nyert_text
m_Name: vesztettel_text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -486,7 +486,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "Veszett\xE9l"
m_text: "Vesztett\xE9l"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

File diff suppressed because it is too large Load Diff

View File

@@ -64,9 +64,9 @@ public class Akciok : MonoBehaviour
{
if (tolteny_index < 24 && ap.akciopont != 0)
{
if (tolteny_index + betarazas > 23)
if (tolteny_index + betarazas > 24)
{
tolteny_index = 23;
tolteny_index = 24;
}
else
{
@@ -79,9 +79,11 @@ public class Akciok : MonoBehaviour
}
betarazott_tolteny += betarazas;
if(betarazott_tolteny > 24){
betarazott_tolteny = 24;
}
//tolteny_index++;
ap.UpdateAkciopont(-1);
Debug.Log("Tolteny betarazva");

View File

@@ -7,6 +7,8 @@ public class Dice : MonoBehaviour {
public Sprite[] diceSides = new Sprite[6];
public SpriteRenderer hely1;
public SpriteRenderer hely2;
public SpriteRenderer animacio1;
public SpriteRenderer animacio2;
public Button dice1btnBtn;
public Button dice2btnBtn;
private Upgrade upgrade;
@@ -107,12 +109,12 @@ public class Dice : MonoBehaviour {
if(!ugynokDobasErtek)
ap.UpdateAkciopont(getValasztottErtek() + upgrade.akcio[upgrade.getAkcioIndex()]);
if(elsoDobas){
/*if(elsoDobas){
//jatek kezdeskor elso dobas ugynok csapat meghatarozas kezdo helyszinen
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.UgynokValasztas);
CallRenderDice(true);
elsoDobas = false;
}
}*/
}
Debug.Log("valasztott ertek: " + valasztottErtek + " locked status: " + locked);
@@ -143,6 +145,10 @@ public class Dice : MonoBehaviour {
diceResult[1] = RollDice();
} while (diceResult[0] == diceResult[1]);
//dice porgo animacio
StartCoroutine(AnimateTheDice(hely1, diceResult[0]));
StartCoroutine(AnimateTheDice(hely2, diceResult[1]));
//lassa a jatekos mit dobott
hely1.sprite = diceSides[diceResult[0]-1];
hely1.size = new Vector2(38, 38);
@@ -267,4 +273,30 @@ public class Dice : MonoBehaviour {
public void setAdrenalinMegerosites(bool adrenalinMegerosites) {
this.adrenalinMegerosites = adrenalinMegerosites;
}
private IEnumerator AnimateTheDice(SpriteRenderer rend, int diceErtek)
{
int randomDiceSide;
float time = 0f;
bool fusson = true;
while(fusson){
time += Time.time;
Debug.Log("time: " + time);
if(time >= 200f) fusson = false;
randomDiceSide = Random.Range(0, 5);
rend.sprite = diceSides[Random.Range(0, 5)];
rend.size = new Vector2(38, 38);
yield return new WaitForSeconds(0.05f);
}
rend.sprite = diceSides[diceErtek - 1];
rend.size = new Vector2(38, 38);
}
}

View File

@@ -7,6 +7,7 @@ using TMPro;
public class Ugynok : MonoBehaviour
{
private Akciok akciok;
private Akciopont ap;
private Upgrade upgrade;
private jatekmanager jatekmanager;
private Elet elet;
@@ -39,6 +40,7 @@ public class Ugynok : MonoBehaviour
jatekmanager = FindObjectOfType<jatekmanager>();
movement = FindObjectOfType<movement>();
elet = FindObjectOfType<Elet>();
ap = FindObjectOfType<Akciopont>();
previus_ugynok_csapatok = new string[3];
@@ -322,6 +324,14 @@ public class Ugynok : MonoBehaviour
Debug.Log("nincs eleg tolteny");
return;
}
if(ap.akciopont < 2){
Debug.Log("nincs eleg ap az oleshez");
return;
}else{
ap.UpdateAkciopont(-2); //harc koltseg
}
akciok.Loves(ugynokcsapatletszama / upgrade.harc[upgrade.getHarcIndex()]);
Debug.Log("tolteny szama:" + ugynokcsapatletszama / upgrade.harc[upgrade.getHarcIndex()]);
}
@@ -332,6 +342,7 @@ public class Ugynok : MonoBehaviour
//minden vissza kapcsolasa
//jatekmanager.ugynokDeaktivalas(true);
jatekmanager.UpdateGameState(jatekmanager.GameState.Akcio); //miutan vegzett menjen az akcio state-re
droidagyuAktivalva = false;
}

View File

@@ -78,7 +78,7 @@ public class helyszinaktivalas : MonoBehaviour
jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
if(!targyak.matavtaviranyitoAktivalva){
//akciopont.akciopont++;
akciopont.UpdateAkciopont(1);
//akciopont.UpdateAkciopont(1);
energia.csokkenEnergia(2);
}

View File

@@ -192,8 +192,10 @@ public class jatekmanager : MonoBehaviour
}
public void NevValasztasUtan(){
if(!nev.text.Equals(""))
Instance.UpdateGameState(GameState.KorKezdet);
if(!nev.text.Equals("")){
UpdateGameState(GameState.UgynokValasztas);
dice.CallRenderDice(true);
}
}
private async void HandleUgynokNev(){
@@ -271,7 +273,7 @@ public class jatekmanager : MonoBehaviour
movement.threethree_Collider.gameObject.SetActive(true);
movement.threefour_Collider.gameObject.SetActive(true);
//rolldice.SetActive(false);
rolldice.SetActive(true);
}
private async void HandleVesztette()

View File

@@ -7,6 +7,7 @@ public class MainMenu : MonoBehaviour
{
public GameObject MainMenuObj;
public GameObject OptionsMenu;
public GameObject CreditsMenuObj;
public GameObject VideoButton;
public void PlayGame()
@@ -36,4 +37,9 @@ public class MainMenu : MonoBehaviour
VideoButton.SetActive(true);
}
}
public void CreditsMenu(){
MainMenuObj.SetActive(false);
CreditsMenuObj.SetActive(true);
}
}

View File

@@ -61,7 +61,7 @@ Material:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
- _UnderlayColor: {r: 1, g: 0.0141509175, b: 0.0141509175, a: 0.5}
m_BuildTextureStacks: []
--- !u!114 &11400000
MonoBehaviour:

View File

@@ -6,17 +6,17 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0
RecentlyUsedSceneGuid-1:
value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a
flags: 0
RecentlyUsedSceneGuid-2:
RecentlyUsedSceneGuid-1:
value: 07040753500359095b580a2641275e41444f19297c2d2363752d4a35b1b46339
flags: 0
RecentlyUsedSceneGuid-3:
RecentlyUsedSceneGuid-2:
value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d
flags: 0
RecentlyUsedSceneGuid-3:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0
UnityRemoteCompression:
value: 29617121
flags: 0

View File

@@ -15,11 +15,11 @@ MonoBehaviour:
m_PixelRect:
serializedVersion: 2
x: 0
y: 28
width: 1366
height: 680
y: 43
width: 1920
height: 997
m_ShowMode: 4
m_Title: Game
m_Title: Inspector
m_RootView: {fileID: 3}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -39,12 +39,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 898
x: 1377
y: 0
width: 468
height: 630
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
width: 543
height: 947
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
@@ -70,8 +70,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1366
height: 680
width: 1920
height: 997
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -95,7 +95,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1366
width: 1920
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -116,8 +116,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 660
width: 1366
y: 977
width: 1920
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -140,12 +140,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 30
width: 1366
height: 630
width: 1920
height: 947
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 19
controlID: 94
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -165,12 +165,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 898
height: 630
width: 1377
height: 947
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 63
controlID: 82
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -190,12 +190,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 898
height: 391
width: 1377
height: 661
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 64
controlID: 83
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -213,10 +213,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 259
height: 391
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
width: 228
height: 661
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -237,10 +237,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 259
x: 228
y: 0
width: 639
height: 391
width: 1149
height: 661
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14}
@@ -265,9 +265,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 391
width: 898
height: 239
y: 661
width: 1377
height: 286
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16}
@@ -296,10 +296,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 259
y: 86
width: 637
height: 370
x: 228
y: 73
width: 1147
height: 640
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -310,7 +310,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 637, y: 349}
m_TargetSize: {x: 1147, y: 619}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -325,10 +325,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -318.5
m_HBaseRangeMax: 318.5
m_VBaseRangeMin: -174.5
m_VBaseRangeMax: 174.5
m_HBaseRangeMin: -573.5
m_HBaseRangeMax: 573.5
m_VBaseRangeMin: -309.5
m_VBaseRangeMax: 309.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -346,23 +346,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 637
height: 349
width: 1147
height: 619
m_Scale: {x: 1, y: 1}
m_Translation: {x: 318.5, y: 174.5}
m_Translation: {x: 573.5, y: 309.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -318.5
y: -174.5
width: 637
height: 349
x: -573.5
y: -309.5
width: 1147
height: 619
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 637, y: 370}
m_LastWindowPixelSize: {x: 1147, y: 640}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -389,19 +389,19 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 86
width: 258
height: 370
y: 73
width: 227
height: 640
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 419}
m_SelectedIDs: f26e0000
m_LastClickedID: 28402
m_ExpandedIDs: 28fbffff246c0000626e0000966f000096700000e8730000
scrollPos: {x: 0, y: 197}
m_SelectedIDs: 886e0000
m_LastClickedID: 28296
m_ExpandedIDs: 0e69ffff6874ffff28fbffff9e700000d4700000287100003675000012780000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -445,10 +445,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 259
y: 86
width: 637
height: 370
x: 228
y: 73
width: 1147
height: 640
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -545,7 +545,7 @@ MonoBehaviour:
containerId: overlay-container--right
floating: 0
collapsed: 0
displayed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
@@ -698,16 +698,16 @@ MonoBehaviour:
m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
m_Gizmos: 1
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 0
m_SceneIsLit: 1
m_SceneLighting: 1
m_2DMode: 1
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -1.8306633, y: -3.2436488, z: 0.12008308}
m_Target: {x: -9.559104, y: -0.1136321, z: -0.011797322}
speed: 2
m_Value: {x: -1.8306633, y: -3.2436488, z: 0.12008308}
m_Value: {x: -9.100242, y: -0.020794325, z: -0.016469676}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -758,9 +758,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 9.074684
m_Target: 9.915714
speed: 2
m_Value: 9.074684
m_Value: 10.382947
m_Ortho:
m_Target: 1
speed: 2
@@ -806,9 +806,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 496
width: 819
height: 199
y: 720
width: 1376
height: 279
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -834,14 +834,14 @@ MonoBehaviour:
m_LastFolders:
- Assets/Scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: /home/tom/Documents/dev/find the source
m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 387a0000
m_LastClickedID: 31288
m_ExpandedIDs: 00000000147a000000ca9a3b
m_SelectedIDs: 3e7a0000
m_LastClickedID: 31294
m_ExpandedIDs: 000000001a7a00003a7a0000487a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -869,7 +869,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000147a0000
m_ExpandedIDs: 000000001a7a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -894,8 +894,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 9e6c0000
m_LastClickedInstanceID: 27806
m_SelectedInstanceIDs: cc760000
m_LastClickedInstanceID: 30412
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
@@ -921,7 +921,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 60}
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
@@ -946,9 +946,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 477
width: 897
height: 218
y: 734
width: 1376
height: 265
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -973,10 +973,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 898
y: 86
width: 467
height: 609
x: 1377
y: 73
width: 542
height: 926
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -988,7 +988,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 702
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: