mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from frizbee19/zoe

Browse Source 
Zoe Prefab
This commit is contained in:
Benji
2022-02-27 03:41:36 -06:00
committed by GitHub
parent 82ffdf1111 dc96800744
commit 643731f54d
6 changed files with 1624 additions and 2498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Art Final/Shelf Sprites/polaroid frame_fireworks.png.meta
+26 -2
View File
@@ -32,7 +32,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -46,7 +46,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 16
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@@ -75,6 +75,30 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
Assets/Font/SFCartoonistHand SDF 1.asset
+1278 -874
View File
File diff suppressed because one or more lines are too long
Assets/Prefabs/EndCredit Prefab.prefab
+5 -5
View File
@@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &687855467128986786
Transform:
m_ObjectHideFlags: 0
@@ -639,7 +639,7 @@ Camera:
m_Enabled: 0
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_BackGroundColor: {r: 0.18039216, g: 0.13333334, b: 0.18431373, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -813,7 +813,7 @@ Camera:
m_Enabled: 0
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_BackGroundColor: {r: 0.18039216, g: 0.13333334, b: 0.18431373, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -969,7 +969,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &6999723469281459480
Transform:
m_ObjectHideFlags: 0
@@ -979,7 +979,7 @@ Transform:
m_GameObject: {fileID: 6999723469281459478}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 37.43464, y: 3.8132353, z: 15.87093}
m_LocalScale: {x: 0.1, y: 0.1, z: 1}
m_LocalScale: {x: 0.2, y: 0.2, z: 1}
m_Children: []
m_Father: {fileID: 4024298208675944916}
m_RootOrder: 1
Assets/Scenes/Game Scenes/Crowds Level.unity
+273 -1613
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Game Scenes/Dark Level.unity
+34 -2
View File
@@ -8489,8 +8489,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7f3324bdaa895394db1ed827a820ab8c, type: 3}
m_Name:
m_EditorClassIdentifier:
currentLevel: 0
i: 2
currentLevel: 3
i: 3
--- !u!4 &1810438011
Transform:
m_ObjectHideFlags: 0
@@ -9658,6 +9658,10 @@ PrefabInstance:
propertyPath: backupbyebye
value:
objectReference: {fileID: 1312893925}
- target: {fileID: 687855467128986789, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1133138391673429717, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: m_Camera
value:
@@ -9714,5 +9718,33 @@ PrefabInstance:
propertyPath: audioManager
value:
objectReference: {fileID: 1190348331}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[2]
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[3]
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[4]
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[8]
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[9]
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[13]
value: 9
objectReference: {fileID: 0}
- target: {fileID: 8373361160025088290, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
propertyPath: emotes.Array.data[14]
value: 11
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8d960d2a345fc1e469e95f87418eb26d, type: 3}
UserSettings/EditorUserSettings.asset
+8 -2
View File
@@ -6,8 +6,11 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
<<<<<<< HEAD
=======
<<<<<<< Updated upstream
<<<<<<< HEAD
>>>>>>> origin/main
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
=======
<<<<<<< Updated upstream
@@ -16,9 +19,11 @@ EditorUserSettings:
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
=======
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
flags: 0
<<<<<<< HEAD
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
=======
<<<<<<< Updated upstream
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
@@ -48,6 +53,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
>>>>>>> Stashed changes
>>>>>>> Stashed changes
>>>>>>> origin/main
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650