Compare commits

..

156 Commits

Author SHA1 Message Date
minenice55
8348eaa283
pause unloads assets on exit 2024-01-22 14:18:41 -05:00
minenice55
ca742c8567 prod flag gaming 2024-01-22 14:14:16 -05:00
minenice55
9bb98310cc change title screen anti-mash mechanism 2024-01-22 10:58:45 -05:00
minenice55
7d41478ed9 adjust dj school mixer settings 2024-01-21 23:13:39 -05:00
minenice55
f46d769f5f literal skill star 2024-01-21 20:55:31 -05:00
minenice55
bc90418494
Merge pull request #650 from blank3times/twilight-over-noon
Update #648 implementation to replace noon in Air Rally
2024-01-22 01:50:07 +00:00
minenice55
ceb76f9d7d settable flashing effects warning 2024-01-21 20:38:56 -05:00
blank3times
1b6422bf6f Update AirRally.cs
Twilight goes back to Night and then goes over Noon
2024-01-21 17:21:12 -08:00
minenice55
097f92ffb1 fix broken marker rendering 2024-01-21 20:18:55 -05:00
minenice55
607818e3be fix doubled input responses in some menus
decimal marker weights
2024-01-21 20:10:45 -05:00
blank3times
284662ea9e Merge remote-tracking branch 'upstream/release_1_patches' 2024-01-21 16:51:22 -08:00
minenice55
029991656c excessive tabs 2024-01-21 19:44:39 -05:00
minenice55
3a3eb803ef default timing display is non-lazer
plan for future overlays?
2024-01-21 19:43:29 -05:00
minenice55
cda15b8cf0 implement #648 "properly"
try to fix weird performance regression in board meeting
2024-01-21 19:36:12 -05:00
minenice55
5cf8422457 Revert "Merge pull request #648 from blank3times/master"
This reverts commit 8507439e0e040196623a71676ec7427a3f46d44a, reversing
changes made to 5e63a5898a87d96abe75babd1f4fdf83ef6d620c.
2024-01-21 19:15:28 -05:00
minenice55
197e5daa14
Merge pull request #649 from evdial/launchbg
Launch party bg / Rockers miss fix
2024-01-21 23:40:22 +00:00
ev
6e7fe573ed launch party bg / rockers miss fix 2024-01-21 18:39:11 -05:00
minenice55
485906a044 default perfect challenge to off 2024-01-21 18:11:48 -05:00
minenice55
1f94fe3048 new memes 2024-01-21 18:10:23 -05:00
minenice55
2941322039 do it in the editor too 2024-01-21 16:54:10 -05:00
minenice55
5c9a0b2d48 no miss + skill star in judgement
fix potential crashes when exiting play
2024-01-21 16:50:05 -05:00
blank3times
7a2026d9bd Merge remote-tracking branch 'upstream/master' 2024-01-21 13:10:56 -08:00
minenice55
8507439e0e
Merge pull request #648 from blank3times/master
Fix golden hour time of day settings being labelled "noon"
2024-01-21 18:24:17 +00:00
blank3times
80f72292a6
Update DoubleDate.cs
Replace references to 'noon' with 'sunset'
2024-01-20 23:15:51 -08:00
blank3times
276b094301
Update AirRally.cs
Replace references to 'noon' with 'twilight'
2024-01-20 23:14:22 -08:00
minenice55
5e63a5898a remove temp kanji from mouse icon
it's still ugly but eh
2024-01-21 00:34:01 -05:00
minenice55
85119ec5be *actually* get rid of discord game sdk 2024-01-21 00:17:14 -05:00
minenice55
b4ceb15743 fix weird edge case in toss boys autodispense
let beataction throw exceptions
2024-01-21 00:15:06 -05:00
minenice55
dbf28debe0 fix asset unloading jank with karate man 2024-01-20 23:59:26 -05:00
minenice55
81e546e3fe rendertexture null check 2024-01-20 23:39:41 -05:00
minenice55
4052e44e7b update Jukebox version
fix issues with Judgement audio
2024-01-20 23:30:28 -05:00
minenice55
8b43853450 fix operation order issue with judgement 2024-01-20 00:24:23 -05:00
minenice55
5c46e64fc0 fix #631 2024-01-19 23:05:26 -05:00
minenice55
4dd1fec62b fix #640 2024-01-19 21:46:21 -05:00
minenice55
2b30b7de97 fix spritesheet scaler incorrectly setting pivots 2024-01-19 20:51:14 -05:00
minenice55
f68192e6e2 de-static-ify game manager and conductor for minigame logic 2024-01-18 23:52:38 -05:00
minenice55
e9bda6742e minigame template 2024-01-18 23:39:20 -05:00
minenice55
49fcc959f4 also use sourcegen for controller loaders 2024-01-18 21:38:01 -05:00
minenice55
ed78a4ba2f replace minigame loader reflection with source generator 2024-01-18 19:56:26 -05:00
minenice55
c341715901 fix minor pj party anim bug
update credits
adjust a mixer effect setting
2024-01-17 19:50:12 -05:00
minenice55
3089fd06ed update splash screen 2024-01-17 19:19:20 -05:00
minenice55
cfcca0f9eb clean up event queues 2024-01-17 18:49:14 -05:00
minenice55
59cc786a94 Merge branch 'release_1_patches' of https://github.com/RHeavenStudio/HeavenStudio into release_1_patches 2024-01-17 18:43:29 -05:00
minenice55
0e1c9bad68 workaround sneaky spirits pause jank
make BeatAction also wait for conductor DSP to start
remove leftover logic from old conductor sync
fix #630
fix #632
fix #633
2024-01-17 18:43:26 -05:00
saladplainzone
9d91444951
Space dance final audio tweak for real this time (#638)
* Child/BG/Objects done

guhhh

* Oh my god samurai slice looks good now! except unstep

* fix unstep

add notes for splat

* Add Splat Anims/Sound

* splat

* properly snap debris to hands

* denied the high school prep squad from yelling so hard it starts to destroy the universe

* Couple audio fixes

- sneaky spirits laugh
- tram n pauline new sounds and panning

* octo machine release sound trim

* goodened lockstep voice offsets

* Ringside Sound Overhaul

* Munchy Monk Offset fix

* i did an oopsy

* Launch Party Parallax

* new icons

* misc samurai fixes

- weird hand rotation
- obj size
- melon color

* Fixed Hand

i fixed it

* Rebalancing

Lockstep Lowered
Space Soccer Lowered
Tap Troupe Lowered
Quiz Show Raised
Tram Pauline Raised
Toss Boys Raised
See Saw Lowered
Glee Club Lowered
Munchy Monk Lowered
TOTC Lowered
Somen Lowered
Contact Lowered
Mr Upbeat Raised

* Glee Club Wave Loop Fix

fuuuuck dude haaaaahahahaaa

* chat i need to make space dance louder

* uh louder

* sorry too loud

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
2024-01-17 13:24:39 -05:00
saladplainzone
6b3b616590
Make space dance louder (#637)
* Child/BG/Objects done

guhhh

* Oh my god samurai slice looks good now! except unstep

* fix unstep

add notes for splat

* Add Splat Anims/Sound

* splat

* properly snap debris to hands

* denied the high school prep squad from yelling so hard it starts to destroy the universe

* Couple audio fixes

- sneaky spirits laugh
- tram n pauline new sounds and panning

* octo machine release sound trim

* goodened lockstep voice offsets

* Ringside Sound Overhaul

* Munchy Monk Offset fix

* i did an oopsy

* Launch Party Parallax

* new icons

* misc samurai fixes

- weird hand rotation
- obj size
- melon color

* Fixed Hand

i fixed it

* Rebalancing

Lockstep Lowered
Space Soccer Lowered
Tap Troupe Lowered
Quiz Show Raised
Tram Pauline Raised
Toss Boys Raised
See Saw Lowered
Glee Club Lowered
Munchy Monk Lowered
TOTC Lowered
Somen Lowered
Contact Lowered
Mr Upbeat Raised

* Glee Club Wave Loop Fix

fuuuuck dude haaaaahahahaaa

* chat i need to make space dance louder

* uh louder

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
2024-01-17 11:08:57 -05:00
minenice55
d0f900c8ac Merge branch 'master' into release_1_patches 2024-01-16 15:21:45 -05:00
minenice55
b6ec60ca92 try to fix weird score bug
controller only gets re-assigned on first boot
don't stall the cpu to queue frames
2024-01-16 15:21:22 -05:00
minenice55
f22a2204f5
thank you vin 2024-01-15 21:05:20 -05:00
minenice55
f67dc8d04f
minor spelling mistake *explodes* 2024-01-15 21:03:39 -05:00
minenice55
fdc53d9b74
oups (readme update) 2024-01-15 21:03:09 -05:00
minenice55
7f15ce82c1 Merge branch 'master' into release_1_patches 2024-01-15 19:56:09 -05:00
minenice55
954bb4f589
mac moment 2024-01-15 19:55:53 -05:00
minenice55
092c9f5cfe
Update build.yml 2024-01-15 19:44:04 -05:00
minenice55
37c07e171a clear prod flag 2024-01-15 19:35:48 -05:00
minenice55
b6c5745276 Merge branch 'release_1' 2024-01-15 19:33:33 -05:00
minenice55
3bf3797442 Merge branch 'release_1' 2024-01-15 14:22:46 -05:00
minenice55
3d662f7b5d Merge branch 'release_1' 2024-01-15 12:31:27 -05:00
minenice55
1545495633 Merge branch 'release_1' 2024-01-15 12:26:46 -05:00
minenice55
b3e412d64e Merge branch 'release_1' 2024-01-15 10:55:12 -05:00
minenice55
46a8d11bbb Merge branch 'release_1' 2024-01-15 09:47:04 -05:00
minenice55
dded5ff8f2 prod flag fixes 2024-01-14 21:51:36 -05:00
minenice55
c08127ddc4 Merge branch 'release_1' 2024-01-14 21:04:54 -05:00
minenice55
5740461f33 Merge branch 'release_1' 2024-01-14 12:52:25 -05:00
minenice55
bb7b6d510a Merge branch 'release_1' 2024-01-14 02:19:06 -05:00
minenice55
3d04cd9736 Merge branch 'release_1' 2024-01-13 13:31:17 -05:00
minenice55
d791e944e1 Merge branch 'release_1' 2024-01-12 21:41:45 -05:00
saladplainzone
09cfe3e669
Title Experiment: Made logo appearance and skip function nicer (#618)
* Child/BG/Objects done

guhhh

* Oh my god samurai slice looks good now! except unstep

* fix unstep

add notes for splat

* Add Splat Anims/Sound

* splat

* properly snap debris to hands

* nicer title appear & skip

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
2024-01-13 02:40:29 +00:00
minenice55
46553ed92f Merge branch 'release_1' 2024-01-11 00:18:02 -05:00
minenice55
412eba32fd Merge branch 'release_1' 2024-01-10 20:43:40 -05:00
minenice55
3e7187257c Merge branch 'release_1' 2024-01-10 18:54:57 -05:00
minenice55
58335cd1ef Merge branch 'release_1' 2024-01-09 11:59:16 -05:00
minenice55
72bebf805a Merge branch 'release_1' 2024-01-08 23:51:13 -05:00
minenice55
f6893042ad Merge branch 'release_1' 2024-01-08 22:53:05 -05:00
minenice55
14545b99fd Merge branch 'release_1' 2024-01-08 01:41:33 -05:00
minenice55
924ab97ef2 Merge branch 'release_1' 2024-01-07 18:46:14 -05:00
minenice55
27d50379cf Merge branch 'release_1' 2024-01-06 22:59:01 -05:00
minenice55
472c5a8982 Merge branch 'release_1' 2024-01-06 16:43:23 -05:00
minenice55
03ec50f154 Merge branch 'release_1' 2024-01-05 22:52:23 -05:00
minenice55
363f85d2f5 Merge branch 'release_1' 2024-01-04 21:08:04 -05:00
minenice55
d7aac5f1c7 Merge branch 'release_1' 2024-01-02 10:53:30 -05:00
minenice55
63d1802114 Merge branch 'release_1' 2023-12-30 23:07:59 -05:00
minenice55
69400acc86 Merge branch 'release_1' 2023-12-26 01:05:35 -05:00
minenice55
c1a61e7a51 Merge branch 'release_1' 2023-12-26 00:24:25 -05:00
minenice55
b929370791 Merge branch 'release_1' 2023-12-13 19:05:31 -05:00
minenice55
b332115109 Merge branch 'release_1' 2023-12-12 11:57:05 -05:00
minenice55
7aed52665c Merge branch 'release_1' 2023-12-05 21:01:48 -05:00
minenice55
50888e9606 Merge branch 'release_1' 2023-12-05 17:40:18 -05:00
minenice55
8bdc34b701 Merge branch 'release_1' 2023-11-25 11:05:54 -05:00
minenice55
fa42e1927a Merge branch 'release_1' 2023-11-24 17:59:59 -05:00
minenice55
6670a6a028 Merge branch 'release_1' 2023-11-24 17:50:31 -05:00
minenice55
f73113a7bd Merge branch 'release_1' 2023-11-24 10:46:50 -05:00
minenice55
11ddb71b0a stub out fork lifter bob 2023-11-23 16:39:07 -05:00
minenice55
73c0c9356f Merge branch 'release_1' 2023-11-23 16:31:53 -05:00
minenice55
c95c628241 Merge branch 'release_1' 2023-11-23 11:23:09 -05:00
minenice55
75b58e7d71 Merge branch 'release_1' 2023-11-21 20:16:20 -05:00
minenice55
63ae2122f2 Merge branch 'release_1' 2023-11-21 13:29:36 -05:00
minenice55
0a2e8d8d52 Merge branch 'release_1' 2023-11-21 11:58:05 -05:00
minenice55
097fd6cb47 Merge branch 'release_1' 2023-11-20 14:57:06 -05:00
minenice55
df622879cb Merge branch 'release_1' 2023-10-29 15:53:10 -04:00
minenice55
ee29f4a210 Merge branch 'release_1' 2023-10-27 16:26:28 -04:00
minenice55
c5e56bfb62 Merge branch 'release_1' 2023-10-23 20:23:40 -04:00
minenice55
2613dcd724 Merge branch 'release_1' 2023-10-18 00:27:28 -04:00
minenice55
cc7050317f Merge branch 'release_1' 2023-10-13 21:46:29 -04:00
minenice55
ee7ed82988 update Jukebox 2023-10-10 22:27:55 -04:00
minenice55
d4e3e479c1 remove unneeded using directives 2023-10-09 12:03:11 -04:00
minenice55
3e940afb76 Merge branch 'release_1' 2023-10-09 11:32:31 -04:00
minenice55
a84dc81390 Merge branch 'release_1' 2023-10-07 14:14:34 -04:00
minenice55
6568194926 Merge branch 'release_1' 2023-10-07 12:35:35 -04:00
minenice55
44f252f0c7 remove unused windows forms reference(??) 2023-10-05 21:40:57 -04:00
minenice55
f814c293de update package cache 2023-10-05 21:15:03 -04:00
minenice55
76832e6d3f Merge branch 'release_1' 2023-10-05 20:31:12 -04:00
minenice55
c60cb48c8c Merge branch 'release_1' 2023-10-04 11:56:33 -04:00
minenice55
e3fb1cf98a Merge branch 'release_1' 2023-09-26 12:00:03 -04:00
minenice55
497ad916b7 Merge branch 'release_1' 2023-09-20 19:49:47 -04:00
Braedon Lewis
fad4173fa7
Release game's render texture before resizing it (#548) 2023-09-19 22:09:45 +00:00
minenice55
54d8e70124 Merge branch 'release_1' 2023-09-17 13:35:15 -04:00
minenice55
47d7e73c58 make mac build script put streamingassets in the right place 2023-09-16 16:04:53 -04:00
minenice55
d7bd8e9665 Merge branch 'release_1' 2023-09-12 16:39:17 -04:00
minenice55
b75dad7994 Merge branch 'release_1' 2023-09-11 18:29:32 -04:00
minenice55
236f2cd240 Merge branch 'release_1' 2023-09-08 10:29:20 -04:00
minenice55
8f8a13d101 Merge branch 'release_1' 2023-08-16 07:00:55 -04:00
minenice55
f9b7778fce Merge branch 'release_1' 2023-08-15 21:28:47 -04:00
minenice55
ac12256127 Merge branch 'release_1' 2023-08-13 04:11:12 -04:00
minenice55
6044e660ca Merge branch 'release_1' 2023-08-11 23:40:24 -04:00
AstrlJelly
f540241fb7
Mr. Upbeat Re-Re-Rework (#525)
* so much

* reworked everything (AGAIN.)
 -everything just uses recursive methods and beatactions, and only uses the update loop for inactive queuing
* count-ins
 -need hq 4 sound effect, kitties doesn't have the og :(
* mr. downbeat rere-revived (unfortunately enough.)
* huge change to how stepping works, to make it so you can't step over it the wrong way, and so that missing looks good
* added missing miss anim, which happens in the same way as the og
* added a check on game switch to use the last bg change/blip color block's attributes
 -i think i might add these to other games; it should make the process of remixing more intuitive and fun, even if it's a small change

currently all i'm missing is blip jank fix. but im not staying up another hour for that lol

* letter/blip jank fixed + force stepping

* instead of being a separate animator, the letter is instead set to have a scale of (1, 1, 1) in the update loop, so that no graphical bugs happen even when the scale is changed.
* hopefully this new system is a lot less janky, but if bugs do still come up they'll be a lot easier to fix now
2023-08-12 03:32:33 +00:00
minenice55
7da767ccbe Merge branch 'release_1' 2023-08-03 11:48:39 -04:00
minenice55
52f06ad780 Merge branch 'release_1' 2023-08-02 21:26:16 -04:00
minenice55
75301b4fc8 Merge branch 'release_1' 2023-08-02 13:38:55 -04:00
minenice55
55adb5278a Merge branch 'release_1' 2023-07-30 22:33:06 -04:00
minenice55
32f6c8fba1 we do need a swap file 2023-07-30 22:10:16 -04:00
minenice55
fd76381fe7 clear out unused tools before run 2023-07-30 21:48:39 -04:00
minenice55
ca859614a3 maybe not this 2023-07-30 21:23:33 -04:00
minenice55
7c18046e19
test action to free space (#516) 2023-07-31 01:07:13 +00:00
minenice55
06a5d3e13c Merge branch 'release_1' 2023-07-30 16:26:54 -04:00
minenice55
04b19a5b5e Merge branch 'release_1' 2023-07-30 16:26:31 -04:00
minenice55
65e5e2a209
don't crash if origin is undefined (#513)
reword the unknown origin message to be less scary
2023-07-29 02:20:40 +00:00
minenice55
69a02f7809 Merge branch 'release_1' 2023-07-25 18:54:06 -04:00
minenice55
67bbcc9d1f Merge branch 'release_1' 2023-07-24 10:20:38 -04:00
minenice55
a22eecacfe Merge branch 'release_1' 2023-07-22 23:21:59 -04:00
minenice55
f8bc3446d3 add manually triggering build action to workflows (#507) 2023-07-20 12:42:41 -04:00
minenice55
9ce61e962b oops 2023-07-20 12:28:11 -04:00
Xylon
06d8e09b25 In CheerReaders.cs, quotation marks were aptly added, and references … (#506)
* Update issue template to include .riq/.zip info (#483)

Co-authored-by: patata <patataofcourse@gmail.com>

* Pull release 1 (#484)

* Squashed commit of the following:

commit a6ce193ce5c0f7a43c63300c567531d430337aa0
Merge: 6105bb4f 9b24ac48
Author: minenice55 <star.elementa@gmail.com>
Date:   Wed Jun 14 01:23:31 2023 +0000

    Merge pull request #473 from minenice55/easings-fix

    Enum Parsing Fix

commit 9b24ac48382591a57d0c33d3e3196a6681d58cde
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:21:13 2023 -0400

    fix all parsing of enums, removed the "special case" for eases

    update to latest Jukebox

commit 6105bb4f64a4128cc0e223724a54bc5421c7cd13
Merge: 576b4a00 8df235a8
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:15 2023 +0000

    Merge pull request #469 from minenice55/jukebox-update

    Jukebox Package Update

commit 576b4a001774b21cce47ff2ace26b2b1a212ad90
Merge: 99804457 10f8fa7f
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:08 2023 +0000

    Merge pull request #458 from AstrlJelly/MiscAdditions_4

    Bug Fixes + Feature Additions

commit 10f8fa7f5a92e431b28b7becdc9484a7f0d97a16
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:38:24 2023 -0400

    add "updater" for the old marching entity

commit 118cd4993da42f6779b2cc2b85bbdae1d2fa27c4
Merge: 1c1c731d 99804457
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:22:01 2023 -0400

    Merge branch 'release_1' into pr/458

commit 8df235a85b0557a6e2e6622582253634ebcb57f6
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:55:02 2023 -0400

    let play mode start if no song file is loaded

    fix issue with loading large audio files

commit 9980445723d3af784de3a56d8200c11b8985ac9a
Merge: aff1e3d8 2f595824
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 18:32:40 2023 +0000

    Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

    Fixed weird curve stuff on game switch in working dough

commit 2f595824608fad4fd3cc69818b5da590aeea7534
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 19:24:13 2023 +0200

    Fixed weird curve stuff on game switch in working dough

commit aff1e3d889505ee33ade1e7e5ced5534ff8ad0e9
Merge: b40ec128 c9accfa5
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:09:21 2023 +0000

    Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

    Fixed small balls not working in working dough

commit c9accfa52d87a475fc3e033ee47bfe5db31ef166
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 18:07:13 2023 +0200

    Fixed small balls not working in working dough

commit b40ec128a5c12fe1b38ad7f1bb79d0f3d5292ed6
Merge: 9f953d50 95c9b346
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 14:56:58 2023 +0000

    Merge pull request #467 from Rapandrasmus/WorkingDoughRework

    Working Dough rework

commit 95c9b3469582a3126ca51b38528b7d2c8d69747e
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:13:08 2023 +0200

    modernised rockers pass turn

commit 0debf553918a241f9a2287745295b230274fdad0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:03:08 2023 +0200

    Rhythm tweezers pass turn now works like working dough

commit 6eac745eaebc502b2b3d733ab3bce5ffd5a94dd5
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 15:51:35 2023 +0200

    gandw on balls has been added

commit 349867d983e17aa124d3834191225d9f294265ad
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 14:59:56 2023 +0200

    Proper inactive handling now

commit d469c6c3fab6266d8a3f68dc1e993980448e59bd
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:52:15 2023 +0200

    OnSpawnBall reimplemented

commit dd290b333136075c30a340ae8c811af2f6e05d19
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:37:09 2023 +0200

    new sounds

commit 757e1c2c5ed87bf09d33006551c2d7ea40a3b786
Author: minenice55 <star.elementa@gmail.com>
Date:   Mon Jun 12 17:18:37 2023 -0400

    update Jukebox to latest version

    fixes for inferred entity loading

commit 8ce1d8276b1740724dc1d5200ec27b1b0f2c7c78
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 21:36:57 2023 +0200

    ball transporter anims for pass turn

commit af0d9bae19aa08bc2078b8fb7214381a0e28cc76
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 20:38:48 2023 +0200

    working dough converted, need to fix eveerything though

commit db21d51673be4ed326fbf6dcec97116956ddcd84
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 18:36:41 2023 +0200

    Converted everything to new curves and made playerballs handle themselves input-wise

commit 41157a038c3318dd68884dbce3f09cffc46188ab
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 14:04:32 2023 +0200

    Some new curves

commit 7d754f570661e77545765978b9a642bf590ae6de
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 12:03:21 2023 +0200

    Rockers can do it too now

commit c196947251d8fa588f1b4129d47c99216227c45f
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 11:58:31 2023 +0200

    You can now place inputs on top of pass turn for rhythm tweezers

commit 9f953d505fb6a4090171c65bd68f17c37df1772b
Merge: 2a8d8d6f df120f08
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:55:40 2023 -0400

    Merge branch 'master' into release_1

commit 2a8d8d6fd2c38df74102b2ad5e2ec0e25b314289
Merge: 9e3e5942 13adf5b0
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 19:53:47 2023 +0000

    Merge pull request #465 from minenice55/dont_infer_track

    Don't infer the track field when importing converted v0 riq coming from unknown origin

commit 13adf5b07b520f68c571c4a7a87fb6d25e98ccd7
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:52:14 2023 -0400

    don't infer track when importing a v0 riq from another program

commit 9e3e594209e775633ebfc43774136010081e7f8b
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 12:12:25 2023 -0400

    make base datamodels for special entity reading (#463)

    * make base datamodels for special entity reading

    * fix crop stomp breaking when no game switch or remix end is set

    * fix save shortcut

    fix loading charts with no music

commit 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 23:00:30 2023 -0400

    add updater for marching orders turn

commit 210be54ba3b48189aabba90e3643326172217767
Merge: 67b6658c af8395fb
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:36:10 2023 -0400

    Merge branch 'release_1' into pr/458

commit af8395fb6a673da7d593b0c4cb1ce094887af742
Merge: 81eafec9 b1fab52a
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:30:32 2023 -0400

    Merge branch 'master' into release_1

commit 81eafec9866a823ccceac95dd9c06000541a898e
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:27:58 2023 -0400

    editor fixes (#459)

    * ditch loading dialog

    doesn't show up when it's supposed to

    * format song offset in editor

    * remove VorbisPlugin

    * Update Editor.cs

commit 67b6658cd37c4d4628f71675164919e65600eada
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:55:10 2023 -0400

    convert float to double and all that

commit a4b66367fda2a6efe9f346882db00d0d588f26d6
Merge: 08a664ba b1fab52a
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:01:44 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit 08a664ba2a50d41243f3e355c7e3d351f246bb1b
Merge: faf3fbf9 b7afd697
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:21:22 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit faf3fbf97c3a2842c85d9adcecde98b78f59068d
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:18:45 2023 -0400

    a lot

    * munchy monk input + mustache fixes
    * fork lifter and pajama party bopping
    * meat grinder miss bop fix
    * cloud monkey Real
    * marching orders Go! was broken
    * force march doesn't break when it's too early from a game switch
    * you can use the March! block without the marching now

commit bb2ae7433907e75c96508411bfcf1bc19608d970
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 15:13:29 2023 -0400

    Integration of Jukebox Library (#451)

    * add Jukebox library

    todo:
    - saving / loading of new format
    - inferrence of unknown data like past versions
    - move the temporary float casts to proper use of double
    - make sound related functions take double for timing
    - inform people that the Jukebox sound player was renamed to SoundByte lol

    * make sound, input scheduling, and super curve use double precision

    * successfully load charts

    * editor works again

    v1 riqs can be saved and loaded

    * first tempo and volume markers are unmovable

    fix loading of charts' easing values

    * use gsync / freesync

    * update Jukebox refs to SoundByte

    * game events use double part 1

    Air Rally - Glee Club converted

    * don't load song if chart load fails

    * finish conversion of all minigames

    * remove editor waveform toggle

    * timeline now respects added song offset length

    clear cache files on app close
    prepped notes for dsp sync

    * update timeline length when offset changed

    * update to latest Jukebox

    * make error panel object in global game manager

    * improve conductor music scheduling

    * added error message box

    fix first game events sometimes not playing

* Squashed commit of the following:

commit e782e3a5b4c31e5e620c8048eed8261c03c56f82
Merge: 5b8cfef1 ce74719c
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 17 16:40:52 2023 +0000

    Merge pull request #478 from evdial/working-dough

    Working Dough Tweaks

commit ce74719c1a8c324269b3df4699871a8ecba07a65
Merge: 9c61b760 5b8cfef1
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 17 12:40:06 2023 -0400

    Merge branch 'release_1' into pr/478

commit 5b8cfef1b0179dffe77b02a40fce8ee37f7ed5c9
Author: patata <patataofcourse@gmail.com>
Date:   Sat Jun 17 17:20:15 2023 +0200

    Update issue template to include .riq/.zip info

commit 9c61b760bb4cc8b93074f57b73e63a9b5a61202b
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 15:05:07 2023 -0400

    assbuns

commit ae7451e9d3182c7e965919d661fc2ac47b3034b7
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Thu Jun 15 20:56:40 2023 +0200

    made small idle not crazy

commit 4c5c95237c50bb1a9805fcd7233cb2d915e7574d
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 14:33:57 2023 -0400

    fsd

commit 083d91623816011017a67c66cf9cdafb348943e6
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 14:16:38 2023 -0400

    anim

commit b3664e01b37e1c317712dfbde947f0f99ba79cb4
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Thu Jun 15 20:13:11 2023 +0200

    Fixed stuff also scaled now yippee

commit 71e3a0ce6bcf0ccae3de304ff2586b566cc36e83
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 13:50:10 2023 -0400

    many

commit 534b06301dc9deeb8638553265ca5a5c49a1c41a
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:28:21 2023 -0400

    Squashed commit of the following: (#474)

    commit a6ce193ce5c0f7a43c63300c567531d430337aa0
    Merge: 6105bb4f 9b24ac48
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Wed Jun 14 01:23:31 2023 +0000

        Merge pull request #473 from minenice55/easings-fix

        Enum Parsing Fix

    commit 9b24ac48382591a57d0c33d3e3196a6681d58cde
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 21:21:13 2023 -0400

        fix all parsing of enums, removed the "special case" for eases

        update to latest Jukebox

    commit 6105bb4f64a4128cc0e223724a54bc5421c7cd13
    Merge: 576b4a00 8df235a8
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 21:39:15 2023 +0000

        Merge pull request #469 from minenice55/jukebox-update

        Jukebox Package Update

    commit 576b4a001774b21cce47ff2ace26b2b1a212ad90
    Merge: 99804457 10f8fa7f
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 21:39:08 2023 +0000

        Merge pull request #458 from AstrlJelly/MiscAdditions_4

        Bug Fixes + Feature Additions

    commit 10f8fa7f5a92e431b28b7becdc9484a7f0d97a16
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 17:38:24 2023 -0400

        add "updater" for the old marching entity

    commit 118cd4993da42f6779b2cc2b85bbdae1d2fa27c4
    Merge: 1c1c731d 99804457
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 17:22:01 2023 -0400

        Merge branch 'release_1' into pr/458

    commit 8df235a85b0557a6e2e6622582253634ebcb57f6
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 16:55:02 2023 -0400

        let play mode start if no song file is loaded

        fix issue with loading large audio files

    commit 9980445723d3af784de3a56d8200c11b8985ac9a
    Merge: aff1e3d8 2f595824
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 18:32:40 2023 +0000

        Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

        Fixed weird curve stuff on game switch in working dough

    commit 2f595824608fad4fd3cc69818b5da590aeea7534
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 19:24:13 2023 +0200

        Fixed weird curve stuff on game switch in working dough

    commit aff1e3d889505ee33ade1e7e5ced5534ff8ad0e9
    Merge: b40ec128 c9accfa5
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 16:09:21 2023 +0000

        Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

        Fixed small balls not working in working dough

    commit c9accfa52d87a475fc3e033ee47bfe5db31ef166
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 18:07:13 2023 +0200

        Fixed small balls not working in working dough

    commit b40ec128a5c12fe1b38ad7f1bb79d0f3d5292ed6
    Merge: 9f953d50 95c9b346
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 14:56:58 2023 +0000

        Merge pull request #467 from Rapandrasmus/WorkingDoughRework

        Working Dough rework

    commit 95c9b3469582a3126ca51b38528b7d2c8d69747e
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 16:13:08 2023 +0200

        modernised rockers pass turn

    commit 0debf553918a241f9a2287745295b230274fdad0
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 16:03:08 2023 +0200

        Rhythm tweezers pass turn now works like working dough

    commit 6eac745eaebc502b2b3d733ab3bce5ffd5a94dd5
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 15:51:35 2023 +0200

        gandw on balls has been added

    commit 349867d983e17aa124d3834191225d9f294265ad
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 14:59:56 2023 +0200

        Proper inactive handling now

    commit d469c6c3fab6266d8a3f68dc1e993980448e59bd
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 13:52:15 2023 +0200

        OnSpawnBall reimplemented

    commit dd290b333136075c30a340ae8c811af2f6e05d19
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 13:37:09 2023 +0200

        new sounds

    commit 757e1c2c5ed87bf09d33006551c2d7ea40a3b786
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Mon Jun 12 17:18:37 2023 -0400

        update Jukebox to latest version

        fixes for inferred entity loading

    commit 8ce1d8276b1740724dc1d5200ec27b1b0f2c7c78
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 21:36:57 2023 +0200

        ball transporter anims for pass turn

    commit af0d9bae19aa08bc2078b8fb7214381a0e28cc76
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 20:38:48 2023 +0200

        working dough converted, need to fix eveerything though

    commit db21d51673be4ed326fbf6dcec97116956ddcd84
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 18:36:41 2023 +0200

        Converted everything to new curves and made playerballs handle themselves input-wise

    commit 41157a038c3318dd68884dbce3f09cffc46188ab
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 14:04:32 2023 +0200

        Some new curves

    commit 7d754f570661e77545765978b9a642bf590ae6de
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 12:03:21 2023 +0200

        Rockers can do it too now

    commit c196947251d8fa588f1b4129d47c99216227c45f
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 11:58:31 2023 +0200

        You can now place inputs on top of pass turn for rhythm tweezers

    commit 9f953d505fb6a4090171c65bd68f17c37df1772b
    Merge: 2a8d8d6f df120f08
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 15:55:40 2023 -0400

        Merge branch 'master' into release_1

    commit 2a8d8d6fd2c38df74102b2ad5e2ec0e25b314289
    Merge: 9e3e5942 13adf5b0
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 19:53:47 2023 +0000

        Merge pull request #465 from minenice55/dont_infer_track

        Don't infer the track field when importing converted v0 riq coming from unknown origin

    commit 13adf5b07b520f68c571c4a7a87fb6d25e98ccd7
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 15:52:14 2023 -0400

        don't infer track when importing a v0 riq from another program

    commit 9e3e594209e775633ebfc43774136010081e7f8b
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 12:12:25 2023 -0400

        make base datamodels for special entity reading (#463)

        * make base datamodels for special entity reading

        * fix crop stomp breaking when no game switch or remix end is set

        * fix save shortcut

        fix loading charts with no music

    commit 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 23:00:30 2023 -0400

        add updater for marching orders turn

    commit 210be54ba3b48189aabba90e3643326172217767
    Merge: 67b6658c af8395fb
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 22:36:10 2023 -0400

        Merge branch 'release_1' into pr/458

    commit af8395fb6a673da7d593b0c4cb1ce094887af742
    Merge: 81eafec9 b1fab52a
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 22:30:32 2023 -0400

        Merge branch 'master' into release_1

    commit 81eafec9866a823ccceac95dd9c06000541a898e
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 22:27:58 2023 -0400

        editor fixes (#459)

        * ditch loading dialog

        doesn't show up when it's supposed to

        * format song offset in editor

        * remove VorbisPlugin

        * Update Editor.cs

    commit 67b6658cd37c4d4628f71675164919e65600eada
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 16:55:10 2023 -0400

        convert float to double and all that

    commit a4b66367fda2a6efe9f346882db00d0d588f26d6
    Merge: 08a664ba b1fab52a
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 16:01:44 2023 -0400

        Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

    commit 08a664ba2a50d41243f3e355c7e3d351f246bb1b
    Merge: faf3fbf9 b7afd697
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 15:21:22 2023 -0400

        Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

    commit faf3fbf97c3a2842c85d9adcecde98b78f59068d
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 15:18:45 2023 -0400

        a lot

        * munchy monk input + mustache fixes
        * fork lifter and pajama party bopping
        * meat grinder miss bop fix
        * cloud monkey Real
        * marching orders Go! was broken
        * force march doesn't break when it's too early from a game switch
        * you can use the March! block without the marching now

    commit bb2ae7433907e75c96508411bfcf1bc19608d970
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 15:13:29 2023 -0400

        Integration of Jukebox Library (#451)

        * add Jukebox library

        todo:
        - saving / loading of new format
        - inferrence of unknown data like past versions
        - move the temporary float casts to proper use of double
        - make sound related functions take double for timing
        - inform people that the Jukebox sound player was renamed to SoundByte lol

        * make sound, input scheduling, and super curve use double precision

        * successfully load charts

        * editor works again

        v1 riqs can be saved and loaded

        * first tempo and volume markers are unmovable

        fix loading of charts' easing values

        * use gsync / freesync

        * update Jukebox refs to SoundByte

        * game events use double part 1

        Air Rally - Glee Club converted

        * don't load song if chart load fails

        * finish conversion of all minigames

        * remove editor waveform toggle

        * timeline now respects added song offset length

        clear cache files on app close
        prepped notes for dsp sync

        * update timeline length when offset changed

        * update to latest Jukebox

        * make error panel object in global game manager

        * improve conductor music scheduling

        * added error message box

        fix first game events sometimes not playing

commit a6ce193ce5c0f7a43c63300c567531d430337aa0
Merge: 6105bb4f 9b24ac48
Author: minenice55 <star.elementa@gmail.com>
Date:   Wed Jun 14 01:23:31 2023 +0000

    Merge pull request #473 from minenice55/easings-fix

    Enum Parsing Fix

commit 9b24ac48382591a57d0c33d3e3196a6681d58cde
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:21:13 2023 -0400

    fix all parsing of enums, removed the "special case" for eases

    update to latest Jukebox

commit 6105bb4f64a4128cc0e223724a54bc5421c7cd13
Merge: 576b4a00 8df235a8
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:15 2023 +0000

    Merge pull request #469 from minenice55/jukebox-update

    Jukebox Package Update

commit 576b4a001774b21cce47ff2ace26b2b1a212ad90
Merge: 99804457 10f8fa7f
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:08 2023 +0000

    Merge pull request #458 from AstrlJelly/MiscAdditions_4

    Bug Fixes + Feature Additions

commit 10f8fa7f5a92e431b28b7becdc9484a7f0d97a16
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:38:24 2023 -0400

    add "updater" for the old marching entity

commit 118cd4993da42f6779b2cc2b85bbdae1d2fa27c4
Merge: 1c1c731d 99804457
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:22:01 2023 -0400

    Merge branch 'release_1' into pr/458

commit 8df235a85b0557a6e2e6622582253634ebcb57f6
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:55:02 2023 -0400

    let play mode start if no song file is loaded

    fix issue with loading large audio files

commit 9980445723d3af784de3a56d8200c11b8985ac9a
Merge: aff1e3d8 2f595824
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 18:32:40 2023 +0000

    Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

    Fixed weird curve stuff on game switch in working dough

commit 2f595824608fad4fd3cc69818b5da590aeea7534
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 19:24:13 2023 +0200

    Fixed weird curve stuff on game switch in working dough

commit aff1e3d889505ee33ade1e7e5ced5534ff8ad0e9
Merge: b40ec128 c9accfa5
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:09:21 2023 +0000

    Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

    Fixed small balls not working in working dough

commit c9accfa52d87a475fc3e033ee47bfe5db31ef166
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 18:07:13 2023 +0200

    Fixed small balls not working in working dough

commit b40ec128a5c12fe1b38ad7f1bb79d0f3d5292ed6
Merge: 9f953d50 95c9b346
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 14:56:58 2023 +0000

    Merge pull request #467 from Rapandrasmus/WorkingDoughRework

    Working Dough rework

commit 95c9b3469582a3126ca51b38528b7d2c8d69747e
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:13:08 2023 +0200

    modernised rockers pass turn

commit 0debf553918a241f9a2287745295b230274fdad0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:03:08 2023 +0200

    Rhythm tweezers pass turn now works like working dough

commit 6eac745eaebc502b2b3d733ab3bce5ffd5a94dd5
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 15:51:35 2023 +0200

    gandw on balls has been added

commit 349867d983e17aa124d3834191225d9f294265ad
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 14:59:56 2023 +0200

    Proper inactive handling now

commit d469c6c3fab6266d8a3f68dc1e993980448e59bd
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:52:15 2023 +0200

    OnSpawnBall reimplemented

commit dd290b333136075c30a340ae8c811af2f6e05d19
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:37:09 2023 +0200

    new sounds

commit 757e1c2c5ed87bf09d33006551c2d7ea40a3b786
Author: minenice55 <star.elementa@gmail.com>
Date:   Mon Jun 12 17:18:37 2023 -0400

    update Jukebox to latest version

    fixes for inferred entity loading

commit 8ce1d8276b1740724dc1d5200ec27b1b0f2c7c78
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 21:36:57 2023 +0200

    ball transporter anims for pass turn

commit af0d9bae19aa08bc2078b8fb7214381a0e28cc76
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 20:38:48 2023 +0200

    working dough converted, need to fix eveerything though

commit db21d51673be4ed326fbf6dcec97116956ddcd84
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 18:36:41 2023 +0200

    Converted everything to new curves and made playerballs handle themselves input-wise

commit 41157a038c3318dd68884dbce3f09cffc46188ab
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 14:04:32 2023 +0200

    Some new curves

commit 7d754f570661e77545765978b9a642bf590ae6de
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 12:03:21 2023 +0200

    Rockers can do it too now

commit c196947251d8fa588f1b4129d47c99216227c45f
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 11:58:31 2023 +0200

    You can now place inputs on top of pass turn for rhythm tweezers

commit 9f953d505fb6a4090171c65bd68f17c37df1772b
Merge: 2a8d8d6f df120f08
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:55:40 2023 -0400

    Merge branch 'master' into release_1

commit 2a8d8d6fd2c38df74102b2ad5e2ec0e25b314289
Merge: 9e3e5942 13adf5b0
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 19:53:47 2023 +0000

    Merge pull request #465 from minenice55/dont_infer_track

    Don't infer the track field when importing converted v0 riq coming from unknown origin

commit 13adf5b07b520f68c571c4a7a87fb6d25e98ccd7
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:52:14 2023 -0400

    don't infer track when importing a v0 riq from another program

commit 9e3e594209e775633ebfc43774136010081e7f8b
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 12:12:25 2023 -0400

    make base datamodels for special entity reading (#463)

    * make base datamodels for special entity reading

    * fix crop stomp breaking when no game switch or remix end is set

    * fix save shortcut

    fix loading charts with no music

commit 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 23:00:30 2023 -0400

    add updater for marching orders turn

commit 210be54ba3b48189aabba90e3643326172217767
Merge: 67b6658c af8395fb
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:36:10 2023 -0400

    Merge branch 'release_1' into pr/458

commit af8395fb6a673da7d593b0c4cb1ce094887af742
Merge: 81eafec9 b1fab52a
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:30:32 2023 -0400

    Merge branch 'master' into release_1

commit 81eafec9866a823ccceac95dd9c06000541a898e
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:27:58 2023 -0400

    editor fixes (#459)

    * ditch loading dialog

    doesn't show up when it's supposed to

    * format song offset in editor

    * remove VorbisPlugin

    * Update Editor.cs

commit 67b6658cd37c4d4628f71675164919e65600eada
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:55:10 2023 -0400

    convert float to double and all that

commit a4b66367fda2a6efe9f346882db00d0d588f26d6
Merge: 08a664ba b1fab52a
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:01:44 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit 08a664ba2a50d41243f3e355c7e3d351f246bb1b
Merge: faf3fbf9 b7afd697
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:21:22 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit faf3fbf97c3a2842c85d9adcecde98b78f59068d
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:18:45 2023 -0400

    a lot

    * munchy monk input + mustache fixes
    * fork lifter and pajama party bopping
    * meat grinder miss bop fix
    * cloud monkey Real
    * marching orders Go! was broken
    * force march doesn't break when it's too early from a game switch
    * you can use the March! block without the marching now

commit bb2ae7433907e75c96508411bfcf1bc19608d970
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 15:13:29 2023 -0400

    Integration of Jukebox Library (#451)

    * add Jukebox library

    todo:
    - saving / loading of new format
    - inferrence of unknown data like past versions
    - move the temporary float casts to proper use of double
    - make sound related functions take double for timing
    - inform people that the Jukebox sound player was renamed to SoundByte lol

    * make sound, input scheduling, and super curve use double precision

    * successfully load charts

    * editor works again

    v1 riqs can be saved and loaded

    * first tempo and volume markers are unmovable

    fix loading of charts' easing values

    * use gsync / freesync

    * update Jukebox refs to SoundByte

    * game events use double part 1

    Air Rally - Glee Club converted

    * don't load song if chart load fails

    * finish conversion of all minigames

    * remove editor waveform toggle

    * timeline now respects added song offset length

    clear cache files on app close
    prepped notes for dsp sync

    * update timeline length when offset changed

    * update to latest Jukebox

    * make error panel object in global game manager

    * improve conductor music scheduling

    * added error message box

    fix first game events sometimes not playing

* Editor Additions (#479)

* favoriting and pick block

favoriting needs to not break after previewing (maybe make it persistent in the settings file?)
pick block needs to pick the icon, too. and preferably scroll to it as well

* final star anim + automatic icon game switching

before i make any more changes im making a checkpoint here cuz i know it works
* i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block)
* i'll have to figure out how to auto scroll to the game when the icon is selected
* the star now fully works, even between preview switches 👍

* fix the rest of the stuff

the event name gets colored correctly and hidden games are skipped over, but still loaded.
also i built mm ass buns

* tweaks + zoom and sorting

this stuff will be in the pr desc so it doesn't matter

* oop one more thing

* icons look better now :D

mipmaps to the rescue

* double date fix

* Merge pull request #486 from RHeavenStudio/actions_rework

Rework GitHub Actions and build script

* add ab meta to gitignore (#489)

* Sound Scheduling Improvements (#491)

* port conductor adjustments

* scheduled sounds prebake

* allow aiff files to be imported

add vbr mp3 warning to readme

* improve wording

* CNR API Internal Rework (#488)

* Prep stuff

* Tweezers now spawn in

* Started converting tweezers

* I hate <1 beat intervals

* Actually nvm

* fixed a bug

* You can chain intervals now, stack them if you really wanted

* Pass turn checks if crhandlerinstance exists

* Fixed hairs being deleted by onion switch

* Rockers rerewritten

* working dough rerewritten

* CNR API Internal Rework (#488)

* Prep stuff

* Tweezers now spawn in

* Started converting tweezers

* I hate <1 beat intervals

* Actually nvm

* fixed a bug

* You can chain intervals now, stack them if you really wanted

* Pass turn checks if crhandlerinstance exists

* Fixed hairs being deleted by onion switch

* Rockers rerewritten

* working dough rerewritten

* Games fixes/reworks patch (#501)

* ghosts are scaled now

* Lockstep fully reworked

* mr. bach has been implemented

* Space dance fixes

* oops

* Tap trial rework part 1

* tap trial rework part 2

* oopsie

* Gramps Talk Update

* Space Dance Voice Offsets

* Giraffe done! (Except miss anim)

* bg is not showing up for some reason

* bg not rendering fixed + giraffe fixed

* scrolling done

* fixed space dance and space soccer bg scrolls

* fixed rockers bugs

* adjustment

* fixed el inaccuracies

* particle fix

* changed pitch and volume of monkey tap

* miss anim

* megamix face for girl

* Proper miss anim implementation

* Added force stepping event

* miss anim fix

---------

Co-authored-by: saladplainzone <chocolate2890mail@gmail.com>
Co-authored-by: ev <85412919+evdial@users.noreply.github.com>

* In CheerReaders.cs, quotation marks were aptly added, and references to the girls were more-so neutralized. Consider this my cheer.

* revert capitalization and quotations while keeping grammar changes

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
Co-authored-by: patata <patataofcourse@gmail.com>
Co-authored-by: AstrlJelly <bdlawson115@gmail.com>
Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Co-authored-by: saladplainzone <chocolate2890mail@gmail.com>
Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
2023-07-20 12:28:00 -04:00
Rapandrasmus
375a634371 Quiz Show and Tambourine Reworks (#505)
* Tambourine fully reworked

* quiz show rework part 1

* quiz show rework part 2

* oopsie doopsie

* el fix numbah two
2023-07-18 21:09:44 -04:00
Rapandrasmus
4060a6366a fixed! (#504) 2023-07-17 13:13:34 -04:00
Rapandrasmus
bd8979364c Game Switch Black Flash is now beat-based. (#503)
* Game switch flashes are now 0.25 beats long

* ambient glow now turns black when the game switch flash is on

* you can now set the void color, it doesn't work with game switch flashes

* black
2023-07-17 11:57:53 -04:00
Rapandrasmus
6505f206ca Mahou Tsukai Rework (#502)
* fixed not being able to whiff in tap trial

* bored meeting fixes

* more board meeting fix

* ww now uses z axis instead of scale

* Inputs are now reworked in mahou tsukai

* Fixed the particle effect
2023-07-17 11:11:05 -04:00
Rapandrasmus
f3609125b7 Games fixes/reworks patch (#501)
* ghosts are scaled now

* Lockstep fully reworked

* mr. bach has been implemented

* Space dance fixes

* oops

* Tap trial rework part 1

* tap trial rework part 2

* oopsie

* Gramps Talk Update

* Space Dance Voice Offsets

* Giraffe done! (Except miss anim)

* bg is not showing up for some reason

* bg not rendering fixed + giraffe fixed

* scrolling done

* fixed space dance and space soccer bg scrolls

* fixed rockers bugs

* adjustment

* fixed el inaccuracies

* particle fix

* changed pitch and volume of monkey tap

* miss anim

* megamix face for girl

* Proper miss anim implementation

* Added force stepping event

* miss anim fix

---------

Co-authored-by: saladplainzone <chocolate2890mail@gmail.com>
Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
2023-07-12 20:48:26 -04:00
Rapandrasmus
2b1642a706 CNR API Internal Rework (#488)
* Prep stuff

* Tweezers now spawn in

* Started converting tweezers

* I hate <1 beat intervals

* Actually nvm

* fixed a bug

* You can chain intervals now, stack them if you really wanted

* Pass turn checks if crhandlerinstance exists

* Fixed hairs being deleted by onion switch

* Rockers rerewritten

* working dough rerewritten
2023-07-12 12:51:00 -04:00
Rapandrasmus
cefb8161b9 CNR API Internal Rework (#488)
* Prep stuff

* Tweezers now spawn in

* Started converting tweezers

* I hate <1 beat intervals

* Actually nvm

* fixed a bug

* You can chain intervals now, stack them if you really wanted

* Pass turn checks if crhandlerinstance exists

* Fixed hairs being deleted by onion switch

* Rockers rerewritten

* working dough rerewritten
2023-06-28 00:53:17 -04:00
minenice55
91ff7fefb7 Sound Scheduling Improvements (#491)
* port conductor adjustments

* scheduled sounds prebake

* allow aiff files to be imported

add vbr mp3 warning to readme

* improve wording
2023-06-24 22:35:05 -04:00
minenice55
3e6c126abf add ab meta to gitignore (#489) 2023-06-19 23:23:08 -04:00
minenice55
bbd20204d1 Merge pull request #486 from RHeavenStudio/actions_rework
Rework GitHub Actions and build script
2023-06-19 16:42:10 -04:00
AstrlJelly
e2d770c910
Editor Additions (#479)
* favoriting and pick block

favoriting needs to not break after previewing (maybe make it persistent in the settings file?)
pick block needs to pick the icon, too. and preferably scroll to it as well

* final star anim + automatic icon game switching

before i make any more changes im making a checkpoint here cuz i know it works
* i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block)
* i'll have to figure out how to auto scroll to the game when the icon is selected
* the star now fully works, even between preview switches 👍

* fix the rest of the stuff

the event name gets colored correctly and hidden games are skipped over, but still loaded.
also i built mm ass buns

* tweaks + zoom and sorting

this stuff will be in the pr desc so it doesn't matter

* oop one more thing

* icons look better now :D

mipmaps to the rescue

* double date fix
2023-06-19 20:28:52 +00:00
minenice55
8abbda6953
Pull release 1 (#484)
* Squashed commit of the following:

commit a6ce193ce5c0f7a43c63300c567531d430337aa0
Merge: 6105bb4f 9b24ac48
Author: minenice55 <star.elementa@gmail.com>
Date:   Wed Jun 14 01:23:31 2023 +0000

    Merge pull request #473 from minenice55/easings-fix

    Enum Parsing Fix

commit 9b24ac48382591a57d0c33d3e3196a6681d58cde
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:21:13 2023 -0400

    fix all parsing of enums, removed the "special case" for eases

    update to latest Jukebox

commit 6105bb4f64a4128cc0e223724a54bc5421c7cd13
Merge: 576b4a00 8df235a8
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:15 2023 +0000

    Merge pull request #469 from minenice55/jukebox-update

    Jukebox Package Update

commit 576b4a001774b21cce47ff2ace26b2b1a212ad90
Merge: 99804457 10f8fa7f
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:08 2023 +0000

    Merge pull request #458 from AstrlJelly/MiscAdditions_4

    Bug Fixes + Feature Additions

commit 10f8fa7f5a92e431b28b7becdc9484a7f0d97a16
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:38:24 2023 -0400

    add "updater" for the old marching entity

commit 118cd4993da42f6779b2cc2b85bbdae1d2fa27c4
Merge: 1c1c731d 99804457
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:22:01 2023 -0400

    Merge branch 'release_1' into pr/458

commit 8df235a85b0557a6e2e6622582253634ebcb57f6
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:55:02 2023 -0400

    let play mode start if no song file is loaded

    fix issue with loading large audio files

commit 9980445723d3af784de3a56d8200c11b8985ac9a
Merge: aff1e3d8 2f595824
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 18:32:40 2023 +0000

    Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

    Fixed weird curve stuff on game switch in working dough

commit 2f595824608fad4fd3cc69818b5da590aeea7534
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 19:24:13 2023 +0200

    Fixed weird curve stuff on game switch in working dough

commit aff1e3d889505ee33ade1e7e5ced5534ff8ad0e9
Merge: b40ec128 c9accfa5
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:09:21 2023 +0000

    Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

    Fixed small balls not working in working dough

commit c9accfa52d87a475fc3e033ee47bfe5db31ef166
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 18:07:13 2023 +0200

    Fixed small balls not working in working dough

commit b40ec128a5c12fe1b38ad7f1bb79d0f3d5292ed6
Merge: 9f953d50 95c9b346
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 14:56:58 2023 +0000

    Merge pull request #467 from Rapandrasmus/WorkingDoughRework

    Working Dough rework

commit 95c9b3469582a3126ca51b38528b7d2c8d69747e
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:13:08 2023 +0200

    modernised rockers pass turn

commit 0debf553918a241f9a2287745295b230274fdad0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:03:08 2023 +0200

    Rhythm tweezers pass turn now works like working dough

commit 6eac745eaebc502b2b3d733ab3bce5ffd5a94dd5
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 15:51:35 2023 +0200

    gandw on balls has been added

commit 349867d983e17aa124d3834191225d9f294265ad
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 14:59:56 2023 +0200

    Proper inactive handling now

commit d469c6c3fab6266d8a3f68dc1e993980448e59bd
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:52:15 2023 +0200

    OnSpawnBall reimplemented

commit dd290b333136075c30a340ae8c811af2f6e05d19
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:37:09 2023 +0200

    new sounds

commit 757e1c2c5ed87bf09d33006551c2d7ea40a3b786
Author: minenice55 <star.elementa@gmail.com>
Date:   Mon Jun 12 17:18:37 2023 -0400

    update Jukebox to latest version

    fixes for inferred entity loading

commit 8ce1d8276b1740724dc1d5200ec27b1b0f2c7c78
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 21:36:57 2023 +0200

    ball transporter anims for pass turn

commit af0d9bae19aa08bc2078b8fb7214381a0e28cc76
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 20:38:48 2023 +0200

    working dough converted, need to fix eveerything though

commit db21d51673be4ed326fbf6dcec97116956ddcd84
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 18:36:41 2023 +0200

    Converted everything to new curves and made playerballs handle themselves input-wise

commit 41157a038c3318dd68884dbce3f09cffc46188ab
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 14:04:32 2023 +0200

    Some new curves

commit 7d754f570661e77545765978b9a642bf590ae6de
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 12:03:21 2023 +0200

    Rockers can do it too now

commit c196947251d8fa588f1b4129d47c99216227c45f
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 11:58:31 2023 +0200

    You can now place inputs on top of pass turn for rhythm tweezers

commit 9f953d505fb6a4090171c65bd68f17c37df1772b
Merge: 2a8d8d6f df120f08
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:55:40 2023 -0400

    Merge branch 'master' into release_1

commit 2a8d8d6fd2c38df74102b2ad5e2ec0e25b314289
Merge: 9e3e5942 13adf5b0
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 19:53:47 2023 +0000

    Merge pull request #465 from minenice55/dont_infer_track

    Don't infer the track field when importing converted v0 riq coming from unknown origin

commit 13adf5b07b520f68c571c4a7a87fb6d25e98ccd7
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:52:14 2023 -0400

    don't infer track when importing a v0 riq from another program

commit 9e3e594209e775633ebfc43774136010081e7f8b
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 12:12:25 2023 -0400

    make base datamodels for special entity reading (#463)

    * make base datamodels for special entity reading

    * fix crop stomp breaking when no game switch or remix end is set

    * fix save shortcut

    fix loading charts with no music

commit 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 23:00:30 2023 -0400

    add updater for marching orders turn

commit 210be54ba3b48189aabba90e3643326172217767
Merge: 67b6658c af8395fb
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:36:10 2023 -0400

    Merge branch 'release_1' into pr/458

commit af8395fb6a673da7d593b0c4cb1ce094887af742
Merge: 81eafec9 b1fab52a
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:30:32 2023 -0400

    Merge branch 'master' into release_1

commit 81eafec9866a823ccceac95dd9c06000541a898e
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:27:58 2023 -0400

    editor fixes (#459)

    * ditch loading dialog

    doesn't show up when it's supposed to

    * format song offset in editor

    * remove VorbisPlugin

    * Update Editor.cs

commit 67b6658cd37c4d4628f71675164919e65600eada
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:55:10 2023 -0400

    convert float to double and all that

commit a4b66367fda2a6efe9f346882db00d0d588f26d6
Merge: 08a664ba b1fab52a
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:01:44 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit 08a664ba2a50d41243f3e355c7e3d351f246bb1b
Merge: faf3fbf9 b7afd697
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:21:22 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit faf3fbf97c3a2842c85d9adcecde98b78f59068d
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:18:45 2023 -0400

    a lot

    * munchy monk input + mustache fixes
    * fork lifter and pajama party bopping
    * meat grinder miss bop fix
    * cloud monkey Real
    * marching orders Go! was broken
    * force march doesn't break when it's too early from a game switch
    * you can use the March! block without the marching now

commit bb2ae7433907e75c96508411bfcf1bc19608d970
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 15:13:29 2023 -0400

    Integration of Jukebox Library (#451)

    * add Jukebox library

    todo:
    - saving / loading of new format
    - inferrence of unknown data like past versions
    - move the temporary float casts to proper use of double
    - make sound related functions take double for timing
    - inform people that the Jukebox sound player was renamed to SoundByte lol

    * make sound, input scheduling, and super curve use double precision

    * successfully load charts

    * editor works again

    v1 riqs can be saved and loaded

    * first tempo and volume markers are unmovable

    fix loading of charts' easing values

    * use gsync / freesync

    * update Jukebox refs to SoundByte

    * game events use double part 1

    Air Rally - Glee Club converted

    * don't load song if chart load fails

    * finish conversion of all minigames

    * remove editor waveform toggle

    * timeline now respects added song offset length

    clear cache files on app close
    prepped notes for dsp sync

    * update timeline length when offset changed

    * update to latest Jukebox

    * make error panel object in global game manager

    * improve conductor music scheduling

    * added error message box

    fix first game events sometimes not playing

* Squashed commit of the following:

commit e782e3a5b4c31e5e620c8048eed8261c03c56f82
Merge: 5b8cfef1 ce74719c
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 17 16:40:52 2023 +0000

    Merge pull request #478 from evdial/working-dough

    Working Dough Tweaks

commit ce74719c1a8c324269b3df4699871a8ecba07a65
Merge: 9c61b760 5b8cfef1
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 17 12:40:06 2023 -0400

    Merge branch 'release_1' into pr/478

commit 5b8cfef1b0179dffe77b02a40fce8ee37f7ed5c9
Author: patata <patataofcourse@gmail.com>
Date:   Sat Jun 17 17:20:15 2023 +0200

    Update issue template to include .riq/.zip info

commit 9c61b760bb4cc8b93074f57b73e63a9b5a61202b
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 15:05:07 2023 -0400

    assbuns

commit ae7451e9d3182c7e965919d661fc2ac47b3034b7
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Thu Jun 15 20:56:40 2023 +0200

    made small idle not crazy

commit 4c5c95237c50bb1a9805fcd7233cb2d915e7574d
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 14:33:57 2023 -0400

    fsd

commit 083d91623816011017a67c66cf9cdafb348943e6
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 14:16:38 2023 -0400

    anim

commit b3664e01b37e1c317712dfbde947f0f99ba79cb4
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Thu Jun 15 20:13:11 2023 +0200

    Fixed stuff also scaled now yippee

commit 71e3a0ce6bcf0ccae3de304ff2586b566cc36e83
Author: ev <85412919+evdial@users.noreply.github.com>
Date:   Thu Jun 15 13:50:10 2023 -0400

    many

commit 534b06301dc9deeb8638553265ca5a5c49a1c41a
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:28:21 2023 -0400

    Squashed commit of the following: (#474)

    commit a6ce193ce5c0f7a43c63300c567531d430337aa0
    Merge: 6105bb4f 9b24ac48
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Wed Jun 14 01:23:31 2023 +0000

        Merge pull request #473 from minenice55/easings-fix

        Enum Parsing Fix

    commit 9b24ac48382591a57d0c33d3e3196a6681d58cde
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 21:21:13 2023 -0400

        fix all parsing of enums, removed the "special case" for eases

        update to latest Jukebox

    commit 6105bb4f64a4128cc0e223724a54bc5421c7cd13
    Merge: 576b4a00 8df235a8
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 21:39:15 2023 +0000

        Merge pull request #469 from minenice55/jukebox-update

        Jukebox Package Update

    commit 576b4a001774b21cce47ff2ace26b2b1a212ad90
    Merge: 99804457 10f8fa7f
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 21:39:08 2023 +0000

        Merge pull request #458 from AstrlJelly/MiscAdditions_4

        Bug Fixes + Feature Additions

    commit 10f8fa7f5a92e431b28b7becdc9484a7f0d97a16
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 17:38:24 2023 -0400

        add "updater" for the old marching entity

    commit 118cd4993da42f6779b2cc2b85bbdae1d2fa27c4
    Merge: 1c1c731d 99804457
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 17:22:01 2023 -0400

        Merge branch 'release_1' into pr/458

    commit 8df235a85b0557a6e2e6622582253634ebcb57f6
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 16:55:02 2023 -0400

        let play mode start if no song file is loaded

        fix issue with loading large audio files

    commit 9980445723d3af784de3a56d8200c11b8985ac9a
    Merge: aff1e3d8 2f595824
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 18:32:40 2023 +0000

        Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

        Fixed weird curve stuff on game switch in working dough

    commit 2f595824608fad4fd3cc69818b5da590aeea7534
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 19:24:13 2023 +0200

        Fixed weird curve stuff on game switch in working dough

    commit aff1e3d889505ee33ade1e7e5ced5534ff8ad0e9
    Merge: b40ec128 c9accfa5
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 16:09:21 2023 +0000

        Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

        Fixed small balls not working in working dough

    commit c9accfa52d87a475fc3e033ee47bfe5db31ef166
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 18:07:13 2023 +0200

        Fixed small balls not working in working dough

    commit b40ec128a5c12fe1b38ad7f1bb79d0f3d5292ed6
    Merge: 9f953d50 95c9b346
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Tue Jun 13 14:56:58 2023 +0000

        Merge pull request #467 from Rapandrasmus/WorkingDoughRework

        Working Dough rework

    commit 95c9b3469582a3126ca51b38528b7d2c8d69747e
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 16:13:08 2023 +0200

        modernised rockers pass turn

    commit 0debf553918a241f9a2287745295b230274fdad0
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 16:03:08 2023 +0200

        Rhythm tweezers pass turn now works like working dough

    commit 6eac745eaebc502b2b3d733ab3bce5ffd5a94dd5
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 15:51:35 2023 +0200

        gandw on balls has been added

    commit 349867d983e17aa124d3834191225d9f294265ad
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 14:59:56 2023 +0200

        Proper inactive handling now

    commit d469c6c3fab6266d8a3f68dc1e993980448e59bd
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 13:52:15 2023 +0200

        OnSpawnBall reimplemented

    commit dd290b333136075c30a340ae8c811af2f6e05d19
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Tue Jun 13 13:37:09 2023 +0200

        new sounds

    commit 757e1c2c5ed87bf09d33006551c2d7ea40a3b786
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Mon Jun 12 17:18:37 2023 -0400

        update Jukebox to latest version

        fixes for inferred entity loading

    commit 8ce1d8276b1740724dc1d5200ec27b1b0f2c7c78
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 21:36:57 2023 +0200

        ball transporter anims for pass turn

    commit af0d9bae19aa08bc2078b8fb7214381a0e28cc76
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 20:38:48 2023 +0200

        working dough converted, need to fix eveerything though

    commit db21d51673be4ed326fbf6dcec97116956ddcd84
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 18:36:41 2023 +0200

        Converted everything to new curves and made playerballs handle themselves input-wise

    commit 41157a038c3318dd68884dbce3f09cffc46188ab
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 14:04:32 2023 +0200

        Some new curves

    commit 7d754f570661e77545765978b9a642bf590ae6de
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 12:03:21 2023 +0200

        Rockers can do it too now

    commit c196947251d8fa588f1b4129d47c99216227c45f
    Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
    Date:   Mon Jun 12 11:58:31 2023 +0200

        You can now place inputs on top of pass turn for rhythm tweezers

    commit 9f953d505fb6a4090171c65bd68f17c37df1772b
    Merge: 2a8d8d6f df120f08
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 15:55:40 2023 -0400

        Merge branch 'master' into release_1

    commit 2a8d8d6fd2c38df74102b2ad5e2ec0e25b314289
    Merge: 9e3e5942 13adf5b0
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 19:53:47 2023 +0000

        Merge pull request #465 from minenice55/dont_infer_track

        Don't infer the track field when importing converted v0 riq coming from unknown origin

    commit 13adf5b07b520f68c571c4a7a87fb6d25e98ccd7
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 15:52:14 2023 -0400

        don't infer track when importing a v0 riq from another program

    commit 9e3e594209e775633ebfc43774136010081e7f8b
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sun Jun 11 12:12:25 2023 -0400

        make base datamodels for special entity reading (#463)

        * make base datamodels for special entity reading

        * fix crop stomp breaking when no game switch or remix end is set

        * fix save shortcut

        fix loading charts with no music

    commit 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 23:00:30 2023 -0400

        add updater for marching orders turn

    commit 210be54ba3b48189aabba90e3643326172217767
    Merge: 67b6658c af8395fb
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 22:36:10 2023 -0400

        Merge branch 'release_1' into pr/458

    commit af8395fb6a673da7d593b0c4cb1ce094887af742
    Merge: 81eafec9 b1fab52a
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 22:30:32 2023 -0400

        Merge branch 'master' into release_1

    commit 81eafec9866a823ccceac95dd9c06000541a898e
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 22:27:58 2023 -0400

        editor fixes (#459)

        * ditch loading dialog

        doesn't show up when it's supposed to

        * format song offset in editor

        * remove VorbisPlugin

        * Update Editor.cs

    commit 67b6658cd37c4d4628f71675164919e65600eada
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 16:55:10 2023 -0400

        convert float to double and all that

    commit a4b66367fda2a6efe9f346882db00d0d588f26d6
    Merge: 08a664ba b1fab52a
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 16:01:44 2023 -0400

        Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

    commit 08a664ba2a50d41243f3e355c7e3d351f246bb1b
    Merge: faf3fbf9 b7afd697
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 15:21:22 2023 -0400

        Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

    commit faf3fbf97c3a2842c85d9adcecde98b78f59068d
    Author: AstrlJelly <bdlawson115@gmail.com>
    Date:   Sat Jun 10 15:18:45 2023 -0400

        a lot

        * munchy monk input + mustache fixes
        * fork lifter and pajama party bopping
        * meat grinder miss bop fix
        * cloud monkey Real
        * marching orders Go! was broken
        * force march doesn't break when it's too early from a game switch
        * you can use the March! block without the marching now

    commit bb2ae7433907e75c96508411bfcf1bc19608d970
    Author: minenice55 <star.elementa@gmail.com>
    Date:   Sat Jun 10 15:13:29 2023 -0400

        Integration of Jukebox Library (#451)

        * add Jukebox library

        todo:
        - saving / loading of new format
        - inferrence of unknown data like past versions
        - move the temporary float casts to proper use of double
        - make sound related functions take double for timing
        - inform people that the Jukebox sound player was renamed to SoundByte lol

        * make sound, input scheduling, and super curve use double precision

        * successfully load charts

        * editor works again

        v1 riqs can be saved and loaded

        * first tempo and volume markers are unmovable

        fix loading of charts' easing values

        * use gsync / freesync

        * update Jukebox refs to SoundByte

        * game events use double part 1

        Air Rally - Glee Club converted

        * don't load song if chart load fails

        * finish conversion of all minigames

        * remove editor waveform toggle

        * timeline now respects added song offset length

        clear cache files on app close
        prepped notes for dsp sync

        * update timeline length when offset changed

        * update to latest Jukebox

        * make error panel object in global game manager

        * improve conductor music scheduling

        * added error message box

        fix first game events sometimes not playing

commit a6ce193ce5c0f7a43c63300c567531d430337aa0
Merge: 6105bb4f 9b24ac48
Author: minenice55 <star.elementa@gmail.com>
Date:   Wed Jun 14 01:23:31 2023 +0000

    Merge pull request #473 from minenice55/easings-fix

    Enum Parsing Fix

commit 9b24ac48382591a57d0c33d3e3196a6681d58cde
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:21:13 2023 -0400

    fix all parsing of enums, removed the "special case" for eases

    update to latest Jukebox

commit 6105bb4f64a4128cc0e223724a54bc5421c7cd13
Merge: 576b4a00 8df235a8
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:15 2023 +0000

    Merge pull request #469 from minenice55/jukebox-update

    Jukebox Package Update

commit 576b4a001774b21cce47ff2ace26b2b1a212ad90
Merge: 99804457 10f8fa7f
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 21:39:08 2023 +0000

    Merge pull request #458 from AstrlJelly/MiscAdditions_4

    Bug Fixes + Feature Additions

commit 10f8fa7f5a92e431b28b7becdc9484a7f0d97a16
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:38:24 2023 -0400

    add "updater" for the old marching entity

commit 118cd4993da42f6779b2cc2b85bbdae1d2fa27c4
Merge: 1c1c731d 99804457
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 17:22:01 2023 -0400

    Merge branch 'release_1' into pr/458

commit 8df235a85b0557a6e2e6622582253634ebcb57f6
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:55:02 2023 -0400

    let play mode start if no song file is loaded

    fix issue with loading large audio files

commit 9980445723d3af784de3a56d8200c11b8985ac9a
Merge: aff1e3d8 2f595824
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 18:32:40 2023 +0000

    Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve

    Fixed weird curve stuff on game switch in working dough

commit 2f595824608fad4fd3cc69818b5da590aeea7534
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 19:24:13 2023 +0200

    Fixed weird curve stuff on game switch in working dough

commit aff1e3d889505ee33ade1e7e5ced5534ff8ad0e9
Merge: b40ec128 c9accfa5
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 16:09:21 2023 +0000

    Merge pull request #470 from Rapandrasmus/WorkingDoughFixes

    Fixed small balls not working in working dough

commit c9accfa52d87a475fc3e033ee47bfe5db31ef166
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 18:07:13 2023 +0200

    Fixed small balls not working in working dough

commit b40ec128a5c12fe1b38ad7f1bb79d0f3d5292ed6
Merge: 9f953d50 95c9b346
Author: minenice55 <star.elementa@gmail.com>
Date:   Tue Jun 13 14:56:58 2023 +0000

    Merge pull request #467 from Rapandrasmus/WorkingDoughRework

    Working Dough rework

commit 95c9b3469582a3126ca51b38528b7d2c8d69747e
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:13:08 2023 +0200

    modernised rockers pass turn

commit 0debf553918a241f9a2287745295b230274fdad0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 16:03:08 2023 +0200

    Rhythm tweezers pass turn now works like working dough

commit 6eac745eaebc502b2b3d733ab3bce5ffd5a94dd5
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 15:51:35 2023 +0200

    gandw on balls has been added

commit 349867d983e17aa124d3834191225d9f294265ad
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 14:59:56 2023 +0200

    Proper inactive handling now

commit d469c6c3fab6266d8a3f68dc1e993980448e59bd
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:52:15 2023 +0200

    OnSpawnBall reimplemented

commit dd290b333136075c30a340ae8c811af2f6e05d19
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Tue Jun 13 13:37:09 2023 +0200

    new sounds

commit 757e1c2c5ed87bf09d33006551c2d7ea40a3b786
Author: minenice55 <star.elementa@gmail.com>
Date:   Mon Jun 12 17:18:37 2023 -0400

    update Jukebox to latest version

    fixes for inferred entity loading

commit 8ce1d8276b1740724dc1d5200ec27b1b0f2c7c78
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 21:36:57 2023 +0200

    ball transporter anims for pass turn

commit af0d9bae19aa08bc2078b8fb7214381a0e28cc76
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 20:38:48 2023 +0200

    working dough converted, need to fix eveerything though

commit db21d51673be4ed326fbf6dcec97116956ddcd84
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 18:36:41 2023 +0200

    Converted everything to new curves and made playerballs handle themselves input-wise

commit 41157a038c3318dd68884dbce3f09cffc46188ab
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 14:04:32 2023 +0200

    Some new curves

commit 7d754f570661e77545765978b9a642bf590ae6de
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 12:03:21 2023 +0200

    Rockers can do it too now

commit c196947251d8fa588f1b4129d47c99216227c45f
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date:   Mon Jun 12 11:58:31 2023 +0200

    You can now place inputs on top of pass turn for rhythm tweezers

commit 9f953d505fb6a4090171c65bd68f17c37df1772b
Merge: 2a8d8d6f df120f08
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:55:40 2023 -0400

    Merge branch 'master' into release_1

commit 2a8d8d6fd2c38df74102b2ad5e2ec0e25b314289
Merge: 9e3e5942 13adf5b0
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 19:53:47 2023 +0000

    Merge pull request #465 from minenice55/dont_infer_track

    Don't infer the track field when importing converted v0 riq coming from unknown origin

commit 13adf5b07b520f68c571c4a7a87fb6d25e98ccd7
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 15:52:14 2023 -0400

    don't infer track when importing a v0 riq from another program

commit 9e3e594209e775633ebfc43774136010081e7f8b
Author: minenice55 <star.elementa@gmail.com>
Date:   Sun Jun 11 12:12:25 2023 -0400

    make base datamodels for special entity reading (#463)

    * make base datamodels for special entity reading

    * fix crop stomp breaking when no game switch or remix end is set

    * fix save shortcut

    fix loading charts with no music

commit 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 23:00:30 2023 -0400

    add updater for marching orders turn

commit 210be54ba3b48189aabba90e3643326172217767
Merge: 67b6658c af8395fb
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:36:10 2023 -0400

    Merge branch 'release_1' into pr/458

commit af8395fb6a673da7d593b0c4cb1ce094887af742
Merge: 81eafec9 b1fab52a
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:30:32 2023 -0400

    Merge branch 'master' into release_1

commit 81eafec9866a823ccceac95dd9c06000541a898e
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 22:27:58 2023 -0400

    editor fixes (#459)

    * ditch loading dialog

    doesn't show up when it's supposed to

    * format song offset in editor

    * remove VorbisPlugin

    * Update Editor.cs

commit 67b6658cd37c4d4628f71675164919e65600eada
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:55:10 2023 -0400

    convert float to double and all that

commit a4b66367fda2a6efe9f346882db00d0d588f26d6
Merge: 08a664ba b1fab52a
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 16:01:44 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit 08a664ba2a50d41243f3e355c7e3d351f246bb1b
Merge: faf3fbf9 b7afd697
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:21:22 2023 -0400

    Merge remote-tracking branch 'upstream/master' into MiscAdditions_4

commit faf3fbf97c3a2842c85d9adcecde98b78f59068d
Author: AstrlJelly <bdlawson115@gmail.com>
Date:   Sat Jun 10 15:18:45 2023 -0400

    a lot

    * munchy monk input + mustache fixes
    * fork lifter and pajama party bopping
    * meat grinder miss bop fix
    * cloud monkey Real
    * marching orders Go! was broken
    * force march doesn't break when it's too early from a game switch
    * you can use the March! block without the marching now

commit bb2ae7433907e75c96508411bfcf1bc19608d970
Author: minenice55 <star.elementa@gmail.com>
Date:   Sat Jun 10 15:13:29 2023 -0400

    Integration of Jukebox Library (#451)

    * add Jukebox library

    todo:
    - saving / loading of new format
    - inferrence of unknown data like past versions
    - move the temporary float casts to proper use of double
    - make sound related functions take double for timing
    - inform people that the Jukebox sound player was renamed to SoundByte lol

    * make sound, input scheduling, and super curve use double precision

    * successfully load charts

    * editor works again

    v1 riqs can be saved and loaded

    * first tempo and volume markers are unmovable

    fix loading of charts' easing values

    * use gsync / freesync

    * update Jukebox refs to SoundByte

    * game events use double part 1

    Air Rally - Glee Club converted

    * don't load song if chart load fails

    * finish conversion of all minigames

    * remove editor waveform toggle

    * timeline now respects added song offset length

    clear cache files on app close
    prepped notes for dsp sync

    * update timeline length when offset changed

    * update to latest Jukebox

    * make error panel object in global game manager

    * improve conductor music scheduling

    * added error message box

    fix first game events sometimes not playing
2023-06-17 12:50:10 -04:00
minenice55
312730fda6
Update issue template to include .riq/.zip info (#483)
Co-authored-by: patata <patataofcourse@gmail.com>
2023-06-17 12:30:42 -04:00
366 changed files with 24964 additions and 8782 deletions

View File

@ -2,7 +2,7 @@ name: Build Heaven Studio
on:
push:
branches: [ "master", "release_1", "actions_rework" ]
branches: [ "master", "release_1_patches" ]
workflow_dispatch: {}
jobs:

View File

@ -1,12 +1,10 @@
using System.IO;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
using UnityEngine;
using SatorImaging.UnitySourceGenerator.Editor;
using HeavenStudio;
public class CreateAssetBundles
{
[MenuItem("Assets/Build AssetBundles/Current Platform")]
@ -17,6 +15,8 @@ public class CreateAssetBundles
{
Directory.CreateDirectory(assetBundleDirectory);
}
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, EditorUserBuildSettings.activeBuildTarget);
}
@ -28,6 +28,8 @@ public class CreateAssetBundles
{
Directory.CreateDirectory(assetBundleDirectory);
}
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneWindows);
}
@ -39,6 +41,8 @@ public class CreateAssetBundles
{
Directory.CreateDirectory(assetBundleDirectory);
}
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneLinux64);
}
@ -50,6 +54,8 @@ public class CreateAssetBundles
{
Directory.CreateDirectory(assetBundleDirectory);
}
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneOSX);
}
}

View File

@ -0,0 +1,14 @@
using UnityEngine;
using UnityEditor;
using SatorImaging.UnitySourceGenerator.Editor;
public class CreateMinigameScriptTemplate
{
[MenuItem("Assets/Heaven Studio/Create Minigame Script From Template", priority = 0)]
public static void CreateMinigameScript()
{
ProjectWindowUtil.CreateScriptAssetFromTemplateFile("Assets/Editor/ScriptTemplates/MinigameScriptTemplate.txt", "NewMinigame.cs");
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(HeavenStudio.Minigames));
}
}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a8beacc6f1e76b94da362fffb1e25e2e
guid: 24bc0d119c30f3a41aee57b4e85dbf64
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5c02948e56fc801488f8e266ae84de7e
guid: 12ec433916efb3c4a895be2ac0dd6935
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,52 @@
using System;
using System.Linq;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using HeavenStudio.Util;
using HeavenStudio.InputSystem;
using Jukebox;
namespace HeavenStudio.Games.Loaders
{
using static Minigames;
/// Minigame loaders handle the setup of your minigame.
/// Here, you designate the game prefab, define entities, and mark what AssetBundle to load
/// Names of minigame loaders follow a specific naming convention of `PlatformcodeNameLoader`, where:
/// `Platformcode` is a three-leter platform code with the minigame's origin
/// `Name` is a short internal name
/// `Loader` is the string "Loader"
/// Platform codes are as follows:
/// Agb: Gameboy Advance ("Advance Gameboy")
/// Ntr: Nintendo DS ("Nitro")
/// Rvl: Nintendo Wii ("Revolution")
/// Ctr: Nintendo 3DS ("Centrair")
/// Mob: Mobile
/// Pco: PC / Other
/// Fill in the loader class label, "*prefab name*", and "*Display Name*" with the relevant information
/// For help, feel free to reach out to us on our discord, in the #development channel.
public static class _______________
{
public static Minigame AddGame(EventCaller eventCaller)
{
return new Minigame("*prefab name*", "*Display Name*", "ffffff", false, false, new List<GameAction>()
{
}
);
}
}
}
namespace HeavenStudio.Games
{
/// This class handles the minigame logic.
/// Minigame inherits directly from MonoBehaviour, and adds Heaven Studio specific methods to override.
public class #SCRIPTNAME# : Minigame
{
}
}

View File

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

View File

@ -77,7 +77,8 @@ public class SpritesheetScaler : EditorWindow
for (int i = 0; i < ti1.spritesheet.Length; i++)
{
SpriteMetaData d = ti1.spritesheet[i];
Vector2 oldPivot = Rect.NormalizedToPoint(d.rect, d.pivot) * multiplier;
// pivot relative to the origin of the rect in pixels
Vector2 oldPivot = new Vector2(d.pivot.x * d.rect.width, d.pivot.y * d.rect.height);
d.rect = ScaleRect(d.rect, multiplier, inflateX, inflateY);
d.border.x += d.border.x > 0 ? inflateX : 0;
@ -85,10 +86,12 @@ public class SpritesheetScaler : EditorWindow
d.border.z += d.border.z > 0 ? inflateX : 0;
d.border.w += d.border.w > 0 ? inflateY : 0;
if (inflateX > 0 || inflateY > 0)
if (d.alignment != (int)SpriteAlignment.Center && (inflateX > 0 || inflateY > 0))
{
d.alignment = (int)SpriteAlignment.Custom;
d.pivot = Rect.PointToNormalized(d.rect, oldPivot);
oldPivot += new Vector2(inflateX, inflateY);
Vector2 newPivot = oldPivot * multiplier;
d.pivot = new Vector2(newPivot.x / d.rect.width, newPivot.y / d.rect.height);
}
d.border *= multiplier;

View File

@ -1,12 +0,0 @@
using System;
namespace Discord
{
public partial class ActivityManager
{
public void RegisterCommand()
{
RegisterCommand(null);
}
}
}

View File

@ -1,9 +0,0 @@
using System;
namespace Discord
{
static class Constants
{
public const string DllName = "discord_game_sdk";
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,53 +0,0 @@
using System;
using System.Runtime.InteropServices;
#if UNITY_EDITOR || UNITY_STANDALONE
using UnityEngine;
#endif
namespace Discord
{
public partial struct ImageHandle
{
static public ImageHandle User(Int64 id)
{
return User(id, 128);
}
static public ImageHandle User(Int64 id, UInt32 size)
{
return new ImageHandle
{
Type = ImageType.User,
Id = id,
Size = size,
};
}
}
public partial class ImageManager
{
public void Fetch(ImageHandle handle, FetchHandler callback)
{
Fetch(handle, false, callback);
}
public byte[] GetData(ImageHandle handle)
{
var dimensions = GetDimensions(handle);
var data = new byte[dimensions.Width * dimensions.Height * 4];
GetData(handle, data);
return data;
}
#if UNITY_EDITOR || UNITY_STANDALONE
public Texture2D GetTexture(ImageHandle handle)
{
var dimensions = GetDimensions(handle);
var texture = new Texture2D((int)dimensions.Width, (int)dimensions.Height, TextureFormat.RGBA32, false, true);
texture.LoadRawTextureData(GetData(handle));
texture.Apply();
return texture;
}
#endif
}
}

View File

@ -1,26 +0,0 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Text;
namespace Discord
{
public partial class LobbyManager
{
public IEnumerable<User> GetMemberUsers(Int64 lobbyID)
{
var memberCount = MemberCount(lobbyID);
var members = new List<User>();
for (var i = 0; i < memberCount; i++)
{
members.Add(GetMemberUser(lobbyID, GetMemberUserId(lobbyID, i)));
}
return members;
}
public void SendLobbyMessage(Int64 lobbyID, string data, SendLobbyMessageHandler handler)
{
SendLobbyMessage(lobbyID, Encoding.UTF8.GetBytes(data), handler);
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 9f595176ca2beab4da4f6473f1a4d102
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Discord
{
public partial class StorageManager
{
public IEnumerable<FileStat> Files()
{
var fileCount = Count();
var files = new List<FileStat>();
for (var i = 0; i < fileCount; i++)
{
files.Add(StatAt(i));
}
return files;
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 0de83ab0ec089db4eb806d35d6dd9558
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,32 +0,0 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Text;
namespace Discord
{
public partial class StoreManager
{
public IEnumerable<Entitlement> GetEntitlements()
{
var count = CountEntitlements();
var entitlements = new List<Entitlement>();
for (var i = 0; i < count; i++)
{
entitlements.Add(GetEntitlementAt(i));
}
return entitlements;
}
public IEnumerable<Sku> GetSkus()
{
var count = CountSkus();
var skus = new List<Sku>();
for (var i = 0; i < count; i++)
{
skus.Add(GetSkuAt(i));
}
return skus;
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 12e503df03fd6734d8f085997e64656c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,63 +0,0 @@
fileFormatVersion: 2
guid: 96fc096f6b288424faf79ea974b7041e
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 0
Exclude Linux64: 1
Exclude OSXUniversal: 0
Exclude Win: 1
Exclude Win64: 1
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: ARM64
DefaultValueInitialized: true
OS: OSX
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: x86_64
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: ARM64
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: x86
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: x86_64
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,63 +0,0 @@
fileFormatVersion: 2
guid: 84f8495f7ca76e94c9e4bfe9675f534c
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 0
Exclude Linux64: 1
Exclude OSXUniversal: 0
Exclude Win: 1
Exclude Win64: 1
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: ARM64
DefaultValueInitialized: true
OS: OSX
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: x86_64
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: ARM64
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: x86
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: x86_64
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: e291cd87df3992b40b4cb0fc5f542185
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,63 +0,0 @@
fileFormatVersion: 2
guid: ba4f73ad56fdd254c9406111c6702f84
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 0
Exclude Linux64: 0
Exclude OSXUniversal: 0
Exclude Win: 0
Exclude Win64: 0
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: AnyOS
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: x86_64
- first:
Standalone: Win
second:
enabled: 1
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: x86_64
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,52 +0,0 @@
fileFormatVersion: 2
guid: ffaf5645d42da1d40b14356395eb1bb8
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: x86_64
DefaultValueInitialized: true
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: x86_64
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,80 +0,0 @@
fileFormatVersion: 2
guid: cbdb66c634dc7af4cb711bca303d2c1a
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Android: 0
Exclude Editor: 0
Exclude Linux64: 0
Exclude OSXUniversal: 0
Exclude Win: 0
Exclude Win64: 0
Exclude iOS: 0
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: AnyOS
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: x86_64
- first:
Standalone: Win
second:
enabled: 1
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
iPhone: iOS
second:
enabled: 1
settings:
AddToEmbeddedBinaries: false
CPU: AnyCPU
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,63 +0,0 @@
fileFormatVersion: 2
guid: f5327cb3294b2bc46a8451ef4c09a855
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 0
Exclude Linux64: 0
Exclude OSXUniversal: 1
Exclude Win: 0
Exclude Win64: 0
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: AnyOS
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win
second:
enabled: 1
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 70173042601fc1846a90b0c8ea926df4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,63 +0,0 @@
fileFormatVersion: 2
guid: 7dc43ba202aaeee43b83eda90c7cf67b
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 1
Exclude Linux64: 0
Exclude OSXUniversal: 0
Exclude Win: 0
Exclude Win64: 0
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: Windows
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: None
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: x86
- first:
Standalone: Win
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: None
userData:
assetBundleName:
assetBundleVariant:

View File

@ -7,7 +7,6 @@
-<indent=5%>Mytiaoga</indent>
-<indent=5%>Carson</indent>
-<indent=5%>saladplainzone</indent>
-<indent=5%>Pengu123</indent>
-<indent=5%>Krıspy Kreme</indent>
-<indent=5%>DPS2004</indent>
-<indent=5%>Jellirby</indent>
@ -18,7 +17,7 @@
-<indent=5%>Maddy / saladplainzone</indent>
-<indent=5%>NoahAmp</indent>
-<indent=5%>Bhaos</indent>
-<indent=5%>Raffy</indent>
-<indent=5%>RaffyTaffy14</indent>
-<indent=5%>Thinedave</indent>
<align="center"><b>Artwork</b></align>
@ -54,7 +53,7 @@
-<indent=5%>Butternnife</indent>
-<indent=5%>Minesweeper95</indent>
-<indent=5%>mizuno</indent>
-<indent=5%>Flowercardiganwillow</indent>
-<indent=5%>Malleable Frog</indent>
-<indent=5%>vincells</indent>
<align="center"><b>Music</b></align>

View File

@ -0,0 +1,501 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &-9022938225433809117
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: buttonIcons Material
m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _CullMode: 0
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3}
m_Name: Buttons
m_EditorClassIdentifier:
m_Version: 1.1.0
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName:
m_StyleName:
m_PointSize: 0
m_Scale: 0
m_UnitsPerEM: 0
m_LineHeight: 0
m_AscentLine: 0
m_CapLine: 0
m_MeanLine: 0
m_Baseline: 0
m_DescentLine: 0
m_SuperscriptOffset: 0
m_SuperscriptSize: 0
m_SubscriptOffset: 0
m_SubscriptSize: 0
m_UnderlineOffset: 0
m_UnderlineThickness: 0
m_StrikethroughOffset: 0
m_StrikethroughThickness: 0
m_TabWidth: 0
m_Material: {fileID: 2100000, guid: 0035f9ee73a3659488de4969ea48d035, type: 2}
spriteSheet: {fileID: 2800000, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
m_SpriteCharacterTable:
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 0
m_Scale: 1
m_Name: ButtonOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 1
m_Scale: 1
m_Name: ShoulderLeftOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 2
m_Scale: 1
m_Name: ShoulderRightOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 3
m_Scale: 1
m_Name: ShouldersOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 4
m_Scale: 1
m_Name: ShouldersRightOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 5
m_Scale: 1
m_Name: Pad
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 6
m_Scale: 1
m_Name: Face
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 7
m_Scale: 1
m_Name: ButtonOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 8
m_Scale: 1
m_Name: EastOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 9
m_Scale: 1
m_Name: SouthOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 10
m_Scale: 1
m_Name: NorthOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 11
m_Scale: 1
m_Name: WestOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 12
m_Scale: 1
m_Name: ShoulderLeftOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 13
m_Scale: 1
m_Name: ShoulderRightOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 14
m_Scale: 1
m_Name: ShouldersOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 15
m_Scale: 1
m_Name: ShouldersLeftOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 16
m_Scale: 1
m_Name: RightOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 17
m_Scale: 1
m_Name: DownOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 18
m_Scale: 1
m_Name: LeftOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 19
m_Scale: 1
m_Name: UpOn
m_GlyphTable:
- m_Index: 0
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 151
m_Y: 984
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -6506423922138132652, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 1
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 511
m_Y: 984
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -598839719690993186, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 2
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 551
m_Y: 984
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 7882489078324362733, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 3
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 591
m_Y: 984
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -7444272823696498285, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 4
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 671
m_Y: 984
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 5518843884416884346, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 5
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 2
m_Y: 955
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 6719230046462009688, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 6
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 71
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 3826735276939671808, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 7
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 151
m_Y: 944
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -7319796363159512643, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 8
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 191
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 8406874011085310447, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 9
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 271
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 111238229322356548, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 10
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 351
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 8017398019882363653, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 11
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 431
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -8397132687541991269, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 12
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 511
m_Y: 944
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -1348493139139215224, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 13
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 551
m_Y: 944
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 6499095914430324874, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 14
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 591
m_Y: 944
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -5368843543446870761, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 15
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 671
m_Y: 944
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 3724681018647327355, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 16
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 2
m_Y: 886
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -4789233240444048905, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 17
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 71
m_Y: 875
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 4213091988662033815, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 18
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 140
m_Y: 875
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 6847377428827266393, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 19
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 209
m_Y: 875
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -5863448563183388835, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
spriteInfoList: []
fallbackSpriteAssets: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0c43f0788bfc33b43abc93c58f2307b5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -48,7 +48,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3}
m_Name: hsEmoji
m_Name: HeavenEmoji
m_EditorClassIdentifier:
m_Version: 1.1.0
m_FaceInfo:

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,107 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: KurokaneCommentText
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Cube:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FaceTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 7565207379736317986, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
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
- _BevelClamp: 0
- _BevelOffset: 0
- _BevelRoundness: 0
- _BevelWidth: 0
- _BumpFace: 0
- _BumpOutline: 0
- _ColorMask: 15
- _CullMode: 0
- _Diffuse: 0.5
- _FaceDilate: 0.5
- _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowPower: 0.75
- _GradientScale: 10
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0.6
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.6990291
- _ScaleRatioB: 0.28125
- _ScaleRatioC: 0.28125
- _ScaleX: 1
- _ScaleY: 1
- _ShaderFlags: 0
- _Sharpness: 0
- _SpecularPower: 2
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _TextureHeight: 2048
- _TextureWidth: 2048
- _UnderlayDilate: 0
- _UnderlayOffsetX: 0
- _UnderlayOffsetY: 0
- _UnderlaySoftness: 0
- _VertexOffsetX: 0
- _VertexOffsetY: 0
- _WeightBold: 0.75
- _WeightNormal: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 1, g: 0.83137256, b: 0, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
m_BuildTextureStacks: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 26a467f586143104f8f45e45e84ccd93
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bdb826e35491c964b9b1e0e1f8705662
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -844,7 +844,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: d03b08a4c5ce7cb47b288ad638c7ca9f, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
m_Color: {r: 1, g: 1, b: 1, a: 0.8627451}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -1228,7 +1228,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b40da75f6d2bafa47ad85e579ee00993, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
m_Color: {r: 1, g: 1, b: 1, a: 0.8627451}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
@ -1721,7 +1721,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
@ -2279,7 +2279,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: d6ea70fa47396b640ab6ae551b0114f8, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
m_Color: {r: 1, g: 1, b: 1, a: 0.9019608}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
@ -4191,7 +4191,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
EligibleHits: []
scheduledInputs: []
alien: {fileID: 1725356918350344904}
translator: {fileID: 2669316826032871973}

View File

@ -74,7 +74,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -296,7 +296,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -380,7 +380,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -614,7 +614,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -839,7 +839,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -881,18 +881,8 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4405228065007432436}
- {fileID: 926803511865261909}
- {fileID: 2483520153194773728}
- {fileID: 23398713494082221}
- {fileID: 5794830076795771464}
- {fileID: 4558807675601686787}
- {fileID: 1756659025686986699}
- {fileID: 3145770816593845091}
- {fileID: 7080074331057963043}
- {fileID: 2608975278585726655}
- {fileID: 2800225648493660279}
- {fileID: 6788972830858619932}
- {fileID: 2107749384676224915}
- {fileID: 8284805101962113762}
- {fileID: 5226783559850429729}
m_Father: {fileID: 2168096156054789972}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1120,7 +1110,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -1288,7 +1278,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -1372,7 +1362,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.57254905}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -1573,8 +1563,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502138646470043659}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.18}
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:
@ -1588,12 +1578,12 @@ RectTransform:
- {fileID: 77958733345222368}
- {fileID: 3409895022873260347}
- {fileID: 3240854059252596719}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 4
m_Father: {fileID: 8284805101962113762}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 9.76}
m_AnchoredPosition: {x: -0.0099983215, y: 4.879999}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1525025648366084942
@ -1754,7 +1744,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.8509804}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -2007,7 +1997,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -2091,7 +2081,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -2175,7 +2165,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -2259,7 +2249,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -2460,8 +2450,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2198155337455343688}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2.3}
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:
@ -2472,12 +2462,12 @@ RectTransform:
- {fileID: 4930761942891866694}
- {fileID: 4023598138402765673}
- {fileID: 2014704604314630246}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 5
m_Father: {fileID: 5226783559850429729}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 15.88, y: 0}
m_AnchoredPosition: {x: 15.870002, y: -4.8899994}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2218334795655616443
@ -2554,7 +2544,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -2671,8 +2661,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2364807215172239617}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.18}
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:
@ -2686,12 +2676,12 @@ RectTransform:
- {fileID: 8161832550679281400}
- {fileID: 26469572763793582}
- {fileID: 1431543481492511005}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 12
m_Father: {fileID: 8284805101962113762}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 15.76, y: 9.76}
m_AnchoredPosition: {x: 15.750002, y: 4.879999}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2379602493099699429
@ -2768,7 +2758,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.80784315}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -2852,7 +2842,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -2936,7 +2926,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -3020,7 +3010,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -3053,8 +3043,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2591902619112967187}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2.3}
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:
@ -3065,12 +3055,12 @@ RectTransform:
- {fileID: 8917567265747845119}
- {fileID: 2514926088813503781}
- {fileID: 251507404491927279}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 11
m_Father: {fileID: 5226783559850429729}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 15.76, y: 9.78}
m_AnchoredPosition: {x: 15.750002, y: 4.8900003}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2764014063411314581
@ -3315,7 +3305,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -3483,7 +3473,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -3600,8 +3590,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268905332919582678}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.18}
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:
@ -3615,12 +3605,12 @@ RectTransform:
- {fileID: 1124821880999532318}
- {fileID: 2559310976653455869}
- {fileID: 5318853408915057115}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 8
m_Father: {fileID: 8284805101962113762}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -15.86, y: 0}
m_AnchoredPosition: {x: -15.869998, y: -4.880001}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3434848222725304509
@ -3697,7 +3687,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -3781,7 +3771,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -3865,7 +3855,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -4033,7 +4023,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.57254905}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -4201,7 +4191,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -4285,7 +4275,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -4402,8 +4392,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3827916254657136956}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2.3}
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:
@ -4414,12 +4404,12 @@ RectTransform:
- {fileID: 7575864339423163732}
- {fileID: 1225957955930656006}
- {fileID: 8427373646372124391}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 7
m_Father: {fileID: 5226783559850429729}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -15.86, y: 0}
m_AnchoredPosition: {x: -15.869998, y: -4.8899994}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3935916386830708752
@ -4445,8 +4435,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3935916386830708752}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2.3}
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:
@ -4457,14 +4447,56 @@ RectTransform:
- {fileID: 8791413887343378023}
- {fileID: 5763186480443003057}
- {fileID: 1773331959457045715}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 9
m_Father: {fileID: 5226783559850429729}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -15.6, y: 9.78}
m_AnchoredPosition: {x: -15.609999, y: 4.8900003}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4012951206705012350
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5226783559850429729}
m_Layer: 0
m_Name: FrontStars
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5226783559850429729
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4012951206705012350}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 8.5265}
m_LocalScale: {x: 1.5411682, y: 1.5411682, z: 1.5411682}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 926803511865261909}
- {fileID: 23398713494082221}
- {fileID: 4558807675601686787}
- {fileID: 3145770816593845091}
- {fileID: 2608975278585726655}
- {fileID: 6788972830858619932}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0099981, y: 4.8918}
m_SizeDelta: {x: 131.73999, y: 109.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4277644444261067960
GameObject:
m_ObjectHideFlags: 0
@ -4623,7 +4655,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -4707,7 +4739,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -4791,7 +4823,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -4875,7 +4907,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -5127,7 +5159,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -5211,7 +5243,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -5485,7 +5517,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -5737,7 +5769,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -5905,7 +5937,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -5999,6 +6031,48 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &5750046169180373967
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8284805101962113762}
m_Layer: 0
m_Name: BackStars
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8284805101962113762
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5750046169180373967}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 11.502}
m_LocalScale: {x: 1.8565451, y: 1.8565451, z: 1.8565451}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2483520153194773728}
- {fileID: 5794830076795771464}
- {fileID: 1756659025686986699}
- {fileID: 7080074331057963043}
- {fileID: 2800225648493660279}
- {fileID: 2107749384676224915}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0099964, y: 4.88}
m_SizeDelta: {x: 131.73999, y: 109.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5769653800879913986
GameObject:
m_ObjectHideFlags: 0
@ -6241,7 +6315,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -6274,8 +6348,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6093695872543899040}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.18}
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:
@ -6289,12 +6363,12 @@ RectTransform:
- {fileID: 4609651232726877626}
- {fileID: 1589207323874566630}
- {fileID: 8529858565281562362}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 6
m_Father: {fileID: 8284805101962113762}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 15.88, y: 0}
m_AnchoredPosition: {x: 15.870002, y: -4.880001}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6105209198813819284
@ -6371,7 +6445,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -6455,7 +6529,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -6490,8 +6564,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6246528639951137231}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 4.8746, y: 3.1533, z: 0}
m_LocalScale: {x: 4.3204956, y: 4.3204956, z: 4.3204956}
m_LocalPosition: {x: 4.8864, y: 5.79, z: 0}
m_LocalScale: {x: 5.4179926, y: 5.4179926, z: 5.4179926}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2483520153194773728}
@ -6539,7 +6613,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -100
m_Sprite: {fileID: -7442281247027042577, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.56078434}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -6623,7 +6697,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -6707,7 +6781,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -6791,7 +6865,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -6875,7 +6949,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7043,7 +7117,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7127,7 +7201,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7211,7 +7285,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7231,6 +7305,7 @@ GameObject:
m_Component:
- component: {fileID: 3515826053360711739}
- component: {fileID: 5921675778279546642}
- component: {fileID: 6655287328441744793}
m_Layer: 0
m_Name: Glare
m_TagString: Untagged
@ -7246,7 +7321,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6561292846486288656}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.101, y: 0.194, z: -0.084}
m_LocalPosition: {x: -1.101, y: 0.194, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -7305,6 +7380,27 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &6655287328441744793
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6561292846486288656}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: d0cd57d413049384db36f985069578ae, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &6578894049253302293
GameObject:
m_ObjectHideFlags: 0
@ -7379,7 +7475,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7463,7 +7559,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7547,7 +7643,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -7631,7 +7727,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -7715,7 +7811,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -7748,8 +7844,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7278122616026706364}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.18}
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:
@ -7764,12 +7860,12 @@ RectTransform:
- {fileID: 2851199372672928068}
- {fileID: 1801399719374522050}
- {fileID: 6504557809142195168}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 2
m_Father: {fileID: 8284805101962113762}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.0099983215, y: -4.880001}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7417163071302115104
@ -7846,7 +7942,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -7930,7 +8026,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -8098,7 +8194,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -8266,7 +8362,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -8350,7 +8446,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -8383,8 +8479,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7858878317832744708}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.18}
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:
@ -8398,12 +8494,12 @@ RectTransform:
- {fileID: 4722993531141705245}
- {fileID: 2092224159930599115}
- {fileID: 5099040026467820445}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 10
m_Father: {fileID: 8284805101962113762}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -15.6, y: 9.76}
m_AnchoredPosition: {x: -15.609999, y: 4.879999}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8100577537916625841
@ -8513,8 +8609,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8112509877096007021}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2.3}
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:
@ -8525,12 +8621,12 @@ RectTransform:
- {fileID: 1423165042533198580}
- {fileID: 6865732712292181353}
- {fileID: 7114460548521712462}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 1
m_Father: {fileID: 5226783559850429729}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.0099983215, y: -4.8899994}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8273590982824071395
@ -8691,7 +8787,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -9027,7 +9123,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -9195,7 +9291,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -9312,8 +9408,8 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8724844040395206150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2.3}
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:
@ -9324,12 +9420,12 @@ RectTransform:
- {fileID: 7956295654057825605}
- {fileID: 5081993994446215136}
- {fileID: 2283627058012952507}
m_Father: {fileID: 8093653255585685654}
m_RootOrder: 3
m_Father: {fileID: 5226783559850429729}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 9.78}
m_AnchoredPosition: {x: -0.0099983215, y: 4.8900003}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8767352270698557463
@ -9406,7 +9502,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -9490,7 +9586,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -9658,7 +9754,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -9742,7 +9838,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -9826,7 +9922,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.42745098}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -9910,7 +10006,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -180
m_Sprite: {fileID: -4408535834297646924, guid: 23e56abfe5ab36140b22aba3e82d1a69, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.2784314}
m_Color: {r: 1, g: 1, b: 1, a: 0.36862746}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0

