diff --git a/src/server/conf/decorate/DecorateCfg.go b/src/server/conf/decorate/DecorateCfg.go index 1fed81ca..e25b7cba 100644 --- a/src/server/conf/decorate/DecorateCfg.go +++ b/src/server/conf/decorate/DecorateCfg.go @@ -28,9 +28,8 @@ func GetStarCost(AreaId, SortId int) int { return 0 } for _, v := range data { - v1 := v.(map[string]interface{}) - if gamedata.ParseInt(v1["AreaId"]) == AreaId && gamedata.ParseInt(v1["SortId"]) == SortId { - return gamedata.ParseInt(v1["CostCount"]) + if gamedata.GetIntValue(v, "AreaId") == AreaId && gamedata.GetIntValue(v, "SortId") == SortId { + return gamedata.GetIntValue(v, "StarCost") } } return 0 @@ -52,8 +51,7 @@ func GetNextAreaId(AreaId, SortId int) int { return 0 } for k, v := range data { - v1 := v.(map[string]interface{}) - if gamedata.ParseInt(v1["AreaId"]) == AreaId && gamedata.ParseInt(v1["SortId"]) == SortId { + if gamedata.GetIntValue(v, "AreaId") == AreaId && gamedata.GetIntValue(v, "SortId") == SortId { UnionKey, _ := strconv.Atoi(k) nextId := UnionKey + 1 AreaId = GetAreaId(nextId) @@ -71,9 +69,8 @@ func GetAllSortIdByAreaId(AreaId int) []int { } var SortIdList []int for _, v := range data { - v1 := v.(map[string]interface{}) - if gamedata.ParseInt(v1["AreaId"]) == AreaId { - Sort := gamedata.ParseInt(v1["SortId"]) + if gamedata.GetIntValue(v, "AreaId") == AreaId { + Sort := gamedata.GetIntValue(v, "SortId") if Sort == 0 { continue } @@ -90,9 +87,8 @@ func GetProgressReward(Scene, Lv int) []*item.Item { return nil } for _, v := range value { - v1 := v.(map[string]interface{}) - if gamedata.ParseInt(v1["Scene"]) == Scene && gamedata.ParseInt(v1["Lv"]) == Lv { - return item.ParseItem(v1["Item"]) + if gamedata.GetIntValue(v, "Scene") == Scene && gamedata.GetIntValue(v, "Lv") == Lv { + return item.ParseItem(gamedata.GetValue(v, "Item")) } } return nil @@ -114,19 +110,18 @@ func GetAreaPerPExp(AreaId int) int { log.Debug("DecorateArea GetAreaPerPExp not found AreaId:%v", AreaId) return 0 } - return gamedata.ParseInt(data["PerPExp"]) + return gamedata.GetIntValue(data, "PerPExp") } func GetDecoratePExp(AreaId, SortId int) int { - data, err := gamedata.GetData(DECORATE_AREA) + data, err := gamedata.GetData(DECORATE_COST) if err != nil { log.Debug("DecorateArea GetDecoratePExp not found") return 0 } for _, v := range data { - v1 := v.(map[string]interface{}) - if gamedata.ParseInt(v1["AreaId"]) == AreaId && gamedata.ParseInt(v1["SortId"]) == SortId { - return gamedata.GetIntValue(v1, "PetExp") + if gamedata.GetIntValue(v, "AreaId") == AreaId && gamedata.GetIntValue(v, "SortId") == SortId { + return gamedata.GetIntValue(v, "PetExp") } } return 0