From 9069e57a779eeb68825ba4cdd04a0dcdf23a4584 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 18 Jul 2023 10:03:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/warorder/api_receive.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/warorder/api_receive.go b/modules/warorder/api_receive.go index ec923b355..858ada13e 100644 --- a/modules/warorder/api_receive.go +++ b/modules/warorder/api_receive.go @@ -54,7 +54,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR return } - days = int32(utils.DiffDays(configure.Now().Unix(), info.Opentime)) + days = int32(utils.DiffDays(configure.Now().Unix(), info.Opentime)) + 1 awards = make([]*cfg.Gameatn, 0) for _, v := range confs { if v.Parameter <= days { From 28c7975613b70b691a3ee700c1c24cc046c8146f Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 18 Jul 2023 10:30:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_recharge.json | 19 +++++++++++ bin/json/game_skillafteratk.json | 47 ++++++++++++++++++++++++++ bin/json/game_skillatk.json | 58 ++++++++++++++++++++++++++++++++ comm/const.go | 3 ++ modules/tools/modelGlobal.go | 19 +++++++++++ 5 files changed, 146 insertions(+) create mode 100644 modules/tools/modelGlobal.go diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 6e1da60f2..41a52edf6 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -630,5 +630,24 @@ "text": "0", "show": "98元", "image": "" + }, + { + "id": "drawcard pack1", + "editionid": "debug", + "recharge_type": 5, + "monetaryunit": "￥", + "amount": 3000, + "vipexp": [ + { + "a": "attr", + "t": "vipexp", + "n": 300 + } + ], + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "30元", + "image": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 858eb0d12..8424fd739 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -42051,5 +42051,52 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 254014111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2000 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 254014211, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001008, + 1000, + 1, + 2 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 6f11d9245..2b2530f6b 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -29914,5 +29914,63 @@ }, "buffid": [], "map": "" + }, + { + "id": 154014111, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_154014111", + "text": "挚爱甜心" + }, + "ico": "jn_54014_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 254014111 + ] + }, + "Desc": { + "key": "skill_skill_atk_Desc_154014111_1", + "text": "对敌方1个目标发起攻击，造成攻击力 200%的伤害。" + }, + "buffid": [], + "map": "" + }, + { + "id": 154014211, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_154014211", + "text": "恋如糖雨" + }, + "ico": "jn_54014_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 254014211 + ] + }, + "Desc": { + "key": "skill_skill_atk_Desc_154014211_1", + "text": "对全体己方队友附加2回合[color=#37d8a9]攻击提升[/color]状态。" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 656d84b7f..3e6a2a569 100644 --- a/comm/const.go +++ b/comm/const.go @@ -293,6 +293,9 @@ const ( ///工会战 TableUniongve = "uniongve" + + //全局表 + TableGlobal = "global" ) // RPC服务接口定义处 diff --git a/modules/tools/modelGlobal.go b/modules/tools/modelGlobal.go new file mode 100644 index 000000000..b6a5a5988 --- /dev/null +++ b/modules/tools/modelGlobal.go @@ -0,0 +1,19 @@ +package tools + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +type modelGlobal struct { + modules.MCompModel + module *Tools +} + +func (this *modelGlobal) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TableGlobal + this.module = module.(*Tools) + return +} From 175c3391f3f89c2410b84c063ee1b8bbcd6db6a5 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 18 Jul 2023 10:58:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 5 +++++ modules/tools/modelGlobal.go | 20 ++++++++++++++++++++ modules/tools/module.go | 12 +++++++++++- modules/warorder/api_receive.go | 13 ++++++++++++- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index c42d22cc8..e1ac856d1 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -500,6 +500,11 @@ type ( GetPriceGroupLen(pricegroupId int32) (count int32, err error) GetGrormetLlame(id string) (data int32, err error) GetGroupDataByLotteryId(id int32) (data *cfg.GameLotteryData, err error) + + //读取全局表 db层 + GetGlobalData(key string, v interface{}) (err error) + //更新全局表 db层 + UpdateGlobalData(key string, v interface{}) (err error) } IReputation interface { diff --git a/modules/tools/modelGlobal.go b/modules/tools/modelGlobal.go index b6a5a5988..eb1fbe864 100644 --- a/modules/tools/modelGlobal.go +++ b/modules/tools/modelGlobal.go @@ -3,7 +3,11 @@ package tools import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" + + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/mongo/options" ) type modelGlobal struct { @@ -17,3 +21,19 @@ func (this *modelGlobal) Init(service core.IService, module core.IModule, comp c this.module = module.(*Tools) return } + +// 查询全局配置 +func (this *modelGlobal) GetGlobalData(key string, v interface{}) (err error) { + if err = this.DBModel.DB.FindOne(core.SqlTable(this.TableName), bson.M{"_id": key}).Decode(v); err != nil { + this.module.Error("GetGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()}) + } + return +} + +// 更新全局配置 +func (this *modelGlobal) UpdateGlobalData(key string, v interface{}) (err error) { + if _, err = this.DBModel.DB.UpdateOne(core.SqlTable(this.TableName), bson.M{"_id": key}, v, options.Update().SetUpsert(true)); err != nil { + this.module.Error("GetGlobalData err", log.Field{Key: "key", Value: key}, log.Field{Key: "err", Value: err.Error()}) + } + return +} diff --git a/modules/tools/module.go b/modules/tools/module.go index c4d7c8328..8070a85da 100644 --- a/modules/tools/module.go +++ b/modules/tools/module.go @@ -14,7 +14,8 @@ func NewModule() core.IModule { type Tools struct { modules.ModuleBase - configure *MCompConfigure + configure *MCompConfigure + modelGlobal *modelGlobal } // 模块名 @@ -38,6 +39,7 @@ func (this *Tools) Start() (err error) { func (this *Tools) OnInstallComp() { this.ModuleBase.OnInstallComp() this.configure = this.RegisterComp(new(MCompConfigure)).(*MCompConfigure) + this.modelGlobal = this.RegisterComp(new(modelGlobal)).(*modelGlobal) } // 随机机器人 @@ -77,3 +79,11 @@ func (this *Tools) GetPriceGroupLen(pricegroupId int32) (count int32, err error) func (this *Tools) GetGrormetLlame(id string) (data int32, err error) { return this.configure.GetGrormetLlame(id) } + +func (this *Tools) GetGlobalData(key string, v interface{}) (err error) { + return this.modelGlobal.GetGlobalData(key, v) +} + +func (this *Tools) UpdateGlobalData(key string, v interface{}) (err error) { + return this.modelGlobal.UpdateGlobalData(key, v) +} diff --git a/modules/warorder/api_receive.go b/modules/warorder/api_receive.go index 858ada13e..00a47b098 100644 --- a/modules/warorder/api_receive.go +++ b/modules/warorder/api_receive.go @@ -22,6 +22,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR info *pb.Warorder confs []*cfg.GamePassCheckData awards []*cfg.Gameatn + ads []*pb.UserAssets = make([]*pb.UserAssets, 0) days int32 err error ok bool @@ -60,10 +61,20 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR if v.Parameter <= days { if info.Freeprogress < v.Parameter { awards = append(awards, v.FreeReward) + ads = append(ads, &pb.UserAssets{ + A: v.FreeReward.A, + T: v.FreeReward.T, + N: v.FreeReward.N, + }) } if info.Vip { if info.Payprogress < v.Parameter { awards = append(awards, v.PayReward) + ads = append(ads, &pb.UserAssets{ + A: v.PayReward.A, + T: v.PayReward.T, + N: v.PayReward.N, + }) } } } @@ -75,6 +86,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR if errdata = this.module.DispenseRes(session, awards, true); errdata != nil { return } - session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Info: info}) + session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Info: info, Award: ads}) return } From 887edc522080623375930dabf76e3123265c7846 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 18 Jul 2023 11:00:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_recharge.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 41a52edf6..c7103590e 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -632,7 +632,7 @@ "image": "" }, { - "id": "drawcard pack1", + "id": "drawcard_pack1", "editionid": "debug", "recharge_type": 5, "monetaryunit": "￥",