View File

@ -85,8 +85,8 @@ AudioMixerController:
- {fileID: 752586362724348005}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_EnableSuspend: 0
m_UpdateMode: 1
m_ExposedParameters: []
m_AudioMixerGroupViews:
- guids:
@ -95,7 +95,7 @@ AudioMixerController:
- 4f0b7ddcf4e12a14c888732f2ab0fda0
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
m_TargetSnapshot: {fileID: 752586362724348005}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
@ -144,7 +144,7 @@ AudioMixerSnapshotController:
9dd04840cf4676047b2e26e659ca4069: 1661
65da18c00dad8f642a1f04b10bc4d3fa: -9.8
2b8f30d01b6887a4a9a1c346efb59529: 0.96
152a0691009a459488775726d7da2a76: 0
152a0691009a459488775726d7da2a76: 0.01
b32285822a3582a46bc02ae0bb31edd0: 0
16419c92ecf0c4743a61bae82f0cd39d: 0.96
3537f1d2761ea514aad24adbde59814c: 0.5
@ -183,7 +183,7 @@ AudioMixerSnapshotController:
m_FloatValues:
8ac1b110f403261418b718a0a6962426: -9.8
9dd04840cf4676047b2e26e659ca4069: 1661
152a0691009a459488775726d7da2a76: 16
152a0691009a459488775726d7da2a76: 10
b32285822a3582a46bc02ae0bb31edd0: 0
3537f1d2761ea514aad24adbde59814c: 0.5
1f89dac5f0e643c4ab8774d8ad05e968: 2.79

