From bd38425e2aaeabca398250c51548d4cf070f5328 Mon Sep 17 00:00:00 2001 From: 陆恒 Date: Tue, 12 May 2020 10:02:20 +0800 Subject: [PATCH] 提交 --- src/HttpServer/jsonconf/AchievementConfig.json | 1 + src/HttpServer/jsonconf/ConfigFileMd5.json | 1 + src/HttpServer/jsonconf/DailyTask.json | 1 + src/HttpServer/jsonconf/LevelConfig.json | 1 + src/HttpServer/jsonconf/MoneyboxLevel.json | 1 + src/HttpServer/jsonconf/MoneyboxTimes.json | 1 + src/HttpServer/jsonconf/RoundCoin.json | 1 + src/HttpServer/jsonconf/WithdrawConfig.json | 1 + src/HttpServer/jsonconf/jsonconf.go | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/HttpServer/main/main.go | 7 +++++++ 10 files changed, 72 insertions(+), 0 deletions(-) create mode 100644 src/HttpServer/jsonconf/AchievementConfig.json create mode 100644 src/HttpServer/jsonconf/ConfigFileMd5.json create mode 100644 src/HttpServer/jsonconf/DailyTask.json create mode 100644 src/HttpServer/jsonconf/LevelConfig.json create mode 100644 src/HttpServer/jsonconf/MoneyboxLevel.json create mode 100644 src/HttpServer/jsonconf/MoneyboxTimes.json create mode 100644 src/HttpServer/jsonconf/RoundCoin.json create mode 100644 src/HttpServer/jsonconf/WithdrawConfig.json create mode 100644 src/HttpServer/jsonconf/jsonconf.go diff --git a/src/HttpServer/jsonconf/AchievementConfig.json b/src/HttpServer/jsonconf/AchievementConfig.json new file mode 100644 index 0000000..0838c00 --- /dev/null +++ b/src/HttpServer/jsonconf/AchievementConfig.json @@ -0,0 +1 @@ +[{"id":1,"task":"观看%d%条广告","num":10,"reward":[7,100]},{"id":1,"task":"观看%d%条广告","num":30,"reward":[7,300]},{"id":1,"task":"观看%d%条广告","num":50,"reward":[7,500]},{"id":1,"task":"观看%d%条广告","num":100,"reward":[7,1000]},{"id":1,"task":"观看%d%条广告","num":150,"reward":[7,1500]},{"id":2,"task":"人物达到%d%级","num":5,"reward":[7,500]},{"id":2,"task":"人物达到%d%级","num":10,"reward":[7,1000]},{"id":2,"task":"人物达到%d%级","num":15,"reward":[7,1500]},{"id":2,"task":"人物达到%d%级","num":20,"reward":[7,2000]},{"id":3,"task":"累计消除%d%颗星星","num":1000,"reward":[1,50]},{"id":3,"task":"累计消除%d%颗星星","num":5000,"reward":[1,80]},{"id":3,"task":"累计消除%d%颗星星","num":10000,"reward":[1,100]},{"id":3,"task":"累计消除%d%颗星星","num":30000,"reward":[2,10]},{"id":3,"task":"累计消除%d%颗星星","num":50000,"reward":[3,10]},{"id":3,"task":"累计消除%d%颗星星","num":100000,"reward":[4,10]},{"id":3,"task":"累计消除%d%颗星星","num":500000,"reward":[5,10]},{"id":4,"task":"存钱罐累计提取%d%次","num":5,"reward":[7,50]},{"id":4,"task":"存钱罐累计提取%d%次","num":10,"reward":[7,100]},{"id":4,"task":"存钱罐累计提取%d%次","num":20,"reward":[7,200]},{"id":4,"task":"存钱罐累计提取%d%次","num":30,"reward":[7,300]},{"id":4,"task":"存钱罐累计提取%d%次","num":50,"reward":[7,500]},{"id":5,"task":"使用%d%次任意道具","num":20,"reward":[7,200]},{"id":5,"task":"使用%d%次任意道具","num":50,"reward":[7,500]},{"id":5,"task":"使用%d%次任意道具","num":100,"reward":[7,1000]},{"id":5,"task":"使用%d%次任意道具","num":300,"reward":[7,3000]},{"id":5,"task":"使用%d%次任意道具","num":500,"reward":[7,5000]}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/ConfigFileMd5.json b/src/HttpServer/jsonconf/ConfigFileMd5.json new file mode 100644 index 0000000..6153dc5 --- /dev/null +++ b/src/HttpServer/jsonconf/ConfigFileMd5.json @@ -0,0 +1 @@ +[{"name":"AchievementConfig","md5":"1233193e9166ebb81f09c13a8b4c4387"},{"name":"DailyTask","md5":"589556105d09f3855f8723a1566c9ac2"},{"name":"LevelConfig","md5":"60dc46bed1204716c9634105298da9b2"},{"name":"MoneyboxTimes","md5":"a3d7ee7a61ebf9a0aa9ffd2020c79bb0"},{"name":"RoundCoin","md5":"51f2a783b93c0a6c20eec1520e6d69f4"},{"name":"MoneyboxLevel","md5":"ba539bdc8435b60a242fe2f3d49cadf8"},{"name":"WithdrawConfig","md5":"1659f4efb030515bac768cf817656530"}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/DailyTask.json b/src/HttpServer/jsonconf/DailyTask.json new file mode 100644 index 0000000..3664492 --- /dev/null +++ b/src/HttpServer/jsonconf/DailyTask.json @@ -0,0 +1 @@ +[{"id":1,"task":"每日登录","num":1,"reward":[1,20]},{"id":2,"task":"提取一次存钱罐","num":1,"reward":[6,50]},{"id":3,"task":"今日通过%d%关","num":10,"reward":[6,50]},{"id":4,"task":"使用%d%次道具","num":5,"reward":[6,20]},{"id":5,"task":"领取%d%次红包","num":5,"reward":[6,20]},{"id":5,"task":"领取%d%次红包","num":10,"reward":[6,30]},{"id":5,"task":"领取%d%次红包","num":15,"reward":[6,50]},{"id":6,"task":"收集%d%枚金币","num":20,"reward":[6,100]},{"id":7,"task":"累计在线%d%分钟","num":5,"reward":[2,2]},{"id":7,"task":"累计在线%d%分钟","num":10,"reward":[4,3]},{"id":7,"task":"累计在线%d%分钟","num":15,"reward":[5,4]}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/LevelConfig.json b/src/HttpServer/jsonconf/LevelConfig.json new file mode 100644 index 0000000..2164816 --- /dev/null +++ b/src/HttpServer/jsonconf/LevelConfig.json @@ -0,0 +1 @@ +[{"id":1,"level":1,"exp":1000,"cash":500,"extracash":300},{"id":2,"level":2,"exp":2000,"cash":1000,"extracash":300},{"id":3,"level":3,"exp":3000,"cash":1000,"extracash":300},{"id":4,"level":4,"exp":5000,"cash":1000,"extracash":300},{"id":5,"level":5,"exp":10000,"cash":1000,"extracash":300},{"id":6,"level":6,"exp":10000,"cash":1000,"extracash":300},{"id":7,"level":7,"exp":10000,"cash":1000,"extracash":300},{"id":8,"level":8,"exp":10000,"cash":1000,"extracash":300},{"id":9,"level":9,"exp":10000,"cash":1000,"extracash":300},{"id":10,"level":10,"exp":10000,"cash":1000,"extracash":300},{"id":11,"level":11,"exp":10000,"cash":1000,"extracash":300},{"id":12,"level":12,"exp":10000,"cash":1000,"extracash":300},{"id":13,"level":13,"exp":10000,"cash":1000,"extracash":300},{"id":14,"level":14,"exp":10000,"cash":1000,"extracash":300},{"id":15,"level":15,"exp":10000,"cash":1000,"extracash":300},{"id":16,"level":16,"exp":10000,"cash":1000,"extracash":300},{"id":17,"level":17,"exp":10000,"cash":1000,"extracash":300},{"id":18,"level":18,"exp":10000,"cash":1000,"extracash":300},{"id":19,"level":19,"exp":10000,"cash":1000,"extracash":300},{"id":20,"level":20,"exp":10000,"cash":1000,"extracash":300}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/MoneyboxLevel.json b/src/HttpServer/jsonconf/MoneyboxLevel.json new file mode 100644 index 0000000..2e80edd --- /dev/null +++ b/src/HttpServer/jsonconf/MoneyboxLevel.json @@ -0,0 +1 @@ +[{"id":1,"level":1,"min":120,"max":900},{"id":2,"level":2,"min":120,"max":1000},{"id":3,"level":3,"min":120,"max":1100},{"id":4,"level":4,"min":120,"max":1200},{"id":5,"level":5,"min":120,"max":1300},{"id":6,"level":6,"min":120,"max":1400},{"id":7,"level":7,"min":120,"max":1500},{"id":8,"level":8,"min":120,"max":1600},{"id":9,"level":9,"min":120,"max":1700},{"id":10,"level":10,"min":120,"max":1800}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/MoneyboxTimes.json b/src/HttpServer/jsonconf/MoneyboxTimes.json new file mode 100644 index 0000000..724caef --- /dev/null +++ b/src/HttpServer/jsonconf/MoneyboxTimes.json @@ -0,0 +1 @@ +[{"id":1,"times":1,"login":1,"score":20000},{"id":2,"times":2,"login":2,"score":20000},{"id":3,"times":2,"login":3,"score":20000},{"id":4,"times":3,"login":4,"score":20000},{"id":5,"times":3,"login":5,"score":20000},{"id":6,"times":4,"login":6,"score":20000}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/RoundCoin.json b/src/HttpServer/jsonconf/RoundCoin.json new file mode 100644 index 0000000..33f14ef --- /dev/null +++ b/src/HttpServer/jsonconf/RoundCoin.json @@ -0,0 +1 @@ +[{"id":1,"cash":30},{"id":2,"cash":30},{"id":3,"cash":30},{"id":4,"cash":30},{"id":5,"cash":30},{"id":6,"cash":30},{"id":7,"cash":30},{"id":8,"cash":30},{"id":9,"cash":30},{"id":10,"cash":30},{"id":11,"cash":30},{"id":12,"cash":30},{"id":13,"cash":30},{"id":14,"cash":30},{"id":15,"cash":30},{"id":16,"cash":30},{"id":17,"cash":30},{"id":18,"cash":30},{"id":19,"cash":30},{"id":20,"cash":30},{"id":21,"cash":30},{"id":22,"cash":30},{"id":23,"cash":30},{"id":24,"cash":30},{"id":25,"cash":30},{"id":26,"cash":30},{"id":27,"cash":30},{"id":28,"cash":30},{"id":29,"cash":30},{"id":30,"cash":30},{"id":31,"cash":30},{"id":32,"cash":30},{"id":33,"cash":30},{"id":34,"cash":30},{"id":35,"cash":30},{"id":36,"cash":30},{"id":37,"cash":30},{"id":38,"cash":30},{"id":39,"cash":30},{"id":40,"cash":30},{"id":41,"cash":30},{"id":42,"cash":30},{"id":43,"cash":30},{"id":44,"cash":30},{"id":45,"cash":30},{"id":46,"cash":30},{"id":47,"cash":30},{"id":48,"cash":30},{"id":49,"cash":30},{"id":50,"cash":30},{"id":51,"cash":30},{"id":52,"cash":30},{"id":53,"cash":30},{"id":54,"cash":30},{"id":55,"cash":30},{"id":56,"cash":30},{"id":57,"cash":30},{"id":58,"cash":30},{"id":59,"cash":30},{"id":60,"cash":30},{"id":61,"cash":30},{"id":62,"cash":30},{"id":63,"cash":30},{"id":64,"cash":30},{"id":65,"cash":30},{"id":66,"cash":30},{"id":67,"cash":30},{"id":68,"cash":30},{"id":69,"cash":30},{"id":70,"cash":30},{"id":71,"cash":30},{"id":72,"cash":30},{"id":73,"cash":30},{"id":74,"cash":30},{"id":75,"cash":30},{"id":76,"cash":30},{"id":77,"cash":30},{"id":78,"cash":30},{"id":79,"cash":30},{"id":80,"cash":30},{"id":81,"cash":30},{"id":82,"cash":30},{"id":83,"cash":30},{"id":84,"cash":30},{"id":85,"cash":30},{"id":86,"cash":30},{"id":87,"cash":30},{"id":88,"cash":30},{"id":89,"cash":30},{"id":90,"cash":30},{"id":91,"cash":30},{"id":92,"cash":30},{"id":93,"cash":30},{"id":94,"cash":30},{"id":95,"cash":30},{"id":96,"cash":30},{"id":97,"cash":30},{"id":98,"cash":30},{"id":99,"cash":30},{"id":100,"cash":30},{"id":101,"cash":30},{"id":102,"cash":30},{"id":103,"cash":30},{"id":104,"cash":30},{"id":105,"cash":30},{"id":106,"cash":30},{"id":107,"cash":30},{"id":108,"cash":30},{"id":109,"cash":30},{"id":110,"cash":30},{"id":111,"cash":30},{"id":112,"cash":30},{"id":113,"cash":30},{"id":114,"cash":30},{"id":115,"cash":30},{"id":116,"cash":30},{"id":117,"cash":30},{"id":118,"cash":30},{"id":119,"cash":30},{"id":120,"cash":30},{"id":121,"cash":30},{"id":122,"cash":30},{"id":123,"cash":30},{"id":124,"cash":30},{"id":125,"cash":30},{"id":126,"cash":30},{"id":127,"cash":30},{"id":128,"cash":30},{"id":129,"cash":30},{"id":130,"cash":30},{"id":131,"cash":30},{"id":132,"cash":30},{"id":133,"cash":30},{"id":134,"cash":30},{"id":135,"cash":30},{"id":136,"cash":30},{"id":137,"cash":30},{"id":138,"cash":30},{"id":139,"cash":30},{"id":140,"cash":30},{"id":141,"cash":30},{"id":142,"cash":30},{"id":143,"cash":30},{"id":144,"cash":30},{"id":145,"cash":30},{"id":146,"cash":30},{"id":147,"cash":30},{"id":148,"cash":30},{"id":149,"cash":30},{"id":150,"cash":30}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/WithdrawConfig.json b/src/HttpServer/jsonconf/WithdrawConfig.json new file mode 100644 index 0000000..83fe0c7 --- /dev/null +++ b/src/HttpServer/jsonconf/WithdrawConfig.json @@ -0,0 +1 @@ +[{"id":1,"money":0.3,"coin":3000,"task":0,"level":1,"new":1},{"id":2,"money":0.5,"coin":5000,"task":1,"level":2,"new":1},{"id":3,"money":1.5,"coin":15000,"task":2,"level":3,"new":1},{"id":4,"money":5,"coin":50000,"task":3,"level":4,"new":1},{"id":5,"money":10,"coin":100000,"task":4,"level":5,"new":1},{"id":6,"money":20,"coin":200000,"task":5,"level":6,"new":0},{"id":7,"money":50,"coin":500000,"task":6,"level":7,"new":0},{"id":8,"money":100,"coin":1000000,"task":7,"level":8,"new":0}] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/jsonconf.go b/src/HttpServer/jsonconf/jsonconf.go new file mode 100644 index 0000000..9f25628 --- /dev/null +++ b/src/HttpServer/jsonconf/jsonconf.go @@ -0,0 +1,57 @@ +package jsonconf + +import ( + "common/logger" + "encoding/json" + "io/ioutil" + "os" +) + +var ( + g_jsonconf = new(GameConfig) +) + +type AchieveDesc struct { + Id int `json:"id"` + Task int `json:"task"` + Num int `json:"num"` + Reward []int `json:"reward"` + +} + +type GameConfig struct { + AchieventConfig []AchieveDesc +} + +func GetJsonConf() *GameConfig { + return g_jsonconf +} + + +func file_get_contents(path string) ([]byte, error) { + f, err := os.Open(path) + if err != nil { + return nil, err + } + return ioutil.ReadAll(f) +} + +func LoadJsonConf() error { + //pconf := &GameConfig{} + //加载第一个配置 + path := "./AchievementConfig.json" + content, err := file_get_contents(path) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + err = json.Unmarshal([]byte(content), &g_jsonconf.AchieventConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) + return err +} \ No newline at end of file diff --git a/src/HttpServer/main/main.go b/src/HttpServer/main/main.go index 5210ff9..22b49fb 100644 --- a/src/HttpServer/main/main.go +++ b/src/HttpServer/main/main.go @@ -2,6 +2,7 @@ package main import ( "HttpServer/conf" + "HttpServer/jsonconf" "mysql" "HttpServer/logic" @@ -60,6 +61,12 @@ func main() { return } + err = jsonconf.LoadJsonConf() + if err != nil { + logger.Error("err load jsonconfl err=%v", err) + return + } + //測試 logic.Test() go logic.StartHttpServe() -- libgit2 0.21.0