Skip to content

Commit ee5b308

Browse files
committed
updating zoosam with latest changes
1 parent 93e8be7 commit ee5b308

File tree

2 files changed

+96
-17
lines changed

2 files changed

+96
-17
lines changed

testproject/Assets/Scenes/ZooSam.unity

Lines changed: 93 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,9 +1225,8 @@ MonoBehaviour:
12251225
RotAngleThreshold: 0
12261226
ScaleThreshold: 0
12271227
InLocalSpace: 1
1228-
Interpolate: 0
1228+
Interpolate: 1
12291229
FixedSendsPerSecond: 50
1230-
UseFixedUpdate: 1
12311230
--- !u!114 &108150026
12321231
MonoBehaviour:
12331232
m_ObjectHideFlags: 0
@@ -1335,7 +1334,7 @@ Transform:
13351334
m_Children:
13361335
- {fileID: 153211162}
13371336
m_Father: {fileID: 0}
1338-
m_RootOrder: 10
1337+
m_RootOrder: 11
13391338
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13401339
--- !u!1 &110121429
13411340
GameObject:
@@ -3401,7 +3400,6 @@ MonoBehaviour:
34013400
InLocalSpace: 0
34023401
Interpolate: 1
34033402
FixedSendsPerSecond: 30
3404-
UseFixedUpdate: 1
34053403
--- !u!114 &240282451
34063404
MonoBehaviour:
34073405
m_ObjectHideFlags: 0
@@ -3509,7 +3507,7 @@ Transform:
35093507
m_Children:
35103508
- {fileID: 1551181949}
35113509
m_Father: {fileID: 0}
3512-
m_RootOrder: 8
3510+
m_RootOrder: 9
35133511
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35143512
--- !u!1 &250510712
35153513
GameObject:
@@ -4180,7 +4178,7 @@ Transform:
41804178
m_LocalScale: {x: 1, y: 1, z: 1}
41814179
m_Children: []
41824180
m_Father: {fileID: 0}
4183-
m_RootOrder: 5
4181+
m_RootOrder: 6
41844182
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
41854183
--- !u!1 &351881178
41864184
GameObject:
@@ -6816,7 +6814,7 @@ MonoBehaviour:
68166814
LogLevel: 1
68176815
NetworkConfig:
68186816
ProtocolVersion: 0
6819-
NetworkTransport: {fileID: 620561613}
6817+
NetworkTransport: {fileID: 620561610}
68206818
PlayerPrefab: {fileID: 4700706668509470175, guid: 7eeaaf9e50c0afc4dab93584a54fb0d6,
68216819
type: 3}
68226820
NetworkPrefabs: []
@@ -7943,7 +7941,7 @@ Transform:
79437941
m_LocalScale: {x: 1, y: 1, z: 1}
79447942
m_Children: []
79457943
m_Father: {fileID: 0}
7946-
m_RootOrder: 7
7944+
m_RootOrder: 8
79477945
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
79487946
--- !u!1 &674940303
79497947
GameObject:
@@ -8078,7 +8076,7 @@ MonoBehaviour:
80788076
m_MoveSpeed: 5
80798077
m_RotationSpeed: 30
80808078
m_RunServerOnly: 1
8081-
m_RunInUpdate: 1
8079+
m_RunInUpdate: 0
80828080
--- !u!114 &678326394
80838081
MonoBehaviour:
80848082
m_ObjectHideFlags: 0
@@ -8122,7 +8120,6 @@ MonoBehaviour:
81228120
InLocalSpace: 1
81238121
Interpolate: 1
81248122
FixedSendsPerSecond: 50
8125-
UseFixedUpdate: 1
81268123
--- !u!65 &678326396
81278124
BoxCollider:
81288125
m_ObjectHideFlags: 0
@@ -8199,7 +8196,7 @@ Transform:
81998196
- {fileID: 702051986}
82008197
- {fileID: 36747677}
82018198
m_Father: {fileID: 0}
8202-
m_RootOrder: 4
8199+
m_RootOrder: 5
82038200
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
82048201
--- !u!1 &680150732
82058202
GameObject:
@@ -8393,6 +8390,89 @@ MeshFilter:
83938390
m_PrefabAsset: {fileID: 0}
83948391
m_GameObject: {fileID: 687753481}
83958392
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
8393+
--- !u!1 &693991909
8394+
GameObject:
8395+
m_ObjectHideFlags: 0
8396+
m_CorrespondingSourceObject: {fileID: 0}
8397+
m_PrefabInstance: {fileID: 0}
8398+
m_PrefabAsset: {fileID: 0}
8399+
serializedVersion: 6
8400+
m_Component:
8401+
- component: {fileID: 693991912}
8402+
- component: {fileID: 693991911}
8403+
- component: {fileID: 693991910}
8404+
m_Layer: 0
8405+
m_Name: Camera (1)
8406+
m_TagString: Untagged
8407+
m_Icon: {fileID: 0}
8408+
m_NavMeshLayer: 0
8409+
m_StaticEditorFlags: 0
8410+
m_IsActive: 1
8411+
--- !u!81 &693991910
8412+
AudioListener:
8413+
m_ObjectHideFlags: 0
8414+
m_CorrespondingSourceObject: {fileID: 0}
8415+
m_PrefabInstance: {fileID: 0}
8416+
m_PrefabAsset: {fileID: 0}
8417+
m_GameObject: {fileID: 693991909}
8418+
m_Enabled: 1
8419+
--- !u!20 &693991911
8420+
Camera:
8421+
m_ObjectHideFlags: 0
8422+
m_CorrespondingSourceObject: {fileID: 0}
8423+
m_PrefabInstance: {fileID: 0}
8424+
m_PrefabAsset: {fileID: 0}
8425+
m_GameObject: {fileID: 693991909}
8426+
m_Enabled: 1
8427+
serializedVersion: 2
8428+
m_ClearFlags: 1
8429+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
8430+
m_projectionMatrixMode: 1
8431+
m_GateFitMode: 2
8432+
m_FOVAxisMode: 0
8433+
m_SensorSize: {x: 36, y: 24}
8434+
m_LensShift: {x: 0, y: 0}
8435+
m_FocalLength: 50
8436+
m_NormalizedViewPortRect:
8437+
serializedVersion: 2
8438+
x: 0
8439+
y: 0
8440+
width: 1
8441+
height: 1
8442+
near clip plane: 0.3
8443+
far clip plane: 1000
8444+
field of view: 60
8445+
orthographic: 0
8446+
orthographic size: 5
8447+
m_Depth: 0
8448+
m_CullingMask:
8449+
serializedVersion: 2
8450+
m_Bits: 4294967295
8451+
m_RenderingPath: -1
8452+
m_TargetTexture: {fileID: 0}
8453+
m_TargetDisplay: 0
8454+
m_TargetEye: 3
8455+
m_HDR: 1
8456+
m_AllowMSAA: 1
8457+
m_AllowDynamicResolution: 0
8458+
m_ForceIntoRT: 0
8459+
m_OcclusionCulling: 1
8460+
m_StereoConvergence: 10
8461+
m_StereoSeparation: 0.022
8462+
--- !u!4 &693991912
8463+
Transform:
8464+
m_ObjectHideFlags: 0
8465+
m_CorrespondingSourceObject: {fileID: 0}
8466+
m_PrefabInstance: {fileID: 0}
8467+
m_PrefabAsset: {fileID: 0}
8468+
m_GameObject: {fileID: 693991909}
8469+
m_LocalRotation: {x: 0.5, y: -0, z: -0, w: 0.8660254}
8470+
m_LocalPosition: {x: 0, y: 20, z: -16}
8471+
m_LocalScale: {x: 1, y: 1, z: 1}
8472+
m_Children: []
8473+
m_Father: {fileID: 0}
8474+
m_RootOrder: 4
8475+
m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
83968476
--- !u!1 &695189437
83978477
GameObject:
83988478
m_ObjectHideFlags: 0
@@ -9333,7 +9413,7 @@ Transform:
93339413
- {fileID: 398540133}
93349414
- {fileID: 1399839515}
93359415
m_Father: {fileID: 0}
9336-
m_RootOrder: 6
9416+
m_RootOrder: 7
93379417
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
93389418
--- !u!1 &731245575
93399419
GameObject:
@@ -25049,7 +25129,6 @@ MonoBehaviour:
2504925129
InLocalSpace: 0
2505025130
Interpolate: 1
2505125131
FixedSendsPerSecond: 50
25052-
UseFixedUpdate: 1
2505325132
--- !u!114 &1934616766
2505425133
MonoBehaviour:
2505525134
m_ObjectHideFlags: 0
@@ -25142,7 +25221,7 @@ Transform:
2514225221
- {fileID: 557794668}
2514325222
- {fileID: 491088867}
2514425223
m_Father: {fileID: 0}
25145-
m_RootOrder: 9
25224+
m_RootOrder: 10
2514625225
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2514725226
--- !u!1 &1949195315
2514825227
GameObject:

testproject/ProjectSettings/EditorBuildSettings.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Scenes:
8-
- enabled: 1
9-
path: Assets/MainMenu.unity
10-
guid: 21c7fd68cda9dd9488fc0cc01f885e39
118
- enabled: 1
129
path: Assets/Scenes/ZooSam.unity
1310
guid: 4683469c9a191411fbda5e426765b2fc
11+
- enabled: 1
12+
path: Assets/MainMenu.unity
13+
guid: 21c7fd68cda9dd9488fc0cc01f885e39
1414
- enabled: 1
1515
path: Assets/Samples/SamplesMenu.unity
1616
guid: 037562c9b1a469f498dfb34256ddf86f

0 commit comments

Comments
 (0)