Commit d77f599c authored by M-e-e's avatar M-e-e

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/_Game/Scenes/Levels/Intro.unity
parents 4dc7148b 0995e9f8
This diff is collapsed.
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class StoryTextSelectScreen : MonoBehaviour
{
}
fileFormatVersion: 2
guid: f27f05b1a220f6643afaeb7932bc14f0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 454c6f35177af2944bbe45b2ee217b5b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: MaxLevelNum
m_EditorClassIdentifier:
DeveloperDescription:
value: 10
value: 5
oldValue: 1
Changed: {fileID: 0}
ChangedWithHistory: {fileID: 0}
......@@ -74,7 +74,7 @@ RectTransform:
m_GameObject: {fileID: 6353232395858310734}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -37.46525}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_Children:
- {fileID: 6353232396652153179}
- {fileID: 4133613943468324356}
......@@ -145,7 +145,7 @@ MonoBehaviour:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.9622642, g: 0.049928807, b: 0.049928807, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_SelectedColor: {r: 0.4811321, g: 0.4811321, b: 0.4811321, a: 1}
m_DisabledColor: {r: 1, g: 1, b: 1, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
......@@ -206,9 +206,39 @@ MonoBehaviour:
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5524448723406144138}
m_MethodName: PlaySound
- m_Target: {fileID: 0}
m_MethodName:
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- eventID: 9
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- eventID: 10
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
......@@ -282,15 +312,16 @@ MonoBehaviour:
m_Calls: []
m_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: e8ed87b03a26dd14b9b99e5dc7c7f088, type: 2}
m_sharedMaterial: {fileID: 9049235665900213045, guid: e8ed87b03a26dd14b9b99e5dc7c7f088,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
rgba: 4294104761
m_fontColor: {r: 0.7254902, g: 0.8392157, b: 0.9490196, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
......
......@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 0
m_UseShadowmask: 1
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
......
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityAtoms;
......@@ -10,16 +11,25 @@ public class SelLevelManager : MonoBehaviour
{
[SerializeField] private IntVariable levelsnum;
public Button lvlaccessbtn;
public GameObject LevelGrid;
public int counter;
public void OnEnable()
{
activateLevels();
}
public void activateLevels()
{
LevelGrid = GameObject.FindGameObjectWithTag("SelLevelGrid");
//LevelGrid = GameObject.FindGameObjectWithTag("SelLevelGrid");
Debug.Log("entered activateLevels");
for (int i = 0; i < levelsnum.Value; i++)
for (int i = 0; i < levelsnum.Value-(counter*7); i++)
{
lvlaccessbtn = LevelGrid.transform.GetChild(i).GetComponent<Button>();
lvlaccessbtn.interactable = true;
lvlaccessbtn = this.transform.GetChild(i).GetComponent<Button>();
lvlaccessbtn.interactable = true;
}
}
}
......@@ -7,6 +7,8 @@ TagManager:
- SelLevelGrid
- SelLevelBtn
- SizePickUp
- FireDirection
- Quote
layers:
- Default
- TransparentFX
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment