sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
j-weissen 2022-06-23 02:22:22 +02:00
commit 561b56ae84
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scenes/MainScene.unity
View file

@ -7622,6 +7622,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
startElements:
- {fileID: 11400000, guid: 7fc4aaa640c1c1e49a0c0a9241fbcf07, type: 2}
- {fileID: 11400000, guid: a5d525b8ca07172499e8678eb6f73fb2, type: 2}
- {fileID: 11400000, guid: a5d525b8ca07172499e8678eb6f73fb2, type: 2}
- {fileID: 11400000, guid: a5d525b8ca07172499e8678eb6f73fb2, type: 2}
@ -7640,6 +7641,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: bb9777a7d5804bd6bf25d5510206aaf0, type: 2}
- {fileID: 11400000, guid: bb9777a7d5804bd6bf25d5510206aaf0, type: 2}
- {fileID: 11400000, guid: bb9777a7d5804bd6bf25d5510206aaf0, type: 2}
- {fileID: 11400000, guid: bb9777a7d5804bd6bf25d5510206aaf0, type: 2}
itemWasBought: 0
--- !u!1001 &1701153146
PrefabInstance:

1
Assets/Scripts/Actions/ActionInvoker.cs
View file

@ -139,7 +139,6 @@ namespace DefaultNamespace {
if(fenceRenderer && fenceCollider) {
if(!fenceRenderer.enabled || !fenceCollider.enabled) {
fenceRenderer.enabled = true;
Debug.Log("aaaaaaaaaaaaaaaaaaaaa");
fenceRenderer.color = new Color(1, 1, 1, 1);
fenceCollider.enabled = true;
Inventory.instance.RemoveElement(ItemContainer.Instance.GetItemByName("Fence"), 1);