View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1187145154065342124}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -16}
m_LocalPosition: {x: 0, y: 0, z: -8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -57,7 +57,7 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
field of view: 35
orthographic: 0
orthographic size: 5
m_Depth: 0
@ -120,26 +120,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: df5f4fb9c5246ee4c8d2e99ad929ca57, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabs:
- {fileID: 7802515460925818711, guid: 2aaa9878c8795a84489edcd4e768b454, type: 3}
- {fileID: 7192404907844891135, guid: f2030f376d1b5f243a2813339d83bbcb, type: 3}
- {fileID: 2504738550622510693, guid: 639d3ab0914a39f4fa43fa957bef1c2c, type: 3}
- {fileID: 2993865421832826193, guid: 1621a5cb04619f5418e065677178088d, type: 3}
- {fileID: 5016524467690985173, guid: 89339a43f531d3b47b2d9a94b3773664, type: 3}
- {fileID: 6789284989889825045, guid: 3e5fd1d9087c44f4283f0a7442344197, type: 3}
- {fileID: 4787243303282176002, guid: f52107c591edd614f813b504522039fa, type: 3}
- {fileID: 7534579311271883722, guid: 53cbfc8ae1a278e498ed9e5586b6224d, type: 3}
- {fileID: 4507225946589498430, guid: a6b921d42e810c04892b251c939b2f45, type: 3}
- {fileID: 7622907553759130377, guid: 09a6efc12ba3d2b429570a43e10654e0, type: 3}
- {fileID: 6665503243595167146, guid: f6c902c426aa77d4e92a0eaa8732a4da, type: 3}
- {fileID: 160985724508280036, guid: 7c23357e15e05d54684371b2f35384df, type: 3}
- {fileID: 5935134666280485629, guid: 204f8d388d394b74bb05d784f1c340b0, type: 3}
- {fileID: 635741003951437542, guid: acdd3b2aa021f2e47a56d3a663b3f63b, type: 3}
- {fileID: 8491628317254562108, guid: c2fe3f9bf05ccf442945074fb7a765b7, type: 3}
- {fileID: 690123129763518588, guid: c83c3abbbee44df499e7cd2161e9f238, type: 3}
- {fileID: 3166074148675172226, guid: 62970d9a567230642bb1e34021abe3f5, type: 3}
- {fileID: 4272499595246014789, guid: f7bb23a0485f926439da0e96e13100e7, type: 3}
- {fileID: 7217551014164345173, guid: 10834007b998bee43b734537a886e30c, type: 3}
- {fileID: 1227462980693949205, guid: b407ca6ac98ec5142841b8fc20c44fa1, type: 3}
- {fileID: 5015118015629009658, guid: d74c0aa161dca1247b65265b51733e35, type: 3}
rotationDegreesPerSecond: 45

View File

@ -767,6 +767,9 @@ MonoBehaviour:
- tag: playstyle
label: Recommended Control Style
isReadOnly: 0
- tag: accessiblewarning
label: Flashing Effects Warning
isReadOnly: 0
- tag: remixtags
label: Tags
isReadOnly: 0

View File

@ -8052,8 +8052,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 951.5, y: 0}
m_SizeDelta: {x: 1863, y: 0}
m_AnchoredPosition: {x: 723, y: 0}
m_SizeDelta: {x: 1406, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3918594456218978261
CanvasRenderer:

View File

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 3840
m_Height: 2160
m_Width: 2238
m_Height: 1258
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92

View File

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 3840
m_Height: 2160
m_Width: 3357
m_Height: 1887
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 92

View File

@ -2137,7 +2137,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 252, y: 252}
m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8617665365188159470
CanvasRenderer:

