Compare commits
17 Commits
cda263839d
...
9a22b9edb5
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a22b9edb5 | |||
| fa16eaa0cc | |||
| 5a58064e4d | |||
| 15a847cbde | |||
| ef6ed85e52 | |||
| aa0cd27d87 | |||
| f36578c429 | |||
| 75c890766c | |||
| 8ca5097604 | |||
| be419b5c78 | |||
| ced8078398 | |||
|
2b8dec8ba7 | ||
|
|
06af055344 | ||
|
|
b3a2d8b1e6 | ||
|
|
3b1774515b | ||
|
|
27e4584d88 | ||
| fc7914f4c5 |
13
.idea/.idea.AwesomeRunner-/.idea/.gitignore
generated
vendored
Normal file
13
.idea/.idea.AwesomeRunner-/.idea/.gitignore
generated
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
# 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
Normal file
4
.idea/.idea.AwesomeRunner-/.idea/encodings.xml
generated
Normal file
@ -0,0 +1,4 @@
|
||||
<?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
Normal file
8
.idea/.idea.AwesomeRunner-/.idea/indexLayout.xml
generated
Normal file
@ -0,0 +1,8 @@
|
||||
<?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
Normal file
6
.idea/.idea.AwesomeRunner-/.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/indexLayout.xml
generated
Normal file
8
.idea/indexLayout.xml
generated
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="UserContentModel">
|
||||
<attachedFolders />
|
||||
<explicitIncludes />
|
||||
<explicitExcludes />
|
||||
</component>
|
||||
</project>
|
||||
7
.idea/projectSettingsUpdater.xml
generated
Normal file
7
.idea/projectSettingsUpdater.xml
generated
Normal file
@ -0,0 +1,7 @@
|
||||
<?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
Normal file
6
.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?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
Normal file
70
.idea/workspace.xml
generated
Normal file
@ -0,0 +1,70 @@
|
||||
<?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>
|
||||
@ -9,6 +9,8 @@ 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
|
||||
@ -19,6 +21,7 @@ Material:
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -85,3 +88,4 @@ 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,20 +2,26 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
serializedVersion: 8
|
||||
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_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _METALLICGLOSSMAP
|
||||
- _NORMALMAP
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -55,6 +61,7 @@ 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
|
||||
@ -75,3 +82,5 @@ 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,19 +2,25 @@
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: No Name
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 5
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 1
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
@ -54,19 +60,26 @@ 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,7 +8,8 @@ public class laserScript : MonoBehaviour {
|
||||
// Use this for initialization
|
||||
void Start () {
|
||||
laserLine = GetComponentInChildren<LineRenderer> ();
|
||||
laserLine.SetWidth (.2f, .2f);
|
||||
laserLine.startWidth = .2f;
|
||||
laserLine.endWidth = .2f;
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
5799
Assets/Prefabs/Player2.prefab
Normal file
5799
Assets/Prefabs/Player2.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefabs/Player2.prefab.meta
Normal file
7
Assets/Prefabs/Player2.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4865203f6c333ec41aa9c857891d9921
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
5799
Assets/Prefabs/Player3.prefab
Normal file
5799
Assets/Prefabs/Player3.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefabs/Player3.prefab.meta
Normal file
7
Assets/Prefabs/Player3.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6e6131461623f7f4e9622a07b5ea2f48
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Resources.meta
Normal file
8
Assets/Resources.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 723c7ecb1f81a8c47a6c3853e476b507
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
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: 10304, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_SkyboxMaterial: {fileID: 2100000, guid: 56d63adb06e62c745852a4e1e4f43902, type: 2}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
@ -168,7 +168,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
@ -217,8 +217,10 @@ 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}
|
||||
@ -238,7 +240,279 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 5827ef60d322c73468e816b5411af65a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
restartButton: {fileID: 0}
|
||||
restartButton: {fileID: 344149856}
|
||||
--- !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
|
||||
--- !u!1 &344149854
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -274,8 +548,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: -93.06824, y: -141.89418}
|
||||
m_SizeDelta: {x: 111.4353, y: 151.2302}
|
||||
m_AnchoredPosition: {x: -72.838036, y: -109.738655}
|
||||
m_SizeDelta: {x: 83.1114, y: 117.0469}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &344149856
|
||||
MonoBehaviour:
|
||||
@ -405,8 +679,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: -339.51, y: -51.875}
|
||||
m_SizeDelta: {x: 347.4745, y: 331.2676}
|
||||
m_AnchoredPosition: {x: -267, y: -23}
|
||||
m_SizeDelta: {x: 215.7859, y: 191.7685}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &532422008
|
||||
MonoBehaviour:
|
||||
@ -550,6 +824,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 934295242}
|
||||
- component: {fileID: 934295243}
|
||||
- component: {fileID: 934295244}
|
||||
m_Layer: 0
|
||||
m_Name: GameManager
|
||||
m_TagString: Untagged
|
||||
@ -584,6 +859,20 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &934295244
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 934295239}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2278264f81ffe464da1a99450675b475, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
distanceText: {fileID: 2089165862}
|
||||
numberCoinsText: {fileID: 142150283}
|
||||
--- !u!1 &963194225
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -760,7 +1049,10 @@ PrefabInstance:
|
||||
propertyPath: PlayerHUD
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
- {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
- {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
@ -799,8 +1091,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, y: -0.0060005}
|
||||
m_SizeDelta: {x: 104.8, y: 117.85}
|
||||
m_AnchoredPosition: {x: 0.000041962, y: -0.00017548}
|
||||
m_SizeDelta: {x: 80, y: 90.028}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1425101075
|
||||
MonoBehaviour:
|
||||
@ -822,7 +1114,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 2800000, guid: f3bf48d62eb8db4488ff8d833e011574, type: 3}
|
||||
m_Texture: {fileID: 2800000, guid: 590b8a48d28b68a48b63b55d69a491ff, type: 3}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -1061,8 +1353,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: 81, y: -141.89418}
|
||||
m_SizeDelta: {x: 111.4353, y: 151.2302}
|
||||
m_AnchoredPosition: {x: 62.2088, y: -109.74}
|
||||
m_SizeDelta: {x: 85.2889, y: 117.05}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1726438703
|
||||
MonoBehaviour:
|
||||
@ -1158,78 +1450,6 @@ 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
|
||||
@ -1298,6 +1518,142 @@ 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
@ -464,6 +464,7 @@ MonoBehaviour:
|
||||
player2: {fileID: 2249596435903131710}
|
||||
scoreboard: {fileID: 634835458}
|
||||
isDuoMode: 1
|
||||
playerData: {fileID: 11400000, guid: 928d6efd735c3814d955e3f955a0264a, type: 2}
|
||||
--- !u!4 &70882853
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -535,7 +536,7 @@ GameObject:
|
||||
- component: {fileID: 100036930}
|
||||
- component: {fileID: 100036929}
|
||||
- component: {fileID: 100036928}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Back
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -701,7 +702,7 @@ GameObject:
|
||||
- component: {fileID: 139585262}
|
||||
- component: {fileID: 139585263}
|
||||
- component: {fileID: 139585264}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -724,7 +725,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.000050159586, y: 0.0000019978345}
|
||||
m_AnchoredPosition: {x: -0.000050159586, y: -0.0000038146973}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &139585263
|
||||
@ -776,7 +777,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 178371325}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Sliding Area
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -935,7 +936,7 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 220002225}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 46.84}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@ -980,8 +981,8 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1858832248}
|
||||
- {fileID: 1791311983}
|
||||
- {fileID: 1858832248}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &377940177
|
||||
@ -1136,7 +1137,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &552140505
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1364,7 +1365,7 @@ 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: 11.384, y: 280}
|
||||
m_AnchoredPosition: {x: 0, y: -262}
|
||||
m_SizeDelta: {x: 122.7673, y: 34.7875}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &772101543
|
||||
@ -1436,7 +1437,7 @@ MonoBehaviour:
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_ActiveFontFeatures: 00000000
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
@ -1478,7 +1479,7 @@ GameObject:
|
||||
- component: {fileID: 812835471}
|
||||
- component: {fileID: 812835470}
|
||||
- component: {fileID: 812835469}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Viewport
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -1567,7 +1568,7 @@ GameObject:
|
||||
- component: {fileID: 839969255}
|
||||
- component: {fileID: 839969257}
|
||||
- component: {fileID: 839969256}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: BackText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -1704,7 +1705,7 @@ GameObject:
|
||||
- component: {fileID: 868437932}
|
||||
- component: {fileID: 868437931}
|
||||
- component: {fileID: 868437930}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Scrollbar Vertical
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -2222,7 +2223,7 @@ GameObject:
|
||||
- component: {fileID: 1055376734}
|
||||
- component: {fileID: 1055376733}
|
||||
- component: {fileID: 1055376732}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Scroll View
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -2431,7 +2432,7 @@ GameObject:
|
||||
- component: {fileID: 1237272501}
|
||||
- component: {fileID: 1237272503}
|
||||
- component: {fileID: 1237272502}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: Handle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -3459,6 +3460,156 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
--- !u!1 &1733628372
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1733628373}
|
||||
- component: {fileID: 1733628375}
|
||||
- component: {fileID: 1733628374}
|
||||
m_Layer: 5
|
||||
m_Name: Separator
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1733628373
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1733628372}
|
||||
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: 678372250}
|
||||
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, y: 0}
|
||||
m_SizeDelta: {x: 5, y: 598.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1733628374
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1733628372}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, 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_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1733628375
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1733628372}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1772075871
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1772075872}
|
||||
- component: {fileID: 1772075874}
|
||||
- component: {fileID: 1772075873}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1772075872
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1772075871}
|
||||
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: 678372250}
|
||||
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, y: 274.87}
|
||||
m_SizeDelta: {x: 128.84, y: 30.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1772075873
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1772075871}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0.8980392}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1772075874
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1772075871}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1791311979
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3788,8 +3939,8 @@ RectTransform:
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 220002229}
|
||||
- {fileID: 678372250}
|
||||
- {fileID: 220002229}
|
||||
- {fileID: 552140505}
|
||||
m_Father: {fileID: 245285643}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -4363,7 +4514,7 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1856934115903457218}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 28.65}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@ -4375,8 +4526,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -60.000004, y: -200}
|
||||
m_AnchoredPosition: {x: 0, y: -5}
|
||||
m_SizeDelta: {x: -60.000004, y: -110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1856934115903457218
|
||||
GameObject:
|
||||
@ -4390,7 +4541,7 @@ GameObject:
|
||||
- component: {fileID: 1856934115903457221}
|
||||
- component: {fileID: 1856934115903457222}
|
||||
- component: {fileID: 4920621562230953387}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: ScoreboardView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -4418,7 +4569,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
|
||||
m_Color: {r: 0.59119487, g: 0.59119487, b: 0.59119487, a: 0.7019608}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -4497,7 +4648,7 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 2749335941631071934}
|
||||
- component: {fileID: 5068000569768891960}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: VerticalLayout
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -5178,6 +5329,14 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1858832248}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 129.0279
|
||||
@ -5186,18 +5345,26 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -64.514404
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16
|
||||
value: -25.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410793, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410798, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_CullTransparentMesh
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_fontSize
|
||||
value: 30.25
|
||||
@ -5212,7 +5379,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_margin.z
|
||||
value: 8.811302
|
||||
value: -0.043342564
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_fontStyle
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_HorizontalAlignment
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
|
||||
value: 1801810542
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -5320,7 +5499,13 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
insertIndex: 0
|
||||
addedObject: {fileID: 1733628373}
|
||||
- targetCorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
insertIndex: 1
|
||||
addedObject: {fileID: 1772075872}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
--- !u!1 &6871074651254400895
|
||||
@ -5365,7 +5550,7 @@ GameObject:
|
||||
- component: {fileID: 4191864465036188526}
|
||||
- component: {fileID: 334265878197336758}
|
||||
- component: {fileID: 3413095558211005055}
|
||||
m_Layer: 5
|
||||
m_Layer: 3
|
||||
m_Name: ScoreboardText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
||||
@ -167,7 +167,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
@ -713,8 +713,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: -410, y: -72}
|
||||
m_SizeDelta: {x: 195, y: 400}
|
||||
m_AnchoredPosition: {x: -252.8, y: -42.3}
|
||||
m_SizeDelta: {x: 142.5, y: 288.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &585937283
|
||||
MonoBehaviour:
|
||||
@ -846,8 +846,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: 265.5, y: -153.16}
|
||||
m_SizeDelta: {x: 177.9763, y: 190.8653}
|
||||
m_AnchoredPosition: {x: 212.75699, y: -113.52}
|
||||
m_SizeDelta: {x: 117.196, y: 152.05}
|
||||
m_Pivot: {x: 0.5, y: 0.50000006}
|
||||
--- !u!114 &641718692
|
||||
MonoBehaviour:
|
||||
@ -1295,8 +1295,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.014961, y: -0.00024796}
|
||||
m_SizeDelta: {x: 130.55, y: 115.45}
|
||||
m_AnchoredPosition: {x: 36.30214, y: 0.00042725}
|
||||
m_SizeDelta: {x: 91.8535, y: 74.982}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1425101075
|
||||
MonoBehaviour:
|
||||
@ -1505,8 +1505,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: 268, y: 71}
|
||||
m_SizeDelta: {x: 177.9763, y: 190.8653}
|
||||
m_AnchoredPosition: {x: 212.76, y: 54}
|
||||
m_SizeDelta: {x: 117.19, y: 151.4374}
|
||||
m_Pivot: {x: 0.49999997, y: 0.5}
|
||||
--- !u!114 &1715640246
|
||||
MonoBehaviour:
|
||||
@ -1638,8 +1638,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: -112, y: -45.2294}
|
||||
m_SizeDelta: {x: 195, y: 400}
|
||||
m_AnchoredPosition: {x: -39.7636, y: -34}
|
||||
m_SizeDelta: {x: 144.9, y: 300.43}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2040053554
|
||||
MonoBehaviour:
|
||||
|
||||
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: 1
|
||||
m_Enabled: 0
|
||||
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
|
||||
<SpeedAcceleration>k__BackingField: 0
|
||||
<CurrentSpeed>k__BackingField: 401.62177
|
||||
<SpeedAcceleration>k__BackingField: 1
|
||||
|
||||
@ -1,13 +1,39 @@
|
||||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
|
||||
[CreateAssetMenu(fileName = "PlayerData", menuName = "ScriptableObjects/Player")]
|
||||
public class PlayerData : ScriptableObject
|
||||
public sealed class PlayerData : ScriptableObject
|
||||
{
|
||||
[field: SerializeField] public int InvincibilityTime { get; private set; }
|
||||
// Serialize Fields
|
||||
[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; private 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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Assets.Scripts.GameSession;
|
||||
using JetBrains.Annotations;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
@ -12,6 +13,7 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
[SerializeField] [CanBeNull] private Player player2;
|
||||
[SerializeField] private Scoreboard scoreboard;
|
||||
[SerializeField] private Boolean isDuoMode;
|
||||
[SerializeField] private PlayerData playerData;
|
||||
|
||||
public static GameSession Instance { get; private set; }
|
||||
public WorldCurver Curver { get; private set; }
|
||||
@ -38,6 +40,7 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
playerData.Update();
|
||||
_player1InputTranslator.Tick();
|
||||
if (isDuoMode)
|
||||
{
|
||||
@ -45,8 +48,8 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
}
|
||||
|
||||
Curver.Tick();
|
||||
// curver.SinCurveX();
|
||||
// Curver.SinCurveY();
|
||||
// curver.SinCurveX();
|
||||
// Curver.SinCurveY();
|
||||
//Curver.TurnWorldToLeft();
|
||||
}
|
||||
|
||||
@ -55,36 +58,28 @@ 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);
|
||||
|
||||
if (isDuoMode)
|
||||
{
|
||||
var player2Holder = new KeyBindingHolder();
|
||||
player2Holder.Init(true);
|
||||
_player2InputTranslator = new InputTranslator<KeyBinding>(player2Holder, true);
|
||||
}
|
||||
playerData.Reset();
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
if (isPaused)
|
||||
_speedAtPause = player1.playerData.CurrentSpeed;
|
||||
else
|
||||
{
|
||||
player1.playerData.CurrentSpeed = _speedAtPause;
|
||||
}
|
||||
|
||||
playerData.isPaused(isPaused);
|
||||
Time.timeScale = isPaused ? 0 : 1;
|
||||
if (!_isSessionPaused && _player1InputTranslator.IsTranslationResticted(InputConstants.InGameCommands) && _player2InputTranslator.IsTranslationResticted(InputConstants.InGameCommands) )
|
||||
{
|
||||
@ -162,26 +157,28 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
SceneManager.LoadScene("DeathScreen1VS1");
|
||||
}
|
||||
|
||||
public void GoToSoloMode()
|
||||
public void PausePlayAgain()
|
||||
{
|
||||
SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single);
|
||||
if (isDuoMode)
|
||||
{
|
||||
GoToScene.GoToDuoMode();
|
||||
}
|
||||
else
|
||||
{
|
||||
GoToScene.GoToSoloMode();
|
||||
}
|
||||
ResetToDefault();
|
||||
}
|
||||
|
||||
public void GoToDuoMode()
|
||||
public void PauseBackToMainMenu()
|
||||
{
|
||||
SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single);
|
||||
ResetToDefault();
|
||||
}
|
||||
public void GoToMainMenu()
|
||||
{
|
||||
SceneManager.LoadScene("MainMenu", LoadSceneMode.Single);
|
||||
GoToScene.GoToMainMenu();
|
||||
ResetToDefault();
|
||||
}
|
||||
|
||||
public void ResetToDefault()
|
||||
{
|
||||
PauseSession(false);
|
||||
playerData.Reset();
|
||||
if(player1 !=null)
|
||||
player1.ResetToDefault();
|
||||
if (isDuoMode && player2 != null)
|
||||
@ -189,4 +186,9 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
player2.ResetToDefault();
|
||||
}
|
||||
}
|
||||
|
||||
public PlayerData GetPlayerData()
|
||||
{
|
||||
return this.playerData;
|
||||
}
|
||||
}
|
||||
@ -5,26 +5,26 @@ namespace Assets.Scripts.GameSession
|
||||
{
|
||||
public class GoToScene : MonoBehaviour
|
||||
{
|
||||
public void GoToSoloMode()
|
||||
public static void GoToSoloMode()
|
||||
{
|
||||
SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single);
|
||||
}
|
||||
|
||||
public void GoToDuoMode()
|
||||
public static void GoToDuoMode()
|
||||
{
|
||||
SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single);
|
||||
}
|
||||
public void GoToMainMenu()
|
||||
public static void GoToMainMenu()
|
||||
{
|
||||
SceneManager.LoadScene("MainMenu", LoadSceneMode.Single);
|
||||
}
|
||||
public void GoToDeathScreenSolo()
|
||||
public static void GoToDeathScreenSolo()
|
||||
{
|
||||
SceneManager.LoadScene("", LoadSceneMode.Single);
|
||||
SceneManager.LoadScene("DeathScreen", LoadSceneMode.Single);
|
||||
}
|
||||
public void GoToDeathScreen1VS1()
|
||||
public static void GoToDeathScreen1VS1()
|
||||
{
|
||||
SceneManager.LoadScene("", LoadSceneMode.Single);
|
||||
SceneManager.LoadScene("DeathScreen1VS1", LoadSceneMode.Single);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,33 +1,36 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Pools;
|
||||
using UnityEngine;
|
||||
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
public class Obstacle : PoolingObject<Obstacle>, IObstacle,IDamageDealer,IResettable
|
||||
namespace Obstacles
|
||||
{
|
||||
[field: SerializeField] public bool IsOnAllLanes { get; private set; }
|
||||
[field: SerializeField] public bool IsInevitable { get; private set; }
|
||||
public BoxCollider Collider { get; private set; }
|
||||
[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; }
|
||||
|
||||
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();
|
||||
}
|
||||
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();
|
||||
}
|
||||
|
||||
public void DealDamage(IDamageable target, int amount)
|
||||
{
|
||||
target.TakeDamage(amount);
|
||||
public void DealDamage(IDamageable target, int amount)
|
||||
{
|
||||
target.TakeDamage(amount);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,11 +34,10 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
|
||||
#region PlayerComponents
|
||||
|
||||
[SerializeField] internal PlayerData playerData;
|
||||
public PlayerData playerData;
|
||||
public IDamageable PlayerHealth { get; private set; }
|
||||
public Statistics PlayerStatictics { get; private set; }
|
||||
|
||||
public PlayerData PlayerData { get { return playerData; } }
|
||||
|
||||
#endregion
|
||||
|
||||
@ -48,14 +47,8 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
|
||||
public LaneSystem LaneSystem
|
||||
{
|
||||
get
|
||||
{
|
||||
return laneSystem;
|
||||
}
|
||||
private set
|
||||
{
|
||||
laneSystem = value;
|
||||
}
|
||||
get => laneSystem;
|
||||
private set => laneSystem = value;
|
||||
}
|
||||
|
||||
|
||||
@ -71,11 +64,11 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
public bool IsInvincible { get; private set; }
|
||||
public float InvincibilityTime { get; private set; } //PLAYER DATA ScriptableObject
|
||||
[SerializeField] private Boolean isPlayer2;
|
||||
[SerializeField] private Boolean isPlaying1VS1;
|
||||
public bool isDead = false;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
playerData = GameSession.Instance.GetPlayerData();
|
||||
GameSession.Instance.AddCommandTranslator(this, isPlayer2);
|
||||
animator = GetComponent<Animator>();
|
||||
if (animator)
|
||||
@ -86,7 +79,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
PlayerStatictics = GetComponent<Statistics>();
|
||||
PlayerStateMachine = new PlayerStateMachine(this);
|
||||
InvincibilityTime = playerData.InvincibilityTime;
|
||||
playerData.CurrentSpeed = playerData.InitialSpeed;
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
@ -102,7 +94,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
|
||||
private void Update()
|
||||
{
|
||||
playerData.CurrentSpeed += playerData.SpeedAcceleration / 1000;
|
||||
PlayerStateMachine.Tick();
|
||||
}
|
||||
|
||||
@ -148,20 +139,6 @@ 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()
|
||||
@ -184,7 +161,6 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
|
||||
LaneSystem.ResetToDefault();
|
||||
Physics.SyncTransforms();
|
||||
ReloadAnimator();
|
||||
playerData.CurrentSpeed = playerData.InitialSpeed;
|
||||
}
|
||||
|
||||
public void TranslateCommand(ECommand command, PressedState state)
|
||||
|
||||
@ -1,39 +1,38 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class PlayerAnimator
|
||||
{
|
||||
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");
|
||||
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");
|
||||
|
||||
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)
|
||||
{
|
||||
animator?.SetBool(idleHash, isIdle);
|
||||
if(_animator){}
|
||||
_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,7 +22,6 @@ 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); //вынести в контроллер
|
||||
@ -38,28 +37,6 @@ 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;
|
||||
@ -83,9 +60,6 @@ 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,14 +4,13 @@ using UnityEngine.Animations.Rigging;
|
||||
public class PlayerStateMachine : StateMachine<Player>
|
||||
{
|
||||
private Player player;
|
||||
private PlayerData playerData;
|
||||
public 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 = player.PlayerData;
|
||||
playerData = GameSession.Instance.GetPlayerData();
|
||||
playerTransform = player.transform;
|
||||
InitStates();
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
public class Statistics : MonoBehaviour,IResettable
|
||||
{
|
||||
@ -12,7 +13,7 @@ public class Statistics : MonoBehaviour,IResettable
|
||||
public event Action<int> OnCoinCountChanged = delegate { };
|
||||
public event Action<float> OnDistanceChanged = delegate { };
|
||||
public event Action<int> OnScoreCalculated = delegate { };
|
||||
[SerializeField] private PlayerHUDView PlayerHUD;
|
||||
[FormerlySerializedAs("PlayerHUD")] [SerializeField] private PlayerHUDView playerHUD;
|
||||
private void Awake()
|
||||
{
|
||||
ResetToDefault();
|
||||
@ -43,7 +44,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()
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using Obstacles;
|
||||
|
||||
namespace Pools
|
||||
{
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Obstacles;
|
||||
using UnityEngine;
|
||||
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
|
||||
19
Assets/Scripts/UI/UIManager.cs
Normal file
19
Assets/Scripts/UI/UIManager.cs
Normal file
@ -0,0 +1,19 @@
|
||||
using System.Globalization;
|
||||
using UnityEngine;
|
||||
using TMPro; // Nécessaire pour TextMeshPro
|
||||
|
||||
public class UIManager : MonoBehaviour
|
||||
{
|
||||
// Références pour la distance et les pièces (mode normal)
|
||||
public TextMeshProUGUI distanceText;
|
||||
public TextMeshProUGUI numberCoinsText;
|
||||
|
||||
// Variables pour distance et pièces
|
||||
private float distance = 0f;
|
||||
private int coins = 0;
|
||||
void Update()
|
||||
{
|
||||
distanceText.text = distance.ToString("F1", CultureInfo.InvariantCulture) + "M";
|
||||
numberCoinsText.text = coins.ToString();
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/UI/UIManager.cs.meta
Normal file
2
Assets/Scripts/UI/UIManager.cs.meta
Normal file
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2278264f81ffe464da1a99450675b475
|
||||
@ -26,12 +26,12 @@ public class PausedView : BaseView
|
||||
|
||||
mainMenuButton.onClick.AddListener(() =>
|
||||
{
|
||||
GameSession.Instance.GoToMainMenu();
|
||||
GameSession.Instance.PauseBackToMainMenu();
|
||||
});
|
||||
|
||||
restartButton.onClick.AddListener(() =>
|
||||
{
|
||||
GameSession.Instance.GoToSoloMode();
|
||||
GameSession.Instance.PausePlayAgain();
|
||||
});
|
||||
base.Init();
|
||||
}
|
||||
|
||||
@ -1,140 +0,0 @@
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f7b00d918e7b13c4c8823278d24d708a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,3 +1,4 @@
|
||||
using Assets.Scripts.GameSession;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
@ -20,6 +21,6 @@ public class RestartButton : MonoBehaviour
|
||||
|
||||
public void RestartGame()
|
||||
{
|
||||
SceneManager.LoadScene("GameScene");
|
||||
GoToScene.GoToSoloMode();
|
||||
}
|
||||
}
|
||||
|
||||
BIN
Assets/Sprites/Deathscreen (1).png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/Deathscreen (1).png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f3bf48d62eb8db4488ff8d833e011574
|
||||
guid: 590b8a48d28b68a48b63b55d69a491ff
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
BIN
Assets/Sprites/Deathscreen.png
(Stored with Git LFS)
BIN
Assets/Sprites/Deathscreen.png
(Stored with Git LFS)
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -12,13 +12,13 @@ PlayerSettings:
|
||||
targetDevice: 2
|
||||
useOnDemandResources: 0
|
||||
accelerometerFrequency: 60
|
||||
companyName: VladimirPirozhenko
|
||||
companyName: ElPoyo
|
||||
productName: AwesomeRunner
|
||||
defaultCursor: {fileID: 0}
|
||||
cursorHotspot: {x: 0, y: 0}
|
||||
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
||||
m_ShowUnitySplashScreen: 1
|
||||
m_ShowUnitySplashLogo: 1
|
||||
m_ShowUnitySplashLogo: 0
|
||||
m_SplashScreenOverlayOpacity: 1
|
||||
m_SplashScreenAnimation: 1
|
||||
m_SplashScreenLogoStyle: 1
|
||||
@ -94,7 +94,7 @@ PlayerSettings:
|
||||
bakeCollisionMeshes: 1
|
||||
forceSingleInstance: 0
|
||||
useFlipModelSwapchain: 1
|
||||
resizableWindow: 0
|
||||
resizableWindow: 1
|
||||
useMacAppStoreValidation: 0
|
||||
macAppStoreCategory: public.app-category.games
|
||||
gpuSkinning: 1
|
||||
@ -164,6 +164,7 @@ PlayerSettings:
|
||||
androidMinAspectRatio: 1
|
||||
applicationIdentifier:
|
||||
Android: com.VladimirPirozhenko.AwesomeRunner
|
||||
Standalone: com.ElPoyo.AwesomeRunner
|
||||
buildNumber:
|
||||
Standalone: 0
|
||||
VisionOS: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user