Skip to content

Commit

Permalink
Version update 1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jcs090218 committed Aug 20, 2017
1 parent d891b5a commit fe7eeab
Show file tree
Hide file tree
Showing 300 changed files with 32,933 additions and 11,046 deletions.
3,007 changes: 1,846 additions & 1,161 deletions Assets/BossFight_Assets/Scenes/BF_Game.unity

Large diffs are not rendered by default.

7,456 changes: 5,131 additions & 2,325 deletions Assets/BossFight_Assets/Scenes/BF_Lobby.unity

Large diffs are not rendered by default.

214 changes: 178 additions & 36 deletions Assets/BossFight_Assets/Scenes/BF_LogoScene.unity
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
SceneSettings:
OcclusionCullingSettings:
m_ObjectHideFlags: 0
m_PVSData:
m_PVSObjectsArray: []
m_PVSPortalsArray: []
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 8
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
Expand All @@ -25,6 +25,7 @@ RenderSettings:
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
Expand All @@ -37,12 +38,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 9
m_GIWorkflowMode: 1
m_LightmapsMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand All @@ -53,49 +54,71 @@ LightmapSettings:
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 3
serializedVersion: 8
m_Resolution: 2
m_BakeResolution: 40
m_TextureWidth: 1024
m_TextureHeight: 1024
m_AO: 0
m_AOMaxDistance: 1
m_Padding: 2
m_CompAOExponent: 0
m_CompAOExponentDirect: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_MixedBakeMode: 1
m_BakeBackend: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFiltering: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_LightingDataAsset: {fileID: 0}
m_RuntimeCPUUsage: 25
m_ShadowMaskMode: 2
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
accuratePlacement: 0
minRegionArea: 2
cellSize: 0.16666667
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &311663126
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 311663128}
- 212: {fileID: 311663127}
- 114: {fileID: 311663129}
- 114: {fileID: 311663130}
- component: {fileID: 311663128}
- component: {fileID: 311663127}
- component: {fileID: 311663129}
- component: {fileID: 311663130}
m_Layer: 0
m_Name: Logo
m_TagString: Untagged
Expand All @@ -112,27 +135,37 @@ SpriteRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
m_SubsetIndices:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 0
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: c80f4ead14f34d044aeff03d11d81c2d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
--- !u!4 &311663128
Transform:
m_ObjectHideFlags: 0
Expand All @@ -142,10 +175,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 68.08619, y: 68.08623, z: 68.08623}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 1772590661}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &311663129
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -225,6 +258,10 @@ Prefab:
propertyPath: mFadeInTime
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 11439248, guid: cea3ae018e023684283757410f3065f4, type: 2}
propertyPath: mType
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: cea3ae018e023684283757410f3065f4, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -342,11 +379,11 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 1072649918}
- 114: {fileID: 1072649917}
- 114: {fileID: 1072649916}
- component: {fileID: 1072649918}
- component: {fileID: 1072649917}
- component: {fileID: 1072649916}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
Expand Down Expand Up @@ -395,10 +432,10 @@ Transform:
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1327007421
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -467,13 +504,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 224: {fileID: 1426560445}
- 223: {fileID: 1426560444}
- 114: {fileID: 1426560443}
- 114: {fileID: 1426560442}
- 114: {fileID: 1426560446}
- component: {fileID: 1426560445}
- component: {fileID: 1426560444}
- component: {fileID: 1426560443}
- component: {fileID: 1426560442}
- component: {fileID: 1426560446}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
Expand Down Expand Up @@ -525,7 +562,7 @@ Canvas:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1426560441}
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 1327007422}
m_PlaneDistance: 100
Expand All @@ -534,6 +571,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 1
m_TargetDisplay: 0
Expand All @@ -546,11 +584,11 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1772590661}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
Expand All @@ -570,6 +608,110 @@ MonoBehaviour:
mCanvas: {fileID: 0}
mResizeUI: {fileID: 0}
mResizeUI_path: JCSUnity_Resources/JCS_LevelDesignUI/ResizeUI
--- !u!1001 &1466177861
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1772590661}
m_Modifications:
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_SizeDelta.x
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_SizeDelta.y
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224000011165829780, guid: cdb4bb889ec50414c92ff3d9a2630848,
type: 2}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1000011437460340, guid: cdb4bb889ec50414c92ff3d9a2630848, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: cdb4bb889ec50414c92ff3d9a2630848, type: 2}
m_IsPrefabParent: 0
--- !u!224 &1772590661 stripped
RectTransform:
m_PrefabParentObject: {fileID: 22457494, guid: 5e738c8e180c9d344ab559f867a0fe2c,
Expand Down Expand Up @@ -612,7 +754,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 403812, guid: f3f4b7d5553961e4cb7509494c81b400, type: 2}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 11485796, guid: f3f4b7d5553961e4cb7509494c81b400, type: 2}
propertyPath: THIS_IS_GAME_SCENE
Expand Down
Loading

0 comments on commit fe7eeab

Please sign in to comment.