From 5067cb51a1519035ae9732f1e4b19582164268b7 Mon Sep 17 00:00:00 2001 From: Konstantin Dyachenko Date: Fri, 27 Feb 2026 03:06:55 +0700 Subject: [PATCH] [Add] System to Scene --- .gitignore | 115 +++----------- Assets/Materials/testDice.mat | 9 +- Assets/Scenes/SampleScene.unity | 145 ++++++++++++++++++ Assets/Scripts/Game.meta | 8 + Assets/Scripts/Game/DebugGameInput.cs.meta | 2 + Assets/Scripts/Game/DiceManager.cs.meta | 2 + Assets/Scripts/Game/GameManager.cs.meta | 2 + Assets/Scripts/Modifiers.meta | 8 + Assets/Scripts/Modifiers/BonusForOnes.cs.meta | 2 + .../Modifiers/MultiplierForSixes.cs.meta | 2 + .../Scripts/Modifiers/ScoreModifier.cs.meta | 2 + Assets/Scripts/Scoring.meta | 8 + Assets/Scripts/Scoring/CategoryScorer.cs.meta | 2 + Assets/Scripts/Scoring/ScoreResult.cs.meta | 2 + Assets/Scripts/Scoring/ScoringSystem.cs.meta | 2 + Assets/Scripts/Scoring/YachtCategory.cs.meta | 2 + 16 files changed, 211 insertions(+), 102 deletions(-) create mode 100644 Assets/Scripts/Game.meta create mode 100644 Assets/Scripts/Game/DebugGameInput.cs.meta create mode 100644 Assets/Scripts/Game/DiceManager.cs.meta create mode 100644 Assets/Scripts/Game/GameManager.cs.meta create mode 100644 Assets/Scripts/Modifiers.meta create mode 100644 Assets/Scripts/Modifiers/BonusForOnes.cs.meta create mode 100644 Assets/Scripts/Modifiers/MultiplierForSixes.cs.meta create mode 100644 Assets/Scripts/Modifiers/ScoreModifier.cs.meta create mode 100644 Assets/Scripts/Scoring.meta create mode 100644 Assets/Scripts/Scoring/CategoryScorer.cs.meta create mode 100644 Assets/Scripts/Scoring/ScoreResult.cs.meta create mode 100644 Assets/Scripts/Scoring/ScoringSystem.cs.meta create mode 100644 Assets/Scripts/Scoring/YachtCategory.cs.meta diff --git a/.gitignore b/.gitignore index 9eb70ce..b8a487d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,99 +1,20 @@ -# This .gitignore file should be placed at the root of your Unity project directory -# -# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore -# -.utmp/ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/[Ll]ogs/ -/[Uu]ser[Ss]ettings/ -*.log +/* +/*/ -# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control. -*.blend1 -*.blend1.meta +!/Assets/ +!/ProjectSettings/ +!/Packages/ +!.gitignore +!.gitattributes +!LICENSE +!README.md -# MemoryCaptures can get excessive in size. -# They also could contain extremely sensitive data -/[Mm]emoryCaptures/ - -# Recordings can get excessive in size -/[Rr]ecordings/ - -# Uncomment this line if you wish to ignore the asset store tools plugin -# /[Aa]ssets/AssetStoreTools* - -# Autogenerated Jetbrains Rider plugin -/[Aa]ssets/Plugins/Editor/JetBrains* -# Jetbrains Rider personal-layer settings -*.DotSettings.user - -# Visual Studio cache directory -.vs/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Mono auto generated files -mono_crash.* - -# Builds -*.apk -*.aab -*.unitypackage -*.unitypackage.meta -*.app - -# Crashlytics generated file -crashlytics-build.properties - -# TestRunner generated files -InitTestScene*.unity* - -# Addressables default ignores, before user customizations -/ServerData -/[Aa]ssets/StreamingAssets/aa* -/[Aa]ssets/AddressableAssetsData/link.xml* -/[Aa]ssets/Addressables_Temp* -# By default, Addressables content builds will generate addressables_content_state.bin -# files in platform-specific subfolders, for example: -# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin -/[Aa]ssets/AddressableAssetsData/*/*.bin* - -# Visual Scripting auto-generated files -/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db -/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta -/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers -/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta - -# Auto-generated scenes by play mode tests -/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity* +.DS_Store +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +RECYCLE.BIN +Desktop.ini +**/GitIgnoreFolder/ +**/GitIgnoreFolder.meta diff --git a/Assets/Materials/testDice.mat b/Assets/Materials/testDice.mat index 2e0dd02..196241c 100644 --- a/Assets/Materials/testDice.mat +++ b/Assets/Materials/testDice.mat @@ -17,7 +17,6 @@ Material: - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _COLOR_RAMP_ON - _FADEUVSET_UV1 - - _GLITCH_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -263,7 +262,7 @@ Material: - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - - _Glitch: 1 + - _Glitch: 0 - _GlitchAmount: 1 - _GlitchSpeed: 0.15 - _GlitchTiling: 1 @@ -364,7 +363,7 @@ Material: - _ScrollTextureY: 1 - _ShadingModel: 0 - _ShadowCutoff: 0.2 - - _ShakeBlend: 0.09 + - _ShakeBlend: 0 - _ShakeSpeedMult: 0.01 - _Shininess: 16 - _Smoothness: 0.5 @@ -400,7 +399,7 @@ Material: - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - - _VertexDistortionAmount: 0.005 + - _VertexDistortionAmount: 0.01 - _VertexDistortionNoiseSpeedX: 1 - _VertexDistortionNoiseSpeedY: 1 - _VertexDistortionOn: 0 @@ -431,7 +430,7 @@ Material: - _DepthGlowColor: {r: 1, g: 0.9869999, b: 0.6, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} - - _GlitchOffset: {r: -0.5, g: -0.5, b: -0.5, a: -0.5} + - _GlitchOffset: {r: 0, g: -0.5, b: 0, a: 0} - _GradientHeightColor01: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _GradientHeightColor02: {r: 1, g: 1, b: 1, a: 1} - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 91224cb..ceabf04 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -557,6 +557,56 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &647322342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 647322344} + - component: {fileID: 647322343} + m_Layer: 0 + m_Name: DiceManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &647322343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 647322342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f097cd2c6bd7d34692236e625e6c62a, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DiceManager + diceRollers: + - {fileID: 2007894913} + - {fileID: 311355252} + - {fileID: 1175507651} + - {fileID: 1506884518} + - {fileID: 1485883516} +--- !u!4 &647322344 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 647322342} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &653932192 GameObject: m_ObjectHideFlags: 0 @@ -1175,6 +1225,53 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1077820435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1077820437} + - component: {fileID: 1077820436} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1077820436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077820435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 187be5e60b9cc014fbe755fbe18578be, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::GameManager + diceManager: {fileID: 647322343} + scoringSystem: {fileID: 1650743280} + maxRollsPerTurn: 3 +--- !u!4 &1077820437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077820435} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.67679, y: 0.5, z: -3.54398} + 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 &1175507651 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7057909628855743290, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} @@ -1680,6 +1777,51 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1650743279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1650743281} + - component: {fileID: 1650743280} + m_Layer: 0 + m_Name: ScoringSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1650743280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650743279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb570f9601b30334dbbb65ecbd45fd52, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ScoringSystem + activeModifiers: [] +--- !u!4 &1650743281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1650743279} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.67679, y: 0.5, z: -3.54398} + 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!1001 &1924014748 PrefabInstance: m_ObjectHideFlags: 0 @@ -2014,3 +2156,6 @@ SceneRoots: - {fileID: 789583826} - {fileID: 1924014748} - {fileID: 1571937138} + - {fileID: 647322344} + - {fileID: 1650743281} + - {fileID: 1077820437} diff --git a/Assets/Scripts/Game.meta b/Assets/Scripts/Game.meta new file mode 100644 index 0000000..58c07b9 --- /dev/null +++ b/Assets/Scripts/Game.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca46b45d6ac8de84db87c07d372a7b3f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/DebugGameInput.cs.meta b/Assets/Scripts/Game/DebugGameInput.cs.meta new file mode 100644 index 0000000..68ed1c9 --- /dev/null +++ b/Assets/Scripts/Game/DebugGameInput.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 982f0996b85edfe419b07ddb36d6e235 \ No newline at end of file diff --git a/Assets/Scripts/Game/DiceManager.cs.meta b/Assets/Scripts/Game/DiceManager.cs.meta new file mode 100644 index 0000000..b93ad3f --- /dev/null +++ b/Assets/Scripts/Game/DiceManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3f097cd2c6bd7d34692236e625e6c62a \ No newline at end of file diff --git a/Assets/Scripts/Game/GameManager.cs.meta b/Assets/Scripts/Game/GameManager.cs.meta new file mode 100644 index 0000000..592ef49 --- /dev/null +++ b/Assets/Scripts/Game/GameManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 187be5e60b9cc014fbe755fbe18578be \ No newline at end of file diff --git a/Assets/Scripts/Modifiers.meta b/Assets/Scripts/Modifiers.meta new file mode 100644 index 0000000..364da2e --- /dev/null +++ b/Assets/Scripts/Modifiers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0937ad61dad6574cb0328335f1e2d43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Modifiers/BonusForOnes.cs.meta b/Assets/Scripts/Modifiers/BonusForOnes.cs.meta new file mode 100644 index 0000000..7272e8a --- /dev/null +++ b/Assets/Scripts/Modifiers/BonusForOnes.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4042dd42832227b43a2772829cdd4710 \ No newline at end of file diff --git a/Assets/Scripts/Modifiers/MultiplierForSixes.cs.meta b/Assets/Scripts/Modifiers/MultiplierForSixes.cs.meta new file mode 100644 index 0000000..2024cfc --- /dev/null +++ b/Assets/Scripts/Modifiers/MultiplierForSixes.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cfaacab54ba4e4d46bc0949fa9454e1e \ No newline at end of file diff --git a/Assets/Scripts/Modifiers/ScoreModifier.cs.meta b/Assets/Scripts/Modifiers/ScoreModifier.cs.meta new file mode 100644 index 0000000..74fe1a3 --- /dev/null +++ b/Assets/Scripts/Modifiers/ScoreModifier.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 58d1718b8dffde64589fa528475004cc \ No newline at end of file diff --git a/Assets/Scripts/Scoring.meta b/Assets/Scripts/Scoring.meta new file mode 100644 index 0000000..face8a8 --- /dev/null +++ b/Assets/Scripts/Scoring.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f95ef1c56a8ef6b4097ee6b979583e88 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scoring/CategoryScorer.cs.meta b/Assets/Scripts/Scoring/CategoryScorer.cs.meta new file mode 100644 index 0000000..afefd3e --- /dev/null +++ b/Assets/Scripts/Scoring/CategoryScorer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2fa2cb346fa82b846a3cf52c47ca9cda \ No newline at end of file diff --git a/Assets/Scripts/Scoring/ScoreResult.cs.meta b/Assets/Scripts/Scoring/ScoreResult.cs.meta new file mode 100644 index 0000000..cd6105f --- /dev/null +++ b/Assets/Scripts/Scoring/ScoreResult.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 77b4fb4f8cb17114991bbc92ba001869 \ No newline at end of file diff --git a/Assets/Scripts/Scoring/ScoringSystem.cs.meta b/Assets/Scripts/Scoring/ScoringSystem.cs.meta new file mode 100644 index 0000000..4e6c4fb --- /dev/null +++ b/Assets/Scripts/Scoring/ScoringSystem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cb570f9601b30334dbbb65ecbd45fd52 \ No newline at end of file diff --git a/Assets/Scripts/Scoring/YachtCategory.cs.meta b/Assets/Scripts/Scoring/YachtCategory.cs.meta new file mode 100644 index 0000000..7160118 --- /dev/null +++ b/Assets/Scripts/Scoring/YachtCategory.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b90683b5d8ef0d24c8c050d7fd0eb75d \ No newline at end of file