More control panel stuff
- added button sounds - fixed button toggling - fixed card button
This commit is contained in:
msk
parent
8b3c03af3d
commit
0792db116c
BIN
Assets/Material/White Ring.png
Normal file
BIN
Assets/Material/White Ring.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.8 KiB |
122
Assets/Material/White Ring.png.meta
Normal file
122
Assets/Material/White Ring.png.meta
Normal file
@ -0,0 +1,122 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 300aef8eab6ac1b4c98b87c5d928ddf2
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Server
|
||||
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: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 27 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 28 KiB |
8
Assets/Resources.meta
Normal file
8
Assets/Resources.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 55c71b90f58b501409674fd6129f38ac
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Resources/Audio.meta
Normal file
8
Assets/Resources/Audio.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 54072e2503037954c8b27f2a3c7424d9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Resources/Audio/button press.mp3
Normal file
BIN
Assets/Resources/Audio/button press.mp3
Normal file
Binary file not shown.
22
Assets/Resources/Audio/button press.mp3.meta
Normal file
22
Assets/Resources/Audio/button press.mp3.meta
Normal file
@ -0,0 +1,22 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d111fd0185fe2fc45b460568521cfa52
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Resources/Audio/lock.wav
Normal file
BIN
Assets/Resources/Audio/lock.wav
Normal file
Binary file not shown.
22
Assets/Resources/Audio/lock.wav.meta
Normal file
22
Assets/Resources/Audio/lock.wav.meta
Normal file
@ -0,0 +1,22 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 97d033599d2196d40a3f6d50bf26eeec
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Resources/Audio/unlock.wav
Normal file
BIN
Assets/Resources/Audio/unlock.wav
Normal file
Binary file not shown.
22
Assets/Resources/Audio/unlock.wav.meta
Normal file
22
Assets/Resources/Audio/unlock.wav.meta
Normal file
@ -0,0 +1,22 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b210a512db9639e42b2299d31090e315
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -366,7 +366,7 @@ GameObject:
|
||||
- component: {fileID: 61320021}
|
||||
- component: {fileID: 61320020}
|
||||
m_Layer: 0
|
||||
m_Name: Test
|
||||
m_Name: Test (Insert)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -932,7 +932,7 @@ GameObject:
|
||||
- component: {fileID: 113329742}
|
||||
- component: {fileID: 113329741}
|
||||
m_Layer: 0
|
||||
m_Name: Enter
|
||||
m_Name: Card Scan (Return)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -967,7 +967,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Button: {fileID: 113329740}
|
||||
key: 36
|
||||
key: 13
|
||||
key2: 0
|
||||
isToggle: 0
|
||||
isOn: 0
|
||||
@ -1391,6 +1391,134 @@ MonoBehaviour:
|
||||
m_Reference: {fileID: 875253871413052681, guid: c348712bda248c246b8c49b3db54643f,
|
||||
type: 3}
|
||||
m_ButtonPressPoint: 0.5
|
||||
--- !u!1 &139742660
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 139742661}
|
||||
- component: {fileID: 139742662}
|
||||
m_Layer: 0
|
||||
m_Name: Audio Source
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &139742661
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 139742660}
|
||||
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: 655176480}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &139742662
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 139742660}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!114 &141452517
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2241,6 +2369,108 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -6250710606382680247, guid: fe556f8bee4726d418b982f1094ca7d3, type: 3}
|
||||
--- !u!1 &383063215
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 383063216}
|
||||
- component: {fileID: 383063219}
|
||||
- component: {fileID: 383063218}
|
||||
- component: {fileID: 383063217}
|
||||
m_Layer: 5
|
||||
m_Name: Hold Timer (Canvas)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &383063216
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 383063215}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.004, y: 0.004, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2107425498}
|
||||
- {fileID: 578842717}
|
||||
m_Father: {fileID: 655176480}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: -0.505, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &383063217
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 383063215}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &383063218
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 383063215}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 1
|
||||
--- !u!223 &383063219
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 383063215}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 2
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &389273322
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2396,9 +2626,9 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 420738857}
|
||||
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_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -0}
|
||||
m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1091765649}
|
||||
@ -2407,7 +2637,7 @@ RectTransform:
|
||||
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: 759, y: 1195}
|
||||
m_SizeDelta: {x: 800, y: 1250}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &420738859
|
||||
MonoBehaviour:
|
||||
@ -2999,6 +3229,82 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 7543857270648718420, guid: fe556f8bee4726d418b982f1094ca7d3, type: 3}
|
||||
--- !u!1 &578842716
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 578842717}
|
||||
- component: {fileID: 578842719}
|
||||
- component: {fileID: 578842720}
|
||||
m_Layer: 5
|
||||
m_Name: Ring
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &578842717
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 578842716}
|
||||
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: 383063216}
|
||||
m_RootOrder: 1
|
||||
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: 200, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &578842719
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 578842716}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &578842720
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 578842716}
|
||||
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: 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_Sprite: {fileID: 21300000, guid: 300aef8eab6ac1b4c98b87c5d928ddf2, type: 3}
|
||||
m_Type: 3
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 0
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 2
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &587127949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3345,6 +3651,8 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1091765649}
|
||||
- {fileID: 233990574}
|
||||
- {fileID: 383063216}
|
||||
- {fileID: 139742661}
|
||||
m_Father: {fileID: 1681290117}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -3423,14 +3731,19 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: b5ce728dbf8b0e54e880d703d5c18eba, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
holdTime: 1
|
||||
statusImg: {fileID: 420738859}
|
||||
lockImg: {fileID: 2800000, guid: 0e86a807c3282a442b3915b99b76e30b, type: 3}
|
||||
unlockImg: {fileID: 2800000, guid: 9a39b28f16a08a04db0433e352bf8e26, type: 3}
|
||||
cpanButtons:
|
||||
timerRing: {fileID: 578842720}
|
||||
audioSrc: {fileID: 139742662}
|
||||
panelButtons:
|
||||
- {fileID: 61320020}
|
||||
- {fileID: 801700136}
|
||||
- {fileID: 998008749}
|
||||
- {fileID: 113329741}
|
||||
lockImg: {fileID: 2800000, guid: 0e86a807c3282a442b3915b99b76e30b, type: 3}
|
||||
unlockImg: {fileID: 2800000, guid: 9a39b28f16a08a04db0433e352bf8e26, type: 3}
|
||||
lockSound: {fileID: 8300000, guid: 97d033599d2196d40a3f6d50bf26eeec, type: 3}
|
||||
unlockSound: {fileID: 8300000, guid: b210a512db9639e42b2299d31090e315, type: 3}
|
||||
--- !u!114 &657393955
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3835,7 +4148,7 @@ GameObject:
|
||||
- component: {fileID: 801700137}
|
||||
- component: {fileID: 801700136}
|
||||
m_Layer: 0
|
||||
m_Name: Service
|
||||
m_Name: Service (Delete)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -4383,178 +4696,6 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 4427641146530910418, guid: fe556f8bee4726d418b982f1094ca7d3, type: 3}
|
||||
--- !u!1 &873712419
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 873712420}
|
||||
- component: {fileID: 873712422}
|
||||
- component: {fileID: 873712421}
|
||||
m_Layer: 0
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &873712420
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 873712419}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2.0382113, y: 2.0382113, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1091765649}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -736}
|
||||
m_SizeDelta: {x: 270.24, y: 76.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &873712421
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 873712419}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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: (HOLD)
|
||||
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: 560.3
|
||||
m_fontSizeBase: 560.3
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 1
|
||||
m_HorizontalAlignment: 2
|
||||
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_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 0
|
||||
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: 19.727285, w: 4.8518376}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
_SortingLayer: 0
|
||||
_SortingLayerID: 0
|
||||
_SortingOrder: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_renderer: {fileID: 873712422}
|
||||
m_maskType: 0
|
||||
--- !u!23 &873712422
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 873712419}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &879895218
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5075,7 +5216,7 @@ GameObject:
|
||||
- component: {fileID: 998008750}
|
||||
- component: {fileID: 998008749}
|
||||
m_Layer: 0
|
||||
m_Name: On
|
||||
m_Name: Third Person Toggle (Home/End)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -5399,7 +5540,7 @@ GameObject:
|
||||
- component: {fileID: 1091765651}
|
||||
- component: {fileID: 1091765650}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_Name: Lock Status (Canvas)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -5418,7 +5559,6 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 420738858}
|
||||
- {fileID: 873712420}
|
||||
m_Father: {fileID: 655176480}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
@ -8099,7 +8239,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1681290113}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.928, y: 1.145, z: -0.753}
|
||||
m_LocalPosition: {x: 0.974, y: 1.145, z: -0.522}
|
||||
m_LocalScale: {x: 0.66825426, y: 0.66825426, z: 0.66825426}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@ -8613,7 +8753,7 @@ GameObject:
|
||||
- component: {fileID: 1740661841}
|
||||
- component: {fileID: 1740661839}
|
||||
m_Layer: 0
|
||||
m_Name: Camera
|
||||
m_Name: Third-Person Camera
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -10134,6 +10274,82 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 7675125415217266018, guid: fe556f8bee4726d418b982f1094ca7d3, type: 3}
|
||||
--- !u!1 &2107425497
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2107425498}
|
||||
- component: {fileID: 2107425500}
|
||||
- component: {fileID: 2107425499}
|
||||
m_Layer: 5
|
||||
m_Name: Ring Base
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2107425498
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2107425497}
|
||||
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: 383063216}
|
||||
m_RootOrder: 0
|
||||
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: 200, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2107425499
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2107425497}
|
||||
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.6037736, g: 0.6037736, b: 0.6037736, 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: 21300000, guid: 300aef8eab6ac1b4c98b87c5d928ddf2, type: 3}
|
||||
m_Type: 3
|
||||
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 &2107425500
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2107425497}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2114757694
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ControlLocker : MonoBehaviour
|
||||
{
|
||||
private int colliderCount = 0;
|
||||
private bool isLocked = false;
|
||||
|
||||
[SerializeField]
|
||||
private RawImage statusImg;
|
||||
[SerializeField]
|
||||
private Texture lockImg;
|
||||
[SerializeField]
|
||||
private Texture unlockImg;
|
||||
[SerializeField]
|
||||
private List<ControlPanel> cpanButtons;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
statusImg.texture = unlockImg;
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider _)
|
||||
{
|
||||
Debug.Log("Lock btn pressed.");
|
||||
colliderCount++;
|
||||
if (colliderCount == 1)
|
||||
{
|
||||
// set state var
|
||||
isLocked = !isLocked;
|
||||
|
||||
// set img
|
||||
statusImg.texture = isLocked ? lockImg : unlockImg;
|
||||
|
||||
// set buttons' state
|
||||
foreach (var btn in cpanButtons)
|
||||
{
|
||||
btn.GetComponent<Collider>().enabled = !isLocked;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider _)
|
||||
{
|
||||
Debug.Log("Lock btn unpressed.");
|
||||
colliderCount--;
|
||||
}
|
||||
}
|
||||
@ -3,60 +3,81 @@ using System.Runtime.InteropServices;
|
||||
using UnityEngine;
|
||||
using WindowsInput.Native;
|
||||
|
||||
public class ControlPanel : MonoBehaviour
|
||||
[RequireComponent(typeof(AudioSource))]
|
||||
public class PanelButton : MonoBehaviour
|
||||
{
|
||||
public Transform Button;
|
||||
[DllImport("user32.dll")]
|
||||
public static extern uint MapVirtualKey(uint uCode, uint uMapType);
|
||||
[DllImport("user32.dll")]
|
||||
static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
|
||||
|
||||
public VirtualKeyCode key;
|
||||
public VirtualKeyCode key2;
|
||||
private int _insideColliderCount = 0;
|
||||
|
||||
public bool isToggle;
|
||||
public bool isOn;
|
||||
private int _insideColliderCount = 0;
|
||||
|
||||
private Renderer cr;
|
||||
public GameObject camera;
|
||||
// Start is called before the first frame update
|
||||
|
||||
private AudioSource audioSrc;
|
||||
public static AudioClip btnSound;
|
||||
|
||||
void Start()
|
||||
{
|
||||
btnSound = Resources.Load<AudioClip>("Audio/button press");
|
||||
cr = GetComponent<Renderer>();
|
||||
}
|
||||
|
||||
audioSrc = GetComponent<AudioSource>();
|
||||
audioSrc.playOnAwake = false;
|
||||
audioSrc.Stop();
|
||||
audioSrc.clip = btnSound;
|
||||
|
||||
if (isToggle)
|
||||
{
|
||||
// initialize toggle state
|
||||
OnTriggerEnter(new Collider());
|
||||
OnTriggerExit(new Collider());
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if (isToggle == true)
|
||||
{
|
||||
if(isOn == false)
|
||||
{
|
||||
isOn = true;
|
||||
cr.material.color = new Color(0f, 1f, 0f, 1f);
|
||||
_insideColliderCount += 1;
|
||||
audioSrc.Play();
|
||||
if (isToggle)
|
||||
{
|
||||
if(!isOn)
|
||||
{
|
||||
cr.material.color = Color.green;
|
||||
keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero);
|
||||
keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero);
|
||||
} else if (isOn == true)
|
||||
isOn = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
isOn = false;
|
||||
cr.material.color = new Color(1f, 0f, 0f, 1f);
|
||||
_insideColliderCount += 1;
|
||||
cr.material.color = Color.red;
|
||||
keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero);
|
||||
keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 0, UIntPtr.Zero);
|
||||
isOn = false;
|
||||
}
|
||||
|
||||
} else if (isToggle == false)
|
||||
}
|
||||
else
|
||||
{
|
||||
_insideColliderCount += 1;
|
||||
keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 0, UIntPtr.Zero);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider other)
|
||||
{
|
||||
_insideColliderCount -= 1;
|
||||
_insideColliderCount = Mathf.Max(0, _insideColliderCount);
|
||||
_insideColliderCount = Mathf.Clamp(_insideColliderCount - 1, 0, _insideColliderCount);
|
||||
|
||||
if (_insideColliderCount == 0)
|
||||
{
|
||||
keybd_event(System.Convert.ToByte(key), (byte)MapVirtualKey((uint)key, 0), 2, UIntPtr.Zero);
|
||||
keybd_event(System.Convert.ToByte(key2), (byte)MapVirtualKey((uint)key2, 0), 2, UIntPtr.Zero);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -66,12 +87,12 @@ public class ControlPanel : MonoBehaviour
|
||||
{
|
||||
if (Input.GetKeyDown(KeyCode.Home))
|
||||
{
|
||||
camera.SetActive(true);
|
||||
camera?.SetActive(true);
|
||||
}
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.End))
|
||||
{
|
||||
camera.SetActive(false);
|
||||
camera?.SetActive(false);
|
||||
}
|
||||
|
||||
}
|
||||
88
Assets/Script/PanelLocker.cs
Normal file
88
Assets/Script/PanelLocker.cs
Normal file
@ -0,0 +1,88 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class PanelLocker : MonoBehaviour
|
||||
{
|
||||
private int colliderCount = 0;
|
||||
private bool isLocked = false;
|
||||
private float timer = 0f;
|
||||
private bool actionTaken = false;
|
||||
|
||||
[Header("Settings")]
|
||||
[SerializeField]
|
||||
private float holdTime = 1f;
|
||||
|
||||
[Header("Components")]
|
||||
[SerializeField]
|
||||
private RawImage statusImg;
|
||||
[SerializeField]
|
||||
private Image timerRing;
|
||||
[SerializeField]
|
||||
private AudioSource audioSrc;
|
||||
[SerializeField]
|
||||
private List<PanelButton> panelButtons;
|
||||
|
||||
[Header("Assets")]
|
||||
[SerializeField]
|
||||
private Texture lockImg;
|
||||
[SerializeField]
|
||||
private Texture unlockImg;
|
||||
[SerializeField]
|
||||
private AudioClip lockSound;
|
||||
[SerializeField]
|
||||
private AudioClip unlockSound;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
statusImg.texture = unlockImg;
|
||||
audioSrc.clip = lockSound;
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider _)
|
||||
{
|
||||
++colliderCount;
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider _)
|
||||
{
|
||||
colliderCount = Mathf.Clamp(colliderCount - 1, 0, colliderCount);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (colliderCount >= 1)
|
||||
{
|
||||
timer += Time.unscaledDeltaTime;
|
||||
float ratio = Mathf.Clamp(timer, 0, holdTime) / holdTime;
|
||||
|
||||
timerRing.fillAmount = Mathf.Pow(ratio, 3f);
|
||||
|
||||
if (ratio >= 1 && !actionTaken)
|
||||
{
|
||||
isLocked = !isLocked;
|
||||
|
||||
audioSrc.clip = isLocked ? lockSound : unlockSound;
|
||||
audioSrc.Play();
|
||||
|
||||
timerRing.color = Color.cyan;
|
||||
statusImg.texture = isLocked ? lockImg : unlockImg;
|
||||
|
||||
// set buttons' state
|
||||
foreach (var btn in panelButtons)
|
||||
{
|
||||
btn.GetComponent<Collider>().enabled = !isLocked;
|
||||
}
|
||||
|
||||
actionTaken = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
timer = 0;
|
||||
timerRing.fillAmount = 0;
|
||||
timerRing.color = Color.white;
|
||||
actionTaken = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -137,8 +137,6 @@ PlayerSettings:
|
||||
bundleVersion: 0.1.0
|
||||
preloadedAssets:
|
||||
- {fileID: 11400000, guid: 74eeb7429f216ca45a7093c586513e98, type: 2}
|
||||
- {fileID: -6265376527240436808, guid: 5e2dc0db42cc5b3459a781fecb0b76f9, type: 2}
|
||||
- {fileID: -6348321304186183749, guid: 6460523340b221f4ea5611d2c011a26c, type: 2}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
|
||||
@ -14,14 +14,23 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 0
|
||||
y: 43.2
|
||||
width: 1536
|
||||
height: 820.8
|
||||
m_ShowMode: 4
|
||||
m_Title: Project
|
||||
=======
|
||||
x: 1080
|
||||
y: 181
|
||||
width: 1920
|
||||
height: 1007
|
||||
m_ShowMode: 4
|
||||
m_Title: Console
|
||||
>>>>>>> Stashed changes
|
||||
m_RootView: {fileID: 5}
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MinSize: {x: 875, y: 350}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 1
|
||||
--- !u!114 &2
|
||||
@ -34,23 +43,32 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: ProjectBrowser
|
||||
m_Name: ConsoleWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< Updated upstream
|
||||
y: 461.6
|
||||
width: 1536
|
||||
height: 309.19998
|
||||
m_MinSize: {x: 230, y: 271}
|
||||
m_MaxSize: {x: 10000, y: 10021}
|
||||
m_ActualView: {fileID: 13}
|
||||
=======
|
||||
y: 685
|
||||
width: 1920
|
||||
height: 272
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 11}
|
||||
>>>>>>> Stashed changes
|
||||
m_Panes:
|
||||
- {fileID: 13}
|
||||
- {fileID: 11}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -70,12 +88,21 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 30
|
||||
<<<<<<< Updated upstream
|
||||
width: 1536
|
||||
height: 770.8
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 341
|
||||
=======
|
||||
width: 1920
|
||||
height: 957
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 92
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -93,10 +120,17 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 247.2
|
||||
height: 461.6
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
=======
|
||||
width: 302
|
||||
height: 685
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
>>>>>>> Stashed changes
|
||||
m_ActualView: {fileID: 15}
|
||||
m_Panes:
|
||||
- {fileID: 15}
|
||||
@ -122,8 +156,13 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 1536
|
||||
height: 820.8
|
||||
=======
|
||||
width: 1920
|
||||
height: 1007
|
||||
>>>>>>> Stashed changes
|
||||
m_MinSize: {x: 875, y: 300}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_UseTopView: 1
|
||||
@ -172,12 +211,21 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 1536
|
||||
height: 461.6
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 342
|
||||
=======
|
||||
width: 1920
|
||||
height: 685
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 93
|
||||
>>>>>>> Stashed changes
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -194,8 +242,13 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
<<<<<<< Updated upstream
|
||||
y: 800.8
|
||||
width: 1536
|
||||
=======
|
||||
y: 987
|
||||
width: 1920
|
||||
>>>>>>> Stashed changes
|
||||
height: 20
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
@ -209,23 +262,29 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: SceneView
|
||||
m_Name: GameView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 247.2
|
||||
y: 0
|
||||
<<<<<<< Updated upstream
|
||||
width: 813.60004
|
||||
height: 461.6
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
=======
|
||||
width: 978
|
||||
height: 685
|
||||
m_MinSize: {x: 102, y: 121}
|
||||
>>>>>>> Stashed changes
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_ActualView: {fileID: 16}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
- {fileID: 16}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 1
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &10
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -241,12 +300,21 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 1060.8
|
||||
y: 0
|
||||
width: 475.19995
|
||||
height: 461.6
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
=======
|
||||
x: 1280
|
||||
y: 0
|
||||
width: 640
|
||||
height: 685
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
>>>>>>> Stashed changes
|
||||
m_ActualView: {fileID: 12}
|
||||
m_Panes:
|
||||
- {fileID: 12}
|
||||
@ -273,10 +341,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 0
|
||||
y: 535.2
|
||||
width: 1536
|
||||
height: 288.19998
|
||||
=======
|
||||
x: 1080
|
||||
y: 896
|
||||
width: 1920
|
||||
height: 251
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@ -302,10 +377,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 1060.8
|
||||
y: 73.6
|
||||
width: 474.19995
|
||||
height: 440.6
|
||||
=======
|
||||
x: 2360
|
||||
y: 211
|
||||
width: 639
|
||||
height: 664
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@ -344,10 +426,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 0
|
||||
y: 535.2
|
||||
width: 1536
|
||||
height: 288.19998
|
||||
=======
|
||||
x: 1080
|
||||
y: 896
|
||||
width: 1920
|
||||
height: 251
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@ -373,6 +462,7 @@ MonoBehaviour:
|
||||
m_LastFolders:
|
||||
- Assets
|
||||
m_LastFoldersGridSize: -1
|
||||
<<<<<<< Updated upstream
|
||||
m_LastProjectPath: D:\WACCA\WACVR
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
@ -381,6 +471,16 @@ MonoBehaviour:
|
||||
m_SelectedIDs: 046f0000
|
||||
m_LastClickedID: 28420
|
||||
m_ExpandedIDs: 00000000046f00000a6f00005a6f000000ca9a3bffffff7f
|
||||
=======
|
||||
m_LastProjectPath: C:\Users\Alex\Documents\GitHub\WACVR
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 9}
|
||||
m_SelectedIDs: c4810000
|
||||
m_LastClickedID: 33220
|
||||
m_ExpandedIDs: 00000000c481000000ca9a3bffffff7f
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -408,7 +508,11 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_ExpandedIDs: 00000000046f000000ca9a3bffffff7f
|
||||
=======
|
||||
m_ExpandedIDs: 00000000c4810000
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -433,10 +537,10 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_SelectedInstanceIDs: 2ede0000
|
||||
m_LastClickedInstanceID: 56878
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c6230000f4790000ce810000e081000044800000
|
||||
m_ExpandedInstanceIDs: c6230000f4790000ce810000e08100004480000000000000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -485,10 +589,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 247.2
|
||||
y: 73.6
|
||||
width: 811.60004
|
||||
height: 440.6
|
||||
=======
|
||||
x: 1382
|
||||
y: 211
|
||||
width: 976
|
||||
height: 664
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@ -690,9 +801,15 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
<<<<<<< Updated upstream
|
||||
m_Target: {x: -0.23342612, y: 1.154188, z: -0.029027253}
|
||||
speed: 2
|
||||
m_Value: {x: -0.23342612, y: 1.154188, z: -0.029027253}
|
||||
=======
|
||||
m_Target: {x: 4.5800953, y: 0.37747407, z: -0.7965523}
|
||||
speed: 2
|
||||
m_Value: {x: 4.5800953, y: 0.37747407, z: -0.7965523}
|
||||
>>>>>>> Stashed changes
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@ -739,6 +856,7 @@ MonoBehaviour:
|
||||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
<<<<<<< Updated upstream
|
||||
m_Target: {x: 0.14618626, y: 0.061685134, z: -0.009133707, w: 0.98729026}
|
||||
speed: 2
|
||||
m_Value: {x: 0.14618619, y: 0.061685104, z: -0.009133702, w: 0.9872898}
|
||||
@ -746,13 +864,22 @@ MonoBehaviour:
|
||||
m_Target: 0.19183554
|
||||
speed: 2
|
||||
m_Value: 0.19183554
|
||||
=======
|
||||
m_Target: {x: -0.068585575, y: -0.72520596, z: 0.07401841, w: -0.68067557}
|
||||
speed: 2
|
||||
m_Value: {x: -0.06860528, y: -0.72541434, z: 0.074039675, w: -0.6808711}
|
||||
m_Size:
|
||||
m_Target: 2.349763
|
||||
speed: 2
|
||||
m_Value: 2.349763
|
||||
>>>>>>> Stashed changes
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
m_Value: 0
|
||||
m_CameraSettings:
|
||||
m_Speed: 1.0646999
|
||||
m_SpeedNormalized: 0.53
|
||||
m_Speed: 0.069699995
|
||||
m_SpeedNormalized: 0.03
|
||||
m_SpeedMin: 0.01
|
||||
m_SpeedMax: 2
|
||||
m_EasingEnabled: 1
|
||||
@ -791,20 +918,34 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 0
|
||||
y: 73.6
|
||||
width: 246.2
|
||||
height: 440.6
|
||||
=======
|
||||
x: 1080
|
||||
y: 211
|
||||
width: 301
|
||||
height: 664
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
<<<<<<< Updated upstream
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 046f0000
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 76f8ffff2c730000607300002a740000ca760000c2780000
|
||||
=======
|
||||
scrollPos: {x: 0, y: 749}
|
||||
m_SelectedIDs: f47b0000
|
||||
m_LastClickedID: 31732
|
||||
m_ExpandedIDs: 30fbffff7c6f00007a7000001a7100009e710000d07200001a73000012750000
|
||||
>>>>>>> Stashed changes
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -849,10 +990,17 @@ MonoBehaviour:
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: 241.6
|
||||
y: 73.6
|
||||
width: 817.2001
|
||||
height: 440.6
|
||||
=======
|
||||
x: 1382
|
||||
y: 211
|
||||
width: 976
|
||||
height: 664
|
||||
>>>>>>> Stashed changes
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@ -865,7 +1013,11 @@ MonoBehaviour:
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
<<<<<<< Updated upstream
|
||||
m_TargetSize: {x: 817.2001, y: 419.6}
|
||||
=======
|
||||
m_TargetSize: {x: 976, y: 643}
|
||||
>>>>>>> Stashed changes
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@ -880,10 +1032,17 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_HBaseRangeMin: -326.88004
|
||||
m_HBaseRangeMax: 326.88004
|
||||
m_VBaseRangeMin: -167.84001
|
||||
m_VBaseRangeMax: 167.84001
|
||||
=======
|
||||
m_HBaseRangeMin: -488
|
||||
m_HBaseRangeMax: 488
|
||||
m_VBaseRangeMin: -321.5
|
||||
m_VBaseRangeMax: 321.5
|
||||
>>>>>>> Stashed changes
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
@ -901,16 +1060,24 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
<<<<<<< Updated upstream
|
||||
width: 817.2001
|
||||
height: 419.6
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 408.60004, y: 209.8}
|
||||
=======
|
||||
width: 976
|
||||
height: 643
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 488, y: 321.5}
|
||||
>>>>>>> Stashed changes
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
<<<<<<< Updated upstream
|
||||
x: -408.60004
|
||||
y: -209.8
|
||||
width: 817.2001
|
||||
@ -918,6 +1085,15 @@ MonoBehaviour:
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 1021.5001, y: 550.75}
|
||||
=======
|
||||
x: -488
|
||||
y: -321.5
|
||||
width: 976
|
||||
height: 643
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 976, y: 664}
|
||||
>>>>>>> Stashed changes
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
|
||||
Loading…
Reference in New Issue
Block a user