From 7faaedae57c34416ef05573f43743f8688c13f34 Mon Sep 17 00:00:00 2001 From: yangjing Date: Fri, 18 Mar 2022 15:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BA=8FID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Config/GameConfig.asset | 39 ++++++++++++++++++++++-- Assets/Scripts/Config/GameConfig.cs | 1 + Assets/Scripts/UI/PanelGame.cs | 23 ++++++++++++-- 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/Assets/Resources/Config/GameConfig.asset b/Assets/Resources/Config/GameConfig.asset index 64b675f7..51748480 100644 --- a/Assets/Resources/Config/GameConfig.asset +++ b/Assets/Resources/Config/GameConfig.asset @@ -17,6 +17,7 @@ MonoBehaviour: - LevelName: "1.\u5FEB\u53BB\u7761\u89C9" LevelColorCode: '#039AC0' SlotCount: 2 + SoundOrder: Endings: - EndingName: "\u665A\u5B89" IsGoodEnding: 1 @@ -36,6 +37,7 @@ MonoBehaviour: - LevelName: "2.\u5199\u4E00\u4E0B\u540D\u5B57" LevelColorCode: '#DA97F8' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u8FD9\u662F\u8F6C\u6821\u751F\u201C\u82B1\u5B50\u201D\u9171" IsGoodEnding: 1 @@ -58,6 +60,7 @@ MonoBehaviour: - LevelName: "3.\u628A\u6BDB\u62D4\u6389" LevelColorCode: '#FF6400' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6E05\u723D" IsGoodEnding: 1 @@ -83,6 +86,7 @@ MonoBehaviour: - LevelName: "4.\u597D\u60F3\u5403\u62C9\u9762" LevelColorCode: '#FDD400' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u62C9\u9762\u7C89\uFF08\u9762\u6D3E\uFF09" IsGoodEnding: 1 @@ -105,6 +109,7 @@ MonoBehaviour: - LevelName: "5.\u8BF7\u526A\u6210\u8FD9\u4E2A\u6837\u5B50" LevelColorCode: '#FF4BC1' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u5168\u65B0\u7684\u81EA\u6211" IsGoodEnding: 1 @@ -133,6 +138,7 @@ MonoBehaviour: - LevelName: "6.\u4E22\u8FDB\u5783\u573E\u6876\uFF01" LevelColorCode: '#039AC0' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u5B89\u5168\u964D\u843D\u518D\u76EE\u7684\u5730" IsGoodEnding: 1 @@ -158,6 +164,7 @@ MonoBehaviour: - LevelName: "7.\u6253\u6B7B\u5C0F\u5F3A\uFF01" LevelColorCode: '#FA2981' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u4E13\u4E1A\u9A71\u866B" IsGoodEnding: 1 @@ -180,6 +187,7 @@ MonoBehaviour: - LevelName: "8.\u6843\u592A\u90CE1" LevelColorCode: '#FFADF6' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6545\u4E8B\u7684\u5F00\u59CB" IsGoodEnding: 1 @@ -208,6 +216,7 @@ MonoBehaviour: - LevelName: "9.\u7EC4\u88C5\u8D77\u6765" LevelColorCode: '#FA2981' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u673A\u5668\u4EBA\u5B8C\u6210" IsGoodEnding: 1 @@ -227,6 +236,7 @@ MonoBehaviour: - LevelName: "10.\u80FD\u626B\u4E0A\u7801\u7684\u5427" LevelColorCode: '#9EF700' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u8D2D\u4E70\uFF01" IsGoodEnding: 1 @@ -246,6 +256,7 @@ MonoBehaviour: - LevelName: "11.\u6253\u6B7B\u868A\u5B50" LevelColorCode: '#039AC0' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u7EC8\u4E8E\u7761\u4E2A\u597D\u89C9" IsGoodEnding: 1 @@ -271,6 +282,7 @@ MonoBehaviour: - LevelName: "12.\u662F\u4EC0\u4E48\u8868" LevelColorCode: '#FFB180' SlotCount: 2 + SoundOrder: Endings: - EndingName: "\u9E3D\u5B50\u65F6\u949F" IsGoodEnding: 1 @@ -293,6 +305,7 @@ MonoBehaviour: - LevelName: "13.\u60F3\u6478\u732B\u732B" LevelColorCode: '#DA97F8' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6BDB\u8338\u8338\u8F6F\u7EF5\u7EF5" IsGoodEnding: 1 @@ -312,6 +325,7 @@ MonoBehaviour: - LevelName: "14.\u6211\u662F\u62F3\u51FB\u624B" LevelColorCode: '#039AC0' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u80DC\u5229" IsGoodEnding: 1 @@ -343,6 +357,7 @@ MonoBehaviour: - LevelName: "15.\u5237\u7259" LevelColorCode: '#FFADF6' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6E05\u7406\u5E72\u51C0\u4E86" IsGoodEnding: 1 @@ -365,6 +380,7 @@ MonoBehaviour: - LevelName: "16.\u5236\u4F5C\u5496\u55B1\u996D\uFF01" LevelColorCode: '#FDD400' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u7F8E\u5473\u6599\u7406" IsGoodEnding: 1 @@ -390,6 +406,7 @@ MonoBehaviour: - LevelName: "17.\u52C7\u8005\u4E4B\u6218" LevelColorCode: '#DA97F8' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u4F4E\u7EA7\u6218\u6597" IsGoodEnding: 1 @@ -409,6 +426,7 @@ MonoBehaviour: - LevelName: "18.\u5E26\u8D70\u4ED6\uFF01" LevelColorCode: '#7E4DE4' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6C38\u522B\u4E86\u5927\u53D4" IsGoodEnding: 1 @@ -431,6 +449,7 @@ MonoBehaviour: - LevelName: "19.\u7406\u60F3\u7684\u6C49\u5821\u5305" LevelColorCode: '#FF6400' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u5B8C\u5168\u4E00\u81F4" IsGoodEnding: 1 @@ -456,6 +475,7 @@ MonoBehaviour: - LevelName: "20.\u6843\u592A\u90CE2" LevelColorCode: '#039AC0' SlotCount: 1 + SoundOrder: Endings: - EndingName: "\u6211\u7684\u4F19\u4F34\u662F\u516C\u9E21\uFF01" IsGoodEnding: 1 @@ -469,6 +489,7 @@ MonoBehaviour: - LevelName: "21.\u60F3\u5403\u866B\u5B50" LevelColorCode: '#9EF700' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u592A\u597D\u5403\u4E86" IsGoodEnding: 1 @@ -491,6 +512,7 @@ MonoBehaviour: - LevelName: "22.\u5206\u4E00\u534A" LevelColorCode: '#FA2981' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u76F8\u5904\u878D\u6D3D" IsGoodEnding: 1 @@ -519,6 +541,7 @@ MonoBehaviour: - LevelName: "23.\u8BA9\u6211\u8FDB\u53BB\u5427" LevelColorCode: '#64FCCF' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u5343\u94A7\u4E00\u53D1" IsGoodEnding: 1 @@ -550,6 +573,7 @@ MonoBehaviour: - LevelName: "24.\u5C0F\u5B69\u5B50\u548C\u8D29\u5356\u673A" LevelColorCode: '#FFADF6' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u559C\u6B22\u7684\u996E\u6599" IsGoodEnding: 1 @@ -569,6 +593,7 @@ MonoBehaviour: - LevelName: "25.\u8EB2\u907F\u5371\u9669\uFF01" LevelColorCode: '#9EF700' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6050\u5413\u6210\u529F\uFF01" IsGoodEnding: 1 @@ -588,6 +613,7 @@ MonoBehaviour: - LevelName: "26.\u8BF7\u526A\u6210\u8FD9\u4E2A\u6837\u5B502" LevelColorCode: '#51E3F4' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u5E05\u6C14\u7537\u4EBA" IsGoodEnding: 1 @@ -613,6 +639,7 @@ MonoBehaviour: - LevelName: "27.\u902E\u6355\u5C0F\u5077\uFF01" LevelColorCode: '#FFADF6' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u987A\u5229\u902E\u6355" IsGoodEnding: 1 @@ -629,6 +656,7 @@ MonoBehaviour: - LevelName: "28.\u52C7\u8005\u4E4B\u62182" LevelColorCode: '#CD72F6' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u56E2\u961F\u80DC\u5229\uFF01" IsGoodEnding: 1 @@ -648,6 +676,7 @@ MonoBehaviour: - LevelName: "29.\u6293\u4F4F\u9E21\u86CB\u5427\uFF01" LevelColorCode: '#FDD400' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u6F02\u4EAE\u7684\u63A5\u86CB" IsGoodEnding: 1 @@ -667,6 +696,7 @@ MonoBehaviour: - LevelName: "30.\u780D\u5411\u574F\u4EBA" LevelColorCode: '#D699D5' SlotCount: 3 + SoundOrder: Endings: - EndingName: "\u82F1\u96C4" IsGoodEnding: 1 @@ -692,6 +722,7 @@ MonoBehaviour: - LevelName: "31.\u5236\u4F5C\u70B8\u85AF\u7247" LevelColorCode: '#FDD400' SlotCount: 3 + SoundOrder: 213 Endings: - EndingName: "\u7F8E\u5473\u70B8\u85AF\u7247" IsGoodEnding: 1 @@ -699,9 +730,9 @@ MonoBehaviour: - EndingName: "\u70B8\u571F\u8C46" IsGoodEnding: 0 EndingCode: 113 - - EndingName: "\u9ED1\u571F\u8C46" + - EndingName: "\u7CCA\u571F\u8C46" IsGoodEnding: 0 - EndingCode: 133 + EndingCode: 133;331;313 - EndingName: "\u751F\u85AF\u6761" IsGoodEnding: 0 EndingCode: 122;212;221 @@ -723,6 +754,7 @@ MonoBehaviour: - LevelName: "32.\u7206\u7C73\u82B1\u5927\u4F5C\u6218" LevelColorCode: '#D699D5' SlotCount: 3 + SoundOrder: 312 Endings: - EndingName: "\u5B8C\u7F8E\u7206\u7C73\u82B1" IsGoodEnding: 1 @@ -748,6 +780,7 @@ MonoBehaviour: - LevelName: "33.\u6325\u62CD\u5927\u5E08" LevelColorCode: '#FA2881' SlotCount: 2 + SoundOrder: Endings: - EndingName: "\u901F\u6218\u901F\u51B3" IsGoodEnding: 1 @@ -767,6 +800,7 @@ MonoBehaviour: - LevelName: "34.\u538B\u54E8\u7403" LevelColorCode: '#D699D5' SlotCount: 2 + SoundOrder: 231 Endings: - EndingName: "\u7EDD\u6740\u65F6\u523B" IsGoodEnding: 1 @@ -783,6 +817,7 @@ MonoBehaviour: - LevelName: "35.\u671F\u4E2D\u6D4B\u9A8C" LevelColorCode: '#D699D5' SlotCount: 2 + SoundOrder: 132 Endings: - EndingName: "\u6EE1\u5206\u7B54\u5377\uFF01" IsGoodEnding: 1 diff --git a/Assets/Scripts/Config/GameConfig.cs b/Assets/Scripts/Config/GameConfig.cs index 76c899b2..0bad8714 100644 --- a/Assets/Scripts/Config/GameConfig.cs +++ b/Assets/Scripts/Config/GameConfig.cs @@ -21,6 +21,7 @@ public class LevelData public string LevelName;//only for editor display public string LevelColorCode; public int SlotCount; + public string SoundOrder; public List Endings; public int GetMatchingEndingID(string pEndingStr) diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs index 0623a438..cbb7e8c6 100644 --- a/Assets/Scripts/UI/PanelGame.cs +++ b/Assets/Scripts/UI/PanelGame.cs @@ -96,10 +96,29 @@ public class PanelGame : BasePanel mGobArrows[i].SetActive(i < mTotalSlot - 1); } + List tSoundOrderList = new List(); + if (!string.IsNullOrEmpty(tLvData.SoundOrder)) + { + for (int i = 0; i < tLvData.SoundOrder.Length; i++) + { + tSoundOrderList.Add(int.Parse(tLvData.SoundOrder[i].ToString())); + } + } + + int tIndex = 0; for (int i = 0; i < mBtnSounds.Length; i++) { - mBtnSounds[i].Init(i); - mBtnSounds[i].SetSoundPic(ResourceManager.Instance.LoadRes(Const.Path.GetSoundPic(PlayerData.Instance.CurrentLevelID, i))); + if (tSoundOrderList.Count == mBtnSounds.Length) + { + tIndex = tSoundOrderList[i] - 1; + } + else + { + tIndex = i; + } + + mBtnSounds[i].Init(tIndex); + mBtnSounds[i].SetSoundPic(ResourceManager.Instance.LoadRes(Const.Path.GetSoundPic(PlayerData.Instance.CurrentLevelID, tIndex))); mBtnSounds[i].DelClick = OnClickSound; }