htamas1210/PuzzleColorBall
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
playmaker1210
2023-04-29 17:07:23 +02:00
parent 2f4caf9a07
commit 25d792e0fd
10 changed files with 6875 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Resources/Prefabs/World Objects.meta Normal file
View File

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

8
Assets/Resources/Prefabs/World Objects/World1.meta Normal file
View File

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

4317
Assets/Resources/Prefabs/World Objects/World1/haz1.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Prefabs/World Objects/World1/haz1.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 801674bb4f54353d3966591ac2876a92
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2441
Assets/Resources/Prefabs/World Objects/World1/haz2.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Prefabs/World Objects/World1/haz2.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8500f6075c56d47809b2a1e2dfb10d39
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Scenes/Menu.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1}
m_IndirectSpecularColor: {r: 0.56158954, g: 0.7218083, b: 0.8178571, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3276,6 +3276,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
loadFrom: []
sideObjects: []
sideObjectsSpawned: []
materials:
- {fileID: 2100000, guid: 97cabee3711df3b4b944878d6d30edda, type: 2}
- {fileID: 2100000, guid: 197ee10712c66054cb2f88781c8d94f4, type: 2}
@@ -12409,6 +12410,10 @@ PrefabInstance:
propertyPath: m_TagString
value: Floor
objectReference: {fileID: 0}
- target: {fileID: 7191957008091885843, guid: d73ae45b499e5f74ba3e0d287b87893c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 97cabee3711df3b4b944878d6d30edda, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d73ae45b499e5f74ba3e0d287b87893c, type: 3}
--- !u!1 &5948498191493442793

11
Assets/Scripts/GroundController.cs
View File

@@ -7,9 +7,11 @@ public class GroundController : MonoBehaviour
private GameObject[] ground;
public GameObject[] loadFrom;
public GameObject[] sideObjects;
public GameObject[] sideObjectsSpawned;
public Material[] materials;
public int materialIndex = 0;
public float groundMoveSpeed = 10f;
private Vector3 lastSideObjectPos = new Vector3(0,0,0);
//private CollectibleSpawner cs;
@@ -18,7 +20,7 @@ public class GroundController : MonoBehaviour
//Loading modules
loadFrom = LoadPrefabs("Prefabs/Modulok");
sideObjects = LoadPrefabs("Models/World Objects/World 1");
sideObjects = LoadPrefabs("Prefabs/World Objects/World 1");
Debug.Log("loadFrom length: " + loadFrom.Length);
Debug.Log("sideObjects Length: " + sideObjects.Length);
@@ -42,6 +44,7 @@ public class GroundController : MonoBehaviour
//uj ground letrehozas
if(ground[ground.Length-1].transform.position.z <= 120){
CreateNewGround();
CreateNewSideObjects();
ground = GameObject.FindGameObjectsWithTag("Ground");
@@ -79,6 +82,12 @@ public class GroundController : MonoBehaviour
return arr;
}
private void CreateNewSideObjects(){
int random = UnityEngine.Random.Range(0, sideObjects.Length);
Instantiate(sideObjects[random], lastSideObjectPos + new Vector3(0,0,20), ground[0].transform.rotation);
}
public void changeMaterialIndex(){
}

1
ProjectSettings/TagManager.asset
View File

@@ -11,6 +11,7 @@ TagManager:
- Obstacle
- Collectible
- DeathCollider
- SideObject
layers:
- Default
- TransparentFX

140
UserSettings/Layouts/default-2021.dwlt
View File

@@ -17,9 +17,9 @@ MonoBehaviour:
x: 0
y: 28
width: 1366
height: 673
height: 680
m_ShowMode: 4
m_Title: Simulator
m_Title: Console
m_RootView: {fileID: 7}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -39,10 +39,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 689
x: 646
y: 0
width: 295
height: 389
width: 401
height: 496
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13}
@@ -70,11 +70,11 @@ MonoBehaviour:
x: 0
y: 30
width: 1366
height: 623
height: 630
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 25
controlID: 142
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -90,12 +90,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 984
x: 1047
y: 0
width: 382
height: 623
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
width: 319
height: 630
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -118,8 +118,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 161
height: 389
width: 239
height: 496
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16}
@@ -137,23 +137,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 389
width: 984
height: 234
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 14}
y: 496
width: 1047
height: 134
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 14}
- {fileID: 18}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -175,7 +175,7 @@ MonoBehaviour:
x: 0
y: 0
width: 1366
height: 673
height: 680
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -220,7 +220,7 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 653
y: 660
width: 1366
height: 20
m_MinSize: {x: 0, y: 0}
@@ -244,12 +244,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 984
height: 623
width: 1047
height: 630
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 26
controlID: 143
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -270,12 +270,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 984
height: 389
width: 1047
height: 496
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
controlID: 27
controlID: 56
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -291,10 +291,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 161
x: 239
y: 0
width: 528
height: 389
width: 407
height: 496
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
@@ -322,10 +322,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 689
x: 646
y: 86
width: 293
height: 368
width: 399
height: 475
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -354,7 +354,7 @@ MonoBehaviour:
- UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
pluginStates:
- '{}'
scale: 13
scale: 17
fitToScreenEnabled: 1
rotationDegree: 0
highlightSafeAreaEnabled: 0
@@ -382,9 +382,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 475
width: 983
height: 213
y: 582
width: 1046
height: 113
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -402,22 +402,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets
- Assets/Resources/Materials
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 53
m_LastFolders:
- Assets
- Assets/Resources/Materials
m_LastFoldersGridSize: 53
m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: b05f0000
m_LastClickedID: 24496
m_ExpandedIDs: 00000000b05f000000ca9a3b
scrollPos: {x: 0, y: 127}
m_SelectedIDs: 9e5f0000
m_LastClickedID: 24478
m_ExpandedIDs: 000000008a5f00008c5f00008e5f0000905f000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -445,7 +445,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000b05f0000
m_ExpandedIDs: 000000008a5f00008c5f00008e5f0000905f0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -472,7 +472,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -489,7 +489,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 6}
m_ClientGUIView: {fileID: 0}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -521,10 +521,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 984
x: 1047
y: 86
width: 381
height: 602
width: 318
height: 609
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -536,7 +536,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 0
m_LastVerticalScrollValue: 216
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker:
@@ -564,8 +564,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 86
width: 160
height: 368
width: 238
height: 475
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -575,7 +575,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 06fbffff
m_ExpandedIDs: f8b3ffff5eb4ffff78b5ffffaabdffff86f5ffff18fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -619,10 +619,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 161
x: 239
y: 86
width: 526
height: 368
width: 405
height: 475
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -857,9 +857,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 18.005922, y: 25.929068, z: 27.950302}
m_Target: {x: -3.0000005, y: 0, z: 37.199997}
speed: 2
m_Value: {x: 18.005922, y: 25.929068, z: 27.950302}
m_Value: {x: -3.0000005, y: 0, z: 37.199997}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -898,7 +898,7 @@ MonoBehaviour:
m_Fade:
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
@@ -906,13 +906,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.20447084, y: 0.33339912, z: -0.07431277, w: -0.91734326}
m_Target: {x: 0.058660932, y: 0.9411822, z: -0.22614713, w: 0.2441374}
speed: 2
m_Value: {x: -0.20171747, y: 0.33361983, z: -0.073312074, w: -0.9179506}
m_Value: {x: 0.058660623, y: 0.94117725, z: -0.22614594, w: 0.24413612}
m_Size:
m_Target: 27.383923
m_Target: 20.056421
speed: 2
m_Value: 27.383923
m_Value: 20.056421
m_Ortho:
m_Target: 0
speed: 2
@@ -958,9 +958,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 663
width: 1382
height: 336
y: 582
width: 1046
height: 113
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default