Browse Source

changes from playtest w/ Nik

A
Josh 2 years ago
parent
commit
5e87cba0e1
  1. 32
      namedropper/Assets/Resources/categories.yaml
  2. 599
      namedropper/Assets/Resources/categories.yaml.bak
  3. 7
      namedropper/Assets/Resources/categories.yaml.bak.meta
  4. 24
      namedropper/Assets/Scenes/Game.unity
  5. 12
      namedropper/Assets/Scripts/Game.cs
  6. 18
      namedropper/Assets/Scripts/Player.cs
  7. 3
      namedropper/ProjectSettings/DynamicsManager.asset
  8. 2
      namedropper/ProjectSettings/Physics2DSettings.asset
  9. 3
      namedropper/ProjectSettings/ProjectSettings.asset

32
namedropper/Assets/Resources/categories.yaml

@ -70,6 +70,26 @@ Topics:
- Gomez Addams
- Pugsley Addams
- Larissa Weems
- Category: The Boys
Elements:
- Homelander
- Billy Butcher
- Hughie
- Starlight
- Soldier Boy
- The Deep
- A-Train
- Mother's Milk
- Category: Attack on Titan
Elements:
- Eren Yeager
- Levi Ackerman
- Mikasa Ackerman
- Armin Arlert
- Annie Leonhart
- Reiner Braun
- Hange Zoe
- General Pixis
- Topic: Netflix Shows
Categories:
- Category: Squid Game
@ -105,18 +125,6 @@ Topics:
- Gomez Addams
- Pugsley Addams
- Larissa Weems
Elements:
- Love On The Brain
- Consideration
- Umbrella
- Pon de Replay
- Bitch Better Have My Money
- Disturbia
- The Monster
- Diamonds
- Only Girl (In The World)
- Work
- S&M
- Category: House of Cards
Elements:
- Francis Underwood

599
namedropper/Assets/Resources/categories.yaml.bak

