Merge branch 'development' into feature/MAVRIC-1961_Create_Animations

This commit is contained in:
Noah 2023-07-21 14:27:50 -04:00
commit 7f5dc3071c
27 changed files with 8840 additions and 4184 deletions

View File

@ -17,7 +17,7 @@ MonoBehaviour:
- key: 4
value: {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
- key: 7
value: {fileID: 0}
value: {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
- key: 14
value: {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
- key: 1

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: da2536a5948e946928ba2bbbe0e494a5
guid: 74254985b73c1a941a4ecfa8e6405cb0
folderAsset: yes
DefaultImporter:
externalObjects: {}

BIN
Assets/Models/3d_Shapes.FBX (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: bb44050f9486f1047962ea8f68a7357d
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1400358654412998212
--- !u!1 &126697010374974011
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -8,47 +8,47 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2109879519065440183}
- component: {fileID: 1234140375901786573}
- component: {fileID: 1945042220837938015}
- component: {fileID: 7637319713342263239}
- component: {fileID: 5649874088570359677}
- component: {fileID: 3551885365274250494}
- component: {fileID: 3316984391857208539}
- component: {fileID: 4410350492271270507}
m_Layer: 0
m_Name: NetworkedCube (1)
m_Name: arrow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2109879519065440183
--- !u!4 &5649874088570359677
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400358654412998212}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.52, z: 0}
m_LocalScale: {x: 0.3, y: 1, z: 1}
m_GameObject: {fileID: 126697010374974011}
m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.1775, y: 0.0029527557, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 297476336125567530}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1234140375901786573
--- !u!33 &3551885365274250494
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400358654412998212}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1945042220837938015
m_GameObject: {fileID: 126697010374974011}
m_Mesh: {fileID: -2232952877369940510, guid: bb44050f9486f1047962ea8f68a7357d, type: 3}
--- !u!23 &3316984391857208539
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400358654412998212}
m_GameObject: {fileID: 126697010374974011}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
@ -84,13 +84,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &7637319713342263239
--- !u!114 &4410350492271270507
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400358654412998212}
m_GameObject: {fileID: 126697010374974011}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
@ -123,12 +123,10 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 297476336125567530}
- component: {fileID: 5340621610232601177}
- component: {fileID: 1561807832200507146}
- component: {fileID: 266210011835689945}
- component: {fileID: 632882415825997108}
m_Layer: 0
m_Name: NetworkedCube
m_Name: NetworkedDevice
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -146,62 +144,13 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2109879519065440183}
- {fileID: 1694081518273306855}
- {fileID: 6217766342941006789}
- {fileID: 7959508680561642091}
- {fileID: 7765972952403781137}
- {fileID: 5649874088570359677}
- {fileID: 6084752236226610333}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5340621610232601177
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3330507743799185566}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1561807832200507146
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3330507743799185566}
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_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
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!114 &266210011835689945
MonoBehaviour:
m_ObjectHideFlags: 0
@ -234,7 +183,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 35fd0dfbb18a59a42bf45722835aeceb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4218337368366296724
childMeshRenderers:
- {fileID: 7478614756298334504}
- {fileID: 3316984391857208539}
- {fileID: 3360044759176182775}
--- !u!1 &3699073771019985766
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -242,47 +195,152 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6217766342941006789}
- component: {fileID: 6476025900254375071}
- component: {fileID: 3834908682998976176}
- component: {fileID: 6672195107126948276}
- component: {fileID: 7959508680561642091}
- component: {fileID: 6716889749481910320}
- component: {fileID: 8770294019704687166}
- component: {fileID: 4653734836465225343}
m_Layer: 0
m_Name: NetworkedCube (3)
m_Name: MainModel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6217766342941006789
--- !u!4 &7959508680561642091
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4218337368366296724}
m_GameObject: {fileID: 3699073771019985766}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.69, y: -0.04, z: 0}
m_LocalScale: {x: 0.3, y: 1, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 297476336125567530}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6476025900254375071
--- !u!33 &6716889749481910320
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4218337368366296724}
m_GameObject: {fileID: 3699073771019985766}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &3834908682998976176
--- !u!23 &8770294019704687166
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4218337368366296724}
m_GameObject: {fileID: 3699073771019985766}
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_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
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!65 &4653734836465225343
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3699073771019985766}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7415537598314333290
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6084752236226610333}
- component: {fileID: 2921427117154176272}
- component: {fileID: 3360044759176182775}
- component: {fileID: 6707117347294344116}
m_Layer: 0
m_Name: ring
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6084752236226610333
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7415537598314333290}
m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.264, y: 0.000984252, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 297476336125567530}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2921427117154176272
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7415537598314333290}
m_Mesh: {fileID: -951608786083511892, guid: bb44050f9486f1047962ea8f68a7357d, type: 3}
--- !u!23 &3360044759176182775
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7415537598314333290}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
@ -318,13 +376,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &6672195107126948276
--- !u!114 &6707117347294344116
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4218337368366296724}
m_GameObject: {fileID: 7415537598314333290}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
@ -348,7 +406,7 @@ MonoBehaviour:
InLocalSpace: 1
Interpolate: 1
SlerpPosition: 0
--- !u!1 &8504336627562831943
--- !u!1 &8670221092016082197
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -356,47 +414,47 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1694081518273306855}
- component: {fileID: 6868724611665727028}
- component: {fileID: 7287025210785857424}
- component: {fileID: 4001491359078686183}
- component: {fileID: 7765972952403781137}
- component: {fileID: 5318005815327705553}
- component: {fileID: 7478614756298334504}
- component: {fileID: 2455791562917048495}
m_Layer: 0
m_Name: NetworkedCube (2)
m_Name: box
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1694081518273306855
--- !u!4 &7765972952403781137
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8504336627562831943}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -1.75, z: 0}
m_LocalScale: {x: 0.3, y: 1, z: 1}
m_GameObject: {fileID: 8670221092016082197}
m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.008267716, y: 0.0022, z: 0.1467}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 297476336125567530}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6868724611665727028
--- !u!33 &5318005815327705553
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8504336627562831943}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7287025210785857424
m_GameObject: {fileID: 8670221092016082197}
m_Mesh: {fileID: 5060444177187149915, guid: bb44050f9486f1047962ea8f68a7357d, type: 3}
--- !u!23 &7478614756298334504
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8504336627562831943}
m_GameObject: {fileID: 8670221092016082197}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
@ -432,13 +490,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &4001491359078686183
--- !u!114 &2455791562917048495
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8504336627562831943}
m_GameObject: {fileID: 8670221092016082197}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}

