Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG

This commit is contained in:
NTG 2024-01-29 00:47:30 +09:00
commit f8308d556b
108 changed files with 285433 additions and 1002 deletions

View File

@ -218,6 +218,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2146667423721892707, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: conversation
value: Guest_Satisfaction_01
objectReference: {fileID: 0}
- target: {fileID: 2211384960430715710, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Sprite
@ -966,6 +971,91 @@ MonoBehaviour:
- {fileID: 1609971082}
- {fileID: 1385281201}
- {fileID: 503580258}
--- !u!1 &56597200
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 56597201}
- component: {fileID: 56597203}
- component: {fileID: 56597202}
m_Layer: 0
m_Name: boat_01_wheel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &56597201
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 56597200}
serializedVersion: 2
m_LocalRotation: {x: 0.1484949, y: -0, z: -0, w: 0.9889132}
m_LocalPosition: {x: 0, y: 6.685426, z: -2.8368456}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 209906753}
m_LocalEulerAnglesHint: {x: 17.079, y: 0, z: 0}
--- !u!23 &56597202
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 56597200}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &56597203
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 56597200}
m_Mesh: {fileID: 6847518756029031712, guid: e174a08d577359c44bd7930fac541c9f, type: 3}
--- !u!1 &60567433
GameObject:
m_ObjectHideFlags: 0
@ -1454,7 +1544,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 107368052}
serializedVersion: 2
m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -0, w: 0.92387956}
m_LocalRotation: {x: 0.3826835, y: -0.00000002248122, z: 0.000000009312028, w: 0.92387956}
m_LocalPosition: {x: 5.22, y: 11.1380005, z: -4.18}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3211,6 +3301,153 @@ Transform:
m_Children: []
m_Father: {fileID: 1784935559}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: -180}
--- !u!1 &209906747
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 209906753}
- component: {fileID: 209906752}
- component: {fileID: 209906751}
- component: {fileID: 209906755}
- component: {fileID: 209906754}
m_Layer: 9
m_Name: MyShip
m_TagString: ShipPlayer
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &209906751
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209906747}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &209906752
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209906747}
m_Mesh: {fileID: 7248041548669669315, guid: e174a08d577359c44bd7930fac541c9f, type: 3}
--- !u!4 &209906753
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209906747}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.7005195, z: -0, w: 0.7136333}
m_LocalPosition: {x: -12.19, y: -2.88, z: -10.76}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2020594132}
- {fileID: 56597201}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 88.937, z: 0}
--- !u!114 &209906754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209906747}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uCD9C\uD56D"
overrideUseMessage:
maxUseDistance: 5
events:
onSelect:
m_PersistentCalls:
m_Calls: []
onDeselect:
m_PersistentCalls:
m_Calls: []
onUse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2044885316}
m_TargetAssemblyTypeName: BlueWaterProject.TycoonPlayer, Assembly-CSharp
m_MethodName: SettingSail
m_Mode: 1
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!65 &209906755
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 209906747}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 12.34, y: 15.842085, z: 8.17}
m_Center: {x: -0.00000011761802, y: 7.9210424, z: 1.82792}
--- !u!1 &212641461
GameObject:
m_ObjectHideFlags: 0
@ -6351,6 +6588,8 @@ GameObject:
- component: {fileID: 501722144}
- component: {fileID: 501722147}
- component: {fileID: 501722148}
- component: {fileID: 501722150}
- component: {fileID: 501722149}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -6425,7 +6664,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501722143}
serializedVersion: 2
m_LocalRotation: {x: 0.38268343, y: 1e-45, z: 0, w: 0.92387956}
m_LocalRotation: {x: 0.3826835, y: -0.00000002248122, z: 0.000000009312028, w: 0.92387956}
m_LocalPosition: {x: 5.22, y: 11.1380005, z: -4.18}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -6510,6 +6749,32 @@ MonoBehaviour:
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!114 &501722149
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501722143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34b570195d17c4342bbe738383afd6ae, type: 3}
m_Name:
m_EditorClassIdentifier:
baseCam: {fileID: 107368053}
--- !u!114 &501722150
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501722143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eba32823f7fae4b7886c2fe6ee08123f, type: 3}
m_Name:
m_EditorClassIdentifier:
_persistent: 0
--- !u!1 &503580258 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1678477063493488, guid: 7e5f12ae14890794591cb6e704b39abe,
@ -11943,7 +12208,7 @@ PrefabInstance:
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -13462,7 +13727,7 @@ PrefabInstance:
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -13776,7 +14041,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.43452924, z: -0, w: 0.9006578}
m_LocalPosition: {x: -9.09, y: 0, z: -2.4}
m_LocalScale: {x: 1.3536491, y: 0.2487, z: 0.37304997}
m_LocalScale: {x: 1.3536491, y: 0.2487, z: 0.5530466}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 826719601}
@ -15853,7 +16118,7 @@ PrefabInstance:
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -17283,6 +17548,91 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1498426306}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1502066001
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1502066002}
- component: {fileID: 1502066004}
- component: {fileID: 1502066003}
m_Layer: 0
m_Name: boat_01_flag
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1502066002
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502066001}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 12.92, z: -0.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2020594132}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &1502066003
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502066001}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1502066004
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502066001}
m_Mesh: {fileID: -3028017588688184324, guid: e174a08d577359c44bd7930fac541c9f, type: 3}
--- !u!1 &1523159101
GameObject:
m_ObjectHideFlags: 0
@ -22762,6 +23112,92 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7e5f12ae14890794591cb6e704b39abe, type: 3}
--- !u!1 &2020594131
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2020594132}
- component: {fileID: 2020594134}
- component: {fileID: 2020594133}
m_Layer: 0
m_Name: boat_01_mast
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2020594132
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2020594131}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 3.42, z: -0.43}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1502066002}
m_Father: {fileID: 209906753}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2020594133
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2020594131}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2020594134
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2020594131}
m_Mesh: {fileID: -1090355519079891785, guid: e174a08d577359c44bd7930fac541c9f, type: 3}
--- !u!1 &2034486715 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1678477063493488, guid: 7e5f12ae14890794591cb6e704b39abe,
@ -23344,10 +23780,7 @@ MonoBehaviour:
sideSprite: {fileID: 21300000, guid: fa13bcdf7a9c148b3859834bc6efaeb9, type: 3}
backSprite: {fileID: 21300000, guid: dba6626ec18b7497a8cdfe6501394253, type: 3}
frontSprite: {fileID: 21300000, guid: c21e822c2c1ca418fa2695be70e90ddb, type: 3}
foodTransform: {fileID: 0}
foodOnHand: 0
foodVisual: {fileID: 0}
kitchenController: {fileID: 0}
myShip: {fileID: 209906753}
--- !u!1 &2057823168
GameObject:
m_ObjectHideFlags: 0
@ -37168,6 +37601,7 @@ SceneRoots:
- {fileID: 1426193642}
- {fileID: 1671439082}
- {fileID: 2044885315}
- {fileID: 209906753}
- {fileID: 977669111}
- {fileID: 1292990768242663165}
- {fileID: 4702635561852861618}