@ -0,0 +1,599 @@
Topics:
- Topic: Contemporary TV
Categories:
- Category: White Lotus
Elements:
- Armond
- Greg
- Tanya McQuoid
- Portia
- Harper
- Albie Di Grasso
- Dominic Di Grasso
- Bert Di Grasso
- Ethan
- Lucia
- Category: The Mandalorian
Elements:
- Din Djarin
- Grogu
- Greef Karga
- The Client
- Dr. Pershing
- Kuiil
- IG-11
- Cara Dune
- Boba Fett
- Moff Gideon
- Category: Yellowstone
Elements:
- Beth Dutton
- John Dutton
- Chief Thomas Rainwater
- Rip Wheeler
- Teeter
- Carter
- Jimmy Hurdstrom
- Walker
- Laramie
- Avery
- Category: I Love Lucy
Elements:
- Ethel Mertz
- Fred Mertz
- Lucy Ricardo
- Ricky Ricardo
- Mrs. McGillicuddy
- Bobby the Bellboy
- Freddie Fillmore
- Category: F•R•I•E•N•D•S
Elements:
- Rachel Green
- Joey Tribbiani
- Chandler Bing
- Ross Geller
- Monica Geller
- Phoebe Buffay
- Janice Hosenstein
- Gunther
- Roy, the Stripper
- Ursula Buffay
- Category: Wednesday
Elements:
- Wednesday Addams
- Morticia Addams
- Uncle Fester
- Enid Sinclair
- Lurch
- Thing
- Xavier Thorpe
- Gomez Addams
- Pugsley Addams
- Larissa Weems
- Category: The Boys
Elements:
- Homelander
- Billy Butcher
- Hughie
- Starlight
- Soldier Boy
- The Deep
- A-Train
- Mother's Milk
- Category: Attack on Titan
Elements:
- Eren Yeager
- Levi Ackerman
- Mikasa Ackerman
- Armin Arlert
- Annie Leonhart
- Reiner Braun
- Hange Zoe
- General Pixis
- Topic: Netflix Shows
Categories:
- Category: Squid Game
Elements:
- Seong Gi-hun
- Cho Sang-woo
- Kang Sae-byeok
- Hwang Jun-ho
- Oh Il-nam
- Jang Deok-su
- Ali Abdul
- Han Mi-nyeo
- Category: Stranger Things
Elements:
- Joyce Byers
- Jim Hopper
- Mike Wheeler
- Eleven
- Dustin Henderson
- Lucas Sinclair
- Nancy Wheeler
- Jonathan Byers
- Karen Wheeler
- Category: Wednesday
Elements:
- Wednesday Addams
- Morticia Addams
- Uncle Fester
- Enid Sinclair
- Lurch
- Thing
- Xavier Thorpe
- Gomez Addams
- Pugsley Addams
- Larissa Weems
Elements:
- Love On The Brain
- Consideration
- Umbrella
- Pon de Replay
- Bitch Better Have My Money
- Disturbia
- The Monster
- Diamonds
- Only Girl (In The World)
- Work
- S&M
- Category: House of Cards
Elements:
- Francis Underwood
- Claire Underwood
- Doug Stamper
- Zoe Barnes
- Rachel Posner
- Edward Meechum
- Remy Danton
- President Garrett Walker
- Rep. Peter Russo
- Jackie Sharp
- Category: Bridgerton
Elements:
- Lady Danbury
- Mrs Varley
- Anthony Bridgerton
- Philippa Featherington
- Prudence Featherington
- Penelope Featherington
- Daphne Bridgerton
- Violet Bridgerton
- Hyacinth Bridgerton
- Eloise Bridgerton
- Colin Bridgerton
- Queen Charlotte
- Benedict Bridgerton
- Gregory Bridgerton
- Portia Featherington
- Lady Whistledown
- Category: Unbreakable Kimmy Schmidt
Elements:
- Kimmy Schmidt
- Titus Andromedon
- Lillian
- Dong Nguyen
- Reverend Richar Wayne Gary Wayne
- Mikey Politano
- Russ Snyder
- Eli Rubin
- Jacqueline Voorhes
- Category: Emily in Paris
Elements:
- Emily Cooper
- Sylvie
- Mindy Chen
- Gabriel
- Julien
- Luc
- Camille
- Antoine Lambert
- Alfie
- Category: BoJack Horseman
Elements:
- BoJack F. Horseman
- Princess Carolyn
- Diane Nguyen
- Mr. Peanutbutter
- Todd Chavez
- Topic: Contemporary Pop Music
Categories:
- Category: The Weeknd
Elements:
- Blinding Lights
- Save Your Tears
- The Hills
- Creepin'
- Starboy
- Can't Feel My Face
- Category: Taylor Swift
Elements:
- You Belong With Me
- Shake It Off
- Blank Space
- Style
- Wildest Dreams
- Bad Blood
- We Are Never Ever Getting Back Together
- Red
- Lover
- 22
- All Too Well
- The 1
- Welcome to New York
- Category: Rihanna
Elements:
- Love On The Brain
- Consideration
- Umbrella
- Pon de Replay
- Bitch Better Have My Money
- Disturbia
- The Monster
- Diamonds
- Only Girl (In The World)
- Work
- S&M
- Category: Bruno Mars
Elements:
- Uptown Funk
- 24K Magic
- When I Was Your Man
- Locked out of Heaven
- Leave The Door Open
- Just the Way You Are
- Treasure
- Grenade
- Smoking Out The Window
- Talking to the Moon
- Category: Harry Styles
Elements:
- As It Was
- Late Night Talking
- Watermelon Sugar
- Adore You
- Falling
- Sign of the Times
- Matilda
- Music For a Sushi Restaurant
- Satellite
- Daylight
- Category: Dua Lipa
Elements:
- One Kiss
- Cold Heart
- Levitating
- Don't Start Now
- New Rules
- Prisoner
- IDGAF
- Scared to Be Lonely
- Break My Heart
- Category: Olivia Rodrigo
Elements:
- good 4 u
- traitor
- drivers license
- deja vu
- happier
- favorite crime
- jealousy, jealousy
- brutal
- 1 step forward, 3 steps back
- Category: Lizzo
Elements:
- About Damn Time
- 2 Be Loved (Am I Ready)
- Truth Hurts
- Juice
- Good as Hell
- Rumors
- Topic: Videogame Characters
Categories:
- Category: Super Mario Bros.
Elements:
- Mario
- Luigi
- Bowser
- Princess Peach
- Toad
- Yoshi
- Wario
- Waluigi
- Boo
- Koopa Troopa
- Category: The Legend of Zelda
Elements:
- Link
- Dark Link
- Princess Zelda
- Ganon
- Skull Kid
- Midna
- Sheik
- Category: Pokemon
Elements:
- Charizard
- Blastoise
- Snorlax
- Ninetales
- Squirtle
- Dragonite
- Eevee
- Bulbasaur
- Arcanine
- Gengar
- Pikachu
- Ash Ketchum
- Professor Oak
- Category: League of Legends
Elements:
- Jinx
- Viktor
- Vi
- Jayce
- Caitlyn
- Gwen
- Zeri
- Lux
- Evelynn
- Viego
- Category: Street Fighter II
Elements:
- Ryu
- Ken
- Chun-Li
- Guile
- E. Honda
- Dhalsim
- Blanka
- Zangief
- Balrog
- Vega
- Sagat
- M. Bison
- Cammy
- Fei Long
- T. Hawk
- Dee Jay
- Akuma
- Category: Mortal Kombat
Elements:
- Goro
- Johnny Cage
- Kano
- Liu Kang
- Raiden
- Reptile
- Scorpion
- Shang Tsung
- Sonya Blade
- Sub-Zero
- Category: Animal Crossing
Elements:
- Blathers
- Isabelle
- K.K. Slider
- Mabel
- Mr. Resetti
- Timmy & Tommy
- Tom Nook
- Category: Other
Elements:
- Ratchet
- Clank
- Steve
- Dogmeat
- Commander Shepard
- Niko Bellic
- Parappa the Rapper
- Samus Aran
- Gordon Freeman
- Cloud
- Nathan Drake
- Spyro
- Geralt of Rivia
- Solid Snake
- Kratos
- Crash Bandicoot
- Master Chief
- Lara Croft
- Sonic the Hedgehog
- Pac-man
- Big Daddy
- Duke Nukem
- GLaDOS
- Kirby
- Topic: 90's Hip-Hop
Categories:
- Category: The Notorious B.I.G.
Elements:
- Hypnotize
- Big Poppa
- Juicy
- Mo Money Mo Problems
- Gimme The Loot
- Notorious Thugs
- Things Done Changed
- Ready To Die
- One More Chance
- Everyday Struggle
- Ten Crack Commandments
- Category: 2Pac
Elements:
- Hit 'Em Up
- California Love
- All Eyez On Me
- Ambitionz Az A Ridah
- Changes
- Hail Mary
- Dear Mama
- Keep Ya Head Up
- Category: Nas
Elements:
- N.Y. State of Mind
- If I Ruled the World (Imagine That)
- The World Is Yours
- I Aint' Hard To Tell
- The Message
- Represent
- Nas Is Like
- I Can
- Category: Jay-Z
Elements:
- Izzo (H.O.V.A)
- Blueprint (Momma Loves Me)
- Big Pimpin'
- Hard Knock Life (Ghetto Anthem)
- Can I Get A...
- Empire State of Mind #actually 2009
- Dirt Off Your Shoulder
- Moment of Clarity
- 99 Problems
- Change Clothes
- Category: Outkast
Elements:
- ATLeins
- Ms. Jackson
- So Fresh, So Clean
- B.O.B - Bombs Over Baghdad
- Stankonia (Stanklove)
- GhettoMusick
- The Way You Move
- Bowtie
- Where Are My Panties
- Hey Ya!
- Roses
- Category: Snoop Dogg
Elements:
- Still D.R.E.
- Gin And Juice
- Nuthin' But A "G" Thang
- Doggfather
- Who Am I? (What's My Name?)
- Still A G Thang
- Doggy Dogg World
- Woof!
- Category: Wu-Tang Clan
Elements:
- C.R.E.A.M.
- Protect Ya Neck
- Method Man
- Can It Be All So Simple
- Bring Da Ruckus
- Wu-Tang Clain Ain't Nuthing Ta F' Wit
- Triumph
- Category: Lauryn Hill
Elements:
- Guantanamera
- Turn Your Lights Down Low
- To Zion
- Lost Ones
- The Miseducation of Lauryn Hill
- Doo Wop (That Thing))
- Everything is Everything
- When It Hurts So Bad
- Every Ghetto, Every City
- Topic: Actors
Categories:
- Category: Dwayne Johnson
Elements:
- Hobbs & Shaw
- Jumanji
- Black Adam
- Moana
- Jungle Cruise
- Get Smart
- The Scorpion King
- Category: Samuel L. Jackson
Elements:
- Chi-Raq
- A Time to Kill
- The Hateful Eight
- Pulp Fiction
- Lakeview Terrance
- Django Unchained
- The Negotiator
- Jackie Brown
- Revenge of the Sith
- Marvel’s The Avengers
- Category: Harrison Ford
Elements:
- American Graffiti
- Sabrina
- Star Wars
- Clear and Present Danger
- Air Force One
- Blade Runner
- The Fugitive
- Raiders of the Lost Ark
- The Empire Strikes Back
- What Lies Beneath
- Category: Zendaya
Elements:
- "Spider-Man: Homecoming"
- The Greatest Showman
- Dune
- Malcolm & Marie
- Euphoria
- Shake It Up
- K.C. Undercover
- Category: Judy Garland
Elements:
- The Wizard of Oz
- A Star Is Born
- Meet Me in St. Louis
- Girl Crazy
- Judgment at Nuremberg
- I Could Go on Singing
- Easter Parade
- Category: Scarlett Johansson
Elements:
- Lost in Translation
- Under the Skin
- Her
- Match Point
- Ghost World
- Marriage Story
- Jojo Rabbit
- Lucy
- Girl with a Pearl Earring
- Black Widow
- He's Just Not That Into You
- Category: Awkwafina
Elements:
- Shang-Chi 2
- Crazy Rich Asians
- Ocean's 8
- The Farewell
- The Bad Guys
- "Jumanji: Welcome to the Jungle"
- The Little Mermaid
- Raya and the Last Dragon
- Category: Leonardo DiCaprio
Elements:
- Titanic
- The Wolf of Wall Street
- Romeo + Juliet
- The Revenant
- Inception
- Shutter Island
- Catch Me If You Can
- Once Upon a Time... in Hollywood
- The Great Gatsby
- What's Eating Gilbert Grape
- Django Unchained
- Gangs of New York
- Category: Robin Williams
Elements:
- "Jumanji: Welcome to the Jungle"
- World's Greatest Dad
- Mrs. Doubtfire
- The Birdcage
- Good Morning, Vietname,
- Gool Will Hunting
- Patch Adams
- Flubber
- Jumanji
- Hook
- Mork & Mindy

