Scriptable Objects + Upgrade Menu

This commit is contained in:
Sewmina 2022-04-05 03:42:52 +05:30
parent c5c5693078
commit 525d1da14a
18 changed files with 1283 additions and 758 deletions

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.45073426, g: 0.50068, b: 0.57484144, a: 1} m_IndirectSpecularColor: {r: 0.44809502, g: 0.49735945, b: 0.5722, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -7067,7 +7067,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3} m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
buildingName: Green House buildingData: {fileID: 11400000, guid: 877632c6c68b29db29d24a00ca56d609, type: 2}
outline: {fileID: 0} outline: {fileID: 0}
--- !u!114 &86460255 --- !u!114 &86460255
MonoBehaviour: MonoBehaviour:
@ -11361,7 +11361,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3} m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
buildingName: Green House buildingData: {fileID: 11400000, guid: 877632c6c68b29db29d24a00ca56d609, type: 2}
outline: {fileID: 0} outline: {fileID: 0}
--- !u!114 &126845492 --- !u!114 &126845492
MonoBehaviour: MonoBehaviour:
@ -14722,7 +14722,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3} m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
buildingName: Research Facility buildingData: {fileID: 11400000, guid: a6aea54cb5f332beba1de43509d49476, type: 2}
outline: {fileID: 0} outline: {fileID: 0}
--- !u!114 &169492417 --- !u!114 &169492417
MonoBehaviour: MonoBehaviour:
@ -39004,7 +39004,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1377611198} m_TargetGraphic: {fileID: 1377611198}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 1520608584}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &476482849 --- !u!114 &476482849
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -58357,7 +58369,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3} m_Script: {fileID: 11500000, guid: b71079c276d1984cd82ae7c982fe5ca7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
buildingName: Communication Center buildingData: {fileID: 11400000, guid: 3f14a9fbb66d4461eabb30a42aa5007a, type: 2}
outline: {fileID: 0} outline: {fileID: 0}
--- !u!114 &735782556 --- !u!114 &735782556
MonoBehaviour: MonoBehaviour:
@ -62372,6 +62384,85 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4ff40d720daca1343be2d17c79b68285, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4ff40d720daca1343be2d17c79b68285, type: 3}
--- !u!1 &782802644
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 782802645}
- component: {fileID: 782802647}
- component: {fileID: 782802646}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &782802645
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 782802644}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1992627680}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &782802646
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 782802644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 13
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: UPGRADE
--- !u!222 &782802647
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 782802644}
m_CullTransparentMesh: 1
--- !u!1001 &782940793 --- !u!1001 &782940793
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -101057,7 +101148,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1146292284} m_TargetGraphic: {fileID: 1146292284}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 1218845502}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1259037935 --- !u!114 &1259037935
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -101112,13 +101215,14 @@ GameObject:
- component: {fileID: 1259426725} - component: {fileID: 1259426725}
- component: {fileID: 1259426727} - component: {fileID: 1259426727}
- component: {fileID: 1259426726} - component: {fileID: 1259426726}
- component: {fileID: 1259426728}
m_Layer: 5 m_Layer: 5
m_Name: Selected Item m_Name: Selected Item
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1259426725 --- !u!224 &1259426725
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -101131,6 +101235,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1480392898} - {fileID: 1480392898}
- {fileID: 1992627680}
m_Father: {fileID: 1669511118} m_Father: {fileID: 1669511118}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -101177,6 +101282,30 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1259426724} m_GameObject: {fileID: 1259426724}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1259426728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1259426724}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6abc3c74e694775039c22bf2106e989e, type: 3}
m_Name:
m_EditorClassIdentifier:
nameTxt: {fileID: 1480392899}
upgradeBtn: {fileID: 1992627681}
menus:
- menuObject: {fileID: 1218845502}
relatedBuildings:
- {fileID: 11400000, guid: 3f14a9fbb66d4461eabb30a42aa5007a, type: 2}
- menuObject: {fileID: 1520608584}
relatedBuildings:
- {fileID: 11400000, guid: a6aea54cb5f332beba1de43509d49476, type: 2}
- menuObject: {fileID: 788098224}
relatedBuildings:
- {fileID: 11400000, guid: 877632c6c68b29db29d24a00ca56d609, type: 2}
--- !u!4 &1259898503 stripped --- !u!4 &1259898503 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4322694313257492, guid: 5b7c91a625e35744c9263b8194bb306c, type: 3} m_CorrespondingSourceObject: {fileID: 4322694313257492, guid: 5b7c91a625e35744c9263b8194bb306c, type: 3}
@ -145027,7 +145156,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 60551409} m_TargetGraphic: {fileID: 60551409}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 788098224}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1852250967 --- !u!114 &1852250967
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -155573,6 +155714,127 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a4c38c065f2dc8a4b85aca89ac86b15e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a4c38c065f2dc8a4b85aca89ac86b15e, type: 3}
--- !u!1 &1992627679
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1992627680}
- component: {fileID: 1992627683}
- component: {fileID: 1992627682}
- component: {fileID: 1992627681}
m_Layer: 5
m_Name: UpgradeBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1992627680
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992627679}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 782802645}
m_Father: {fileID: 1259426725}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -58.2, y: 21.7}
m_SizeDelta: {x: 95.8, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1992627681
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992627679}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1992627682}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1992627682
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992627679}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.30347908, g: 0.6415094, b: 0.2753649, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1992627683
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992627679}
m_CullTransparentMesh: 1
--- !u!1001 &1993033666 --- !u!1001 &1993033666
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f7c303ff2b548ed11b2cf1d10a7b2187
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f0b47dea2cdff1a7f8ceb414b9011549
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
m_Name: Communication Center
m_EditorClassIdentifier:
buildingName: Communication Center

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3f14a9fbb66d4461eabb30a42aa5007a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
m_Name: Greenhouse
m_EditorClassIdentifier:
buildingName: Greenhouse

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 877632c6c68b29db29d24a00ca56d609
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 0f0adcd9d9fe1cd78b1cc91fd454aa46, type: 3}
m_Name: Research Facility
m_EditorClassIdentifier:
buildingName: Research Facility

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a6aea54cb5f332beba1de43509d49476
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4,7 +4,7 @@ using UnityEngine;
public class Building : MonoBehaviour public class Building : MonoBehaviour
{ {
public string buildingName; public BuildingData buildingData;
public Outline outline; public Outline outline;
void Awake(){ void Awake(){
@ -17,21 +17,8 @@ public class Building : MonoBehaviour
if(Selector.selectedBuilding == null){outline.enabled=false; return;} if(Selector.selectedBuilding == null){outline.enabled=false; return;}
outline.enabled = Selector.selectedBuilding == this; outline.enabled = Selector.selectedBuilding == this;
Debug.Log(buildingName); // this function debugs 4 names and not always the one u clicked. // Debug.Log(buildingName);
// SetRightUpgradeButton(); // function to let the button know what menu to open, also runs 4+ times.
} }
/* void SetRightUpgradeButton(){ /* */
switch (buildingName)
{
case "Research Facility":
Debug.Log("research facility menu");
break;
case "Green House":
Debug.Log("green house menu");
break;
}
} */
} }

