Skip to content

Commit fe7eeab

Browse files
committed
Version update 1.5.0
1 parent d891b5a commit fe7eeab

File tree

300 files changed

+32933
-11046
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+32933
-11046
lines changed

Assets/BossFight_Assets/Scenes/BF_Game.unity

Lines changed: 1846 additions & 1161 deletions
Large diffs are not rendered by default.

Assets/BossFight_Assets/Scenes/BF_Lobby.unity

Lines changed: 5131 additions & 2325 deletions
Large diffs are not rendered by default.

Assets/BossFight_Assets/Scenes/BF_LogoScene.unity

Lines changed: 178 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!29 &1
4-
SceneSettings:
4+
OcclusionCullingSettings:
55
m_ObjectHideFlags: 0
6-
m_PVSData:
7-
m_PVSObjectsArray: []
8-
m_PVSPortalsArray: []
6+
serializedVersion: 2
97
m_OcclusionBakeSettings:
108
smallestOccluder: 5
119
smallestHole: 0.25
1210
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 6
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 3
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 0}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -37,12 +38,12 @@ RenderSettings:
3738
m_ReflectionIntensity: 1
3839
m_CustomReflection: {fileID: 0}
3940
m_Sun: {fileID: 0}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4042
--- !u!157 &3
4143
LightmapSettings:
4244
m_ObjectHideFlags: 0
43-
serializedVersion: 6
45+
serializedVersion: 9
4446
m_GIWorkflowMode: 1
45-
m_LightmapsMode: 1
4647
m_GISettings:
4748
serializedVersion: 2
4849
m_BounceScale: 1
@@ -53,49 +54,71 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 0
5455
m_EnableRealtimeLightmaps: 0
5556
m_LightmapEditorSettings:
56-
serializedVersion: 3
57+
serializedVersion: 8
5758
m_Resolution: 2
5859
m_BakeResolution: 40
5960
m_TextureWidth: 1024
6061
m_TextureHeight: 1024
62+
m_AO: 0
6163
m_AOMaxDistance: 1
62-
m_Padding: 2
6364
m_CompAOExponent: 0
65+
m_CompAOExponentDirect: 0
66+
m_Padding: 2
6467
m_LightmapParameters: {fileID: 0}
68+
m_LightmapsBakeMode: 1
6569
m_TextureCompression: 1
6670
m_FinalGather: 0
71+
m_FinalGatherFiltering: 1
6772
m_FinalGatherRayCount: 1024
6873
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
6989
m_LightingDataAsset: {fileID: 0}
70-
m_RuntimeCPUUsage: 25
90+
m_ShadowMaskMode: 2
7191
--- !u!196 &4
7292
NavMeshSettings:
7393
serializedVersion: 2
7494
m_ObjectHideFlags: 0
7595
m_BuildSettings:
7696
serializedVersion: 2
97+
agentTypeID: 0
7798
agentRadius: 0.5
7899
agentHeight: 2
79100
agentSlope: 45
80101
agentClimb: 0.4
81102
ledgeDropHeight: 0
82103
maxJumpAcrossDistance: 0
83-
accuratePlacement: 0
84104
minRegionArea: 2
85-
cellSize: 0.16666667
86105
manualCellSize: 0
106+
cellSize: 0.16666667
107+
manualTileSize: 0
108+
tileSize: 256
109+
accuratePlacement: 0
87110
m_NavMeshData: {fileID: 0}
88111
--- !u!1 &311663126
89112
GameObject:
90113
m_ObjectHideFlags: 0
91114
m_PrefabParentObject: {fileID: 0}
92115
m_PrefabInternal: {fileID: 0}
93-
serializedVersion: 4
116+
serializedVersion: 5
94117
m_Component:
95-
- 4: {fileID: 311663128}
96-
- 212: {fileID: 311663127}
97-
- 114: {fileID: 311663129}
98-
- 114: {fileID: 311663130}
118+
- component: {fileID: 311663128}
119+
- component: {fileID: 311663127}
120+
- component: {fileID: 311663129}
121+
- component: {fileID: 311663130}
99122
m_Layer: 0
100123
m_Name: Logo
101124
m_TagString: Untagged
@@ -112,27 +135,37 @@ SpriteRenderer:
112135
m_Enabled: 1
113136
m_CastShadows: 0
114137
m_ReceiveShadows: 0
138+
m_MotionVectors: 1
139+
m_LightProbeUsage: 0
140+
m_ReflectionProbeUsage: 0
115141
m_Materials:
116-
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
117-
m_SubsetIndices:
142+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
143+
m_StaticBatchInfo:
144+
firstSubMesh: 0
145+
subMeshCount: 0
118146
m_StaticBatchRoot: {fileID: 0}
119-
m_UseLightProbes: 0
120-
m_ReflectionProbeUsage: 0
121147
m_ProbeAnchor: {fileID: 0}
148+
m_LightProbeVolumeOverride: {fileID: 0}
122149
m_ScaleInLightmap: 1
123150
m_PreserveUVs: 0
124151
m_IgnoreNormalsForChartDetection: 0
125152
m_ImportantGI: 0
153+
m_SelectedEditorRenderState: 0
126154
m_MinimumChartSize: 4
127155
m_AutoUVMaxDistance: 0.5
128156
m_AutoUVMaxAngle: 89
129157
m_LightmapParameters: {fileID: 0}
130158
m_SortingLayerID: 0
159+
m_SortingLayer: 0
131160
m_SortingOrder: 0
132161
m_Sprite: {fileID: 21300000, guid: c80f4ead14f34d044aeff03d11d81c2d, type: 3}
133162
m_Color: {r: 1, g: 1, b: 1, a: 1}
134163
m_FlipX: 0
135164
m_FlipY: 0
165+
m_DrawMode: 0
166+
m_Size: {x: 1, y: 1}
167+
m_AdaptiveModeThreshold: 0.5
168+
m_SpriteTileMode: 0
136169
--- !u!4 &311663128
137170
Transform:
138171
m_ObjectHideFlags: 0
@@ -142,10 +175,10 @@ Transform:
142175
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
143176
m_LocalPosition: {x: 0, y: 0, z: 0}
144177
m_LocalScale: {x: 68.08619, y: 68.08623, z: 68.08623}
145-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
146178
m_Children: []
147179
m_Father: {fileID: 1772590661}
148180
m_RootOrder: 0
181+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
149182
--- !u!114 &311663129
150183
MonoBehaviour:
151184
m_ObjectHideFlags: 0
@@ -225,6 +258,10 @@ Prefab:
225258
propertyPath: mFadeInTime
226259
value: 1.5
227260
objectReference: {fileID: 0}
261+
- target: {fileID: 11439248, guid: cea3ae018e023684283757410f3065f4, type: 2}
262+
propertyPath: mType
263+
value: 2
264+
objectReference: {fileID: 0}
228265
m_RemovedComponents: []
229266
m_ParentPrefab: {fileID: 100100000, guid: cea3ae018e023684283757410f3065f4, type: 2}
230267
m_IsPrefabParent: 0
@@ -342,11 +379,11 @@ GameObject:
342379
m_ObjectHideFlags: 0
343380
m_PrefabParentObject: {fileID: 0}
344381
m_PrefabInternal: {fileID: 0}
345-
serializedVersion: 4
382+
serializedVersion: 5
346383
m_Component:
347-
- 4: {fileID: 1072649918}
348-
- 114: {fileID: 1072649917}
349-
- 114: {fileID: 1072649916}
384+
- component: {fileID: 1072649918}
385+
- component: {fileID: 1072649917}
386+
- component: {fileID: 1072649916}
350387
m_Layer: 0
351388
m_Name: EventSystem
352389
m_TagString: Untagged
@@ -395,10 +432,10 @@ Transform:
395432
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
396433
m_LocalPosition: {x: 0, y: 0, z: 0}
397434
m_LocalScale: {x: 1, y: 1, z: 1}
398-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
399435
m_Children: []
400436
m_Father: {fileID: 0}
401437
m_RootOrder: 1
438+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
402439
--- !u!1001 &1327007421
403440
Prefab:
404441
m_ObjectHideFlags: 0
@@ -467,13 +504,13 @@ GameObject:
467504
m_ObjectHideFlags: 0
468505
m_PrefabParentObject: {fileID: 0}
469506
m_PrefabInternal: {fileID: 0}
470-
serializedVersion: 4
507+
serializedVersion: 5
471508
m_Component:
472-
- 224: {fileID: 1426560445}
473-
- 223: {fileID: 1426560444}
474-
- 114: {fileID: 1426560443}
475-
- 114: {fileID: 1426560442}
476-
- 114: {fileID: 1426560446}
509+
- component: {fileID: 1426560445}
510+
- component: {fileID: 1426560444}
511+
- component: {fileID: 1426560443}
512+
- component: {fileID: 1426560442}
513+
- component: {fileID: 1426560446}
477514
m_Layer: 5
478515
m_Name: Canvas
479516
m_TagString: Untagged
@@ -525,7 +562,7 @@ Canvas:
525562
m_PrefabInternal: {fileID: 0}
526563
m_GameObject: {fileID: 1426560441}
527564
m_Enabled: 1
528-
serializedVersion: 2
565+
serializedVersion: 3
529566
m_RenderMode: 1
530567
m_Camera: {fileID: 1327007422}
531568
m_PlaneDistance: 100
@@ -534,6 +571,7 @@ Canvas:
534571
m_OverrideSorting: 0
535572
m_OverridePixelPerfect: 0
536573
m_SortingBucketNormalizedSize: 0
574+
m_AdditionalShaderChannelsFlag: 25
537575
m_SortingLayerID: 0
538576
m_SortingOrder: 1
539577
m_TargetDisplay: 0
@@ -546,11 +584,11 @@ RectTransform:
546584
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
547585
m_LocalPosition: {x: 0, y: 0, z: 0}
548586
m_LocalScale: {x: 0, y: 0, z: 0}
549-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
550587
m_Children:
551588
- {fileID: 1772590661}
552589
m_Father: {fileID: 0}
553590
m_RootOrder: 0
591+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
554592
m_AnchorMin: {x: 0, y: 0}
555593
m_AnchorMax: {x: 0, y: 0}
556594
m_AnchoredPosition: {x: 0, y: 0}
@@ -570,6 +608,110 @@ MonoBehaviour:
570608
mCanvas: {fileID: 0}
571609
mResizeUI: {fileID: 0}
572610
mResizeUI_path: JCSUnity_Resources/JCS_LevelDesignUI/ResizeUI
611+
--- !u!1001 &1466177861
612+
Prefab:
613+
m_ObjectHideFlags: 0
614+
serializedVersion: 2
615+
m_Modification:
616+
m_TransformParent: {fileID: 1772590661}
617+
m_Modifications:
618+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
619+
type: 2}
620+
propertyPath: m_LocalPosition.x
621+
value: 0
622+
objectReference: {fileID: 0}
623+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
624+
type: 2}
625+
propertyPath: m_LocalPosition.y
626+
value: 0
627+
objectReference: {fileID: 0}
628+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
629+
type: 2}
630+
propertyPath: m_LocalPosition.z
631+
value: 0
632+
objectReference: {fileID: 0}
633+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
634+
type: 2}
635+
propertyPath: m_LocalRotation.x
636+
value: 0
637+
objectReference: {fileID: 0}
638+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
639+
type: 2}
640+
propertyPath: m_LocalRotation.y
641+
value: 0
642+
objectReference: {fileID: 0}
643+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
644+
type: 2}
645+
propertyPath: m_LocalRotation.z
646+
value: 0
647+
objectReference: {fileID: 0}
648+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
649+
type: 2}
650+
propertyPath: m_LocalRotation.w
651+
value: 1
652+
objectReference: {fileID: 0}
653+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
654+
type: 2}
655+
propertyPath: m_RootOrder
656+
value: 1
657+
objectReference: {fileID: 0}
658+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
659+
type: 2}
660+
propertyPath: m_AnchoredPosition.x
661+
value: 0
662+
objectReference: {fileID: 0}
663+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
664+
type: 2}
665+
propertyPath: m_AnchoredPosition.y
666+
value: 0
667+
objectReference: {fileID: 0}
668+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
669+
type: 2}
670+
propertyPath: m_SizeDelta.x
671+
value: 1920
672+
objectReference: {fileID: 0}
673+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
674+
type: 2}
675+
propertyPath: m_SizeDelta.y
676+
value: 1080
677+
objectReference: {fileID: 0}
678+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
679+
type: 2}
680+
propertyPath: m_AnchorMin.x
681+
value: 0.5
682+
objectReference: {fileID: 0}
683+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
684+
type: 2}
685+
propertyPath: m_AnchorMin.y
686+
value: 0.5
687+
objectReference: {fileID: 0}
688+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
689+
type: 2}
690+
propertyPath: m_AnchorMax.x
691+
value: 0.5
692+
objectReference: {fileID: 0}
693+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
694+
type: 2}
695+
propertyPath: m_AnchorMax.y
696+
value: 0.5
697+
objectReference: {fileID: 0}
698+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
699+
type: 2}
700+
propertyPath: m_Pivot.x
701+
value: 0.5
702+
objectReference: {fileID: 0}
703+
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
704+
type: 2}
705+
propertyPath: m_Pivot.y
706+
value: 0.5
707+
objectReference: {fileID: 0}
708+
- target: {fileID: 1000011437460340, guid: cdb4bb889ec50414c92ff3d9a2630848, type: 2}
709+
propertyPath: m_IsActive
710+
value: 0
711+
objectReference: {fileID: 0}
712+
m_RemovedComponents: []
713+
m_ParentPrefab: {fileID: 100100000, guid: cdb4bb889ec50414c92ff3d9a2630848, type: 2}
714+
m_IsPrefabParent: 0
573715
--- !u!224 &1772590661 stripped
574716
RectTransform:
575717
m_PrefabParentObject: {fileID: 22457494, guid: 5e738c8e180c9d344ab559f867a0fe2c,
@@ -612,7 +754,7 @@ Prefab:
612754
objectReference: {fileID: 0}
613755
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 2}
614756
propertyPath: m_RootOrder
615-
value: 4
757+
value: 3
616758
objectReference: {fileID: 0}
617759
- target: {fileID: 11485796, guid: f3f4b7d5553961e4cb7509494c81b400, type: 2}
618760
propertyPath: THIS_IS_GAME_SCENE

0 commit comments

Comments
 (0)