完善关卡逻辑

2025-05-19 19:51:17 +08:00
parent d51c122d57
commit e9e60706a4
23 changed files with 792 additions and 113 deletions
--- a/src/models/DOStage.ts
+++ b/src/models/DOStage.ts
@@ -3,6 +3,7 @@
 import { StorageManager } from "./StorageManager"
 import { DOBlock } from "./DOBlock"
 import { DataBlock, DataUndo, DataStage } from "../types/global"
+import { LevelManager } from "./LevelManager"


 export class DOStage {
@@ -13,7 +14,7 @@ export class DOStage {
    private letterToNumber: Map<string, number>;
    private numberToLetter: Map<number, string>;

-    constructor(dataStage: DataStage, levelStr: string) {
+    constructor(dataStage: DataStage) {
        this.data = dataStage

        this.letterToNumber = new Map();
@@ -44,8 +45,9 @@ export class DOStage {
            blockMap.set(dataBlock.index, dataBlock)
        }

-        if (levelStr.length != 81) {
-            console.log("levelStr error", levelStr.length)
+        var levelStr = LevelManager.getInstance().getLevelStr(this.data.difficulty, this.data.index)
+        if (!levelStr || levelStr.length != 81) {
+            console.log("levelStr error", this.data.difficulty, this.data.index, levelStr)
        }
        var list = new Map();
        for (var i=0; i<levelStr.length; i++) {
@@ -79,12 +81,26 @@ export class DOStage {
            }
        }
    }
-
+    public getData(): DataStage {
+        return this.data
+    }

    //====================================持久化数据
-    public get_difficulty(): number {
+    public get_stageID(): string {
+        return this.data.id
+    }
+    public get_stageType(): number {
+        return this.data.type
+    }
+    public get_stageName(): string {
+        return this.data.name
+    }
+    public get_difficulty(): string {
        return this.data.difficulty
    }
+    public get_stageIndex(): number {
+        return this.data.index
+    }

    public get_mistake(): number {
        return this.data.mistake
@@ -99,7 +115,7 @@ export class DOStage {
    }
    public set_duration(duration: number): void {//关卡计时
        this.data.duration = duration
-        // StorageManager.getInstance().onChanged()
+        StorageManager.getInstance().onChanged()
    }

    public get_note_open(): boolean {
--- a/src/models/DOUser.ts
+++ b/src/models/DOUser.ts
@@ -0,0 +1,70 @@
+import { DataProgress, DataUser } from "../types/global";
+import { StorageManager } from "./StorageManager"
+
+
+export class DOUser {
+
+    private data: DataUser
+
+
+    constructor(dataUser: DataUser) {
+        this.data = dataUser
+    }
+    public getData(): DataUser {
+        return this.data
+    }
+
+    //====================================持久化数据
+    public get_isCompletedMain(): boolean {
+        return this.data.isCompletedMain
+    }
+    public set_isCompletedMain(isCompletedMain: boolean): void {
+        this.data.isCompletedMain = isCompletedMain
+        StorageManager.getInstance().saveUser()
+    }
+
+    public get_dones(): Array<string> {
+        return this.data.dones
+    }
+    public add_done(stageID: string): void {
+        if (this.data.dones.indexOf(stageID) < 0) {
+            this.data.dones.push(stageID)
+            StorageManager.getInstance().saveUser()
+        }
+    }
+
+    public get_progress(difficulty: string): number {
+        var find: DataProgress
+        for (var i=0; i<this.data.progresses.length; i++) {
+            var obj = this.data.progresses[i]
+            if (obj.difficulty == difficulty) {
+                find = obj
+                break
+            }
+        }
+        if (find) {
+            return find.index
+        }
+        return 0
+    }
+    public update_progress(difficulty: string, index: number): void {
+        var find: DataProgress
+        for (var i=0; i<this.data.progresses.length; i++) {
+            var obj = this.data.progresses[i]
+            if (obj.difficulty == difficulty) {
+                find = obj
+                break
+            }
+        }
+        if (find) {
+            find.index = index
+        }
+        else {
+            find = {difficulty: difficulty, index: index}
+            this.data.progresses.push(find)
+        }
+        StorageManager.getInstance().saveUser()
+    }
+
+    //====================================持久化数据
+}
--- a/src/models/DOUser.ts.meta
+++ b/src/models/DOUser.ts.meta
@@ -0,0 +1,3 @@
+{
+  "uuid": "fc4cb9cd-3bc4-47e8-bfd4-6adbaea331b8"
+}
--- a/src/models/LevelManager.ts
+++ b/src/models/LevelManager.ts
@@ -0,0 +1,151 @@
+import { config } from "../constants/config"
+
+
+
+const Easy = [
+    "aBCeIGFhdEDFcAHBGIhigBdfecAgHDiFBCaeBEAGHCIdffcIdEAHbgcABfGEdiHIFHaCDGEBDGEHbiaFC",
+    "abecfIgdhdICGhbAFEHGfeAdIcBCFAbigEHDGDhFeABICIEbHdCFGAFaGDBHcEIbCDIGehAFeHIaCFdbG",
+    "AbIGdeHFCHFDbCieaGgEcfaHbDIEiAdBFGcHFHGcEAIBddCBHIGFEaCdfiGBAHEbgeAHCDIfIaHefdCgB",
+    "ACEdBIGHFBHGFacDEIdiFheGAbCcEiBdFHaGhfBGIAecDGadcHeIfBIgCaFHbDEFdAegbcIHEBHICDfGa",
+    "acEIhbgFDFIDAgEBHCBGHfCdeaIDEaBFgicHcFGHAidebIHbDecaGFeBFCIAHdGGDCebHfIAHAiGdfCBE",
+    "aCfDbGHIEGHBIcEFdaedIAFhbCGDFahGiebCHbecaDIGFiGCbEFdAHBEHGIcAfDFiGedACHBCAdFHBgei",
+    "ACGBfIHDeHEBCdgFAIfdIHaegcBDgEAHCIBFIbhFEdaGCcAFGIbDEHgIDebHcfabHADcFEiGEfcigABHd",
+    "AcGFdihBEdHEbGCAifBFIEhaGDCEgADIBfcHhibGcfDEaFDChaEigbGBHCFdEAIIEdabHCFGcAfIEGbHD",
+    "ACGIFbEhdbFEDGhaCIIHDCAEBGFFAIHBDceggdbecfIahHEcAIGdFBeIHFDAGBcdGFbeCHIacbAgHifdE",
+]
+const Medium = [
+    "achEDIBFGgeIHbFaDCFDBaCGHeIbHaceDGiFCIFGHBeadeGDIFAChbDAGbIeFCHhfEdGCIbaiBcFAhdGE",
+    "ADBeIGhFCGhCDFabiefiECHBgDACGDbaFieHEBIHGCFADhFAIedCbGdAFGbheCIbEhaciDGFIcGFDeaHb",
+    "aDBIEcHFGEGHbDFcaiIFCAGHeDbgHdEIafBCCIaHFbdGeBefGcdIHADCGFbeAIHhbedAIGcFFaIcHgBEd",
+    "AdEGCHfibHGbefIacdCIFABdehgICgHDAbFefahbecDgIEBDIGFCAHbeICAGHDFGFCDheIbADHAFIBGec",
+    "ADeIBFgHCIHFcgabdebGCeDhaIfHfaDeIcGbgIBFacHEdECdBHGFaiFBHAIEDcGDeGHcBiFaCAIgFDEBH",
+    "aDFIEHbcGciHaGbFDEeGBcdFHIAbeadhCgfIGHIfBEcAdFCdGAIeHBDAeHcgibFHFGbIDaECIBcEFADGh",
+    "aDgEICFBHHCFdGBAeIIEBFHacdgcAEgBIdhFDGhCFEiabBFIADHEGCGbciaDHfEEHdbcFgiAFiAHeGbcd",
+    "adHEbCIfGegBfHIDAcIcfgDaHEBDFABIGcHEHIcdfegbaBEGcAHFdIFAdIgBeCHCbihEFAGdghEACDBIF",
+    "aecDbHIGFDGHCFIBEAfiBEGaHCdgAFBIedHcHCEaDFGBIbDIghCFAeibahcdeFGcHdfeGAIBefGIAbCDH",  
+]
+const Hard = [
+    "AEdfiHgCBIFGECbahdcbHGADeIFGIFCDaBeHHDCbGEIFAeabhfICdgbCIAHFDGeFGadEcHBiDHeIBgFac",
+    "aEFGBihCdHcIefdGBAGdbcahIfeIBAFDcegHDHEAGBCiFFgcHIEadBeFHDCGBaicidBHAFEGbAGIeFDHC",
+    "AEGIdchFBFICbehgAdbHDFAGeIchdEgBaFCiGbfchIadeCAIefdbGHdfBaIeChGEGHdCFibAIcaHGbDEf",
+    "afbCGDehiIGhEaFCdBECDIbHAFGhEGADbfICdbifechGAFACHIGbeDgDFBHAIcEcIaDFeGBHBHegCIdaF",
+    "AFhIgCdEBcEGDBHAFIiDbfaeGCHhGIEcfbdafcdBIAHGEBaeHdGCIfEBACFdIHggHcAeiFbDdiFGHBEAC",
+    "agcfdHbEIHBDEIGCaFFiecBAhGDBEghcFIdaDHiAGbEfCCAFiEdGBHGCabfIdHeIDHgAEFCbEFBdHcAIg",
+    "agibdeFchcHDGIfeBAEFbHAcDIgiDCAEBGHFHBeDFGCaIFAGICHBdEgEaCBihfdbIfeHDAGCdCHFGaIeb",
+    "AHbIEDcGFCifgHBAdeGEDAfcIHBBdGHCEFaiIFcbdaHeGHaeFIGBCDeBAcGFdIhFGHDaieBcDcIebhGFA",    
+    "AHEbCIGfdiBGDEFHCAdfcHGaBIEBGICfdaeHhCFEAbIdGEAdihgFbcFIAgDECHbcdBAIHegfGEHFbcdAI",
+    "AHECBgFdIBIGDAfhCECfDHIEagbIGHEDcBFAEBFAGichddCaBFHeigFEIgHadbChDcIeBGaFGabFcdiEH",
+]
+const Expert = [
+    "AHEIDCFGBiBFGaedchcdghbfIEADfHEIACBgbeADCGHfiGCibFHaDEeaBcHDGIFHIdFgBeAcFGCaeIBhD",
+    "AHEIFGcbDDgBacefhIFIcBdHGeACbdHIFAgehfgEAcIDbEaIGBDHFCIEAFGbdcHBDFchaeiGgCHDEIbAF",
+    "aIBCFDeHGcGFHaeIdbdHEIGBafCFDGahcbieBeaGDIHcFICHEBfdGAHADFEgcbIgBIdcaFEHEFCbiHGAd",
+    "AIBHEFDcGEFcaDGihbHDGBCIAefGHFiadEBCBCAeFHGIdIEDGBcHFaCAiFGebdhfbHdIaCgedgECHbfAi",
+    "aiDHBEfCGCGEFIdhBABFHCaGEdiIDGEHbcAfHABifcdgeECFgDaIHBFBaDEHGiCdECbGIafHGhiacFBed",
+    "aIgdfbhcEdBEHCiGFAFCHEGaBdIIFbCAGDEHcHABDeFigegdIHFCabBDiFEHAGcHACGIDEBFGefabcihd",
+    "AIGdFebCHBfHiaCdGEEDcgHbIaFgcBfeAHIdiHecgDfBAfaDbIhgeccbfaDIeHGhGIECFadbdeAHBGCFI",
+    "baDEHGIFCGIHDCfABEceFAIBgdhfdchGIEABIgAbdEHcFEHbfaCDGIABeGFhciddFiCEabhGHCgIBdFEA",    
+    "baicHdegFHEdIFGcABGFCaebhidfbadGCIHEICEfAhBDGdGHBIeaFCAHBEDfGCICDGHBifEaeiFGCADBh",
+    "BaiGFcdEHdFCHEAIGBhEgbDIcfaCidFAeBHGFBACGhEIdghEDibAcfEdBIHFgAcaGHECdFBIICfabGHDe",
+    "bCFIGHADeHAGdFebCIDIEaBcFGHEbHGAFDIcgdCbhieFaafiCEDHBGCEBHdGIafIHAFcbgeDfgDeiACHb",
+    "BdaHFIEGCicHDgEafBEGFBACDIHfbDcEgIHAHAIFBdgceCeGihAbDFDIbEchFaggFCadbHEIaHEGIfcBD",
+    "BDCEFiGAHIHacGBeDFGEFHADIBcEIdfHACgBhCGbDEaFIFABgicdHeaFhiEgbCdDbiaChfeGCGEdbFHIa",
+    "bdEcFAHIGCAIegHFBDFGHBDICaEehfaBDIGCDCgiHeaFBIBAFcgedhaicgEbDHFGeDhAFbcIHFbDiCGEa",
+    "BEaihfcdgCFIGEDAHBgDHACBIFeFIdhaeGbcAHGcBIDEfebcdFGHAIDgeBIHFCaHCbFGAeiDIAfEdcbGH",
+    "BehdIcaFgCfGeAHIbdaIdfBGCheEgcIDFHAbdAFHeBGCiIHBGcaDefFCIBHdeGAHbeaGIFDCGDACfEBIH", 
+    "BfHCEGADIIdchAFGbeGaEiBdCHFFBigCADEHHEGBdIfaCDCafhEiGBeGFDIHbCacHdaFBEiGaIbegcHFd",
+]
+const Extreme = [
+    "BGDiEAfchahcFBDIGEEIFhgCDabFAHGibedcDEGACHbIFCbIEdfGHagDACfEHBihFBDAIcegICEbHGaFd",
+    "BGFAIHDCEDHicegBAfEACFDbIGHidhbCEgFAaEGIhfcDBFCbgadeHIHIedGafBCcbdhFiAEGGFAEbcHID",
+    "BGFHIAdECaiCdBEFGHhDeFcgbaiGFBeAICHdICAGdHEFbdeHCFBGIAFhIBGDACEeBGaHcIDfcadiefhbg",
+    "BhAcGEIDFIGdBaFCHefeCHiDGbaeaBFcIdGHcDGEHAFIBhifgdBEACAcIDFHbEGGbHIEcaFDdFeabGhcI",
+    "BHeadfiCGICAgbHDEFdFgIEcHabgEHdFabICcadBHIfGEFBICGEAdHeiBFAGcHdHdCeIBGfAaGfHcDEBI",
+    "BHFcEdgaigIDAfbEHcCEaIGHBfDdfIGHCAeBhCBeIADGFAGedbFcihFdHBaGIceIacfDEHBGEbGHCIFdA",
+    "biADChGFEEHFIagbDCcGDBFEAHIIaeFHDCGBFBHgIcdEadcGebAhIFHfBAGIECDgDICEbFahaechdFibg",
+    "bICEGDHFAHFeaICdbGaDGbFHEcIEadfcgIHbFGHIbECAdICBhdAfGEcHiDAbgefGBFceiadhDEAGHFBIC",    
+    "bieDFaGHcgcaeHiDbFHfDGcBiAECHIBgEFdaDGBHafEciAEFIDcbghFBcaIdheGIdHCEGAFBEAGFBHCID",
+    "BIFCAdhGeDhAEbgFCICEgFHiBDaFBEGDAIHCADHicBEfggciHFeDabHGDBicaefiacdeFGbHEFBaGHCID",
+    "bihCGEADfFAGIbDchEedCfahbigCFDEIGHbaIbEHdaFGCHGaBCfIEdGcFdHbeAIAEBGFIDcHdhIAEcGFB",
+    "CaBhedgfiidHcFGAEbEFGbiahCDAEIGDbFHcFGdIhcebahBCFaEDiGDHAECIBGFbCEdGFIAHGIfaBhCDE",
+    "cbFDEGiAHGIacFHdebdeHibAgFcfdIBCehGABHgAIFECdACEgHdfBIIGbFDCahEeAdHGBCIFHfceAIBDG",
+    "cbgHEaFdIaIdcbfGEHEHFigDBACbFEAIHdCGhcAEDGIBFDGIBFCehaGDCFABHIEiabGHecfdFehdcIaGB",
+    "CbhdAEIGfaEFgibCdhIGDHCFBEafDEBHaGICGibcfdhAehcAIeGFbddFIEbHAcGEHCagIDFBBAGfDCEHI",
+    "CDabGEHIFeFhIaCGDbbgIHdFcAEAcEGhbifdGIbCFdaEHdHfaEiBGciaDFCHEbghEgDbafCIFbceiGDha",  
+    "cdgeAIBfhhbFDCgIAeAiEHbFcDGBFICGEdHAdGhBFaECIeACIdHGbfIedFHcagBGhbaEdficfCagiBHed",
+    "cDgIbFEAHehbdGaFICiafecHgDBACIGEBhfdgbdfhiCeAHFECAdbGIBIHAFedcgfGABdCIheDechIGabF",
+    "CEBIAFHGDIhAdEgbcfgFdCbheaIFGHACIDEbeBCGFdIhADaIbHEcFgBIEFGcAdHHdGEiaFbcAcFHDBgie",
+    "cEHGfdIABFIgCAbhedAbDeIHcGfeABFcGdHIHDFBEIACGigChdafbEbFaDHEgIcGCIAbfeDHDHeIGcBFA",
+    "ceIBaDGfhHaGcfiDEbBdFhGEIaCAHbFICEgDGiCdEahbFEfDGhbACIfbhEDGcIAiCeabHFdgdgaIcFBhe",
+    "CeiBaGHDfADGfeHIBCbFHidcegAdHCeFagIBIGECHBAFDFBAgIdcHEEaFHBIDcGgidacfBEHHCBdGefaI",
+    "cEIDAGFHbgDBEFhICAFHAIBCeGdbGFhIeadCACDBGFHIehIecDAGBFdacGEiBfHIfHAcbDEgEbgfhdCai",
+    "CFeabGHIDGBdHEIfcaihACDFBegEGIBadcHFbDcGFHEAIHAFEICgDBAcGihbDFEFIHdgeabcdebfCAIGH",  
+    "CFEIAdbgHaHicbgDeFGDBEFhcIAeGHADCIfBIcFghbAdEBADFIEhcGFbcHGIeaDHEADCFGbidigBEaFHc",
+    "CGaBfHIdEHEiacDFBGDbFIgEHcaadcFBgEIHfhECDIGaBBiGHEadFcgCdEIBAHFiAbgHfCEdEFHdacBGI",
+    "CGhAIbfEDFAIEdhcBgDEBCGfHaIIDgbheACFHFcDaIbgeebAGFcIDHGCFibdEHABHDFEaGicaIeHcgDFB",
+    "cHbEFDGAIAdIcgBEFHegfhIAcbDHACbDGfieIbEACFDHgGFdIheACBBCaGEHidfdEhfaIBGcFIGDbCHEa",
+    "cidGHEBFAFaeBDcIGHbHgAFIECdgeIHafdbcAdfecbHIGHbCDIGAEFEFaCBHgDIDCbIGaFheighFEDCAB",
+    "cIFDHAEbgebHgicAfdaGDEFbhCIBDacGFIEHFHIABEGDCgcehdIFABdeGBAHCIFhfciEdbgAIABFCGDhe",
+    "CIFeBahdGHGDIcFebabaegDHIcfdhAbEcFGiIfcaHgdEbEBGDFIcAHFcbhaEgidaEIfGDBhCGdHciBAFE",
+    "DAeFBIHGcFiCHGeBadhGBadCFeIabgIHDECFIEDGCFabhChFBEAdIGbcadfGIHEEdhCiBgFAGfiEAHCdb",  
+    "dafibcGHEHIEFdgcbaBCGAHEDIfeHcDgbfaIGBAHIFECDIFdEcAHGbaGBceDIfHFehGaIBdCCdIBfHAEG",
+    "DaFIcbHgebeHGDFAiccgiEAHDFBEBcAHgFDIGHdCfibEaIFabEdGcHHIGfBeCAdFCbDIAehGAdEHGcIBF",
+    "DaibFEGHCGHECIDaBFcFbGHaIDeHiAedbFcGEgFicHBAdBCDAgFheIIEHdAGcfBFDchBIEGAabgFecDiH",
+    "DaIbGFHeCFChaiebdGGeBdCHIFaCbGFADEHIHFAIEbGCdIDEcHgAbFBGcHDafiEEIFGbcdahahdEFiCGB",
+    "dAIcebGFHgBEHFaCiDhcFdgIAbeIDBFaGeHcCeAIDHFgBfGhBcEIdABFgAHCDEIAHdeIFBcGeICGbDhaf",
+    "dbFECIAgHIGaFDHBCeHEcAGbDiFFDBgheiacECGIAFHBDaIHDbceFGcHEbfaGDibfdHIGCEAgaiCEDFhb",
+    "DbgiCFaehcaehbdIGFHIfAEGCBDgfCeIHDABIHAbDCGFEEdbFGAhCIBEDcaiFHGaGHDfBEIcFciGhEbdA",
+    "DEbfcgaHIFaIHDbCegcHGaiEFbDAfebhdIGcidCEGABFHgBHcFIdAEhgfibceDaeIdGafHcBBCaDEhGIF",  
+    "dEGHAfIbCBIHcEGFDACFABDIEGhFhbagCdIEEDCfibhAGGAIeHdBCFIGfdcHaEbHCeibaGFDAbdgFechI",
+    "DFACBhGIEgchaIeFDbBEIFDGaChAHFbgidEcedcHAfbGIIGbdecHAFFBGECDIHAcadIHbefGHiEgFACBD",
+    "dfbeahiCgECgiDbfHAAihGFCdeBGbFHCDEAihDIAgecBFcaEBIFgDHFGDCHaBIEIeADBGHFcBHcFEIaGd",
+    "dfeGchaIBICAFbeHgdgBHdAIfceCHIAeBGdfAGBIFDEHcFEDHGCIBaEDgcIFBAHHIfbdAceGbACehGDFi",  
+    "dGaICHBFEFBIAedHcGCEhgBFIADHcEdfagBiaIbeHGCDfgDFciBEHAEAdHGCFIbbhgFdIaEcIFcbAEDGh",
+    "dGeihbaCFHFBCADgIECiaeFGBDHEDIgBHcfAbACFDiHEGGHFaEcibdaehBIFDGcFBGdcaEhIICDHgEfaB",
+    "dHcIFGABEIegCABFdHFbADHEIgCaGFebdCHIEDHaCIBFgciBHGFEadbaDGechiFhCIFDageBGfEBiHDca",
+    "dHGaicbeFEacFHBIDgIbFeDghcAHeIDcAFGBFdbHgECaIGcABFIDHeaIHcEFgbDBfDGAHEiCCGEIbdAFh",  
+    "DICbAEhgfFaGIHDBCEbEHFCGADIEcBGDIFAhaDFCeHibggHiAFBdECIbehGAcFdcGadIFEhBhFDebcGia",
+    "diGbCEaHFAfCIdhEBghBeAGFCdiCEbDHGFIAIgdfEaBcHFaHcIBgedgcAhBdIFEEDiGfchabbHFEaidgc",
+    "diGEHFBCAHcaIBGEdfeFbCadIhgiGEDFAHBCaHFBcEDGICBDHGIfAegdcFEBAIHbehAIcGfDFaIGdhceb",
+    "eaBdfIHGcIGdCHbFAEfHCAGEDBigcebdHAIFhFAiECGdBBdifAGECHabFecdIHGDiHGBFCeaCEgHIabFD",  
+    "EABFHiGcDHdICgaebfcGFBdeAHIaCDHIgBFEbFeaCDIGHiHGEFBdACfbaDECHIGgEHiBfcdadICGahFeB",
+    "eacIBFhdgGHBecDaFIDIfgAhCBECFGHDEiabIdHaGBECFabeCFIGHDfCiBHGdeAHgdFEabIcBEADiCFGh",
+    "EadCFbIhGbGCiahdeffhiGedcABGDbEiFHCACEadhgbFIIfHBcAeGddCfabegiHaBEHGIFDChIGFDcaBE",
+]
+
+export class LevelManager {
+
+    private static instance: LevelManager
+    public static getInstance(): LevelManager {
+        if (!LevelManager.instance) {
+        LevelManager.instance = new LevelManager()
+        }
+        return LevelManager.instance
+    }
+
+    private levelMap: Map<string, Array<string>> = new Map()
+    
+    public init(): void {
+        this.levelMap.set(config.DIFFICULTY_TYPE.Easy, Easy)
+        this.levelMap.set(config.DIFFICULTY_TYPE.Medium, Medium)
+        this.levelMap.set(config.DIFFICULTY_TYPE.Hard, Hard)
+        this.levelMap.set(config.DIFFICULTY_TYPE.Expert, Expert)
+        this.levelMap.set(config.DIFFICULTY_TYPE.Extreme, Extreme)
+        //检查关卡配置
+        this.levelMap.forEach((list, key)=>{
+            for (var i=0; i<list.length; i++) {
+                if (list[i].length != 81) {
+                    console.error("关卡配置有误>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", key, i)
+                }
+            }
+        })
+    }
+
+    public getLevelStr(difficulty: string, index: number): string {
+        var list = this.levelMap.get(difficulty)
+        if (list) {
+            return list[index]
+        }
+        return ""
+    }
+}
--- a/src/models/LevelManager.ts.meta
+++ b/src/models/LevelManager.ts.meta
@@ -0,0 +1,3 @@
+{
+  "uuid": "4b2967ad-786a-4ad1-8b1d-22b093d62575"
+}
--- a/src/models/StorageManager.ts
+++ b/src/models/StorageManager.ts
@@ -1,6 +1,8 @@
-import { config } from "../constants/config"
+
+
 import { DataStage, createDataStage } from "../types/global"
 import { DOStage } from "./DOStage"
+import { DOUser } from "./DOUser"


 export class StorageManager {
@@ -13,58 +15,96 @@ export class StorageManager {
    return StorageManager.instance
  }

-  private changed = false
+  private user: DOUser;

  private stageID: string = "";
-  private stageMap: Map<string, DataStage> = new Map();
+  private stageChanged = false
+  private stageMap: Map<string, DOStage> = new Map();

+  
  public init(): void {
-    this.changed = false
+    if (!this.user) {
+        var jsonStr = Laya.LocalStorage.getItem("user")
+        if (jsonStr) {
+            this.user = new DOUser(JSON.parse(jsonStr))
+        }
+        else {
+            this.user = new DOUser({isCompletedMain: true, dones: new Array(), progresses: new Array()})
+        }
+    }
+    this.stageID = ""
+    this.stageChanged = false
  }

+  
+  public getUser(): DOUser {
+    return this.user
+  }
+  public saveUser(): void {
+    if (this.user) {
+      var jsonStr = JSON.stringify(this.user.getData())
+      Laya.LocalStorage.setItem("user", jsonStr)
+    }
+  }
+
+
+  public cleanStage(stageID: string): void {
+    if (this.stageMap.has(stageID)) {
+      this.stageMap.delete(stageID)
+    }
+    Laya.LocalStorage.removeItem(stageID)
+    this.stageID = ""
+    this.stageChanged = false
+  }
+  public newStage(stageID: string, type: number, name: string, difficulty: string, index: number): DOStage {
+    this.stageID = stageID
+    this.stageChanged = false
+    var dataStage: DataStage = createDataStage(stageID, type, name, difficulty, index)
+    var doStage: DOStage = new DOStage(dataStage)
+    this.stageMap.set(stageID, doStage)
+    return doStage
+  }
  public loadStage(stageID: string): DOStage {
    this.stageID = stageID
-    var dataStage: DataStage
+    this.stageChanged = false
    if (this.stageMap.has(stageID)) {
-        dataStage = this.stageMap.get(stageID)
+        var doStage: DOStage = this.stageMap.get(stageID)
+        return doStage
    }
    else {
        var jsonStr = Laya.LocalStorage.getItem(stageID)
        if (jsonStr) {
-            dataStage = JSON.parse(jsonStr)
-            this.stageMap.set(stageID, dataStage)
-        }
-        else {
-            dataStage = createDataStage("first", "", config.DIFFICULTY_TYPE.Easy)
-            this.stageMap.set(stageID, dataStage)
+            var dataStage: DataStage = JSON.parse(jsonStr)
+            var doStage: DOStage = new DOStage(dataStage)
+            this.stageMap.set(stageID, doStage)
+            return doStage
        }
    }
-    var levelStr = "aBCeIGFhdEDFcAHBGIhigBdfecAgHDiFBCaeBEAGHCIdffcIdEAHbgcABfGEdiHIFHaCDGEBDGEHbiaFC"
-    return new DOStage(dataStage, levelStr)
+    return null
  }
-
-  public cleanStage(): void {
-    if (this.stageID && this.stageID.length > 0) {
-      if (this.stageMap.has(this.stageID)) {
-        this.stageMap.delete(this.stageID)
-      }
-      Laya.LocalStorage.removeItem(this.stageID)
-      this.stageID = ""
-    }
-  }
-
  public saveStage(): void {
-    if (this.changed) {
-      this.changed = false
+    if (this.stageChanged) {
+      this.stageChanged = false
      if (this.stageMap.has(this.stageID)) {
-          var dataStage = this.stageMap.get(this.stageID)
-          var jsonStr = JSON.stringify(dataStage)
+          var doStage = this.stageMap.get(this.stageID)
+          var jsonStr = JSON.stringify(doStage.getData())
          Laya.LocalStorage.setItem(this.stageID, jsonStr)
      }
    }
  }
-
  public onChanged(): void {
-    this.changed = true
+    this.stageChanged = true
  }
+
+
+  public cleanAll(): void {
+    this.user = new DOUser({isCompletedMain: true, dones: new Array(), progresses: new Array()})
+
+    this.stageID = ""
+    this.stageChanged = false
+    this.stageMap.clear()
+
+    Laya.LocalStorage.clear()
+  }
+
 }
--- a/src/models/UIManager.ts
+++ b/src/models/UIManager.ts
@@ -12,10 +12,10 @@ export class UIManager extends Laya.Script {
  private static _instance: UIManager
  onAwake(): void {
    UIManager._instance = this
+  }

-    StorageManager.getInstance().init()
-
-    this.loadHome()
+  onStart(): void {
+    this.loadHomeUI()
  }

  public static getInstance(): UIManager {
@@ -24,51 +24,49 @@ export class UIManager extends Laya.Script {

  private stage: Stage

-  public loadHome(): void {
+
+  public getUIRoot(): Laya.Node {
+    return this.owner
+  }
+
+  public loadHomeUI(): void {
    Laya.loader.load(respath.home_ui_res).then((go)=>{
      var prefab = go.create()
-      this.owner.addChild(prefab)
+      this.getUIRoot().addChild(prefab)
    })
  }
  
-  public loadStage(stageID: string, clean: boolean=false): void {
-    if (clean) {
-      StorageManager.getInstance().cleanStage()
-    }
+  public loadStageUI(stageID: string): void {
    if (this.stage) {
        this.stage.onLoadStage(StorageManager.getInstance().loadStage(stageID))
    }
    else {
      Laya.loader.load(respath.stage_ui_res).then((go)=>{
        var prefab = go.create()
-        this.stage = this.owner.addChild(prefab).getComponent(Stage)
+        this.stage = this.getUIRoot().addChild(prefab).getComponent(Stage)
        this.stage.onLoadStage(StorageManager.getInstance().loadStage(stageID))
      })
    }
  }

-  public closeStage(): void {
+  public closeStageUI(): void {
    if (this.stage) {
      this.stage.owner.destroy()
      this.stage = null
    }
  }

-  public loadGameOver(): void {
+  public loadGameOverUI(): void {
    Laya.loader.load(respath.gameover_ui_res).then((go)=>{
      var prefab = go.create()
-      this.owner.addChild(prefab)
+      this.getUIRoot().addChild(prefab)
    })
  }
-  public loadGameDone(): void {
+  public loadGameDoneUI(): void {
    Laya.loader.load(respath.gamedone_ui_res).then((go)=>{
      var prefab = go.create()
-      this.owner.addChild(prefab)
+      this.getUIRoot().addChild(prefab)
    })
  }

-  onLateUpdate(): void {
-    StorageManager.getInstance().saveStage()
-  }
-
 }