diff --git a/bin/json/game_global.json b/bin/json/game_global.json index c7beb46be..a1b8c1553 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -274,8 +274,8 @@ ], "run_horsetime1": 3, "run_horsetime2": 10, - "boy_headPortrait": "1", - "girl_headPortrait": "2", + "boy_headPortrait": "action_44006", + "girl_headPortrait": "action_11011", "namecolor": "#000080" } ] \ No newline at end of file diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json index cf1064959..3e03893c4 100644 --- a/bin/json/game_playerlv.json +++ b/bin/json/game_playerlv.json @@ -223,5 +223,434 @@ "n": 1000 } ] + }, + { + "lv": 22, + "exp": 22000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 23, + "exp": 23000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 24, + "exp": 24000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 25, + "exp": 25000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 26, + "exp": 26000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 27, + "exp": 27000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 28, + "exp": 28000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 29, + "exp": 29000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 30, + "exp": 30000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 31, + "exp": 31000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 32, + "exp": 32000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 33, + "exp": 33000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 34, + "exp": 34000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 35, + "exp": 35000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 36, + "exp": 36000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 37, + "exp": 37000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 38, + "exp": 38000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 39, + "exp": 39000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 40, + "exp": 40000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 41, + "exp": 41000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 42, + "exp": 42000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 43, + "exp": 43000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 44, + "exp": 44000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 45, + "exp": 45000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 46, + "exp": 46000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 47, + "exp": 47000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 48, + "exp": 48000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 49, + "exp": 49000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 50, + "exp": 50000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 51, + "exp": 51000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 52, + "exp": 52000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 53, + "exp": 53000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 54, + "exp": 54000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 55, + "exp": 55000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 56, + "exp": 56000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 57, + "exp": 57000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 58, + "exp": 58000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 59, + "exp": 59000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "lv": 60, + "exp": 60000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] } ] \ No newline at end of file diff --git a/modules/mail/model_mail.go b/modules/mail/model_mail.go index d558fbe1d..93794043b 100644 --- a/modules/mail/model_mail.go +++ b/modules/mail/model_mail.go @@ -48,7 +48,7 @@ func (this *modelMail) MailInsertUserMail(mail *pb.DBMailData) (err error) { mail.ObjId = primitive.NewObjectID().Hex() mail.Check = false - mail.Reward = false + mail.Reward = true if len(mail.GetItems()) > 0 { mail.Reward = false diff --git a/modules/mail/module.go b/modules/mail/module.go index 68136297f..8e1b686e2 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -58,7 +58,7 @@ func (this *Mail) CreateNewMail(session comm.IUserSession, mail *pb.DBMailData) dbModel := db.NewDBModel(comm.TableMail, time.Hour, conn) mail.ObjId = primitive.NewObjectID().Hex() mail.Check = false - mail.Reward = false + mail.Reward = true if len(mail.GetItems()) > 0 { mail.Reward = false @@ -95,7 +95,7 @@ func (this *Mail) SendNewMail(mail *pb.DBMailData, uid ...string) bool { dbModel := db.NewDBModel(comm.TableMail, time.Hour, conn) mail.ObjId = primitive.NewObjectID().Hex() mail.Check = false - mail.Reward = false + mail.Reward = true if len(mail.GetItems()) > 0 { mail.Reward = false @@ -110,7 +110,7 @@ func (this *Mail) SendNewMail(mail *pb.DBMailData, uid ...string) bool { mail.Uid = id mail.ObjId = primitive.NewObjectID().Hex() mail.Check = false - mail.Reward = false + mail.Reward = true if len(mail.GetItems()) > 0 { mail.Reward = false diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go index 5b8b59329..6bce20640 100644 --- a/modules/smithy/model_smithy.go +++ b/modules/smithy/model_smithy.go @@ -142,9 +142,9 @@ func (this *modelSmithy) CalculationSmithy(uid string, smithy *pb.DBSmithy) { smithy.Orders = append(smithy.Orders[:0], smithy.Orders[pos:]...) // 保存信息 mapData["items"] = smithy.Items - mapData["foods"] = smithy.Orders + mapData["orders"] = smithy.Orders mapData["orderCostTime"] = smithy.OrderCostTime - mapData["cookingFood"] = smithy.Clang // 正在做的 + mapData["clang"] = smithy.Clang // 正在做的 this.module.ModifySmithyData(uid, mapData) // 同步数据 } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index cb2212405..a708be3d9 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -146,10 +146,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod // 日常登录任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype7, 1) - // 每日签到检测 - //this.module.modelSign.checkResetSignData(session) - - //this.Sign(session, &pb.UserSignReq{}) // 检查特权 并发送每日邮件 this.module.ModulePrivilege.QueryPrivilege(session) //推送登录公告 @@ -164,20 +160,20 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod Check: false, Reward: false, } - fj := make([]*pb.UserAssets, 0) - atn1 := &pb.UserAssets{ - A: "hero", - T: "25001", - N: 1, - } - atn2 := &pb.UserAssets{ - A: "attr", - T: "gold", - N: 10000, - } - fj = append(fj, atn1) - fj = append(fj, atn2) - mail.Items = fj + // fj := make([]*pb.UserAssets, 0) + // atn1 := &pb.UserAssets{ + // A: "hero", + // T: "25001", + // N: 1, + // } + // atn2 := &pb.UserAssets{ + // A: "attr", + // T: "gold", + // N: 10000, + // } + // fj = append(fj, atn1) + // fj = append(fj, atn2) + // mail.Items = fj this.mail.CreateNewMail(session, mail) return