From 8cbcc67e7f7cfa767062d91d55a5415e6982f93b Mon Sep 17 00:00:00 2001 From: IDMhan Date: Sun, 7 Jan 2024 21:02:39 +0900 Subject: [PATCH] #106 Testing --- BlueWater/Assets/01.Scenes/02.Tycoon.unity | 32 ++------- .../Assets/05.Prefabs/Ai/Npc/TycconNpc.prefab | 68 +++++++++++++++++-- .../Models/Materials/Texture_01_A.mat | 23 +++++-- 3 files changed, 86 insertions(+), 37 deletions(-) diff --git a/BlueWater/Assets/01.Scenes/02.Tycoon.unity b/BlueWater/Assets/01.Scenes/02.Tycoon.unity index 9b7e680c5..02abbf1b5 100644 --- a/BlueWater/Assets/01.Scenes/02.Tycoon.unity +++ b/BlueWater/Assets/01.Scenes/02.Tycoon.unity @@ -476,7 +476,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107368052} serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -1e-45, w: 0.92387956} + m_LocalRotation: {x: 0.38268343, y: -3e-45, z: 1e-45, w: 0.92387956} m_LocalPosition: {x: 4.08, y: 11.1380005, z: -4.17} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2855,7 +2855,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 501722143} serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -1e-45, w: 0.92387956} + m_LocalRotation: {x: 0.38268343, y: -3e-45, z: 1e-45, w: 0.92387956} m_LocalPosition: {x: 4.08, y: 11.1380005, z: -4.17} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4418,36 +4418,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 2044885316} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: TakeFoodFromPlayer - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BlueWaterProject.TycoonPlayer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: m_Name @@ -6861,6 +6836,7 @@ MonoBehaviour: onDeselectedUsable: m_PersistentCalls: m_Calls: [] + usablesInRange: [] --- !u!114 &2044885312 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7025,7 +7001,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.08, y: 1.138, z: 5.83} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 1 + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1176137535} - {fileID: 1094392896} diff --git a/BlueWater/Assets/05.Prefabs/Ai/Npc/TycconNpc.prefab b/BlueWater/Assets/05.Prefabs/Ai/Npc/TycconNpc.prefab index 22c540abb..cf28accc1 100644 --- a/BlueWater/Assets/05.Prefabs/Ai/Npc/TycconNpc.prefab +++ b/BlueWater/Assets/05.Prefabs/Ai/Npc/TycconNpc.prefab @@ -81,6 +81,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -432,6 +434,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -647,6 +651,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -796,6 +802,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -912,6 +920,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -996,6 +1006,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1080,6 +1092,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1241,6 +1255,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1358,6 +1374,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1455,6 +1473,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1959,6 +1979,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2075,6 +2097,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2194,6 +2218,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2491,6 +2517,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2576,6 +2604,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2693,6 +2723,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2790,6 +2822,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2949,6 +2983,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3033,6 +3069,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3468,6 +3506,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3553,6 +3593,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3683,6 +3725,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3780,6 +3824,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3949,12 +3995,12 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: BlueWaterProject.InShipPlayer, Assembly-CSharp - m_MethodName: StartInteraction - m_Mode: 2 + m_TargetAssemblyTypeName: BlueWaterProject.TycoonPlayer, Assembly-CSharp + m_MethodName: TakeFoodFromPlayer + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -4000,6 +4046,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -4074,6 +4122,8 @@ MonoBehaviour: sendMessages: [] barkSource: 0 barkConversation: + barkEntryID: -1 + barkEntryTitle: barkText: barkTextSequence: barker: {fileID: 0} @@ -4248,6 +4298,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4334,6 +4386,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4419,6 +4473,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4503,6 +4559,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4590,6 +4648,8 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/BlueWater/Assets/PolygonPirates/Models/Materials/Texture_01_A.mat b/BlueWater/Assets/PolygonPirates/Models/Materials/Texture_01_A.mat index d62a445d4..65c254136 100644 --- a/BlueWater/Assets/PolygonPirates/Models/Materials/Texture_01_A.mat +++ b/BlueWater/Assets/PolygonPirates/Models/Materials/Texture_01_A.mat @@ -2,19 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Texture_01_A m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -54,17 +60,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 @@ -72,3 +83,5 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1