#211 Scene Merging

This commit is contained in:
IDMhan 2024-02-21 03:29:16 +09:00
parent 70c2edfd01
commit 2172c0a37a
116 changed files with 1066 additions and 127 deletions

View File

@ -10204,7 +10204,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 107368052}
serializedVersion: 2
m_LocalRotation: {x: 0.22975291, y: 0.000000016746096, z: -0.0000000039532173, w: 0.973249}
m_LocalRotation: {x: 0.22975291, y: -0.000000016746089, z: 0.0000000039532155, w: 0.973249}
m_LocalPosition: {x: 5.22, y: 9.6, z: -10.18}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -29845,7 +29845,9 @@ GameObject:
- component: {fileID: 318608392}
- component: {fileID: 318608394}
- component: {fileID: 318608393}
m_Layer: 0
- component: {fileID: 318608396}
- component: {fileID: 318608395}
m_Layer: 21
m_Name: Beer (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -29919,6 +29921,64 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318608391}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!65 &318608395
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318608391}
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: 0.4, y: 1, z: 0.5}
m_Center: {x: 0, y: 0, z: -0.00000023841858}
--- !u!114 &318608396
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318608391}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uB9E5\uC8FC"
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: TakeBeer
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!1001 &320898929
PrefabInstance:
m_ObjectHideFlags: 0
@ -35424,7 +35484,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &377346305
Transform:
m_ObjectHideFlags: 0
@ -45590,7 +45650,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 501722143}
serializedVersion: 2
m_LocalRotation: {x: 0.22975291, y: 0.000000016746096, z: -0.0000000039532173, w: 0.973249}
m_LocalRotation: {x: 0.22975291, y: -0.000000016746089, z: 0.0000000039532155, w: 0.973249}
m_LocalPosition: {x: 5.22, y: 9.6, z: -10.18}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -60047,7 +60107,6 @@ Transform:
- {fileID: 1259577116}
- {fileID: 1696230097}
- {fileID: 1856919713}
- {fileID: 1240582853}
- {fileID: 433516087}
- {fileID: 1593489590}
- {fileID: 715238202}
@ -76872,7 +76931,7 @@ MonoBehaviour:
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 2187568767
m_Bits: 2183374463
--- !u!114 &846530003
MonoBehaviour:
m_ObjectHideFlags: 0
@ -88280,7 +88339,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 962457521}
m_Layer: 0
- component: {fileID: 962457523}
- component: {fileID: 962457522}
m_Layer: 21
m_Name: TomatoBox
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -88317,6 +88378,64 @@ Transform:
- {fileID: 751022223}
m_Father: {fileID: 2002910172}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &962457522
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 962457520}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uD1A0\uB9C8\uD1A0"
overrideUseMessage:
maxUseDistance: 5
events:
onSelect:
m_PersistentCalls:
m_Calls: []
onDeselect:
m_PersistentCalls:
m_Calls: []
onUse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 55111071}
m_TargetAssemblyTypeName: BlueWaterProject.KitchenManager, Assembly-CSharp
m_MethodName: TomatoBox
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 &962457523
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 962457520}
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: 7, y: 7, z: 12}
m_Center: {x: -5.67, y: -4.35, z: 6.46}
--- !u!1001 &963488674
PrefabInstance:
m_ObjectHideFlags: 0
@ -99434,8 +99553,10 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1094674011}
m_Layer: 0
m_Name: Pabox
- component: {fileID: 1094674013}
- component: {fileID: 1094674012}
m_Layer: 21
m_Name: ScallionBox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -99460,6 +99581,64 @@ Transform:
- {fileID: 576302018}
m_Father: {fileID: 2002910172}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1094674012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1094674010}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uD30C"
overrideUseMessage:
maxUseDistance: 5
events:
onSelect:
m_PersistentCalls:
m_Calls: []
onDeselect:
m_PersistentCalls:
m_Calls: []
onUse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 55111071}
m_TargetAssemblyTypeName: BlueWaterProject.KitchenManager, Assembly-CSharp
m_MethodName: ScallionBox
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 &1094674013
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1094674010}
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: 7, y: 7, z: 12}
m_Center: {x: -14.15, y: -2.82, z: 6.89}
--- !u!1 &1095074881
GameObject:
m_ObjectHideFlags: 0
@ -113890,97 +114069,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1239463186}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1240582852
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1240582853}
- component: {fileID: 1240582855}
- component: {fileID: 1240582854}
m_Layer: 21
m_Name: KitchenTable (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1240582853
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240582852}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -9.1, y: -0.46, z: -7.716}
m_LocalScale: {x: 0.9166524, y: 1, z: 1.3795501}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 656939802}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1240582854
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240582852}
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: 4.02, y: 0.93, z: 2.29}
m_Center: {x: 1.02, y: 2.22, z: 9.31}
--- !u!114 &1240582855
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240582852}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName:
overrideUseMessage:
maxUseDistance: 5
events:
onSelect:
m_PersistentCalls:
m_Calls: []
onDeselect:
m_PersistentCalls:
m_Calls: []
onUse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: BlueWaterProject.TycoonPlayer, Assembly-CSharp
m_MethodName: TakeFoodFromKitchen
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!1 &1242486714
GameObject:
m_ObjectHideFlags: 0
@ -122044,7 +122132,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1323230864}
m_Layer: 0
- component: {fileID: 1323230866}
- component: {fileID: 1323230865}
m_Layer: 21
m_Name: onion box
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -122086,6 +122176,64 @@ Transform:
- {fileID: 1418402025}
m_Father: {fileID: 2002910172}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1323230865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1323230863}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uC591\uD30C"
overrideUseMessage:
maxUseDistance: 5
events:
onSelect:
m_PersistentCalls:
m_Calls: []
onDeselect:
m_PersistentCalls:
m_Calls: []
onUse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 55111071}
m_TargetAssemblyTypeName: BlueWaterProject.KitchenManager, Assembly-CSharp
m_MethodName: OnionBox
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 &1323230866
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1323230863}
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: 7, y: 7, z: 12}
m_Center: {x: 2.8, y: -1.07, z: 7.15}
--- !u!1001 &1324802589
PrefabInstance:
m_ObjectHideFlags: 0
@ -136128,7 +136276,9 @@ GameObject:
- component: {fileID: 1458313122}
- component: {fileID: 1458313124}
- component: {fileID: 1458313123}
m_Layer: 0
- component: {fileID: 1458313126}
- component: {fileID: 1458313125}
m_Layer: 21
m_Name: Water
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -136202,6 +136352,64 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458313121}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!65 &1458313125
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458313121}
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: 0.4, y: 1, z: 0.5}
m_Center: {x: 0, y: 0, z: -0.00000023841858}
--- !u!114 &1458313126
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1458313121}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uB9E5\uC8FC"
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: TakeBeer
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!1001 &1458970416
PrefabInstance:
m_ObjectHideFlags: 0
@ -155277,7 +155485,9 @@ GameObject:
- component: {fileID: 1661961958}
- component: {fileID: 1661961960}
- component: {fileID: 1661961959}
m_Layer: 0
- component: {fileID: 1661961962}
- component: {fileID: 1661961961}
m_Layer: 21
m_Name: Beer
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -155351,6 +155561,64 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661961957}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!65 &1661961961
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661961957}
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: 0.4, y: 1, z: 0.5}
m_Center: {x: 0, y: 0, z: -0.00000023841858}
--- !u!114 &1661961962
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661961957}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3}
m_Name:
m_EditorClassIdentifier:
overrideName: "\uB9E5\uC8FC"
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: TakeBeer
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!1 &1662395859
GameObject:
m_ObjectHideFlags: 0

