Mergeconflicts resolved
Integrated new ChallengeRounds PartyMode into old Challenge Mode
This commit is contained in:
Pr3di committed
1 parent
16adec46d1
commit
67c1d26dad
10 files changed
+238
-1862
No files matched your search
@@ -65,7 +65,7 @@
|
||||
<Rect>
|
||||
<X>40</X>
|
||||
<Y>40</Y>
|
||||
<W>360</W>
|
||||
<W>640</W>
|
||||
<H>360</H>
|
||||
<Z>-2.1</Z>
|
||||
</Rect>
|
||||
@@ -73,11 +73,11 @@
|
||||
</Statics>
|
||||
<Texts>
|
||||
<Text Name="TextPlayer1">
|
||||
<X>950</X>
|
||||
<X>1160</X>
|
||||
<Y>65</Y>
|
||||
<Z>-2.11</Z>
|
||||
<H>42</H>
|
||||
<MaxW>280</MaxW>
|
||||
<MaxW>100</MaxW>
|
||||
<Color Name="Player1" />
|
||||
<SelColor Name="Player1" />
|
||||
<Align>Left</Align>
|
||||
@@ -87,11 +87,11 @@
|
||||
<Text />
|
||||
</Text>
|
||||
<Text Name="TextPlayer2">
|
||||
<X>950</X>
|
||||
<X>1160</X>
|
||||
<Y>135</Y>
|
||||
<Z>-2.11</Z>
|
||||
<H>42</H>
|
||||
<MaxW>280</MaxW>
|
||||
<MaxW>100</MaxW>
|
||||
<Color Name="Player2" />
|
||||
<SelColor Name="Player2" />
|
||||
<Align>Left</Align>
|
||||
@@ -101,11 +101,11 @@
|
||||
<Text />
|
||||
</Text>
|
||||
<Text Name="TextPlayer3">
|
||||
<X>950</X>
|
||||
<X>1160</X>
|
||||
<Y>205</Y>
|
||||
<Z>-2.11</Z>
|
||||
<H>42</H>
|
||||
<MaxW>280</MaxW>
|
||||
<MaxW>100</MaxW>
|
||||
<Color Name="Player3" />
|
||||
<SelColor Name="Player3" />
|
||||
<Align>Left</Align>
|
||||
@@ -115,11 +115,11 @@
|
||||
<Text />
|
||||
</Text>
|
||||
<Text Name="TextPlayer4">
|
||||
<X>950</X>
|
||||
<X>1160</X>
|
||||
<Y>275</Y>
|
||||
<Z>-2.11</Z>
|
||||
<H>42</H>
|
||||
<MaxW>280</MaxW>
|
||||
<MaxW>100</MaxW>
|
||||
<Color Name="Player4" />
|
||||
<SelColor Name="Player4" />
|
||||
<Align>Left</Align>
|
||||
@@ -129,11 +129,11 @@
|
||||
<Text />
|
||||
</Text>
|
||||
<Text Name="TextPlayer5">
|
||||
<X>950</X>
|
||||
<X>1160</X>
|
||||
<Y>345</Y>
|
||||
<Z>-2.11</Z>
|
||||
<H>42</H>
|
||||
<MaxW>280</MaxW>
|
||||
<MaxW>100</MaxW>
|
||||
<Color Name="Player5" />
|
||||
<SelColor Name="Player5" />
|
||||
<Align>Left</Align>
|
||||
@@ -143,11 +143,11 @@
|
||||
<Text />
|
||||
</Text>
|
||||
<Text Name="TextPlayer6">
|
||||
<X>950</X>
|
||||
<X>1160</X>
|
||||
<Y>415</Y>
|
||||
<Z>-2.11</Z>
|
||||
<H>42</H>
|
||||
<MaxW>280</MaxW>
|
||||
<MaxW>100</MaxW>
|
||||
<Color Name="Player6" />
|
||||
<SelColor Name="Player6" />
|
||||
<Align>Left</Align>
|
||||
@@ -244,10 +244,10 @@
|
||||
<Skin>Random</Skin>
|
||||
<SkinSelected>Random</SkinSelected>
|
||||
<Rect>
|
||||
<X>850</X>
|
||||
<X>1100</X>
|
||||
<Y>50</Y>
|
||||
<W>80</W>
|
||||
<H>80</H>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-1.01</Z>
|
||||
</Rect>
|
||||
<Color Name="Player1">
|
||||
@@ -255,11 +255,11 @@
|
||||
</Color>
|
||||
<SelColor Name="Player1" />
|
||||
<Text Name="Text">
|
||||
<X>40</X>
|
||||
<Y>23</Y>
|
||||
<X>30</X>
|
||||
<Y>20</Y>
|
||||
<Z>0</Z>
|
||||
<H>34</H>
|
||||
<MaxW>60</MaxW>
|
||||
<H>30</H>
|
||||
<MaxW>40</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
@@ -273,10 +273,10 @@
|
||||
<Skin>Random</Skin>
|
||||
<SkinSelected>Random</SkinSelected>
|
||||
<Rect>
|
||||
<X>850</X>
|
||||
<X>1100</X>
|
||||
<Y>120</Y>
|
||||
<W>80</W>
|
||||
<H>80</H>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-1.01</Z>
|
||||
</Rect>
|
||||
<Color Name="Player2">
|
||||
@@ -284,11 +284,11 @@
|
||||
</Color>
|
||||
<SelColor Name="Player2" />
|
||||
<Text Name="Text">
|
||||
<X>40</X>
|
||||
<Y>23</Y>
|
||||
<X>30</X>
|
||||
<Y>20</Y>
|
||||
<Z>0</Z>
|
||||
<H>34</H>
|
||||
<MaxW>60</MaxW>
|
||||
<H>30</H>
|
||||
<MaxW>40</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
@@ -302,10 +302,10 @@
|
||||
<Skin>Random</Skin>
|
||||
<SkinSelected>Random</SkinSelected>
|
||||
<Rect>
|
||||
<X>850</X>
|
||||
<X>1100</X>
|
||||
<Y>190</Y>
|
||||
<W>80</W>
|
||||
<H>80</H>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-1.01</Z>
|
||||
</Rect>
|
||||
<Color Name="Player3">
|
||||
@@ -313,11 +313,11 @@
|
||||
</Color>
|
||||
<SelColor Name="Player3" />
|
||||
<Text Name="Text">
|
||||
<X>40</X>
|
||||
<Y>23</Y>
|
||||
<X>30</X>
|
||||
<Y>20</Y>
|
||||
<Z>0</Z>
|
||||
<H>34</H>
|
||||
<MaxW>60</MaxW>
|
||||
<H>30</H>
|
||||
<MaxW>40</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
@@ -331,10 +331,10 @@
|
||||
<Skin>Random</Skin>
|
||||
<SkinSelected>Random</SkinSelected>
|
||||
<Rect>
|
||||
<X>850</X>
|
||||
<X>1100</X>
|
||||
<Y>260</Y>
|
||||
<W>80</W>
|
||||
<H>80</H>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-1.01</Z>
|
||||
</Rect>
|
||||
<Color Name="Player4">
|
||||
@@ -342,11 +342,11 @@
|
||||
</Color>
|
||||
<SelColor Name="Player4" />
|
||||
<Text Name="Text">
|
||||
<X>40</X>
|
||||
<Y>23</Y>
|
||||
<X>30</X>
|
||||
<Y>20</Y>
|
||||
<Z>0</Z>
|
||||
<H>34</H>
|
||||
<MaxW>60</MaxW>
|
||||
<H>30</H>
|
||||
<MaxW>40</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
@@ -360,10 +360,10 @@
|
||||
<Skin>Random</Skin>
|
||||
<SkinSelected>Random</SkinSelected>
|
||||
<Rect>
|
||||
<X>850</X>
|
||||
<X>1100</X>
|
||||
<Y>330</Y>
|
||||
<W>80</W>
|
||||
<H>80</H>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-1.01</Z>
|
||||
</Rect>
|
||||
<Color Name="Player5">
|
||||
@@ -371,11 +371,11 @@
|
||||
</Color>
|
||||
<SelColor Name="Player5" />
|
||||
<Text Name="Text">
|
||||
<X>40</X>
|
||||
<Y>23</Y>
|
||||
<X>30</X>
|
||||
<Y>20</Y>
|
||||
<Z>0</Z>
|
||||
<H>34</H>
|
||||
<MaxW>60</MaxW>
|
||||
<H>30</H>
|
||||
<MaxW>40</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
@@ -389,10 +389,10 @@
|
||||
<Skin>Random</Skin>
|
||||
<SkinSelected>Random</SkinSelected>
|
||||
<Rect>
|
||||
<X>850</X>
|
||||
<X>1100</X>
|
||||
<Y>400</Y>
|
||||
<W>80</W>
|
||||
<H>80</H>
|
||||
<W>60</W>
|
||||
<H>60</H>
|
||||
<Z>-1.01</Z>
|
||||
</Rect>
|
||||
<Color Name="Player6">
|
||||
@@ -400,11 +400,11 @@
|
||||
</Color>
|
||||
<SelColor Name="Player6" />
|
||||
<Text Name="Text">
|
||||
<X>40</X>
|
||||
<Y>23</Y>
|
||||
<X>30</X>
|
||||
<Y>20</Y>
|
||||
<Z>0</Z>
|
||||
<H>34</H>
|
||||
<MaxW>60</MaxW>
|
||||
<H>30</H>
|
||||
<MaxW>40</MaxW>
|
||||
<Color Name="ButtonTextColor" />
|
||||
<SelColor Name="ButtonTextSelColor" />
|
||||
<Align>Center</Align>
|
||||
@@ -661,7 +661,7 @@
|
||||
<Skin>Button</Skin>
|
||||
<SkinSelected>Button</SkinSelected>
|
||||
<Rect>
|
||||
<X>960</X>
|
||||
<X>1100</X>
|
||||
<Y>500</Y>
|
||||
<W>150</W>
|
||||
<H>50</H>
|
||||
@@ -1018,6 +1018,145 @@
|
||||
</Rect>
|
||||
</StaticMedleyTagIcon>
|
||||
</SongMenuList>
|
||||
<SongMenuListRecord>
|
||||
<ListLength>8</ListLength>
|
||||
<SpaceW>10</SpaceW>
|
||||
<SpaceH>10</SpaceH>
|
||||
<NumRecords>7</NumRecords>
|
||||
<!-- RECORDSTYLE_SINGLE = One per Player
|
||||
RECORDSTYLE_DIFFICULTY = One per Player per Difficulty
|
||||
RECORDSTYLE_ALL = The best 5 Records independent from Players -->
|
||||
<RecordStyle>RECORDSTYLE_SINGLE</RecordStyle>
|
||||
<TileRect>
|
||||
<X>640</X>
|
||||
<Y>40</Y>
|
||||
<W>550</W>
|
||||
<H>550</H>
|
||||
<Z>-1</Z>
|
||||
</TileRect>
|
||||
<TileRectSmall>
|
||||
<X>640</X>
|
||||
<Y>40</Y>
|
||||
<W>395</W>
|
||||
<H>550</H>
|
||||
<Z>-1</Z>
|
||||
</TileRectSmall>
|
||||
<TileRectRecord>
|
||||
<X>400</X>
|
||||
<Y>415</Y>
|
||||
<W>280</W>
|
||||
<H>170</H>
|
||||
<Z>-1</Z>
|
||||
</TileRectRecord>
|
||||
<TextArtist Name="TextArtist">
|
||||
<X>222</X>
|
||||
<Y>416</Y>
|
||||
<Z>-1.01</Z>
|
||||
<H>39</H>
|
||||
<MaxW>340</MaxW>
|
||||
<Color Name="StaticColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Top</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text />
|
||||
</TextArtist>
|
||||
<TextTitle Name="TextTitle">
|
||||
<X>222</X>
|
||||
<Y>456</Y>
|
||||
<Z>-1.01</Z>
|
||||
<H>32</H>
|
||||
<MaxW>340</MaxW>
|
||||
<Color Name="StaticColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Top</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text />
|
||||
</TextTitle>
|
||||
<TextSongLength Name="TextSongLength">
|
||||
<X>222</X>
|
||||
<Y>490</Y>
|
||||
<Z>-1.01</Z>
|
||||
<H>28</H>
|
||||
<MaxW>340</MaxW>
|
||||
<Color Name="StaticColor" />
|
||||
<SelColor Name="TextSelColor" />
|
||||
<Align>Center</Align>
|
||||
<ResizeAlign>Top</ResizeAlign>
|
||||
<Style>Bold</Style>
|
||||
<Font>Outline</Font>
|
||||
<Text />
|
||||
</TextSongLength>
|
||||
<StaticCoverBig Name="StaticCoverBig">
|
||||
<Skin>CoverBackground</Skin>
|
||||
<Color Name="Visible" />
|
||||
<Rect>
|
||||
<X>40</X>
|
||||
<Y>40</Y>
|
||||
<W>640</W>
|
||||
<H>360</H>
|
||||
<Z>-1</Z>
|
||||
</Rect>
|
||||
</StaticCoverBig>
|
||||
<StaticTextBG Name="StaticTextBG">
|
||||
<Skin>CoverBackground</Skin>
|
||||
<Color Name="StaticColorAlpha" />
|
||||
<Rect>
|
||||
<X>40</X>
|
||||
<Y>40</Y>
|
||||
<W>640</W>
|
||||
<H>360</H>
|
||||
<Z>-1</Z>
|
||||
</Rect>
|
||||
</StaticTextBG>
|
||||
<StaticDuetIcon Name="StaticDuetIcon">
|
||||
<Skin>DuetIcon</Skin>
|
||||
<Color Name="StaticColor" />
|
||||
<Rect>
|
||||
<X>200</X>
|
||||
<Y>530</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>-1</Z>
|
||||
</Rect>
|
||||
</StaticDuetIcon>
|
||||
<StaticVideoIcon Name="StaticVideoIcon">
|
||||
<Skin>VideoIcon</Skin>
|
||||
<Color Name="TextColor" />
|
||||
<Rect>
|
||||
<X>120</X>
|
||||
<Y>530</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>-1</Z>
|
||||
</Rect>
|
||||
</StaticVideoIcon>
|
||||
<StaticMedleyCalcIcon Name="StaticMedleyCalcIcon">
|
||||
<Skin>MedleyCalcIcon</Skin>
|
||||
<Color Name="TextColor" />
|
||||
<Rect>
|
||||
<X>280</X>
|
||||
<Y>530</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>-1</Z>
|
||||
</Rect>
|
||||
</StaticMedleyCalcIcon>
|
||||
<StaticMedleyTagIcon Name="StaticMedleyTagIcon">
|
||||
<Skin>MedleyTagIcon</Skin>
|
||||
<Color Name="StaticColor" />
|
||||
<Rect>
|
||||
<X>280</X>
|
||||
<Y>530</Y>
|
||||
<W>40</W>
|
||||
<H>40</H>
|
||||
<Z>-1</Z>
|
||||
</Rect>
|
||||
</StaticMedleyTagIcon>
|
||||
</SongMenuListRecord>
|
||||
</SongMenu>
|
||||
</SongMenus>
|
||||
<Lyrics />
|
||||
|
||||
Reference in new issue
Block a user