View File

@ -113,6 +113,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 64
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AlienTextboxMaterial
m_Shader: {fileID: 4800000, guid: 777678d31f953e04e8f15812003b9c27, type: 3}
m_ShaderKeywords: UNITY_UI_ALPHACLIP
m_ValidKeywords:
- UNITY_UI_ALPHACLIP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
@ -84,7 +87,7 @@ Material:
- _UseUIAlphaClip: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.3137255, g: 0.45490196, b: 0.2509804, a: 1}
- _Color: {r: 0.39607844, g: 0.4745098, b: 0.023529412, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _OutColor: {r: 0.38823533, g: 0, b: 0.6, a: 1}
- _OutColor: {r: 0.43529412, g: 0.02745098, b: 0.67058825, a: 1}
m_BuildTextureStacks: []

View File

@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TranslatedTextboxMaterial
m_Shader: {fileID: 4800000, guid: 777678d31f953e04e8f15812003b9c27, type: 3}
m_ShaderKeywords: UNITY_UI_ALPHACLIP
m_ValidKeywords:
- UNITY_UI_ALPHACLIP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
@ -84,7 +87,7 @@ Material:
- _UseUIAlphaClip: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.8392157, g: 0.8392157, b: 0.92941177, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _OutColor: {r: 0.07528239, g: 0, b: 0.3529412, a: 1}
- _OutColor: {r: 0.09803922, g: 0.12941177, b: 0.34509805, a: 1}
m_BuildTextureStacks: []

View File

@ -2,14 +2,16 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TranslatedTextboxMaterialFX
m_Shader: {fileID: 4800000, guid: 777678d31f953e04e8f15812003b9c27, type: 3}
m_ShaderKeywords: UNITY_UI_ALPHACLIP
m_ValidKeywords:
- UNITY_UI_ALPHACLIP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,6 +57,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
@ -84,7 +87,7 @@ Material:
- _UseUIAlphaClip: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.07450981, g: 0, b: 0.3529412, a: 1}
- _Color: {r: 0.09803922, g: 0.12941177, b: 0.34509805, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _OutColor: {r: 0.07450981, g: 0, b: 0.3529412, a: 1}
- _OutColor: {r: 0.09803922, g: 0.12941177, b: 0.34509805, a: 1}
m_BuildTextureStacks: []

View File

@ -86,6 +86,6 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 1, g: 1, b: 1, a: 1}
- _ColorBravo: {r: 1, g: 0, b: 0, a: 1}
- _ColorDelta: {r: 0.8117648, g: 0.8235295, b: 0.8117648, a: 1}
- _ColorDelta: {r: 0.81, g: 0.81, b: 0.81, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -22,6 +22,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.05
value: 1
inSlope: 0
outSlope: 0
@ -30,17 +39,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0.050980393
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
time: 2.2166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -75,7 +75,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 2.2166667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -96,6 +96,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.05
value: 1
inSlope: 0
outSlope: 0
@ -104,17 +113,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0.050980393
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
time: 2.2166667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-672710162430556386
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2766078289939570403}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2766078289939570403}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Glare
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -672710162430556386}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2766078289939570403
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flashing
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8e4a132441923394a916c58673e05cb4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d0cd57d413049384db36f985069578ae
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -808,22 +808,6 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: Torso
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.66, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves:
- curve:
serializedVersion: 2
@ -1183,13 +1167,6 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: -1502141066, guid: 603b36d5a9ea5be47905bc3b72e91d57, type: 3}
- {fileID: -1502141066, guid: 603b36d5a9ea5be47905bc3b72e91d57, type: 3}
@ -4040,63 +4017,6 @@ AnimationClip:
path: Torso
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1.66
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
@ -4104,7 +4024,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
attribute: m_LocalEulerAngles.z
path: ArmR
classID: 4
script: {fileID: 0}
@ -4124,7 +4044,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
attribute: m_LocalEulerAngles.x
path: ArmR
classID: 4
script: {fileID: 0}
@ -4134,7 +4054,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
attribute: m_LocalEulerAngles.z
path: Head
classID: 4
script: {fileID: 0}
@ -4154,7 +4074,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
attribute: m_LocalEulerAngles.x
path: Head
classID: 4
script: {fileID: 0}
@ -4164,7 +4084,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
attribute: m_LocalEulerAngles.z
path: LegL
classID: 4
script: {fileID: 0}
@ -4184,7 +4104,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
attribute: m_LocalEulerAngles.x
path: LegL
classID: 4
script: {fileID: 0}
@ -4218,6 +4138,6 @@ AnimationClip:
path: Torso
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 1
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -161,6 +161,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 465 KiB

