From 10b33bd505ca3735cf6364366f6a387869fe89a5 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 27 Jun 2023 11:01:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=AE=B1=E8=B5=B0=E6=96=B0=E6=8E=89?= =?UTF-8?q?=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_huntingopentime.json | 8 +- bin/json/game_pandamasjx.json | 96 +++++++++++++------- bin/json/game_skillbuff.json | 70 +++++++------- modules/items/modelitems.go | 4 +- modules/sys/config.go | 9 +- sys/configure/structs/Game.PandamasJxData.go | 2 + 6 files changed, 114 insertions(+), 75 deletions(-) diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index 9129e0b34..7c83cf884 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -20,7 +20,7 @@ }, "opentimetext": { "key": "hunting_opentime_opentimetext_1", - "text": "开启时间：1、2" + "text": "开启时间：周一，周二" }, "bg": "fb_pt_jxxx", "icon": "wjyz_img016", @@ -47,7 +47,7 @@ }, "opentimetext": { "key": "hunting_opentime_opentimetext_2", - "text": "开启时间：3、4" + "text": "开启时间：周三，周四" }, "bg": "fb_pt_hl", "icon": "wjyz_img015", @@ -74,7 +74,7 @@ }, "opentimetext": { "key": "hunting_opentime_opentimetext_3", - "text": "开启时间：5、6" + "text": "开启时间：周五，周六" }, "bg": "fb_pt_dc", "icon": "wjyz_img014", @@ -101,7 +101,7 @@ }, "opentimetext": { "key": "hunting_opentime_opentimetext_4", - "text": "开启时间：1、7" + "text": "开启时间：周日，周一" }, "bg": "fb_pt_tkhx", "icon": "wjyz_img017", diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index a83e35061..bebacb427 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -32,7 +32,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "13002" }, { "id": "10002", @@ -67,7 +68,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "13001" }, { "id": "10003", @@ -102,7 +104,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "44002" }, { "id": "10004", @@ -137,7 +140,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "24005" }, { "id": "10005", @@ -172,7 +176,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "14005" }, { "id": "10006", @@ -207,7 +212,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "44006" }, { "id": "10007", @@ -242,7 +248,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "45003" }, { "id": "10008", @@ -288,7 +295,8 @@ "num": [ 1, 1 - ] + ], + "ban_hero": "35002" }, { "id": "10009", @@ -334,7 +342,8 @@ "num": [ 1, 1 - ] + ], + "ban_hero": "45004" }, { "id": "10010", @@ -369,7 +378,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "35001" }, { "id": "10011", @@ -415,7 +425,8 @@ "num": [ 1, 3 - ] + ], + "ban_hero": "25001" }, { "id": "10012", @@ -461,7 +472,8 @@ "num": [ 1, 5 - ] + ], + "ban_hero": "45001" }, { "id": "20001", @@ -507,7 +519,8 @@ "num": [ 1, 15 - ] + ], + "ban_hero": "" }, { "id": "20002", @@ -542,7 +555,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "" }, { "id": "20003", @@ -577,7 +591,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "" }, { "id": "20004", @@ -612,7 +627,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "" }, { "id": "20005", @@ -658,7 +674,8 @@ "num": [ 2, 2 - ] + ], + "ban_hero": "" }, { "id": "20006", @@ -704,7 +721,8 @@ "num": [ 2, 2 - ] + ], + "ban_hero": "" }, { "id": "20007", @@ -750,7 +768,8 @@ "num": [ 2, 2 - ] + ], + "ban_hero": "" }, { "id": "20008", @@ -796,7 +815,8 @@ "num": [ 2, 2 - ] + ], + "ban_hero": "" }, { "id": "20009", @@ -842,7 +862,8 @@ "num": [ 10, 10 - ] + ], + "ban_hero": "" }, { "id": "20010", @@ -888,7 +909,8 @@ "num": [ 1, 1 - ] + ], + "ban_hero": "" }, { "id": "20011", @@ -934,7 +956,8 @@ "num": [ 1, 3 - ] + ], + "ban_hero": "" }, { "id": "20012", @@ -980,7 +1003,8 @@ "num": [ 1, 5 - ] + ], + "ban_hero": "" }, { "id": "20013", @@ -1026,7 +1050,8 @@ "num": [ 1, 2 - ] + ], + "ban_hero": "" }, { "id": "20014", @@ -1061,7 +1086,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "" }, { "id": "20015", @@ -1096,7 +1122,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "" }, { "id": "20016", @@ -1131,7 +1158,8 @@ "probability": 0, "ants": [], "wget": [], - "num": [] + "num": [], + "ban_hero": "" }, { "id": "20017", @@ -1175,7 +1203,8 @@ "num": [ 1, 12 - ] + ], + "ban_hero": "" }, { "id": "20018", @@ -1219,7 +1248,8 @@ "num": [ 1, 12 - ] + ], + "ban_hero": "" }, { "id": "20019", @@ -1263,7 +1293,8 @@ "num": [ 1, 3 - ] + ], + "ban_hero": "" }, { "id": "20020", @@ -1309,6 +1340,7 @@ "num": [ 1, 5 - ] + ], + "ban_hero": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index d417df254..e05ee25fe 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -300,7 +300,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 1 ], "AddEffect": false, "RemoveType": true, @@ -569,7 +569,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 2 + 1 ], "AddEffect": false, "RemoveType": true, @@ -655,7 +655,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 0, + 1, 5 ], "AddEffect": false, @@ -1276,7 +1276,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1309,7 +1309,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1396,7 +1396,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1424,7 +1424,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1455,7 +1455,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1514,7 +1514,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1635,7 +1635,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 2 ], "AddEffect": false, "RemoveType": true, @@ -1665,7 +1665,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1756,7 +1756,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -1818,7 +1818,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -1849,7 +1849,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -1911,7 +1911,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -1942,7 +1942,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -1973,7 +1973,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2035,7 +2035,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2066,7 +2066,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2128,7 +2128,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2159,7 +2159,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2190,7 +2190,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2252,7 +2252,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2283,7 +2283,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2345,7 +2345,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2376,7 +2376,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2407,7 +2407,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2438,7 +2438,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2469,7 +2469,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2500,7 +2500,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2531,7 +2531,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2562,7 +2562,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -2593,7 +2593,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 1 + 3 ], "AddEffect": false, "RemoveType": false, @@ -3203,7 +3203,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, @@ -3292,7 +3292,7 @@ "RelyCheckArgu": [], "CoexistCheckArgu": [], "Effect": [ - 3 + 0 ], "AddEffect": false, "RemoveType": false, diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 3dfbd2d01..dca9c3fd9 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -753,7 +753,9 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun return } case itemuse_randombox: //宝箱 - if prop = this.module.configure.GetDropData(itemcf.BoxId); prop == nil { + user := this.module.ModuleUser.GetUser(session.GetUserId()) + if prop := this.module.ModuleTools.GetGroupDataByLottery(itemcf.BoxId, user.Vip, user.Lv); len(prop) > 0 { + //if prop = this.module.configure.GetDropData(itemcf.BoxId); prop == nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), diff --git a/modules/sys/config.go b/modules/sys/config.go index c461793c0..6897ffba9 100644 --- a/modules/sys/config.go +++ b/modules/sys/config.go @@ -33,12 +33,15 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } func (this *configureComp) LoadCondConfig() { - this.maplv = make(map[int32][]string, 0) - this.maptask = make(map[int32][]string, 0) - this.mapmline = make(map[int32][]string, 0) + if v, err := this.GetConfigure(gameOpencond); err == nil { if data, ok := v.(*cfg.GameOpencond); ok { + this.hlock.Lock() + this.maplv = make(map[int32][]string, 0) + this.maptask = make(map[int32][]string, 0) + this.mapmline = make(map[int32][]string, 0) + defer this.hlock.Unlock() for _, v := range data.GetDataList() { for _, v1 := range v.Main { if v.ActivateType == 2 { diff --git a/sys/configure/structs/Game.PandamasJxData.go b/sys/configure/structs/Game.PandamasJxData.go index ac71b9884..71ae6056e 100644 --- a/sys/configure/structs/Game.PandamasJxData.go +++ b/sys/configure/structs/Game.PandamasJxData.go @@ -32,6 +32,7 @@ type GamePandamasJxData struct { Ants []*Gameatn Wget []int32 Num []int32 + BanHero string } const TypeId_GamePandamasJxData = -1003744967 @@ -114,6 +115,7 @@ func (_v *GamePandamasJxData)Deserialize(_buf map[string]interface{}) (err error } } + { var _ok_ bool; if _v.BanHero, _ok_ = _buf["ban_hero"].(string); !_ok_ { err = errors.New("ban_hero error"); return } } return }