Compare commits
1 Commits
e776b9476e
...
EdaSweeSpo
| Author | SHA1 | Date | |
|---|---|---|---|
| a15a9790b5 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -499,3 +499,5 @@ FodyWeavers.xsd
|
|||||||
|
|
||||||
# End of https://www.toptal.com/developers/gitignore/api/unity,visualstudiocode,visualstudio,vim
|
# End of https://www.toptal.com/developers/gitignore/api/unity,visualstudiocode,visualstudio,vim
|
||||||
|
|
||||||
|
|
||||||
|
.utmp/
|
||||||
|
|||||||
8
Assets/Build Profiles.meta
Normal file
8
Assets/Build Profiles.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 92df50b8fba934144a4c4dcaf506f9b4
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Dancing triangle 1 Hour [YB3yHfqdw3Y].mp3
Normal file
BIN
Assets/Dancing triangle 1 Hour [YB3yHfqdw3Y].mp3
Normal file
Binary file not shown.
23
Assets/Dancing triangle 1 Hour [YB3yHfqdw3Y].mp3.meta
Normal file
23
Assets/Dancing triangle 1 Hour [YB3yHfqdw3Y].mp3.meta
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 58ebc3ffa125a9949953f6704e0a8c39
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 8
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -62,6 +62,7 @@ public class GameManager : MonoBehaviour
|
|||||||
"MiniGame-FlappyBird",
|
"MiniGame-FlappyBird",
|
||||||
"MiniGame-ThrowInHole",
|
"MiniGame-ThrowInHole",
|
||||||
"MiniGame-Satelit"
|
"MiniGame-Satelit"
|
||||||
|
// Add minigame scene name here
|
||||||
};
|
};
|
||||||
|
|
||||||
[Header("Debug")]
|
[Header("Debug")]
|
||||||
|
|||||||
@@ -1,8 +1,16 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 2230bf768ecb84610af77bea6cdd7074
|
||||||
|
=======
|
||||||
guid: 6b37670de43269e4f984694475e75510
|
guid: 6b37670de43269e4f984694475e75510
|
||||||
|
>>>>>>> origin/main
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
<<<<<<< HEAD
|
||||||
|
assetBundleVariant:
|
||||||
|
=======
|
||||||
|
assetBundleVariant:
|
||||||
|
>>>>>>> origin/main
|
||||||
|
|||||||
8
Assets/Readme.asset.meta
Normal file
8
Assets/Readme.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: befd731805f7270498a643333899b479
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
7
Assets/SampleScene.unity.meta
Normal file
7
Assets/SampleScene.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8afa6ce05eb7dba4c894b910786e3baf
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -119,7 +119,8 @@ NavMeshSettings:
|
|||||||
debug:
|
debug:
|
||||||
m_Flags: 0
|
m_Flags: 0
|
||||||
m_NavMeshData: {fileID: 0}
|
m_NavMeshData: {fileID: 0}
|
||||||
--- !u!1 &350850563
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
--- !u!1 &26104820
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -127,9 +128,49 @@ GameObject:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
|
- component: {fileID: 26104821}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: GameObject (1)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &26104821
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 26104820}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0.9, y: 5.3, z: -20.9}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &871248414
|
||||||
|
=======
|
||||||
|
--- !u!1 &350850563
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
- component: {fileID: 871248415}
|
||||||
|
- component: {fileID: 871248419}
|
||||||
|
- component: {fileID: 871248420}
|
||||||
|
=======
|
||||||
- component: {fileID: 350850566}
|
- component: {fileID: 350850566}
|
||||||
- component: {fileID: 350850565}
|
- component: {fileID: 350850565}
|
||||||
- component: {fileID: 350850564}
|
- component: {fileID: 350850564}
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: EventSystem
|
m_Name: EventSystem
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -187,7 +228,46 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
--- !u!114 &871248419
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 871248414}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d665da208a5a3ad408e85341263c60e5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: '::'
|
||||||
|
ball: {fileID: 3655566030548358981}
|
||||||
|
forceStrength: 50
|
||||||
|
dampingPerSecond: 0.9
|
||||||
|
--- !u!114 &871248420
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 871248414}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 9f70c5a8e211b7142b26b4ea95bf2348, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: '::'
|
||||||
|
platformController: {fileID: 871248419}
|
||||||
|
goalTrigger: {fileID: 1036109236}
|
||||||
|
ball: {fileID: 3655566030548358981}
|
||||||
|
startSound: {fileID: 0}
|
||||||
|
winSound: {fileID: 0}
|
||||||
|
isActive: 1
|
||||||
|
freezeOnWin: 1
|
||||||
|
disableBallOnWin: 0
|
||||||
|
--- !u!1 &1036109232
|
||||||
|
=======
|
||||||
--- !u!1 &713781621
|
--- !u!1 &713781621
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -195,22 +275,136 @@ GameObject:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
- component: {fileID: 1036109235}
|
||||||
|
- component: {fileID: 1036109234}
|
||||||
|
- component: {fileID: 1036109236}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: HoleTrigger
|
||||||
|
=======
|
||||||
- component: {fileID: 713781622}
|
- component: {fileID: 713781622}
|
||||||
- component: {fileID: 713781624}
|
- component: {fileID: 713781624}
|
||||||
- component: {fileID: 713781623}
|
- component: {fileID: 713781623}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: RawImage
|
m_Name: RawImage
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
--- !u!65 &1036109234
|
||||||
|
BoxCollider:
|
||||||
|
=======
|
||||||
--- !u!224 &713781622
|
--- !u!224 &713781622
|
||||||
RectTransform:
|
RectTransform:
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
m_GameObject: {fileID: 1036109232}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_ProvidesContacts: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 3
|
||||||
|
m_Size: {x: 1, y: 1, z: 1}
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!4 &1036109235
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1036109232}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 2.57, y: 1.67, z: -16.17}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &1036109236
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1036109232}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e6bad0eb7441229448191433d8a9f758, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: '::'
|
||||||
|
ballRigidbody: {fileID: 3655566030548358981}
|
||||||
|
requireBallTag: 1
|
||||||
|
--- !u!1 &1078774431
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1078774434}
|
||||||
|
- component: {fileID: 1078774433}
|
||||||
|
- component: {fileID: 1078774432}
|
||||||
|
- component: {fileID: 1078774436}
|
||||||
|
- component: {fileID: 1078774435}
|
||||||
|
- component: {fileID: 1078774437}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Main Camera
|
||||||
|
m_TagString: MainCamera
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!81 &1078774432
|
||||||
|
AudioListener:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1078774431}
|
||||||
|
m_Enabled: 1
|
||||||
|
--- !u!20 &1078774433
|
||||||
|
Camera:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1078774431}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_ClearFlags: 2
|
||||||
|
m_BackGroundColor: {r: 0.764151, g: 0.65241194, b: 0.752649, a: 0}
|
||||||
|
m_projectionMatrixMode: 1
|
||||||
|
m_GateFitMode: 2
|
||||||
|
m_FOVAxisMode: 0
|
||||||
|
m_Iso: 200
|
||||||
|
m_ShutterSpeed: 0.005
|
||||||
|
m_Aperture: 16
|
||||||
|
m_FocusDistance: 10
|
||||||
|
m_FocalLength: 50
|
||||||
|
m_BladeCount: 5
|
||||||
|
m_Curvature: {x: 2, y: 11}
|
||||||
|
m_BarrelClipping: 0.25
|
||||||
|
m_Anamorphism: 0
|
||||||
|
m_SensorSize: {x: 36, y: 24}
|
||||||
|
m_LensShift: {x: 0, y: 0}
|
||||||
|
m_NormalizedViewPortRect:
|
||||||
|
=======
|
||||||
m_GameObject: {fileID: 713781621}
|
m_GameObject: {fileID: 713781621}
|
||||||
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_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
@@ -246,20 +440,182 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Texture: {fileID: 8400000, guid: 4d595312cdcdd094cbe411227603ceea, type: 2}
|
m_Texture: {fileID: 8400000, guid: 4d595312cdcdd094cbe411227603ceea, type: 2}
|
||||||
m_UVRect:
|
m_UVRect:
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 1
|
width: 1
|
||||||
height: 1
|
height: 1
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
near clip plane: 0.3
|
||||||
|
far clip plane: 1000
|
||||||
|
field of view: 131.6
|
||||||
|
orthographic: 0
|
||||||
|
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!4 &1078774434
|
||||||
|
Transform:
|
||||||
|
=======
|
||||||
--- !u!222 &713781624
|
--- !u!222 &713781624
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
m_GameObject: {fileID: 1078774431}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0.994375, y: -0, z: -0, w: 0.10591704}
|
||||||
|
m_LocalPosition: {x: 0.013403273, y: 0.0635, z: 0.1102}
|
||||||
|
m_LocalScale: {x: 0.016666666, y: 0.015950274, z: 0.03959131}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1359128623787926744}
|
||||||
|
m_LocalEulerAnglesHint: {x: 167.84, y: 0, z: 0}
|
||||||
|
--- !u!114 &1078774435
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1078774431}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 37f33c8b63e5b384db6a385b909b27aa, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: '::'
|
||||||
|
clip: {fileID: 8300000, guid: 58ebc3ffa125a9949953f6704e0a8c39, type: 3}
|
||||||
|
--- !u!82 &1078774436
|
||||||
|
AudioSource:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1078774431}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
OutputAudioMixerGroup: {fileID: 0}
|
||||||
|
m_audioClip: {fileID: 0}
|
||||||
|
m_Resource: {fileID: 0}
|
||||||
|
m_PlayOnAwake: 1
|
||||||
|
m_Volume: 1
|
||||||
|
m_Pitch: 1
|
||||||
|
Loop: 0
|
||||||
|
Mute: 0
|
||||||
|
Spatialize: 0
|
||||||
|
SpatializePostEffects: 0
|
||||||
|
Priority: 128
|
||||||
|
DopplerLevel: 1
|
||||||
|
MinDistance: 0.8200283
|
||||||
|
MaxDistance: 500
|
||||||
|
Pan2D: 0
|
||||||
|
rolloffMode: 0
|
||||||
|
BypassEffects: 0
|
||||||
|
BypassListenerEffects: 0
|
||||||
|
BypassReverbZones: 0
|
||||||
|
rolloffCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
panLevelCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
spreadCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
reverbZoneMixCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
--- !u!114 &1078774437
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1078774431}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b159266533f64ba4eb30ef6112cc4611, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: '::'
|
||||||
|
parent: {fileID: 0}
|
||||||
|
--- !u!1 &1757180458
|
||||||
|
=======
|
||||||
m_GameObject: {fileID: 713781621}
|
m_GameObject: {fileID: 713781621}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &863085480
|
--- !u!1 &863085480
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -356,7 +712,150 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
--- !u!1 &1859351083
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1859351086}
|
||||||
|
- component: {fileID: 1859351085}
|
||||||
|
- component: {fileID: 1859351084}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: GameObject
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1859351084
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1859351083}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 2e101cb487f02244592e16548d98f0b5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: '::'
|
||||||
|
targetPosition: {fileID: 26104821}
|
||||||
|
--- !u!65 &1859351085
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1859351083}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_ProvidesContacts: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 3
|
||||||
|
m_Size: {x: 200, y: 2, z: 200}
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!4 &1859351086
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1859351083}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 2.87, y: -1.63, z: -15.8}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!23 &519675517008124548
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382865335249670925}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 2
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||||
|
m_RayTracingAccelStructBuildFlags: 1
|
||||||
|
m_SmallMeshCulling: 1
|
||||||
|
m_ForceMeshLod: -1
|
||||||
|
m_MeshLodSelectionBias: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: -3846018093981099296, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
|
||||||
|
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_GlobalIlluminationMeshLod: 0
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
|
--- !u!33 &1048207857388389211
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1498391756221246888}
|
||||||
|
m_Mesh: {fileID: 4711208715938537054, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
|
||||||
|
--- !u!4 &1359128623787926744
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1498391756221246888}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
|
||||||
|
m_LocalPosition: {x: 1.26, y: 6.29, z: -20.48}
|
||||||
|
m_LocalScale: {x: 60, y: 60, z: 60}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 1078774434}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &1382865335249670925
|
||||||
|
=======
|
||||||
--- !u!1 &903577773
|
--- !u!1 &903577773
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -548,11 +1047,19 @@ GameObject:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
- component: {fileID: 1359128623787926744}
|
||||||
|
- component: {fileID: 1048207857388389211}
|
||||||
|
- component: {fileID: 3655566030548358980}
|
||||||
|
- component: {fileID: 3655566030548358981}
|
||||||
|
- component: {fileID: 3655566030548358982}
|
||||||
|
=======
|
||||||
- component: {fileID: 1692768359}
|
- component: {fileID: 1692768359}
|
||||||
- component: {fileID: 1692768358}
|
- component: {fileID: 1692768358}
|
||||||
- component: {fileID: 1692768357}
|
- component: {fileID: 1692768357}
|
||||||
- component: {fileID: 1692768356}
|
- component: {fileID: 1692768356}
|
||||||
- component: {fileID: 1692768355}
|
- component: {fileID: 1692768355}
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Zemekoule
|
m_Name: Zemekoule
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -579,7 +1086,35 @@ SphereCollider:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1692768354}
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
m_GameObject: {fileID: 1498391756221246888}
|
||||||
|
serializedVersion: 5
|
||||||
|
m_Mass: 20
|
||||||
|
m_LinearDamping: 0
|
||||||
|
m_AngularDamping: 0.05
|
||||||
|
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||||
|
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||||
|
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ImplicitCom: 1
|
||||||
|
m_ImplicitTensor: 1
|
||||||
|
m_UseGravity: 1
|
||||||
|
m_IsKinematic: 0
|
||||||
|
m_Interpolate: 1
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 1
|
||||||
|
--- !u!64 &3655566030548358982
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1498391756221246888}
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_IncludeLayers:
|
m_IncludeLayers:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@@ -591,6 +1126,125 @@ SphereCollider:
|
|||||||
m_IsTrigger: 0
|
m_IsTrigger: 0
|
||||||
m_ProvidesContacts: 0
|
m_ProvidesContacts: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
|
serializedVersion: 5
|
||||||
|
m_Convex: 1
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: 4711208715938537054, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
|
||||||
|
--- !u!4 &4076998000468173039
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382865335249670925}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0.033134237}
|
||||||
|
m_LocalScale: {x: 0.22222221, y: 0.125, z: 2.0199997}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 6263590706582785712}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!4 &6263590706582785712
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7970178287526494298}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
|
||||||
|
m_LocalPosition: {x: 2.5141964, y: 0.50000185, z: -16.063879}
|
||||||
|
m_LocalScale: {x: 900, y: 1599.9998, z: 50}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 4076998000468173039}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!23 &6491906927663981809
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7970178287526494298}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 2
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||||
|
m_RayTracingAccelStructBuildFlags: 1
|
||||||
|
m_SmallMeshCulling: 1
|
||||||
|
m_ForceMeshLod: -1
|
||||||
|
m_MeshLodSelectionBias: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: -876546973899608171, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
|
||||||
|
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_GlobalIlluminationMeshLod: 0
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
|
--- !u!33 &6633840909085778479
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382865335249670925}
|
||||||
|
m_Mesh: {fileID: -7387706064836869012, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
|
||||||
|
--- !u!64 &6633840909085778480
|
||||||
|
MeshCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1382865335249670925}
|
||||||
|
=======
|
||||||
|
m_GameObject: {fileID: 1692768354}
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_ProvidesContacts: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
serializedVersion: 5
|
||||||
|
m_Convex: 0
|
||||||
|
m_CookingOptions: 30
|
||||||
|
m_Mesh: {fileID: -7387706064836869012, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
|
||||||
|
--- !u!1 &7970178287526494298
|
||||||
|
=======
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_Radius: 0.5
|
m_Radius: 0.5
|
||||||
m_Center: {x: 0, y: 0, z: 0}
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
@@ -666,6 +1320,7 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1715099257
|
--- !u!1 &1715099257
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -811,9 +1466,19 @@ CanvasRenderer:
|
|||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_Roots:
|
m_Roots:
|
||||||
|
<<<<<<< HEAD:Assets/pojekt.unity
|
||||||
|
- {fileID: 1757180460}
|
||||||
|
- {fileID: 871248415}
|
||||||
|
- {fileID: 6263590706582785712}
|
||||||
|
- {fileID: 1359128623787926744}
|
||||||
|
- {fileID: 1036109235}
|
||||||
|
- {fileID: 1859351086}
|
||||||
|
- {fileID: 26104821}
|
||||||
|
=======
|
||||||
- {fileID: 903577776}
|
- {fileID: 903577776}
|
||||||
- {fileID: 863085482}
|
- {fileID: 863085482}
|
||||||
- {fileID: 1692768359}
|
- {fileID: 1692768359}
|
||||||
- {fileID: 1250930873}
|
- {fileID: 1250930873}
|
||||||
- {fileID: 1715099261}
|
- {fileID: 1715099261}
|
||||||
- {fileID: 350850566}
|
- {fileID: 350850566}
|
||||||
|
>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
|
||||||
|
|||||||
8
Assets/Scripts.meta
Normal file
8
Assets/Scripts.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 50c3453b214b4c24487f630d82fff48b
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
27
Assets/Scripts/FollowPositionOnly.cs
Normal file
27
Assets/Scripts/FollowPositionOnly.cs
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class FollowParentPositionOnly : MonoBehaviour
|
||||||
|
{
|
||||||
|
public Transform parent;
|
||||||
|
private Quaternion initialRotation;
|
||||||
|
private Vector3 worldOffset;
|
||||||
|
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
if (parent == null)
|
||||||
|
parent = transform.parent;
|
||||||
|
|
||||||
|
// Store offset in WORLD space
|
||||||
|
worldOffset = transform.position - parent.position;
|
||||||
|
initialRotation = transform.rotation;
|
||||||
|
}
|
||||||
|
|
||||||
|
void LateUpdate()
|
||||||
|
{
|
||||||
|
if (parent == null) return;
|
||||||
|
|
||||||
|
// Move child using stored world offset
|
||||||
|
transform.position = parent.position + worldOffset;
|
||||||
|
transform.rotation = initialRotation;
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/FollowPositionOnly.cs.meta
Normal file
2
Assets/Scripts/FollowPositionOnly.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b159266533f64ba4eb30ef6112cc4611
|
||||||
30
Assets/Scripts/GyroPlatformController.cs
Normal file
30
Assets/Scripts/GyroPlatformController.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class GyroPlatformController : MonoBehaviour
|
||||||
|
{
|
||||||
|
public Rigidbody ball;
|
||||||
|
public float forceStrength = 30f;
|
||||||
|
public float dampingPerSecond = 0.9f;
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
if (SystemInfo.supportsGyroscope)
|
||||||
|
{
|
||||||
|
Input.gyro.enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void FixedUpdate()
|
||||||
|
{
|
||||||
|
if (ball == null) return;
|
||||||
|
|
||||||
|
Vector3 g = Input.gyro.gravity;
|
||||||
|
|
||||||
|
Vector3 force = new Vector3(g.x, 0f, g.y);
|
||||||
|
|
||||||
|
ball.AddForce(force * forceStrength, ForceMode.Acceleration);
|
||||||
|
|
||||||
|
float frameDamping = Mathf.Pow(dampingPerSecond, Time.deltaTime);
|
||||||
|
|
||||||
|
ball.linearVelocity *= frameDamping;
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/GyroPlatformController.cs.meta
Normal file
2
Assets/Scripts/GyroPlatformController.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d665da208a5a3ad408e85341263c60e5
|
||||||
33
Assets/Scripts/HoleGoalTrigger.cs
Normal file
33
Assets/Scripts/HoleGoalTrigger.cs
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class HoleGoalTrigger : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Tooltip("Optional: assign the ball rigidbody or leave empty to accept any Rigidbody with tag Ball.")]
|
||||||
|
public Rigidbody ballRigidbody;
|
||||||
|
|
||||||
|
[Tooltip("If true, checks tag 'Ball' when ballRigidbody not assigned.")]
|
||||||
|
public bool requireBallTag = true;
|
||||||
|
|
||||||
|
public System.Action OnBallScored;
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (ballRigidbody != null)
|
||||||
|
{
|
||||||
|
if (other.attachedRigidbody == ballRigidbody)
|
||||||
|
{
|
||||||
|
OnBallScored?.Invoke();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (other.attachedRigidbody == null) return;
|
||||||
|
|
||||||
|
if (requireBallTag)
|
||||||
|
{
|
||||||
|
if (!other.CompareTag("Ball")) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
OnBallScored?.Invoke();
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/HoleGoalTrigger.cs.meta
Normal file
2
Assets/Scripts/HoleGoalTrigger.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e6bad0eb7441229448191433d8a9f758
|
||||||
30
Assets/Scripts/PlayAudioOnCamera.cs
Normal file
30
Assets/Scripts/PlayAudioOnCamera.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class PlayAudioOnCamera : MonoBehaviour
|
||||||
|
{
|
||||||
|
public AudioClip clip; // assign your audio file in the Inspector
|
||||||
|
private AudioSource audioSource;
|
||||||
|
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
// Get or add an AudioSource to this GameObject
|
||||||
|
audioSource = gameObject.GetComponent<AudioSource>();
|
||||||
|
if (audioSource == null)
|
||||||
|
{
|
||||||
|
audioSource = gameObject.AddComponent<AudioSource>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Assign the audio clip
|
||||||
|
if (clip != null)
|
||||||
|
{
|
||||||
|
audioSource.clip = clip;
|
||||||
|
audioSource.playOnAwake = false;
|
||||||
|
audioSource.loop = false; // change to true if you want looping
|
||||||
|
audioSource.Play();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogWarning("PlayAudioOnCamera: No audio clip assigned!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/PlayAudioOnCamera.cs.meta
Normal file
2
Assets/Scripts/PlayAudioOnCamera.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 37f33c8b63e5b384db6a385b909b27aa
|
||||||
29
Assets/Scripts/TeleportOnTrigger.cs
Normal file
29
Assets/Scripts/TeleportOnTrigger.cs
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class TeleportOnTrigger : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Header("Teleport Target")]
|
||||||
|
public Transform targetPosition;
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (targetPosition == null) return;
|
||||||
|
|
||||||
|
Rigidbody rb = other.attachedRigidbody;
|
||||||
|
|
||||||
|
if (rb != null)
|
||||||
|
{
|
||||||
|
// STOP ALL MOTION
|
||||||
|
rb.linearVelocity = Vector3.zero;
|
||||||
|
rb.angularVelocity = Vector3.zero;
|
||||||
|
|
||||||
|
// TELEPORT
|
||||||
|
rb.position = targetPosition.position;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Non-physics objects
|
||||||
|
other.transform.position = targetPosition.position;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/TeleportOnTrigger.cs.meta
Normal file
2
Assets/Scripts/TeleportOnTrigger.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2e101cb487f02244592e16548d98f0b5
|
||||||
187
Assets/Scripts/TiltHoleMiniGameManager.cs
Normal file
187
Assets/Scripts/TiltHoleMiniGameManager.cs
Normal file
@@ -0,0 +1,187 @@
|
|||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class TiltHoleMiniGameManager : MonoBehaviour, ITask
|
||||||
|
{
|
||||||
|
// =========================
|
||||||
|
// ITask PROPERTIES
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
public string TaskID { get; private set; } = "TILT_HOLE_01";
|
||||||
|
public TaskType TaskType { get; private set; } = TaskType.Task;
|
||||||
|
public string TaskName { get; private set; } = "Tilt Ball Into Hole";
|
||||||
|
public (double, double) TaskLocation { get; private set; } = (0, 0);
|
||||||
|
public bool IsCompleted { get; private set; }
|
||||||
|
|
||||||
|
private Action<ITask> _onCompletedCallback;
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// MINIGAME REFERENCES
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
[Header("References")]
|
||||||
|
public GyroPlatformController platformController;
|
||||||
|
public HoleGoalTrigger goalTrigger;
|
||||||
|
public Rigidbody ball;
|
||||||
|
|
||||||
|
[Header("Audio")]
|
||||||
|
public AudioClip startSound;
|
||||||
|
public AudioClip winSound;
|
||||||
|
|
||||||
|
private AudioSource audioSource;
|
||||||
|
|
||||||
|
[Header("Game State")]
|
||||||
|
public bool isActive = false;
|
||||||
|
|
||||||
|
[Header("Win Behavior")]
|
||||||
|
public bool freezeOnWin = true;
|
||||||
|
public bool disableBallOnWin = false;
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// UNITY LIFECYCLE
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
if (platformController == null) platformController = FindFirstObjectByType<GyroPlatformController>();
|
||||||
|
if (goalTrigger == null) goalTrigger = FindFirstObjectByType<HoleGoalTrigger>();
|
||||||
|
|
||||||
|
if (Camera.main != null)
|
||||||
|
{
|
||||||
|
audioSource = Camera.main.GetComponent<AudioSource>();
|
||||||
|
if (audioSource == null)
|
||||||
|
audioSource = Camera.main.gameObject.AddComponent<AudioSource>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
if (goalTrigger != null)
|
||||||
|
{
|
||||||
|
goalTrigger.OnBallScored += HandleWin;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ball != null && goalTrigger != null)
|
||||||
|
{
|
||||||
|
goalTrigger.ballRigidbody = ball;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnDestroy()
|
||||||
|
{
|
||||||
|
if (goalTrigger != null)
|
||||||
|
goalTrigger.OnBallScored -= HandleWin;
|
||||||
|
}
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// TASK LIFECYCLE
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
public void Initialize(Action<ITask> onCompleted)
|
||||||
|
{
|
||||||
|
Debug.Log("Initializing Tilt Hole Task");
|
||||||
|
|
||||||
|
IsCompleted = false;
|
||||||
|
isActive = true;
|
||||||
|
_onCompletedCallback = onCompleted;
|
||||||
|
|
||||||
|
if (platformController != null)
|
||||||
|
platformController.enabled = true;
|
||||||
|
|
||||||
|
if (ball != null)
|
||||||
|
{
|
||||||
|
ball.isKinematic = false;
|
||||||
|
ball.linearVelocity = Vector3.zero;
|
||||||
|
ball.angularVelocity = Vector3.zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (startSound != null && audioSource != null)
|
||||||
|
{
|
||||||
|
audioSource.PlayOneShot(startSound);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ExitTask(Action<ITask> onExit)
|
||||||
|
{
|
||||||
|
Debug.Log("Exiting Tilt Hole Task");
|
||||||
|
|
||||||
|
isActive = false;
|
||||||
|
|
||||||
|
if (platformController != null)
|
||||||
|
platformController.enabled = false;
|
||||||
|
|
||||||
|
onExit?.Invoke(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Complete()
|
||||||
|
{
|
||||||
|
if (IsCompleted) return;
|
||||||
|
|
||||||
|
Debug.Log("Task Complete: Tilt Hole");
|
||||||
|
|
||||||
|
IsCompleted = true;
|
||||||
|
isActive = false;
|
||||||
|
|
||||||
|
if (winSound != null && audioSource != null)
|
||||||
|
{
|
||||||
|
audioSource.PlayOneShot(winSound);
|
||||||
|
}
|
||||||
|
|
||||||
|
_onCompletedCallback?.Invoke(this);
|
||||||
|
ExitTask(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// MINIGAME WIN EVENT
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
private void HandleWin()
|
||||||
|
{
|
||||||
|
if (!isActive) return;
|
||||||
|
|
||||||
|
Debug.Log("Ball reached hole.");
|
||||||
|
|
||||||
|
if (freezeOnWin)
|
||||||
|
{
|
||||||
|
if (platformController != null)
|
||||||
|
platformController.enabled = false;
|
||||||
|
|
||||||
|
if (ball != null)
|
||||||
|
{
|
||||||
|
ball.linearVelocity = Vector3.zero;
|
||||||
|
ball.angularVelocity = Vector3.zero;
|
||||||
|
ball.isKinematic = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (disableBallOnWin && ball != null)
|
||||||
|
{
|
||||||
|
ball.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
Complete(); // 🔥 THIS completes the task
|
||||||
|
}
|
||||||
|
|
||||||
|
// =========================
|
||||||
|
// DEBUG GUI
|
||||||
|
// =========================
|
||||||
|
|
||||||
|
void OnGUI()
|
||||||
|
{
|
||||||
|
GUIStyle s = new GUIStyle(GUI.skin.label);
|
||||||
|
s.fontSize = 24;
|
||||||
|
|
||||||
|
if (isActive)
|
||||||
|
{
|
||||||
|
s.normal.textColor = Color.white;
|
||||||
|
GUI.Label(new Rect(10, 10, 700, 30),
|
||||||
|
"Goal: Tilt platform to roll the ball into the hole.", s);
|
||||||
|
}
|
||||||
|
else if (IsCompleted)
|
||||||
|
{
|
||||||
|
s.normal.textColor = Color.yellow;
|
||||||
|
GUI.Label(new Rect(10, 10, 700, 30),
|
||||||
|
"Task Completed!", s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/Scripts/TiltHoleMiniGameManager.cs.meta
Normal file
2
Assets/Scripts/TiltHoleMiniGameManager.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9f70c5a8e211b7142b26b4ea95bf2348
|
||||||
2
Assets/Scripts/WindController.cs.meta
Normal file
2
Assets/Scripts/WindController.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a2d62d3ffa507924ab3a6fd97f185f3e
|
||||||
55
Assets/Settings/Build Profiles/Android™ 1.asset
Normal file
55
Assets/Settings/Build Profiles/Android™ 1.asset
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 15003, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name: "Android\u2122 1"
|
||||||
|
m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.Build.Profile.BuildProfile
|
||||||
|
m_AssetVersion: 1
|
||||||
|
m_BuildTarget: 13
|
||||||
|
m_Subtarget: 0
|
||||||
|
m_PlatformId: b9b35072a6f44c2e863f17467ea3dc13
|
||||||
|
m_PlatformBuildProfile:
|
||||||
|
rid: 240730859082350731
|
||||||
|
m_OverrideGlobalSceneList: 0
|
||||||
|
m_Scenes: []
|
||||||
|
m_ScriptingDefines: []
|
||||||
|
m_PlayerSettingsYaml:
|
||||||
|
m_Settings: []
|
||||||
|
references:
|
||||||
|
version: 2
|
||||||
|
RefIds:
|
||||||
|
- rid: 240730859082350731
|
||||||
|
type: {class: AndroidPlatformBuildSettings, ns: UnityEditor.Android, asm: UnityEditor.Android.Extensions}
|
||||||
|
data:
|
||||||
|
m_Development: 0
|
||||||
|
m_ConnectProfiler: 0
|
||||||
|
m_BuildWithDeepProfilingSupport: 0
|
||||||
|
m_AllowDebugging: 0
|
||||||
|
m_WaitForManagedDebugger: 0
|
||||||
|
m_ManagedDebuggerFixedPort: 0
|
||||||
|
m_ExplicitNullChecks: 0
|
||||||
|
m_ExplicitDivideByZeroChecks: 0
|
||||||
|
m_ExplicitArrayBoundsChecks: 0
|
||||||
|
m_CompressionType: 2
|
||||||
|
m_InstallInBuildFolder: 0
|
||||||
|
m_InsightsSettingsContainer:
|
||||||
|
m_BuildProfileEngineDiagnosticsState: 2
|
||||||
|
m_BuildSubtarget: 0
|
||||||
|
m_BuildSystem: 1
|
||||||
|
m_ExportAsGoogleAndroidProject: 0
|
||||||
|
m_DebugSymbolLevel: 1
|
||||||
|
m_DebugSymbolFormat: 5
|
||||||
|
m_CurrentDeploymentTargetId: __builtin__target_default
|
||||||
|
m_BuildType: 2
|
||||||
|
m_LinkTimeOptimization: 0
|
||||||
|
m_BuildAppBundle: 0
|
||||||
|
m_IPAddressToConnect:
|
||||||
|
m_SymlinkSources: 0
|
||||||
8
Assets/Settings/Build Profiles/Android™ 1.asset.meta
Normal file
8
Assets/Settings/Build Profiles/Android™ 1.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9496285097e5d904da120cdcec6534dc
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -29,7 +29,7 @@ MonoBehaviour:
|
|||||||
- rid: 4246746364202188844
|
- rid: 4246746364202188844
|
||||||
type: {class: AndroidPlatformBuildSettings, ns: UnityEditor.Android, asm: UnityEditor.Android.Extensions}
|
type: {class: AndroidPlatformBuildSettings, ns: UnityEditor.Android, asm: UnityEditor.Android.Extensions}
|
||||||
data:
|
data:
|
||||||
m_Development: 0
|
m_Development: 1
|
||||||
m_ConnectProfiler: 0
|
m_ConnectProfiler: 0
|
||||||
m_BuildWithDeepProfilingSupport: 0
|
m_BuildWithDeepProfilingSupport: 0
|
||||||
m_AllowDebugging: 0
|
m_AllowDebugging: 0
|
||||||
@@ -45,10 +45,10 @@ MonoBehaviour:
|
|||||||
m_BuildSubtarget: 0
|
m_BuildSubtarget: 0
|
||||||
m_BuildSystem: 1
|
m_BuildSystem: 1
|
||||||
m_ExportAsGoogleAndroidProject: 0
|
m_ExportAsGoogleAndroidProject: 0
|
||||||
m_DebugSymbolLevel: 1
|
m_DebugSymbolLevel: 4
|
||||||
m_DebugSymbolFormat: 5
|
m_DebugSymbolFormat: 5
|
||||||
m_CurrentDeploymentTargetId: __builtin__target_default
|
m_CurrentDeploymentTargetId: __builtin__target_default
|
||||||
m_BuildType: 2
|
m_BuildType: 1
|
||||||
m_LinkTimeOptimization: 0
|
m_LinkTimeOptimization: 0
|
||||||
m_BuildAppBundle: 0
|
m_BuildAppBundle: 0
|
||||||
m_IPAddressToConnect:
|
m_IPAddressToConnect:
|
||||||
|
|||||||
@@ -1,8 +1,15 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 7f18313555a02cd48bc22d29d0f2ff55
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
=======
|
||||||
guid: f7414f44a3a063a4d80af09af6a4cc50
|
guid: f7414f44a3a063a4d80af09af6a4cc50
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
>>>>>>> origin/main
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|||||||
49
Assets/Settings/Build Profiles/iOS.asset
Normal file
49
Assets/Settings/Build Profiles/iOS.asset
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 15003, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name: iOS
|
||||||
|
m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.Build.Profile.BuildProfile
|
||||||
|
m_AssetVersion: 1
|
||||||
|
m_BuildTarget: 9
|
||||||
|
m_Subtarget: 0
|
||||||
|
m_PlatformId: ad48d16a66894befa4d8181998c3cb09
|
||||||
|
m_PlatformBuildProfile:
|
||||||
|
rid: 4718407457732296746
|
||||||
|
m_OverrideGlobalSceneList: 0
|
||||||
|
m_Scenes: []
|
||||||
|
m_ScriptingDefines:
|
||||||
|
-
|
||||||
|
m_PlayerSettingsYaml:
|
||||||
|
m_Settings: []
|
||||||
|
references:
|
||||||
|
version: 2
|
||||||
|
RefIds:
|
||||||
|
- rid: 4718407457732296746
|
||||||
|
type: {class: iOSPlatformSettings, ns: UnityEditor.iOS, asm: UnityEditor.iOS.Extensions}
|
||||||
|
data:
|
||||||
|
m_Development: 0
|
||||||
|
m_ConnectProfiler: 0
|
||||||
|
m_BuildWithDeepProfilingSupport: 0
|
||||||
|
m_AllowDebugging: 0
|
||||||
|
m_WaitForManagedDebugger: 0
|
||||||
|
m_ManagedDebuggerFixedPort: 0
|
||||||
|
m_ExplicitNullChecks: 0
|
||||||
|
m_ExplicitDivideByZeroChecks: 0
|
||||||
|
m_ExplicitArrayBoundsChecks: 0
|
||||||
|
m_CompressionType: 0
|
||||||
|
m_InstallInBuildFolder: 0
|
||||||
|
m_InsightsSettingsContainer:
|
||||||
|
m_BuildProfileEngineDiagnosticsState: 2
|
||||||
|
m_iOSXcodeBuildConfig: 1
|
||||||
|
m_SymlinkSources: 0
|
||||||
|
m_PreferredXcode:
|
||||||
|
m_SymlinkTrampoline: 0
|
||||||
8
Assets/Settings/Build Profiles/iOS.asset.meta
Normal file
8
Assets/Settings/Build Profiles/iOS.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 18829ddd933a57c489872a4f1a3942e4
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 526aab55ceaf10142a59ee4d62fe8f42
|
||||||
|
=======
|
||||||
guid: 45dce265e34e8484d8a0ac37bbb3f593
|
guid: 45dce265e34e8484d8a0ac37bbb3f593
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 0e9d05516516cba48aff23bd436701ca
|
||||||
|
=======
|
||||||
guid: 7a71f5fa3cfec3240876dcc0cf90945c
|
guid: 7a71f5fa3cfec3240876dcc0cf90945c
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: e6ba5b26dda963e43beba7012129f6a5
|
||||||
|
=======
|
||||||
guid: da9ec6b53c9d2604eb3b9b733f09d25f
|
guid: da9ec6b53c9d2604eb3b9b733f09d25f
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 9c73e51f432aa184cb1408179eb09d3f
|
||||||
|
=======
|
||||||
guid: c2dd8e13cc746c643853b4d68aa29b08
|
guid: c2dd8e13cc746c643853b4d68aa29b08
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 1fe0ebf7f09ec7e4fa76e81c31b87dde
|
||||||
|
=======
|
||||||
guid: 838b2b6371a376844b3213d982530ce0
|
guid: 838b2b6371a376844b3213d982530ce0
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 3dc1b9d50da01394198653f975d9c13d
|
||||||
|
=======
|
||||||
guid: 696a9922efc80544cbf9fc061955f550
|
guid: 696a9922efc80544cbf9fc061955f550
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 7bfdf167f826294468ffbde02bb390f1
|
||||||
|
=======
|
||||||
guid: 800007f585dbb8d409bce87a3ccad193
|
guid: 800007f585dbb8d409bce87a3ccad193
|
||||||
|
>>>>>>> origin/main
|
||||||
NativeFormatImporter:
|
NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 2692316a8a73b434783a8c8c50c49ac0
|
||||||
|
=======
|
||||||
guid: 4c89ded1fa5528e43965b0d178497f9a
|
guid: 4c89ded1fa5528e43965b0d178497f9a
|
||||||
|
>>>>>>> origin/main
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
|
||||||
|
=======
|
||||||
guid: c5ada28132037dc49b25799cd085863a
|
guid: c5ada28132037dc49b25799cd085863a
|
||||||
|
>>>>>>> origin/main
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
117
Assets/TutorialInfo/Icons/URP.png.meta
Normal file
117
Assets/TutorialInfo/Icons/URP.png.meta
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 95952c7b1590baf479a484d39d256da9
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
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
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
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: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
7
Assets/TutorialInfo/Layout.wlt.meta
Normal file
7
Assets/TutorialInfo/Layout.wlt.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7717e22d410f9a444be1699f27f08476
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 478503718c5a2c449bf8efbdda9c5aa2
|
||||||
|
=======
|
||||||
guid: 340fa7a6658f67b4884beda3ce703bc8
|
guid: 340fa7a6658f67b4884beda3ce703bc8
|
||||||
|
>>>>>>> origin/main
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: ffed5da1f0e08a5409de9dfef22c21f3
|
||||||
|
=======
|
||||||
guid: 90a0dcae2a28dbc488afff041a155933
|
guid: 90a0dcae2a28dbc488afff041a155933
|
||||||
|
>>>>>>> origin/main
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|||||||
2
Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta
Normal file
2
Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 84b2aaf916697844694b8831472d3e0e
|
||||||
2
Assets/TutorialInfo/Scripts/Readme.cs.meta
Normal file
2
Assets/TutorialInfo/Scripts/Readme.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bd183dd179558504ab1767087b1efc32
|
||||||
7
Assets/Untitled.blend1.meta
Normal file
7
Assets/Untitled.blend1.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8a3ae6902f1c0f640a60306c36bf7976
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
7
Assets/Untitled.stl.meta
Normal file
7
Assets/Untitled.stl.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2e89477d2c2cb534988b1a3912bf69dd
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 26709d992d8a99b4791083f116c56a36
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 8
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
7
Assets/dd.unity.meta
Normal file
7
Assets/dd.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8f9e944b2f23a444588ce2e4ac78b0f0
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 74379ac554348f84c8d3abeb440b79b9
|
||||||
|
=======
|
||||||
guid: f0565825ed419f845acc6ec1f2406ead
|
guid: f0565825ed419f845acc6ec1f2406ead
|
||||||
|
>>>>>>> origin/main
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|||||||
110
Assets/koulickaone.fbx.meta
Normal file
110
Assets/koulickaone.fbx.meta
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7fd80bd46d706b042a137593bf706d58
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 24200
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importPhysicalCameras: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
generateMeshLods: 0
|
||||||
|
meshLodGenerationFlags: 0
|
||||||
|
maximumMeshLod: -1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
strictVertexDataChecks: 0
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
importBlendShapeDeformPercent: 1
|
||||||
|
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
7
Assets/pojekt.unity.meta
Normal file
7
Assets/pojekt.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f01e25b5a8e60224fa8643bf4f074a71
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Dancing triangle 1 Hour [YB3yHfqdw3Y].mp3
Normal file
BIN
Dancing triangle 1 Hour [YB3yHfqdw3Y].mp3
Normal file
Binary file not shown.
@@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
<<<<<<< HEAD
|
||||||
|
"com.unity.textmeshpro": "4.0.0",
|
||||||
|
"com.unity.ugui": "2.0.0",
|
||||||
|
"com.unity.multiplayer.center": "1.0.0",
|
||||||
|
=======
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.ide.visualstudio": "2.0.27",
|
"com.unity.ide.visualstudio": "2.0.27",
|
||||||
"com.unity.inputsystem": "1.14.2",
|
"com.unity.inputsystem": "1.14.2",
|
||||||
@@ -10,6 +15,7 @@
|
|||||||
"com.unity.nuget.newtonsoft-json": "3.2.2",
|
"com.unity.nuget.newtonsoft-json": "3.2.2",
|
||||||
"com.unity.toolchain.linux-x86_64": "2.0.11",
|
"com.unity.toolchain.linux-x86_64": "2.0.11",
|
||||||
"com.unity.ugui": "2.0.0",
|
"com.unity.ugui": "2.0.0",
|
||||||
|
>>>>>>> origin/main
|
||||||
"com.unity.modules.accessibility": "1.0.0",
|
"com.unity.modules.accessibility": "1.0.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
"com.unity.2d.sprite": {
|
"com.unity.2d.sprite": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@@ -107,6 +109,7 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
>>>>>>> origin/main
|
||||||
"com.unity.multiplayer.center": {
|
"com.unity.multiplayer.center": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@@ -115,6 +118,16 @@
|
|||||||
"com.unity.modules.uielements": "1.0.0"
|
"com.unity.modules.uielements": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
|
"com.unity.textmeshpro": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.ugui": "2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
=======
|
||||||
"com.unity.nuget.newtonsoft-json": {
|
"com.unity.nuget.newtonsoft-json": {
|
||||||
"version": "3.2.2",
|
"version": "3.2.2",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@@ -258,6 +271,7 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
>>>>>>> origin/main
|
||||||
"com.unity.ugui": {
|
"com.unity.ugui": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|||||||
@@ -3,10 +3,11 @@
|
|||||||
--- !u!55 &1
|
--- !u!55 &1
|
||||||
PhysicsManager:
|
PhysicsManager:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 13
|
serializedVersion: 20
|
||||||
m_Gravity: {x: 0, y: -9.81, z: 0}
|
m_Gravity: {x: 0, y: -20, z: 0}
|
||||||
m_DefaultMaterial: {fileID: 0}
|
m_DefaultMaterial: {fileID: 0}
|
||||||
m_BounceThreshold: 2
|
m_BounceThreshold: 2
|
||||||
|
m_DefaultMaxDepenetrationVelocity: 10
|
||||||
m_SleepThreshold: 0.005
|
m_SleepThreshold: 0.005
|
||||||
m_DefaultContactOffset: 0.01
|
m_DefaultContactOffset: 0.01
|
||||||
m_DefaultSolverIterations: 6
|
m_DefaultSolverIterations: 6
|
||||||
@@ -16,11 +17,11 @@ PhysicsManager:
|
|||||||
m_EnableAdaptiveForce: 0
|
m_EnableAdaptiveForce: 0
|
||||||
m_ClothInterCollisionDistance: 0.1
|
m_ClothInterCollisionDistance: 0.1
|
||||||
m_ClothInterCollisionStiffness: 0.2
|
m_ClothInterCollisionStiffness: 0.2
|
||||||
m_ContactsGeneration: 1
|
|
||||||
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
m_AutoSimulation: 1
|
m_SimulationMode: 0
|
||||||
m_AutoSyncTransforms: 0
|
m_AutoSyncTransforms: 0
|
||||||
m_ReuseCollisionCallbacks: 1
|
m_ReuseCollisionCallbacks: 1
|
||||||
|
m_InvokeCollisionCallbacks: 1
|
||||||
m_ClothInterCollisionSettingsToggle: 0
|
m_ClothInterCollisionSettingsToggle: 0
|
||||||
m_ClothGravity: {x: 0, y: -9.81, z: 0}
|
m_ClothGravity: {x: 0, y: -9.81, z: 0}
|
||||||
m_ContactPairsMode: 0
|
m_ContactPairsMode: 0
|
||||||
@@ -31,6 +32,10 @@ PhysicsManager:
|
|||||||
m_WorldSubdivisions: 8
|
m_WorldSubdivisions: 8
|
||||||
m_FrictionType: 0
|
m_FrictionType: 0
|
||||||
m_EnableEnhancedDeterminism: 0
|
m_EnableEnhancedDeterminism: 0
|
||||||
m_EnableUnifiedHeightmaps: 1
|
m_ImprovedPatchFriction: 0
|
||||||
|
m_GenerateOnTriggerStayEvents: 1
|
||||||
m_SolverType: 0
|
m_SolverType: 0
|
||||||
m_DefaultMaxAngularSpeed: 50
|
m_DefaultMaxAngularSpeed: 50
|
||||||
|
m_ScratchBufferChunkCount: 4
|
||||||
|
m_CurrentBackendId: 4072204805
|
||||||
|
m_FastMotionThreshold: 3.4028235e+38
|
||||||
|
|||||||
@@ -5,8 +5,14 @@ EditorBuildSettings:
|
|||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Scenes:
|
m_Scenes:
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/SampleScene.unity
|
path: Assets/Scenes/SampleScene.unity
|
||||||
|
<<<<<<< HEAD
|
||||||
|
guid: 6a18d9b328b6a794da5d050347950362
|
||||||
|
- enabled: 1
|
||||||
|
path: Assets/pojekt.unity
|
||||||
|
guid: f01e25b5a8e60224fa8643bf4f074a71
|
||||||
|
=======
|
||||||
guid: 8afa6ce05eb7dba4c894b910786e3baf
|
guid: 8afa6ce05eb7dba4c894b910786e3baf
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/Client.unity
|
path: Assets/Scenes/Client.unity
|
||||||
@@ -53,6 +59,7 @@ EditorBuildSettings:
|
|||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/MiniGame-Satelit.unity
|
path: Assets/Scenes/MiniGame-Satelit.unity
|
||||||
guid: 070c4a89027b6e9a28e16859d55f8c66
|
guid: 070c4a89027b6e9a28e16859d55f8c66
|
||||||
|
>>>>>>> origin/main
|
||||||
m_configObjects:
|
m_configObjects:
|
||||||
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
|
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
|
||||||
m_UseUCBPForAssetBundles: 0
|
m_UseUCBPForAssetBundles: 0
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ PlayerSettings:
|
|||||||
AndroidProfiler: 0
|
AndroidProfiler: 0
|
||||||
AndroidFilterTouchesWhenObscured: 0
|
AndroidFilterTouchesWhenObscured: 0
|
||||||
AndroidEnableSustainedPerformanceMode: 0
|
AndroidEnableSustainedPerformanceMode: 0
|
||||||
defaultScreenOrientation: 4
|
defaultScreenOrientation: 0
|
||||||
targetDevice: 2
|
targetDevice: 2
|
||||||
useOnDemandResources: 0
|
useOnDemandResources: 0
|
||||||
accelerometerFrequency: 60
|
accelerometerFrequency: 60
|
||||||
@@ -161,7 +161,7 @@ PlayerSettings:
|
|||||||
m_ColorGamuts: 00000000
|
m_ColorGamuts: 00000000
|
||||||
targetPixelDensity: 30
|
targetPixelDensity: 30
|
||||||
resolutionScalingMode: 0
|
resolutionScalingMode: 0
|
||||||
resetResolutionOnWindowResize: 0
|
resetResolutionOnWindowResize: 1
|
||||||
androidSupportedAspectRatio: 1
|
androidSupportedAspectRatio: 1
|
||||||
androidMaxAspectRatio: 2.4
|
androidMaxAspectRatio: 2.4
|
||||||
androidMinAspectRatio: 1
|
androidMinAspectRatio: 1
|
||||||
@@ -558,13 +558,16 @@ PlayerSettings:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
m_BuildTarget: Android
|
m_BuildTarget: Android
|
||||||
m_Formats: 03000000
|
m_Formats: 03000000
|
||||||
|
- serializedVersion: 3
|
||||||
|
m_BuildTarget: iOS
|
||||||
|
m_Formats: 03000000
|
||||||
playModeTestRunnerEnabled: 0
|
playModeTestRunnerEnabled: 0
|
||||||
runPlayModeTestAsEditModeTest: 0
|
runPlayModeTestAsEditModeTest: 0
|
||||||
actionOnDotNetUnhandledException: 1
|
actionOnDotNetUnhandledException: 1
|
||||||
editorGfxJobOverride: 1
|
editorGfxJobOverride: 1
|
||||||
enableInternalProfiler: 0
|
enableInternalProfiler: 0
|
||||||
logObjCUncaughtExceptions: 1
|
logObjCUncaughtExceptions: 1
|
||||||
enableCrashReportAPI: 0
|
enableCrashReportAPI: 1
|
||||||
cameraUsageDescription:
|
cameraUsageDescription:
|
||||||
locationUsageDescription:
|
locationUsageDescription:
|
||||||
microphoneUsageDescription:
|
microphoneUsageDescription:
|
||||||
|
|||||||
Reference in New Issue
Block a user