After

Width:  |  Height:  |  Size: 457 KiB

View File

@ -122,6 +122,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:

View File

@ -113,6 +113,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2c9d45b9e04493443876a15629290be8
guid: f793948d79e4bee40809969894a8c0a9
TextureImporter:
internalIDToNameTable: []
externalObjects:
@ -7,7 +7,7 @@ TextureImporter:
type: UnityEngine:GameObject
assembly: UnityEngine.CoreModule
name: MeshPrefab
second: {fileID: 5935134666280485629, guid: 204f8d388d394b74bb05d784f1c340b0, type: 3}
second: {fileID: 7137295008004177144, guid: 5aa8254cf13d366449a1137c2e487d24, type: 3}
serializedVersion: 12
mipmaps:
mipMapMode: 0
@ -54,7 +54,7 @@ TextureImporter:
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 128
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 0
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
@ -106,6 +106,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -123,6 +135,6 @@ TextureImporter:
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: '{"mode":2,"transparentDetail":0.30000001192092898,"transparentAlphaTolerance":10,"opaqueDetail":0.30000001192092898,"opaqueAlphaTolerance":250,"opaqueExtrude":0.06400000303983689,"gridSize":0,"gridTolerance":0.0,"detectHoles":true,"edgeSmoothing":1.0,"useNonZero":false,"transparentShaderName":"Unlit/Transparent","opaqueShaderName":"Unlit/Texture","thickness":3.0,"overrideTag":false,"overrideLayer":false,"overrideSortingLayer":false,"tag":"Untagged","layer":0,"sortingLayerId":0,"sortingOrder":0,"isCorrectNormal":false}'
userData: '{"mode":2,"transparentDetail":0.30000001192092898,"transparentAlphaTolerance":10,"opaqueDetail":0.34299999475479128,"opaqueAlphaTolerance":185,"opaqueExtrude":0.06400000303983689,"gridSize":0,"gridTolerance":0.0,"detectHoles":true,"edgeSmoothing":1.0,"useNonZero":false,"transparentShaderName":"Unlit/Transparent","opaqueShaderName":"Unlit/Texture","thickness":1.0,"overrideTag":false,"overrideLayer":false,"overrideSortingLayer":false,"tag":"Untagged","layer":0,"sortingLayerId":0,"sortingOrder":0,"isCorrectNormal":false}'
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Some files were not shown because too many files have changed in this diff Show More