Closes #72 #73 Make island, Restaurant on the island

This commit is contained in:
IDMhan 2023-12-13 10:22:22 +09:00
parent 9ea7fcd4a8
commit 3a4b65e947
10 changed files with 19510 additions and 67 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: ff226c7f810a49b8932ee4f233cd32e9
timeCreated: 1702395024

View File

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class TycoonPlayer : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

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

View File

@ -30,7 +30,7 @@ Material:
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
@ -124,7 +124,7 @@ Material:
- _CelPrimaryMode: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailMapBlendingMode: 0

View File

@ -8,6 +8,21 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalScale.x
@ -31,17 +46,17 @@ PrefabInstance:
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.92387956
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.38268343
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -45
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5504018826774220437, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}

View File

@ -8,6 +8,21 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1226522768702761892, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalScale.x
@ -31,17 +46,17 @@ PrefabInstance:
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.92387956
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.38268343
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -45
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a,
type: 3}

View File

@ -6,7 +6,7 @@ using UnityEngine.UI;
namespace SoulGames.EasyGridBuilderPro
{
public class BuildableGridObject : MonoBehaviour
public class BuildableGridObject : MonoBehaviour
{
private Vector2Int calculatedWidthAndlength;
private bool showGridBelowObject;
@ -50,8 +50,6 @@ namespace SoulGames.EasyGridBuilderPro
private bool hasCollider = false;
private static Transform inShipProp;
private void Start()
{
if (MultiGridManager.Instance.activeGridSystem == null) return;
@ -80,8 +78,6 @@ namespace SoulGames.EasyGridBuilderPro
}
HandleVisualCanvasGrid(activeGridSystem);
}
inShipProp = GameObject.Find("InShipMap/Props").transform;
}
private void OnDestroy()
@ -142,7 +138,7 @@ namespace SoulGames.EasyGridBuilderPro
{
EasyGridBuilderPro activeGridSystem = system;
Transform placedObjectTransform = Instantiate(buildableGridObjectTypeSO.objectPrefab[Random.Range(0, buildableGridObjectTypeSO.objectPrefab.Length)], Vector3.zero, Quaternion.identity);
placedObjectTransform.name = placedObjectTransform.name.Replace("(Clone)","").Trim();
placedObjectTransform.rotation = Quaternion.Euler(0, buildableGridObjectTypeSO.GetRotationAngle(dir), 0);
placedObjectTransform.localPosition = worldPosition;
@ -261,19 +257,6 @@ namespace SoulGames.EasyGridBuilderPro
buildableGridObject.HandleVisualCanvasGrid(system);
buildableGridObject.Setup();
placedObjectTransform.SetParent(inShipProp);
switch (placedObjectTransform.name)
{
case "Toilet":
placedObjectTransform.gameObject.AddComponent<Toilet>();
break;
case "Jail":
placedObjectTransform.gameObject.AddComponent<Jail>();
break;
}
return buildableGridObject;
}

View File

@ -0,0 +1,133 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8336376365651362303
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: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CPT_Terrain_Texture_Atlas_01
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: f7973976799eb6843bcb25e25e25522e, 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}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: f7973976799eb6843bcb25e25e25522e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
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:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 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: []

View File

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