diff --git a/cmd/robot/story.go b/cmd/robot/story.go index f363baeed..c3a06664b 100644 --- a/cmd/robot/story.go +++ b/cmd/robot/story.go @@ -3,7 +3,7 @@ package robot import ( "fmt" "go_dreamfactory/comm" - "go_dreamfactory/modules/story" + "go_dreamfactory/modules/mainline" "go_dreamfactory/pb" "google.golang.org/protobuf/proto" @@ -14,7 +14,7 @@ var ( { desc: "主线数据", mainType: string(comm.ModuleMainline), - subType: story.MainlineGetListResp, + subType: mainline.MainlineGetListResp, req: &pb.MainlineGetListReq{}, rsp: &pb.MainlineGetListResp{}, print: func(rsp proto.Message) { @@ -27,7 +27,7 @@ var ( }, { desc: "主线详情", mainType: string(comm.ModuleMainline), - subType: story.MainlineChallengeResp, + subType: mainline.MainlineChallengeResp, req: &pb.MainlineChallengeReq{ ChapterId: 1, MainlineId: 1, diff --git a/modules/story/api.go b/modules/mainline/api.go similarity index 97% rename from modules/story/api.go rename to modules/mainline/api.go index b310acc69..d6bf71a9d 100644 --- a/modules/story/api.go +++ b/modules/mainline/api.go @@ -1,4 +1,4 @@ -package story +package mainline import ( "go_dreamfactory/lego/core" diff --git a/modules/story/api_challenge.go b/modules/mainline/api_challenge.go similarity index 96% rename from modules/story/api_challenge.go rename to modules/mainline/api_challenge.go index e6954df73..fefd1cf93 100644 --- a/modules/story/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -1,4 +1,4 @@ -package story +package mainline import ( "go_dreamfactory/comm" @@ -92,9 +92,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle } if curChapter.ChapterId == int32(req.ChapterId) && curChapter.MainlineId == int32(req.MainlineId) { update := map[string]interface{}{ - "storyId": req.MainlineId, - "ChapterId": req.ChapterId, - "branchID": curChapter.BranchID, + "mainlineId": req.MainlineId, + "ChapterId": req.ChapterId, + "branchID": curChapter.BranchID, } err = this.module.modelMainline.modifyMainlineData(session.GetUserId(), curChapter.Id, update) } else { diff --git a/modules/story/api_getlist.go b/modules/mainline/api_getlist.go similarity index 97% rename from modules/story/api_getlist.go rename to modules/mainline/api_getlist.go index 7d5922259..25823d3d1 100644 --- a/modules/story/api_getlist.go +++ b/modules/mainline/api_getlist.go @@ -1,4 +1,4 @@ -package story +package mainline import ( "go_dreamfactory/comm" diff --git a/modules/story/comp_configure.go b/modules/mainline/comp_configure.go similarity index 99% rename from modules/story/comp_configure.go rename to modules/mainline/comp_configure.go index b65fd4179..e519ecdcc 100644 --- a/modules/story/comp_configure.go +++ b/modules/mainline/comp_configure.go @@ -1,4 +1,4 @@ -package story +package mainline import ( "go_dreamfactory/lego/core" diff --git a/modules/story/model_story.go b/modules/mainline/model_story.go similarity index 94% rename from modules/story/model_story.go rename to modules/mainline/model_story.go index b42da295d..6ebd19228 100644 --- a/modules/story/model_story.go +++ b/modules/mainline/model_story.go @@ -1,4 +1,4 @@ -package story +package mainline import ( "go_dreamfactory/lego/core" @@ -7,7 +7,7 @@ import ( ) const ( //Redis - TableMainline core.SqlTable = "story" + TableMainline core.SqlTable = "mainline" ) type ModelMainline struct { diff --git a/modules/story/module.go b/modules/mainline/module.go similarity index 99% rename from modules/story/module.go rename to modules/mainline/module.go index ead69e980..2f6f35d8c 100644 --- a/modules/story/module.go +++ b/modules/mainline/module.go @@ -1,4 +1,4 @@ -package story +package mainline import ( "go_dreamfactory/comm" diff --git a/modules/modulebase.go b/modules/modulebase.go index d3a7f1209..bf879b430 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -223,6 +223,7 @@ func (this *ModuleBase) DispenseRes(uid string, res []*cfg.Game_atn, bPush bool) Describe: "发放资源", } for _, v := range res { + this.Debugf("发放资源 DispenseRes:A = %s, T:%s, N:%d", v.A, v.T, v.N) if v.A == comm.AttrType { //用户属性资源 code = this.ModuleUser.AddAttributeValue(uid, v.T, v.N, bPush) diff --git a/services/worker/main.go b/services/worker/main.go index 9813e9099..acca143f8 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -8,9 +8,9 @@ import ( "go_dreamfactory/modules/hero" "go_dreamfactory/modules/items" "go_dreamfactory/modules/mail" + "go_dreamfactory/modules/mainline" "go_dreamfactory/modules/notify" "go_dreamfactory/modules/shop" - "go_dreamfactory/modules/story" "go_dreamfactory/modules/task" "go_dreamfactory/modules/user" "go_dreamfactory/services" @@ -49,7 +49,7 @@ func main() { hero.NewModule(), equipment.NewModule(), task.NewModule(), - story.NewModule(), + mainline.NewModule(), shop.NewModule(), notify.NewModule(), )