7
namedropper/Assets/Resources/categories.yaml.bak.meta

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0f893c8c2580040428c097070062ef63
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

24
namedropper/Assets/Scenes/Game.unity

@ -158,6 +158,10 @@ PrefabInstance:
propertyPath: m_Name
value: Player Dark Blue
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338381, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@ -228,7 +232,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 658
value: 430
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -445,6 +449,10 @@ PrefabInstance:
propertyPath: m_Name
value: Player Light Red
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338381, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@ -515,7 +523,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 657.99994
value: 430
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -1432,6 +1440,10 @@ PrefabInstance:
propertyPath: _keyDown
value: 107
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: _keyDrop
value: 91
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: _keyLeft
value: 106
@ -1518,7 +1530,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 658
value: 430
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -1757,6 +1769,10 @@ PrefabInstance:
propertyPath: _team
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: _keyDrop
value: 122
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338378, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_Mass
value: 0.5
@ -1839,7 +1855,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 657.99994
value: 430
objectReference: {fileID: 0}
- target: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

12
namedropper/Assets/Scripts/Game.cs

@ -5,16 +5,17 @@ using UnityEngine.SceneManagement;
public class Game : MonoBehaviour
{
int _seconds = 60;
int _seconds = 90;
[SerializeField] Text Score;
[SerializeField] Text Timer;
Category[] _categories;
int _originalFontSize;
// Start is called before the first frame update
void Awake()
{
_originalFontSize = Timer.fontSize;
_categories = FindObjectsOfType<Category>();
//set the topic for testing purposes in case I start directly from this scene
@ -40,6 +41,11 @@ public class Game : MonoBehaviour
{
_seconds--;
Timer.text = _seconds.ToString();
if (_seconds < 10)
{
Timer.color = Color.red;
Timer.fontSize = _originalFontSize + 50;
}
yield return new WaitForSeconds(1f);
}
NextRound();
@ -85,7 +91,7 @@ public class Game : MonoBehaviour
// Update is called once per frame
void Update()
{
if (Input.GetKeyDown(KeyCode.RightBracket))
if (Input.GetKeyDown(KeyCode.F12))
{
NextRound();
}

18
namedropper/Assets/Scripts/Player.cs

@ -3,16 +3,20 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class Player : MonoBehaviour
{
const float SPEED = 1500f;
const bool ALLOW_DROP = true;
const float SPEED = 3000f;
[SerializeField] KeyCode _keyLeft;
[SerializeField] KeyCode _keyRight;
[SerializeField] KeyCode _keyDown;
[SerializeField] KeyCode _keyDrop;
[SerializeField] Team _team;
[SerializeField] Text _text;
[SerializeField] bool _forTopicSelect = false;
Game _game;
bool _dropping = false;
Vector3 _originalPosition;
public enum Team
{
@ -71,6 +75,8 @@ public class Player : MonoBehaviour
}
transform.position = _originalPosition;
_dropping = false;
_rigidbody.velocity = Vector3.zero;
PickNewWord();
}
@ -99,6 +105,16 @@ public class Player : MonoBehaviour
{
_rigidbody.velocity += new Vector2(0f, SPEED * Time.deltaTime * -1f);
}
if (Input.GetKey(_keyDrop) && ALLOW_DROP)
{
_dropping = true;
}
if (_dropping)
{
_rigidbody.velocity += new Vector2(0f, SPEED * 5f * Time.deltaTime * -1f);
}
}
}

3
namedropper/ProjectSettings/DynamicsManager.asset

@ -7,6 +7,7 @@ PhysicsManager:
m_Gravity: {x: 0, y: -9.81, z: 0}
m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2
m_DefaultMaxDepenetrationVelocity: 10
m_SleepThreshold: 0.005
m_DefaultContactOffset: 0.01
m_DefaultSolverIterations: 6
@ -22,7 +23,7 @@ PhysicsManager:
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1
m_ClothInterCollisionSettingsToggle: 0
m_ClothGravity: {x: 0, y: -9.81, z: 0}
m_ClothGravity: {x: 0, y: -5.77, z: 0}
m_ContactPairsMode: 0
m_BroadphaseType: 0
m_WorldBounds:

2
namedropper/ProjectSettings/Physics2DSettings.asset

@ -4,7 +4,7 @@
Physics2DSettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_Gravity: {x: 0, y: -9.81}
m_Gravity: {x: 0, y: -4}
m_DefaultMaterial: {fileID: 0}
m_VelocityIterations: 8
m_PositionIterations: 3

3
namedropper/ProjectSettings/ProjectSettings.asset

@ -152,7 +152,8 @@ PlayerSettings:
resolutionScalingMode: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier: {}
applicationIdentifier:
Standalone: com.DefaultCompany.namedropper
buildNumber:
Standalone: 0
iPhone: 0

Loading…
Cancel
Save