diff --git a/namedropper/Assets/Fonts/narrow/IMPACT SDF.asset b/namedropper/Assets/Fonts/narrow/IMPACT SDF.asset index 7384e63..fe624f3 100644 --- a/namedropper/Assets/Fonts/narrow/IMPACT SDF.asset +++ b/namedropper/Assets/Fonts/narrow/IMPACT SDF.asset @@ -49,14 +49,15 @@ Texture2D: path: --- !u!21 &-2286323512744935518 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: IMPACT SDF Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -86,6 +87,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Ambient: 0.5 - _Bevel: 0.5 @@ -112,7 +114,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.214 + - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8333333 diff --git a/namedropper/Assets/Scenes/Game.unity b/namedropper/Assets/Scenes/Game.unity index e01f0c4..e58b51a 100644 --- a/namedropper/Assets/Scenes/Game.unity +++ b/namedropper/Assets/Scenes/Game.unity @@ -151,6 +151,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.15} m_LocalScale: {x: 239.22668, y: 227.28369, z: 80.4715} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1666960088} m_RootOrder: 0 @@ -171,6 +172,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -263,6 +265,7 @@ RectTransform: 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: 107001399} m_RootOrder: 4 @@ -321,13 +324,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 43.55 + value: 34.25 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontAsset @@ -335,7 +342,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.99030876 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -343,7 +350,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7877358 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -351,7 +358,7 @@ PrefabInstance: objectReference: {fileID: 1001970574707011636, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4294836169 + value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -538,6 +545,7 @@ RectTransform: 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: - {fileID: 1225785572} - {fileID: 1957998282} @@ -584,6 +592,7 @@ RectTransform: 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: 107001399} m_RootOrder: 3 @@ -1024,6 +1033,7 @@ RectTransform: 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: - {fileID: 1973273086} - {fileID: 1729924321} @@ -1192,13 +1202,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 43.55 + value: 34.25 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontAsset @@ -1206,7 +1220,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.017164495 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -1214,7 +1228,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.2924528 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -1222,7 +1236,7 @@ PrefabInstance: objectReference: {fileID: 1001970574707011636, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4278452299 + value: 4278190080 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -1414,6 +1428,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -940, y: 10.08606, z: 0} m_LocalScale: {x: 1, y: 1.675, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1391939819} m_RootOrder: 0 @@ -1429,6 +1444,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1497,6 +1513,7 @@ RectTransform: 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: 107001399} m_RootOrder: 7 @@ -1575,6 +1592,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 939.06, y: 10.08606, z: 0} m_LocalScale: {x: 2, y: 1.675, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146299635} m_RootOrder: 1 @@ -1590,6 +1608,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1780,6 +1799,7 @@ RectTransform: 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: 107001399} m_RootOrder: 2 @@ -2239,6 +2259,7 @@ RectTransform: 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: - {fileID: 1200810652} - {fileID: 974885549} @@ -2404,6 +2425,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -798.47, y: 10.08606, z: 0} m_LocalScale: {x: 1.3, y: 1.675, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146299635} m_RootOrder: 0 @@ -2419,6 +2441,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2609,6 +2632,7 @@ RectTransform: 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: 107001399} m_RootOrder: 0 @@ -2812,6 +2836,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -2844,6 +2869,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -2874,6 +2900,7 @@ RectTransform: 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: - {fileID: 903959529} - {fileID: 1959472267} @@ -2918,6 +2945,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -61.77} m_LocalScale: {x: 13.604, y: 13.604, z: 13.604} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 107001399} m_RootOrder: 6 @@ -3115,6 +3143,7 @@ RectTransform: 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: 107001399} m_RootOrder: 8 @@ -3245,6 +3274,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 960, y: 540, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -3399,6 +3429,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -61.77} m_LocalScale: {x: 13.604, y: 13.604, z: 13.604} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 107001399} m_RootOrder: 5 @@ -3604,13 +3635,13 @@ MonoBehaviour: - {fileID: 1791992020} - {fileID: 1777639902} - {fileID: 707823885} + Timer: {fileID: 1225785573} + RoundNumber: {fileID: 924483020} + Topic: {fileID: 1415156232} Score1: {fileID: 1957998283} Score2: {fileID: 1042264265} Score3: {fileID: 119717092} Score4: {fileID: 64627489} - Timer: {fileID: 1225785573} - RoundNumber: {fileID: 924483020} - Topic: {fileID: 1415156232} CategoriesRound1: {fileID: 554321082} CategoriesRound2: {fileID: 1146299634} CategoriesRound3: {fileID: 1391939818} @@ -3626,6 +3657,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 328.70825, y: 532.0139, z: -188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -3688,6 +3720,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 23665175} - {fileID: 107001399} @@ -3913,6 +3946,7 @@ RectTransform: 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: - {fileID: 191539951} - {fileID: 1801753664} @@ -3955,6 +3989,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 939.06006, y: 10.08606, z: 0} m_LocalScale: {x: -3.14, y: 1.675, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 554321083} m_RootOrder: 1 @@ -3970,6 +4005,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4312,6 +4348,7 @@ RectTransform: 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: - {fileID: 76032779} - {fileID: 554720354} @@ -4353,6 +4390,7 @@ RectTransform: 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: 107001399} m_RootOrder: 1 @@ -4431,6 +4469,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 926, y: 10.08606, z: 0} m_LocalScale: {x: 1, y: 1.675, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1391939819} m_RootOrder: 1 @@ -4446,6 +4485,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4513,6 +4553,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -798.47, y: 10.08606, z: 0} m_LocalScale: {x: 2.13, y: 1.675, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 554321083} m_RootOrder: 0 @@ -4528,6 +4569,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4575,13 +4617,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 43.55 + value: 34.25 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontAsset @@ -4589,7 +4635,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.99030876 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -4597,7 +4643,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7877358 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -4605,7 +4651,7 @@ PrefabInstance: objectReference: {fileID: 1001970574707011636, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4294836169 + value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -5004,6 +5050,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3246767593435583328, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalRotation.w value: 0.9961947 @@ -5022,7 +5072,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 43.55 + value: 34.25 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontAsset @@ -5030,15 +5080,15 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.6698113 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.28364882 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.022116425 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -5046,7 +5096,7 @@ PrefabInstance: objectReference: {fileID: 1001970574707011636, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4289415174 + value: 4278190080 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team diff --git a/namedropper/Assets/Scenes/Ontology.unity b/namedropper/Assets/Scenes/Ontology.unity index 5c7e950..1a95cf4 100644 --- a/namedropper/Assets/Scenes/Ontology.unity +++ b/namedropper/Assets/Scenes/Ontology.unity @@ -221,6 +221,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 @@ -239,7 +243,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.99030876 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -247,7 +251,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7877358 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -1156,6 +1160,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 @@ -1174,7 +1182,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.017164495 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -1182,7 +1190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.2924528 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -4546,6 +4554,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 @@ -4564,7 +4576,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.99030876 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -4572,7 +4584,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7877358 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -4979,6 +4991,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3246767593435583328, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalRotation.w value: 0.9961947 @@ -5009,15 +5025,15 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.6698113 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.28364882 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.022116425 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial diff --git a/namedropper/Assets/Scenes/RaceGame.unity b/namedropper/Assets/Scenes/RaceGame.unity index 101621a..46e1446 100644 --- a/namedropper/Assets/Scenes/RaceGame.unity +++ b/namedropper/Assets/Scenes/RaceGame.unity @@ -367,6 +367,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 @@ -385,7 +389,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.99030876 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -393,7 +397,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7877358 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -2386,6 +2390,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 @@ -2404,7 +2412,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.017164495 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -2412,7 +2420,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.2924528 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -5447,6 +5455,7 @@ MonoBehaviour: _players: [] Timer: {fileID: 1225785573} RoundNumber: {fileID: 924483020} + Topic: {fileID: 0} --- !u!1 &1666960087 GameObject: m_ObjectHideFlags: 0 @@ -7017,6 +7026,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3300629709659245742, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalPosition.z value: -3.63 @@ -7035,7 +7048,7 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.99030876 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g @@ -7043,7 +7056,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7877358 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial @@ -7498,6 +7511,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3246767593435583328, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_LocalRotation.w value: 0.9961947 @@ -7528,15 +7545,15 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 4fe6d5308385b4341885d0d510c8e2aa, type: 2} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.6698113 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.28364882 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.022116425 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_sharedMaterial diff --git a/namedropper/Assets/Scenes/Title.unity b/namedropper/Assets/Scenes/Title.unity index 4056be4..bc7963a 100644 --- a/namedropper/Assets/Scenes/Title.unity +++ b/namedropper/Assets/Scenes/Title.unity @@ -149,6 +149,7 @@ RectTransform: 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: - {fileID: 1225785572} - {fileID: 277092717} @@ -184,15 +185,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 44.25 + value: 34.85 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.9441657 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r @@ -200,7 +201,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4294963456 + value: 4278190080 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -388,6 +389,7 @@ RectTransform: 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: 107001399} m_RootOrder: 1 @@ -492,7 +494,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2980751867113818293, guid: 790b53bfae3a1424bb8a7aca77f1a2da, type: 3} propertyPath: m_Name - value: ScoreStackBlue + value: ScoreStackGreen objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 790b53bfae3a1424bb8a7aca77f1a2da, type: 3} @@ -522,6 +524,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0051374, y: 1.0051374, z: 1.0051374} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1272407094} - {fileID: 261236786} @@ -548,23 +551,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 42.65 + value: 33.6 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.27615115 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4282402559 + value: 4278190080 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -768,6 +771,7 @@ RectTransform: 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: 1666960088} m_RootOrder: 3 @@ -887,23 +891,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 42.25 + value: 33.25 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.12253404 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7169812 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4280221879 + value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -1103,6 +1107,7 @@ RectTransform: 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: 107001399} m_RootOrder: 0 @@ -1184,6 +1189,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1216,6 +1222,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1233,7 +1240,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 42.65 + value: 33.55 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b @@ -1241,15 +1248,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.306108 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4294921728 + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 7992912250974679967, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -1448,6 +1459,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 40.521, y: 40.521, z: 40.521} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1666960088} m_RootOrder: 4 @@ -1468,6 +1480,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1587,6 +1600,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 960, y: 540, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1710,6 +1724,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 328.70825, y: 532.0139, z: -188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1772,6 +1787,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2075748657} - {fileID: 868125099} @@ -2008,6 +2024,7 @@ RectTransform: 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: - {fileID: 1866955251} m_Father: {fileID: 1666960088} diff --git a/namedropper/Assets/Scenes/TopicSelect.unity b/namedropper/Assets/Scenes/TopicSelect.unity index 1aaf3ad..b43f091 100644 --- a/namedropper/Assets/Scenes/TopicSelect.unity +++ b/namedropper/Assets/Scenes/TopicSelect.unity @@ -165,6 +165,7 @@ RectTransform: 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: - {fileID: 1225785572} - {fileID: 277092717} @@ -184,21 +185,25 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 868125099} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text value: Player\u00A01 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 44.25 + value: 34.85 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.9441657 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r @@ -206,7 +211,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4294963456 + value: 4278190080 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -399,6 +404,7 @@ RectTransform: 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: 107001399} m_RootOrder: 1 @@ -478,6 +484,7 @@ RectTransform: 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: 107001399} m_RootOrder: 2 @@ -555,6 +562,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0051374, y: 1.0051374, z: 1.0051374} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1272407094} - {fileID: 261236786} @@ -575,29 +583,33 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 868125099} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text value: Player\u00A04 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 42.65 + value: 33.6 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.27615115 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4282402559 + value: 4278190080 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -785,29 +797,33 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 868125099} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text value: Player\u00A03 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 42.25 + value: 33.25 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b - value: 0.12253404 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0.7169812 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4280221879 + value: 4294506744 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -1012,6 +1028,7 @@ RectTransform: 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: 107001399} m_RootOrder: 0 @@ -1093,6 +1110,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1125,6 +1143,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1136,13 +1155,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 868125099} m_Modifications: + - target: {fileID: 3223008826524451067, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text value: Player\u00A02 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontSize - value: 42.65 + value: 33.55 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.b @@ -1150,15 +1173,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.306108 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4294921728 + value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -1414,6 +1437,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 960, y: 540, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1470,16 +1494,15 @@ MonoBehaviour: - {fileID: 261236787} - {fileID: 1003872902} - {fileID: 1192266244} + Timer: {fileID: 0} + RoundNumber: {fileID: 0} + Topic: {fileID: 0} _topic1Box: {fileID: 1797572950} _topic2Box: {fileID: 1500576227} _topic3Box: {fileID: 18155122} _title: {fileID: 1225785573} _subTitle: {fileID: 277092718} _subTitle2: {fileID: 760273395} - _player1: {fileID: 261236787} - _player2: {fileID: 1272407095} - _player3: {fileID: 1192266244} - _player4: {fileID: 1003872902} --- !u!4 &1641253473 Transform: m_ObjectHideFlags: 0 @@ -1490,6 +1513,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 328.70825, y: 532.0139, z: -188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1552,6 +1576,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 868125099} - {fileID: 107001399} @@ -1651,6 +1676,7 @@ RectTransform: 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: - {fileID: 1499098757330260238} - {fileID: 1499098758550182527} @@ -1689,6 +1715,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757079836144} m_RootOrder: 3 @@ -1703,6 +1730,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757330260238} m_RootOrder: 3 @@ -1717,6 +1745,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098758550182527} m_RootOrder: 3 @@ -1809,6 +1838,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 745, y: -10.900024, z: -188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1499098758612486788} - {fileID: 1499098757566106219} @@ -1863,6 +1893,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -126.34, y: 20.986084, z: 188.99962} m_LocalScale: {x: -1.9728489, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098758550182527} m_RootOrder: 0 @@ -1878,6 +1909,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1946,6 +1978,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1996,6 +2029,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.34, y: -351.8, z: 188.99962} m_LocalScale: {x: 2.5787544, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757330260238} m_RootOrder: 1 @@ -2010,6 +2044,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -489, y: -10.900024, z: -188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1499098758326845050} - {fileID: 1499098757246647957} @@ -2048,6 +2083,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2098,6 +2134,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.34, y: -351.8, z: 188.99962} m_LocalScale: {x: 2.5787544, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757079836144} m_RootOrder: 1 @@ -2171,6 +2208,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757079836144} m_RootOrder: 2 @@ -2208,6 +2246,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757330260238} m_RootOrder: 2 @@ -2304,6 +2343,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.34, y: -351.8, z: 188.99962} m_LocalScale: {x: 2.5787544, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098758550182527} m_RootOrder: 1 @@ -2319,6 +2359,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2369,6 +2410,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -126.34, y: 20.986084, z: 188.99962} m_LocalScale: {x: -1.9728489, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757330260238} m_RootOrder: 0 @@ -2401,6 +2443,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2469,6 +2512,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 129, y: -10.900024, z: -188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1499098757134185739} - {fileID: 1499098758230636004} @@ -2489,6 +2533,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2539,6 +2584,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -126.34, y: 20.986084, z: 188.99962} m_LocalScale: {x: -1.9728489, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757079836144} m_RootOrder: 0 @@ -2588,6 +2634,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 188.99962} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098758550182527} m_RootOrder: 2 @@ -2650,6 +2697,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2701,6 +2749,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2752,6 +2801,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2803,6 +2853,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2854,6 +2905,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2905,6 +2957,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3057,6 +3110,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757330260238} m_RootOrder: 4 @@ -3071,6 +3125,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098757079836144} m_RootOrder: 4 @@ -3085,6 +3140,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -127.20996, y: -243, z: 188.9996} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1499098758550182527} m_RootOrder: 4 diff --git a/namedropper/Assets/Scripts/GameManager.cs b/namedropper/Assets/Scripts/GameManager.cs index e4d1581..8532914 100644 --- a/namedropper/Assets/Scripts/GameManager.cs +++ b/namedropper/Assets/Scripts/GameManager.cs @@ -25,7 +25,7 @@ public class GameManager public static int MVP = -1; public static bool AllowUnlock = false; - bool _doubleBlueScores = false; + bool _doubleGreenScores = false; bool _doubleRedScores = false; public static void TurnOnGravity() @@ -57,7 +57,7 @@ public class GameManager Score3 = 0; Score4 = 0; Round = 1; - DoubleBlueScores = false; + DoubleGreenScores = false; DoubleRedScores = false; for (int i = 0; i < 4; i++) @@ -68,7 +68,7 @@ public class GameManager public void RestartGame() { - GameObject.Destroy(GameObject.Find("/ScoreStackBlue")); + GameObject.Destroy(GameObject.Find("/ScoreStackGreen")); GameObject.Destroy(GameObject.Find("/ScoreStackRed")); Reset(); GameDataManager.Instance.Reset(); @@ -118,6 +118,6 @@ public class GameManager } } - public bool DoubleBlueScores { get => _doubleBlueScores; set => _doubleBlueScores = value; } + public bool DoubleGreenScores { get => _doubleGreenScores; set => _doubleGreenScores = value; } public bool DoubleRedScores { get => _doubleRedScores; set => _doubleRedScores = value; } } \ No newline at end of file diff --git a/namedropper/Assets/Scripts/GameOverScreen.cs b/namedropper/Assets/Scripts/GameOverScreen.cs index 71d34d5..d339fd3 100644 --- a/namedropper/Assets/Scripts/GameOverScreen.cs +++ b/namedropper/Assets/Scripts/GameOverScreen.cs @@ -21,18 +21,18 @@ public class GameOverScreen : Level } else { - ScoreStack blueScoreStack = GameObject.Find("/ScoreStackBlue").GetComponent(); + ScoreStack greenScoreStack = GameObject.Find("/ScoreStackGreen").GetComponent(); ScoreStack redScoreStack = GameObject.Find("/ScoreStackRed").GetComponent(); - //blueScoreStack.AddChecker(54, true); + //greenScoreStack.AddChecker(54, true); //redScoreStack.AddChecker(57, true); const int scoreSize = 450; - _gameOverMessage.text = "" + blueScoreStack.Score + " to " + redScoreStack.Score + "\n"; - if (blueScoreStack.Score > redScoreStack.Score) + _gameOverMessage.text = "" + greenScoreStack.Score + " to " + redScoreStack.Score + "\n"; + if (greenScoreStack.Score > redScoreStack.Score) { - _gameOverMessage.text += "BLUE TEAM WINS!"; + _gameOverMessage.text += "GREEN TEAM WINS!"; } - else if (redScoreStack.Score > blueScoreStack.Score) + else if (redScoreStack.Score > greenScoreStack.Score) { _gameOverMessage.text += "RED TEAM WINS!"; } @@ -78,13 +78,13 @@ public class GameOverScreen : Level if (GameManager.Instance.Score1 > bestScore) { bestScore = GameManager.Instance.Score1; - mvpName = "light blue"; + mvpName = "light green"; bestPlayerNumber = 0; } if (GameManager.Instance.Score2 > bestScore) { bestScore = GameManager.Instance.Score2; - mvpName = "dark blue"; + mvpName = "dark green"; bestPlayerNumber = 1; } if (GameManager.Instance.Score3 > bestScore) diff --git a/namedropper/Assets/Scripts/JoinPlayer.cs b/namedropper/Assets/Scripts/JoinPlayer.cs index 5ca0d94..cb7fff8 100644 --- a/namedropper/Assets/Scripts/JoinPlayer.cs +++ b/namedropper/Assets/Scripts/JoinPlayer.cs @@ -77,11 +77,11 @@ public class JoinPlayer : MonoBehaviour Invoke("Redo", 2f); } else if (GameManager.Instance.NumPlayers == 3){ - string color = "blue"; + string color = "green"; if (GameManager.Instance.PlayerJoined[0] == false || GameManager.Instance.PlayerJoined[1] == false) { - color = "blue"; - GameManager.Instance.DoubleBlueScores = true; + color = "green"; + GameManager.Instance.DoubleGreenScores = true; } else { diff --git a/namedropper/Assets/Scripts/Level.cs b/namedropper/Assets/Scripts/Level.cs index 7a47d1c..a509937 100644 --- a/namedropper/Assets/Scripts/Level.cs +++ b/namedropper/Assets/Scripts/Level.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; public class Level : MonoBehaviour { public List _players; - ScoreStack _blueScoreStack; + ScoreStack _greenScoreStack; ScoreStack _redScoreStack; [SerializeField] protected Text Timer; [SerializeField] protected Text RoundNumber; @@ -29,7 +29,7 @@ public class Level : MonoBehaviour { if (RoundNumber != null) RoundNumber.text = GameManager.Instance.GetRoundName(); - _blueScoreStack = GameObject.Find("/ScoreStackBlue")?.GetComponent(); + _greenScoreStack = GameObject.Find("/ScoreStackGreen")?.GetComponent(); _redScoreStack = GameObject.Find("/ScoreStackRed")?.GetComponent(); if (Timer != null) @@ -121,18 +121,18 @@ public class Level : MonoBehaviour { if (player == 0) { - if (GameManager.Instance.DoubleBlueScores) + if (GameManager.Instance.DoubleGreenScores) amount *= 2; GameManager.Instance.Score1 += amount; - _blueScoreStack.AddChecker(amount / 10, true); + _greenScoreStack.AddChecker(amount / 10, true); } else if (player == 1) { - if (GameManager.Instance.DoubleBlueScores) + if (GameManager.Instance.DoubleGreenScores) amount *= 2; - _blueScoreStack.AddChecker(amount / 10, false); + _greenScoreStack.AddChecker(amount / 10, false); GameManager.Instance.Score2 += amount; } else if (player == 2) diff --git a/namedropper/Assets/Scripts/Player.cs b/namedropper/Assets/Scripts/Player.cs index 858813d..265f89e 100644 --- a/namedropper/Assets/Scripts/Player.cs +++ b/namedropper/Assets/Scripts/Player.cs @@ -53,7 +53,7 @@ public class Player : MonoBehaviour public enum Team { RED, - BLUE + GREEN } public Rigidbody2D _rigidbody; diff --git a/namedropper/Assets/Scripts/RoundOutro.cs b/namedropper/Assets/Scripts/RoundOutro.cs index e9d5acf..8145dc9 100644 --- a/namedropper/Assets/Scripts/RoundOutro.cs +++ b/namedropper/Assets/Scripts/RoundOutro.cs @@ -11,7 +11,7 @@ public class RoundOutro : MonoBehaviour // Start is called before the first frame update void Start() { - _subtitle.text = "light blue" + " player may\nchoose the topic"; + _subtitle.text = "light green" + " player may\nchoose the topic"; Invoke("Advance", 3f); } diff --git a/namedropper/Assets/Scripts/TopicSelect.cs b/namedropper/Assets/Scripts/TopicSelect.cs index 984f39e..b190c8d 100644 --- a/namedropper/Assets/Scripts/TopicSelect.cs +++ b/namedropper/Assets/Scripts/TopicSelect.cs @@ -61,31 +61,31 @@ public class TopicSelect : Level if (WORST_TEAM_PICKS && GameManager.Instance.NumTeams > 1) { - bool bluePicks = false; - ScoreStack blueScoreStack = GameObject.Find("/ScoreStackBlue").GetComponent(); + bool greenPicks = false; + ScoreStack greenScoreStack = GameObject.Find("/ScoreStackGreen").GetComponent(); ScoreStack redScoreStack = GameObject.Find("/ScoreStackRed").GetComponent(); - string titleText = "" + blueScoreStack.Score + " to " + redScoreStack.Score + "\n"; + string titleText = "" + greenScoreStack.Score + " to " + redScoreStack.Score + "\n"; string text = ""; string text2 = ""; string first = ""; - if (blueScoreStack.Score > redScoreStack.Score) + if (greenScoreStack.Score > redScoreStack.Score) { - text += "Blue team is in the lead\n"; - bluePicks = false; + text += "Green team is in the lead\n"; + greenPicks = false; } - else if (redScoreStack.Score > blueScoreStack.Score) + else if (redScoreStack.Score > greenScoreStack.Score) { text += "Red team is in the lead\n"; - bluePicks = true; + greenPicks = true; } else { - bluePicks = Random.Range(0, 2) == 1; + greenPicks = Random.Range(0, 2) == 1; - if (blueScoreStack.Score + redScoreStack.Score == 0) + if (greenScoreStack.Score + redScoreStack.Score == 0) { //first round @@ -98,13 +98,13 @@ public class TopicSelect : Level { _players[0].GetComponent().SetName("MVP"); _players[1].GetComponent().SetName("MVP"); - bluePicks = true; + greenPicks = true; } else { _players[2].GetComponent().SetName("MVP"); _players[3].GetComponent().SetName("MVP"); - bluePicks = false; + greenPicks = false; } } //else @@ -123,13 +123,13 @@ public class TopicSelect : Level } - if (bluePicks) + if (greenPicks) { - text2 = "Blue team picks the " + first + "topic"; + text2 = "Green team picks the " + first + "topic"; if (GameManager.Instance.PlayerJoined[0]) { if (GameManager.MVP == -1) - _players[0].GetComponent().SetName("blue team"); + _players[0].GetComponent().SetName("green team"); _players[1].GetComponent().BecomeInvisible(); _players[1].GetComponent().PassInputOnto = _players[0].GetComponent(); @@ -137,7 +137,7 @@ public class TopicSelect : Level else { if (GameManager.MVP == -1) - _players[1].GetComponent().SetName("blue team"); + _players[1].GetComponent().SetName("green team"); } _players[2].SetActive(false); @@ -188,13 +188,13 @@ public class TopicSelect : Level if (GameManager.Instance.Score1 < worstScore) { worstScore = GameManager.Instance.Score1; - worstPlayerName = "light blue"; + worstPlayerName = "light green"; worstPlayerNumber = 0; } if (GameManager.Instance.Score2 < worstScore) { worstScore = GameManager.Instance.Score2; - worstPlayerName = "dark blue"; + worstPlayerName = "dark green"; worstPlayerNumber = 1; } if (GameManager.Instance.Score3 < worstScore) diff --git a/namedropper/Assets/Sprites/checkers/checker_darkBlue.png b/namedropper/Assets/Sprites/checkers/checker_darkBlue.png index 6598687..0e11aac 100644 Binary files a/namedropper/Assets/Sprites/checkers/checker_darkBlue.png and b/namedropper/Assets/Sprites/checkers/checker_darkBlue.png differ diff --git a/namedropper/Assets/Sprites/checkers/checker_lightBlue.png b/namedropper/Assets/Sprites/checkers/checker_lightBlue.png index 458e42d..d22e914 100644 Binary files a/namedropper/Assets/Sprites/checkers/checker_lightBlue.png and b/namedropper/Assets/Sprites/checkers/checker_lightBlue.png differ diff --git a/namedropper/Assets/Sprites/pops/pop_darkblue.png b/namedropper/Assets/Sprites/pops/pop_darkblue.png index 4be502f..65dccca 100644 Binary files a/namedropper/Assets/Sprites/pops/pop_darkblue.png and b/namedropper/Assets/Sprites/pops/pop_darkblue.png differ diff --git a/namedropper/Assets/Sprites/pops/pop_darkred.png b/namedropper/Assets/Sprites/pops/pop_darkred.png index d726f0d..fc63d6a 100644 Binary files a/namedropper/Assets/Sprites/pops/pop_darkred.png and b/namedropper/Assets/Sprites/pops/pop_darkred.png differ diff --git a/namedropper/Assets/Sprites/pops/pop_lightblue.png b/namedropper/Assets/Sprites/pops/pop_lightblue.png index 12f9d6d..ec90983 100644 Binary files a/namedropper/Assets/Sprites/pops/pop_lightblue.png and b/namedropper/Assets/Sprites/pops/pop_lightblue.png differ diff --git a/namedropper/Assets/Sprites/pops/pop_lightred.png b/namedropper/Assets/Sprites/pops/pop_lightred.png index 178923e..eecaac2 100644 Binary files a/namedropper/Assets/Sprites/pops/pop_lightred.png and b/namedropper/Assets/Sprites/pops/pop_lightred.png differ