File diff suppressed because it is too large Load Diff

View File

@ -9,6 +9,7 @@ namespace BlueWaterProject
public Camera MainCam { get; set; }
public OceanCamera OceanCamera { get; set; }
public TycoonCamera TycoonCamera { get; set; }
public CombatCamera CombatCamera { get; set; }

View File

@ -47,6 +47,15 @@ namespace BlueWaterProject
npc.BarkFillImg.fillAmount = 0;
}
}
else if (drinkEt >= maxWaitTime)
{
npcStateMachine.InstantiateUi(DataManager.Inst.emojiAnger, npc.EmojiTransform);
npc.Satisfaction -= 10;
npc.BarkFillImg.fillAmount = 0;
npc.IsGetDrink = true;
}
}
else if (npc.IsGetDrink)
{

View File

@ -28,21 +28,21 @@ namespace BlueWaterProject
public void AddIngredient()
{
var player = GameManager.Inst.TycoonPlayer;
if (player.foodTransform.gameObject.activeSelf)
if (player.FoodTransform.gameObject.activeSelf)
{
var ingredient = player.foodOnHand;
var ingredient = player.FoodOnHand;
if (!ingredientsInPot.ContainsKey(ingredient))
ingredientsInPot[ingredient] = 0;
ingredientsInPot[ingredient]++;
player.foodTransform.gameObject.SetActive(false);
player.foodOnHand = GlobalValue.FoodOnHand.NONE;
player.FoodTransform.gameObject.SetActive(false);
player.FoodOnHand = GlobalValue.FoodOnHand.NONE;
}
else if (isFoodInSot)
{
player.foodVisual.sprite = DataManager.Inst.kingCrabMeat;
player.foodTransform.gameObject.SetActive(true);
player.foodOnHand = GlobalValue.FoodOnHand.KING_CRAB;
player.FoodVisual.sprite = DataManager.Inst.kingCrabMeat;
player.FoodTransform.gameObject.SetActive(true);
player.FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB;
cookingProcess.fillAmount = 0;
isFoodInSot = false;
}
@ -124,37 +124,37 @@ namespace BlueWaterProject
public void ScallionBox()
{
var player = GameManager.Inst.TycoonPlayer;
if (player.foodTransform.gameObject.activeSelf) return;
player.foodVisual.sprite = DataManager.Inst.scallion;
player.foodTransform.gameObject.SetActive(true);
player.foodOnHand = GlobalValue.FoodOnHand.SCALLION;
if (player.FoodTransform.gameObject.activeSelf) return;
player.FoodVisual.sprite = DataManager.Inst.scallion;
player.FoodTransform.gameObject.SetActive(true);
player.FoodOnHand = GlobalValue.FoodOnHand.SCALLION;
}
public void OnionBox()
{
var player = GameManager.Inst.TycoonPlayer;
if (player.foodTransform.gameObject.activeSelf) return;
player.foodVisual.sprite = DataManager.Inst.onion;
player.foodTransform.gameObject.SetActive(true);
player.foodOnHand = GlobalValue.FoodOnHand.ONION;
if (player.FoodTransform.gameObject.activeSelf) return;
player.FoodVisual.sprite = DataManager.Inst.onion;
player.FoodTransform.gameObject.SetActive(true);
player.FoodOnHand = GlobalValue.FoodOnHand.ONION;
}
public void TomatoBox()
{
var player = GameManager.Inst.TycoonPlayer;
if (player.foodTransform.gameObject.activeSelf) return;
player.foodVisual.sprite = DataManager.Inst.tomato;
player.foodTransform.gameObject.SetActive(true);
player.foodOnHand = GlobalValue.FoodOnHand.TOMATO;
if (player.FoodTransform.gameObject.activeSelf) return;
player.FoodVisual.sprite = DataManager.Inst.tomato;
player.FoodTransform.gameObject.SetActive(true);
player.FoodOnHand = GlobalValue.FoodOnHand.TOMATO;
}
public void KingCrab()
{
var player = GameManager.Inst.TycoonPlayer;
if (player.foodTransform.gameObject.activeSelf) return;
player.foodVisual.sprite = DataManager.Inst.kingCrabMeat;
player.foodTransform.gameObject.SetActive(true);
player.foodOnHand = GlobalValue.FoodOnHand.KING_CRAB;
if (player.FoodTransform.gameObject.activeSelf) return;
player.FoodVisual.sprite = DataManager.Inst.kingCrabMeat;
player.FoodTransform.gameObject.SetActive(true);
player.FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB;
}
}
}

