diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 51509e9..79d2c74 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 83d9a74..21cefc8 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 1b093c9..8f7ff61 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 688d4e4..73f5796 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 6ef2325..b12cd3d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -1352,17 +1352,26 @@ void RCSrl::mrcTrialApp(FILE *fp) // 表示するときに振り分けをする // Touch!Try!DS + bool use_tis = false; bool use_nis = false; for each( RCLicense ^lic in this->hLicenseList ) { + if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "TIS_FOR_TWLSDK" ) ) + { + use_tis = true; + } if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "NIS_FOR_TWLSDK" ) ) { use_nis = true; } } - if( !use_nis ) + if( !use_tis ) { - this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLib") ); + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLibTis") ); + } + if( use_nis ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLibNis") ); } if( this->IsMediaNand ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index 628bff3..7a683b2 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -57,7 +57,7 @@ } "Entry" { - "MsmKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D" + "MsmKey" = "8:_4E53291669A94A01BEB1B14679DF85E0" "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" "MsmSig" = "8:_UNDEFINED" } @@ -87,6 +87,12 @@ } "Entry" { + "MsmKey" = "8:_899760908357496CB0912065D65DDBDA" + "OwnerKey" = "8:_4E53291669A94A01BEB1B14679DF85E0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_9081D70FB535474FA8789DC9AFE4637C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -111,12 +117,6 @@ } "Entry" { - "MsmKey" = "8:_E67AE567BCA041ABA7D402B9029EA503" - "OwnerKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -408,7 +408,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=en, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3664.28542, Culture=en, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -494,7 +494,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=ja, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3664.28542, Culture=ja, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -657,7 +657,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MasterEditorTWL" "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}" - "PackageCode" = "8:{E2B78A12-4165-4BC1-99EC-3E8BF69CB7A6}" + "PackageCode" = "8:{1047076B-0F2A-4B45-8FB6-12E43381C4B5}" "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -1186,7 +1186,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ACA4D814AA04AF2A2F63060CDA5FA7D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4E53291669A94A01BEB1B14679DF85E0" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1200,7 +1200,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E67AE567BCA041ABA7D402B9029EA503" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_899760908357496CB0912065D65DDBDA" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 651efcc..a510eee 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml and b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index cf08ae5..ede8a72 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -61,11 +61,17 @@ - + Touch!Try!DS菴馴ィ鍋沿蟇セ蠢 - Touch!Try!DS菴馴ィ鍋沿縺ァ縺ッNIS繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺吶k蠢隕√′縺ゅj縺セ縺吶 + Touch!Try!DS菴馴ィ鍋沿縺ァ縺ッTIS繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺吶k蠢隕√′縺ゅj縺セ縺吶 00FalseTrue - + + + + Touch!Try!DS菴馴ィ鍋沿蟇セ蠢 + Touch!Try!DS菴馴ィ鍋沿縺ァ縺ッNIS繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺励※縺ッ縺縺代∪縺帙s縲5IS繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺励※縺上□縺輔>縲 + 00FalseTrue + Touch!Try!DS菴馴ィ鍋沿蟇セ蠢