Skip to content

Commit

Permalink
nth
Browse files Browse the repository at this point in the history
  • Loading branch information
linxchxn committed Jan 24, 2023
1 parent ad1855a commit e7585db
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 83 deletions.
4 changes: 2 additions & 2 deletions Assets/Scenes/Home Scene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 0.5
m_Volume: 1
m_Pitch: 2
Loop: 0
Mute: 0
Expand Down Expand Up @@ -3226,7 +3226,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 41d3721fd6cfc3b45a737c03507a9ea8, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.5
m_Volume: 0.8
m_Pitch: 1
Loop: 1
Mute: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/Script/UserInput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ bool Stackable(GameObject selected)
if (s1.value == s2.value + 1)
{
move+=1;
//AudioManager.Instance.PlaySFX("Open");
return true;
}
}
Expand Down Expand Up @@ -379,6 +380,7 @@ bool Stackable(GameObject selected)
{
print("Stackable");
move+=1;
//AudioManager.Instance.PlaySFX("Open");
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: KASS
productName: Solitaire
productName: "\U0001F437\U0001F437\U0001F437"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
Expand Down
56 changes: 28 additions & 28 deletions UserSettings/Layouts/CurrentMaximizeLayout.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 81
controlID: 89
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -56,12 +56,12 @@ MonoBehaviour:
m_SerializedViewNames:
- UnityEditor.DeviceSimulation.SimulatorWindow
m_SerializedViewValues:
- C:\Users\USER\Desktop\Solitaire\Solitaire-Game\Library\PlayModeViewStates\9070ba25e6b21a04393eef62075ca644
- C:\Users\USER\Desktop\Solitaire game\Solitaire-Game\Library\PlayModeViewStates\dec5d04c391a236499341d6aecacfa8f
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 1920, y: 1080}
m_TargetSize: {x: 2436, y: 1125}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
Expand All @@ -70,16 +70,16 @@ MonoBehaviour:
m_VSyncEnabled: 0
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 03000000000000002300000013000000000000000000000000000000000000000000000000000000
m_SelectedSizes: 03000000000000000c00000013000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -768
m_HBaseRangeMax: 768
m_VBaseRangeMin: -432
m_VBaseRangeMax: 432
m_HBaseRangeMin: -974.4
m_HBaseRangeMax: 974.4
m_VBaseRangeMin: -450
m_VBaseRangeMax: 450
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
Expand All @@ -99,20 +99,20 @@ MonoBehaviour:
y: 21
width: 789.19995
height: 401.2
m_Scale: {x: 0.46435186, y: 0.46435186}
m_Scale: {x: 0.40496713, y: 0.40496713}
m_Translation: {x: 394.59998, y: 200.6}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -849.78656
y: -432
width: 1699.5731
height: 864
x: -974.4
y: -495.34885
width: 1948.8
height: 990.6977
m_MinimalGUI: 1
m_defaultScale: 0.46435186
m_defaultScale: 0.40496713
m_LastWindowPixelSize: {x: 986.49994, y: 527.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
Expand Down Expand Up @@ -143,7 +143,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 82
controlID: 90
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -168,7 +168,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 83
controlID: 91
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -226,9 +226,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 6c640000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: c084fffff284ffff6286ffff3aa7ffff40a8ffffbeacffff96b3ffffd2dbffff26fbfffff26000006461000012620000666200003a670000086900000a6a0000b472000072730000e473000048740000a2740000b8740000f6740000b6920000e69300003a94000028a50000a6a7000018a80000d6a80000eca800002aa90000
m_ExpandedIDs: 26fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -278,7 +278,7 @@ MonoBehaviour:
- {fileID: 8}
- {fileID: 2}
m_Selected: 1
m_LastSelected: 0
m_LastSelected: 1
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -687,9 +687,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 46630000
m_LastClickedID: 25414
m_ExpandedIDs: 000000001663000000ca9a3b
m_SelectedIDs: 56630000
m_LastClickedID: 25430
m_ExpandedIDs: 000000002663000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -717,7 +717,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 0000000016630000
m_ExpandedIDs: 0000000026630000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand All @@ -742,9 +742,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 6c640000
m_LastClickedInstanceID: 25708
m_HadKeyboardFocusLastEvent: 1
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c623000022660000706e0000e06c00004663000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
Expand Down Expand Up @@ -820,8 +820,8 @@ MonoBehaviour:
y: 0
width: 422.40002
height: 747.6
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
Expand Down
Loading

0 comments on commit e7585db

Please sign in to comment.