every button works, some play mode fixes
This commit is contained in:
parent
4fd29e123f
commit
1e41d57546
File diff suppressed because it is too large
Load diff
|
|
@ -10,7 +10,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3276216358621914657}
|
- component: {fileID: 3276216358621914657}
|
||||||
- component: {fileID: 3276216358621914659}
|
- component: {fileID: 3276216358621914659}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Logo
|
m_Name: Logo
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -57,7 +57,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216358758736494}
|
- component: {fileID: 3276216358758736494}
|
||||||
- component: {fileID: 3276216358758736496}
|
- component: {fileID: 3276216358758736496}
|
||||||
- component: {fileID: 3276216358758736495}
|
- component: {fileID: 3276216358758736495}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Header
|
m_Name: Header
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -135,7 +135,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216358884288557}
|
- component: {fileID: 3276216358884288557}
|
||||||
- component: {fileID: 3276216358884288556}
|
- component: {fileID: 3276216358884288556}
|
||||||
- component: {fileID: 3276216358884288555}
|
- component: {fileID: 3276216358884288555}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: LogoCounter
|
m_Name: LogoCounter
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -269,7 +269,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216358902658885}
|
- component: {fileID: 3276216358902658885}
|
||||||
- component: {fileID: 3276216358902658884}
|
- component: {fileID: 3276216358902658884}
|
||||||
- component: {fileID: 3276216358902658883}
|
- component: {fileID: 3276216358902658883}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: StudioDance
|
m_Name: StudioDance
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -403,7 +403,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359023061025}
|
- component: {fileID: 3276216359023061025}
|
||||||
- component: {fileID: 3276216359023061024}
|
- component: {fileID: 3276216359023061024}
|
||||||
- component: {fileID: 3276216359023061023}
|
- component: {fileID: 3276216359023061023}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Viewport
|
m_Name: Viewport
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -495,7 +495,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359264292462}
|
- component: {fileID: 3276216359264292462}
|
||||||
- component: {fileID: 6758400429291581769}
|
- component: {fileID: 6758400429291581769}
|
||||||
- component: {fileID: 8450436868124997307}
|
- component: {fileID: 8450436868124997307}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Credits
|
m_Name: Credits
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -666,7 +666,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359294279433}
|
- component: {fileID: 3276216359294279433}
|
||||||
- component: {fileID: 3276216359294279435}
|
- component: {fileID: 3276216359294279435}
|
||||||
- component: {fileID: 3276216359294279434}
|
- component: {fileID: 3276216359294279434}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Image
|
m_Name: Image
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -742,7 +742,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359458918366}
|
- component: {fileID: 3276216359458918366}
|
||||||
- component: {fileID: 3276216359458918368}
|
- component: {fileID: 3276216359458918368}
|
||||||
- component: {fileID: 3276216359458918367}
|
- component: {fileID: 3276216359458918367}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Handle
|
m_Name: Handle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -819,7 +819,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359486296929}
|
- component: {fileID: 3276216359486296929}
|
||||||
- component: {fileID: 3276216359486296928}
|
- component: {fileID: 3276216359486296928}
|
||||||
- component: {fileID: 3276216359486296927}
|
- component: {fileID: 3276216359486296927}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: CreditsLegal
|
m_Name: CreditsLegal
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -912,7 +912,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359673638260}
|
- component: {fileID: 3276216359673638260}
|
||||||
- component: {fileID: 3276216359673638262}
|
- component: {fileID: 3276216359673638262}
|
||||||
- component: {fileID: 3276216359673638261}
|
- component: {fileID: 3276216359673638261}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Image
|
m_Name: Image
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -986,7 +986,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3276216359692268649}
|
- component: {fileID: 3276216359692268649}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Sliding Area
|
m_Name: Sliding Area
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1024,7 +1024,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3276216359814484404}
|
- component: {fileID: 3276216359814484404}
|
||||||
- component: {fileID: 3276216359814484405}
|
- component: {fileID: 3276216359814484405}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: StudioDanceActivator
|
m_Name: StudioDanceActivator
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1072,7 +1072,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216359861115899}
|
- component: {fileID: 3276216359861115899}
|
||||||
- component: {fileID: 3276216359861115898}
|
- component: {fileID: 3276216359861115898}
|
||||||
- component: {fileID: 3276216359861115897}
|
- component: {fileID: 3276216359861115897}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Options
|
m_Name: Options
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1180,7 +1180,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216360127051165}
|
- component: {fileID: 3276216360127051165}
|
||||||
- component: {fileID: 3276216360127051167}
|
- component: {fileID: 3276216360127051167}
|
||||||
- component: {fileID: 3276216360127051166}
|
- component: {fileID: 3276216360127051166}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Content
|
m_Name: Content
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1262,7 +1262,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216360247263708}
|
- component: {fileID: 3276216360247263708}
|
||||||
- component: {fileID: 3276216360247263707}
|
- component: {fileID: 3276216360247263707}
|
||||||
- component: {fileID: 3276216360247263706}
|
- component: {fileID: 3276216360247263706}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Scrollbar Vertical
|
m_Name: Scrollbar Vertical
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1388,7 +1388,7 @@ GameObject:
|
||||||
- component: {fileID: 3276216360411725377}
|
- component: {fileID: 3276216360411725377}
|
||||||
- component: {fileID: 3276216360411725379}
|
- component: {fileID: 3276216360411725379}
|
||||||
- component: {fileID: 3276216360411725378}
|
- component: {fileID: 3276216360411725378}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Text (TMP)
|
m_Name: Text (TMP)
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ GameObject:
|
||||||
- component: {fileID: 6861573717526687243}
|
- component: {fileID: 6861573717526687243}
|
||||||
- component: {fileID: 1987294861373899821}
|
- component: {fileID: 1987294861373899821}
|
||||||
- component: {fileID: 2499129337308477260}
|
- component: {fileID: 2499129337308477260}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Text (TMP)
|
m_Name: Text (TMP)
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -149,7 +149,7 @@ GameObject:
|
||||||
- component: {fileID: 5262680735014795458}
|
- component: {fileID: 5262680735014795458}
|
||||||
- component: {fileID: 8921356690607522631}
|
- component: {fileID: 8921356690607522631}
|
||||||
- component: {fileID: 383095155661938755}
|
- component: {fileID: 383095155661938755}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Incre
|
m_Name: Incre
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -282,7 +282,7 @@ GameObject:
|
||||||
- component: {fileID: 7774736397554609743}
|
- component: {fileID: 7774736397554609743}
|
||||||
- component: {fileID: 8757829121654880135}
|
- component: {fileID: 8757829121654880135}
|
||||||
- component: {fileID: 2857186382041299405}
|
- component: {fileID: 2857186382041299405}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Text (TMP)
|
m_Name: Text (TMP)
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -419,7 +419,7 @@ GameObject:
|
||||||
- component: {fileID: 6652101627242449918}
|
- component: {fileID: 6652101627242449918}
|
||||||
- component: {fileID: 1629991509693806793}
|
- component: {fileID: 1629991509693806793}
|
||||||
- component: {fileID: 1058206118348333195}
|
- component: {fileID: 1058206118348333195}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: EditorScale
|
m_Name: EditorScale
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -559,7 +559,7 @@ GameObject:
|
||||||
- component: {fileID: 3382107506031419457}
|
- component: {fileID: 3382107506031419457}
|
||||||
- component: {fileID: 1143089118221371013}
|
- component: {fileID: 1143089118221371013}
|
||||||
- component: {fileID: 8487556764501708920}
|
- component: {fileID: 8487556764501708920}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: ScaleWSS
|
m_Name: ScaleWSS
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -697,7 +697,7 @@ GameObject:
|
||||||
- component: {fileID: 1326256688912109657}
|
- component: {fileID: 1326256688912109657}
|
||||||
- component: {fileID: 6853165160418157372}
|
- component: {fileID: 6853165160418157372}
|
||||||
- component: {fileID: 8214015227030685802}
|
- component: {fileID: 8214015227030685802}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Text (TMP)
|
m_Name: Text (TMP)
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -834,7 +834,7 @@ GameObject:
|
||||||
- component: {fileID: 14539832792667216}
|
- component: {fileID: 14539832792667216}
|
||||||
- component: {fileID: 5747906335205313162}
|
- component: {fileID: 5747906335205313162}
|
||||||
- component: {fileID: 3256322431154591709}
|
- component: {fileID: 3256322431154591709}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: RPCLabel
|
m_Name: RPCLabel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -973,7 +973,7 @@ GameObject:
|
||||||
- component: {fileID: 4480235305736490524}
|
- component: {fileID: 4480235305736490524}
|
||||||
- component: {fileID: 2681763775808117533}
|
- component: {fileID: 2681763775808117533}
|
||||||
- component: {fileID: 6127870905162584076}
|
- component: {fileID: 6127870905162584076}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Decre
|
m_Name: Decre
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1106,7 +1106,7 @@ GameObject:
|
||||||
- component: {fileID: 7815667255158939506}
|
- component: {fileID: 7815667255158939506}
|
||||||
- component: {fileID: 1530090611450384744}
|
- component: {fileID: 1530090611450384744}
|
||||||
- component: {fileID: 3718459074068155101}
|
- component: {fileID: 3718459074068155101}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Checkmark
|
m_Name: Checkmark
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1182,7 +1182,7 @@ GameObject:
|
||||||
- component: {fileID: 3358182036527372524}
|
- component: {fileID: 3358182036527372524}
|
||||||
- component: {fileID: 5999213011864573693}
|
- component: {fileID: 5999213011864573693}
|
||||||
- component: {fileID: 230129683945334152}
|
- component: {fileID: 230129683945334152}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Checkmark
|
m_Name: Checkmark
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1258,7 +1258,7 @@ GameObject:
|
||||||
- component: {fileID: 3595855392946436849}
|
- component: {fileID: 3595855392946436849}
|
||||||
- component: {fileID: 2197657614678147653}
|
- component: {fileID: 2197657614678147653}
|
||||||
- component: {fileID: 9072224171221309358}
|
- component: {fileID: 9072224171221309358}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Background
|
m_Name: Background
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1336,7 +1336,7 @@ GameObject:
|
||||||
- component: {fileID: 6544614745947759419}
|
- component: {fileID: 6544614745947759419}
|
||||||
- component: {fileID: 2262624455503317595}
|
- component: {fileID: 2262624455503317595}
|
||||||
- component: {fileID: 1247686370311955214}
|
- component: {fileID: 1247686370311955214}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Reset
|
m_Name: Reset
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1468,7 +1468,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7292326169755866509}
|
- component: {fileID: 7292326169755866509}
|
||||||
- component: {fileID: 1122327647812458447}
|
- component: {fileID: 1122327647812458447}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Toggle
|
m_Name: Toggle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1567,7 +1567,7 @@ GameObject:
|
||||||
- component: {fileID: 4915438607901596292}
|
- component: {fileID: 4915438607901596292}
|
||||||
- component: {fileID: 2671519573279941359}
|
- component: {fileID: 2671519573279941359}
|
||||||
- component: {fileID: 4195792031845100646}
|
- component: {fileID: 4195792031845100646}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Background
|
m_Name: Background
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1643,7 +1643,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7785783802733199037}
|
- component: {fileID: 7785783802733199037}
|
||||||
- component: {fileID: 7046810222813886660}
|
- component: {fileID: 7046810222813886660}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Toggle
|
m_Name: Toggle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1742,7 +1742,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581105990529507}
|
- component: {fileID: 9208581105990529507}
|
||||||
- component: {fileID: 9208581105990529509}
|
- component: {fileID: 9208581105990529509}
|
||||||
- component: {fileID: 9208581105990529508}
|
- component: {fileID: 9208581105990529508}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Text (TMP)
|
m_Name: Text (TMP)
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1879,7 +1879,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106009979527}
|
- component: {fileID: 9208581106009979527}
|
||||||
- component: {fileID: 9208581106009979529}
|
- component: {fileID: 9208581106009979529}
|
||||||
- component: {fileID: 9208581106009979528}
|
- component: {fileID: 9208581106009979528}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Header
|
m_Name: Header
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -1957,7 +1957,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106079180836}
|
- component: {fileID: 9208581106079180836}
|
||||||
- component: {fileID: 9208581106079180835}
|
- component: {fileID: 9208581106079180835}
|
||||||
- component: {fileID: 9208581106079180837}
|
- component: {fileID: 9208581106079180837}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: EditorSettings
|
m_Name: EditorSettings
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2052,7 +2052,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106298752703}
|
- component: {fileID: 9208581106298752703}
|
||||||
- component: {fileID: 9208581106298752705}
|
- component: {fileID: 9208581106298752705}
|
||||||
- component: {fileID: 9208581106298752704}
|
- component: {fileID: 9208581106298752704}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Content
|
m_Name: Content
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2132,7 +2132,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 9208581106336568507}
|
- component: {fileID: 9208581106336568507}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Sliding Area
|
m_Name: Sliding Area
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2172,7 +2172,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106700575106}
|
- component: {fileID: 9208581106700575106}
|
||||||
- component: {fileID: 9208581106700575105}
|
- component: {fileID: 9208581106700575105}
|
||||||
- component: {fileID: 9208581106700575104}
|
- component: {fileID: 9208581106700575104}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Scrollbar Vertical
|
m_Name: Scrollbar Vertical
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2298,7 +2298,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106704273180}
|
- component: {fileID: 9208581106704273180}
|
||||||
- component: {fileID: 9208581106704273182}
|
- component: {fileID: 9208581106704273182}
|
||||||
- component: {fileID: 9208581106704273181}
|
- component: {fileID: 9208581106704273181}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: FullscreenLabel
|
m_Name: FullscreenLabel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2435,7 +2435,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 9208581106828673703}
|
- component: {fileID: 9208581106828673703}
|
||||||
- component: {fileID: 9208581106828673704}
|
- component: {fileID: 9208581106828673704}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Toggle
|
m_Name: Toggle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2534,7 +2534,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106831335129}
|
- component: {fileID: 9208581106831335129}
|
||||||
- component: {fileID: 9208581106831335131}
|
- component: {fileID: 9208581106831335131}
|
||||||
- component: {fileID: 9208581106831335130}
|
- component: {fileID: 9208581106831335130}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Handle
|
m_Name: Handle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2611,7 +2611,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581106987031243}
|
- component: {fileID: 9208581106987031243}
|
||||||
- component: {fileID: 9208581106987031242}
|
- component: {fileID: 9208581106987031242}
|
||||||
- component: {fileID: 9208581106987031241}
|
- component: {fileID: 9208581106987031241}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Viewport
|
m_Name: Viewport
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2702,7 +2702,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581107103424967}
|
- component: {fileID: 9208581107103424967}
|
||||||
- component: {fileID: 9208581107103424966}
|
- component: {fileID: 9208581107103424966}
|
||||||
- component: {fileID: 9208581107103424965}
|
- component: {fileID: 9208581107103424965}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Options
|
m_Name: Options
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2810,7 +2810,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581107110813884}
|
- component: {fileID: 9208581107110813884}
|
||||||
- component: {fileID: 9208581107110813886}
|
- component: {fileID: 9208581107110813886}
|
||||||
- component: {fileID: 9208581107110813885}
|
- component: {fileID: 9208581107110813885}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Background
|
m_Name: Background
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
@ -2887,7 +2887,7 @@ GameObject:
|
||||||
- component: {fileID: 9208581107756448695}
|
- component: {fileID: 9208581107756448695}
|
||||||
- component: {fileID: 9208581107756448697}
|
- component: {fileID: 9208581107756448697}
|
||||||
- component: {fileID: 9208581107756448696}
|
- component: {fileID: 9208581107756448696}
|
||||||
m_Layer: 5
|
m_Layer: 31
|
||||||
m_Name: Checkmark
|
m_Name: Checkmark
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -2136,6 +2136,342 @@ AnimationClip:
|
||||||
path: Circle (5)/Black
|
path: Circle (5)/Black
|
||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (5)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (5)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (4)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (4)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (3)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (3)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (2)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (2)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (1)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (1)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
m_PPtrCurves: []
|
m_PPtrCurves: []
|
||||||
m_SampleRate: 60
|
m_SampleRate: 60
|
||||||
m_WrapMode: 0
|
m_WrapMode: 0
|
||||||
|
|
@ -2361,6 +2697,90 @@ AnimationClip:
|
||||||
typeID: 224
|
typeID: 224
|
||||||
customType: 28
|
customType: 28
|
||||||
isPPtrCurve: 0
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 1845467134
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 3239057288
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 956834105
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 3908172158
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 4121043367
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 1317466826
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 4284950718
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 2334248004
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 869083168
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 760662000
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 3175231427
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 482270573
|
||||||
|
attribute: 3305885265
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 212
|
||||||
|
customType: 0
|
||||||
|
isPPtrCurve: 0
|
||||||
pptrCurveMapping: []
|
pptrCurveMapping: []
|
||||||
m_AnimationClipSettings:
|
m_AnimationClipSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
|
@ -5966,6 +6386,342 @@ AnimationClip:
|
||||||
path: Circle (4)/White
|
path: Circle (4)/White
|
||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (5)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (5)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (4)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (4)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (3)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (3)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (2)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (2)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (1)/White
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.55
|
||||||
|
value: 1
|
||||||
|
inSlope: Infinity
|
||||||
|
outSlope: Infinity
|
||||||
|
tangentMode: 103
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_Enabled
|
||||||
|
path: Circle (1)/Blue
|
||||||
|
classID: 212
|
||||||
|
script: {fileID: 0}
|
||||||
m_EulerEditorCurves: []
|
m_EulerEditorCurves: []
|
||||||
m_HasGenericRootTransform: 0
|
m_HasGenericRootTransform: 0
|
||||||
m_HasMotionFloatCurves: 0
|
m_HasMotionFloatCurves: 0
|
||||||
|
|
|
||||||
|
|
@ -150,6 +150,54 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 541051827683878848, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_SortingLayerID
|
||||||
|
value: 805687615
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067077537461449, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067077546299118, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067077718924012, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067077828100228, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067077875750289, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067078033126859, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067078569197629, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067078569207447, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067078740753795, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067078804841826, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 657067079285165510, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 31
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2818452675230549280, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
- target: {fileID: 2818452675230549280, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
|
|
@ -174,6 +222,10 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5076291358362867362, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
propertyPath: m_UiScaleMode
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6143951404584343211, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
- target: {fileID: 6143951404584343211, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
|
|
@ -301,11 +353,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 16a839834af94a042a3feb7a4762bafd, type: 3}
|
m_Script: {fileID: 11500000, guid: 16a839834af94a042a3feb7a4762bafd, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
startBeat: 0
|
|
||||||
length: 0
|
|
||||||
startColor: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
endColor: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
ease: 0
|
|
||||||
currentCol: {r: 0, g: 0, b: 0, a: 0}
|
currentCol: {r: 0, g: 0, b: 0, a: 0}
|
||||||
--- !u!1 &638827924
|
--- !u!1 &638827924
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -533,3 +580,127 @@ GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 285182280367868641, guid: 81ce52789acca4440804eb938de70425, type: 3}
|
m_CorrespondingSourceObject: {fileID: 285182280367868641, guid: 81ce52789acca4440804eb938de70425, type: 3}
|
||||||
m_PrefabInstance: {fileID: 2019287955}
|
m_PrefabInstance: {fileID: 2019287955}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2074492219 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 7290227265050141556, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 348185263}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2074492220 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8486406171574698083, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 348185263}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2074492221 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 5783294278673705789, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 348185263}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2074492222 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 5530727079185901299, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 348185263}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!61 &2074492223
|
||||||
|
BoxCollider2D:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2074492219}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Density: 1
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_UsedByEffector: 0
|
||||||
|
m_UsedByComposite: 0
|
||||||
|
m_Offset: {x: 1.75, y: 0}
|
||||||
|
m_SpriteTilingProperty:
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
oldSize: {x: 0, y: 0}
|
||||||
|
newSize: {x: 0, y: 0}
|
||||||
|
adaptiveTilingThreshold: 0
|
||||||
|
drawMode: 0
|
||||||
|
adaptiveTiling: 0
|
||||||
|
m_AutoTiling: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Size: {x: 4.5, y: 0.7}
|
||||||
|
m_EdgeRadius: 0
|
||||||
|
--- !u!61 &2074492224
|
||||||
|
BoxCollider2D:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2074492220}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Density: 1
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_UsedByEffector: 0
|
||||||
|
m_UsedByComposite: 0
|
||||||
|
m_Offset: {x: 1.75, y: 0}
|
||||||
|
m_SpriteTilingProperty:
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
oldSize: {x: 0, y: 0}
|
||||||
|
newSize: {x: 0, y: 0}
|
||||||
|
adaptiveTilingThreshold: 0
|
||||||
|
drawMode: 0
|
||||||
|
adaptiveTiling: 0
|
||||||
|
m_AutoTiling: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Size: {x: 4.5, y: 0.7}
|
||||||
|
m_EdgeRadius: 0
|
||||||
|
--- !u!61 &2074492225
|
||||||
|
BoxCollider2D:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2074492221}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Density: 1
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_UsedByEffector: 0
|
||||||
|
m_UsedByComposite: 0
|
||||||
|
m_Offset: {x: 1.75, y: 0}
|
||||||
|
m_SpriteTilingProperty:
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
oldSize: {x: 0, y: 0}
|
||||||
|
newSize: {x: 0, y: 0}
|
||||||
|
adaptiveTilingThreshold: 0
|
||||||
|
drawMode: 0
|
||||||
|
adaptiveTiling: 0
|
||||||
|
m_AutoTiling: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Size: {x: 4.5, y: 0.7}
|
||||||
|
m_EdgeRadius: 0
|
||||||
|
--- !u!61 &2074492226
|
||||||
|
BoxCollider2D:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2074492222}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Density: 1
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_UsedByEffector: 0
|
||||||
|
m_UsedByComposite: 0
|
||||||
|
m_Offset: {x: 1.75, y: 0}
|
||||||
|
m_SpriteTilingProperty:
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
oldSize: {x: 0, y: 0}
|
||||||
|
newSize: {x: 0, y: 0}
|
||||||
|
adaptiveTilingThreshold: 0
|
||||||
|
drawMode: 0
|
||||||
|
adaptiveTiling: 0
|
||||||
|
m_AutoTiling: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Size: {x: 4.5, y: 0.7}
|
||||||
|
m_EdgeRadius: 0
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -51,18 +51,18 @@ namespace HeavenStudio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (OpeningManager.OnOpenFile is not null or "")
|
else if (GlobalGameManager.PlayOpenFile is not null or "")
|
||||||
{
|
{
|
||||||
if (editorGO == null && OpeningManager.OnOpenFile.IndexOfAny(Path.GetInvalidPathChars()) == -1)
|
if (editorGO == null && GlobalGameManager.PlayOpenFile.IndexOfAny(Path.GetInvalidPathChars()) == -1)
|
||||||
{
|
{
|
||||||
if (File.Exists(OpeningManager.OnOpenFile) && Path.GetExtension(OpeningManager.OnOpenFile) == ".riq")
|
if (File.Exists(GlobalGameManager.PlayOpenFile) && Path.GetExtension(GlobalGameManager.PlayOpenFile) == ".riq")
|
||||||
{
|
{
|
||||||
input = OpeningManager.OnOpenFile;
|
input = GlobalGameManager.PlayOpenFile;
|
||||||
fromCmd = true;
|
fromCmd = true;
|
||||||
playOnStart = true;
|
playOnStart = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OpeningManager.OnOpenFile = null;
|
GlobalGameManager.PlayOpenFile = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
GameObject Games = new GameObject();
|
GameObject Games = new GameObject();
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,6 @@ namespace HeavenStudio
|
||||||
if (playOnStart)
|
if (playOnStart)
|
||||||
{
|
{
|
||||||
StartCoroutine(WaitReadyAndPlayCo(startBeat));
|
StartCoroutine(WaitReadyAndPlayCo(startBeat));
|
||||||
CircleCursor.LockCursor(true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -630,6 +629,10 @@ namespace HeavenStudio
|
||||||
miniGame.OnPlay(beat);
|
miniGame.OnPlay(beat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (playOnStart)
|
||||||
|
{
|
||||||
|
CircleCursor.LockCursor(true);
|
||||||
|
}
|
||||||
Application.backgroundLoadingPriority = ThreadPriority.Low;
|
Application.backgroundLoadingPriority = ThreadPriority.Low;
|
||||||
Conductor.instance.Play(beat);
|
Conductor.instance.Play(beat);
|
||||||
}
|
}
|
||||||
|
|
@ -670,15 +673,17 @@ namespace HeavenStudio
|
||||||
Debug.Log($"Perfect Clear!");
|
Debug.Log($"Perfect Clear!");
|
||||||
|
|
||||||
KillAllSounds();
|
KillAllSounds();
|
||||||
if (playOnStart || restart)
|
if (restart)
|
||||||
{
|
{
|
||||||
Play(0, restartDelay);
|
Play(0, restartDelay);
|
||||||
}
|
}
|
||||||
else
|
else if (playOnStart)
|
||||||
{
|
{
|
||||||
Application.backgroundLoadingPriority = ThreadPriority.Normal;
|
// when rating screen gets added playOnStart will instead move to that scene
|
||||||
|
GlobalGameManager.LoadScene("Title", 0.35f, 0.5f);
|
||||||
|
CircleCursor.LockCursor(false);
|
||||||
}
|
}
|
||||||
// when rating screen gets added playOnStart will instead move to that scene
|
Application.backgroundLoadingPriority = ThreadPriority.Normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator WaitReadyAndPlayCo(double beat)
|
private IEnumerator WaitReadyAndPlayCo(double beat)
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ namespace HeavenStudio
|
||||||
[SerializeField] Button errorLogButton;
|
[SerializeField] Button errorLogButton;
|
||||||
[SerializeField] Slider dialogProgress;
|
[SerializeField] Slider dialogProgress;
|
||||||
public static bool IsShowingDialog;
|
public static bool IsShowingDialog;
|
||||||
|
public static string PlayOpenFile = null;
|
||||||
|
|
||||||
public static string buildTime = "00/00/0000 00:00:00";
|
public static string buildTime = "00/00/0000 00:00:00";
|
||||||
|
|
||||||
|
|
@ -46,7 +47,7 @@ namespace HeavenStudio
|
||||||
public static int CustomScreenWidth = 1280;
|
public static int CustomScreenWidth = 1280;
|
||||||
public static int CustomScreenHeight = 720;
|
public static int CustomScreenHeight = 720;
|
||||||
|
|
||||||
public static readonly (int width, int height)[] DEFAULT_SCREEN_SIZES = new[] { (1280, 720), (1920, 1080), (2560, 1440), (3840, 2160)};
|
public static readonly (int width, int height)[] DEFAULT_SCREEN_SIZES = new[] { (1280, 720), (1920, 1080), (2560, 1440), (3840, 2160) };
|
||||||
public static readonly string[] DEFAULT_SCREEN_SIZES_STRING = new[] { "1280x720", "1920x1080", "2560x1440", "3840x2160", "Custom" };
|
public static readonly string[] DEFAULT_SCREEN_SIZES_STRING = new[] { "1280x720", "1920x1080", "2560x1440", "3840x2160", "Custom" };
|
||||||
public static int ScreenSizeIndex = 0;
|
public static int ScreenSizeIndex = 0;
|
||||||
|
|
||||||
|
|
@ -117,13 +118,13 @@ namespace HeavenStudio
|
||||||
ChangeScreenSize();
|
ChangeScreenSize();
|
||||||
}
|
}
|
||||||
PlayerInput.InitInputControllers();
|
PlayerInput.InitInputControllers();
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
Starpelly.OS.ChangeWindowTitle("Heaven Studio UNITYEDITOR ");
|
Starpelly.OS.ChangeWindowTitle("Heaven Studio UNITYEDITOR ");
|
||||||
buildTime = "(EDITOR) " + System.DateTime.UtcNow.ToString("dd/MM/yyyy hh:mm:ss");
|
buildTime = "(EDITOR) " + System.DateTime.UtcNow.ToString("dd/MM/yyyy hh:mm:ss");
|
||||||
#else
|
#else
|
||||||
Starpelly.OS.ChangeWindowTitle("Heaven Studio (INDEV) " + Application.buildGUID.Substring(0, 8));
|
Starpelly.OS.ChangeWindowTitle("Heaven Studio (INDEV) " + Application.buildGUID.Substring(0, 8));
|
||||||
buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Awake()
|
public void Awake()
|
||||||
|
|
@ -211,12 +212,23 @@ namespace HeavenStudio
|
||||||
|
|
||||||
instance.fadeImage.DOKill();
|
instance.fadeImage.DOKill();
|
||||||
instance.fadeImage.gameObject.SetActive(true);
|
instance.fadeImage.gameObject.SetActive(true);
|
||||||
instance.fadeImage.color = new Color(0, 0, 0, 0);
|
if (fadeIn <= 0)
|
||||||
instance.fadeImage.DOFade(1, fadeIn).OnComplete(() =>
|
|
||||||
{
|
{
|
||||||
instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut));
|
instance.fadeImage.color = new Color(0, 0, 0, 1);
|
||||||
instance.loadingText.enabled = true;
|
instance.loadingText.enabled = true;
|
||||||
});
|
AssetBundle.UnloadAllAssetBundles(true);
|
||||||
|
instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
instance.fadeImage.color = new Color(0, 0, 0, 0);
|
||||||
|
instance.fadeImage.DOFade(1, fadeIn).OnComplete(() =>
|
||||||
|
{
|
||||||
|
AssetBundle.UnloadAllAssetBundles(true);
|
||||||
|
instance.StartCoroutine(instance.LoadSceneAsync(scene, fadeOut));
|
||||||
|
instance.loadingText.enabled = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void ForceFade(float fadeIn, float hold, float fadeOut)
|
public static void ForceFade(float fadeIn, float hold, float fadeOut)
|
||||||
|
|
@ -244,11 +256,11 @@ namespace HeavenStudio
|
||||||
instance.dialogProgress.gameObject.SetActive(false);
|
instance.dialogProgress.gameObject.SetActive(false);
|
||||||
|
|
||||||
instance.errorBuild.gameObject.SetActive(true);
|
instance.errorBuild.gameObject.SetActive(true);
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
instance.errorBuild.text = "(EDITOR) " + System.DateTime.UtcNow.ToString("dd/MM/yyyy hh:mm:ss");
|
instance.errorBuild.text = "(EDITOR) " + System.DateTime.UtcNow.ToString("dd/MM/yyyy hh:mm:ss");
|
||||||
#else
|
#else
|
||||||
instance.errorBuild.text = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
instance.errorBuild.text = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
instance.messagePanel.SetActive(true);
|
instance.messagePanel.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -467,7 +467,10 @@ namespace HeavenStudio.InputSystem
|
||||||
public override void TogglePointerLock(bool locked)
|
public override void TogglePointerLock(bool locked)
|
||||||
{
|
{
|
||||||
Cursor.lockState = locked ? CursorLockMode.Locked : CursorLockMode.None;
|
Cursor.lockState = locked ? CursorLockMode.Locked : CursorLockMode.None;
|
||||||
RecentrePointer();
|
if (locked)
|
||||||
|
{
|
||||||
|
RecentrePointer();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void RecentrePointer()
|
public override void RecentrePointer()
|
||||||
|
|
|
||||||
|
|
@ -271,7 +271,7 @@ namespace HeavenStudio.InputSystem
|
||||||
public abstract Vector3 GetVector(InputVector vector);
|
public abstract Vector3 GetVector(InputVector vector);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the value of a pointer mapped to screen coordinates
|
/// Get the value of a pointer mapped to world coordinates
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public abstract Vector2 GetPointer();
|
public abstract Vector2 GetPointer();
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ namespace HeavenStudio
|
||||||
[SerializeField] TMP_Text versionDisclaimer;
|
[SerializeField] TMP_Text versionDisclaimer;
|
||||||
[SerializeField] bool enableSecondDisclaimer;
|
[SerializeField] bool enableSecondDisclaimer;
|
||||||
|
|
||||||
public static string OnOpenFile;
|
|
||||||
bool fastBoot = false;
|
bool fastBoot = false;
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
@ -29,7 +28,7 @@ namespace HeavenStudio
|
||||||
{
|
{
|
||||||
if (File.Exists(args[i]) && (args[i].EndsWith(".riq") || args[i].EndsWith(".tengoku")))
|
if (File.Exists(args[i]) && (args[i].EndsWith(".riq") || args[i].EndsWith(".tengoku")))
|
||||||
{
|
{
|
||||||
OnOpenFile = args[i];
|
GlobalGameManager.PlayOpenFile = args[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (args[i] == "--nosplash")
|
if (args[i] == "--nosplash")
|
||||||
|
|
@ -90,7 +89,7 @@ namespace HeavenStudio
|
||||||
|
|
||||||
void OnFinishDisclaimer(float fadeDuration = 0)
|
void OnFinishDisclaimer(float fadeDuration = 0)
|
||||||
{
|
{
|
||||||
if (OnOpenFile is not null or "")
|
if (GlobalGameManager.PlayOpenFile is not null or "")
|
||||||
{
|
{
|
||||||
GlobalGameManager.LoadScene("Game", fadeDuration, 0.5f);
|
GlobalGameManager.LoadScene("Game", fadeDuration, 0.5f);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
using System.IO;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
@ -7,6 +8,10 @@ using HeavenStudio.Common;
|
||||||
using Starpelly;
|
using Starpelly;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
|
using SFB;
|
||||||
|
using Jukebox;
|
||||||
|
using TMPro;
|
||||||
|
|
||||||
namespace HeavenStudio
|
namespace HeavenStudio
|
||||||
{
|
{
|
||||||
public class TitleManager : MonoBehaviour
|
public class TitleManager : MonoBehaviour
|
||||||
|
|
@ -31,6 +36,9 @@ namespace HeavenStudio
|
||||||
|
|
||||||
[SerializeField] private SettingsDialog settingsPanel;
|
[SerializeField] private SettingsDialog settingsPanel;
|
||||||
|
|
||||||
|
[SerializeField] private GameObject snsPanel;
|
||||||
|
[SerializeField] private TMP_Text snsVersionText;
|
||||||
|
|
||||||
private AudioSource musicSource;
|
private AudioSource musicSource;
|
||||||
|
|
||||||
private double songPosBeat;
|
private double songPosBeat;
|
||||||
|
|
@ -47,7 +55,7 @@ namespace HeavenStudio
|
||||||
|
|
||||||
private bool logoRevealed;
|
private bool logoRevealed;
|
||||||
|
|
||||||
private bool menuMode;
|
private bool menuMode, snsRevealed;
|
||||||
|
|
||||||
private Animator menuAnim;
|
private Animator menuAnim;
|
||||||
|
|
||||||
|
|
@ -79,11 +87,19 @@ namespace HeavenStudio
|
||||||
songPos = time + offset;
|
songPos = time + offset;
|
||||||
|
|
||||||
songPosBeat = SecsToBeats(songPos);
|
songPosBeat = SecsToBeats(songPos);
|
||||||
if (logoRevealed && !menuMode && Input.anyKeyDown)
|
if (Input.anyKeyDown)
|
||||||
{
|
{
|
||||||
menuMode = true;
|
if (logoRevealed && !menuMode)
|
||||||
menuAnim.Play("Revealed", 0, 0);
|
{
|
||||||
pressAnyKeyAnim.Play("PressKeyFadeOut", 0, 0);
|
menuMode = true;
|
||||||
|
menuAnim.Play("Revealed", 0, 0);
|
||||||
|
pressAnyKeyAnim.Play("PressKeyFadeOut", 0, 0);
|
||||||
|
}
|
||||||
|
// else if (snsRevealed)
|
||||||
|
// {
|
||||||
|
// snsRevealed = false;
|
||||||
|
// snsPanel.SetActive(false);
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
if (loops == 0 && !logoRevealed)
|
if (loops == 0 && !logoRevealed)
|
||||||
{
|
{
|
||||||
|
|
@ -126,10 +142,10 @@ namespace HeavenStudio
|
||||||
altBop = !altBop;
|
altBop = !altBop;
|
||||||
}
|
}
|
||||||
targetBopBeat += 1;
|
targetBopBeat += 1;
|
||||||
if ((!settingsPanel.IsOpen) && logoRevealed && logoHoverCollider.OverlapPoint(Camera.main.ScreenToWorldPoint(Input.mousePosition)))
|
// if ((!settingsPanel.IsOpen) && logoRevealed && logoHoverCollider.OverlapPoint(Camera.main.ScreenToWorldPoint(Input.mousePosition)))
|
||||||
{
|
// {
|
||||||
SoundByte.PlayOneShot("metronome");
|
// SoundByte.PlayOneShot("metronome");
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -151,23 +167,74 @@ namespace HeavenStudio
|
||||||
|
|
||||||
public void CreatePressed()
|
public void CreatePressed()
|
||||||
{
|
{
|
||||||
|
GlobalGameManager.PlayOpenFile = null;
|
||||||
GlobalGameManager.LoadScene("Editor");
|
GlobalGameManager.LoadScene("Editor");
|
||||||
SoundByte.PlayOneShot("ui/UIEnter");
|
SoundByte.PlayOneShot("ui/UIEnter");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PlayPressed()
|
public void PlayPressed()
|
||||||
{
|
{
|
||||||
|
SoundByte.PlayOneShot("ui/UISelect");
|
||||||
|
// temp: open file browser then go into quickplay
|
||||||
|
OpenQuickplayFileDialog();
|
||||||
// go into the play mode menu
|
// go into the play mode menu
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OpenQuickplayFileDialog()
|
||||||
|
{
|
||||||
|
var extensions = new[]
|
||||||
|
{
|
||||||
|
new ExtensionFilter("Heaven Studio Remix File ", new string[] { "riq" }),
|
||||||
|
};
|
||||||
|
|
||||||
|
StandaloneFileBrowser.OpenFilePanelAsync("Open Remix", "", extensions, false, (string[] paths) =>
|
||||||
|
{
|
||||||
|
var path = Path.Combine(paths);
|
||||||
|
if (path == string.Empty)
|
||||||
|
{
|
||||||
|
SoundByte.PlayOneShot("ui/UICancel");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
RiqFileHandler.UnlockCache();
|
||||||
|
string tmpDir = RiqFileHandler.ExtractRiq(path);
|
||||||
|
Debug.Log("Imported RIQ successfully!");
|
||||||
|
GlobalGameManager.PlayOpenFile = path;
|
||||||
|
SoundByte.PlayOneShot("ui/UIEnter");
|
||||||
|
GlobalGameManager.LoadScene("Game", 0.35f, 0.5f);
|
||||||
|
}
|
||||||
|
catch (System.Exception e)
|
||||||
|
{
|
||||||
|
Debug.Log($"Error importing RIQ: {e.Message}");
|
||||||
|
Debug.LogException(e);
|
||||||
|
GlobalGameManager.ShowErrorMessage("Error Loading RIQ", e.Message + "\n\n" + e.StackTrace);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public void SocialsPressed()
|
public void SocialsPressed()
|
||||||
{
|
{
|
||||||
|
snsRevealed = true;
|
||||||
|
snsVersionText.text = GlobalGameManager.buildTime;
|
||||||
|
snsPanel.SetActive(true);
|
||||||
|
SoundByte.PlayOneShot("ui/UISelect");
|
||||||
// show a panel with our SNS links
|
// show a panel with our SNS links
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SocialsClose()
|
||||||
|
{
|
||||||
|
snsRevealed = false;
|
||||||
|
snsPanel.SetActive(false);
|
||||||
|
SoundByte.PlayOneShot("ui/UICancel");
|
||||||
|
}
|
||||||
|
|
||||||
public void SettingsPressed()
|
public void SettingsPressed()
|
||||||
{
|
{
|
||||||
settingsPanel.SwitchSettingsDialog();
|
settingsPanel.SwitchSettingsDialog();
|
||||||
|
SoundByte.PlayOneShot("ui/UISelect");
|
||||||
// notes:
|
// notes:
|
||||||
// gameplay settings currently don't work due to the overlay pereview requiring the screen composition setup from a gameplay prefab
|
// gameplay settings currently don't work due to the overlay pereview requiring the screen composition setup from a gameplay prefab
|
||||||
// adding the attract screen will fix this since we'd need to add that prefab for it anyways
|
// adding the attract screen will fix this since we'd need to add that prefab for it anyways
|
||||||
|
|
@ -175,6 +242,7 @@ namespace HeavenStudio
|
||||||
|
|
||||||
public void QuitPressed()
|
public void QuitPressed()
|
||||||
{
|
{
|
||||||
|
SoundByte.PlayOneShot("ui/PauseQuit");
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ namespace HeavenStudio.Common
|
||||||
{
|
{
|
||||||
if (GlobalGameManager.IsShowingDialog) return;
|
if (GlobalGameManager.IsShowingDialog) return;
|
||||||
if (!Conductor.instance.isPlaying) return;
|
if (!Conductor.instance.isPlaying) return;
|
||||||
|
GameManager.instance.CircleCursor.LockCursor(true);
|
||||||
Conductor.instance.Pause();
|
Conductor.instance.Pause();
|
||||||
pauseBeat = Conductor.instance.songPositionInBeatsAsDouble;
|
pauseBeat = Conductor.instance.songPositionInBeatsAsDouble;
|
||||||
chartTitleText.text = GameManager.instance.Beatmap["remixtitle"].ToString();
|
chartTitleText.text = GameManager.instance.Beatmap["remixtitle"].ToString();
|
||||||
|
|
@ -61,6 +62,7 @@ namespace HeavenStudio.Common
|
||||||
void UnPause(bool instant = false)
|
void UnPause(bool instant = false)
|
||||||
{
|
{
|
||||||
if ((!instant) && (!Conductor.instance.isPaused)) return;
|
if ((!instant) && (!Conductor.instance.isPaused)) return;
|
||||||
|
// GameManager.instance.CircleCursor.LockCursor(true);
|
||||||
Conductor.instance.Play(pauseBeat);
|
Conductor.instance.Play(pauseBeat);
|
||||||
if (instant)
|
if (instant)
|
||||||
{
|
{
|
||||||
|
|
@ -110,7 +112,7 @@ namespace HeavenStudio.Common
|
||||||
|
|
||||||
if (isQuitting) return;
|
if (isQuitting) return;
|
||||||
|
|
||||||
if (PlayerInput.GetInputController(1).GetActionDown(PlayerInput.CurrentControlStyle, btPause, out _))
|
if (PlayerInput.GetInputController(1).GetActionDown(PlayerInput.CurrentControlStyle, btPause, out _) && !settingsDialog.IsOpen)
|
||||||
{
|
{
|
||||||
if (isPaused)
|
if (isPaused)
|
||||||
{
|
{
|
||||||
|
|
@ -123,6 +125,19 @@ namespace HeavenStudio.Common
|
||||||
}
|
}
|
||||||
else if (isPaused && canPick && !settingsDialog.IsOpen)
|
else if (isPaused && canPick && !settingsDialog.IsOpen)
|
||||||
{
|
{
|
||||||
|
if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch)
|
||||||
|
{
|
||||||
|
foreach (Transform t in optionHolder.transform)
|
||||||
|
{
|
||||||
|
if (t.GetComponent<Collider2D>().OverlapPoint(PlayerInput.GetInputController(1).GetPointer()))
|
||||||
|
{
|
||||||
|
int idx = t.GetSiblingIndex();
|
||||||
|
ChooseOption((Options)idx, idx != optionSelected);
|
||||||
|
optionSelected = idx;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (Input.GetKeyDown(KeyCode.UpArrow) || PlayerInput.GetInputController(1).GetActionDown(PlayerInput.CurrentControlStyle, btUp, out _))
|
if (Input.GetKeyDown(KeyCode.UpArrow) || PlayerInput.GetInputController(1).GetActionDown(PlayerInput.CurrentControlStyle, btUp, out _))
|
||||||
{
|
{
|
||||||
optionSelected--;
|
optionSelected--;
|
||||||
|
|
@ -209,11 +224,13 @@ namespace HeavenStudio.Common
|
||||||
{
|
{
|
||||||
isQuitting = true;
|
isQuitting = true;
|
||||||
SoundByte.PlayOneShot("ui/PauseQuit");
|
SoundByte.PlayOneShot("ui/PauseQuit");
|
||||||
GlobalGameManager.LoadScene("Editor", 0, 0.1f);
|
GameManager.instance.CircleCursor.LockCursor(false);
|
||||||
|
GlobalGameManager.LoadScene("Title", 0, 0.35f);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnSettings()
|
void OnSettings()
|
||||||
{
|
{
|
||||||
|
GameManager.instance.CircleCursor.LockCursor(false);
|
||||||
settingsDialog.SwitchSettingsDialog();
|
settingsDialog.SwitchSettingsDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,11 @@ namespace HeavenStudio.Common
|
||||||
PersistentDataManager.SaveSettings();
|
PersistentDataManager.SaveSettings();
|
||||||
tabsManager.CleanTabs();
|
tabsManager.CleanTabs();
|
||||||
|
|
||||||
|
if (GameManager.instance != null && GameManager.instance.CircleCursor != null && GameManager.instance.playOnStart)
|
||||||
|
{
|
||||||
|
GameManager.instance.CircleCursor.LockCursor(true);
|
||||||
|
}
|
||||||
|
|
||||||
if (Editor.Editor.instance == null) return;
|
if (Editor.Editor.instance == null) return;
|
||||||
Editor.Editor.instance.canSelect = true;
|
Editor.Editor.instance.canSelect = true;
|
||||||
Editor.Editor.instance.inAuthorativeMenu = false;
|
Editor.Editor.instance.inAuthorativeMenu = false;
|
||||||
|
|
@ -34,6 +39,12 @@ namespace HeavenStudio.Common
|
||||||
|
|
||||||
BuildDateDisplay.text = GlobalGameManager.buildTime;
|
BuildDateDisplay.text = GlobalGameManager.buildTime;
|
||||||
|
|
||||||
|
|
||||||
|
if (GameManager.instance != null && GameManager.instance.CircleCursor != null && GameManager.instance.playOnStart)
|
||||||
|
{
|
||||||
|
GameManager.instance.CircleCursor.LockCursor(false);
|
||||||
|
}
|
||||||
|
|
||||||
if (Editor.Editor.instance == null) return;
|
if (Editor.Editor.instance == null) return;
|
||||||
Editor.Editor.instance.canSelect = false;
|
Editor.Editor.instance.canSelect = false;
|
||||||
Editor.Editor.instance.inAuthorativeMenu = true;
|
Editor.Editor.instance.inAuthorativeMenu = true;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue