Skip to content

Add Graphics to the Match3 env #4627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 74 commits into from
Nov 10, 2020
Merged

Add Graphics to the Match3 env #4627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
1f010e6
first pass - matching and gravity work
Aug 24, 2020
07ca4d9
valid moves WIP
Aug 24, 2020
aad55ef
Merge remote-tracking branch 'origin/master' into match3-example
Aug 28, 2020
6059340
Merge remote-tracking branch 'origin/master' into match3-example
Aug 28, 2020
4447cca
move enumeration, simple checking
Aug 31, 2020
bb8015c
move detection
Sep 1, 2020
84e3bca
fix up/down directions
Sep 1, 2020
18e8987
actuator and heuristic
Sep 1, 2020
4494c9c
sensor
Sep 1, 2020
436ae95
reset if no moves
Sep 1, 2020
7c2c633
add masking, retrain
Sep 1, 2020
a85ef3c
cleanup
Sep 2, 2020
8f4c280
Merge remote-tracking branch 'origin/master' into match3-example
Sep 2, 2020
b67c532
config update
Sep 3, 2020
de3c999
optionally force heuristic mode
Sep 3, 2020
3501d6a
Merge remote-tracking branch 'origin/master' into match3-example
Sep 16, 2020
1b4d9a5
compressed observations, reset board if no moves
Sep 17, 2020
5a4e6ea
TFModel meta files
Sep 18, 2020
f9708cc
WIP abstract
Sep 21, 2020
812e8ba
random move heuristic
Sep 22, 2020
66ec74e
rename Move fields, migrate IsValid logic
Sep 23, 2020
c595b22
comments
Sep 23, 2020
a16b8b0
reduce dependency on Match3Agent
Sep 23, 2020
2473f20
abstractBoard as monobehavior
Sep 24, 2020
df6d9d8
move actuator to extensions
Sep 24, 2020
3d0cda8
move sensor to extensions
Sep 24, 2020
8d490f3
update components in scene
Sep 24, 2020
c74dfd2
undo accidental checkins
Sep 25, 2020
478cbdf
drawing cleanup, custom maxMoves logic
Sep 25, 2020
236eb69
meta file
Sep 27, 2020
bc27e6b
prefab, use 8 agents
Sep 28, 2020
c795349
different behaviors
Sep 28, 2020
8fed68f
timers, early out
Sep 28, 2020
373669a
unit tests
Sep 28, 2020
1c93f2e
docs
Sep 30, 2020
1bc3316
Merge remote-tracking branch 'origin/master' into match3-example
Sep 30, 2020
2051229
Apply suggestions from code review
Oct 1, 2020
6751b20
Merge branch 'match3-example' of https://github.com/Unity-Technologie…
Oct 1, 2020
88dc7d8
doc cleanup, swap to .nn file, add heuristic agents
Oct 1, 2020
8c9c9db
board iterator
Oct 6, 2020
2eae0a3
convert others to iterator, rename to Move.MoveIndex
Oct 6, 2020
e1d472f
change observation type to enum
Oct 7, 2020
d35db80
fix flip for compressed obs
Oct 8, 2020
8943ffd
save dimensions on sensor
Oct 9, 2020
f212120
save dimension on actuator
Oct 9, 2020
d02830f
Merge remote-tracking branch 'origin/master' into match3-example
Oct 16, 2020
1a6444d
Match3 example - special pieces (#4575)
Oct 16, 2020
a41abe1
more interesting scoring, smarter heuristic
Oct 20, 2020
5a51e4f
more steps
Oct 21, 2020
ef29e3a
longer trained models
Oct 22, 2020
5d91ccb
handle no valid moves more gracefully (#4598)
Oct 23, 2020
d842556
cleanup heuristic logic
Oct 23, 2020
4840c80
more sensor and actuator tests
Oct 23, 2020
1c5a911
update heuristic configs
Oct 26, 2020
dfbd2d5
docstrings and add to environment docs
Oct 30, 2020
bcd051e
sensor and actuator names
Oct 30, 2020
8a7df81
compare compressed obs against saved PNGs
Oct 30, 2020
7ecca9a
Merge remote-tracking branch 'origin/master' into match3-example
Nov 2, 2020
f5b69ac
review feedback, cleanup TODOs, comments
Nov 2, 2020
f2c7ce6
docstrings, heuristic benchmarks
Nov 2, 2020
920cefc
kind of working
Hunter-Unity Nov 5, 2020
5fa3800
added symbol gameobjects
Hunter-Unity Nov 5, 2020
41954e0
basic shapes & colors working
Hunter-Unity Nov 5, 2020
d5452b0
cleanup and added background
Hunter-Unity Nov 6, 2020
d06cde0
Merge branch 'master' into hh/develop/m3-graphics-m
Hunter-Unity Nov 6, 2020
bf9b9c3
bug hunt. won't train
Hunter-Unity Nov 6, 2020
267fa1b
merge master version
Hunter-Unity Nov 6, 2020
ca8cd38
update prefabs
Hunter-Unity Nov 6, 2020
3df63f1
update prefabs
Hunter-Unity Nov 7, 2020
3665c4f
add image to docs
Hunter-Unity Nov 7, 2020
1ac40b8
Update Match3.md
Hunter-Unity Nov 7, 2020
f3992c5
rename some properties
Hunter-Unity Nov 7, 2020
a4c53f2
Merge branch 'hh/develop/m3-graphics-m' of https://github.com/Unity-T…
Hunter-Unity Nov 7, 2020
f069fed
remove unneeded comments and some cleanup
Hunter-Unity Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX.meta
View file
Open in desktop

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

Binary file added Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/3.fbx
View file
Open in desktop
Binary file not shown.
97 changes: 97 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/3.fbx.meta
View file
Open in desktop

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

Binary file added Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/Match.fbx
View file
Open in desktop
Binary file not shown.
97 changes: 97 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/Match.fbx.meta
View file
Open in desktop

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

10 changes: 8 additions & 2 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Match3Heuristic.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ MonoBehaviour:
Board: {fileID: 0}
MoveTime: 0.25
MaxMoves: 500
UseSmartHeuristic: 1
HeuristicQuality: 0
--- !u!114 &3508723250470608011
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -94,7 +94,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: abebb7ad4a5547d7a3b04373784ff195, type: 3}
m_Name:
m_EditorClassIdentifier:
DebugEdgeIndex: -1
DebugMoveIndex: -1
CubeSpacing: 1.25
Board: {fileID: 0}
TilePrefab: {fileID: 4007900521885639951, guid: faee4e805953b49e688bd00b45c55f2e,
type: 3}
--- !u!114 &3508723250470608009
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -127,6 +131,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 08e4b0da54cb4d56bfcbae22dd49ab8d, type: 3}
m_Name:
m_EditorClassIdentifier:
ActuatorName: Match3 Actuator
ForceHeuristic: 1
--- !u!114 &3508723250470608014
MonoBehaviour:
Expand All @@ -140,6 +145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 530d2f105aa145bd8a00e021bdd925fd, type: 3}
m_Name:
m_EditorClassIdentifier:
SensorName: Match3 Sensor
ObservationType: 0
--- !u!1 &3508723250774301855
GameObject:
Expand Down
14 changes: 12 additions & 2 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Match3VectorObs.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ MonoBehaviour:
Board: {fileID: 0}
MoveTime: 0.25
MaxMoves: 500
HeuristicQuality: 0
--- !u!114 &2118285884327540685
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -124,7 +125,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: abebb7ad4a5547d7a3b04373784ff195, type: 3}
m_Name:
m_EditorClassIdentifier:
DebugEdgeIndex: -1
DebugMoveIndex: -1
CubeSpacing: 1.25
Board: {fileID: 0}
TilePrefab: {fileID: 4007900521885639951, guid: faee4e805953b49e688bd00b45c55f2e,
type: 3}
--- !u!114 &2118285884327540687
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -142,6 +147,9 @@ MonoBehaviour:
NumCellTypes: 6
NumSpecialTypes: 2
RandomSeed: -1
BasicCellPoints: 1
SpecialCell1Points: 2
SpecialCell2Points: 3
--- !u!114 &2118285884327540683
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -154,7 +162,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 08e4b0da54cb4d56bfcbae22dd49ab8d, type: 3}
m_Name:
m_EditorClassIdentifier:
ForceRandom: 0
ActuatorName: Match3 Actuator
ForceHeuristic: 0
--- !u!114 &2118285884327540680
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -167,4 +176,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 530d2f105aa145bd8a00e021bdd925fd, type: 3}
m_Name:
m_EditorClassIdentifier:
SensorName: Match3 Sensor
ObservationType: 0
14 changes: 12 additions & 2 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Match3VisualObs.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ MonoBehaviour:
Board: {fileID: 0}
MoveTime: 0.25
MaxMoves: 500
HeuristicQuality: 0
--- !u!114 &3019509692332007778
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -124,7 +125,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: abebb7ad4a5547d7a3b04373784ff195, type: 3}
m_Name:
m_EditorClassIdentifier:
DebugEdgeIndex: -1
DebugMoveIndex: -1
CubeSpacing: 1.25
Board: {fileID: 0}
TilePrefab: {fileID: 4007900521885639951, guid: faee4e805953b49e688bd00b45c55f2e,
type: 3}
--- !u!114 &3019509692332007776
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -142,6 +147,9 @@ MonoBehaviour:
NumCellTypes: 6
NumSpecialTypes: 2
RandomSeed: -1
BasicCellPoints: 1
SpecialCell1Points: 2
SpecialCell2Points: 3
--- !u!114 &3019509692332007780
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -154,7 +162,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 08e4b0da54cb4d56bfcbae22dd49ab8d, type: 3}
m_Name:
m_EditorClassIdentifier:
ForceRandom: 0
ActuatorName: Match3 Actuator
ForceHeuristic: 0
--- !u!114 &3019509692332007783
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -167,4 +176,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 530d2f105aa145bd8a00e021bdd925fd, type: 3}
m_Name:
m_EditorClassIdentifier:
SensorName: Match3 Sensor
ObservationType: 2
8 changes: 8 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Tiles.meta
View file
Open in desktop

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

Loading