Compare commits
No commits in common. "dev" and "BugFix" have entirely different histories.
13
.idea/.idea.AwesomeRunner-/.idea/.gitignore
generated
vendored
13
.idea/.idea.AwesomeRunner-/.idea/.gitignore
generated
vendored
@ -1,13 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Rider ignored files
|
||||
/projectSettingsUpdater.xml
|
||||
/contentModel.xml
|
||||
/.idea.AwesomeRunner-.iml
|
||||
/modules.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
4
.idea/.idea.AwesomeRunner-/.idea/encodings.xml
generated
4
.idea/.idea.AwesomeRunner-/.idea/encodings.xml
generated
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
8
.idea/.idea.AwesomeRunner-/.idea/indexLayout.xml
generated
8
.idea/.idea.AwesomeRunner-/.idea/indexLayout.xml
generated
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="UserContentModel">
|
||||
<attachedFolders />
|
||||
<explicitIncludes />
|
||||
<explicitExcludes />
|
||||
</component>
|
||||
</project>
|
6
.idea/.idea.AwesomeRunner-/.idea/vcs.xml
generated
6
.idea/.idea.AwesomeRunner-/.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
13
.idea/.idea.SAE/.idea/.gitignore
generated
vendored
13
.idea/.idea.SAE/.idea/.gitignore
generated
vendored
@ -1,13 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Rider ignored files
|
||||
/.idea.SAE.iml
|
||||
/modules.xml
|
||||
/projectSettingsUpdater.xml
|
||||
/contentModel.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
4
.idea/.idea.SAE/.idea/encodings.xml
generated
4
.idea/.idea.SAE/.idea/encodings.xml
generated
@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
8
.idea/.idea.SAE/.idea/indexLayout.xml
generated
8
.idea/.idea.SAE/.idea/indexLayout.xml
generated
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="UserContentModel">
|
||||
<attachedFolders />
|
||||
<explicitIncludes />
|
||||
<explicitExcludes />
|
||||
</component>
|
||||
</project>
|
6
.idea/.idea.SAE/.idea/vcs.xml
generated
6
.idea/.idea.SAE/.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
8
.idea/indexLayout.xml
generated
8
.idea/indexLayout.xml
generated
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="UserContentModel">
|
||||
<attachedFolders />
|
||||
<explicitIncludes />
|
||||
<explicitExcludes />
|
||||
</component>
|
||||
</project>
|
7
.idea/projectSettingsUpdater.xml
generated
7
.idea/projectSettingsUpdater.xml
generated
@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RiderProjectSettingsUpdater">
|
||||
<option name="singleClickDiffPreview" value="1" />
|
||||
<option name="vcsConfiguration" value="3" />
|
||||
</component>
|
||||
</project>
|
6
.idea/vcs.xml
generated
6
.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
70
.idea/workspace.xml
generated
70
.idea/workspace.xml
generated
@ -1,70 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="bbce60c9-b020-43bc-ac91-3e747354e409" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/DeathScreen1VS1.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/DeathScreen1VS1.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Sprites/CameraRenderTexture.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Sprites/CameraRenderTexture.renderTexture" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/MainMenu.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/MainMenu.unity" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" root0="FORCE_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="ProjectColorInfo"><![CDATA[{
|
||||
"associatedIndex": 8
|
||||
}]]></component>
|
||||
<component name="ProjectId" id="2rfdTSaHd8CQV55SaQfRGNTGbwL" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"git-widget-placeholder": "dev",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="bbce60c9-b020-43bc-ac91-3e747354e409" name="Changes" comment="" />
|
||||
<created>1736954071558</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1736954071558</updated>
|
||||
<workItem from="1736954074577" duration="429000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
|
||||
<component name="UnityProjectDiscoverer">
|
||||
<option name="unityProjectFolder" value="true" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|
||||
</component>
|
||||
</project>
|
Binary file not shown.
Binary file not shown.
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@ -51,5 +51,5 @@
|
||||
"temp/": true,
|
||||
"Temp/": true
|
||||
},
|
||||
"dotnet.defaultSolution": "AwesomeRunner-.sln"
|
||||
"dotnet.defaultSolution": "AwesomeRunner.sln"
|
||||
}
|
@ -9,8 +9,6 @@ Material:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: m_jammo_metal 1
|
||||
m_Shader: {fileID: 4800000, guid: 73ef4de7c429719438a73d771100db7c, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _METALLICGLOSSMAP
|
||||
@ -21,7 +19,6 @@ Material:
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -88,4 +85,3 @@ Material:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
@ -2,26 +2,20 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: m_jammo_metal
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _METALLICGLOSSMAP
|
||||
- _NORMALMAP
|
||||
m_InvalidKeywords: []
|
||||
m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -61,7 +55,6 @@ Material:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
@ -82,5 +75,3 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
@ -2,26 +2,19 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_Name: comuter_wall
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
- _METALLICGLOSSMAP
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 1
|
||||
m_ShaderKeywords: _METALLICGLOSSMAP
|
||||
m_LightmapFlags: 5
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -61,26 +54,19 @@ Material:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
@ -2,25 +2,19 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_Name: No Name
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 1
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 5
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -60,26 +54,19 @@ Material:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
@ -8,8 +8,7 @@ public class laserScript : MonoBehaviour {
|
||||
// Use this for initialization
|
||||
void Start () {
|
||||
laserLine = GetComponentInChildren<LineRenderer> ();
|
||||
laserLine.startWidth = .2f;
|
||||
laserLine.endWidth = .2f;
|
||||
laserLine.SetWidth (.2f, .2f);
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aa7ee8fd100668c43a4a6598a35a3ad6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,163 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &9117726010709451998
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2262208576908815080}
|
||||
- component: {fileID: 3572880127954793139}
|
||||
- component: {fileID: 6612934893704467973}
|
||||
- component: {fileID: 2619330802336550126}
|
||||
- component: {fileID: 6803980266743182291}
|
||||
- component: {fileID: 6108635676596831665}
|
||||
- component: {fileID: 1187001800563073841}
|
||||
m_Layer: 0
|
||||
m_Name: Coins
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2262208576908815080
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 2, z: 0}
|
||||
m_LocalScale: {x: 1, y: 0.05, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
||||
--- !u!33 &3572880127954793139
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &6612934893704467973
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
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_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 9fc1d0d62308b2a47839d64bc3a4983d, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!136 &2619330802336550126
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
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: 2
|
||||
m_Radius: 0.5000001
|
||||
m_Height: 2
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
|
||||
--- !u!65 &6803980266743182291
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
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.0000001, y: 2.0000005, z: 1.0000005}
|
||||
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940699}
|
||||
--- !u!114 &6108635676596831665
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ddaf0a1f90e1c46428ba5f029fd32ad0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
coinValue: 1
|
||||
--- !u!114 &1187001800563073841
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117726010709451998}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ef8880022572d924bbe4f58655a16a6f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
amplitude: 0.1
|
||||
animationVelocity: {x: 0, y: 1, z: 0}
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b23a39661488b4b4bb909b4285f3f874
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -104,7 +104,7 @@ BoxCollider:
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 2, y: 2, z: 2}
|
||||
m_Center: {x: 0, y: 0.5, z: 0}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6632165759313513218
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -230,8 +230,8 @@ BoxCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 2, y: 1.75, z: 2}
|
||||
m_Center: {x: 0, y: 2.25, z: 0}
|
||||
m_Size: {x: 2, y: 2, z: 2}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &-5363852902891024896
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -245,7 +245,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<IsOnAllLanes>k__BackingField: 0
|
||||
<IsInevitable>k__BackingField: 0
|
||||
<IsInevitable>k__BackingField: 1
|
||||
--- !u!4 &4156031263124959724 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 02c07866f16913044aea6679ce17cfc5, type: 3}
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4865203f6c333ec41aa9c857891d9921
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6e6131461623f7f4e9622a07b5ea2f48
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -24,13 +24,13 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1385490266177085035}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3244299530156243158
|
||||
MonoBehaviour:
|
||||
@ -44,5 +44,5 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 1290664e863a3d34596917f255587b4c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
capacity: 10
|
||||
capacity: 30
|
||||
prefab: {fileID: 6716018880928220119, guid: aa7da947970bb714fa7924d204fe2bdd, type: 3}
|
||||
|
@ -24,13 +24,13 @@ Transform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4737509690352194895}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6300939898152622968
|
||||
MonoBehaviour:
|
||||
@ -44,5 +44,5 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 1290664e863a3d34596917f255587b4c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
capacity: 10
|
||||
capacity: 20
|
||||
prefab: {fileID: 6716018880928220119, guid: aa7da947970bb714fa7924d204fe2bdd, type: 3}
|
||||
|
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 723c7ecb1f81a8c47a6c3853e476b507
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,48 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &7658440756881775109
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2738643474112209314}
|
||||
- component: {fileID: 8935043373779239955}
|
||||
m_Layer: 0
|
||||
m_Name: CoinPool
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2738643474112209314
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7658440756881775109}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 3.7201803, y: -0.29014507, z: 29.534254}
|
||||
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 &8935043373779239955
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7658440756881775109}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c4456a434a6301241bcca08c705b96c4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
capacity: 0
|
||||
prefab: {fileID: 6108635676596831665, guid: b23a39661488b4b4bb909b4285f3f874, type: 3}
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44cf83f237ca73248933ea3c97149a4a
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -26,7 +26,7 @@ RenderSettings:
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 2100000, guid: 56d63adb06e62c745852a4e1e4f43902, type: 2}
|
||||
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
@ -132,7 +132,6 @@ GameObject:
|
||||
- component: {fileID: 28337888}
|
||||
- component: {fileID: 28337887}
|
||||
- component: {fileID: 28337891}
|
||||
- component: {fileID: 28337892}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
@ -169,7 +168,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 1
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
@ -218,10 +217,8 @@ RectTransform:
|
||||
- {fileID: 1425101074}
|
||||
- {fileID: 344149855}
|
||||
- {fileID: 1726438702}
|
||||
- {fileID: 1809258969}
|
||||
- {fileID: 532422007}
|
||||
- {fileID: 2089165861}
|
||||
- {fileID: 117032978}
|
||||
- {fileID: 142150282}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -241,295 +238,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5827ef60d322c73468e816b5411af65a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
restartButton: {fileID: 344149856}
|
||||
--- !u!114 &28337892
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 28337886}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 80d0e44a44be4982a77850a10cbae2f9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Joueur1Text: {fileID: 0}
|
||||
Joueur2Text: {fileID: 0}
|
||||
CoinsText: {fileID: 142150283}
|
||||
ScoreText: {fileID: 2089165862}
|
||||
--- !u!1 &117032977
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 117032978}
|
||||
- component: {fileID: 117032980}
|
||||
- component: {fileID: 117032979}
|
||||
m_Layer: 5
|
||||
m_Name: TextCoins
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &117032978
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 117032977}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 28337890}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 8, y: 12}
|
||||
m_SizeDelta: {x: 293.0168, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &117032979
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 117032977}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 'Coins earned :'
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278255615
|
||||
m_fontColor: {r: 1, g: 1, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 19
|
||||
m_fontSizeBase: 19
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 1
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &117032980
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 117032977}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &142150281
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 142150282}
|
||||
- component: {fileID: 142150284}
|
||||
- component: {fileID: 142150283}
|
||||
m_Layer: 5
|
||||
m_Name: NumberCoins
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &142150282
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 142150281}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 28337890}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 18, y: 25}
|
||||
m_SizeDelta: {x: 109.9835, y: 50}
|
||||
m_Pivot: {x: 0.32881245, y: 0.5}
|
||||
--- !u!114 &142150283
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 142150281}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 5024
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278255615
|
||||
m_fontColor: {r: 1, g: 1, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 26
|
||||
m_fontSizeBase: 26
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 9
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &142150284
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 142150281}
|
||||
m_CullTransparentMesh: 1
|
||||
restartButton: {fileID: 0}
|
||||
--- !u!1 &344149854
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -565,8 +274,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -72.838036, y: -109.738655}
|
||||
m_SizeDelta: {x: 83.1114, y: 117.0469}
|
||||
m_AnchoredPosition: {x: -93.06824, y: -141.89418}
|
||||
m_SizeDelta: {x: 111.4353, y: 151.2302}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &344149856
|
||||
MonoBehaviour:
|
||||
@ -696,8 +405,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -267, y: -23}
|
||||
m_SizeDelta: {x: 215.7859, y: 191.7685}
|
||||
m_AnchoredPosition: {x: -339.51, y: -51.875}
|
||||
m_SizeDelta: {x: 347.4745, y: 331.2676}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &532422008
|
||||
MonoBehaviour:
|
||||
@ -1051,10 +760,7 @@ PrefabInstance:
|
||||
propertyPath: PlayerHUD
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
- {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
- {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
@ -1093,8 +799,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0.000041962, y: -0.00017548}
|
||||
m_SizeDelta: {x: 80, y: 90.028}
|
||||
m_AnchoredPosition: {x: 0, y: -0.0060005}
|
||||
m_SizeDelta: {x: 104.8, y: 117.85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1425101075
|
||||
MonoBehaviour:
|
||||
@ -1116,7 +822,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 2800000, guid: 590b8a48d28b68a48b63b55d69a491ff, type: 3}
|
||||
m_Texture: {fileID: 2800000, guid: f3bf48d62eb8db4488ff8d833e011574, type: 3}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -1355,8 +1061,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 62.2088, y: -109.74}
|
||||
m_SizeDelta: {x: 85.2889, y: 117.05}
|
||||
m_AnchoredPosition: {x: 81, y: -141.89418}
|
||||
m_SizeDelta: {x: 111.4353, y: 151.2302}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1726438703
|
||||
MonoBehaviour:
|
||||
@ -1452,6 +1158,78 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1726438701}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1809258968
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1809258969}
|
||||
- component: {fileID: 1809258970}
|
||||
m_Layer: 5
|
||||
m_Name: Video Player
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1809258969
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1809258968}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 28337890}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 81, y: -141.89418}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!328 &1809258970
|
||||
VideoPlayer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1809258968}
|
||||
m_Enabled: 1
|
||||
m_VideoClip: {fileID: 0}
|
||||
m_TargetCameraAlpha: 1
|
||||
m_TargetCamera3DLayout: 0
|
||||
m_TargetCamera: {fileID: 0}
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TimeReference: 0
|
||||
m_TargetMaterialRenderer: {fileID: 0}
|
||||
m_TargetMaterialProperty: <noninit>
|
||||
m_RenderMode: 2
|
||||
m_AspectRatio: 2
|
||||
m_DataSource: 0
|
||||
m_TimeUpdateMode: 2
|
||||
m_PlaybackSpeed: 1
|
||||
m_AudioOutputMode: 2
|
||||
m_TargetAudioSources:
|
||||
- {fileID: 0}
|
||||
m_DirectAudioVolumes:
|
||||
- 1
|
||||
m_Url:
|
||||
m_EnabledAudioTracks: 01
|
||||
m_DirectAudioMutes: 00
|
||||
m_ControlledAudioTrackCount: 1
|
||||
m_PlayOnAwake: 1
|
||||
m_SkipOnDrop: 1
|
||||
m_Looping: 0
|
||||
m_WaitForFirstFrame: 1
|
||||
m_FrameReadyEventEnabled: 0
|
||||
m_VideoShaders: []
|
||||
--- !u!1 &2056363842
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1520,142 +1298,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2089165860
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2089165861}
|
||||
- component: {fileID: 2089165863}
|
||||
- component: {fileID: 2089165862}
|
||||
m_Layer: 5
|
||||
m_Name: Distance
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2089165861
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2089165860}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 28337890}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.0000019073, y: 124}
|
||||
m_SizeDelta: {x: 236.3232, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2089165862
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2089165860}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 15202M
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 56
|
||||
m_fontSizeBase: 56
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 1
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: -4.0126266, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &2089165863
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2089165860}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 72410a9edaee92c4e86511fe51f4aeaf
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f80e925cd90324449923b287b3fb0f5f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9055f72a604bc3f4ba01bc120f0643d2, type: 3}
|
||||
m_Name: PlayerData
|
||||
@ -15,6 +15,6 @@ MonoBehaviour:
|
||||
<InvincibilityTime>k__BackingField: 600
|
||||
<JumpHeight>k__BackingField: 6
|
||||
<LaneSwitchSpeed>k__BackingField: 20
|
||||
<CurrentSpeed>k__BackingField: 10
|
||||
<InitialSpeed>k__BackingField: 10
|
||||
<CurrentSpeed>k__BackingField: 401.62177
|
||||
<SpeedAcceleration>k__BackingField: 1
|
||||
<SpeedAcceleration>k__BackingField: 0
|
||||
|
@ -1,39 +1,13 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
|
||||
[CreateAssetMenu(fileName = "PlayerData", menuName = "ScriptableObjects/Player")]
|
||||
public sealed class PlayerData : ScriptableObject
|
||||
public class PlayerData : ScriptableObject
|
||||
{
|
||||
// Serialize Fields
|
||||
[field: SerializeField] public int InvincibilityTime { get; private set; }
|
||||
[field: SerializeField] public int InvincibilityTime { get; private set; }
|
||||
[field: SerializeField] public float JumpHeight { get; private set; }
|
||||
[field: SerializeField] public float LaneSwitchSpeed { get; private set; }
|
||||
[field: SerializeField] public float CurrentSpeed { get; set; }
|
||||
[field: SerializeField] public float InitialSpeed { get; private set; }
|
||||
[field: SerializeField] public float CurrentSpeed { get; internal set; }
|
||||
[field: SerializeField] public float SpeedAcceleration { get; private set; }
|
||||
|
||||
// Other attributes
|
||||
private bool onPause = false;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
CurrentSpeed = InitialSpeed;
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
CurrentSpeed = InitialSpeed;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (!onPause)
|
||||
CurrentSpeed += SpeedAcceleration / 1000;
|
||||
}
|
||||
|
||||
public void isPaused(bool isPaused)
|
||||
{
|
||||
onPause = isPaused;
|
||||
}
|
||||
}
|
||||
|
@ -5,7 +5,6 @@ using UnityEngine;
|
||||
public class Coin : PoolingObject<Coin>, ICollectable,IResettable
|
||||
{
|
||||
[SerializeField] private int coinValue;
|
||||
public int CoinValue => coinValue;
|
||||
|
||||
private SinAnimator sinAnimator;
|
||||
public Renderer Renderer { get; private set; }
|
||||
@ -24,9 +23,7 @@ public class Coin : PoolingObject<Coin>, ICollectable,IResettable
|
||||
gameObject.SetActive(false);
|
||||
OnCoinCollected?.Invoke(coinValue);
|
||||
OnCoinDissapeared?.Invoke(this);
|
||||
ReturnToPool();
|
||||
}
|
||||
|
||||
public void UpdateStartPositionForSinAnimator()
|
||||
{
|
||||
sinAnimator.UpdateStartPosition();
|
||||
|
@ -1,9 +0,0 @@
|
||||
namespace Assets.Scripts.GameSession
|
||||
{
|
||||
public class GameResult
|
||||
{
|
||||
public static string MatchResult { get; set; }
|
||||
public static int score { get; set; }
|
||||
public static int coinsEarned { get; set; }
|
||||
}
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2ccf940b8a6f4771951a3760a7865928
|
||||
timeCreated: 1739468701
|
@ -12,12 +12,13 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
[SerializeField] private Player player1;
|
||||
[SerializeField] [CanBeNull] private Player player2;
|
||||
[SerializeField] private Scoreboard scoreboard;
|
||||
[SerializeField] private bool isDuoMode;
|
||||
[SerializeField] private PlayerData playerData;
|
||||
public static GameSession Instance { get; private set; }
|
||||
private WorldCurver Curver { get; set; }
|
||||
[SerializeField] private Boolean isDuoMode;
|
||||
|
||||
public static GameSession Instance { get; private set; }
|
||||
public WorldCurver Curver { get; private set; }
|
||||
private IInputTranslator _player1InputTranslator;
|
||||
private IInputTranslator _player2InputTranslator;
|
||||
public static string MatchResult { get; private set; }
|
||||
private bool _isSessionPaused = false;
|
||||
private bool _isInputAlreadyRestricted = false;
|
||||
private float _speedAtPause;
|
||||
@ -38,7 +39,6 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
playerData.Update();
|
||||
_player1InputTranslator.Tick();
|
||||
if (isDuoMode)
|
||||
{
|
||||
@ -46,8 +46,8 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
}
|
||||
|
||||
Curver.Tick();
|
||||
// curver.SinCurveX();
|
||||
// Curver.SinCurveY();
|
||||
// curver.SinCurveX();
|
||||
// Curver.SinCurveY();
|
||||
//Curver.TurnWorldToLeft();
|
||||
}
|
||||
|
||||
@ -56,28 +56,36 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
var player1Holder = new KeyBindingHolder();
|
||||
player1Holder.Init(false);
|
||||
_player1InputTranslator = new InputTranslator<KeyBinding>(player1Holder, false);
|
||||
var player2Holder = new KeyBindingHolder();
|
||||
player2Holder.Init(true);
|
||||
_player2InputTranslator = new InputTranslator<KeyBinding>(player2Holder, true);
|
||||
|
||||
playerData.Reset();
|
||||
if (isDuoMode)
|
||||
{
|
||||
var player2Holder = new KeyBindingHolder();
|
||||
player2Holder.Init(true);
|
||||
_player2InputTranslator = new InputTranslator<KeyBinding>(player2Holder, true);
|
||||
}
|
||||
}
|
||||
|
||||
public void AddCommandTranslator(ICommandTranslator translator, bool isPlayer2)
|
||||
{
|
||||
if (isPlayer2)
|
||||
{
|
||||
_player2InputTranslator.AddCommandTranslator(translator);
|
||||
}else
|
||||
{
|
||||
_player1InputTranslator.AddCommandTranslator(translator);
|
||||
}
|
||||
if (isPlayer2)
|
||||
{
|
||||
_player2InputTranslator.AddCommandTranslator(translator);
|
||||
}else
|
||||
{
|
||||
_player1InputTranslator.AddCommandTranslator(translator);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void PauseSession(bool isPaused)
|
||||
{
|
||||
playerData.isPaused(isPaused);
|
||||
if (isPaused)
|
||||
_speedAtPause = player1.playerData.CurrentSpeed;
|
||||
else
|
||||
{
|
||||
player1.playerData.CurrentSpeed = _speedAtPause;
|
||||
}
|
||||
|
||||
Time.timeScale = isPaused ? 0 : 1;
|
||||
if (!_isSessionPaused && _player1InputTranslator.IsTranslationResticted(InputConstants.InGameCommands) && _player2InputTranslator.IsTranslationResticted(InputConstants.InGameCommands) )
|
||||
{
|
||||
@ -125,8 +133,6 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
}
|
||||
else
|
||||
{
|
||||
GameResult.score = player1.PlayerStatictics.Score;
|
||||
GameResult.coinsEarned = player1.PlayerStatictics.coinCount;
|
||||
SceneManager.LoadScene("DeathScreen");
|
||||
}
|
||||
}
|
||||
@ -137,26 +143,23 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
|
||||
if (player1.isDead && player2.isDead)
|
||||
{
|
||||
SendResultToDeathScreen1VS1("DRAW");
|
||||
SendResultToDeathScreen("DRAW");
|
||||
}
|
||||
else if (player1.isDead)
|
||||
{
|
||||
SendResultToDeathScreen1VS1("PLAYER2");
|
||||
SendResultToDeathScreen("PLAYER2");
|
||||
}
|
||||
else if (player2.isDead)
|
||||
{
|
||||
SendResultToDeathScreen1VS1("PLAYER1");
|
||||
SendResultToDeathScreen("PLAYER1");
|
||||
}
|
||||
|
||||
isCheckingEquality = false;
|
||||
}
|
||||
|
||||
private void SendResultToDeathScreen1VS1(string result)
|
||||
private void SendResultToDeathScreen(string result)
|
||||
{
|
||||
//MatchResult = result;
|
||||
GameResult.score = player1.PlayerStatictics.Score;
|
||||
GameResult.coinsEarned = player1.PlayerStatictics.coinCount;
|
||||
GameResult.MatchResult = result;
|
||||
MatchResult = result;
|
||||
SceneManager.LoadScene("DeathScreen1VS1");
|
||||
}
|
||||
|
||||
@ -181,7 +184,6 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
public void ResetToDefault()
|
||||
{
|
||||
PauseSession(false);
|
||||
playerData.Reset();
|
||||
if(player1 !=null)
|
||||
player1.ResetToDefault();
|
||||
if (isDuoMode && player2 != null)
|
||||
@ -189,9 +191,4 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
player2.ResetToDefault();
|
||||
}
|
||||
}
|
||||
|
||||
public PlayerData GetPlayerData()
|
||||
{
|
||||
return this.playerData;
|
||||
}
|
||||
}
|
@ -26,13 +26,5 @@ namespace Assets.Scripts.GameSession
|
||||
{
|
||||
SceneManager.LoadScene("DeathScreen1VS1", LoadSceneMode.Single);
|
||||
}
|
||||
public static void GoToSkinMenuPlayer1()
|
||||
{
|
||||
SceneManager.LoadScene("SkinMenuPlayer1", LoadSceneMode.Single);
|
||||
}
|
||||
public static void GoToSkinMenuPlayer2()
|
||||
{
|
||||
SceneManager.LoadScene("SkinMenuPlayer2", LoadSceneMode.Single);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,36 +1,33 @@
|
||||
using Pools;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Obstacles
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
public class Obstacle : PoolingObject<Obstacle>, IObstacle,IDamageDealer,IResettable
|
||||
{
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
public class Obstacle : PoolingObject<Obstacle>, IObstacle,IDamageDealer,IResettable
|
||||
{
|
||||
[field: SerializeField] public bool IsOnAllLanes { get; private set; }
|
||||
[field: SerializeField] public bool IsInevitable { get; private set; }
|
||||
public BoxCollider Collider { get; private set; }
|
||||
[field: SerializeField] public bool IsOnAllLanes { get; private set; }
|
||||
[field: SerializeField] public bool IsInevitable { get; private set; }
|
||||
public BoxCollider Collider { get; private set; }
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Collider = GetComponent<BoxCollider>();
|
||||
OwningPool = FindFirstObjectByType<ObstaclePool>();
|
||||
}
|
||||
public void ResetToDefault()
|
||||
{
|
||||
transform.localPosition = Vector3.zero;
|
||||
transform.position = Vector3.zero;
|
||||
transform.rotation = Quaternion.identity;
|
||||
gameObject.transform.SetParent(OwningPool.transform);
|
||||
ReturnToPool();
|
||||
}
|
||||
public void Impact()
|
||||
{
|
||||
ResetToDefault();
|
||||
}
|
||||
private void Awake()
|
||||
{
|
||||
Collider = GetComponent<BoxCollider>();
|
||||
}
|
||||
public void ResetToDefault()
|
||||
{
|
||||
transform.localPosition = Vector3.zero;
|
||||
transform.position = Vector3.zero;
|
||||
transform.rotation = Quaternion.identity;
|
||||
gameObject.transform.SetParent(OwningPool.transform);
|
||||
ReturnToPool();
|
||||
}
|
||||
public void Impact()
|
||||
{
|
||||
ResetToDefault();
|
||||
}
|
||||
|
||||
public void DealDamage(IDamageable target, int amount)
|
||||
{
|
||||
target.TakeDamage(amount);
|
||||
}
|
||||
public void DealDamage(IDamageable target, int amount)
|
||||
{
|
||||
target.TakeDamage(amount);
|
||||
}
|
||||
}
|
||||
|
@ -37,7 +37,9 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
[SerializeField] internal PlayerData playerData;
|
||||
public IDamageable PlayerHealth { get; private set; }
|
||||
public Statistics PlayerStatictics { get; private set; }
|
||||
|
||||
|
||||
public PlayerData PlayerData { get { return playerData; } }
|
||||
|
||||
#endregion
|
||||
|
||||
#region MovementControl
|
||||
@ -62,10 +64,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
|
||||
#endregion
|
||||
|
||||
#region Sounds
|
||||
public AudioSource JumpSound;
|
||||
#endregion
|
||||
|
||||
public bool IsInvincible { get; private set; }
|
||||
public float InvincibilityTime { get; private set; } //PLAYER DATA ScriptableObject
|
||||
[SerializeField] private Boolean isPlayer2;
|
||||
@ -74,8 +72,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
playerData = GameSession.Instance.GetPlayerData();
|
||||
Debug.Log("Player Awake : " + this);
|
||||
GameSession.Instance.AddCommandTranslator(this, isPlayer2);
|
||||
animator = GetComponent<Animator>();
|
||||
if (animator)
|
||||
@ -87,7 +83,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
PlayerStateMachine = new PlayerStateMachine(this);
|
||||
InvincibilityTime = playerData.InvincibilityTime;
|
||||
playerData.CurrentSpeed = playerData.InitialSpeed;
|
||||
Debug.Log("Player Awake END");
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
@ -97,7 +92,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
private void Start()
|
||||
{
|
||||
PlayerStateMachine.SetState(PlayerStateMachine.PlayerStartingIdleState);
|
||||
JumpSound.GetComponent<AudioSource>();
|
||||
}
|
||||
|
||||
|
||||
@ -137,12 +131,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
else if (other.TryGetComponent(out ICollectable collectable))
|
||||
{
|
||||
collectable.Collect();
|
||||
|
||||
if (other.TryGetComponent(out Coin coin))
|
||||
{
|
||||
PlayerStatictics.AddScore(coin.CoinValue);
|
||||
coin.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -152,6 +140,20 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
PlayerStateMachine.SetState(PlayerStateMachine.PlayerDeadState);
|
||||
GameSession.Instance.UpdateScoreboard(new ScoreboardEntry(name, PlayerStatictics.Score));
|
||||
GameSession.Instance.HandlePlayerDeath(this); // Informe GameSession qu'un joueur est mort
|
||||
|
||||
// PlayerStateMachine.SetState(PlayerStateMachine.PlayerDeadState);
|
||||
// GameSession.Instance.UpdateScoreboard(new ScoreboardEntry(name, PlayerStatictics.Score));
|
||||
// if (isPlaying1VS1)
|
||||
// {
|
||||
// // SceneManager.LoadScene("DeathScreen1v1");
|
||||
// SceneManager.LoadScene("Death1VS1");
|
||||
//
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// SceneManager.LoadScene("Death1VS1");
|
||||
// }
|
||||
//
|
||||
}
|
||||
|
||||
public IEnumerator GrantInvincibility()
|
||||
@ -186,7 +188,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
case ECommand.RIGHT:
|
||||
case ECommand.RIGHT2:
|
||||
PlayerStateMachine.IncreaseTargetLane();
|
||||
JumpSound.Play();
|
||||
break;
|
||||
case ECommand.LEFT:
|
||||
case ECommand.LEFT2:
|
||||
|
@ -1,38 +1,39 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class PlayerAnimator
|
||||
{
|
||||
private readonly Animator _animator;
|
||||
private readonly int _runningHash = Animator.StringToHash("Run");
|
||||
private readonly int _deadHash = Animator.StringToHash("Dead");
|
||||
private readonly int _jumpHash = Animator.StringToHash("Jump");
|
||||
private readonly int _slideHash = Animator.StringToHash("Slide");
|
||||
private readonly int _idleHash = Animator.StringToHash("Idle");
|
||||
private Animator animator;
|
||||
private int runningHash = Animator.StringToHash("Run");
|
||||
private int deadHash = Animator.StringToHash("Dead");
|
||||
private int jumpHash = Animator.StringToHash("Jump");
|
||||
private int slideHash = Animator.StringToHash("Slide");
|
||||
private int idleHash = Animator.StringToHash("Idle");
|
||||
|
||||
public PlayerAnimator(Animator animator)
|
||||
{
|
||||
if (animator)
|
||||
this._animator = animator;
|
||||
this.animator = animator;
|
||||
}
|
||||
public void SetRunState(bool isRunning)
|
||||
{
|
||||
_animator?.SetBool(_runningHash, isRunning);
|
||||
animator?.SetBool(runningHash, isRunning);
|
||||
}
|
||||
public void SetJumpState(bool isJumping)
|
||||
{
|
||||
_animator?.SetBool(_jumpHash, isJumping);
|
||||
animator?.SetBool(jumpHash, isJumping);
|
||||
}
|
||||
public void SetDeadState(bool isDead)
|
||||
{
|
||||
_animator?.SetBool(_deadHash, isDead);
|
||||
animator?.SetBool(deadHash, isDead);
|
||||
}
|
||||
public void SetSlideState(bool isSliding)
|
||||
{
|
||||
_animator?.SetBool(_slideHash, isSliding);
|
||||
animator?.SetBool(slideHash, isSliding);
|
||||
}
|
||||
public void SetIdleState(bool isIdle)
|
||||
{
|
||||
if(_animator){}
|
||||
_animator?.SetBool(_idleHash, isIdle);
|
||||
animator?.SetBool(idleHash, isIdle);
|
||||
}
|
||||
}
|
||||
|
@ -8,7 +8,7 @@ public abstract class MovingState : PlayerState
|
||||
private float speed; //SO
|
||||
private float laneSwitchSpeed; //SO
|
||||
protected const float gravity = -9.8f;
|
||||
private float invincibilityTime => playerSM.playerData.InvincibilityTime;
|
||||
private float invincibilityTime => playerSM.PlayerData.InvincibilityTime;
|
||||
public MovingState(PlayerStateMachine playerStateMachine) : base(playerStateMachine)
|
||||
{
|
||||
this.playerSM = playerStateMachine;
|
||||
@ -22,6 +22,7 @@ public abstract class MovingState : PlayerState
|
||||
public override void Tick()
|
||||
{
|
||||
speed = playerData.CurrentSpeed;
|
||||
//HandleDirection();
|
||||
playerSM.HorizontalDeltaPosition = playerSM.PlayerTransform.forward * speed * Time.deltaTime ;
|
||||
playerSM.HorizontalDeltaPosition += playerSM.PlayerTransform.forward * speed * Time.deltaTime;
|
||||
playerSM.UpdateDistance(playerSM.HorizontalDeltaPosition.z); //вынести в контроллер
|
||||
@ -37,6 +38,28 @@ public abstract class MovingState : PlayerState
|
||||
playerSM.VerticalDeltaPosition += gravity * Time.deltaTime;
|
||||
}
|
||||
|
||||
|
||||
//private void HandleDirection()
|
||||
//{
|
||||
// switch (playerSM.InputDirection)
|
||||
// {
|
||||
// case EInputDirection.RIGHT:
|
||||
// playerSM.IncreaseTargetLane();
|
||||
// break;
|
||||
// case EInputDirection.LEFT:
|
||||
// playerSM.DecreaseTargetLane();
|
||||
// break;
|
||||
// case EInputDirection.UP:
|
||||
// playerSM.SetState(playerSM.PlayerJumpState);
|
||||
// break;
|
||||
// case EInputDirection.DOWN:
|
||||
// playerSM.SetState(playerSM.PlayerSlideState);
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
|
||||
public void SwitchLane()
|
||||
{
|
||||
float sidewaysPos = playerTransform.localPosition.x;
|
||||
@ -60,6 +83,9 @@ public abstract class MovingState : PlayerState
|
||||
playerSM.HorizontalDeltaPosition += playerSM.PlayerTransform.right * diffX.x;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -11,7 +11,7 @@ public abstract class PlayerState : State<Player>
|
||||
public PlayerState(PlayerStateMachine playerStateMachine)
|
||||
{
|
||||
playerSM = playerStateMachine;
|
||||
playerData = playerStateMachine.playerData;
|
||||
playerData = playerStateMachine.PlayerData;
|
||||
playerTransform = playerStateMachine.PlayerTransform;
|
||||
}
|
||||
public override void Tick()
|
||||
|
@ -4,13 +4,14 @@ using UnityEngine.Animations.Rigging;
|
||||
public class PlayerStateMachine : StateMachine<Player>
|
||||
{
|
||||
private Player player;
|
||||
public PlayerData playerData;
|
||||
private PlayerData playerData;
|
||||
private Transform playerTransform;
|
||||
public Transform PlayerTransform { get { return playerTransform; } }
|
||||
public PlayerData PlayerData { get { return playerData; } }
|
||||
public PlayerStateMachine(Player player)
|
||||
{
|
||||
this.player = player;
|
||||
playerData = GameSession.Instance.GetPlayerData();
|
||||
playerData = player.PlayerData;
|
||||
playerTransform = player.transform;
|
||||
InitStates();
|
||||
}
|
||||
|
@ -2,18 +2,17 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
public class Statistics : MonoBehaviour,IResettable
|
||||
{
|
||||
private float distance;
|
||||
public int coinCount;
|
||||
private int coinCount;
|
||||
private int coinMultiplier;
|
||||
public int Score { get; private set; }
|
||||
public event Action<int> OnCoinCountChanged = delegate { };
|
||||
public event Action<float> OnDistanceChanged = delegate { };
|
||||
public event Action<int> OnScoreCalculated = delegate { };
|
||||
[FormerlySerializedAs("PlayerHUD")] [SerializeField] private PlayerHUDView playerHUD;
|
||||
[SerializeField] private PlayerHUDView PlayerHUD;
|
||||
private void Awake()
|
||||
{
|
||||
ResetToDefault();
|
||||
@ -44,7 +43,7 @@ public class Statistics : MonoBehaviour,IResettable
|
||||
{
|
||||
Score = Mathf.FloorToInt(coinCount * coinMultiplier + distance);
|
||||
OnScoreCalculated?.Invoke(Score);
|
||||
playerHUD.UpdateScore(Score.ToString());
|
||||
PlayerHUD.UpdateScore(Score.ToString());
|
||||
}
|
||||
|
||||
public void ResetToDefault()
|
||||
@ -55,12 +54,4 @@ public class Statistics : MonoBehaviour,IResettable
|
||||
coinMultiplier = 1;
|
||||
//gameOverPopUp.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public void AddScore(int amount)
|
||||
{
|
||||
Score += amount;
|
||||
OnScoreCalculated?.Invoke(Score);
|
||||
playerHUD.UpdateScore(Score.ToString());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,9 +1,5 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
namespace Pools
|
||||
{
|
||||
public sealed class CoinPool : BasePool<Coin>
|
||||
{}
|
||||
}
|
||||
|
||||
public class CoinPool : BasePool<Coin>
|
||||
{}
|
||||
|
@ -8,8 +8,6 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using Obstacles;
|
||||
|
||||
namespace Pools
|
||||
{
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
using Pools;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class ChunkGenerator : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private LaneSystem LaneSystem;
|
||||
[SerializeField] private CoinPool coinPool;
|
||||
public CoinPool CoinPool { get; private set; }
|
||||
[field: SerializeField] public List<ObstaclePool> ObstaclePools { get; private set; }
|
||||
|
||||
private bool _isFirstChunk = true;
|
||||
public Chunk Generate(Chunk chunkToFill)
|
||||
{
|
||||
@ -16,56 +16,21 @@ public class ChunkGenerator : MonoBehaviour
|
||||
_isFirstChunk = false;
|
||||
return chunkToFill;
|
||||
}
|
||||
if (!ObstaclePools.IsEmpty())
|
||||
if (ObstaclePools.IsEmpty())
|
||||
return chunkToFill;
|
||||
var obstaclePool = ObstaclePools.GetRandomElement();
|
||||
var obstacle = obstaclePool.Spawn();
|
||||
chunkToFill.Obstacles.Add(obstacle);
|
||||
obstacle.transform.SetParent(chunkToFill.transform, true);
|
||||
obstacle.transform.localPosition = chunkToFill.Grid.GetRandomPosition();
|
||||
if (obstacle.IsOnAllLanes)
|
||||
{
|
||||
var obstaclePool = ObstaclePools.GetRandomElement();
|
||||
var obstacle = obstaclePool.Spawn();
|
||||
chunkToFill.Obstacles.Add(obstacle);
|
||||
obstacle.transform.SetParent(chunkToFill.transform, true);
|
||||
obstacle.transform.localPosition = chunkToFill.Grid.GetRandomPosition();
|
||||
|
||||
if (obstacle.IsOnAllLanes)
|
||||
{
|
||||
obstacle.transform.localPosition = new Vector3(
|
||||
LaneSystem.CenterLane * LaneSystem.LaneWidth,
|
||||
transform.localPosition.y,
|
||||
transform.localPosition.z
|
||||
);
|
||||
}
|
||||
obstacle.transform.localPosition = new Vector3(
|
||||
LaneSystem.CenterLane * LaneSystem.LaneWidth,
|
||||
transform.localPosition.y,
|
||||
transform.localPosition.z
|
||||
);
|
||||
}
|
||||
Coin coin = coinPool.Spawn();
|
||||
chunkToFill.Coins.Add(coin);
|
||||
coin.transform.SetParent(chunkToFill.transform, true);
|
||||
Vector3 randomPosition;
|
||||
bool isPositionValid = false;
|
||||
int laneIndex = Random.Range(0, LaneSystem.LaneCount);
|
||||
randomPosition = new Vector3(
|
||||
laneIndex * LaneSystem.LaneWidth,
|
||||
chunkToFill.Grid.GetRandomPosition().y + 1.0f,
|
||||
chunkToFill.Grid.GetRandomPosition().z
|
||||
);
|
||||
while (!isPositionValid)
|
||||
{
|
||||
isPositionValid = true;
|
||||
foreach (var obstacle in chunkToFill.Obstacles)
|
||||
{
|
||||
if (Vector3.Distance(randomPosition, obstacle.transform.localPosition) < 1.0f)
|
||||
{
|
||||
isPositionValid = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!isPositionValid)
|
||||
{
|
||||
randomPosition = new Vector3(
|
||||
laneIndex * LaneSystem.LaneWidth,
|
||||
chunkToFill.Grid.GetRandomPosition().y + 1.0f,
|
||||
chunkToFill.Grid.GetRandomPosition().z
|
||||
);
|
||||
}
|
||||
}
|
||||
coin.transform.localPosition = randomPosition;
|
||||
coin.UpdateStartPositionForSinAnimator();
|
||||
return chunkToFill;
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Obstacles;
|
||||
using UnityEngine;
|
||||
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
@ -38,7 +37,6 @@ public abstract class Chunk : PoolingObject<Chunk>, IResettable
|
||||
transform.localPosition = Vector3.zero;
|
||||
transform.position = Vector3.zero;
|
||||
transform.rotation = Quaternion.identity;
|
||||
Coins.Clear();
|
||||
}
|
||||
private void OnTriggerExit(Collider other)
|
||||
{
|
||||
|
@ -8,7 +8,6 @@ public class LaneSystem : MonoBehaviour,IResettable
|
||||
[field: SerializeField] public float LaneWidth { get; private set; }
|
||||
|
||||
[SerializeField] private int laneCount;
|
||||
public int LaneCount => laneCount;
|
||||
public List<int> Lanes { get; private set; }
|
||||
public float CurrentPosition { get; private set; }
|
||||
public float TargetPosition { get; set; }
|
||||
|
@ -1,24 +1,20 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Networking;
|
||||
using System;
|
||||
|
||||
[Serializable]
|
||||
public class ScoreboardEntriesTable
|
||||
{
|
||||
public List<ScoreboardEntry> listeScore;
|
||||
|
||||
public ScoreboardEntriesTable()
|
||||
public ScoreboardEntriesTable(List<ScoreboardEntry> entries)
|
||||
{
|
||||
listeScore = new List<ScoreboardEntry>();
|
||||
this.entries = entries;
|
||||
}
|
||||
public List<ScoreboardEntry> entries = new List<ScoreboardEntry>();
|
||||
}
|
||||
|
||||
public class Scoreboard : MonoBehaviour
|
||||
public class Scoreboard : MonoBehaviour, ICommandTranslator
|
||||
{
|
||||
private string apiUrl = "https://awesomerunner.lagaudiere.uk/score";
|
||||
public List<ScoreboardEntry> entries = new List<ScoreboardEntry>();
|
||||
[SerializeField] private int maxEntries;
|
||||
private List<ScoreboardEntry> entries = new List<ScoreboardEntry>();
|
||||
|
||||
public event Action<ScoreboardEntry> OnEntryAdded;
|
||||
|
||||
@ -26,111 +22,72 @@ public class Scoreboard : MonoBehaviour
|
||||
|
||||
private void Start()
|
||||
{
|
||||
StartCoroutine(GetScoreboard());
|
||||
}
|
||||
private IEnumerator GetScoreboard()
|
||||
{
|
||||
Debug.Log("Fetching scoreboard...");
|
||||
|
||||
using (UnityWebRequest request = UnityWebRequest.Get(apiUrl))
|
||||
GameSession.Instance.AddCommandTranslator(this, false);
|
||||
string jsonScoreboardEntries = PlayerPrefs.GetString("ScoreboardEntriesTableTest"); //Binary file
|
||||
ScoreboardEntriesTable entriesTable = JsonUtility.FromJson<ScoreboardEntriesTable>(jsonScoreboardEntries);
|
||||
if (entriesTable == null)
|
||||
return;
|
||||
if (entriesTable.entries == null)
|
||||
return;
|
||||
List<PlayerScoreboardCardData> scoreboardCardDatas = new List<PlayerScoreboardCardData>();
|
||||
for (int i = 0; i < entriesTable.entries.Count; i++)
|
||||
{
|
||||
yield return request.SendWebRequest();
|
||||
|
||||
if (request.result == UnityWebRequest.Result.Success)
|
||||
{
|
||||
string json = request.downloadHandler.text;
|
||||
Debug.Log("Received JSON: " + json);
|
||||
|
||||
// Désérialiser directement en un tableau
|
||||
ScoreboardEntry[] scoreboardEntriesArray = JsonHelper.FromJson<ScoreboardEntry>(json);
|
||||
|
||||
if (scoreboardEntriesArray != null)
|
||||
{
|
||||
entries = new List<ScoreboardEntry>(scoreboardEntriesArray);
|
||||
SortScoreboardEntriesByHighscore(entries);
|
||||
UpdateScoreboardView();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("Erreur lors de la récupération du scoreboard : " + request.error);
|
||||
}
|
||||
entries.Add(entriesTable.entries[i]);
|
||||
OnEntryAdded?.Invoke(entriesTable.entries[i]);
|
||||
PlayerScoreboardCardData cardData = new PlayerScoreboardCardData(entriesTable.entries[i].Name, entriesTable.entries[i].Score.ToString());
|
||||
scoreboardCardDatas.Add(cardData);
|
||||
}
|
||||
SortScoreboardEntriesByHighscore(entries);
|
||||
SortScoreboardCardsDatasByHighscore(scoreboardCardDatas);
|
||||
scoreboardView.AddPlayerCards(scoreboardCardDatas);
|
||||
}
|
||||
|
||||
public void AddScoreboardEntry(string entryName, int entryScore)
|
||||
{
|
||||
ScoreboardEntry entry = new ScoreboardEntry(entryName, entryScore);
|
||||
entries.Add(entry);
|
||||
OnEntryAdded?.Invoke(entry);
|
||||
}
|
||||
|
||||
public void SortScoreboardEntriesByHighscore(List<ScoreboardEntry> entries)
|
||||
{
|
||||
entries.Sort((x,y) => y.Score.CompareTo(x.Score));
|
||||
}
|
||||
|
||||
public void SortScoreboardCardsDatasByHighscore(List<PlayerScoreboardCardData> scoreboardCardDatas)
|
||||
{
|
||||
scoreboardCardDatas.Sort((x, y) => y.playerScore.CompareTo(x.playerScore));
|
||||
}
|
||||
|
||||
public void AddScoreboardEntry(ScoreboardEntry entry)
|
||||
{
|
||||
entries.Add(entry);
|
||||
OnEntryAdded?.Invoke(entry);
|
||||
SaveScoreboardEntriesTable();
|
||||
}
|
||||
|
||||
public void SaveScoreboardEntriesTable()
|
||||
{
|
||||
SortScoreboardEntriesByHighscore(entries);
|
||||
UpdateScoreboardView();
|
||||
StartCoroutine(PostScoreboardEntry(entry));
|
||||
ScoreboardEntriesTable scoreboardEntriesTable = new ScoreboardEntriesTable(entries);
|
||||
string jsonScoreboardEntries = JsonUtility.ToJson(scoreboardEntriesTable);
|
||||
PlayerPrefs.SetString("ScoreboardEntriesTableTest", jsonScoreboardEntries);
|
||||
PlayerPrefs.Save();
|
||||
}
|
||||
|
||||
private IEnumerator PostScoreboardEntry(ScoreboardEntry entry)
|
||||
public void TranslateCommand(ECommand command, PressedState state)
|
||||
{
|
||||
string json = JsonUtility.ToJson(entry);
|
||||
using (UnityWebRequest request = new UnityWebRequest(apiUrl, "POST"))
|
||||
switch (command)
|
||||
{
|
||||
byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(json);
|
||||
request.uploadHandler = new UploadHandlerRaw(bodyRaw);
|
||||
request.downloadHandler = new DownloadHandlerBuffer();
|
||||
request.SetRequestHeader("Content-Type", "application/json");
|
||||
|
||||
yield return request.SendWebRequest();
|
||||
|
||||
if (request.result == UnityWebRequest.Result.Success)
|
||||
{
|
||||
Debug.Log("Score ajouté avec succès !");
|
||||
OnEntryAdded?.Invoke(entry);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("Erreur lors de l'ajout du score : " + request.error);
|
||||
}
|
||||
case ECommand.OPEN_SCOREBOARD:
|
||||
if (state.IsPressed == true)
|
||||
scoreboardView.Show(true);
|
||||
if (state.IsReleased == true)
|
||||
scoreboardView.Show(false);
|
||||
break;
|
||||
default:
|
||||
scoreboardView.Show(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
private void SortScoreboardEntriesByHighscore(List<ScoreboardEntry> entries)
|
||||
{
|
||||
entries.Sort((x, y) => y.score.CompareTo(x.score));
|
||||
}
|
||||
private void UpdateScoreboardView()
|
||||
{
|
||||
Debug.Log("Updating scoreboard view...");
|
||||
|
||||
List<PlayerScoreboardCardData> scoreboardCardDatas = new List<PlayerScoreboardCardData>();
|
||||
|
||||
foreach (var entry in entries)
|
||||
{
|
||||
OnEntryAdded?.Invoke(entry);
|
||||
scoreboardCardDatas.Add(new PlayerScoreboardCardData(entry.pseudo, entry.score.ToString()));
|
||||
}
|
||||
|
||||
scoreboardView.AddPlayerCards(scoreboardCardDatas);
|
||||
}
|
||||
}
|
||||
|
||||
public static class JsonHelper
|
||||
{
|
||||
public static T[] FromJson<T>(string json)
|
||||
{
|
||||
string wrappedJson = "{\"items\":" + json + "}";
|
||||
Wrapper<T> wrapper = JsonUtility.FromJson<Wrapper<T>>(wrappedJson);
|
||||
return wrapper.items;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
private class Wrapper<T>
|
||||
{
|
||||
public T[] items;
|
||||
}
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class ScoreboardEntriesWrapper
|
||||
{
|
||||
public ScoreboardEntry[] listeScore;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@ -6,13 +5,13 @@ using UnityEngine;
|
||||
[System.Serializable]
|
||||
public class ScoreboardEntry
|
||||
{
|
||||
public string pseudo;
|
||||
public int score;
|
||||
|
||||
public ScoreboardEntry(string pseudo, int score)
|
||||
[SerializeField] private float score;
|
||||
[SerializeField] private string name;
|
||||
public float Score { get { return score; } private set { score = value; } }
|
||||
public string Name { get { return name; } private set { name = value; } }
|
||||
public ScoreboardEntry(string name,float score)
|
||||
{
|
||||
this.pseudo = pseudo;
|
||||
this.name = name;
|
||||
this.score = score;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a87de00688705474c882c4db176e76cf
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,33 +0,0 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class MenuManager : MonoBehaviour
|
||||
{
|
||||
public Image menuImage; // L'image affichée dans le menu
|
||||
public Sprite[] menuSprites; // Tableau des 9 images de menu
|
||||
|
||||
private int player1Skin;
|
||||
private int player2Skin;
|
||||
|
||||
void Start()
|
||||
{
|
||||
player1Skin = PlayerPrefs.GetInt("SelectedSkin_Player1", 0);
|
||||
player2Skin = PlayerPrefs.GetInt("SelectedSkin_Player2", 0);
|
||||
UpdateMenuImage();
|
||||
}
|
||||
|
||||
void UpdateMenuImage()
|
||||
{
|
||||
int imageIndex = GetMenuImageIndex(player1Skin, player2Skin);
|
||||
|
||||
if (imageIndex >= 0 && imageIndex < menuSprites.Length)
|
||||
{
|
||||
menuImage.sprite = menuSprites[imageIndex];
|
||||
}
|
||||
}
|
||||
|
||||
int GetMenuImageIndex(int skin1, int skin2)
|
||||
{
|
||||
return skin1 * 3 + skin2; // Adapter selon ton nombre de skins
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 73a49fe834731374cbc6b8886a79c0f1
|
@ -1,26 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class PlayerSkinManager : MonoBehaviour
|
||||
{
|
||||
public SkinnedMeshRenderer[] bodyParts; // Liste des renderers
|
||||
public Material[] skins; // Liste des matériaux (à remplir dans l'Inspector)
|
||||
public string playerId; // Identifiant unique du joueur
|
||||
|
||||
void Start()
|
||||
{
|
||||
// Charger le skin sélectionné pour ce joueur spécifique
|
||||
int selectedSkin = PlayerPrefs.GetInt($"SelectedSkin_{playerId}", 0);
|
||||
ApplySkin(selectedSkin);
|
||||
}
|
||||
|
||||
public void ApplySkin(int index)
|
||||
{
|
||||
if (index >= 0 && index < skins.Length)
|
||||
{
|
||||
foreach (var part in bodyParts) // Appliquer à chaque partie du corps
|
||||
{
|
||||
part.material = skins[index];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: aa943b55701d5e245bcdc37e137a1e73
|
@ -1,13 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class SkinSelector : MonoBehaviour
|
||||
{
|
||||
public string playerId; // Identifiant unique du joueur
|
||||
|
||||
public void SelectSkin(int skinIndex)
|
||||
{
|
||||
// Sauvegarder l'index du skin choisi pour ce joueur spécifique
|
||||
PlayerPrefs.SetInt($"SelectedSkin_{playerId}", skinIndex);
|
||||
PlayerPrefs.Save();
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 21b477373147aaf4a81c8bf75f8984a5
|
@ -1,5 +1,4 @@
|
||||
using Assets.Scripts.GameSession;
|
||||
using TMPro;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
@ -10,42 +9,32 @@ namespace UI.Views
|
||||
{
|
||||
public TMP_Text Joueur1Text;
|
||||
public TMP_Text Joueur2Text;
|
||||
public TMP_Text CoinsText;
|
||||
public TMP_Text ScoreText;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(GameResult.MatchResult))
|
||||
if (!string.IsNullOrEmpty(GameSession.MatchResult))
|
||||
{
|
||||
switch (GameResult.MatchResult)
|
||||
switch (GameSession.MatchResult)
|
||||
{
|
||||
case "PLAYER1":
|
||||
if(Joueur2Text != null)
|
||||
Joueur1Text.text = "WINNER !";
|
||||
if(Joueur2Text != null)
|
||||
Joueur2Text.text = "LOSER !";
|
||||
Joueur1Text.text = "WINNER !";
|
||||
Joueur2Text.text = "LOSER !";
|
||||
break;
|
||||
|
||||
case "PLAYER2":
|
||||
if(Joueur2Text != null )
|
||||
Joueur2Text.text = "WINNER !";
|
||||
if(Joueur2Text != null)
|
||||
Joueur1Text.text = "LOSER !";
|
||||
Joueur2Text.text = "WINNER !";
|
||||
Joueur1Text.text = "LOSER !";
|
||||
break;
|
||||
|
||||
case "DRAW":
|
||||
if(Joueur1Text != null)
|
||||
Joueur1Text.text = "Draw";
|
||||
if(Joueur2Text != null)
|
||||
Joueur2Text.text = "Draw";
|
||||
Joueur1Text.text = "Draw";
|
||||
Joueur2Text.text = "Draw";
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
CoinsText.text = GameResult.coinsEarned.ToString();
|
||||
ScoreText.text = GameResult.score.ToString() + "M";
|
||||
}
|
||||
|
||||
public void RestartGame()
|
||||
|
@ -21,37 +21,22 @@ public class ScoreboardView : BaseView
|
||||
}
|
||||
public void AddPlayerCards(List<PlayerScoreboardCardData> cardsData)
|
||||
{
|
||||
Debug.Log("Adding " + cardsData.Count + " player cards.");
|
||||
|
||||
foreach (var cardData in cardsData)
|
||||
{
|
||||
Debug.Log("Card Data: " + cardData.playerName + " - " + cardData.playerScore);
|
||||
AddPlayerCard(cardData);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void AddPlayerCard(PlayerScoreboardCardData cardData)
|
||||
{
|
||||
if (layoutGroup == null)
|
||||
{
|
||||
Debug.LogError("layoutGroup is not assigned!");
|
||||
return;
|
||||
}
|
||||
|
||||
//if (playerCards.ContainsKey(cardData.playerName))
|
||||
// return;
|
||||
PlayerScoreboardCard playerScoreboardCard = Instantiate(cardPrefab);
|
||||
playerScoreboardCard.transform.SetParent(layoutGroup.transform, false);
|
||||
playerScoreboardCard.UpdateCard(cardData);
|
||||
|
||||
Debug.Log("Player card created for: " + cardData.playerName);
|
||||
|
||||
playerScoreboardCard.UpdateCard(cardData);
|
||||
playerCards.Add(playerScoreboardCard);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public void RemovePlayerCard(string cardTag)
|
||||
{
|
||||
//if (playerCards.ContainsKey(cardTag))
|
||||
|
140
Assets/Scripts/Utils/CubemapTextureBuilder.cs
Normal file
140
Assets/Scripts/Utils/CubemapTextureBuilder.cs
Normal file
@ -0,0 +1,140 @@
|
||||
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEditor;
|
||||
using System.Linq;
|
||||
using System.IO;
|
||||
|
||||
public class CubemapTextureBuilder : EditorWindow
|
||||
{
|
||||
[MenuItem("Tools/Cubemap Builder")]
|
||||
public static void OpenWindow()
|
||||
{
|
||||
GetWindow<CubemapTextureBuilder>();
|
||||
}
|
||||
|
||||
Texture2D[] textures = new Texture2D[6];
|
||||
string[] labels = new string[] {
|
||||
"Right", "Left",
|
||||
"Top", "Bottom",
|
||||
"Front", "Back"
|
||||
};
|
||||
|
||||
TextureFormat[] HDRFormats = new TextureFormat[] {
|
||||
TextureFormat.ASTC_HDR_10x10 ,
|
||||
TextureFormat.ASTC_HDR_12x12 ,
|
||||
TextureFormat.ASTC_HDR_4x4 ,
|
||||
TextureFormat.ASTC_HDR_5x5 ,
|
||||
TextureFormat.ASTC_HDR_6x6 ,
|
||||
TextureFormat.ASTC_HDR_8x8 ,
|
||||
TextureFormat.BC6H ,
|
||||
TextureFormat.RGBAFloat ,
|
||||
TextureFormat.RGBAHalf
|
||||
};
|
||||
|
||||
Vector2Int[] placementRects = new Vector2Int[]
|
||||
{
|
||||
new Vector2Int(2, 1),
|
||||
new Vector2Int(0, 1),
|
||||
new Vector2Int(1, 2),
|
||||
new Vector2Int(1, 0),
|
||||
new Vector2Int(1, 1),
|
||||
new Vector2Int(3, 1),
|
||||
};
|
||||
|
||||
|
||||
private void OnGUI()
|
||||
{
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
textures[i] = EditorGUILayout.ObjectField(labels[i], textures[i], typeof(Texture2D), false) as Texture2D;
|
||||
}
|
||||
|
||||
if (GUILayout.Button("Build Cubemap"))
|
||||
{
|
||||
// Missing Texture
|
||||
if (textures.Any(t => t == null))
|
||||
{
|
||||
EditorUtility.DisplayDialog("Cubemap Builder Error", "One or more texture is missing.", "Ok");
|
||||
return;
|
||||
}
|
||||
|
||||
// Get size
|
||||
var size = textures[0].width;
|
||||
|
||||
// Not all of the same size or square
|
||||
if (textures.Any(t => (t.width != size) || (t.height != size)))
|
||||
{
|
||||
EditorUtility.DisplayDialog("Cubemap Builder Error", "All the textures need to be the same size and square.", "Ok");
|
||||
return;
|
||||
}
|
||||
|
||||
var isHDR = HDRFormats.Any(f => f == textures[0].format);
|
||||
var texturePaths = textures.Select(t => AssetDatabase.GetAssetPath(t)).ToArray();
|
||||
|
||||
// Should be ok, ask for the file path.
|
||||
var path = EditorUtility.SaveFilePanel("Save Cubemap", Path.GetDirectoryName(texturePaths[0]), "Cubemap", isHDR ? "exr" : "png");
|
||||
|
||||
if (string.IsNullOrEmpty(path)) return;
|
||||
|
||||
// Save the readable flag to restore it afterwards
|
||||
var readableFlags = textures.Select(t => t.isReadable).ToArray();
|
||||
|
||||
// Get the importer and mark the textures as readable
|
||||
var importers = texturePaths.Select(p => TextureImporter.GetAtPath(p) as TextureImporter).ToArray();
|
||||
|
||||
foreach (var importer in importers)
|
||||
{
|
||||
importer.isReadable = true;
|
||||
}
|
||||
|
||||
AssetDatabase.Refresh();
|
||||
|
||||
foreach (var p in texturePaths)
|
||||
{
|
||||
AssetDatabase.ImportAsset(p);
|
||||
}
|
||||
|
||||
// Build the cubemap texture
|
||||
var cubeTexture = new Texture2D(size * 4, size * 3, isHDR ? TextureFormat.RGBAFloat : TextureFormat.RGBA32, false);
|
||||
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
cubeTexture.SetPixels(placementRects[i].x * size, placementRects[i].y * size, size, size, textures[i].GetPixels(0));
|
||||
}
|
||||
|
||||
cubeTexture.Apply(false);
|
||||
|
||||
// Save the texture to the specified path, and destroy the temporary object
|
||||
var bytes = isHDR ? cubeTexture.EncodeToEXR() : cubeTexture.EncodeToPNG();
|
||||
|
||||
File.WriteAllBytes(path, bytes);
|
||||
|
||||
DestroyImmediate(cubeTexture);
|
||||
|
||||
// Reset the read flags, and reimport everything
|
||||
for (var i = 0; i < 6; i++)
|
||||
{
|
||||
importers[i].isReadable = readableFlags[i];
|
||||
}
|
||||
|
||||
path = path.Remove(0, Application.dataPath.Length - 6);
|
||||
|
||||
AssetDatabase.ImportAsset(path);
|
||||
|
||||
var cubeImporter = AssetImporter.GetAtPath(path) as TextureImporter;
|
||||
cubeImporter.textureShape = TextureImporterShape.TextureCube;
|
||||
cubeImporter.sRGBTexture = false;
|
||||
cubeImporter.generateCubemap = TextureImporterGenerateCubemap.FullCubemap;
|
||||
|
||||
foreach (var p in texturePaths)
|
||||
{
|
||||
AssetDatabase.ImportAsset(p);
|
||||
}
|
||||
AssetDatabase.ImportAsset(path);
|
||||
|
||||
AssetDatabase.Refresh();
|
||||
}
|
||||
}
|
||||
}
|
11
Assets/Scripts/Utils/CubemapTextureBuilder.cs.meta
Normal file
11
Assets/Scripts/Utils/CubemapTextureBuilder.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f7b00d918e7b13c4c8823278d24d708a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,4 +1,3 @@
|
||||
using Assets.Scripts.GameSession;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
@ -21,6 +20,6 @@ public class RestartButton : MonoBehaviour
|
||||
|
||||
public void RestartGame()
|
||||
{
|
||||
GoToScene.GoToSoloMode();
|
||||
SceneManager.LoadScene("GameScene");
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7a6cd05b162829143bc4b5dad38146f6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Sounds/Trailer Action Cinematic by Infraction [No Copyright Music] ⧸ Galactic.wav
(Stored with Git LFS)
BIN
Assets/Sounds/Trailer Action Cinematic by Infraction [No Copyright Music] ⧸ Galactic.wav
(Stored with Git LFS)
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ddf8fb13b61f8474d89b050db1febfc6
|
||||
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:
|
BIN
Assets/Sounds/jumping_1-6452.mp3
(Stored with Git LFS)
BIN
Assets/Sounds/jumping_1-6452.mp3
(Stored with Git LFS)
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1349cd948201da94d803d355043b3e6b
|
||||
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:
|
BIN
Assets/Sprites/Awesome Runner (2).png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/Awesome Runner (2).png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 590b8a48d28b68a48b63b55d69a491ff
|
||||
guid: 38c95c0304ff5fa40842726137f20778
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
BIN
Assets/Sprites/Awesome_Runner_1.png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/Awesome_Runner_1.png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,12 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c8d223d6d753d8a4182de07e68df4669
|
||||
guid: de8ae31bb102a7848b475b5b60316716
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
@ -37,13 +37,13 @@ TextureImporter:
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
@ -52,9 +52,9 @@ TextureImporter:
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
@ -100,7 +100,7 @@ TextureImporter:
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ab2de4a0db2b6fb4697d134551345552
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Sprites/Deathscreen.png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/Deathscreen.png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,12 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
guid: daf5c9f9cd97739419b7ed0d8bb24818
|
||||
guid: f3bf48d62eb8db4488ff8d833e011574
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
@ -37,13 +37,13 @@ TextureImporter:
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
@ -52,9 +52,9 @@ TextureImporter:
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
@ -100,7 +100,7 @@ TextureImporter:
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
BIN
Assets/Sprites/Deathscreen/Deathscreen (1).png
(Stored with Git LFS)
BIN
Assets/Sprites/Deathscreen/Deathscreen (1).png
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3734d701a4e328845b4bee95769e2f7e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Sprites/MainMenu/NN.png
(Stored with Git LFS)
BIN
Assets/Sprites/MainMenu/NN.png
(Stored with Git LFS)
Binary file not shown.
@ -1,117 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6224b07b34e67fc4a84103561e0f8f19
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
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: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Sprites/MainMenu/NO.png
(Stored with Git LFS)
BIN
Assets/Sprites/MainMenu/NO.png
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Sprites/MainMenu/NR.png
(Stored with Git LFS)
BIN
Assets/Sprites/MainMenu/NR.png
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Sprites/MainMenu/ON.png
(Stored with Git LFS)
BIN
Assets/Sprites/MainMenu/ON.png
(Stored with Git LFS)
Binary file not shown.
@ -1,117 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a80d2cff3fa61f3498485931ec9c1aac
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
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: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
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: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user