diff --git a/Assets/Resources/Config/GameConfig.asset b/Assets/Resources/Config/GameConfig.asset index e7f10b9a..64b675f7 100644 --- a/Assets/Resources/Config/GameConfig.asset +++ b/Assets/Resources/Config/GameConfig.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e62078a75cb7c480b87077644e239944, type: 3} m_Name: GameConfig m_EditorClassIdentifier: - LevelSort: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d000000 + LevelSort: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e00000020000000 Levels: - LevelName: "1.\u5FEB\u53BB\u7761\u89C9" LevelColorCode: '#039AC0' @@ -689,3 +689,113 @@ MonoBehaviour: - EndingName: "\u8FD8\u6709\u4E00\u4EBA" IsGoodEnding: 0 EndingCode: 122;212;221 + - LevelName: "31.\u5236\u4F5C\u70B8\u85AF\u7247" + LevelColorCode: '#FDD400' + SlotCount: 3 + Endings: + - EndingName: "\u7F8E\u5473\u70B8\u85AF\u7247" + IsGoodEnding: 1 + EndingCode: 123;213 + - EndingName: "\u70B8\u571F\u8C46" + IsGoodEnding: 0 + EndingCode: 113 + - EndingName: "\u9ED1\u571F\u8C46" + IsGoodEnding: 0 + EndingCode: 133 + - EndingName: "\u751F\u85AF\u6761" + IsGoodEnding: 0 + EndingCode: 122;212;221 + - EndingName: "\u751F\u85AF\u7247" + IsGoodEnding: 0 + EndingCode: 112;121;211 + - EndingName: "\u70B8\u5F97\u7A00\u70C2" + IsGoodEnding: 0 + EndingCode: 333 + - EndingName: "\u5B8C\u6574\u7684\u751F\u571F\u8C46" + IsGoodEnding: 0 + EndingCode: 111 + - EndingName: "\u751F\u571F\u8C46\u6CE5" + IsGoodEnding: 0 + EndingCode: 222 + - EndingName: "\u597D\u810F\u554A\uFF01" + IsGoodEnding: 0 + EndingCode: 322;232;223;233;323;332 + - LevelName: "32.\u7206\u7C73\u82B1\u5927\u4F5C\u6218" + LevelColorCode: '#D699D5' + SlotCount: 3 + Endings: + - EndingName: "\u5B8C\u7F8E\u7206\u7C73\u82B1" + IsGoodEnding: 1 + EndingCode: 123 + - EndingName: "\u751F\u7389\u7C73\u7C92" + IsGoodEnding: 0 + EndingCode: 113;313 + - EndingName: "\u72FC\u6765\u4E86" + IsGoodEnding: 0 + EndingCode: 233;323;332;333 + - EndingName: "\u7A7A\u6C14\u5927\u70AE" + IsGoodEnding: 0 + EndingCode: 223 + - EndingName: "\u597D\u70ED\u554A" + IsGoodEnding: 0 + EndingCode: 222 + - EndingName: "\u8FD8\u8981\u591A\u4E45" + IsGoodEnding: 0 + EndingCode: 122 + - EndingName: "\u6EE1\u51FA\u6765\u4E86" + IsGoodEnding: 0 + EndingCode: 111 + - LevelName: "33.\u6325\u62CD\u5927\u5E08" + LevelColorCode: '#FA2881' + SlotCount: 2 + Endings: + - EndingName: "\u901F\u6218\u901F\u51B3" + IsGoodEnding: 1 + EndingCode: 13 + - EndingName: "\u771F\u70E6\u4EBA" + IsGoodEnding: 0 + EndingCode: 12 + - EndingName: "\u6B7B\u7F20\u70C2\u6253" + IsGoodEnding: 0 + EndingCode: 21 + - EndingName: "\u98DE\u5230\u8138\u4E0A\u4E86\uFF01" + IsGoodEnding: 0 + EndingCode: 11 + - EndingName: "\u8D76\u90FD\u8D76\u4E0D\u8D70" + IsGoodEnding: 0 + EndingCode: 22 + - LevelName: "34.\u538B\u54E8\u7403" + LevelColorCode: '#D699D5' + SlotCount: 2 + Endings: + - EndingName: "\u7EDD\u6740\u65F6\u523B" + IsGoodEnding: 1 + EndingCode: 11 + - EndingName: "\u9677\u5165\u82E6\u6218" + IsGoodEnding: 0 + EndingCode: 33 + - EndingName: "\u9057\u61BE\u843D\u8D25" + IsGoodEnding: 0 + EndingCode: 12;21 + - EndingName: "\u5012\u9709\u7684\u88C1\u5224" + IsGoodEnding: 0 + EndingCode: 22 + - LevelName: "35.\u671F\u4E2D\u6D4B\u9A8C" + LevelColorCode: '#D699D5' + SlotCount: 2 + Endings: + - EndingName: "\u6EE1\u5206\u7B54\u5377\uFF01" + IsGoodEnding: 1 + EndingCode: 12 + - EndingName: "\u7B97\u672F\u597D\u96BE~" + IsGoodEnding: 0 + EndingCode: 21 + - EndingName: "250\uFF01\uFF1F" + IsGoodEnding: 0 + EndingCode: 22 + - EndingName: "\u5FC3\u6001\u5D29\u4E86" + IsGoodEnding: 0 + EndingCode: 33 + - EndingName: "\u5377\u5B50\u7834\u4E86" + IsGoodEnding: 0 + EndingCode: 11 diff --git a/Assets/Resources/Film/33.prefab b/Assets/Resources/Film/33.prefab index 2ab77ff7..869e979c 100644 --- a/Assets/Resources/Film/33.prefab +++ b/Assets/Resources/Film/33.prefab @@ -166,6 +166,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9172401482021604784, guid: 13426506d1bb6b14f86d96b8df2e8488, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9172401482021604784, guid: 13426506d1bb6b14f86d96b8df2e8488, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9172401482021604784, guid: 13426506d1bb6b14f86d96b8df2e8488, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13426506d1bb6b14f86d96b8df2e8488, type: 3} --- !u!224 &614434093451557469 stripped diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs index 940d579e..0623a438 100644 --- a/Assets/Scripts/UI/PanelGame.cs +++ b/Assets/Scripts/UI/PanelGame.cs @@ -72,7 +72,7 @@ public class PanelGame : BasePanel { LevelData tLvData = GameConfig.Instance.GetLevelData(PlayerData.Instance.CurrentLevelID); - mTxtTitle.text = tLvData.LevelName; + mTxtTitle.text = PlayerData.Instance.CurrentLevel + tLvData.LevelName.Substring(tLvData.LevelName.IndexOf('.')); mBtnEndings.Init(PlayerData.Instance.CurrentLevelID, PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID), tLvData.Endings.Count); mTotalSlot = tLvData.SlotCount;