From 4c12096c02d3af240fb3745a750b3bb9561776e6 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 4 Nov 2022 12:11:01 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E8=88=97=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=E3=81=94=E3=81=A8=E3=81=AE=E4=BC=9A=E8=A9=B1ID=E3=82=92?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt | 2 +- popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs | 2 +- .../Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs | 5 +++-- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt b/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt index 7b48d637..2f80268e 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt @@ -1 +1 @@ -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 \ No newline at end of file +RthdFIYtMhyRyEbCOpTN7hKT5doNvKEAECPMLRMVyG+92R6ow4E4Qdjp7YoNufR6sbKKbSt52fWSQPKYCXPDqb5fs7lP3ascx2lomPqjUPzusn3KCdVSCYJrk1jPUck1SL+sG/ZumBd6Lql7WuZSK8f1M+81fL+ikpjH/CVvvGTiD694HPO+cY99Gt9gk+M9qXhoYZI1dk67/M9xeFAoT9qvyYKz97SnHelv874ZhF2cpDd+g/gSrjVylqcjigJUsKu9HLTNWqyXPE62601HEGGzSeWtCFeF3deXsoRFNE246UXd/ZSGCCG8HVR1pQI8OR5B1nflgQXzzvNSoWu3YdtCA+hkNbPBtNkVRQWaMbWodLAVVsqbj3urKJRcu41iN2LpNxOSM+BTlhTxEaZyfwCE1ZZWf9d3aActMM/tBh0nTSwURE6biGqwazlCkK2eQppqi3Y91xrKZ+XZ/NLIEu6Oai1AmWr8JxX9Y/YJHq8a1Vr42Qvmc2rMPpNWCm/r+T1ZqqPPrKZ6K8NsLCIlbXWThg0HMDC4dKKyvf2aaX/lRiGZNQyzEG6LZKOR9mtFpdelWfyPsbjSw5/AmCNbckHXewsZU9PuS6pr2OZaGhRjrmxumn0wyW/z93kzhZWYepAdqmQTDqg9HtuUY1eSL/W95loN1VmLNYMbdykhYjvMJkoEOakIlhqnuFnV/+aAAOC7UeG7eaIj58rWPtGGIBsDC7Tw8iXn7hHZoBsYlfjMSaAt8JSRIgeR46bch90gBCQ3prNrrmMCCfMsdG7EJf+Rpj7YVPgcxfhwh3Ncd8mUFG6/R1OUFAJxgr4Cpz94Sd/pD03YbyQ53DbuAE1jaSKkpCXlDHlZTy9IVFsZ/Rl1ROEEqj9maROOQmlWP+DCfqZZa0QHo4x46BU6eoSbI3TSYVC/Fy2x+i6GLjeFSs5mk+KLMWpL7tBKA80lqm/Lhp3JvzcDBL2gbPkCPA/oDBTaQWicEUC9bqkkUHrH7s3gN1shXqMFrl8zCKuZmdXYEXSGG4/Zc4xIQ6vSqru8SED+M3z0ct6SUpwXKOGRWTKu16Df80qye6XCO0R8nG9XSjLxA6vJzq0ZPzWkmRVPrULzXzi0LfIyLv1Z4qYIhaKIHyH/+PzyXyEfBwX+hyDG8/BglcCezfyNUmuRB6z3+v2qn83ksZodT/lO+LBS2vEM4J74pHYyvhjCaSnjlM9Db8RL0/9IuDOjT/Gtp1sljdPxgMFyFb6Xry6Za6ZKyQbnLCZaVEEqS48mU/Mmn+XfOO2UzXOn0TB+job+p0L3KLf2BdvSsY4ETWaW2zau+nhGY98d2y8P3f7fDxpJlAPyMcFHBWd55sT7Blb/fkZXjSKJSdLEyL9nUbh7jlwAJjmH4WsEAGmSDJRVhngJhDooAxYusOzVMGKXjLOZt5RewvJiMgHrMz0e9JKM2ybMp3G6pD4HoiA2x226TfI+Hr/nf0OOew3BmDFRA2XSnDCSqViBYsVlJdD+GE56jUjqRodUb/Yh1+HJ4j7Tv3yLqDNQBm2/drO6FpIxCL8uX+ba3jTW1i+NU6VfQqcaW7TishBr/fzqn5DLiVl9UfyI/aZ8xt9zgJZYfkrhIOWX5E1FCMOiDhkcAX1AWadi/DjfK1xhP0TzH6LF5JGkrTDRi+pwgoNtmn9hNY5WTQeiedVK7/eTZRz71J7lnM6qXmb40HA05PR+a88HBX8ru1YO9HoOin1Nsp44eSJ8aZo3/ruZmRKlW2rl8C1i6dEWtUq4ERH7PKJvI1BuybInehxxTmC8My+7yhfXb1lf0o+py74LyPGOVKreLJY204bS+2G/1Rg= \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index 46d0b905..f0c964f7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -127,7 +127,7 @@ public class Information : MonoBehaviour for (var index = 1; index < shopLevelList.Count; index++) { var levelData = shopLevelList[index]; - var scriptList = shopScriptList.Where(data => data.id == levelData.shopLevel).ToList(); + var scriptList = shopScriptList.Where(data => data.id == levelData.scriptDataId).ToList(); SetHistory(levelData, scriptList, levelData.shopLevel > globalGameData.ViewedShopLevel); if (index == 6) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index 3145a593..6f6b73b7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -29,12 +29,13 @@ public class ShopLevelUp : MonoBehaviour { shopLevel = LocalCacheManager.Load(DataTag); var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); - var targetScriptList = scriptList.Where(data => data.id == shopLevel).ToList(); var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); var productData = productList.FirstOrDefault(data => data.shopLevel == shopLevel); + var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel); + var targetScriptList = scriptList.Where(data => data.id == shopLevelData?.scriptDataId).ToList(); shopLevelText.text = shopLevel.ToString(); - achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.Achievement ?? ""; + achievementText.text = shopLevelData?.Achievement ?? ""; recipeNameText.text = productData?.Name ?? ""; GameDataManager.GameData.ViewedShopLevel = shopLevel; diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 756f6b08..8fb1466c 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -435,7 +435,7 @@ public sealed class ShopLevelData public int shopLevel; public int heart; public int customer; - public string achievement; + public int scriptDataId; public string Achievement => LocalizationManager.GetTranslation($"Item/ShopLevelText{id:0000}"); }