View File

@ -44,7 +44,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 22f336065512a394d95bfcddece1fd6c, type: 3}
m_Texture: {fileID: 2800000, guid: c35e9f69e2d2ebd48878c668a619a026, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -123,7 +123,7 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &156672453
--- !u!1001 &506652576
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -131,352 +131,385 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
- target: {fileID: 62037503446583542, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 529620196}
- target: {fileID: 2301362472593170023, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_Name
value: EditorObjects
objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2378901702852761775, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4062317275640942792, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.3431876
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 0.18244445
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.25964585
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.09911112
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2578444913239673792, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4732050508463854983, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 529620196}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMax.x
value: 0.74700004
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMax.y
value: 0.2055926
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMin.x
value: 0.657
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMin.y
value: 0.09911112
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5406916776953705393, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5933924579405714970, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 529620196}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalPosition.x
value: 0.19
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalPosition.z
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.w
value: -0.12816393
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.x
value: -0.021451214
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.y
value: 0.97791797
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.z
value: -0.16367747
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 19.003
objectReference: {fileID: 0}
- target: {fileID: 6023609763215936869, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 194.933
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMax.x
value: 0.53347915
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMax.y
value: 0.18244445
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMin.x
value: 0.446875
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchorMin.y
value: 0.09911112
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8740223567327763973, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4462715032293092861, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
- target: {fileID: 8760413228547238992, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4928682705538839603, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5569208285680914711, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6111960555710732882, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6130414054276300538, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_Name
value: MainScreen
objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6547583138651562363, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8175012630111476763, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8387095118721819293, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
propertyPath: m_AnchoredPosition.y
- target: {fileID: 8905626693440847948, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
propertyPath: orthographic
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a933cd7f0b9c344429950fd18fc3e7cc, type: 3}
--- !u!1001 &439399488
PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
--- !u!1 &506652577 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2301362472593170023, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
m_PrefabInstance: {fileID: 506652576}
m_PrefabAsset: {fileID: 0}
--- !u!114 &506652578 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4732050508463854983, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
m_PrefabInstance: {fileID: 506652576}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &506652579 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 62037503446583542, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
m_PrefabInstance: {fileID: 506652576}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &506652580 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5933924579405714970, guid: 0b23aeada06226942bfb56eaf745d2be, type: 3}
m_PrefabInstance: {fileID: 506652576}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &529620192
GameObject:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalPosition.x
value: 0.172
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5906286381360451428, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
propertyPath: m_Name
value: Cartridge_Guide_Model
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 84f6851439a6bfc45a13aa41eabcf782, type: 3}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 529620197}
- component: {fileID: 529620195}
- component: {fileID: 529620194}
- component: {fileID: 529620196}
- component: {fileID: 529620193}
m_Layer: 0
m_Name: NetworkManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &529620193
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 529620192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36fbb968c75088842a5e258fd4264e0f, type: 3}
m_Name:
m_EditorClassIdentifier:
editorObject: {fileID: 506652577}
arObject: {fileID: 6076211927436386727}
menuCanvasObject: {fileID: 839431832}
connectingObject: {fileID: 839431833}
networkManager: {fileID: 529620195}
unityTransport: {fileID: 529620194}
deviceIPText: {fileID: 839431837}
devicePortText: {fileID: 839431836}
serverIPField: {fileID: 839431835}
serverPortField: {fileID: 839431834}
connectionWaitSeconds: 2
--- !u!114 &529620194
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 529620192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ProtocolType: 0
m_MaxPacketQueueSize: 128
m_MaxPayloadSize: 6144
m_HeartbeatTimeoutMS: 500
m_ConnectTimeoutMS: 1000
m_MaxConnectAttempts: 60
m_DisconnectTimeoutMS: 30000
ConnectionData:
Address: 127.0.0.1
Port: 7777
ServerListenAddress: 0.0.0.0
DebugSimulator:
PacketDelayMS: 0
PacketJitterMS: 0
PacketDropRate: 0
--- !u!114 &529620195
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 529620192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
m_Name:
m_EditorClassIdentifier:
NetworkConfig:
ProtocolVersion: 0
NetworkTransport: {fileID: 529620194}
PlayerPrefab: {fileID: 3330507743799185566, guid: 4bea6c5919240c94da16a55316ce914d, type: 3}
Prefabs:
NetworkPrefabsLists:
- {fileID: 11400000, guid: 625bea7dc03966f468451cb1480e967f, type: 2}
TickRate: 30
ClientConnectionBufferTimeout: 10
ConnectionApproval: 0
ConnectionData:
EnableTimeResync: 0
TimeResyncInterval: 30
EnsureNetworkVariableLengthSafety: 0
EnableSceneManagement: 1
ForceSamePrefabs: 1
RecycleNetworkIds: 1
NetworkIdRecycleDelay: 120
RpcHashSize: 0
LoadSceneTimeOut: 120
SpawnTimeout: 1
EnableNetworkLogs: 1
OldPrefabList: []
RunInBackground: 1
LogLevel: 1
--- !u!114 &529620196
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 529620192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 93e41da81d8991040b6eb3e9f1583bce, type: 3}
m_Name:
m_EditorClassIdentifier:
networkManager: {fileID: 529620195}
buttons:
- {fileID: 506652580}
- {fileID: 506652579}
- {fileID: 506652578}
networkedParent: {fileID: 0}
--- !u!4 &529620197
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 529620192}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &815650767
GameObject:
m_ObjectHideFlags: 0
@ -568,8 +601,8 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 21.15, y: 0, z: 0}
--- !u!1001 &915689919
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &839431831
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -577,67 +610,161 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 4632086872844890547, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 529620193}
- target: {fileID: 4814519339637553459, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_Name
value: NetworkMenuCanvas
objectReference: {fileID: 0}
- target: {fileID: 5027592584467397017, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 529620193}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_RootOrder
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalPosition.x
value: 0.08557141
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalPosition.y
value: 0.1455276
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalPosition.z
value: -1.6246004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1327698172346070804, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
- target: {fileID: 5133258367307586457, guid: dde008f9d050111489389129f382ac3e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2459705246185267206, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
propertyPath: machine
value:
objectReference: {fileID: 11400000, guid: 502ad59888b6fb743bee45c5ed1ec563, type: 2}
- target: {fileID: 6267913419890995047, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
propertyPath: machine
value:
objectReference: {fileID: 11400000, guid: 502ad59888b6fb743bee45c5ed1ec563, type: 2}
- target: {fileID: 6350314852590490647, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
propertyPath: m_Name
value: Managers
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: dde008f9d050111489389129f382ac3e, type: 3}
--- !u!1 &839431832 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4814519339637553459, guid: dde008f9d050111489389129f382ac3e, type: 3}
m_PrefabInstance: {fileID: 839431831}
m_PrefabAsset: {fileID: 0}
--- !u!1 &839431833 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6610017742738903018, guid: dde008f9d050111489389129f382ac3e, type: 3}
m_PrefabInstance: {fileID: 839431831}
m_PrefabAsset: {fileID: 0}
--- !u!114 &839431834 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9011289594126348507, guid: dde008f9d050111489389129f382ac3e, type: 3}
m_PrefabInstance: {fileID: 839431831}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &839431835 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 64698931436562114, guid: dde008f9d050111489389129f382ac3e, type: 3}
m_PrefabInstance: {fileID: 839431831}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &839431836 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3317664238089409539, guid: dde008f9d050111489389129f382ac3e, type: 3}
m_PrefabInstance: {fileID: 839431831}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &839431837 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4206063697250794972, guid: dde008f9d050111489389129f382ac3e, type: 3}
m_PrefabInstance: {fileID: 839431831}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1243805569
GameObject:
m_ObjectHideFlags: 0
@ -704,7 +831,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1308932973
GameObject:
@ -800,7 +927,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1435311945
--- !u!1001 &1058417658004860609
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -808,56 +935,61 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4454453486575741852, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 2995049788487289996, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5906286381360451428, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
- target: {fileID: 6575707842653958062, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
propertyPath: m_Name
value: Cartridge_Full_Model
value: DemoAR-Objects
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ba265f6df045634dbd02c5e9a545352, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
--- !u!1 &6076211927436386727 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6575707842653958062, guid: 7dd0d6045dc2d80419e4a5081c1e9f0b, type: 3}
m_PrefabInstance: {fileID: 1058417658004860609}
m_PrefabAsset: {fileID: 0}

