diff --git a/Assets/Editor/Huoshan/ExpressionLocalizationTests.cs b/Assets/Editor/Huoshan/ExpressionLocalizationTests.cs index 2d6d0029a..6a5ba6ddd 100644 --- a/Assets/Editor/Huoshan/ExpressionLocalizationTests.cs +++ b/Assets/Editor/Huoshan/ExpressionLocalizationTests.cs @@ -87,7 +87,7 @@ namespace AibisDream.EditorTests.Huoshan LocalizationSettings.SelectedLocale = previous; Assert.That(chineseTask.Result, Is.EqualTo("我就是个笑话")); - Assert.That(englishTask.Result, Is.Empty); + Assert.That(englishTask.Result, Is.EqualTo("I am nothing but a joke")); } [UnityTest] @@ -415,7 +415,7 @@ namespace AibisDream.EditorTests.Huoshan } [Test] - public void Params_ContainsLocalizedExpressPoolForEveryLocale() + public void Params_ContainsEnglishWordPoolAndPendingPoolsForOtherLocales() { StringTableCollection collection = LocalizationEditorSettings.GetStringTableCollection(ConstRef.ParamsTable); @@ -441,7 +441,18 @@ namespace AibisDream.EditorTests.Huoshan chinese.GetEntry(key).LocalizedValue), Is.Not.Empty); - foreach (string localeCode in localeCodes.Skip(1)) + StringTable english = + collection.GetTable(new LocaleIdentifier("en")) as StringTable; + Assert.That( + LanguageYarnCommand.TryParseExpressionPool( + english.GetEntry(key).LocalizedValue, + ExpressionParticleUnitMode.Word, + out List englishPool), + Is.True); + Assert.That(englishPool, Does.Contain("truth")); + Assert.That(englishPool, Does.Contain("believe")); + + foreach (string localeCode in localeCodes.Skip(2)) { StringTable table = collection.GetTable(new LocaleIdentifier(localeCode)) as StringTable; diff --git a/Assets/GameContent/Huoshan/Actor.meta b/Assets/GameContent/Feature_Huoshan/Actor.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor.meta rename to Assets/GameContent/Feature_Huoshan/Actor.meta diff --git a/Assets/GameContent/Huoshan/Actor/彩带Clip.asset b/Assets/GameContent/Feature_Huoshan/Actor/彩带Clip.asset similarity index 100% rename from Assets/GameContent/Huoshan/Actor/彩带Clip.asset rename to Assets/GameContent/Feature_Huoshan/Actor/彩带Clip.asset diff --git a/Assets/GameContent/Huoshan/Actor/彩带Clip.asset.meta b/Assets/GameContent/Feature_Huoshan/Actor/彩带Clip.asset.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/彩带Clip.asset.meta rename to Assets/GameContent/Feature_Huoshan/Actor/彩带Clip.asset.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山Graph.asset b/Assets/GameContent/Feature_Huoshan/Actor/火山Graph.asset similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山Graph.asset rename to Assets/GameContent/Feature_Huoshan/Actor/火山Graph.asset diff --git a/Assets/GameContent/Huoshan/Actor/火山Graph.asset.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山Graph.asset.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山Graph.asset.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山Graph.asset.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山像素版.aseprite b/Assets/GameContent/Feature_Huoshan/Actor/火山像素版.aseprite similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山像素版.aseprite rename to Assets/GameContent/Feature_Huoshan/Actor/火山像素版.aseprite diff --git a/Assets/GameContent/Huoshan/Actor/火山像素版.aseprite.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山像素版.aseprite.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山像素版.aseprite.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山像素版.aseprite.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山像素版.json b/Assets/GameContent/Feature_Huoshan/Actor/火山像素版.json similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山像素版.json rename to Assets/GameContent/Feature_Huoshan/Actor/火山像素版.json diff --git a/Assets/GameContent/Huoshan/Actor/火山像素版.json.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山像素版.json.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山像素版.json.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山像素版.json.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山像素版.png b/Assets/GameContent/Feature_Huoshan/Actor/火山像素版.png similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山像素版.png rename to Assets/GameContent/Feature_Huoshan/Actor/火山像素版.png diff --git a/Assets/GameContent/Huoshan/Actor/火山像素版.png.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山像素版.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山像素版.png.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山像素版.png.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.json b/Assets/GameContent/Feature_Huoshan/Actor/火山彩带.json similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山彩带.json rename to Assets/GameContent/Feature_Huoshan/Actor/火山彩带.json diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.json.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山彩带.json.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山彩带.json.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山彩带.json.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.playable b/Assets/GameContent/Feature_Huoshan/Actor/火山彩带.playable similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山彩带.playable rename to Assets/GameContent/Feature_Huoshan/Actor/火山彩带.playable diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.playable.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山彩带.playable.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山彩带.playable.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山彩带.playable.meta diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.png b/Assets/GameContent/Feature_Huoshan/Actor/火山彩带.png similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山彩带.png rename to Assets/GameContent/Feature_Huoshan/Actor/火山彩带.png diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.png.meta b/Assets/GameContent/Feature_Huoshan/Actor/火山彩带.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/Actor/火山彩带.png.meta rename to Assets/GameContent/Feature_Huoshan/Actor/火山彩带.png.meta diff --git a/Assets/GameContent/Huoshan.meta b/Assets/GameContent/Feature_Huoshan/Art.meta similarity index 77% rename from Assets/GameContent/Huoshan.meta rename to Assets/GameContent/Feature_Huoshan/Art.meta index 4d645508a..7f33b7366 100644 --- a/Assets/GameContent/Huoshan.meta +++ b/Assets/GameContent/Feature_Huoshan/Art.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91dd0288ab6cb7a4fb7bc684b9e3ed69 +guid: 5f2a0ba886c6cac40a1857418c5e16a4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameContent/Huoshan/维修火山释放完log火山脑部特写.psb b/Assets/GameContent/Feature_Huoshan/Art/维修火山释放完log火山脑部特写.psb similarity index 100% rename from Assets/GameContent/Huoshan/维修火山释放完log火山脑部特写.psb rename to Assets/GameContent/Feature_Huoshan/Art/维修火山释放完log火山脑部特写.psb diff --git a/Assets/GameContent/Huoshan/维修火山释放完log火山脑部特写.psb.meta b/Assets/GameContent/Feature_Huoshan/Art/维修火山释放完log火山脑部特写.psb.meta similarity index 100% rename from Assets/GameContent/Huoshan/维修火山释放完log火山脑部特写.psb.meta rename to Assets/GameContent/Feature_Huoshan/Art/维修火山释放完log火山脑部特写.psb.meta diff --git a/Assets/GameContent/Feature_Huoshan/Expression/ExpressionParticleLanguageProfile.asset b/Assets/GameContent/Feature_Huoshan/Expression/ExpressionParticleLanguageProfile.asset index 0c137ad5d..7a159a450 100644 --- a/Assets/GameContent/Feature_Huoshan/Expression/ExpressionParticleLanguageProfile.asset +++ b/Assets/GameContent/Feature_Huoshan/Expression/ExpressionParticleLanguageProfile.asset @@ -33,37 +33,37 @@ MonoBehaviour: minimumReadablePhraseScale: 0.65 - localeCode: en unitMode: 1 - targetFontScale: 0.65 - nonTargetFontScale: 0.58 - floatingFontScale: 0.58 - nonTargetCountScale: 0.65 + targetFontScale: 0.75 + nonTargetFontScale: 0.7 + floatingFontScale: 0.7 + nonTargetCountScale: 0.75 wordSpacing: 0.18 visualEdgeConnectionDistance: 0.18 minimumReadablePhraseScale: 0.65 - localeCode: es unitMode: 1 - targetFontScale: 0.65 - nonTargetFontScale: 0.58 - floatingFontScale: 0.58 - nonTargetCountScale: 0.65 + targetFontScale: 0.75 + nonTargetFontScale: 0.7 + floatingFontScale: 0.7 + nonTargetCountScale: 0.75 wordSpacing: 0.18 visualEdgeConnectionDistance: 0.18 minimumReadablePhraseScale: 0.65 - localeCode: ru unitMode: 1 - targetFontScale: 0.65 - nonTargetFontScale: 0.58 - floatingFontScale: 0.58 - nonTargetCountScale: 0.65 + targetFontScale: 0.75 + nonTargetFontScale: 0.7 + floatingFontScale: 0.7 + nonTargetCountScale: 0.75 wordSpacing: 0.18 visualEdgeConnectionDistance: 0.18 minimumReadablePhraseScale: 0.65 - localeCode: pt-BR unitMode: 1 - targetFontScale: 0.65 - nonTargetFontScale: 0.58 - floatingFontScale: 0.58 - nonTargetCountScale: 0.65 + targetFontScale: 0.75 + nonTargetFontScale: 0.7 + floatingFontScale: 0.7 + nonTargetCountScale: 0.75 wordSpacing: 0.18 visualEdgeConnectionDistance: 0.18 minimumReadablePhraseScale: 0.65 diff --git a/Assets/GameContent/Huoshan/sprite.meta b/Assets/GameContent/Feature_Huoshan/sprite.meta similarity index 100% rename from Assets/GameContent/Huoshan/sprite.meta rename to Assets/GameContent/Feature_Huoshan/sprite.meta diff --git a/Assets/GameContent/Huoshan/sprite/告别夕阳.png b/Assets/GameContent/Feature_Huoshan/sprite/告别夕阳.png similarity index 100% rename from Assets/GameContent/Huoshan/sprite/告别夕阳.png rename to Assets/GameContent/Feature_Huoshan/sprite/告别夕阳.png diff --git a/Assets/GameContent/Huoshan/sprite/告别夕阳.png.meta b/Assets/GameContent/Feature_Huoshan/sprite/告别夕阳.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/sprite/告别夕阳.png.meta rename to Assets/GameContent/Feature_Huoshan/sprite/告别夕阳.png.meta diff --git a/Assets/GameContent/Huoshan/sprite/大办公室.png b/Assets/GameContent/Feature_Huoshan/sprite/大办公室.png similarity index 100% rename from Assets/GameContent/Huoshan/sprite/大办公室.png rename to Assets/GameContent/Feature_Huoshan/sprite/大办公室.png diff --git a/Assets/GameContent/Huoshan/sprite/大办公室.png.meta b/Assets/GameContent/Feature_Huoshan/sprite/大办公室.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/sprite/大办公室.png.meta rename to Assets/GameContent/Feature_Huoshan/sprite/大办公室.png.meta diff --git a/Assets/GameContent/Huoshan/sprite/火山脑部特写_红屏.png b/Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_红屏.png similarity index 100% rename from Assets/GameContent/Huoshan/sprite/火山脑部特写_红屏.png rename to Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_红屏.png diff --git a/Assets/GameContent/Huoshan/sprite/火山脑部特写_红屏.png.meta b/Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_红屏.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/sprite/火山脑部特写_红屏.png.meta rename to Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_红屏.png.meta diff --git a/Assets/GameContent/Huoshan/sprite/火山脑部特写_透明.png b/Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_透明.png similarity index 100% rename from Assets/GameContent/Huoshan/sprite/火山脑部特写_透明.png rename to Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_透明.png diff --git a/Assets/GameContent/Huoshan/sprite/火山脑部特写_透明.png.meta b/Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_透明.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/sprite/火山脑部特写_透明.png.meta rename to Assets/GameContent/Feature_Huoshan/sprite/火山脑部特写_透明.png.meta diff --git a/Assets/GameContent/Huoshan/sprite/私人办公室.png b/Assets/GameContent/Feature_Huoshan/sprite/私人办公室.png similarity index 100% rename from Assets/GameContent/Huoshan/sprite/私人办公室.png rename to Assets/GameContent/Feature_Huoshan/sprite/私人办公室.png diff --git a/Assets/GameContent/Huoshan/sprite/私人办公室.png.meta b/Assets/GameContent/Feature_Huoshan/sprite/私人办公室.png.meta similarity index 100% rename from Assets/GameContent/Huoshan/sprite/私人办公室.png.meta rename to Assets/GameContent/Feature_Huoshan/sprite/私人办公室.png.meta diff --git a/Assets/Language/Params/Params_en.asset b/Assets/Language/Params/Params_en.asset index b087b7c69..7301e889e 100644 --- a/Assets/Language/Params/Params_en.asset +++ b/Assets/Language/Params/Params_en.asset @@ -47,115 +47,115 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 200000000000001001 - m_Localized: + m_Localized: I am nothing but a joke m_Metadata: m_Items: [] - m_Id: 200000000000001002 - m_Localized: + m_Localized: Ha ha|Heh heh|So funny m_Metadata: m_Items: [] - m_Id: 200000000000001003 - m_Localized: + m_Localized: Please don't leave me m_Metadata: m_Items: [] - m_Id: 200000000000001004 - m_Localized: + m_Localized: Ha ha ha|Heh heh heh|That's hilarious|So funny|What a joke m_Metadata: m_Items: [] - m_Id: 200000000000001005 - m_Localized: + m_Localized: Why won't you believe in me m_Metadata: m_Items: [] - m_Id: 200000000000001006 - m_Localized: + m_Localized: Ha ha ha ha|I'm dying laughing|This is too funny|I can't hold it|I can't stop laughing|This is hilarious m_Metadata: m_Items: [] - m_Id: 200000000000001008 - m_Localized: + m_Localized: Why m_Metadata: m_Items: [] - m_Id: 200000000000001009 - m_Localized: + m_Localized: You don't believe me m_Metadata: m_Items: [] - m_Id: 200000000000001010 - m_Localized: + m_Localized: I know I come last m_Metadata: m_Items: [] - m_Id: 200000000000001011 - m_Localized: + m_Localized: The weather is terrible m_Metadata: m_Items: [] - m_Id: 200000000000001012 - m_Localized: + m_Localized: Nobody is buying m_Metadata: m_Items: [] - m_Id: 200000000000001013 - m_Localized: + m_Localized: Try to explain m_Metadata: m_Items: [] - m_Id: 200000000000001014 - m_Localized: + m_Localized: You refuse to believe me m_Metadata: m_Items: [] - m_Id: 200000000000001015 - m_Localized: + m_Localized: Just a little trust m_Metadata: m_Items: [] - m_Id: 200000000000001016 - m_Localized: + m_Localized: I've had enough m_Metadata: m_Items: [] - m_Id: 200000000000001017 - m_Localized: + m_Localized: Damn it m_Metadata: m_Items: [] - m_Id: 200000000000001018 - m_Localized: + m_Localized: I'm useless m_Metadata: m_Items: [] - m_Id: 200000000000001019 - m_Localized: + m_Localized: Prove myself m_Metadata: m_Items: [] - m_Id: 200000000000001020 - m_Localized: + m_Localized: I can't do anything m_Metadata: m_Items: [] - m_Id: 200000000000001021 - m_Localized: + m_Localized: Catch up with you m_Metadata: m_Items: [] - m_Id: 200000000000001022 - m_Localized: + m_Localized: Help Yingli m_Metadata: m_Items: [] - m_Id: 200000000000001023 - m_Localized: + m_Localized: I have no courage m_Metadata: m_Items: [] - m_Id: 200000000000001024 - m_Localized: + m_Localized: Say it out loud m_Metadata: m_Items: [] - m_Id: 200000000000001025 - m_Localized: + m_Localized: Trash m_Metadata: m_Items: [] - m_Id: 200000000000001026 - m_Localized: + m_Localized: Completely hopeless m_Metadata: m_Items: [] - m_Id: 200000000000001027 - m_Localized: + m_Localized: Why why why m_Metadata: m_Items: [] - m_Id: 200000000000001028 - m_Localized: + m_Localized: I want to win for once m_Metadata: m_Items: [] - m_Id: 200000000000001029 - m_Localized: + m_Localized: the a an and or but if then because I me my mine you your yours we our us they their them he his him she her it its this that these those who what where when why how is am are was were be been being do does did done can could will would shall should may might must have has had not no yes never always sometimes again still already just only even very really too so more most less least all any some none one two first last next now here there inside outside above below before after back away near far good bad right wrong true false real fake funny joke laugh smile cry fear trust doubt hope courage voice word words say tell ask answer explain believe leave stay come go follow catch help hold let make try fail win lose break fix remember forget think know feel want need like hate love angry tired lonely useless enough nothing everything someone nobody friend weather today tomorrow yesterday time world dream truth lie problem reason choice change begin end open close light dark red blue green warm cold quiet loud slow fast strong weak safe danger together apart broken whole m_Metadata: m_Items: [] references: