Skip to content

Commit

Permalink
adjusted vector color for right and wrong answers
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaohanzai
xiaohanzai committed Aug 16, 2024
1 parent 14e72fb commit b97f466
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 57 deletions.
104 changes: 104 additions & 0 deletions Assets/Prefabs/IllustratorPlaceholder.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5312320556066330773}
- component: {fileID: 2048833762263175648}
m_Layer: 0
m_Name: IllustratorPlaceholder
m_TagString: Untagged
Expand All @@ -30,8 +31,25 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5864175473428269189}
- {fileID: 1172836337391230859}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2048833762263175648
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6814369193950711701}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 22235106963a1402e96bb97cbdf777c7, type: 3}
m_Name:
m_EditorClassIdentifier:
lineRenderer: {fileID: 4900282625105777343}
meshRenderer: {fileID: 4695724274862781418}
rightAnswerMaterial: {fileID: 2100000, guid: 0d1b5bff99a9f41bb84d8a37bca759b4, type: 2}
wrongAnswerMaterial: {fileID: 2100000, guid: a0819622f60854681b5d0e395338d523, type: 2}
--- !u!1001 &6263106271730036590
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -120,9 +138,95 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 550505131a91243a4826cff971c21e70, type: 3}
--- !u!23 &4695724274862781418 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 550505131a91243a4826cff971c21e70,
type: 3}
m_PrefabInstance: {fileID: 6263106271730036590}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5864175473428269189 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 550505131a91243a4826cff971c21e70,
type: 3}
m_PrefabInstance: {fileID: 6263106271730036590}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6454879219484788586
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5312320556066330773}
m_Modifications:
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.1304557
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.1902184
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.6756378
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5687201655287064470, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
propertyPath: m_Name
value: IllustratorLineRenderer
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15774c0cf57fc4c1395cec80df91e926, type: 3}
--- !u!4 &1172836337391230859 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5319479157765101793, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
m_PrefabInstance: {fileID: 6454879219484788586}
m_PrefabAsset: {fileID: 0}
--- !u!120 &4900282625105777343 stripped
LineRenderer:
m_CorrespondingSourceObject: {fileID: 2131640127037101525, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
m_PrefabInstance: {fileID: 6454879219484788586}
m_PrefabAsset: {fileID: 0}
51 changes: 1 addition & 50 deletions Assets/Scenes/MainGame.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17339,52 +17339,6 @@ Transform:
- {fileID: 772802166}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &904147021
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 904147023}
- component: {fileID: 904147022}
m_Layer: 0
m_Name: WallPrefabSpawner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &904147022
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904147021}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0822689342fb24d7bbb22ad7b1a2b2a8, type: 3}
m_Name:
m_EditorClassIdentifier:
_label: 4
_prefab: {fileID: 1338636542848519033, guid: 625337987843244e6a1deb0b32aabf15, type: 3}
--- !u!4 &904147023
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 904147021}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.038300008, y: 1.0599048, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &907175465
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -19885,14 +19839,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: feb5f27449e7e4e10bf6fa0d8a66c1e6, type: 3}
m_Name:
m_EditorClassIdentifier:
lineRendererPrefab: {fileID: 2131640127037101525, guid: 15774c0cf57fc4c1395cec80df91e926,
type: 3}
text0: {fileID: 1473284814}
text1: {fileID: 820883165}
text2: {fileID: 1089392139}
speed: 0.5
gridObjectTransform: {fileID: 3980103496815401057}
illustratorPrefab: {fileID: 6814369193950711701, guid: be9812efe6a2744bf942fd131920da4f,
illustratorPrefab: {fileID: 2048833762263175648, guid: be9812efe6a2744bf942fd131920da4f,
type: 3}
projectilePrefab: {fileID: -6455355190530209502, guid: fed704390e95049fd95774a88335c5c3,
type: 3}
Expand Down Expand Up @@ -39154,7 +39106,6 @@ SceneRoots:
- {fileID: 410087041}
- {fileID: 832575519}
- {fileID: 1991163098}
- {fileID: 904147023}
- {fileID: 3980103496815401057}
- {fileID: 628880549}
- {fileID: 1049274335}
Expand Down
20 changes: 13 additions & 7 deletions Assets/Scripts/AnswerIllustrator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

public class AnswerIllustrator : MonoBehaviour
{
[SerializeField] private LineRenderer lineRendererPrefab;

[SerializeField] private TextMeshProUGUI text0;
[SerializeField] private TextMeshProUGUI text1;
[SerializeField] private TextMeshProUGUI text2;
Expand All @@ -18,7 +16,7 @@ public class AnswerIllustrator : MonoBehaviour
[SerializeField] private float speed = 1f;

[SerializeField] private Transform gridObjectTransform;
[SerializeField] private GameObject illustratorPrefab;
[SerializeField] private Illustrator illustratorPrefab;
[SerializeField] private Projectile projectilePrefab;
[SerializeField] private GameObject cannonObject;

Expand Down Expand Up @@ -88,11 +86,20 @@ public void ShowAnswer(int i)

IEnumerator Co_MoveIllustratorAndShoot(Vector3 target)
{
GameObject illustrator = Instantiate(illustratorPrefab, gridObjectTransform);
Illustrator illustrator = Instantiate(illustratorPrefab, gridObjectTransform);
illustrator.transform.position = gridOrigin;
LineRenderer lineRenderer = Instantiate(lineRendererPrefab, gridObjectTransform);
LineRenderer lineRenderer = illustrator.GetLineRenderer();
lineRenderer.SetPosition(0, gridOrigin);

if (target == answer0)
{
illustrator.ApplyRightAnswerMat();
}
else
{
illustrator.ApplyWrongAnswerMat();
}

bool moveInX = true;
bool moveInY = false;
bool moveInZ = false;
Expand Down Expand Up @@ -150,7 +157,6 @@ IEnumerator Co_MoveIllustratorAndShoot(Vector3 target)
waitTime = 7f;
}
yield return new WaitForSeconds(waitTime);
Destroy(illustrator);
Destroy(lineRenderer);
Destroy(illustrator.gameObject);
}
}
28 changes: 28 additions & 0 deletions Assets/Scripts/Illustrator.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class Illustrator : MonoBehaviour
{
[SerializeField] private LineRenderer lineRenderer;
[SerializeField] private MeshRenderer meshRenderer;
[SerializeField] private Material rightAnswerMaterial;
[SerializeField] private Material wrongAnswerMaterial;

public void ApplyRightAnswerMat()
{
meshRenderer.material = rightAnswerMaterial;
lineRenderer.material = rightAnswerMaterial;
}

public void ApplyWrongAnswerMat()
{
meshRenderer.material = wrongAnswerMaterial;
lineRenderer.material = wrongAnswerMaterial;
}

public LineRenderer GetLineRenderer()
{
return lineRenderer;
}
}
11 changes: 11 additions & 0 deletions Assets/Scripts/Illustrator.cs.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b97f466

Please sign in to comment.