테이블 빌드 시스템 추가

This commit is contained in:
Nam Tae Gun 2024-07-08 15:02:12 +09:00
parent 38cc902073
commit b4e96433c6
33 changed files with 13742 additions and 331 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
using System;
using SoulGames.EasyGridBuilderPro;
using UnityEngine;
namespace BlueWater
{
public class BuildableEvent : MonoBehaviour
{
private async void Start()
{
while (!EasyGridBuilderPro.Instance)
{
await Awaitable.NextFrameAsync();
}
EasyGridBuilderPro.Instance.OnObjectPlaced += OnParentSet;
}
private void OnDestroy()
{
EasyGridBuilderPro.Instance.OnObjectPlaced -= OnParentSet;
}
public void OnParentSet(object o, EventArgs eventArgs)
{
var obj = (BuildableGridObject)o;
obj.GetComponent<SetParent>()?.OnParentSet();
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 9d0604a87c31ef94aa9da3f8f1539b6b

View File

@ -87,30 +87,20 @@ namespace BlueWater.Players.Tycoons
}
}
public void OnOpenRestaurantUpgrade(InputAction.CallbackContext context)
public void OnBuildingSystem(InputAction.CallbackContext context)
{
if (context.performed)
{
TycoonUiManager.Instance.TycoonUpgradeUi.Open(TycoonUiManager.Instance.PopupUiList);
TycoonUiManager.Instance.MultiGridUIManager.BuildButton();
}
}
// TycoonUi
public void OnCloseRestaurantUpgrade(InputAction.CallbackContext context)
{
if (context.performed)
{
if (!TycoonUiManager.Instance.TycoonUpgradeUi.gameObject.activeSelf) return;
TycoonUiManager.Instance.TycoonUpgradeUi.Close();
}
}
public void OnCancel(InputAction.CallbackContext context)
{
if (context.performed)
{
CombatUiManager.Instance.CloseLastPopup();
TycoonUiManager.Instance.CloseLastPopup();
}
}

View File

@ -540,7 +540,7 @@
"initialStateCheck": false
},
{
"name": "OpenRestaurantUpgrade",
"name": "BuildingSystem",
"type": "Button",
"id": "a0f02877-2c29-4c32-8898-f0074336c625",
"expectedControlType": "",
@ -623,7 +623,7 @@
"interactions": "",
"processors": "",
"groups": "",
"action": "OpenRestaurantUpgrade",
"action": "BuildingSystem",
"isComposite": false,
"isPartOfComposite": false
}
@ -633,15 +633,6 @@
"name": "TycoonUi",
"id": "db82013e-4a4f-4ca3-9bce-d562f1186d92",
"actions": [
{
"name": "CloseRestaurantUpgrade",
"type": "Button",
"id": "013e4058-f4a2-46fc-b3f7-a7f94a4d4644",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Cancel",
"type": "Button",
@ -653,17 +644,6 @@
}
],
"bindings": [
{
"name": "",
"id": "12f16c66-7177-428e-bfdf-5c0dc59f2eef",
"path": "<Keyboard>/b",
"interactions": "",
"processors": "",
"groups": "",
"action": "CloseRestaurantUpgrade",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "a4375f73-1732-4234-9b38-d093eceda9a6",

View File

@ -0,0 +1,17 @@
using BlueWater.Tycoons;
using UnityEngine;
namespace BlueWater
{
public class SetParent : MonoBehaviour
{
[SerializeField]
private BuildableObjectType _buildableObject;
public void OnParentSet()
{
var parent = TycoonManager.Instance.GetParent(_buildableObject);
transform.parent = parent;
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: adadf7878a2b4ff43a293cfa419e879e

View File

@ -1,13 +1,23 @@
using System;
using UnityEngine;
using Sirenix.OdinInspector;
namespace BlueWater.Tycoons
{
public enum BuildableObjectType
{
None = 0,
CustomerTable
}
public class TycoonManager : Singleton<TycoonManager>
{
[field: SerializeField]
public CustomerTableManager CustomerTableManager { get; private set; }
[SerializeField]
private Transform _customerTables;
protected override void OnAwake()
{
InitializeComponents();
@ -18,5 +28,18 @@ namespace BlueWater.Tycoons
{
CustomerTableManager = GetComponent<CustomerTableManager>();
}
public Transform GetParent(BuildableObjectType buildableObjectType)
{
switch (buildableObjectType)
{
case BuildableObjectType.None:
return null;
case BuildableObjectType.CustomerTable:
return _customerTables;
default:
throw new ArgumentOutOfRangeException(nameof(buildableObjectType), buildableObjectType, null);
}
}
}
}

View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using Sirenix.OdinInspector;
using SoulGames.EasyGridBuilderPro;
using UnityEngine;
namespace BlueWater.Uis
@ -15,6 +16,9 @@ namespace BlueWater.Uis
[field: SerializeField]
public TycoonUpgradeUi TycoonUpgradeUi { get; private set; }
[field: SerializeField]
public MultiGridUIManager MultiGridUIManager { get; private set; }
// Variables
public List<PopupUi> PopupUiList { get; private set; }
@ -50,6 +54,7 @@ namespace BlueWater.Uis
{
MainCanvas = GetComponent<Canvas>();
TycoonUpgradeUi = GetComponentInChildren<TycoonUpgradeUi>(true);
MultiGridUIManager = FindAnyObjectByType<MultiGridUIManager>();
PopupUiList = new List<PopupUi>(8);
}

View File

@ -405,7 +405,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1674052485383758547}
m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp
m_MethodName: OnOpenRestaurantUpgrade
m_MethodName: OnBuildingSystem
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -417,22 +417,6 @@ MonoBehaviour:
m_CallState: 2
m_ActionId: a0f02877-2c29-4c32-8898-f0074336c625
m_ActionName: 'Tycoon/RestaurantUpgrade[/Keyboard/b]'
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1674052485383758547}
m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp
m_MethodName: OnCloseRestaurantUpgrade
m_Mode: 0
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
m_ActionId: 013e4058-f4a2-46fc-b3f7-a7f94a4d4644
m_ActionName: 'TycoonUi/CloseRestaurantUpgrade[/Keyboard/b]'
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1674052485383758547}

View File

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

View File

@ -0,0 +1,119 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &9144032627093884999
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6278891390445669163}
- component: {fileID: 1289663608826275115}
- component: {fileID: 5283474879809510274}
- component: {fileID: -1020311819587236498}
m_Layer: 0
m_Name: BaseBuildableObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6278891390445669163
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144032627093884999}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1289663608826275115
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144032627093884999}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 406ed6c1845107a4c8f383446e80927f, type: 3}
m_Name:
m_EditorClassIdentifier:
buildableGridObjectTypeSO: {fileID: 0}
rotateObjectForXY: 0
rotateObjectForXZ: 0
rotateForXY: 0
objectScale: {x: 2, y: 1, z: 2}
objectCenter: {x: 0, y: 0.5, z: 0.5}
objectCustomPivot: {x: 0, y: 0, z: 0}
--- !u!114 &5283474879809510274
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144032627093884999}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e04739d4434aca44b05de850efb8d7e, type: 3}
m_Name:
m_EditorClassIdentifier:
useScalingEffect: 1
showObjectScallingData: 1
useScaleEffectX: 0
useScaleEffectY: 1
useScaleEffectZ: 0
ScaleEffectAnimationCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 2
outSlope: 2
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.75
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
showObjectSpawnData: 0
useSpawnGameObjects: 0
spawnGameObjects: []
spawnRandomOneFromList: 0
spawnStartDelay: 0
spawnLocalPosition: {x: 0, y: 0, z: 0}
spawnLocalRotation: {x: 0, y: 0, z: 0}
spawnLocalScale: {x: 1, y: 1, z: 1}
destroySpawnnedAfterDelay: 0
destroyDelay: 1
--- !u!114 &-1020311819587236498
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9144032627093884999}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adadf7878a2b4ff43a293cfa419e879e, type: 3}
m_Name:
m_EditorClassIdentifier:
_buildableObject: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 61c966062a2dc1a449a3eb3176fe01fd
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,141 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6597147455768578164
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -1020311819587236498, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: _buildableObject
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1289663608826275115, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: objectScale.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1289663608826275115, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: buildableGridObjectTypeSO
value:
objectReference: {fileID: 11400000, guid: db38344e6a3f47245936c7801e21da4a, type: 2}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9144032627093884999, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
propertyPath: m_Name
value: BuildableCustomerTable01
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
insertIndex: -1
addedObject: {fileID: 8471656957250154750}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
--- !u!4 &913910610665702239 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6278891390445669163, guid: 61c966062a2dc1a449a3eb3176fe01fd, type: 3}
m_PrefabInstance: {fileID: 6597147455768578164}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7812007715416691093
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 913910610665702239}
m_Modifications:
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833254060163934334, guid: bc2abb0d190003240b86437081f20536, type: 3}
propertyPath: m_Name
value: CustomerTable01
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bc2abb0d190003240b86437081f20536, type: 3}
--- !u!4 &8471656957250154750 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3}
m_PrefabInstance: {fileID: 7812007715416691093}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 338bb9ee9f2f9b44887786d77efe731d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@ -0,0 +1,37 @@
%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: 65d2d645654a6df41b437ed3f8e35368, type: 3}
m_Name: BuildableCustomerTable01
m_EditorClassIdentifier:
objectName: Building 2x2
buildableCategorySO: {fileID: 11400000, guid: 00d47d8fda444fb4f9e6779dcd31f855, type: 2}
objectDescription: Building 2x2 Object Description
objectToolTipDescription: Building 2x2 Object Tool Tip Description
objectIcon: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3}
objectPrefab:
- {fileID: 913910610665702239, guid: 338bb9ee9f2f9b44887786d77efe731d, type: 3}
ghostPrefab: {fileID: 913910610665702239, guid: 338bb9ee9f2f9b44887786d77efe731d, type: 3}
placeableGhostMaterial: {fileID: 2100000, guid: 281380b3d50e1eb46b869b8c8aa1307c, type: 2}
notPlaceableGhostMaterial: {fileID: 2100000, guid: 1fb75a46b45af6e49a32883c3bcb026a, type: 2}
setBuiltObjectLayer: 0
builtObjectLayer:
serializedVersion: 2
m_Bits: 1
showGridBelowObject: 1
objectGridCanvas: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b, type: 3}
gridImageSprite: {fileID: 21300000, guid: 89f923662002a7240b3f8939cdc9bc13, type: 3}
gridImagePlaceableColor: {r: 0, g: 0.9254902, b: 1, a: 0.78431374}
gridImageNotPlaceableColor: {r: 1, g: 0.29803923, b: 0.29803923, a: 0.78431374}
holdToPlace: 0
placeAndDeselect: 1
enableBuildCondition: 0
buildConditionSO: {fileID: 0}