View File

@ -0,0 +1,7 @@
using UnityEngine;
[CreateAssetMenu(fileName = "Building01", menuName = "GameData/BuildingData", order = 1)]
public class BuildingData : ScriptableObject
{
public string buildingName;
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0f0adcd9d9fe1cd78b1cc91fd454aa46
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,31 @@
using UnityEngine.UI;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SelectedItemMenu : MonoBehaviour
{
public Text nameTxt;
public Button upgradeBtn;
public UpgradeMenuItem[] menus;
void Start()
{
upgradeBtn.onClick.AddListener(OnUpgradeClicked);
}
void OnUpgradeClicked(){
//int relatedMenuIndex = -1;
for(int i = 0; i < menus.Length; i++){
menus[i].menuObject.SetActive(menus[i].relatedBuildings.Contains(Selector.selectedBuilding.buildingData));
}
}
}
[System.Serializable]
public class UpgradeMenuItem{
public GameObject menuObject;
public List<BuildingData> relatedBuildings;
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6abc3c74e694775039c22bf2106e989e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -18,7 +18,7 @@ public class WorldItemSelector : MonoBehaviour
if(Physics.Raycast(ray,out hit, Mathf.Infinity, layerMask)){ if(Physics.Raycast(ray,out hit, Mathf.Infinity, layerMask)){
Building selectedB = hit.collider.GetComponent<Building>(); Building selectedB = hit.collider.GetComponent<Building>();
if(selectedB!=null){ if(selectedB!=null){
Debug.Log("Selected building : " + selectedB.buildingName); Debug.Log("Selected building : " + selectedB.buildingData.buildingName);
Selector.selectBuilding(selectedB); Selector.selectBuilding(selectedB);
}else{ }else{
Debug.Log("No target here, Unselecting"); Debug.Log("No target here, Unselecting");
@ -32,8 +32,20 @@ public class WorldItemSelector : MonoBehaviour
public void RefreshUI(){ public void RefreshUI(){
selectedItemUI.gameObject.SetActive(Selector.selectedBuilding !=null); selectedItemUI.gameObject.SetActive(Selector.selectedBuilding !=null);
if(Selector.selectedBuilding!=null){ if(Selector.selectedBuilding!=null){
selectedItemUI.GetChild(0).GetComponent<Text>().text = Selector.selectedBuilding.buildingName; selectedItemUI.GetChild(0).GetComponent<Text>().text = Selector.selectedBuilding.buildingData.buildingName;
} }
// switch (Selector.selectedBuilding.buildingData.buildingName)
// {
// case "Research Facility":
// Debug.Log("research facility menu");
// break;
// case "Green House":
// Debug.Log("green house menu");
// break;
// }
} }

View File

@ -154,6 +154,7 @@ PlayerSettings:
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.DefaultCompany.UPF Android: com.DefaultCompany.UPF
Standalone: com.DefaultCompany.UPF
buildNumber: buildNumber:
Standalone: 0 Standalone: 0
iPhone: 0 iPhone: 0
@ -421,6 +422,9 @@ PlayerSettings:
- m_BuildTarget: WebGLSupport - m_BuildTarget: WebGLSupport
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: LinuxStandaloneSupport
m_APIs: 1100000015000000
m_Automatic: 0
m_BuildTargetVRSettings: m_BuildTargetVRSettings:
- m_BuildTarget: Standalone - m_BuildTarget: Standalone
m_Enabled: 0 m_Enabled: 0
@ -586,9 +590,7 @@ PlayerSettings:
switchPlayerConnectionEnabled: 1 switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0 switchUseNewStyleFilepaths: 0
switchUseMicroSleepForYield: 1 switchUseMicroSleepForYield: 1
switchEnableRamDiskSupport: 0
switchMicroSleepForYieldTime: 25 switchMicroSleepForYieldTime: 25
switchRamDiskSpaceSize: 12
ps4NPAgeRating: 12 ps4NPAgeRating: 12
ps4NPTitleSecret: ps4NPTitleSecret:
ps4NPTrophyPackPath: ps4NPTrophyPackPath:
@ -730,7 +732,6 @@ PlayerSettings:
metroFTAName: metroFTAName:
metroFTAFileTypes: [] metroFTAFileTypes: []
metroProtocolName: metroProtocolName:
vcxProjDefaultLanguage:
XboxOneProductId: XboxOneProductId:
XboxOneUpdateKey: XboxOneUpdateKey:
XboxOneSandboxId: XboxOneSandboxId:

117
UPF.sln
View File

@ -1,18 +1,123 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.UI", "UnityEngine.UI.csproj", "{b4ac23e1-f788-99ec-b4d4-f4db4249a6d3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Core.Runtime", "Unity.RenderPipelines.Core.Runtime.csproj", "{b0558cdb-64c9-3a15-92e8-c93ae5b494ac}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.TestRunner", "UnityEngine.TestRunner.csproj", "{4b099d95-4be9-a4aa-edb7-33f78a7d2efe}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics", "Unity.Mathematics.csproj", "{0bd64dde-46cc-a28c-b84b-e0522f6fed97}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Universal.Runtime", "Unity.RenderPipelines.Universal.Runtime.csproj", "{e581676b-e515-94dc-c7ee-e5158f5af96b}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro", "Unity.TextMeshPro.csproj", "{968fcd68-5785-2424-a8b1-57d977f064ee}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline", "Unity.Timeline.csproj", "{3c396443-9c6c-69d1-7248-8e6b6a3580d2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Core.ShaderLibrary", "Unity.RenderPipelines.Core.ShaderLibrary.csproj", "{c9a516c3-de53-877b-b458-f8a67e878a04}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipeline.Universal.ShaderLibrary", "Unity.RenderPipeline.Universal.ShaderLibrary.csproj", "{72f9865c-6891-ed55-bfc3-e1d7c8e26394}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Universal.Shaders", "Unity.RenderPipelines.Universal.Shaders.csproj", "{a565100f-fe57-c681-fc17-3c645ba47452}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary", "Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.csproj", "{8e40b3fc-8515-5589-cc5f-4fbc4ecf3ab2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.PlasticSCM.Editor", "Unity.PlasticSCM.Editor.csproj", "{3fc5e71b-00d4-6906-3b4f-dab1d0795696}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ShaderGraph.Editor", "Unity.ShaderGraph.Editor.csproj", "{885e274e-7f50-a377-4930-562fc60828cc}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VisualStudio.Editor", "Unity.VisualStudio.Editor.csproj", "{ed8b43dd-4d8e-01b1-673f-fd1a268b0a02}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{bbd5d945-3371-201c-a412-b472d2b13b80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor", "Unity.TextMeshPro.Editor.csproj", "{52312059-599b-ab0f-8b82-9e6cc546efd5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.CollabProxy.Editor", "Unity.CollabProxy.Editor.csproj", "{40c3d5a7-8695-a89e-b884-01ff4239925b}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.TestRunner", "UnityEditor.TestRunner.csproj", "{26f23d52-7433-1b44-0570-9da4a33f7995}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Rider.Editor", "Unity.Rider.Editor.csproj", "{e2612a72-7ae6-8888-531c-6c25c21ac0a8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Universal.Editor", "Unity.RenderPipelines.Universal.Editor.csproj", "{0944cd92-8f3d-69a1-8713-2c99f884a0a8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Services.Core.Editor", "Unity.Services.Core.Editor.csproj", "{02de4d4e-b0e9-6f14-19ec-bc90a8fc62a5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.RenderPipelines.Core.Editor", "Unity.RenderPipelines.Core.Editor.csproj", "{b4be5cdf-66d4-ea8e-f726-9bf045e13587}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Searcher.Editor", "Unity.Searcher.Editor.csproj", "{c57ac926-239a-b887-19f0-e9834f17b0fe}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{46971bd6-6e06-6e02-f6cc-f2a57fe23d9b}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.UI", "UnityEditor.UI.csproj", "{d6fbbd1f-59ed-334c-8652-133616ce63a4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics.Editor", "Unity.Mathematics.Editor.csproj", "{d322fda3-5976-c697-265b-cc32f8c52c18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ShaderGraph.Utilities", "Unity.ShaderGraph.Utilities.csproj", "{4bb84661-785f-28e0-8162-52d940cc5908}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {b4ac23e1-f788-99ec-b4d4-f4db4249a6d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Debug|Any CPU.Build.0 = Debug|Any CPU {b4ac23e1-f788-99ec-b4d4-f4db4249a6d3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {b0558cdb-64c9-3a15-92e8-c93ae5b494ac}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Release|Any CPU.Build.0 = Release|Any CPU {b0558cdb-64c9-3a15-92e8-c93ae5b494ac}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4b099d95-4be9-a4aa-edb7-33f78a7d2efe}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4b099d95-4be9-a4aa-edb7-33f78a7d2efe}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0bd64dde-46cc-a28c-b84b-e0522f6fed97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0bd64dde-46cc-a28c-b84b-e0522f6fed97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e581676b-e515-94dc-c7ee-e5158f5af96b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e581676b-e515-94dc-c7ee-e5158f5af96b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{968fcd68-5785-2424-a8b1-57d977f064ee}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{968fcd68-5785-2424-a8b1-57d977f064ee}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3c396443-9c6c-69d1-7248-8e6b6a3580d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3c396443-9c6c-69d1-7248-8e6b6a3580d2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c9a516c3-de53-877b-b458-f8a67e878a04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c9a516c3-de53-877b-b458-f8a67e878a04}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72f9865c-6891-ed55-bfc3-e1d7c8e26394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72f9865c-6891-ed55-bfc3-e1d7c8e26394}.Debug|Any CPU.Build.0 = Debug|Any CPU
{a565100f-fe57-c681-fc17-3c645ba47452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{a565100f-fe57-c681-fc17-3c645ba47452}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8e40b3fc-8515-5589-cc5f-4fbc4ecf3ab2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8e40b3fc-8515-5589-cc5f-4fbc4ecf3ab2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3fc5e71b-00d4-6906-3b4f-dab1d0795696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3fc5e71b-00d4-6906-3b4f-dab1d0795696}.Debug|Any CPU.Build.0 = Debug|Any CPU
{885e274e-7f50-a377-4930-562fc60828cc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{885e274e-7f50-a377-4930-562fc60828cc}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ed8b43dd-4d8e-01b1-673f-fd1a268b0a02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ed8b43dd-4d8e-01b1-673f-fd1a268b0a02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{bbd5d945-3371-201c-a412-b472d2b13b80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{bbd5d945-3371-201c-a412-b472d2b13b80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52312059-599b-ab0f-8b82-9e6cc546efd5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52312059-599b-ab0f-8b82-9e6cc546efd5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40c3d5a7-8695-a89e-b884-01ff4239925b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40c3d5a7-8695-a89e-b884-01ff4239925b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26f23d52-7433-1b44-0570-9da4a33f7995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26f23d52-7433-1b44-0570-9da4a33f7995}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e2612a72-7ae6-8888-531c-6c25c21ac0a8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e2612a72-7ae6-8888-531c-6c25c21ac0a8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0944cd92-8f3d-69a1-8713-2c99f884a0a8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0944cd92-8f3d-69a1-8713-2c99f884a0a8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02de4d4e-b0e9-6f14-19ec-bc90a8fc62a5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02de4d4e-b0e9-6f14-19ec-bc90a8fc62a5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{b4be5cdf-66d4-ea8e-f726-9bf045e13587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{b4be5cdf-66d4-ea8e-f726-9bf045e13587}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c57ac926-239a-b887-19f0-e9834f17b0fe}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c57ac926-239a-b887-19f0-e9834f17b0fe}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46971bd6-6e06-6e02-f6cc-f2a57fe23d9b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46971bd6-6e06-6e02-f6cc-f2a57fe23d9b}.Debug|Any CPU.Build.0 = Debug|Any CPU
{d6fbbd1f-59ed-334c-8652-133616ce63a4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{d6fbbd1f-59ed-334c-8652-133616ce63a4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{d322fda3-5976-c697-265b-cc32f8c52c18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{d322fda3-5976-c697-265b-cc32f8c52c18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4bb84661-785f-28e0-8162-52d940cc5908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4bb84661-785f-28e0-8162-52d940cc5908}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE