Commit a87476bb authored by saad's avatar saad

fix scaling canvas bug

parent 06934bbe
...@@ -75,10 +75,10 @@ MonoBehaviour: ...@@ -75,10 +75,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
m_UiScaleMode: 0 m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600} m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3 m_PhysicalUnit: 3
...@@ -415,7 +415,7 @@ RectTransform: ...@@ -415,7 +415,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 750, y: 175} m_AnchoredPosition: {x: 600, y: 175}
m_SizeDelta: {x: 200, y: 200} m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4911661176318096178 --- !u!222 &4911661176318096178
...@@ -697,7 +697,7 @@ RectTransform: ...@@ -697,7 +697,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -750, y: 175} m_AnchoredPosition: {x: -600, y: 175}
m_SizeDelta: {x: 200, y: 200} m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7674763745984168837 --- !u!222 &7674763745984168837
......
...@@ -135,6 +135,8 @@ GameObject: ...@@ -135,6 +135,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 2606214074821258370} - component: {fileID: 2606214074821258370}
- component: {fileID: 6588315072564813733} - component: {fileID: 6588315072564813733}
- component: {fileID: 4836744744494718672}
- component: {fileID: 4745502482891085492}
m_Layer: 0 m_Layer: 0
m_Name: ProductionLine m_Name: ProductionLine
m_TagString: Untagged m_TagString: Untagged
...@@ -182,7 +184,205 @@ MonoBehaviour: ...@@ -182,7 +184,205 @@ MonoBehaviour:
door: {fileID: 0} door: {fileID: 0}
machine: {fileID: 674825255532559789, guid: 5998f45ccf9e4e14888a430e35818723, type: 3} machine: {fileID: 674825255532559789, guid: 5998f45ccf9e4e14888a430e35818723, type: 3}
machineContainer: {fileID: 3825002632626704734} machineContainer: {fileID: 3825002632626704734}
moveSound: {fileID: 8300000, guid: 1a929b70e26095f489dc29121aa6052a, type: 3}
backgroundMusic: {fileID: 8300000, guid: 35e247fe8003f9730a5afdc547918e69, type: 3}
moveAudioSource: {fileID: 4836744744494718672}
musicAudioSource: {fileID: 4745502482891085492}
machineVFXController: {fileID: 0} machineVFXController: {fileID: 0}
--- !u!82 &4836744744494718672
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736489298177994633}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 0.432
m_Pitch: 2
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!82 &4745502482891085492
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736489298177994633}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 0.49
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!1 &2643349146522646291 --- !u!1 &2643349146522646291
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: 32d24dfce96da6e4bb0991eebaf25e8d
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
...@@ -13,10 +13,27 @@ public class MachineVFXController : MonoBehaviour ...@@ -13,10 +13,27 @@ public class MachineVFXController : MonoBehaviour
[Header("Fire Settings")] [Header("Fire Settings")]
[SerializeField] private float minFireAlpha = 0.1f; [SerializeField] private float minFireAlpha = 0.1f;
[SerializeField] private float maxFireAlpha = 1f; [SerializeField] private float maxFireAlpha = 1f;
[SerializeField] private float minFireSize = 1f; [SerializeField] private float minFireSize = 1f;
[SerializeField] private float maxFireSize = 5f; [SerializeField] private float maxFireSize = 5f;
[Header("Sound References")]
[SerializeField] private AudioSource explosionAudioSource;
[SerializeField] private AudioSource loopNoiseAudioSource;
[Header("Loop Noise Settings")]
[SerializeField] private float minNoiseVolume = 0f;
[SerializeField] private float maxNoiseVolume = 1f;
private void Start()
{
if (loopNoiseAudioSource != null)
{
loopNoiseAudioSource.loop = true;
loopNoiseAudioSource.volume = minNoiseVolume;
if (!loopNoiseAudioSource.isPlaying)
loopNoiseAudioSource.Play();
}
}
private void Update() private void Update()
{ {
...@@ -30,7 +47,6 @@ public class MachineVFXController : MonoBehaviour ...@@ -30,7 +47,6 @@ public class MachineVFXController : MonoBehaviour
/// ratio = 0 → calm /// ratio = 0 → calm
/// ratio = 1 → maximum intensity /// ratio = 1 → maximum intensity
/// </summary> /// </summary>
///
public void SetIntensityRatio(float ratio) public void SetIntensityRatio(float ratio)
{ {
ratio = Mathf.Clamp01(ratio); ratio = Mathf.Clamp01(ratio);
...@@ -39,6 +55,7 @@ public class MachineVFXController : MonoBehaviour ...@@ -39,6 +55,7 @@ public class MachineVFXController : MonoBehaviour
scaryMachine.SetIntensity(ratio); scaryMachine.SetIntensity(ratio);
UpdateFire(ratio); UpdateFire(ratio);
UpdateLoopNoise(ratio);
} }
private void UpdateFire(float ratio) private void UpdateFire(float ratio)
...@@ -46,16 +63,22 @@ public class MachineVFXController : MonoBehaviour ...@@ -46,16 +63,22 @@ public class MachineVFXController : MonoBehaviour
if (fireVFX == null) return; if (fireVFX == null) return;
var main = fireVFX.main; var main = fireVFX.main;
float alpha = Mathf.Lerp(minFireAlpha, maxFireAlpha, ratio); float alpha = Mathf.Lerp(minFireAlpha, maxFireAlpha, ratio);
float size = Mathf.Lerp(minFireSize, maxFireSize, ratio); float size = Mathf.Lerp(minFireSize, maxFireSize, ratio);
Color c = main.startColor.color; Color c = main.startColor.color;
c.a = alpha; c.a = alpha;
main.startColor = c; main.startColor = c;
main.startSize = size; main.startSize = size;
} }
private void UpdateLoopNoise(float ratio)
{
if (loopNoiseAudioSource == null) return;
loopNoiseAudioSource.volume = Mathf.Lerp(minNoiseVolume, maxNoiseVolume, ratio);
}
public void PlayExplosion() public void PlayExplosion()
{ {
StopAllVFX(); StopAllVFX();
...@@ -63,40 +86,32 @@ public class MachineVFXController : MonoBehaviour ...@@ -63,40 +86,32 @@ public class MachineVFXController : MonoBehaviour
// Play explosion VFX // Play explosion VFX
explosionVFX?.Play(); explosionVFX?.Play();
// Play explosion sound (one-shot)
if (explosionAudioSource != null)
explosionAudioSource.Play();
// Reset scary machine intensity // Reset scary machine intensity
if (scaryMachine != null) if (scaryMachine != null)
{
scaryMachine.SetIntensity(-1f); scaryMachine.SetIntensity(-1f);
}
// Trigger impacts on all child AutoForceImpact components // Trigger impacts on all child AutoForceImpact components
AutoForceImpact[] impacts = GetComponentsInChildren<AutoForceImpact>(true); AutoForceImpact[] impacts = GetComponentsInChildren<AutoForceImpact>(true);
if (impacts.Length > 0) if (impacts.Length > 0)
{ {
Vector3 explosionPosition = transform.position; Vector3 explosionPosition = transform.position;
foreach (var impact in impacts) foreach (var impact in impacts)
{
impact?.TriggerImpact(explosionPosition); impact?.TriggerImpact(explosionPosition);
} }
} }
}
public void StopAllVFX() public void StopAllVFX()
{ {
SetIntensityRatio(0f); SetIntensityRatio(0f);
Debug.Log("stop"); Debug.Log("stop");
if (correctVFX != null)
correctVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (wrongVFX != null)
wrongVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (explosionVFX != null)
explosionVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (fireVFX != null)
fireVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (correctVFX != null) correctVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (wrongVFX != null) wrongVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (explosionVFX != null) explosionVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
if (fireVFX != null) fireVFX.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
} }
} }
\ No newline at end of file
...@@ -14220,6 +14220,8 @@ GameObject: ...@@ -14220,6 +14220,8 @@ GameObject:
- component: {fileID: 5132323277893022286} - component: {fileID: 5132323277893022286}
- component: {fileID: 9171422854662029844} - component: {fileID: 9171422854662029844}
- component: {fileID: 4776298457712748868} - component: {fileID: 4776298457712748868}
- component: {fileID: 6720802054867345570}
- component: {fileID: 8189303045537585967}
m_Layer: 0 m_Layer: 0
m_Name: Machn_2 m_Name: Machn_2
m_TagString: Untagged m_TagString: Untagged
...@@ -14372,6 +14374,204 @@ MonoBehaviour: ...@@ -14372,6 +14374,204 @@ MonoBehaviour:
maxFireAlpha: 1 maxFireAlpha: 1
minFireSize: 1 minFireSize: 1
maxFireSize: 5 maxFireSize: 5
explosionAudioSource: {fileID: 8189303045537585967}
loopNoiseAudioSource: {fileID: 6720802054867345570}
minNoiseVolume: 0
maxNoiseVolume: 0.2
--- !u!82 &6720802054867345570
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 674825255532559789}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 8300000, guid: 1b8f9dfdf2e1d3141a1612c6e983decf, type: 3}
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!82 &8189303045537585967
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 674825255532559789}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 8300000, guid: 32d24dfce96da6e4bb0991eebaf25e8d, type: 3}
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!1 &920656980724022583 --- !u!1 &920656980724022583
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
fileFormatVersion: 2
guid: 1a929b70e26095f489dc29121aa6052a
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7cf87651921ae294f90fad985a724838
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1b8f9dfdf2e1d3141a1612c6e983decf
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
...@@ -365,7 +365,7 @@ MonoBehaviour: ...@@ -365,7 +365,7 @@ MonoBehaviour:
m_Bits: 1 m_Bits: 1
m_VolumeTrigger: {fileID: 0} m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2 m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0 m_RenderPostProcessing: 1
m_Antialiasing: 0 m_Antialiasing: 0
m_AntialiasingQuality: 2 m_AntialiasingQuality: 2
m_StopNaN: 0 m_StopNaN: 0
......
...@@ -18,22 +18,62 @@ namespace com.al_arcade.tf ...@@ -18,22 +18,62 @@ namespace com.al_arcade.tf
[SerializeField] public GameObject machine; [SerializeField] public GameObject machine;
[SerializeField] public Transform machineContainer; [SerializeField] public Transform machineContainer;
[Header("Audio")]
[SerializeField] private AudioClip moveSound;
[SerializeField] private AudioClip backgroundMusic;
[SerializeField] private AudioSource moveAudioSource;
[SerializeField] private AudioSource musicAudioSource;
private GameObject _spawnedMachine; private GameObject _spawnedMachine;
private float currentDistance; private float currentDistance;
private float stepDistance; private float stepDistance;
private float _lastIntensity = -1f; private float _lastIntensity = -1f;
private bool _start = false; private bool _start = false;
public MachineVFXController machineVFXController; public MachineVFXController machineVFXController;
private void Awake() private void Awake()
{ {
StartCoroutine(DelayStart()); StartCoroutine(DelayStart());
if (materialOffsetController == null && product != null) if (materialOffsetController == null && product != null)
materialOffsetController = product.GetComponent<MaterialOffsetController>(); materialOffsetController = product.GetComponent<MaterialOffsetController>();
SetupAudio();
machineVFXController?.SetIntensityRatio(0f); machineVFXController?.SetIntensityRatio(0f);
} }
private void SetupAudio()
{
// Move Audio Source
if (moveAudioSource == null)
moveAudioSource = gameObject.AddComponent<AudioSource>();
moveAudioSource.playOnAwake = false;
moveAudioSource.loop = false;
// Music Audio Source
if (musicAudioSource == null)
musicAudioSource = gameObject.AddComponent<AudioSource>();
if (backgroundMusic != null)
{
musicAudioSource.clip = backgroundMusic;
musicAudioSource.loop = true;
musicAudioSource.volume = 0.5f;
musicAudioSource.playOnAwake = true;
musicAudioSource.Play();
}
}
private void PlayMoveSound()
{
if (moveSound == null) return;
moveAudioSource.pitch = 1.2f;
moveAudioSource.PlayOneShot(moveSound);
}
public void Build(int stepsToWin, float stepSize, Vector3 cameraPos) public void Build(int stepsToWin, float stepSize, Vector3 cameraPos)
{ {
if (startPoint == null || endPoint == null || stepsToWin <= 0) if (startPoint == null || endPoint == null || stepsToWin <= 0)
...@@ -79,6 +119,8 @@ namespace com.al_arcade.tf ...@@ -79,6 +119,8 @@ namespace com.al_arcade.tf
if (product == null || startPoint == null || endPoint == null) if (product == null || startPoint == null || endPoint == null)
yield break; yield break;
PlayMoveSound();
materialOffsetController?.AddOffset(new Vector2(0f, 1f), 0.2f); materialOffsetController?.AddOffset(new Vector2(0f, 1f), 0.2f);
currentDistance = Mathf.Clamp( currentDistance = Mathf.Clamp(
...@@ -108,6 +150,7 @@ namespace com.al_arcade.tf ...@@ -108,6 +150,7 @@ namespace com.al_arcade.tf
float previousDistance = currentDistance; float previousDistance = currentDistance;
currentDistance = Mathf.Clamp( currentDistance = Mathf.Clamp(
currentDistance - stepDistance, currentDistance - stepDistance,
0, 0,
...@@ -129,6 +172,7 @@ namespace com.al_arcade.tf ...@@ -129,6 +172,7 @@ namespace com.al_arcade.tf
{ {
materialOffsetController?.AddOffset(new Vector2(0f, -1f), 0.2f); materialOffsetController?.AddOffset(new Vector2(0f, -1f), 0.2f);
}); });
PlayMoveSound();
} }
seq.Append( seq.Append(
...@@ -163,7 +207,6 @@ namespace com.al_arcade.tf ...@@ -163,7 +207,6 @@ namespace com.al_arcade.tf
currentDistance = 0f; currentDistance = 0f;
// Reset product
if (product != null && startPoint != null) if (product != null && startPoint != null)
{ {
product.localPosition = startPoint.localPosition; product.localPosition = startPoint.localPosition;
...@@ -171,7 +214,6 @@ namespace com.al_arcade.tf ...@@ -171,7 +214,6 @@ namespace com.al_arcade.tf
product.localScale = Vector3.one * 2f; product.localScale = Vector3.one * 2f;
} }
// Reset door
if (door != null) if (door != null)
{ {
Vector3 pos = door.localPosition; Vector3 pos = door.localPosition;
...@@ -184,19 +226,17 @@ namespace com.al_arcade.tf ...@@ -184,19 +226,17 @@ namespace com.al_arcade.tf
_lastIntensity = -1f; _lastIntensity = -1f;
_start = false; _start = false;
// ✅ Destroy old machine FIRST
if (_spawnedMachine != null) if (_spawnedMachine != null)
{ {
Destroy(_spawnedMachine); Destroy(_spawnedMachine);
_spawnedMachine = null; _spawnedMachine = null;
} }
// ✅ Spawn new machine
if (machine != null && machineContainer != null) if (machine != null && machineContainer != null)
{ {
_spawnedMachine = Instantiate( _spawnedMachine = Instantiate(
machine, machine,
machineContainer.position , machineContainer.position,
Quaternion.Euler(0f, 90f, 0f) Quaternion.Euler(0f, 90f, 0f)
); );
......
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7893295128165547882
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 0
skipIterations:
m_OverrideState: 1
m_Value: 0
threshold:
m_OverrideState: 1
m_Value: 1
intensity:
m_OverrideState: 1
m_Value: 0.25
scatter:
m_OverrideState: 1
m_Value: 0.5
clamp:
m_OverrideState: 0
m_Value: 65472
tint:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
highQualityFiltering:
m_OverrideState: 1
m_Value: 1
filter:
m_OverrideState: 0
m_Value: 0
downscale:
m_OverrideState: 0
m_Value: 0
maxIterations:
m_OverrideState: 0
m_Value: 6
dirtTexture:
m_OverrideState: 0
m_Value: {fileID: 0}
dimension: 1
dirtIntensity:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-7011558710299706105 --- !u!114 &-7011558710299706105
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
...@@ -28,6 +78,34 @@ MonoBehaviour: ...@@ -28,6 +78,34 @@ MonoBehaviour:
rounded: rounded:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 0 m_Value: 0
--- !u!114 &-3357603926938260329
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 0
color:
m_OverrideState: 0
m_Value: {r: 0, g: 0, b: 0, a: 1}
center:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0.2
smoothness:
m_OverrideState: 0
m_Value: 0.2
rounded:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-1319815706948491187 --- !u!114 &-1319815706948491187
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
...@@ -69,9 +147,51 @@ MonoBehaviour: ...@@ -69,9 +147,51 @@ MonoBehaviour:
m_Name: SampleSceneProfile m_Name: SampleSceneProfile
m_EditorClassIdentifier: m_EditorClassIdentifier:
components: components:
- {fileID: -7011558710299706105} - {fileID: 849379129802519247}
- {fileID: -1319815706948491187} - {fileID: -7893295128165547882}
- {fileID: 4848244823020691756} - {fileID: 7391319092446245454}
- {fileID: -3357603926938260329}
- {fileID: 9174983849937493503}
--- !u!114 &849379129802519247
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3}
m_Name: Tonemapping
m_EditorClassIdentifier:
active: 0
mode:
m_OverrideState: 1
m_Value: 1
neutralHDRRangeReductionMode:
m_OverrideState: 0
m_Value: 2
acesPreset:
m_OverrideState: 0
m_Value: 3
hueShiftAmount:
m_OverrideState: 0
m_Value: 0
detectPaperWhite:
m_OverrideState: 1
m_Value: 0
paperWhite:
m_OverrideState: 1
m_Value: 234
detectBrightnessLimits:
m_OverrideState: 1
m_Value: 1
minNits:
m_OverrideState: 1
m_Value: 0.005
maxNits:
m_OverrideState: 1
m_Value: 647
--- !u!114 &4848244823020691756 --- !u!114 &4848244823020691756
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
...@@ -118,3 +238,74 @@ MonoBehaviour: ...@@ -118,3 +238,74 @@ MonoBehaviour:
bladeRotation: bladeRotation:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 0 m_Value: 0
--- !u!114 &7391319092446245454
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3}
m_Name: MotionBlur
m_EditorClassIdentifier:
active: 0
mode:
m_OverrideState: 0
m_Value: 0
quality:
m_OverrideState: 1
m_Value: 2
intensity:
m_OverrideState: 1
m_Value: 0.6
clamp:
m_OverrideState: 0
m_Value: 0.05
--- !u!114 &9174983849937493503
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3}
m_Name: DepthOfField
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.DepthOfField
active: 1
mode:
m_OverrideState: 1
m_Value: 2
gaussianStart:
m_OverrideState: 0
m_Value: 10
gaussianEnd:
m_OverrideState: 0
m_Value: 30
gaussianMaxRadius:
m_OverrideState: 0
m_Value: 1
highQualitySampling:
m_OverrideState: 0
m_Value: 0
focusDistance:
m_OverrideState: 1
m_Value: 683.1
aperture:
m_OverrideState: 0
m_Value: 5.6
focalLength:
m_OverrideState: 0
m_Value: 50
bladeCount:
m_OverrideState: 0
m_Value: 5
bladeCurvature:
m_OverrideState: 0
m_Value: 1
bladeRotation:
m_OverrideState: 0
m_Value: 0
...@@ -24,7 +24,7 @@ MonoBehaviour: ...@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 112} m_MinSize: {x: 400, y: 112}
m_MaxSize: {x: 32384, y: 16192} m_MaxSize: {x: 32384, y: 16192}
vertical: 0 vertical: 0
controlID: 56820 controlID: 65494
draggingID: 0 draggingID: 0
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -50,7 +50,7 @@ MonoBehaviour: ...@@ -50,7 +50,7 @@ MonoBehaviour:
x: 828 x: 828
y: 79.200005 y: 79.200005
width: 342.80005 width: 342.80005
height: 317.2 height: 378
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -107,9 +107,9 @@ MonoBehaviour: ...@@ -107,9 +107,9 @@ MonoBehaviour:
x: 0 x: 0
y: 21 y: 21
width: 342.80005 width: 342.80005
height: 296.2 height: 357
m_Scale: {x: 0.22317712, y: 0.22317712} m_Scale: {x: 0.22317712, y: 0.22317712}
m_Translation: {x: 171.40002, y: 148.1} m_Translation: {x: 171.40002, y: 178.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
...@@ -117,12 +117,12 @@ MonoBehaviour: ...@@ -117,12 +117,12 @@ MonoBehaviour:
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -768 x: -768
y: -663.5985 y: -799.8132
width: 1536 width: 1536
height: 1327.197 height: 1599.6263
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 0.22317712 m_defaultScale: 0.22317712
m_LastWindowPixelSize: {x: 428.50006, y: 396.5} m_LastWindowPixelSize: {x: 428.50006, y: 472.5}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -153,7 +153,7 @@ MonoBehaviour: ...@@ -153,7 +153,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 112} m_MinSize: {x: 300, y: 112}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 1 vertical: 1
controlID: 56821 controlID: 65495
draggingID: 0 draggingID: 0
--- !u!114 &4 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
...@@ -176,11 +176,11 @@ MonoBehaviour: ...@@ -176,11 +176,11 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 1172.8 width: 1172.8
height: 343.2 height: 404
m_MinSize: {x: 300, y: 56} m_MinSize: {x: 300, y: 56}
m_MaxSize: {x: 24288, y: 8096} m_MaxSize: {x: 24288, y: 8096}
vertical: 0 vertical: 0
controlID: 56822 controlID: 65496
draggingID: 0 draggingID: 0
--- !u!114 &5 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
...@@ -200,7 +200,7 @@ MonoBehaviour: ...@@ -200,7 +200,7 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 278.4 width: 278.4
height: 343.2 height: 404
m_MinSize: {x: 201, y: 226} m_MinSize: {x: 201, y: 226}
m_MaxSize: {x: 4001, y: 4026} m_MaxSize: {x: 4001, y: 4026}
m_ActualView: {fileID: 6} m_ActualView: {fileID: 6}
...@@ -232,7 +232,7 @@ MonoBehaviour: ...@@ -232,7 +232,7 @@ MonoBehaviour:
x: 0 x: 0
y: 79.200005 y: 79.200005
width: 277.4 width: 277.4
height: 317.2 height: 378
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -249,11 +249,19 @@ MonoBehaviour: ...@@ -249,11 +249,19 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs: []
- m_Data: 285768
m_LastClickedID: m_LastClickedID:
m_Data: 285768 m_Data: 0
m_ExpandedIDs: m_ExpandedIDs:
- m_Data: -656922
- m_Data: -656604
- m_Data: -655656
- m_Data: -652006
- m_Data: -651680
- m_Data: -650728
- m_Data: -633992
- m_Data: -633666
- m_Data: -632646
- m_Data: -499186 - m_Data: -499186
- m_Data: -498450 - m_Data: -498450
- m_Data: -497626 - m_Data: -497626
...@@ -343,9 +351,9 @@ MonoBehaviour: ...@@ -343,9 +351,9 @@ MonoBehaviour:
x: 278.4 x: 278.4
y: 0 y: 0
width: 549.6 width: 549.6
height: 343.2 height: 404
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 202, y: 226}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4026}
m_ActualView: {fileID: 8} m_ActualView: {fileID: 8}
m_Panes: m_Panes:
- {fileID: 8} - {fileID: 8}
...@@ -375,7 +383,7 @@ MonoBehaviour: ...@@ -375,7 +383,7 @@ MonoBehaviour:
x: 278.4 x: 278.4
y: 79.200005 y: 79.200005
width: 547.6 width: 547.6
height: 317.2 height: 378
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1018,7 +1026,7 @@ MonoBehaviour: ...@@ -1018,7 +1026,7 @@ MonoBehaviour:
m_Position: m_Position:
m_Target: {x: -22.970797, y: 9.579826, z: 21.546589} m_Target: {x: -22.970797, y: 9.579826, z: 21.546589}
speed: 2 speed: 2
m_Value: {x: -22.970797, y: 9.579826, z: 21.546589} m_Value: {x: 19.467089, y: -10.037382, z: 20.729881}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -1066,11 +1074,11 @@ MonoBehaviour: ...@@ -1066,11 +1074,11 @@ MonoBehaviour:
m_Rotation: m_Rotation:
m_Target: {x: 0.11078891, y: 0.83010656, z: -0.17797183, w: 0.5167362} m_Target: {x: 0.11078891, y: 0.83010656, z: -0.17797183, w: 0.5167362}
speed: 2 speed: 2
m_Value: {x: 0.110786624, y: 0.83008945, z: -0.17796816, w: 0.51672554} m_Value: {x: 0.20169434, y: 0.5959287, z: -0.11794657, w: 0.76829493}
m_Size: m_Size:
m_Target: 8.487049 m_Target: 8.487049
speed: 2 speed: 2
m_Value: 8.487049 m_Value: 14.924964
m_Ortho: m_Ortho:
m_Target: 0 m_Target: 0
speed: 2 speed: 2
...@@ -1088,7 +1096,7 @@ MonoBehaviour: ...@@ -1088,7 +1096,7 @@ MonoBehaviour:
m_FarClip: 10000 m_FarClip: 10000
m_DynamicClip: 1 m_DynamicClip: 1
m_OcclusionCulling: 0 m_OcclusionCulling: 0
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewRotation: {x: 0.11078891, y: 0.83010656, z: -0.17797183, w: 0.5167362}
m_LastSceneViewOrtho: 0 m_LastSceneViewOrtho: 0
m_Viewpoint: m_Viewpoint:
m_SceneView: {fileID: 8} m_SceneView: {fileID: 8}
...@@ -1122,7 +1130,7 @@ MonoBehaviour: ...@@ -1122,7 +1130,7 @@ MonoBehaviour:
x: 828 x: 828
y: 0 y: 0
width: 344.80005 width: 344.80005
height: 343.2 height: 404
m_MinSize: {x: 202, y: 226} m_MinSize: {x: 202, y: 226}
m_MaxSize: {x: 4002, y: 4026} m_MaxSize: {x: 4002, y: 4026}
m_ActualView: {fileID: 2} m_ActualView: {fileID: 2}
...@@ -1146,9 +1154,9 @@ MonoBehaviour: ...@@ -1146,9 +1154,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 343.2 y: 404
width: 1172.8 width: 1172.8
height: 373.59998 height: 312.8
m_MinSize: {x: 231, y: 276} m_MinSize: {x: 231, y: 276}
m_MaxSize: {x: 10001, y: 10026} m_MaxSize: {x: 10001, y: 10026}
m_ActualView: {fileID: 11} m_ActualView: {fileID: 11}
...@@ -1181,9 +1189,9 @@ MonoBehaviour: ...@@ -1181,9 +1189,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 422.4 y: 483.2
width: 1171.8 width: 1171.8
height: 347.59998 height: 286.8
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1208,7 +1216,7 @@ MonoBehaviour: ...@@ -1208,7 +1216,7 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/ScienceStreet/CS/Scripts - Assets/Prefabs/TF/Art
m_Globs: [] m_Globs: []
m_ProductIds: m_ProductIds:
m_AnyWithAssetOrigin: 0 m_AnyWithAssetOrigin: 0
...@@ -1218,18 +1226,18 @@ MonoBehaviour: ...@@ -1218,18 +1226,18 @@ MonoBehaviour:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 59 m_StartGridSize: 59
m_LastFolders: m_LastFolders:
- Assets/ScienceStreet/CS/Scripts - Assets/Prefabs/TF/Art
m_LastFoldersGridSize: 59 m_LastFoldersGridSize: 59
m_LastProjectPath: D:\saad work\Unity project\SSbookminigames\My project m_LastProjectPath: D:\saad work\Unity project\SSbookminigames\My project
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastLocalAssetsSearchArea: 1 m_LastLocalAssetsSearchArea: 1
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 748.4} scrollPos: {x: 0, y: 789.2}
m_SelectedIDs: m_SelectedIDs:
- m_Data: 285818 - m_Data: 55060
m_LastClickedID: m_LastClickedID:
m_Data: 285818 m_Data: 55060
m_ExpandedIDs: m_ExpandedIDs:
- m_Data: 0 - m_Data: 0
- m_Data: 54580 - m_Data: 54580
...@@ -1247,7 +1255,7 @@ MonoBehaviour: ...@@ -1247,7 +1255,7 @@ MonoBehaviour:
- m_Data: 54604 - m_Data: 54604
- m_Data: 54606 - m_Data: 54606
- m_Data: 54608 - m_Data: 54608
- m_Data: 55040 - m_Data: 55028
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1321,10 +1329,9 @@ MonoBehaviour: ...@@ -1321,10 +1329,9 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs: []
- m_Data: 285768 m_LastClickedInstanceID: 0
m_LastClickedInstanceID: 285768 m_HadKeyboardFocusLastEvent: 1
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: m_ExpandedInstanceIDs:
- m_Data: 55308 - m_Data: 55308
- m_Data: 82478 - m_Data: 82478
...@@ -1473,7 +1480,7 @@ MonoBehaviour: ...@@ -1473,7 +1480,7 @@ MonoBehaviour:
m_DynamicPanelBehavior: 0 m_DynamicPanelBehavior: 0
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastSelectedObjectID: 285768 m_LastSelectedObjectID: 301170
--- !u!114 &14 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -1496,9 +1503,9 @@ MonoBehaviour: ...@@ -1496,9 +1503,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 422.4 y: 483.2
width: 1171.8 width: 1171.8
height: 347.59998 height: 286.8
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1531,8 +1538,8 @@ MonoBehaviour: ...@@ -1531,8 +1538,8 @@ MonoBehaviour:
y: 0 y: 0
width: 363.19995 width: 363.19995
height: 716.8 height: 716.8
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 276, y: 76}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4026}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
...@@ -1583,7 +1590,7 @@ MonoBehaviour: ...@@ -1583,7 +1590,7 @@ MonoBehaviour:
m_ControlHash: -371814159 m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1 m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 463 m_LastVerticalScrollValue: 0
m_GlobalObjectId: m_GlobalObjectId:
m_InspectorMode: 0 m_InspectorMode: 0
m_LockTracker: m_LockTracker:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment