From fcb85f2f042a02dceacc35c0b8f8f2979d776b1e Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 13 Oct 2021 12:38:28 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=A4=E3=83=91=E3=83=B3?= =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E3=82=B2?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=AB=E8=AA=AD=E8=BE=BC=E3=82=80=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resources/Data/DownloadDate.txt | 2 +- .../MyGame/Resources/Data/MaterialData.txt | 2 +- .../Assets/MyGame/Resources/Data/PanData.txt | 2 +- .../Cooking/Scripts/PopcornGameManager.cs | 7 +++--- .../Scenes/Cooking/Scripts/ThermalControl.cs | 22 +++++++++++++++++++ popcorn/Assets/MyGame/Scripts/Const.cs | 2 -- .../Assets/MyGame/Scripts/SpreadsheetData.cs | 8 +++++++ 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 41dac223..129d0ca3 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -yWu/0KPlF9hB+Gay3WkE524M5fNj6jVpBq1gD0tsZK21RGIPwoazt4Hd5KKtZiSi \ No newline at end of file +7cYPJH4wJiwKvIqdedyVll/pnW5xgx1ee3xZoq2Jb1KXCqgU1nnH4IcUL56D/IXA \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/MaterialData.txt b/popcorn/Assets/MyGame/Resources/Data/MaterialData.txt index 3029e7d5..dffe8e1b 100644 --- a/popcorn/Assets/MyGame/Resources/Data/MaterialData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/MaterialData.txt @@ -1 +1 @@ -Ac7kiQiXA5RnXWMBSrSn7XGw6MzEXh7V5gBTEPcQCWgIq0J17qLhI6QhusXkqiB2DZTuPDijVK5prJj8IVU7dxBZx50ArbP1d8ug0YPYrBjkva+MB93WFEHzDWf4vpRx3o91/MMWwEq7j1S6AewXfemiE3q3+Junt74Aar4l0OAiMwdauDkXx5JCUcaD6wqLNmU7SJd2M8OMsUk4kCN1/7fw4Q08HJp//tx8oPowLQckQwg5m7WeGaAlOV112ru9ZBFz9B7XPq/jgDfdTs/bB94KpcDXq6oOenJvnE0XYr3CJ9SePX4ERNBDL3sZtoSRHOveOZlq0yToqLXkkoVt4CDd8brtDsH5KZYa0kmCmR+7qDVimoqcrLErfe8gHyt+sT/6NfGsff5Dmtt1YiAwYW/Fq6p84V6eWZyfB4h9OlBUYosVxv8D9D9JIOBFIibGO7iS0Op1vy8DG86fZ4FhFYnhdc9Zc/9zmkNnlntGjsEI5coWV1WJGnQTWkkQSbNw+mRzBLEXpGopWsqIq7wDTfyUYjtOCxCjfwtzEZ91Hfi0FJEQeXMC3ItuGadovXMc6IFOEH/nUYsMgxoyCyZzom9lQziTGpG0TiWs0XHHSgIeq0xTQGQvjwnQgJS/ORemE6+drU9zFbVdu0GLB1/q+AZsX+EfGiCy+f+xvgap+7zQVAkzvHey+sUm71j2RCWwo1vlTxSbfhrOrScy1AZqGNIjjT5qMFdGWOt0hHbI6cEouCcSdTbWPOMbSKcoXsverWVnQYt3mzZQpn4OTRlFlQ9+JmksK/QjtSKpuFgr+6mNab2DP1Ylme+N0Kuty1QlOuPiVEFuiQspoceJXfjIixdIMcI0EqTLlaBCBGw6aW6qXhPFA3xIPbSPrk2v3UvStUP8ltmwPh+d04TIuKPrcgXTCcq+4MA2LS03HMDV/Z0HPZAzio5bZMr1o2VAXkEGzhzOrsZdYkeqbhq64Qfgs+l2gc5sAB14Kv47bjaH8phGdPWN4aFfA4NAxjAji2MOWa5Sk3mJUX55xjKdyTlEMg== \ No newline at end of file +CpupIwTLxx5hPFLqflr2h3yV4tZxRP27ca+9R+hhT/s7LXUtfBj61Cy17YmCDavI+Ba+GribeezamiM29zmRE1KodCiXKmLKCpncP4k7ZBQD/uow0dgm+bd//jHqnF7OESN1pTX/QIC9Ay4GsBxt2xLnoC94rKFw6GKvZ38BNobPpNlYH9JlYkZNMeN0RBGzhtHSHkh6Vo3VdCX6CgG9qP7Usw7ZZe+hOZAEbUGHcKAqNZfhDDzOJploP8e20siIOqV+9JrV4wdXTzoCpIhetiWDLebHudi8zDsfYmcw+EtbmIEd5I9iews/I4vrJupF17J2IR9hl2dUTMe6qpp3DxnWpYqjiKWw2aPJ3M5BTB5vFyHElicC6tUd1Di4O8zVIzcjVoJhhzT1yQ7R2lgCh5lcHLaRVvtWJ8/+9ra24A2enqns26wxuMChmWptAirOsYaU0v/tWnw27ZPf7AZfKVdS2HAmNZ0BXU7GRFAy3/LUq1Fk1XOerz5Ik6swEy2BQB6UpjJVuT9VMz4S6j4m7GnQLMeIdzMkqSYFdlQuNs1NA6N1GAG1FZ0FEN8PRigDhY2etN5EyPoVCIs2oFgsthA3nsLUPkGdmuRqHo9Ez1NaibEdDp5ZmnhcjDjwl0wOR00pgQQoMyRJnQg/pZy7LnnINMZIXa9eQs3Ol381JuWJfNvbDnvfHYWfwsePzPpirru5VQ9aX6t2RssSGN1iWxaS0xLfmyRAWS5W5B0nq495EJWKE8qeJ5Js8/HCNb3px9r7o69TMZ/ZHDHItgqMauTr1q9FPGANCk4VL7xuQJR7cFmlHjPDXpdMIaVvtlIL4lzPZTM+ISaUpaLncJ/JNBafekrSWLqRbH8Z3y0Fn6h7XhX66OVCSVT6/wk8P7IEeLcD8ZGQJpLq7eU1qNpu7p+mky8katsvzOB1Gw3YRuNGT2JmDbUcDPHdGsHogwjpnua+OkEDHcSARDUUhJjKRdmaKLqiNv9M8eSHyREYyrq+8SuR0flFqR9tl10nIg8uKa6IyxyGOj8YKuL2uO5zhQ== \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/PanData.txt b/popcorn/Assets/MyGame/Resources/Data/PanData.txt index be7765aa..4ec017d1 100644 --- a/popcorn/Assets/MyGame/Resources/Data/PanData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/PanData.txt @@ -1 +1 @@ -fYjekkrgz8Jk8w/qz/d0gzo6P+7MDEi7Hxota32T+2ZTHsInU7a9Ud8Pvz4YC7a/xlax0j54E6OgioG6Lx5xbHg/ylF2q1t13ek0Xf/Fxh9hxSkB4wGNyq72kC+LUIpH+fGb+N/aOPXOiSYvHvF3w8bEm0XLCrY6RbaOXIMUuyc/ABG/9XmYzFScTiCcHuEOmzHKEHva7FJvbnIjOGyOe4A1F0byOBHgRlIEEixFLaLqQMBbkF8KlwPTOR6rr8NUQTrgTbIkZs06RK8fxmXrCLSqvgT1BUELVlqm9gSwpCUyMZXMTcXqFi83z9zynPtXvSPRPEVLrTuhnxyBs2jHWLh+g972fazwTt13QFSdUCIsXiKpgSzzh/O3GWshzioMT7XQd1ts2z4adRmYIttpR4lkGTtMLhdELb3Yeh1tKFtHPwgXLWxiCgtalZ+AIqv5HaFpw4qbVYFx/DBL4CIcXUEMawb9zYh3kQ/HDlf0hPLmDLMbC5lsX8sevigX0f8z/7W3V5E+RGAOwa16iOLAWgB3ubxbd7mYgdefdKbHCfQE/Cv8s2pVBQ2efRjNscgm0hftrHPD/2vTjpPoa79KBoKVw0ptZO5U1PUjtLIcyDmC1GAlwQCrwno97RQnX9CrpKF+cD5ZUPo+AYfOr8zqOav9tvMwOh4hxBI+KnFdgtWTG5oBuvxiOgauBG0hV5+VLw8tslGJzIcTzWj0RH7BYCL+5YEn4HN+gTUjzDS6ZmAv88Fe8+fV5qLHNxl2Jg/22ng2+chknWSzjjU53KqKQA6cNdztp7+da1/RbrGE2vZQ/GwFerikth9yB4P6sfj557MaJxWxkKgtzUBbcKdjbogjwWxy4YXlxitwOTJXphUTwUkXzL/Wb7XTP/Cmrp9QA8jMv9P29bgTS3MuQXQ00xIyOvzt6NW4Any/pn2PQvvWoyutzC1608jamCjvGo7hdZTGo3wINaVl4brQM6yi5Xo+RYlqKe+oRXpoRtvKCV7g+os/gPFPWyHc2Ddf8kIILBbFTmwvXeF+ceyBBOWUo0QI5VIfpyomP861GcQkz0ATvzERmUdqb1SSqvGtAFADblMP/vaw0A1AfRYTzedhp+S0iLEPvBcMj9KWV5//6yD1nTMoInuLXKiDLlApjr8FxNKkxXPPvxZnTwTEhUNK0F+iT9rXkOVkvaZHWkTlYyApZSym4cOsGNgRH4RqMFet8bmzuE14WEucWcHTk6n4hT6PS2S3V0Px7RespG6sRPqcav3eaKoyFkIqVCa+JFapd5dgG54pm4E6Q2ma0ZTrP77QvNNbIwIimn7fCzcv90Eawu8/nG3NhF0T+OG7P1+8zydep9L0069f5qtR6NkMh/MDMKFqoqi3xD/C0P6EeQDwd4RdLxG7QwZVPqV1pY/I88W8KQfyPCT27yiwSuAzpALB7y0kqeVucVvfgI81YgoG+VpZWe1sdE2+hcL0GBJr5Y+7orAw8aL+/Dbn2asCONJ1G5wRf5w7hwSt5xDoo0P7qboyW32Dov9u8awq9tLb4Y2ZrBZ0/Ela3Bq9reK61ZJba5Kjttk7q6AXkmgHw73iLcn8MPUUnQ53IcCI0MZ+g37V/QtYH2dZwI67cRnzYHeeDpAPh+juvSa6ohpxnN4hS4JFSOTtmt/dQV4p54MxA3w0HWKW/n0Eov+WrSDj+W74lgspO4wcfVWXCGbjFrw9+bz/kzZWaZ+EpupGl581gYjzlg7+d5ANnSXuybCep33tc3Xq66izoqfaXi0XGMo4t6OeomT6JEkpyidFe84SzDB2E8ImnVBHMVu1eiuQSHbfo2Ar82Nq6eNrwN232p0iQNzI0lVoWtRxAapeSKDJ \ No newline at end of file +frMAIckXzMXuft/nLYpRRIE96DaoqRqLG0jCrwFum7CFdDQ0TIqswueMGjN30zr3N0VdrYRh4SaHnqaF17SdfN76e0lf0VGHcnvO7nvrf/zWV4edSDP1Qe6gkUg8EZr2LjpC6JRSPbrQMBNcFujwXC4seq82gw8aGZDTP5Mzsz2xXO51aIWguYsFopzBiNH76dRsCmU0vsiOXsUoVUZP7S11WEmSI0upxbmbCaCOQsMZOyf0gRDqeVl70i2dS1FvzDhQkHVJrE1ipWF2Xov1vePT1pUt808g1ci2UtACt5i96F7YYvPhiytgkaty+d3cjYHLeA5xEI2cBf4XcBv92Gm5rM85xLZAT6EB/f3BRiRU4CV6/KqqG61/M5aqLRPq328m3RfunSSskJxPM3tjuW4wgpztDQvvFqZEmKlD16vmI5tDce5pyc5Jb/S5fghqZAZcBldh7heKi2viEiTMVOKhFl1I4q7DmATyWl1QPfwXdgS+5ju5KI1YMUHg8A1MgoKFJm3XLLpi47nO0fL7Z0UD+unsJDBIPoPD2lKXGyaJz4qk9qo4PX9125sTaiYSPW0f1/b168eDVhy0dtdG7TOB3t776DJPdJQRST1HfqTqdMEbsutzNDIiUVG0+MnrRMM0ETPlOnVXiLSk5kwv6Q9j4d9SttItVdzLp+CMlhrBRvn/xY0AIwELA2P0PBJb0pE+SkOvXjxp9H8qLhmj+iwRA5pKZ66Y9JmE53fdbKduwJ6tCgBEIfrKLBwkXFvZUVE7H5/WIul45a5B4qmXQAOQuJFnl0AL8IWUH2BVZaWddHMer5GLUrKfyUUoitVkum62tLYdpmHPPs51744WddtM+7If6nWEoVA8HZ9yH8sVBL2/l9fRfuXx96t5QHVcGLVuujTlxvwoZ9fKEIugGrqdVYDIjLSfLLrPq4C9MU3gPnt6RN5S/l++hc5Vrwylu15icDlZLspUPkI5LVW9OOU49BbmFnrvm6n2yo8D7LzKP1Fm+6V8L/ESvAGeLUcK5FZNLxBTdSBhmmfpe1hWcRwcvTsTd53Y1bo+HSAi3xwldxNJFqHJTNOr48hoOOH7bKvOWRyvuX2efdQVlIuG8vJgn1RXsNB9/hKI/0aKDeDdp5p0+6EE4XggOxIHfkpgtu0MEACRTD0sWhAYR15cNaOEXoxwam1ChmbyN1ujSJ3GK8Y8sT15ex3ZxRLRiGNCIX8nzCepD2Ty3DFmnMvsy2tNVEw2W+YUB1GQ2bDturvAGHsqb2v8vhYCqRqdZJKypMPAdA59rFhHPDUuxrFfek7B9mYpLLzZ048TvzpJpKoi0aufITKF39O6MUrIZSwC7i1XaFQVRxkisJkDfDGdlWLMMu9iRc3O657ocaMhFjNAge08OoKwcPrXI6JffMwmn9LvmYByqZUsA53huVzfchO00jiYobNLyS5yCqYiq8LnTYuHCwSTwTF+geDUhaTAoR2zUqbOUxqul7OfddB8CiF4AAp1FJKukXHD8sAAUFoQCd5LUgdhLR9P1esshl59NSKdRVTWpqS7C/dBOMZxLxSTmkm0kj2TobHCLpWRAx1+ZJDdGP7xBmolK43yM+2Ql+YkiJvdEKVwfnbzz2Vy0FkoVHgvfiQoWedn7IfAh4/baUXx8kY2DBbHVxO4mU5NEE+ATO88qbnZCwfhh5BfFMhWVOswalBlRAJia6pLofH2oKFTw/iNh7EcYurx6nNXq4xno69CL7uqkYswtgeR5K5Kk+B1NGGRwDFudD3jzlLtvxpXwrWXmzwBMvMtEJ5Yct3yWgSCISQrEGMW0DPbag== \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs index 9dbc0e80..210912e2 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs @@ -45,7 +45,7 @@ public class PopcornGameManager : MonoBehaviour gameView.ChangeCharacterState(x); }).AddTo(this); - state.Subscribe(x => + state.SkipLatestValueOnSubscribe().Subscribe(x => { cornManager.GameState.Value = x; gameView.ChangeUI(x); @@ -103,12 +103,12 @@ public class PopcornGameManager : MonoBehaviour private void ResetGame() { - var panList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.PanDataSheet); var panData = LocalCacheManager.Load(PanDataTag); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); var rarityData = rarityList.First(data => data.Rarity == panData.Rarity); // フライパン設定 gameView.SetPan(panData.GetPrefab()); + thermalControl.SetPanData(panData); // setPanData(); cornManager.SetCornsActive(true); compositeDisposable.Clear(); @@ -136,7 +136,6 @@ public class PopcornGameManager : MonoBehaviour { state.Value = GameState.Playing; }).AddTo(compositeDisposable); - - state.Value = GameState.Guide; + state.SetValueAndForceNotify(GameState.Guide); } } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index d713df38..33e2d2d3 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -177,4 +177,26 @@ public class ThermalControl : MonoBehaviour isMove = false; panController.enabled = false; } + + public void SetPanData(PanData panData) + { + panFactor = panData.panFactor; + deadZone = panData.deadZone; + baseIncreaseSpeed = panData.baseIncreaseSpeed; + coldIncreaseSpeed = panData.coldIncreaseSpeed; + hotIncreaseSpeed = panData.hotIncreaseSpeed; + maxDecreaseSpeed = panData.maxDecreaseSpeed; + yellowSize = panData.yellowSize; + randomRange = panData.randomRange; +#if UNITY_EDITOR || DEVELOPMENT_BUILD + factorSlider.value = panFactor; + deadZoneSlider.value = deadZone; + baseSpeedSlider.value = baseIncreaseSpeed; + coldSpeedSlider.value = coldIncreaseSpeed; + hotSpeedSlider.value = hotIncreaseSpeed; + decreaseSpeedSlider.value = maxDecreaseSpeed; + yellowSizeSlider.value = yellowSize; + randomRangeSlider.value = randomRange; +#endif + } } diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index 857bd8b3..df0c824b 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -30,7 +30,6 @@ public static class Const { public static readonly string AvatarDataSheet = "AvatarData"; public static readonly string ShopDataSheet = "ShopData"; public static readonly string ShopLevelDataSheet = "ShopLevelData"; - public static readonly string MaterialDataSheet = "MaterialData"; public static readonly string ProductDataSheet = "ProductData"; public static readonly string PanDataSheet = "PanData"; public static readonly string RarityDataSheet = "RarityData"; @@ -62,7 +61,6 @@ public static class Const { // new SheetData(Const.AvatarDataSheet), new SheetData(Const.ShopDataSheet), new SheetData(Const.ShopLevelDataSheet), - new SheetData(Const.MaterialDataSheet), new SheetData(Const.ProductDataSheet), new SheetData(Const.PanDataSheet), new SheetData(Const.RarityDataSheet), diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index ac528859..b931290f 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -95,6 +95,14 @@ public sealed class PanData public string text; public int rarity; public string prefabName; + public float panFactor; + public float deadZone; + public float baseIncreaseSpeed; + public float coldIncreaseSpeed; + public float hotIncreaseSpeed; + public float maxDecreaseSpeed; + public float yellowSize; + public float randomRange; public ProductRarity Rarity => (ProductRarity)rarity; public Transform GetPrefab() {