Commit cfdfd02a authored by 苍蓝's avatar 苍蓝

update

parent f386dc0e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup> </startup>
</configuration> </configuration>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BotWrapper</RootNamespace> <RootNamespace>BotWrapper</RootNamespace>
<AssemblyName>Bot</AssemblyName> <AssemblyName>Bot</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86'"> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>BotWrapper.BotWrapper</StartupObject> <StartupObject>BotWrapper.BotWrapper</StartupObject>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
...@@ -33,12 +33,13 @@ ...@@ -33,12 +33,13 @@
120151018 120151018
120151015 120151015
120151015 120151015
120151017
120151017 120151017
120151017 120151017
120151016 120151016
120151020 120151020
120151020 120151020
120151020
120151019 120151019
#extra #extra
!side !side
\ No newline at end of file
...@@ -40,13 +40,13 @@ namespace WindBot.Game.AI.Decks ...@@ -40,13 +40,13 @@ namespace WindBot.Game.AI.Decks
AddExecutor(ExecutorType.SpSummon); AddExecutor(ExecutorType.SpSummon);
AddExecutor(ExecutorType.Activate, CardId.七星道法师,七星道法师Effect); AddExecutor(ExecutorType.Activate, CardId.七星道法师,七星道法师Effect);
AddExecutor(ExecutorType.Activate, CardId.对死者的供奉, 死供Eff); AddExecutor(ExecutorType.Activate, CardId.对死者的供奉, 死供Eff);
AddExecutor(ExecutorType.Summon, CardId.青眼白龙, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.青眼白龙, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.破坏之剑士, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.破坏之剑士, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.恶魔召唤, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.恶魔召唤, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.连击龙, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.连击龙, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.雅灭鲁拉, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.雅灭鲁拉, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.黑魔术师, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.黑魔术师, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.真红眼黑龙, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.真红眼黑龙, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.七星道魔术师, DefaultMonsterSummon); AddExecutor(ExecutorType.Summon, CardId.七星道魔术师, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.人造人, DefaultMonsterSummon); AddExecutor(ExecutorType.Summon, CardId.人造人, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.神秘庄家); AddExecutor(ExecutorType.Summon, CardId.神秘庄家);
...@@ -141,7 +141,7 @@ namespace WindBot.Game.AI.Decks ...@@ -141,7 +141,7 @@ namespace WindBot.Game.AI.Decks
{ {
return true; return true;
} }
else if (Bot.HasInHand(new[] { else if (Bot.HasInHandOrHasInMonstersZone(new[] {
CardId.七星道魔术师, CardId.七星道魔术师,
CardId.连击龙, CardId.连击龙,
CardId.青眼白龙, CardId.青眼白龙,
......
...@@ -46,13 +46,13 @@ namespace WindBot.Game.AI.Decks ...@@ -46,13 +46,13 @@ namespace WindBot.Game.AI.Decks
AddExecutor(ExecutorType.SpSummon); AddExecutor(ExecutorType.SpSummon);
AddExecutor(ExecutorType.Activate, CardId.七星道法师, 七星道法师Effect); AddExecutor(ExecutorType.Activate, CardId.七星道法师, 七星道法师Effect);
AddExecutor(ExecutorType.Activate, CardId.对死者的供奉, 死供Eff); AddExecutor(ExecutorType.Activate, CardId.对死者的供奉, 死供Eff);
AddExecutor(ExecutorType.Summon, CardId.青眼白龙, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.青眼白龙, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.破坏之剑士, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.破坏之剑士, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.恶魔召唤, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.恶魔召唤, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.连击龙, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.连击龙, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.雅灭鲁拉, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.雅灭鲁拉, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.黑魔术师, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.黑魔术师, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.真红眼黑龙, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, CardId.真红眼黑龙, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.七星道魔术师, DefaultMonsterSummon); AddExecutor(ExecutorType.Summon, CardId.七星道魔术师, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.人造人, DefaultMonsterSummon); AddExecutor(ExecutorType.Summon, CardId.人造人, DefaultMonsterSummon);
AddExecutor(ExecutorType.Summon, CardId.神秘庄家); AddExecutor(ExecutorType.Summon, CardId.神秘庄家);
...@@ -65,12 +65,11 @@ namespace WindBot.Game.AI.Decks ...@@ -65,12 +65,11 @@ namespace WindBot.Game.AI.Decks
AddExecutor(ExecutorType.Activate, CardId.凤凰龙); AddExecutor(ExecutorType.Activate, CardId.凤凰龙);
AddExecutor(ExecutorType.Summon, CardId.凤凰龙, 凤凰龙summon); AddExecutor(ExecutorType.Summon, CardId.凤凰龙, 凤凰龙summon);
AddExecutor(ExecutorType.MonsterSet, CardId.凤凰龙); AddExecutor(ExecutorType.MonsterSet, CardId.凤凰龙);
AddExecutor(ExecutorType.MonsterSet, CardId.火星心少女, Monsterset); AddExecutor(ExecutorType.MonsterSet, CardId.火星心少女, Monsterset);
AddExecutor(ExecutorType.MonsterSet, CardId.七星道法师, Monsterset); AddExecutor(ExecutorType.MonsterSet, CardId.七星道法师, Monsterset);
AddExecutor(ExecutorType.MonsterSet, CardId.耳语妖精, Monsterset); AddExecutor(ExecutorType.MonsterSet, CardId.耳语妖精, Monsterset);
AddExecutor(ExecutorType.Summon, CardId.七星道法师); AddExecutor(ExecutorType.Summon, CardId.七星道法师);
AddExecutor(ExecutorType.SummonOrSet, DefaultMonsterSummon); AddExecutor(ExecutorType.SummonOrSet, DefaultMonsterSummon);
AddExecutor(ExecutorType.Repos, DefaultMonsterRepos); AddExecutor(ExecutorType.Repos, DefaultMonsterRepos);
AddExecutor(ExecutorType.SpellSet); AddExecutor(ExecutorType.SpellSet);
...@@ -146,7 +145,7 @@ namespace WindBot.Game.AI.Decks ...@@ -146,7 +145,7 @@ namespace WindBot.Game.AI.Decks
{ {
return true; return true;
} }
else if (Bot.HasInHand(new[] { else if (Bot.HasInHandOrHasInMonstersZone(new[] {
CardId.七星道魔术师, CardId.七星道魔术师,
CardId.连击龙, CardId.连击龙,
CardId.青眼白龙, CardId.青眼白龙,
......
...@@ -162,8 +162,10 @@ namespace WindBot.Game.AI.Decks ...@@ -162,8 +162,10 @@ namespace WindBot.Game.AI.Decks
private bool DefaultDoubleSummon() private bool DefaultDoubleSummon()
{ {
if (!DoubleTribute && Bot.HasInMonstersZone(CardId.双角兽)) if (!DoubleTribute && Bot.HasInMonstersZone(CardId.双角兽))
AI.SelectCard(CardId.双角兽); { AI.SelectCard(CardId.双角兽);
return true; return true;
}
return false;
} }
private bool 左迁1Effect() private bool 左迁1Effect()
{ {
...@@ -288,17 +290,17 @@ namespace WindBot.Game.AI.Decks ...@@ -288,17 +290,17 @@ namespace WindBot.Game.AI.Decks
{ {
foreach (ClientCard mon in Enemy.GetMonsters()) foreach (ClientCard mon in Enemy.GetMonsters())
if (mon.Level >= 9) if (mon.Level >= 9)
AI.SelectNextCard(mon); AI.SelectCard(mon);
else if (mon.Level >= 8) else if (mon.Level >= 8)
AI.SelectNextCard(mon); AI.SelectCard(mon);
else if (mon.Level >= 6) else if (mon.Level >= 6)
AI.SelectNextCard(mon); AI.SelectCard(mon);
else if (mon.Level >= 4) else if (mon.Level >= 4)
AI.SelectNextCard(mon); AI.SelectCard(mon);
else if (mon.Level >= 2) else if (mon.Level >= 2)
AI.SelectNextCard(mon); AI.SelectCard(mon);
else if (mon.Level >= 1) else if (mon.Level >= 1)
AI.SelectNextCard(mon); AI.SelectCard(mon);
return true; return true;
} }
private bool 突击坦克summon() private bool 突击坦克summon()
...@@ -369,9 +371,8 @@ namespace WindBot.Game.AI.Decks ...@@ -369,9 +371,8 @@ namespace WindBot.Game.AI.Decks
} }
private bool 瞄准鹰Effect() private bool 瞄准鹰Effect()
{ {
//ClientCard target = Util.GetWorstBotMonster();
//if (target != null) AI.SelectCard(target); if (Bot.MonsterZone.GetMatchingCardsCount(card => card.Level >= 7) <= 1 && Bot.HasInHand(new[] { CardId.最强战旗, CardId.钢机神, CardId.恶德, CardId.旗兽, CardId.社员 }))
if (Bot.MonsterZone.GetMatchingCardsCount(card => card.Level >= 7) <= 1)
{ {
AI.SelectCard(CardId.瞄准鹰,CardId.突击坦克, CardId.成金恐龙王, CardId.社员, CardId.旗兽); AI.SelectCard(CardId.瞄准鹰,CardId.突击坦克, CardId.成金恐龙王, CardId.社员, CardId.旗兽);
AI.SelectNextCard(CardId.瞄准鹰, CardId.突击坦克, CardId.成金恐龙王, CardId.社员, CardId.旗兽); AI.SelectNextCard(CardId.瞄准鹰, CardId.突击坦克, CardId.成金恐龙王, CardId.社员, CardId.旗兽);
......
...@@ -704,8 +704,7 @@ namespace WindBot.Game.AI ...@@ -704,8 +704,7 @@ namespace WindBot.Game.AI
{ {
ClientCard tributeCard = Bot.MonsterZone[j]; ClientCard tributeCard = Bot.MonsterZone[j];
if (tributeCard == null) continue; if (tributeCard == null) continue;
// if (tributeCard.GetDefensePower() +400 < Card.Attack) if (tributeCard.GetDefensePower() < (Card.Attack - 400))
if ((tributeCard.Level +1) < Card.Level)
tributecount--; tributecount--;
} }
return tributecount <= 0; return tributecount <= 0;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WindBot</RootNamespace> <RootNamespace>WindBot</RootNamespace>
<AssemblyName>WindBot</AssemblyName> <AssemblyName>WindBot</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
...@@ -30,12 +31,14 @@ ...@@ -30,12 +31,14 @@
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject /> <StartupObject />
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>WindBot.ico</ApplicationIcon> <ApplicationIcon>
</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
...@@ -154,7 +157,6 @@ ...@@ -154,7 +157,6 @@
<None Include="App.config" /> <None Include="App.config" />
<None Include="Dialogs\rd-c.json" /> <None Include="Dialogs\rd-c.json" />
<None Include="Dialogs\rd-d.json" /> <None Include="Dialogs\rd-d.json" />
<None Include="Dialogs\rd1.json" />
<None Include="sqlite3.dll"> <None Include="sqlite3.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment