From faba9985d6c8b3e3077b7695c8f47b213bec1a79 Mon Sep 17 00:00:00 2001
From: Moritz Meyerhof <moritz.meyerhof@rub.de>
Date: Tue, 13 Apr 2021 12:40:12 +0200
Subject: [PATCH] Minor shop adjustments
---
.../URP_Import_All1Sh.unitypackage.meta | 7 --
Assets/Scenes/Forest.unity | 107 +++++++++++++++++-
Assets/Scripts/Store/UpgradeController.cs | 18 ---
.../Scripts/Store/UpgradeController.cs.meta | 11 --
4 files changed, 105 insertions(+), 38 deletions(-)
delete mode 100644 Assets/Asset Store/AllIn1SpriteShader/URP_Import_All1Sh.unitypackage.meta
delete mode 100644 Assets/Scripts/Store/UpgradeController.cs
delete mode 100644 Assets/Scripts/Store/UpgradeController.cs.meta
diff --git a/Assets/Asset Store/AllIn1SpriteShader/URP_Import_All1Sh.unitypackage.meta b/Assets/Asset Store/AllIn1SpriteShader/URP_Import_All1Sh.unitypackage.meta
deleted file mode 100644
index 6c12638..0000000
--- a/Assets/Asset Store/AllIn1SpriteShader/URP_Import_All1Sh.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: efdf2295c5aee504a937008f0db49719
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/Forest.unity b/Assets/Scenes/Forest.unity
index d083315..7e79357 100644
--- a/Assets/Scenes/Forest.unity
+++ b/Assets/Scenes/Forest.unity
@@ -223,6 +223,34 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1599829696}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: BuyDamage
+ objectReference: {fileID: 0}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: UpgradeController, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 4775638172051795040, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c0ff9effa0df294d8b12587d88feda0, type: 3}
--- !u!1 &183114044
@@ -670,6 +698,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4b50c623df01f0f45a9f891f7b884d37, type: 3}
m_Name:
m_EditorClassIdentifier:
+ statsManager: {fileID: 0}
--- !u!224 &595856522 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4313696329430193921, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
@@ -849,6 +878,34 @@ PrefabInstance:
propertyPath: m_Name
value: Armor
objectReference: {fileID: 0}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1599829696}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: BuyArmor
+ objectReference: {fileID: 0}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: UpgradeController, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 1530477864730390915, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c5e71a7c2d333fd428cf3a3e7bf2464a, type: 3}
--- !u!1 &1070897604
@@ -1442,7 +1499,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
currentMana: 0
- availableUpgrades: []
+ availableUpgrades:
+ - {fileID: 11400000, guid: 908c8818f4675e04d914986ffa80720d, type: 2}
+ - {fileID: 11400000, guid: 96d63ebbac2078d4297c15d27daabc49, type: 2}
+ - {fileID: 11400000, guid: f6f66e24552d4de4d820fa23bb45b5db, type: 2}
+ - {fileID: 11400000, guid: a45d28a185b90484c9786229c6ca82ba, type: 2}
--- !u!4 &1296921607
Transform:
m_ObjectHideFlags: 0
@@ -1815,13 +1876,14 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1599829695}
+ - component: {fileID: 1599829696}
m_Layer: 5
m_Name: Store Container
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1599829695
RectTransform:
m_ObjectHideFlags: 0
@@ -1847,6 +1909,19 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1599829696
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1599829694}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4b50c623df01f0f45a9f891f7b884d37, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ statsManager: {fileID: 1296921606}
--- !u!1001 &1709830593
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2171,6 +2246,34 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1296921605}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: UpgradeController, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 4313696329624128066, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 93fb458242ecfce46b9984a12e094259, type: 3}
--- !u!224 &1837764643 stripped
diff --git a/Assets/Scripts/Store/UpgradeController.cs b/Assets/Scripts/Store/UpgradeController.cs
deleted file mode 100644
index 470fe91..0000000
--- a/Assets/Scripts/Store/UpgradeController.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class UpgradeController : MonoBehaviour
-{
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
- }
-}
diff --git a/Assets/Scripts/Store/UpgradeController.cs.meta b/Assets/Scripts/Store/UpgradeController.cs.meta
deleted file mode 100644
index 6fdf45c..0000000
--- a/Assets/Scripts/Store/UpgradeController.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4b50c623df01f0f45a9f891f7b884d37
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
--
GitLab