View File

@ -0,0 +1,29 @@
using System;
using System.Collections;
using System.Collections.Generic;
using BlueWaterProject;
using Cinemachine;
using UnityEngine;
public class TycoonCamera : MonoBehaviour
{
public CinemachineVirtualCamera baseCam;
private CinemachineTransposer baseCamTransposer;
private void Awake()
{
CameraManager.Inst.TycoonCamera = this;
baseCamTransposer = baseCam.GetComponent<CinemachineTransposer>();
}
public void SetFollow(Transform target)
{
baseCam.Follow = target;
baseCam.LookAt = target;
}
public void SetVerticalFOV(int value)
{
baseCam.m_Lens.FieldOfView = value;
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 34b570195d17c4342bbe738383afd6ae

View File

@ -1,4 +1,5 @@
using System;
using PixelCrushers.DialogueSystem;
using Sirenix.OdinInspector;
using TMPro;
using UnityEngine;
@ -61,6 +62,8 @@ namespace BlueWaterProject
private void Update()
{
DialogueLua.SetVariable("Satisfaction", Satisfaction);
if (Satisfaction <= -1)
{
var walkOutState = new WalkOutSate(this);

View File

@ -5,6 +5,7 @@ using PixelCrushers.DialogueSystem;
using SoulGames.EasyGridBuilderPro;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
using DialogueSystemTrigger = PixelCrushers.DialogueSystem.Wrappers.DialogueSystemTrigger;
// ReSharper disable once CheckNamespace
@ -27,10 +28,10 @@ namespace BlueWaterProject
public Sprite sideSprite;
public Sprite backSprite;
public Sprite frontSprite;
public Transform foodTransform;
public GlobalValue.FoodOnHand foodOnHand;
public SpriteRenderer foodVisual;
public KitchenController kitchenController;
public Transform FoodTransform { get; set; }
[SerializeField] public GlobalValue.FoodOnHand FoodOnHand { get; set; }
[SerializeField] public SpriteRenderer FoodVisual { get; set; }
public Transform myShip;
private void Init()
{
@ -40,9 +41,9 @@ namespace BlueWaterProject
rb = GetComponent<Rigidbody>();
spriteRenderer = visualLook.GetComponent<SpriteRenderer>();
playerInput = GetComponent<PlayerInput>();
foodTransform = transform.Find("Food");
foodOnHand = GlobalValue.FoodOnHand.NONE;
foodVisual = foodTransform.transform.Find("Visual").GetComponent<SpriteRenderer>();
FoodTransform = transform.Find("Food");
FoodOnHand = GlobalValue.FoodOnHand.NONE;
FoodVisual = FoodTransform.transform.Find("Visual").GetComponent<SpriteRenderer>();
proximitySelector = GetComponent<ProximitySelector>();
IsRuning = false;
}
@ -126,7 +127,7 @@ namespace BlueWaterProject
{
localScale.x = Mathf.Abs(localScale.x);
//spriteRenderer.sprite = sideSprite;
foodTransform.localPosition = new Vector3(-0.30f, 0.6f, -0.15f);
FoodTransform.localPosition = new Vector3(-0.30f, 0.6f, -0.15f);
animator.SetBool("IsMoving", true);
}
// 오른쪽
@ -134,21 +135,21 @@ namespace BlueWaterProject
{
localScale.x = -Mathf.Abs(localScale.x);
//spriteRenderer.sprite = sideSprite;
foodTransform.localPosition = new Vector3(0.30f, 0.6f, -0.15f);
FoodTransform.localPosition = new Vector3(0.30f, 0.6f, -0.15f);
animator.SetBool("IsMoving", true);
}
// 뒤로
else if (movement.z > 0)
{
//spriteRenderer.sprite = backSprite;
foodTransform.localPosition = new Vector3(0f, 0.6f, 0f);
FoodTransform.localPosition = new Vector3(0f, 0.6f, 0f);
animator.SetBool("IsMoving", true);
}
// 앞으로
else if (movement.z < 0)
{
//spriteRenderer.sprite = frontSprite;
foodTransform.localPosition = new Vector3(0f, 0.6f, -0.25f);
FoodTransform.localPosition = new Vector3(0f, 0.6f, -0.25f);
animator.SetBool("IsMoving", true);
}
else
@ -182,29 +183,29 @@ namespace BlueWaterProject
public void TakeKingCrab()
{
if (foodTransform.gameObject.activeSelf) return;
foodVisual.sprite = DataManager.Inst.kingCrabMeat;
foodTransform.gameObject.SetActive(true);
foodOnHand = GlobalValue.FoodOnHand.KING_CRAB;
if (FoodTransform.gameObject.activeSelf) return;
FoodVisual.sprite = DataManager.Inst.kingCrabMeat;
FoodTransform.gameObject.SetActive(true);
FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB;
}
public void TakeBeer()
{
if (foodTransform.gameObject.activeSelf) return;
foodVisual.sprite = DataManager.Inst.beer;
foodTransform.gameObject.SetActive(true);
foodOnHand = GlobalValue.FoodOnHand.BEER;
if (FoodTransform.gameObject.activeSelf) return;
FoodVisual.sprite = DataManager.Inst.beer;
FoodTransform.gameObject.SetActive(true);
FoodOnHand = GlobalValue.FoodOnHand.BEER;
}
public void TakeFoodFromPlayer()
{
if (!foodTransform.gameObject.activeSelf) return;
if (!FoodTransform.gameObject.activeSelf) return;
if (proximitySelector == null || proximitySelector.CurrentUsable == null) return;
var tycoonNpc = proximitySelector.CurrentUsable.gameObject.GetComponent<TycoonNpc>();
if (tycoonNpc != null && tycoonNpc.DoSeat)
{
switch (foodOnHand)
switch (FoodOnHand)
{
case GlobalValue.FoodOnHand.NONE:
break;
@ -227,11 +228,37 @@ namespace BlueWaterProject
default:
throw new ArgumentOutOfRangeException();
}
foodTransform.gameObject.SetActive(false);
foodOnHand = GlobalValue.FoodOnHand.NONE;
FoodTransform.gameObject.SetActive(false);
FoodOnHand = GlobalValue.FoodOnHand.NONE;
}
}
public void SettingSail()
{
visualLook.gameObject.SetActive(false);
CameraManager.Inst.TycoonCamera.SetVerticalFOV(80);
proximitySelector.enabled = false;
StartCoroutine(ShipMovementAndSceneChange());
}
IEnumerator ShipMovementAndSceneChange()
{
float elapsedTime = 0;
var startingPosition = myShip.position;
var endPosition = startingPosition + transform.right * 10;
var playerPosition = transform.position;
var playerEndPosition = playerPosition + transform.right * 10;
while (elapsedTime < 3.0f)
{
myShip.position = Vector3.Lerp(startingPosition, endPosition, elapsedTime / 3.0f);
transform.position = Vector3.Lerp(playerPosition, playerEndPosition, elapsedTime / 3.0f);
elapsedTime += Time.deltaTime;
yield return null;
}
SceneManager.LoadScene("02.Ocean");
}
public void StartInteraction(Transform target)
{

View File

@ -175,6 +175,20 @@ MonoBehaviour:
value:
type: 0
typeString:
- id: 2
fields:
- title: Name
value: Satisfaction
type: 0
typeString:
- title: Initial Value
value: 25
type: 1
typeString: CustomFieldType_Number
- title: Description
value:
type: 0
typeString:
conversations:
- id: 1
fields:
@ -1283,6 +1297,214 @@ MonoBehaviour:
entryGroups: []
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
- id: 5
fields:
- title: Title
value: Guest_Satisfaction_01
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
type: 5
typeString: CustomFieldType_Actor
overrideSettings:
useOverrides: 0
overrideSubtitleSettings: 0
showNPCSubtitlesDuringLine: 1
showNPCSubtitlesWithResponses: 1
showPCSubtitlesDuringLine: 0
skipPCSubtitleAfterResponseMenu: 0
subtitleCharsPerSecond: 30
minSubtitleSeconds: 2
continueButton: 0
overrideSequenceSettings: 0
defaultSequence:
defaultPlayerSequence:
defaultResponseMenuSequence:
overrideInputSettings: 0
alwaysForceResponseMenu: 1
includeInvalidEntries: 0
responseTimeout: 0
emTagForOldResponses: 0
emTagForInvalidResponses: 0
cancelSubtitle:
key: 27
buttonName:
cancelConversation:
key: 27
buttonName:
nodeColor:
dialogueEntries:
- id: 0
fields:
- title: Title
value: START
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value:
type: 0
typeString:
- title: Sequence
value: None()
type: 0
typeString:
conversationID: 5
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 5
originDialogueID: 0
destinationConversationID: 5
destinationDialogueID: 1
isConnector: 0
priority: 2
- originConversationID: 5
originDialogueID: 0
destinationConversationID: 5
destinationDialogueID: 2
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 165
y: 50
width: 160
height: 30
- id: 1
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uAD1C\uCC2E\uC740 \uC2DD\uB2F9\uC774\uB124"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 5
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString: Variable["Satisfaction"] >= 25
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 35
y: 248
width: 160
height: 30
- id: 2
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC774 \uC2DD\uB2F9... \uB2E4\uC2DC\uB294 \uC624\uC9C0 \uB9D0\uC790..."
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 5
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString: Variable["Satisfaction"] < 25
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 302
y: 248
width: 160
height: 30
entryGroups: []
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
syncInfo:
syncActors: 0
syncItems: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f5789d13135b86645a366dac6583d1cd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 004bb78c41a95b84093e416b01e1fbe8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: aba6fa52907672a4da99307e9c925639
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3643c0d76ec153646b1203880bfb64ed
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 078b8f13a17171b49892ad10426d5af0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f9406a33814af9c47b352e77f079d798
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9aacf6f3043624194bb6f6fe9a580786
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b1d738c46034bc244bd356692577373c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2d6d5d59d45ce8a4784ba6c47984a23e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fb01be13d6e88ca488dda82150319bfc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4d9b575363cdb56408d92f7d7f0e5216
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 171c5051d845c4545a6679cdcb9e8290
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e381f1e638a8aec4dbd9a7be673b56e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 01db744855bbae74481522d48fd63008
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e5f625ae60b99fe4ab78d44cfb58ce5a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b606e558541a7b14593ea370c1a31da1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c13a7e89fcc1f5544b4debda9d682854
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9d6eeb26838ae2140a98c7b012c07610
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 46615cbdbe482664aaf8d3fe2af274c8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 92b78aa6c7b02924c907a69383e7722f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 169dbd692ce7b8a4083e3e77421ce8d0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ab41e3ef05cb5ef44a38c3a33b6715eb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9a785472f49cbc0419f4e80050360f8a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: acc7135a62c70bb40bfd196dcc0dbf58
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 43b92591c923d1543bc95a9b89918a6c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4c1d290c89eb9a146a0c3fc3c5d97639
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 79d6a8f7106f5a949afdf0f9fce6e5c9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5db5e6540b70aa44a8b8f0be7cbc03a4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b81586c5bf3938042babe319ccb6b693
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 29400b82342c15b44bebd36e5f253c7a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e3dca3dc2724503479b532ec6f801f2f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5a3da110bff34d54eb93d1c3c7755741
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 590bfaf71ac68024e96342bd38a2e799
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 89c6283ed4a7a914db4ed32d9fe4be1b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2133c1709cbeab043b2c0d4a09f8c560
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 107656dc7c8decd4b98ddacdb4c63d9c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 69578b34b0b99fd408db1f26e709204b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 890975c726da4f447a9fdbb24e0ac5a6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1977e46ddf171054ba06e70c3a17b562
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d04dae1efd4c20f42801fa99bfb48c71
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f48e38a1694a4a94ba7bfa99b5bb8da7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a760ee77bdfe6fc4fbfeb4e74d81e9ee
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7ac1fca502db8634ca8a220957ce0efe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 03276c81a3b7e1f4f8b9a2c42d29ccb5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4c2fe1e05f53ce540a7e6629e37e62ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 41dc081f41d06ad4cb3a976e3bc784ff
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7224afe475473f5479a4be84354c0ffe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6566ea9453ea9a54c8adda4ce157bfe5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8a6eaa4e4e356664da332e906c4116ca
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d78d339535406c443be8ab962fe3faed
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6556a12f622b9f84a87c93e43a05c57a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7adde0d8ab9d11c4f8958df473963096
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2e0d514b37da90b43aca77d71d4ea274
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f73b81d6a28009a4d8a6cfa24e4f6670
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 14eb0de10b56d7d48aa47c34c085763a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bab8f8e2fd66cc94eb0381c12da4f8a1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 853d51cc63a44614b8aa108c20970d53
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0acaab50ea80e2740907f9fb8e96d5cb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 00d3be9741969ee4abb41a0d36893d12
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a84c2fae02ab66e4bb10f4b632b4e59f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ff46b33770bc0e04da5553db516b2791
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d4762985b08cf424d8a389bd106e9c41
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 82f4200e470c7a2459f54ef829fd130b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8f7926653749bc042b66acaf162cb653
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d8244e47333fea34cabbe75f30b489cd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a60eb26401f5d2e40a3f8ad3a0cdd2ae
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d20f46daec1cff04b8767c37cbc64dfd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1e0bc8e64ca5a204ab01fcb065ad3ea4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0439b345dc19afc4e9e38a45964c21d2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2f034bb78093baf41a5b14693eefb6ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 37a76039173f99b4fac971349e64b845
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 12f5d0647e98dad4cba5773dbfe617ee
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cfa06a72ad668b64e84eb67a6653c27a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f372c15f48325e4da788631806fbd37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d48ea718ba1476a4baa5cd9e66f6ed78
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 21b40e7d71233864788700238fab175d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 44688b79fc3aa6a44b5c47a92a453722
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c6b5601000159b44594b95b58dc95e5e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1f67bb1f7a0ccac4bacceb5680482ca2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d418d21b145ca9e4289690cca70d800d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ba01c8813d9d8e645a60034600445394
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 373fa280b9df46f45901d7ac3fea3beb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d0b0bdbd9366c9e4fba085f618ca54ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c59e446cf466a424daed6859d731bc80
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 494657561b44a1c489255e7049d56ad7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0bfa1827c30ff98418b3b36047505a15
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More