Skip to content

Commit b91b755

Browse files
committed
fixed bad export
1 parent 98908fa commit b91b755

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

assets/data/cards.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<card id="332" icon="082832.png" rarity="1" type="0" up="7" lt="3" dn="7" rt="1" sort="318" group="0" />
335335
<card id="333" icon="082833.png" rarity="2" type="0" up="6" lt="8" dn="7" rt="1" sort="319" group="0" />
336336
<card id="334" icon="082834.png" rarity="2" type="0" up="8" lt="7" dn="3" rt="3" sort="320" group="0" />
337-
<card id="335" icon="082835.png" rarity="-1" type="0" up="-1" lt="-1" dn="-1" rt="-1" sort="0" group="0" />
337+
<card id="335" icon="082835.png" rarity="2" type="0" up="5" lt="8" dn="5" rt="6" sort="332" group="0" />
338338
<card id="336" icon="082836.png" rarity="2" type="2" up="4" lt="1" dn="8" rt="8" sort="321" group="0" />
339339
<card id="337" icon="082837.png" rarity="2" type="0" up="7" lt="1" dn="8" rt="6" sort="322" group="0" />
340340
<card id="338" icon="082838.png" rarity="2" type="0" up="7" lt="7" dn="3" rt="7" sort="323" group="0" />

sources/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("101.0.0.0")]
35-
[assembly: AssemblyFileVersion("101.0.0.0")]
34+
[assembly: AssemblyVersion("102.0.0.0")]
35+
[assembly: AssemblyFileVersion("102.0.0.0")]

sources/utils/DataCoverter.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,16 @@ private bool UpdateCards(GameDataLists gameDataLists, Dictionary<string, ETriadC
150150
foreach (var cardData in gameDataLists.cards)
151151
{
152152
TriadCard cardOb = (cardData.Id < cardDB.cards.Count) ? cardDB.cards[cardData.Id] : null;
153-
if (cardOb != null)
153+
if (cardOb != null && cardOb.IsValid())
154154
{
155155
// ensure side numbers are the same
156-
if (cardOb.IsValid())
157-
{
158-
if (cardOb.Sides[0] != cardData.sideTop ||
156+
if (cardOb.Sides[0] != cardData.sideTop ||
159157
cardOb.Sides[1] != cardData.sideLeft ||
160158
cardOb.Sides[2] != cardData.sideBottom ||
161159
cardOb.Sides[3] != cardData.sideRight)
162-
{
163-
Logger.WriteLine("FAILED card update, id:{0} name:{1} is not matching side numbers!", cardData.Id, cardData.LinkedName.Name.GetCodeName());
164-
return false;
165-
}
160+
{
161+
Logger.WriteLine("FAILED card update, id:{0} name:{1} is not matching side numbers!", cardData.Id, cardData.LinkedName.Name.GetCodeName());
162+
return false;
166163
}
167164
}
168165
else

0 commit comments

Comments
 (0)