r.nikolin
/
rabidus-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp

This commit is contained in:
Кичигин Алексей 2023-10-31 15:44:09 +03:00
parent 02d18a3779 cd73685c8e
commit c4ae0345b7
7 changed files with 143 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/Images/UI/StartSceen/Preview.png.meta
View File

@ -48,7 +48,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 449, y: 301, z: 514, w: 315}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -101,6 +101,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -108,7 +120,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

16
Assets/Images/UI/StartSceen/PreviewBG.png.meta
View File

@ -48,7 +48,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 378, y: 257, z: 417, w: 223}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -101,6 +101,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -108,7 +120,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

25
Assets/Prefabs/Player.prefab
View File

@ -752,7 +752,6 @@ GameObject:
- component: {fileID: 5885267486099067688}
- component: {fileID: 5885267484555030673}
- component: {fileID: 4554157844629752389}
- component: {fileID: 4029234530319435169}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@ -902,18 +901,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 4029234530319435169}
m_TargetAssemblyTypeName: DisableAfterFinishController, Assembly-CSharp
m_MethodName: Disabele
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
_unityOnBeginningReached:
m_PersistentCalls:
m_Calls: []
@ -1002,18 +989,6 @@ MonoBehaviour:
- Popup: {fileID: 7146971184224956080, guid: c86fad07ffc84b14f854c246948dbfac, type: 3}
MovePositon: {fileID: 5885267485284967485}
UIMagnetType: 1
--- !u!114 &4029234530319435169
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4574774226093017486}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f3df0992729b6f242aca267e0aa8315f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4574774226115770231
GameObject:
m_ObjectHideFlags: 0

49
Assets/Prefabs/Scripts.prefab
View File

@ -127,9 +127,54 @@ Transform:
- {fileID: 7764968721981305003}
- {fileID: 2692296770531394948}
- {fileID: 2027141745847319292}
- {fileID: 1590330903376965188}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5561863535947159317
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1590330903376965188}
- component: {fileID: 7757543441732016759}
m_Layer: 0
m_Name: DisableAfterFinish
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1590330903376965188
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5561863535947159317}
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: 1160822104568116160}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7757543441732016759
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5561863535947159317}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f3df0992729b6f242aca267e0aa8315f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7764968720163939310
GameObject:
m_ObjectHideFlags: 0
@ -431,6 +476,10 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
LowTime: 10
OnLowTime:
m_PersistentCalls:
m_Calls: []
Seconds: 20
--- !u!1 &7764968721981305005
GameObject:

72
Assets/Prefabs/SecondDisplay.prefab
View File

@ -156,8 +156,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.14099121, y: 1.4000244}
m_SizeDelta: {x: -16.288, y: -18.41}
m_AnchoredPosition: {x: -0.78601074, y: -1.6372986}
m_SizeDelta: {x: -88.5972, y: -87.5235}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5477373346045607918
CanvasRenderer:
@ -188,7 +188,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 879306e0ec986e24f9acedb5d22240f0, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -196,7 +196,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 3.1
--- !u!1 &1757592109385600261
GameObject:
m_ObjectHideFlags: 0
@ -535,7 +535,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.7921569}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -543,7 +543,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: bd2dbdbb25053f242bcd0048cb28ef14, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -551,7 +551,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 2.75
--- !u!1 &2928872577229752701
GameObject:
m_ObjectHideFlags: 0
@ -587,8 +587,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: 26, y: 123}
m_SizeDelta: {x: 448.7739, y: 50}
m_AnchoredPosition: {x: 33.4163, y: 269.4592}
m_SizeDelta: {x: 574.8516, y: 87.0816}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5375311392328973172
CanvasRenderer:
@ -649,7 +649,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 23.35
m_fontSize: 31.45
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -811,8 +811,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -1249, y: -139}
m_SizeDelta: {x: 552.58496, y: 357.6252}
m_AnchoredPosition: {x: -667, y: 20}
m_SizeDelta: {x: 777.0676, y: 716.7972}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &42436011227070237
Canvas:
@ -975,7 +975,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5725758608836304181}
m_LocalRotation: {x: 0, y: 0.00000016048051, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -986,8 +986,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: -78.51758, y: -20.40921}
m_SizeDelta: {x: -235.044, y: -139.2648}
m_AnchoredPosition: {x: -126.160034, y: -38.705566}
m_SizeDelta: {x: -358.7912, y: -212.4504}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4104671321967047119
CanvasRenderer:
@ -1118,8 +1118,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: 204, y: -119}
m_SizeDelta: {x: 210.1684, y: 173.2432}
m_AnchoredPosition: {x: 265, y: -268}
m_SizeDelta: {x: 335.5867, y: 276.6237}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7922296203041382943
CanvasRenderer:
@ -1473,8 +1473,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28.92
m_fontSizeBase: 28.92
m_fontSize: 41.31
m_fontSizeBase: 41.31
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -1749,6 +1749,26 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 376e32f7b4fb5164db9a3df5ef3c3338, type: 3}
--- !u!1 &219461578155034393 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1452772419466054320, guid: 376e32f7b4fb5164db9a3df5ef3c3338,
type: 3}
m_PrefabInstance: {fileID: 1667149855795269033}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8287636028835184786
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 219461578155034393}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aa81bf86d9e6976459821f77be724766, type: 3}
m_Name:
m_EditorClassIdentifier:
_target: {fileID: 0}
DisableState: 0
--- !u!224 &6063720120198318616 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4829071181691357105, guid: 376e32f7b4fb5164db9a3df5ef3c3338,
@ -2021,6 +2041,20 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1874187628045104409}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2405559784491123078
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4905135172142477797}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aa81bf86d9e6976459821f77be724766, type: 3}
m_Name:
m_EditorClassIdentifier:
_target: {fileID: 0}
DisableState: 0
--- !u!114 &3315757124944667178
MonoBehaviour:
m_ObjectHideFlags: 0

3
Assets/Scripts/FinishController.cs
View File

@ -9,6 +9,7 @@ public class FinishController : MonoBehaviour
private ShipMoveSides _moveSides;
private MonumentController _monumentController;
private vTimerCounter _vTimerCounter;
private DisableAfterFinishController _disabler;
[SerializeField] private SteeringWheel _wheel;
private void Awake()
@ -16,11 +17,13 @@ public class FinishController : MonoBehaviour
_moveSides = FindObjectOfType<PlayerInputHandler>().GetComponent<ShipMoveSides>();
_vTimerCounter = FindObjectOfType<vTimerCounter>();
_monumentController = FindObjectOfType<MonumentController>();
_disabler = FindObjectOfType<DisableAfterFinishController>();
}
public void OnFinish()
{
DisablePlayerMovement();
_disabler.Disabele();
_monumentController.UnlockMonument();
}

10
Assets/_Monuments/Prefabs/Big/Monument_1.prefab
View File

@ -122,6 +122,16 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: -586
objectReference: {fileID: 0}
- target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7944146
objectReference: {fileID: 0}
- target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.6073759
objectReference: {fileID: 0}
- target: {fileID: 2559237996015783021, guid: f7c18ea67fe64514a8e28b62367e16f7,
type: 3}
propertyPath: ShapeModule.m_MeshRenderer