View File

@ -13,6 +13,8 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
- _ENVIRONMENTREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -93,12 +95,12 @@ Material:
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _Cutoff: 0.584
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _EnvironmentReflections: 0
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
@ -109,7 +111,7 @@ Material:
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SpecularHighlights: 0
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON
@ -206,7 +205,7 @@ Material:
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Glow: 10
- _Glow: 0
- _GlowAffectLight: 1
- _GlowGlobal: 1
- _GradBlend: 1
@ -254,11 +253,11 @@ Material:
- _OffsetUvY: 0
- _OnlyInnerOutline: 0
- _OnlyOutline: 0
- _OutlineAlpha: 1
- _OutlineAlpha: 0.83
- _OutlineDistortAmount: 0.5
- _OutlineDistortTexXSpeed: 5
- _OutlineDistortTexYSpeed: 5
- _OutlineGlow: 100
- _OutlineGlow: 41.9
- _OutlinePixelWidth: 1
- _OutlineTexXSpeed: 10
- _OutlineTexYSpeed: 0

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -13,7 +13,6 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- FLICKER_ON
- ONLYOUTLINE_ON
- OUTBASE_ON
m_InvalidKeywords:
- GLOWLIGHT_ON

View File

@ -213,7 +213,7 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1.5, y: 1.5, z: 1.5}
m_Size: {x: 2.5, y: 1.5, z: 1.5}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &82096434795905233
MonoBehaviour:
@ -1000,7 +1000,7 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1.5, y: 1.5, z: 1.5}
m_Size: {x: 2.5, y: 1.5, z: 1.5}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5693451222661632599
MonoBehaviour:
@ -1133,7 +1133,7 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1.5, y: 1.5, z: 1.5}
m_Size: {x: 2.5, y: 1.5, z: 1.5}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &6427183899725284728
MonoBehaviour:
@ -1784,7 +1784,7 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1.5, y: 1.5, z: 1.5}
m_Size: {x: 2.5, y: 1.5, z: 1.5}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &2367100495063979536
MonoBehaviour:

View File

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

@ -131,7 +131,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.37540048, g: 0.5693702, b: 0.7169812, a: 1}
- _Color: {r: 0.37540045, g: 0.5693702, b: 0.7169812, 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

@ -35,8 +35,7 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3

View File

@ -131,7 +131,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.6603774, g: 0.3083837, b: 0.3083837, a: 1}
- _Color: {r: 0.6603774, g: 0.30838367, b: 0.30838367, 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

@ -118,7 +118,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.7830188, g: 0.48812127, b: 0.35826805, a: 1}
- _Color: {r: 0.7830188, g: 0.48812127, b: 0.35826802, 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,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:

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