Изменён текст
This commit is contained in:
parent
21d0dc79e5
commit
25144da5be
@ -1,5 +1,176 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1084912905228280655
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6381787581279840726}
|
||||
- component: {fileID: 5352818066113057206}
|
||||
- component: {fileID: 7815083663742870766}
|
||||
m_Layer: 0
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6381787581279840726
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1084912905228280655}
|
||||
m_LocalRotation: {x: -0.27563733, y: 0, z: 0, w: 0.96126175}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 31}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 359741391555935905}
|
||||
m_LocalEulerAnglesHint: {x: -32, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 20}
|
||||
m_SizeDelta: {x: 20, y: 5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!23 &5352818066113057206
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1084912905228280655}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!114 &7815083663742870766
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1084912905228280655}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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: "\u0421\u0447\u0451\u0442 - 0"
|
||||
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: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, 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: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
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: 0
|
||||
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
|
||||
_SortingLayer: 0
|
||||
_SortingLayerID: 0
|
||||
_SortingOrder: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_renderer: {fileID: 5352818066113057206}
|
||||
m_maskType: 0
|
||||
--- !u!1 &1478161082377504939
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -201,6 +372,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6381787581279840726}
|
||||
- {fileID: 1263357622982229807}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -216,4 +388,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 3139efcae2b31a64f88f543730cea817, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_ScoreText: {fileID: 4155697755104840522}
|
||||
_PlayerTransform: {fileID: 0}
|
||||
_Distance: 50
|
||||
_ScoreText: {fileID: 7815083663742870766}
|
||||
|
||||
@ -122,6 +122,11 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!4 &482978294 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 243723136171841685, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3}
|
||||
m_PrefabInstance: {fileID: 3034490512036249413}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &593427418 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2491700103206237577, guid: ad34e5f884ceba0459e127656e282c6e, type: 3}
|
||||
@ -140,6 +145,7 @@ GameObject:
|
||||
- component: {fileID: 894356745}
|
||||
- component: {fileID: 894356744}
|
||||
- component: {fileID: 894356743}
|
||||
- component: {fileID: 894356747}
|
||||
m_Layer: 0
|
||||
m_Name: Close Zone
|
||||
m_TagString: Close Zone
|
||||
@ -160,7 +166,7 @@ Transform:
|
||||
m_LocalScale: {x: 150, y: 4.25, z: 3.5}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1779555358}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &894356743
|
||||
MonoBehaviour:
|
||||
@ -245,6 +251,18 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 894356741}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &894356747
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 894356741}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5d7babeea46928e42bede327af4205fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &904496846
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2136,7 +2154,23 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.0038549919
|
||||
value: 31
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.95881975
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.28401542
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
@ -2144,12 +2178,20 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1263357622982229807, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -45
|
||||
value: -33
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1478161082377504939, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1510913528632895574, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: _Distance
|
||||
value: 50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1510913528632895574, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: _PlayerTransform
|
||||
value:
|
||||
objectReference: {fileID: 482978294}
|
||||
- target: {fileID: 1812251619614480449, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Score Manager
|
||||
@ -2159,13 +2201,11 @@ PrefabInstance:
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 359741391555935905, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 894356742}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1478161082377504939, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1478161082377504939, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
- targetCorrespondingSourceObject: {fileID: 1084912905228280655, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 0}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
@ -2199,6 +2239,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
scoreManager: {fileID: 0}
|
||||
MoveWithTile: {fileID: 0}
|
||||
_NumTile: 20
|
||||
_DistanceTiles: 30
|
||||
_TilePrefs:
|
||||
@ -2224,11 +2265,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &1779555358 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 359741391555935905, guid: d345ba61556173847ba32546368899cd, type: 3}
|
||||
m_PrefabInstance: {fileID: 1744412849}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1870866336
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2549,6 +2585,7 @@ SceneRoots:
|
||||
- {fileID: 1140935468}
|
||||
- {fileID: 1750947391}
|
||||
- {fileID: 1744412849}
|
||||
- {fileID: 894356742}
|
||||
- {fileID: 1991568992}
|
||||
- {fileID: 1322744478}
|
||||
- {fileID: 3034490512036249413}
|
||||
|
||||
@ -8,7 +8,13 @@ public class ScoreManagerScript : MonoBehaviour
|
||||
{
|
||||
// to do
|
||||
// добавить коментарии ко всему
|
||||
private TileManagerScript _tileManagerScript;
|
||||
private TileManagerScript _TileManagerScript;
|
||||
|
||||
[SerializeField]
|
||||
private Transform _PlayerTransform;
|
||||
|
||||
[SerializeField]
|
||||
private float _Distance = 0f;
|
||||
|
||||
private int _CurrentScore = 0;
|
||||
|
||||
@ -17,17 +23,19 @@ public class ScoreManagerScript : MonoBehaviour
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_tileManagerScript = GameObject.FindGameObjectWithTag("Tile Manager").GetComponent<TileManagerScript>();
|
||||
_TileManagerScript = GameObject.FindGameObjectWithTag("Tile Manager").GetComponent<TileManagerScript>();
|
||||
|
||||
if (_tileManagerScript != null)
|
||||
if (_TileManagerScript != null)
|
||||
{
|
||||
_tileManagerScript.scoreManager = this;
|
||||
_TileManagerScript.scoreManager = this;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void Start()
|
||||
private void Update()
|
||||
{
|
||||
|
||||
UpdatePos();
|
||||
}
|
||||
|
||||
public void Increase()
|
||||
@ -41,9 +49,15 @@ public class ScoreManagerScript : MonoBehaviour
|
||||
text.text = $"Счёт - {_CurrentScore}";
|
||||
}
|
||||
|
||||
//public void UpdatePos()
|
||||
//{
|
||||
// Vector3 newVector = new Vector3(_ScoreText.gameObject.transform.position.x, _ScoreText.gameObject.transform.position.y, _ScoreText.gameObject.transform.position.z + _TileManagerScript.DistanceTiles);
|
||||
// _ScoreText.gameObject.transform.position = newVector;
|
||||
//}
|
||||
|
||||
public void UpdatePos()
|
||||
{
|
||||
Vector3 newVector = new Vector3(_ScoreText.gameObject.transform.position.x, _ScoreText.gameObject.transform.position.y, _ScoreText.gameObject.transform.position.z + _tileManagerScript.DistanceTiles);
|
||||
Vector3 newVector = new Vector3(_ScoreText.gameObject.transform.position.x, _ScoreText.gameObject.transform.position.y, _PlayerTransform.position.z + _Distance);
|
||||
_ScoreText.gameObject.transform.position = newVector;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user