View File

@ -1,15 +1,26 @@
using System;
using System.Collections;
using System.Net;
using System.Net.Sockets;
using TMPro;
using Unity.Netcode;
using Unity.Netcode.Transports.UTP;
using UnityEngine;
namespace NetCode
{
public class NetCodeModeSelect : MonoBehaviour
{
[SerializeField] private GameObject editorObject, arObject, menuCanvasObject;
[SerializeField] private GameObject editorObject, arObject, menuCanvasObject,connectingObject;
[SerializeField] private NetworkManager networkManager;
[SerializeField] private UnityTransport unityTransport;
[SerializeField] private TextMeshProUGUI deviceIPText,devicePortText;
[SerializeField] private TMP_InputField serverIPField, serverPortField;
[SerializeField] private float connectionWaitSeconds = 1.0f;
private void Start()
{
@ -17,10 +28,30 @@ namespace NetCode
{
networkManager = FindObjectOfType<NetworkManager>();
}
if (unityTransport == null)
{
unityTransport = FindObjectOfType<UnityTransport>();
}
var host = Dns.GetHostEntry(Dns.GetHostName());
foreach (var ip in host.AddressList)
{
if (ip.AddressFamily == AddressFamily.InterNetwork)
{
deviceIPText.text = ip.ToString();
}
}
devicePortText.text = unityTransport.ConnectionData.Port.ToString();
}
public void SelectEditor()
{
if (networkManager.IsServer) return;
if (networkManager.IsClient) return;
unityTransport.ConnectionData.Address = deviceIPText.text;
menuCanvasObject.SetActive(false);
editorObject.SetActive(true);
networkManager.StartServer();
@ -28,9 +59,29 @@ namespace NetCode
public void SelectAR()
{
menuCanvasObject.SetActive(false);
arObject.SetActive(true);
if (networkManager.IsServer) return;
if (networkManager.IsClient) return;
connectingObject.SetActive(true);
unityTransport.ConnectionData.Address = serverIPField.text;
bool portIsInt = int.TryParse(serverPortField.text, out int portNum);
if (!portIsInt) return;
unityTransport.ConnectionData.Port = (ushort)portNum;
networkManager.StartClient();
StartCoroutine(WaitForConnection());
IEnumerator WaitForConnection()
{
yield return new WaitForSeconds(connectionWaitSeconds);
connectingObject.SetActive(false);
if (!networkManager.IsConnectedClient) yield break;
menuCanvasObject.SetActive(false);
arObject.SetActive(true);
}
}
}
}

View File

@ -0,0 +1,41 @@
using System.Collections.Generic;
using Unity.Netcode;
using UnityEngine;
using UnityEngine.UI;
namespace NetCode
{
public class NetCodeSpawner : MonoBehaviour
{
public NetworkManager networkManager;
public List<Button> buttons = new List<Button>();
public NetworkedParent networkedParent;
private void OnEnable()
{
networkManager.OnServerStarted += ServerStarted;
}
private void OnDisable()
{
networkManager.OnServerStarted -= ServerStarted;
}
public void ServerStarted()
{
foreach (var button in buttons)
{
button.gameObject.SetActive(true);
}
}
public void Toggle(int index)
{
if (networkManager.ConnectedClients.Count == 0) return;
if (networkedParent == null) return;
networkedParent.Toggle(index);
}
}
}

View File

@ -0,0 +1,34 @@
using System.Collections.Generic;
using Unity.Netcode;
using UnityEngine;
namespace NetCode
{
public class NetworkedParent : NetworkBehaviour
{
[SerializeField] private List<MeshRenderer> childMeshRenderers = new List<MeshRenderer>();
private int childCount;
private void Start()
{
FindObjectOfType<NetCodeSpawner>().networkedParent = this;
childCount = childMeshRenderers.Count;
}
public void Toggle(int index)
{
if (childCount < index) return;
MeshRenderer child = childMeshRenderers[index];
child.enabled = !child.enabled;
ToggleClientRpc(index);
}
[ClientRpc]
public void ToggleClientRpc(int index)
{
if (childCount < index) return;
MeshRenderer child = childMeshRenderers[index];
child.enabled = !child.enabled;
}
}
}

View File

@ -1,40 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Unity.Netcode;
using UnityEngine;
using UnityEngine.UI;
public class NetCodeSpawner : MonoBehaviour
{
public NetworkManager networkManager;
public List<Button> buttons = new List<Button>();
public NetCube cube;
private void OnEnable()
{
networkManager.OnServerStarted += ServerStarted;
}
private void OnDisable()
{
networkManager.OnServerStarted -= ServerStarted;
}
public void ServerStarted()
{
foreach (var button in buttons)
{
button.gameObject.SetActive(true);
}
}
public void Toggle(int index)
{
if (networkManager.ConnectedClients.Count == 0) return;
if (cube == null) return;
cube.Toggle(index);
}
}

View File

@ -1,38 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Unity.Netcode;
using UnityEngine;
public class NetCube : NetworkBehaviour
{
private List<MeshRenderer> meshRenderers = new List<MeshRenderer>();
private int childCount;
private void Start()
{
FindObjectOfType<NetCodeSpawner>().cube = this;
for (int i = 0; i < transform.childCount; i++)
{
MeshRenderer meshRenderer = transform.GetChild(i).gameObject.GetComponent<MeshRenderer>();
meshRenderers.Add(meshRenderer);
}
childCount = transform.childCount;
}
public void Toggle(int index)
{
if (childCount < index) return;
MeshRenderer child = meshRenderers[index];
child.enabled = !child.enabled;
ToggleClientRpc(index);
}
[ClientRpc]
public void ToggleClientRpc(int index)
{
if (childCount < index) return;
MeshRenderer child = meshRenderers[index];
child.enabled = !child.enabled;
}
}

View File

@ -12,8 +12,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 848409ee8ba454f42a5ddff137688a27, type: 3}
m_Name: ReferenceImageLibrary
m_EditorClassIdentifier:
m_GuidLow: 0
m_GuidHigh: 0
m_GuidLow: 4998897224589816693
m_GuidHigh: 4980599166140822156
m_DataStore:
m_Storage: []
m_Images: []
m_Images:
- m_SerializedGuid:
m_GuidLow: 5526809559422211064
m_GuidHigh: 11352171135067037336
m_SerializedTextureGuid:
m_GuidLow: 16371981909256243904
m_GuidHigh: 7770245327679602008
m_Size: {x: 0, y: 0}
m_SpecifySize: 0
m_Name: qr-code
m_Texture: {fileID: 0}

View File

@ -9,11 +9,8 @@ EditorBuildSettings:
path: Assets/Scenes/EOS-DEMO.unity
guid: f7b48c7df56deca4a92248009c33166c
- enabled: 1
path: Assets/Scenes/Hololens.unity
guid: 610b4d002511c1f44a9069b575f93e99
- enabled: 1
path: Assets/Scenes/AR-Netcode-Merge.unity
guid: 578c2f43902445a429c3e95d4bf94b0e
path: Assets/Scenes/Fortus-450mc-Demo.unity
guid: c8d41b60c3e114b46a2503dffca87008
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 524efed5f15b6a64c99f494f1875b695, type: 2}
UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: e3ab4a3e4f5555743bc160ec035a5114, type: 2}

View File

@ -142,6 +142,7 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 11400000, guid: 4602a861915eb4f4b897d24e48435c09, type: 2}
- {fileID: 6165854303103985, guid: a700e85e08e15cc42afa43b723945cc8, type: 2}
- {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1