整理持久化数据结构

src/models/DOStage.ts

@@ -3,18 +3,19 @@
 import { StorageManager } from "./StorageManager"
 import { DOBlock } from "./DOBlock"
 import { DOCandy } from "./DOCandy"
+import { DataBlock, DataStage } from "../types/global"
 
 
 export class DOStage {
 
-    private data: any
+    private data: DataStage
     private blocks: Array<DOBlock> = new Array()
     private candys: Array<DOCandy> = new Array()
 
-    private letterToNumber: any;
-    private numberToLetter: any;
+    private letterToNumber: Map<string, number>;
+    private numberToLetter: Map<number, string>;
 
-    constructor(dataStage: any, levelStr: string) {
+    constructor(dataStage: DataStage, levelStr: string) {
         this.data = dataStage
 
         this.letterToNumber = new Map();
@@ -39,7 +40,7 @@ export class DOStage {
         this.numberToLetter.set(8, "h");
         this.numberToLetter.set(9, "i");
 
-        var blockMap: Map<number, any> = new Map()
+        var blockMap: Map<number, DataBlock> = new Map()
         for (var i=0; i<this.data.blocks.length; i++) {
             var dataBlock = this.data.blocks[i]
             blockMap.set(dataBlock.index, dataBlock)
@@ -53,7 +54,7 @@ export class DOStage {
             var letter = levelStr[i];
             if (this.letterToNumber.has(letter)) {//预设格子 使用配置文件初始化
                 var show = this.letterToNumber.get(letter)
-                var dataBlock = StorageManager.createDataBlock(i, show)
+                var dataBlock: DataBlock = {index: i, show: show, score: 0, notes: new Array()}
                 var doBlock = new DOBlock(dataBlock, true, show)
                 this.blocks.push(doBlock)
             }
@@ -65,7 +66,7 @@ export class DOStage {
                     this.blocks.push(doBlock)
                 }
                 else {
-                    dataBlock = StorageManager.createDataBlock(i, 0)
+                    dataBlock = {index: i, show: 0, score: 0, notes: new Array()}
                     this.data.blocks.push(dataBlock)
                     var doBlock = new DOBlock(dataBlock, false, show)
                     this.blocks.push(doBlock)
@@ -90,7 +91,7 @@ export class DOStage {
                 var c = this.numberToLetter.get(i)
                 if (list.has(c))
                     left = list.get(c);
-                dataCandy = StorageManager.createDataCandy(left)
+                dataCandy = {left: left}
                 this.data.candys.push(dataCandy)
                 var doCandy = new DOCandy(dataCandy, i)
                 this.candys.push(doCandy)