View File

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

View File

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

View File

@ -0,0 +1 @@
{"placedObjectSaveObjectArrayArray":[{"placedObjectSaveObjectArray":[{"buildableGridObjectTypeSOName":"BuildableCustomerTable01","origin":{"x":20,"y":16},"dir":0},{"buildableGridObjectTypeSOName":"BuildableCustomerTable01","origin":{"x":20,"y":19},"dir":0}]}],"placedEdgeObjectSaveObjectArrayArray":[{"placedEdgeObjectSaveObjectArray":[]}],"looseSaveObjectArray":[]}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 11c5a67c7a383384e87794643f45ba55
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -8,18 +8,27 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlackMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -56,12 +65,40 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
@ -69,12 +106,34 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.18867922, g: 0.18867922, b: 0.18867922, a: 1}
- _BaseColor: {r: 0.18867919, g: 0.18867919, b: 0.18867919, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &390756411374529827
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-406824472007168311
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -8,18 +21,27 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BuildablesMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: cbaf011e9d9eade4593fc61f53eabbcb, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -56,12 +78,40 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.1
- _GlossyReflections: 1
@ -69,12 +119,21 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -8,16 +8,22 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FireMat
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords:
- _FLIPBOOKBLENDING_OFF
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- GRABPASS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -25,6 +31,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -64,6 +74,9 @@ Material:
m_Ints: []
m_Floats:
- PixelSnap: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
@ -78,9 +91,11 @@ Material:
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EmissionEnabled: 0
- _EmissionScaleUI: 0
- _EnableExternalAlpha: 0
- _FlipbookBlending: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
@ -90,6 +105,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _Shininess: 0.7
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
@ -97,9 +113,13 @@ Material:
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
@ -111,3 +131,17 @@ Material:
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &3887666495827282806
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-903794858349289703
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -8,18 +21,27 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NodesMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 5377886a840e7b740bd96c74a97bf2cd, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -41,7 +63,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 5377886a840e7b740bd96c74a97bf2cd, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@ -56,12 +78,40 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.1
- _GlossyReflections: 1
@ -69,12 +119,21 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0.35099816, g: 0.8784314, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -8,18 +8,27 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PropsMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 519ab324d99c9a249a9c56711b919795, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -41,7 +50,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 519ab324d99c9a249a9c56711b919795, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@ -56,12 +65,40 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.1
- _GlossyReflections: 1
@ -69,12 +106,34 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &3935063748328056235
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 5948627682425428685}
- component: {fileID: 5948627682425428687}
- component: {fileID: 5948627682425428684}
m_Layer: 5
m_Layer: 31
m_Name: Grid Texture
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -31,7 +31,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7023326040891081470}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -87,7 +86,7 @@ GameObject:
- component: {fileID: 7023326040891081470}
- component: {fileID: 7023326040891081457}
- component: {fileID: 7023326040891081456}
m_Layer: 5
m_Layer: 31
m_Name: Grid Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -108,7 +107,6 @@ RectTransform:
m_Children:
- {fileID: 5948627682425428685}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -132,9 +130,11 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 1
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!114 &7023326040891081456
MonoBehaviour:
@ -152,4 +152,4 @@ MonoBehaviour:
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 2147483647
m_Bits: 131071

