diff --git a/.gitignore b/.gitignore index 846c8c0..ac74416 100644 --- a/.gitignore +++ b/.gitignore @@ -1,349 +1,350 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ \ No newline at end of file +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ +*.bak diff --git a/README.md b/README.md index 1d02b1a..9e3eb98 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ - [Click Here for instructions](https://github.com/jtborn/TFT-Overlay/blob/master/Localization.md) ## Version History +- **11.12.2019** + - [2.2.2](https://github.com/jtborn/TFT-Overlay/releases/tag/V2.2.2) + - CN language updates + - **11.07.2019** - [2.2.1](https://github.com/jtborn/TFT-Overlay/releases/tag/V2.2.1) - Further set 2 updates for item/synergy stats diff --git a/Resource/Localization/ItemStrings_zh-CN.xaml b/Resource/Localization/ItemStrings_zh-CN.xaml index 747d34b..bd6977b 100644 --- a/Resource/Localization/ItemStrings_zh-CN.xaml +++ b/Resource/Localization/ItemStrings_zh-CN.xaml @@ -23,7 +23,7 @@ 装备者也是 极地 地狱火熔渣 - 携带者也是 炼狱 + 携带者也是 地狱火 骑士之誓 携带者也是 骑士 @@ -38,7 +38,7 @@ 普攻对额外 1 个目标造成伤害,额外攻击造成攻击力 60% 的伤害,附带普攻特效 光之护符 - 携带者也是 光明 + 携带者也是 光 守护神板甲 携带者也是 守护神 @@ -67,7 +67,7 @@ 邻近格子的敌人降低 35% 攻击速度 巨人杀手 - 攻击造成目标当前生命值 8% 的额外真实伤害 + 攻击造成目标当前生命值 8% 的物理伤害 守护天使 阵亡 2 秒后复活,复活后恢复 400 生命值 @@ -93,7 +93,7 @@ 离子火花 每当敌人使用技能,他们受到 100 点真实伤害 - 奥数护手 + 珠光护手 佩戴者的技能可以暴击 钢铁烈阳之匣 @@ -103,7 +103,7 @@ 技能对命中目标造成 150 点溅射伤害且每次技能施放时都会触发一次 莫雷洛秘典 - 技能造成燃烧伤害,每秒伤害值相当于敌人 5% 的最大生命值 + 技能 10 秒内灼烧敌人最大生命值 20% ,并禁止 80% 治疗效果(无法叠加) 妮蔻之助 创建一个与其相同的 1 星卡牌,将它添加到您的台上 @@ -121,12 +121,12 @@ 携带者的攻击距离翻倍 红色增益 - 攻击每秒燃烧 2% 最大生命值,持续10秒,并使恢复速度降低 80% + 攻击每秒燃烧 2% 最大生命值,持续 10 秒,并禁止 80% 治疗效果(无法叠加) 救赎 在生命值降低到 30% 时,治疗附近所有友军 1200 点生命值 - 连发弩 + 复用型十字弩 携带者死亡时,该装备转移至一个新单位,并且其获得 30% 攻速和 30% 暴击率,每次交接都会叠加 炽天使之拥 @@ -148,10 +148,10 @@ 携带者不能装备其它装备。准备阶段,暂时获得 2 件装备,品质取决于自身等级 荆棘之甲 - 反弹所受到伤害的 100% 的真实伤害 + 反弹所受到物理伤害的 100% 的真实伤害 巨型九头蛇 - 攻击对敌人造成携带者 3% 最大生命值的溅射伤害 + 攻击对目标及目标身后的敌人造成携带者 3% 最大生命值的溅射伤害 反击之手 携带者在回合开始后会有一个法术护盾,打破护盾的敌人会被眩晕 4 秒 @@ -222,17 +222,17 @@ (2)1名随机帝国单位 (4)所有帝国单位 - 炼狱 - 炼狱英雄的技能在接下来的 5 秒内灼烧地面,对目标额外造成 + 地狱火 + 地狱火英雄的技能在接下来的 5 秒内灼烧地面,对目标额外造成 (3) +80% 魔法伤害 (6) +175% 魔法伤害 (9) +275% 魔法伤害 - 光明 - 光明英雄死亡时,对其他光明英雄施加 25% 最大生命值的治疗,并提升他们 + + 光英雄死亡时,对其他光英雄施加 25% 最大生命值的治疗,并提升他们 (3) +10% 攻速 (6) +20% 攻速 (9) +35% 攻速 - 山地 + 山脉 (2) 战斗开始时随机赋予一个友军 1500 点的护盾 @@ -267,13 +267,13 @@ 机器人在开始战斗时就有满额的法力值 (1) - 风影 - 当风影英雄造成伤害时,在 5 秒内提升 + + 当影英雄造成伤害时,在 5 秒内提升 (2) 自身 50% 的伤害 (4) 全体风影英雄 100% 的伤害 - 合金 - 合金英雄生命值低于 50% 时,获得免疫伤害,持续 + 钢铁 + 钢铁英雄生命值低于 50% 时,获得免疫伤害,持续 (2) 2 秒 (3) 3 秒 (4) 4 秒 @@ -290,8 +290,8 @@ (2) 狂野单位 (4) 所有友军且攻击不能被闪避 - 林地 - (3) 战斗开始时,随机复制一个林地英雄的镜像 + 森林 + (3) 战斗开始时,随机复制一个森林英雄的镜像 约德尔人 @@ -357,7 +357,7 @@ (3) 50% 几率 (6) 100% 几率 - 秘术师 + 秘术 为全体友军增加魔法抗性 (2) 40 魔抗 (4) 120 魔抗 diff --git a/Resource/Localization/ItemStrings_zh-CN.xaml.bak b/Resource/Localization/ItemStrings_zh-CN.xaml.bak index 48411f9..8070f94 100644 --- a/Resource/Localization/ItemStrings_zh-CN.xaml.bak +++ b/Resource/Localization/ItemStrings_zh-CN.xaml.bak @@ -23,7 +23,7 @@ 装备者也是 极地 地狱火熔渣 - 携带者也是 炼狱 + 携带者也是 地狱火 骑士之誓 携带者也是 骑士 @@ -38,7 +38,7 @@ 普攻对额外 1 个目标造成伤害,额外攻击造成攻击力 60% 的伤害,附带普攻特效 光之护符 - 携带者也是 光明 + 携带者也是 光 守护神板甲 携带者也是 守护神 @@ -67,7 +67,7 @@ 邻近格子的敌人降低 35% 攻击速度 巨人杀手 - 攻击造成目标当前生命值 8% 的额外真实伤害 + 攻击造成目标当前生命值 8% 的物理伤害 守护天使 阵亡 2 秒后复活,复活后恢复 400 生命值 @@ -93,7 +93,7 @@ 离子火花 每当敌人使用技能,他们受到 100 点真实伤害 - 奥数护手 + 珠光护手 佩戴者的技能可以暴击 钢铁烈阳之匣 @@ -103,7 +103,7 @@ 技能对命中目标造成 150 点溅射伤害且每次技能施放时都会触发一次 莫雷洛秘典 - 技能造成燃烧伤害,每秒伤害值相当于敌人 5% 的最大生命值 + 技能 10 秒内灼烧敌人最大生命值 20% ,并禁止 80% 治疗效果(无法叠加) 妮蔻之助 创建一个与其相同的 1 星卡牌,将它添加到您的台上 @@ -121,12 +121,12 @@ 携带者的攻击距离翻倍 红色增益 - 攻击每秒燃烧 2% 最大生命值,持续10秒,并使恢复速度降低 80% + 攻击每秒燃烧 2% 最大生命值,持续 10 秒,并禁止 80% 治疗效果(无法叠加) 救赎 在生命值降低到 30% 时,治疗附近所有友军 1200 点生命值 - 连发弩 + 复用型十字弩 携带者死亡时,该装备转移至一个新单位,并且其获得 30% 攻速和 30% 暴击率,每次交接都会叠加 炽天使之拥 @@ -148,10 +148,10 @@ 携带者不能装备其它装备。准备阶段,暂时获得 2 件装备,品质取决于自身等级 荆棘之甲 - 反弹所受到伤害的 100% 的真实伤害 + 反弹所受到物理伤害的 100% 的真实伤害 巨型九头蛇 - 攻击对敌人造成携带者 3% 最大生命值的溅射伤害 + 攻击对目标及目标身后的敌人造成携带者 3% 最大生命值的溅射伤害 反击之手 携带者在回合开始后会有一个法术护盾,打破护盾的敌人会被眩晕 4 秒 @@ -317,7 +317,7 @@ 狂战士 狂战士的攻击有几率对目标背后锥形区域造成伤害 - (3) 40% 几率 (6) 100% 几率 + (3) 45% 几率 (6) 100% 几率 剑士 @@ -363,7 +363,7 @@ 掠食者 - (3) 掠食者们的伤害会秒杀生命值低于 20% 的敌人 + (3) 掠食者们的伤害会秒杀生命值低于 25% 的敌人 游侠 @@ -400,7 +400,7 @@ 玩家伤害公式 - 2点(小小英雄) + + 2/3/4/5/6/7 (根据舞台) + 每个单位的伤害 diff --git a/Version.cs b/Version.cs index c47ea07..3e4eb0b 100644 --- a/Version.cs +++ b/Version.cs @@ -2,6 +2,6 @@ { class Version { - public static string version = "2.2.1"; + public static string version = "2.2.2"; } }