Added slight changes to loading scene after saving game
This commit is contained in:
parent
6d7760c120
commit
20d24c5973
@ -53,6 +53,7 @@
|
|||||||
<Compile Include="Assets\Scripts\Inventory\InventoryManager.cs" />
|
<Compile Include="Assets\Scripts\Inventory\InventoryManager.cs" />
|
||||||
<Compile Include="Assets\Scripts\Dialogue.cs" />
|
<Compile Include="Assets\Scripts\Dialogue.cs" />
|
||||||
<Compile Include="Assets\Scripts\Item\Item.cs" />
|
<Compile Include="Assets\Scripts\Item\Item.cs" />
|
||||||
|
<Compile Include="Assets\Scripts\PlayerPosition.cs" />
|
||||||
<Compile Include="Assets\Scripts\CamerFollow.cs" />
|
<Compile Include="Assets\Scripts\CamerFollow.cs" />
|
||||||
<Compile Include="Assets\SaveMusicSettings.cs" />
|
<Compile Include="Assets\SaveMusicSettings.cs" />
|
||||||
<Compile Include="Assets\Scripts\SaveSoundSettings.cs" />
|
<Compile Include="Assets\Scripts\SaveSoundSettings.cs" />
|
||||||
|
@ -452,11 +452,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 23852502}
|
m_GameObject: {fileID: 23852502}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!4 &55793480 stripped
|
|
||||||
Transform:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 9081071845975046733}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!1 &59883995
|
--- !u!1 &59883995
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -16277,7 +16272,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 880342282}
|
m_Father: {fileID: 880342282}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &622865437
|
--- !u!114 &622865437
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -26667,7 +26662,6 @@ Transform:
|
|||||||
m_LocalPosition: {x: -1.4602706, y: -0.8430535, z: -2.7875266}
|
m_LocalPosition: {x: -1.4602706, y: -0.8430535, z: -2.7875266}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 55793480}
|
|
||||||
- {fileID: 622865436}
|
- {fileID: 622865436}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 7
|
m_RootOrder: 7
|
||||||
@ -121648,68 +121642,3 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3}
|
m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
--- !u!1001 &9081071845975046733
|
|
||||||
PrefabInstance:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Modification:
|
|
||||||
m_TransformParent: {fileID: 880342282}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 9081071845930167553, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: item.itemModel
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 9081071845930167562, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_RootOrder
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167557, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9081071845930167562, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_Icon
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0}
|
|
||||||
- target: {fileID: 9081071845930167562, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Pickaxe
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
|
|
||||||
|
@ -9,6 +9,11 @@ public class PickableController : MonoBehaviour
|
|||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
item.Name = gameObject.name;
|
item.Name = gameObject.name;
|
||||||
|
string pickaxe = PlayerPrefs.GetString("pickaxe1");
|
||||||
|
if(pickaxe == "picked")
|
||||||
|
{
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnTriggerEnter2D(Collider2D collision)
|
private void OnTriggerEnter2D(Collider2D collision)
|
||||||
@ -16,6 +21,8 @@ public class PickableController : MonoBehaviour
|
|||||||
if (collision.tag == "Player")
|
if (collision.tag == "Player")
|
||||||
{
|
{
|
||||||
InventoryManager.Instance.AddToInventory(this.item);
|
InventoryManager.Instance.AddToInventory(this.item);
|
||||||
|
string pickaxe = "picked";
|
||||||
|
PlayerPrefs.SetString("pickaxe1", pickaxe);
|
||||||
Destroy(gameObject);
|
Destroy(gameObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,11 @@ public class breakable : MonoBehaviour
|
|||||||
{
|
{
|
||||||
availableSprites.Add(i);
|
availableSprites.Add(i);
|
||||||
}
|
}
|
||||||
PlayerPrefs.SetInt("particles", 1);
|
int rock = PlayerPrefs.GetInt("particles");
|
||||||
|
if(rock == 0)
|
||||||
|
{
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IEnumerator Timer()
|
IEnumerator Timer()
|
||||||
|
Loading…
Reference in New Issue
Block a user