File diff suppressed because it is too large Load Diff

View File

@ -4055,7 +4055,7 @@ namespace SoulGames.EasyGridBuilderPro
private void RemoveGridObjects()
{
BuildableGridObject[] buildableGridObjects = FindObjectsOfType<BuildableGridObject>();
BuildableGridObject[] buildableGridObjects = FindObjectsByType<BuildableGridObject>(FindObjectsSortMode.None);
if (gridAxis == GridAxis.XZ)
{
foreach (var buildableGridObject in buildableGridObjects)

View File

@ -21,7 +21,7 @@ namespace SoulGames.EasyGridBuilderPro
{
Instance = this;
foreach (EasyGridBuilderPro grid in FindObjectsOfType<EasyGridBuilderPro>())
foreach (EasyGridBuilderPro grid in FindObjectsByType<EasyGridBuilderPro>(FindObjectsSortMode.None))
{
easyGridBuilderProList.Add(grid);
}

View File

@ -84,7 +84,7 @@ namespace SoulGames.EasyGridBuilderPro
{
easyGridBuilderProList = MultiGridManager.Instance.easyGridBuilderProList;
currentActiveSystem = MultiGridManager.Instance.activeGridSystem;
if (FindObjectOfType<GridObjectSelector>()) gridObjectSelector = FindObjectOfType<GridObjectSelector>();
if (FindAnyObjectByType<GridObjectSelector>()) gridObjectSelector = FindAnyObjectByType<GridObjectSelector>();
foreach (EasyGridBuilderPro easyGridBuilderPro in easyGridBuilderProList)
{

View File

@ -126,7 +126,8 @@ namespace PixelCrushers.DialogueSystem
if (canvas != null)
{
if (waitForContinueButton && (canvas.worldCamera == null)) canvas.worldCamera = UnityEngine.Camera.main;
canvas.enabled = false;
// TODO : 현재 프로젝트에서 꺼지면 안됨
//canvas.enabled = false;
originalCanvasLocalPosition = canvas.GetComponent<RectTransform>().localPosition;
}
if (nameText != null) nameText.SetActive(includeName);

View File

@ -7,6 +7,7 @@ TagManager:
- Missile
- Wall
- DamageableProps
- Grid
layers:
- Default
- TransparentFX
@ -39,7 +40,7 @@ TagManager:
-
-
-
-
- Grid Surface
m_SortingLayers:
- name: Default
uniqueID: 0