From 93b40d4b9895ff99117935fd24e4fae5b21a93bc Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 17:07:14 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E8=A7=A3=E9=94=81=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 2 +- modules/sys/model_sys.go | 9 ++++----- modules/sys/module.go | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/comm/const.go b/comm/const.go index f41170b71..ad686c601 100644 --- a/comm/const.go +++ b/comm/const.go @@ -999,7 +999,7 @@ const ( AddUpRecharge = 10 //累计充值 - // 特殊类型活动 只受活动开启限制 + // 特殊类型活动 只受活动开启限制 具体玩法 走excel 配置 HdTypeTurntable = 1001 //大转盘 HdCelebration = 1002 // 庆典活动 ) diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index d5bcc552e..aa41e0792 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -68,13 +68,12 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri } } case 5: - module, err := this.service.GetModule(comm.ModulePagoda) - if err != nil { - this.moduleSys.Debugln(err) + if !this.moduleSys.pagoda.CheckCompletePagoda(uid) { return "" } - if v, ok := module.(comm.IPagoda); ok { - if !v.CheckCompletePagoda(uid) { + case 6: // 查询工会等级 + if s := this.moduleSys.sociaty.GetSociaty(uid); s != nil { + if s.Lv < conf.Param { return "" } } diff --git a/modules/sys/module.go b/modules/sys/module.go index f4565d098..8ef31dfdf 100644 --- a/modules/sys/module.go +++ b/modules/sys/module.go @@ -20,6 +20,10 @@ type ModuleSys struct { service base.IRPCXService modelSys *ModelSys mainline comm.IMainline + + pagoda comm.IPagoda + + sociaty comm.ISociaty } func NewModule() core.IModule { @@ -54,6 +58,18 @@ func (this *ModuleSys) Start() (err error) { return } this.mainline = module.(comm.IMainline) + + if module, err = this.service.GetModule(comm.ModulePagoda); err != nil { + + return + } + this.pagoda = module.(comm.IPagoda) + + if module, err = this.service.GetModule(comm.ModuleSociaty); err != nil { + + return + } + this.sociaty = module.(comm.ISociaty) return } From 8a00c3798b333f0fded2ac6849a8bdf40b3727a2 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 17:27:39 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_caravancity.json | 12 +- bin/json/game_caravanreward.json | 2 +- bin/json/game_item.json | 43 ++ bin/json/game_lottery.json | 432 ++++++++++++++++++ bin/json/game_mainstage.json | 365 ++++++++++++++- bin/json/game_recharge.json | 42 ++ bin/json/game_shop.json | 5 +- bin/json/game_shopcentercontrol.json | 91 ++++ bin/json/game_shopcenterfund.json | 63 +++ bin/json/game_shopitem.json | 110 +---- sys/configure/structs/Game.MainStageData.go | 30 ++ .../structs/Game.ShopCenterControlData.go | 15 + 12 files changed, 1089 insertions(+), 121 deletions(-) diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json index 7e48ee691..3ed9c6931 100644 --- a/bin/json/game_caravancity.json +++ b/bin/json/game_caravancity.json @@ -9,7 +9,7 @@ { "a": "item", "t": "10000005", - "n": 10 + "n": 2 } ], "cityexlock": [ @@ -30,7 +30,7 @@ "key": "caravan_caravan_city_citytxt_1", "text": "贝特曼城生活着具有一定高级文明的人，他们用灶炉生火、能够引水洗澡、有独立的房间睡觉。" }, - "citytype": 1, + "citytype": 2, "citytypenum": 2, "special": [ "21000002", @@ -80,7 +80,7 @@ { "a": "item", "t": "10000005", - "n": 5 + "n": 2 } ], "cityexlock": [ @@ -152,7 +152,7 @@ { "a": "item", "t": "10000005", - "n": 7 + "n": 2 } ], "cityexlock": [ @@ -224,7 +224,7 @@ { "a": "item", "t": "10000005", - "n": 3 + "n": 2 } ], "cityexlock": [ @@ -295,7 +295,7 @@ { "a": "item", "t": "10000005", - "n": 6 + "n": 2 } ], "cityexlock": [ diff --git a/bin/json/game_caravanreward.json b/bin/json/game_caravanreward.json index 1d5d0f050..53b4d4063 100644 --- a/bin/json/game_caravanreward.json +++ b/bin/json/game_caravanreward.json @@ -61,7 +61,7 @@ { "a": "attr", "t": "gold", - "n": 10 + "n": 1 } ] } diff --git a/bin/json/game_item.json b/bin/json/game_item.json index a7c7bd4ef..cdc8ae0b6 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -16474,5 +16474,48 @@ "n": 1000 } ] + }, + { + "id": "17040001", + "name": { + "key": "item_item_name_375", + "text": "4星无极套装宝箱" + }, + "usetype": 5, + "color": 4, + "bagtype": 1, + "index": 18, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "effect_ui_bagwindow_2", + "modelName": "", + "box_id": 17111040, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [ + 122 + ], + "use_skip": 0, + "upper_limit": 99, + "img": "item_17030001", + "intr": { + "key": "item_item_intr_384", + "text": "开启后，可以获得一套4星装备。" + }, + "describe": { + "key": "item_item_describe_384", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index 7bb9487d7..947d3c0ce 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -24190,5 +24190,437 @@ "playerlvmin": 0, "playerlvmax": 0, "notice": 0 + }, + { + "id": 1009, + "lotteryid": 22003001, + "description": "首充礼包第一档第一天", + "type": 1, + "groupwt": 1000, + "groupid": 220023, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "hero", + "t": "14003", + "n": 1 + }, + "itemdes": "首充礼包第一档第一天", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1010, + "lotteryid": 22003001, + "description": "首充礼包第一档第一天", + "type": 1, + "groupwt": 1000, + "groupid": 220023, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第一档第一天", + "itemwt": 1000, + "min": 15, + "max": 15, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1011, + "lotteryid": 22003002, + "description": "首充礼包第一档第二天", + "type": 1, + "groupwt": 1000, + "groupid": 220024, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000001", + "n": 1 + }, + "itemdes": "首充礼包第一档第二天", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1012, + "lotteryid": 22003002, + "description": "首充礼包第一档第二天", + "type": 1, + "groupwt": 1000, + "groupid": 220024, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第一档第二天", + "itemwt": 1000, + "min": 15, + "max": 15, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1013, + "lotteryid": 22003003, + "description": "首充礼包第一档第三天", + "type": 1, + "groupwt": 1000, + "groupid": 220025, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000001", + "n": 1 + }, + "itemdes": "首充礼包第一档第三天", + "itemwt": 1000, + "min": 2, + "max": 2, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1014, + "lotteryid": 22003003, + "description": "首充礼包第一档第三天", + "type": 1, + "groupwt": 1000, + "groupid": 220025, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第一档第三天", + "itemwt": 1000, + "min": 15, + "max": 15, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1015, + "lotteryid": 22004001, + "description": "首充礼包第二档第一天", + "type": 1, + "groupwt": 1000, + "groupid": 220026, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000001", + "n": 1 + }, + "itemdes": "首充礼包第二档第一天", + "itemwt": 1000, + "min": 10, + "max": 10, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1016, + "lotteryid": 22004001, + "description": "首充礼包第二档第一天", + "type": 1, + "groupwt": 1000, + "groupid": 220026, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第二档第一天", + "itemwt": 1000, + "min": 40, + "max": 40, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1017, + "lotteryid": 22004002, + "description": "首充礼包第二档第二天", + "type": 1, + "groupwt": 1000, + "groupid": 220027, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "17060007", + "n": 1 + }, + "itemdes": "首充礼包第二档第二天", + "itemwt": 1000, + "min": 20, + "max": 20, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1018, + "lotteryid": 22004002, + "description": "首充礼包第二档第二天", + "type": 1, + "groupwt": 1000, + "groupid": 220027, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第二档第二天", + "itemwt": 1000, + "min": 30, + "max": 30, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1019, + "lotteryid": 22004003, + "description": "首充礼包第二档第三天", + "type": 1, + "groupwt": 1000, + "groupid": 220028, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "17060007", + "n": 1 + }, + "itemdes": "首充礼包第二档第三天", + "itemwt": 1000, + "min": 30, + "max": 30, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1020, + "lotteryid": 22004003, + "description": "首充礼包第二档第三天", + "type": 1, + "groupwt": 1000, + "groupid": 220028, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第二档第三天", + "itemwt": 1000, + "min": 30, + "max": 30, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1021, + "lotteryid": 22005001, + "description": "首充礼包第三档第一天", + "type": 1, + "groupwt": 1000, + "groupid": 220029, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "17040001", + "n": 1 + }, + "itemdes": "首充礼包第三档第一天", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1022, + "lotteryid": 22005001, + "description": "首充礼包第三档第一天", + "type": 1, + "groupwt": 1000, + "groupid": 220029, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第三档第一天", + "itemwt": 1000, + "min": 80, + "max": 80, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1023, + "lotteryid": 22005002, + "description": "首充礼包第三档第二天", + "type": 1, + "groupwt": 1000, + "groupid": 220030, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000001", + "n": 1 + }, + "itemdes": "首充礼包第三档第二天", + "itemwt": 1000, + "min": 4, + "max": 4, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1024, + "lotteryid": 22005002, + "description": "首充礼包第三档第二天", + "type": 1, + "groupwt": 1000, + "groupid": 220030, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第三档第二天", + "itemwt": 1000, + "min": 60, + "max": 60, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1025, + "lotteryid": 22005003, + "description": "首充礼包第三档第三天", + "type": 1, + "groupwt": 1000, + "groupid": 220031, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000001", + "n": 1 + }, + "itemdes": "首充礼包第三档第三天", + "itemwt": 1000, + "min": 6, + "max": 6, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1026, + "lotteryid": 22005003, + "description": "首充礼包第三档第三天", + "type": 1, + "groupwt": 1000, + "groupid": 220031, + "subtype": 2, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "10000009", + "n": 1 + }, + "itemdes": "首充礼包第三档第三天", + "itemwt": 1000, + "min": 60, + "max": 60, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 5986239d2..8e686c932 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -48,6 +48,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -130,6 +132,12 @@ "FormatList": [ 101011 ], + "helphero": [ + "25001" + ], + "banhero": [ + "13004" + ], "star": [ 1, 1, @@ -226,6 +234,12 @@ "FormatList": [ 101021 ], + "helphero": [ + "25001" + ], + "banhero": [ + "13004" + ], "star": [ 1, 1, @@ -322,6 +336,12 @@ "FormatList": [ 101031 ], + "helphero": [ + "25001" + ], + "banhero": [ + "13004" + ], "star": [ 1, 1, @@ -423,6 +443,12 @@ "FormatList": [ 101041 ], + "helphero": [ + "25001" + ], + "banhero": [ + "13004" + ], "star": [ 1, 1, @@ -499,6 +525,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -509,7 +537,7 @@ "chapterid": 11001, "group_id": 100106, "previous_group_id": [ - 100105 + 100104 ], "previoustage": 0, "Episodetype": 1, @@ -583,6 +611,10 @@ "FormatList": [ 101051 ], + "helphero": [ + "25001" + ], + "banhero": [], "star": [ 1, 1, @@ -651,6 +683,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -713,6 +747,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -775,6 +811,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -837,6 +875,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -895,6 +935,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -951,6 +993,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -1033,6 +1077,12 @@ "FormatList": [ 101061 ], + "helphero": [ + "25001" + ], + "banhero": [ + "44005" + ], "star": [ 1, 1, @@ -1132,6 +1182,12 @@ "FormatList": [ 101071 ], + "helphero": [ + "25001" + ], + "banhero": [ + "44005" + ], "star": [ 1, 1, @@ -1200,6 +1256,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -1267,6 +1325,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -1334,6 +1394,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -1391,6 +1453,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -1478,6 +1542,11 @@ "FormatList": [ 101081 ], + "helphero": [], + "banhero": [ + "44005", + "34004" + ], "star": [ 1, 1, @@ -1552,6 +1621,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -1644,6 +1715,8 @@ "FormatList": [ 122011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -1748,6 +1821,8 @@ "FormatList": [ 122021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -1852,6 +1927,8 @@ "FormatList": [ 122031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -1956,6 +2033,8 @@ "FormatList": [ 122041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2060,6 +2139,8 @@ "FormatList": [ 122051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2164,6 +2245,8 @@ "FormatList": [ 122061 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2268,6 +2351,8 @@ "FormatList": [ 122071 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2372,6 +2457,8 @@ "FormatList": [ 122081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2476,6 +2563,8 @@ "FormatList": [ 141011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2580,6 +2669,8 @@ "FormatList": [ 141021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2684,6 +2775,8 @@ "FormatList": [ 141031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2788,6 +2881,8 @@ "FormatList": [ 141041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2892,6 +2987,8 @@ "FormatList": [ 141051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -2996,6 +3093,8 @@ "FormatList": [ 141061 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3100,6 +3199,8 @@ "FormatList": [ 141071 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3204,6 +3305,8 @@ "FormatList": [ 141081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3308,6 +3411,8 @@ "FormatList": [ 161011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3412,6 +3517,8 @@ "FormatList": [ 161021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3516,6 +3623,8 @@ "FormatList": [ 161031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3620,6 +3729,8 @@ "FormatList": [ 161041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3724,6 +3835,8 @@ "FormatList": [ 161051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3828,6 +3941,8 @@ "FormatList": [ 161061 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -3932,6 +4047,8 @@ "FormatList": [ 161071 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -4036,6 +4153,8 @@ "FormatList": [ 161081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -4140,6 +4259,8 @@ "FormatList": [ 101071 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -4214,6 +4335,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4276,6 +4399,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4338,6 +4463,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4400,6 +4527,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4462,6 +4591,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4518,6 +4649,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4580,6 +4713,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4642,6 +4777,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4698,6 +4835,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -4790,6 +4929,8 @@ "FormatList": [ 103021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -4894,6 +5035,8 @@ "FormatList": [ 103031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -4998,6 +5141,8 @@ "FormatList": [ 103041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -5102,6 +5247,8 @@ "FormatList": [ 103051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -5206,6 +5353,8 @@ "FormatList": [ 103061 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -5310,6 +5459,8 @@ "FormatList": [ 103071 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -5414,6 +5565,8 @@ "FormatList": [ 103081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -5488,6 +5641,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5550,6 +5705,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5612,6 +5769,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5674,6 +5833,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5736,6 +5897,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5798,6 +5961,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5860,6 +6025,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5922,6 +6089,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -5984,6 +6153,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6046,6 +6217,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6108,6 +6281,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6170,6 +6345,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6262,6 +6439,8 @@ "FormatList": [ 102081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -6336,6 +6515,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6398,6 +6579,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6460,6 +6643,8 @@ "commonaward": [], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6552,6 +6737,8 @@ "FormatList": [ 104081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -6632,6 +6819,8 @@ ], "BattleReadyID": 0, "FormatList": [], + "helphero": [], + "banhero": [], "star": [], "star_type": [], "star_value": [], @@ -6724,6 +6913,8 @@ "FormatList": [ 102021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -6826,6 +7017,8 @@ "FormatList": [ 102031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -6928,6 +7121,8 @@ "FormatList": [ 102041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7030,6 +7225,8 @@ "FormatList": [ 102051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7132,6 +7329,8 @@ "FormatList": [ 1000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7234,6 +7433,8 @@ "FormatList": [ 1000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7336,6 +7537,8 @@ "FormatList": [ 102081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7438,6 +7641,8 @@ "FormatList": [ 123011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7540,6 +7745,8 @@ "FormatList": [ 103021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7642,6 +7849,8 @@ "FormatList": [ 103031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7744,6 +7953,8 @@ "FormatList": [ 103041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7846,6 +8057,8 @@ "FormatList": [ 103051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -7948,6 +8161,8 @@ "FormatList": [ 2000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8050,6 +8265,8 @@ "FormatList": [ 2000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8152,6 +8369,8 @@ "FormatList": [ 103081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8254,6 +8473,8 @@ "FormatList": [ 124011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8356,6 +8577,8 @@ "FormatList": [ 104021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8458,6 +8681,8 @@ "FormatList": [ 104031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8560,6 +8785,8 @@ "FormatList": [ 104041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8662,6 +8889,8 @@ "FormatList": [ 104051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8764,6 +8993,8 @@ "FormatList": [ 3000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8866,6 +9097,8 @@ "FormatList": [ 3000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -8968,6 +9201,8 @@ "FormatList": [ 104081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9070,6 +9305,8 @@ "FormatList": [ 125011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9172,6 +9409,8 @@ "FormatList": [ 105021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9274,6 +9513,8 @@ "FormatList": [ 105031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9376,6 +9617,8 @@ "FormatList": [ 105041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9478,6 +9721,8 @@ "FormatList": [ 105051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9580,6 +9825,8 @@ "FormatList": [ 4000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9682,6 +9929,8 @@ "FormatList": [ 4000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9784,6 +10033,8 @@ "FormatList": [ 105081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9886,6 +10137,8 @@ "FormatList": [ 126011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -9988,6 +10241,8 @@ "FormatList": [ 106021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10090,6 +10345,8 @@ "FormatList": [ 106031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10192,6 +10449,8 @@ "FormatList": [ 106041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10294,6 +10553,8 @@ "FormatList": [ 106051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10396,6 +10657,8 @@ "FormatList": [ 5000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10498,6 +10761,8 @@ "FormatList": [ 5000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10600,6 +10865,8 @@ "FormatList": [ 106081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10702,6 +10969,8 @@ "FormatList": [ 127011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10804,6 +11073,8 @@ "FormatList": [ 107021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -10906,6 +11177,8 @@ "FormatList": [ 107031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11008,6 +11281,8 @@ "FormatList": [ 107041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11110,6 +11385,8 @@ "FormatList": [ 107051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11212,6 +11489,8 @@ "FormatList": [ 6000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11314,6 +11593,8 @@ "FormatList": [ 6000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11416,6 +11697,8 @@ "FormatList": [ 107081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11518,6 +11801,8 @@ "FormatList": [ 128011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11620,6 +11905,8 @@ "FormatList": [ 108021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11722,6 +12009,8 @@ "FormatList": [ 108031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11824,6 +12113,8 @@ "FormatList": [ 108041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -11926,6 +12217,8 @@ "FormatList": [ 108051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12028,6 +12321,8 @@ "FormatList": [ 7000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12130,6 +12425,8 @@ "FormatList": [ 7000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12232,6 +12529,8 @@ "FormatList": [ 108081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12334,6 +12633,8 @@ "FormatList": [ 129011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12436,6 +12737,8 @@ "FormatList": [ 109021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12538,6 +12841,8 @@ "FormatList": [ 109031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12640,6 +12945,8 @@ "FormatList": [ 109041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12742,6 +13049,8 @@ "FormatList": [ 109051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12844,6 +13153,8 @@ "FormatList": [ 8000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -12946,6 +13257,8 @@ "FormatList": [ 8000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13048,6 +13361,8 @@ "FormatList": [ 109081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13150,6 +13465,8 @@ "FormatList": [ 130011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13252,6 +13569,8 @@ "FormatList": [ 110021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13354,6 +13673,8 @@ "FormatList": [ 110031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13456,6 +13777,8 @@ "FormatList": [ 110041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13558,6 +13881,8 @@ "FormatList": [ 110051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13660,6 +13985,8 @@ "FormatList": [ 9000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13762,6 +14089,8 @@ "FormatList": [ 9000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13864,6 +14193,8 @@ "FormatList": [ 110081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -13966,6 +14297,8 @@ "FormatList": [ 131011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14068,6 +14401,8 @@ "FormatList": [ 111021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14170,6 +14505,8 @@ "FormatList": [ 111031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14272,6 +14609,8 @@ "FormatList": [ 111041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14374,6 +14713,8 @@ "FormatList": [ 111051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14476,6 +14817,8 @@ "FormatList": [ 10000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14578,6 +14921,8 @@ "FormatList": [ 10000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14680,6 +15025,8 @@ "FormatList": [ 111081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14782,6 +15129,8 @@ "FormatList": [ 132011 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14884,6 +15233,8 @@ "FormatList": [ 112021 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -14986,6 +15337,8 @@ "FormatList": [ 112031 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -15088,6 +15441,8 @@ "FormatList": [ 112041 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -15190,6 +15545,8 @@ "FormatList": [ 112051 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -15292,6 +15649,8 @@ "FormatList": [ 11000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -15394,6 +15753,8 @@ "FormatList": [ 11000 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -15496,6 +15857,8 @@ "FormatList": [ 112081 ], + "helphero": [], + "banhero": [], "star": [ 1, 1, diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 1d66bdb85..6080468d3 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -582,5 +582,47 @@ "show": "30元", "image": "", "integral": 3800 + }, + { + "id": "passcheck_10", + "editionid": "debug", + "recharge_type": 6, + "monetaryunit": "￥", + "amount": 6000, + "vipexp": [], + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "6元", + "image": "", + "integral": 3600 + }, + { + "id": "passcheck_11", + "editionid": "debug", + "recharge_type": 30, + "monetaryunit": "￥", + "amount": 3000, + "vipexp": [], + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "30元", + "image": "", + "integral": 3700 + }, + { + "id": "passcheck_12", + "editionid": "debug", + "recharge_type": 68, + "monetaryunit": "￥", + "amount": 6800, + "vipexp": [], + "diamond_num_double": [], + "channel": "0", + "text": "0", + "show": "68元", + "image": "", + "integral": 3800 } ] \ No newline at end of file diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index c6525b5fb..c0ce4c435 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -143,10 +143,7 @@ 13001, 13002, 13003, - 13004, - 13005, - 13006, - 13007 + 13004 ] }, { diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json index 971a35be4..1bea57b6d 100644 --- a/bin/json/game_shopcentercontrol.json +++ b/bin/json/game_shopcentercontrol.json @@ -12,6 +12,7 @@ "text": "购买礼包并通关所有简单模式主线，总计可获得超值1200%奖励！" }, "point": "passcheck_3", + "props": [], "restriction": 1, "lv": 1, "on": 0, @@ -33,6 +34,7 @@ "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！" }, "point": "passcheck_4", + "props": [], "restriction": 1, "lv": 1, "on": 0, @@ -54,6 +56,7 @@ "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！" }, "point": "passcheck_5", + "props": [], "restriction": 1, "lv": 1, "on": 0, @@ -75,6 +78,7 @@ "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！" }, "point": "passcheck_6", + "props": [], "restriction": 1, "lv": 1, "on": 0, @@ -96,6 +100,7 @@ "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" }, "point": "passcheck_7", + "props": [], "restriction": 1, "lv": 1, "on": 1, @@ -117,6 +122,7 @@ "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" }, "point": "passcheck_8", + "props": [], "restriction": 1, "lv": 1, "on": 2, @@ -138,6 +144,7 @@ "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" }, "point": "passcheck_9", + "props": [], "restriction": 1, "lv": 1, "on": 1, @@ -145,5 +152,89 @@ "times": 0, "duration": 10, "loop": 1 + }, + { + "id": 10008, + "text": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3007% bonus!", + "text": "首充礼包1" + }, + "type": 6, + "index": 1, + "slogan": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3007% bonus!", + "text": "购买首充礼包，累计返利4888%" + }, + "point": "passcheck_10", + "props": [ + { + "a": "hero", + "t": "14003", + "n": 1 + } + ], + "restriction": 1, + "lv": 1, + "on": 0, + "time": 0, + "times": 0, + "duration": 0, + "loop": 0 + }, + { + "id": 10009, + "text": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!", + "text": "首充礼包2" + }, + "type": 6, + "index": 2, + "slogan": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!", + "text": "购买首充礼包，累计返利1688%" + }, + "point": "passcheck_11", + "props": [ + { + "a": "item", + "t": "17060007", + "n": 1 + } + ], + "restriction": 1, + "lv": 1, + "on": 0, + "time": 0, + "times": 0, + "duration": 0, + "loop": 0 + }, + { + "id": 10010, + "text": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!", + "text": "首充礼包3" + }, + "type": 6, + "index": 3, + "slogan": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!", + "text": "购买首充礼包，累计返利1088%" + }, + "point": "passcheck_12", + "props": [ + { + "a": "item", + "t": "17040001", + "n": 1 + } + ], + "restriction": 1, + "lv": 1, + "on": 0, + "time": 0, + "times": 0, + "duration": 0, + "loop": 0 } ] \ No newline at end of file diff --git a/bin/json/game_shopcenterfund.json b/bin/json/game_shopcenterfund.json index ba67f9b5d..fe0da900c 100644 --- a/bin/json/game_shopcenterfund.json +++ b/bin/json/game_shopcenterfund.json @@ -334,5 +334,68 @@ "unlock": 12, "group": 1015, "position": 12 + }, + { + "id": 300001, + "type": 6, + "unlock": 1, + "group": 22003001, + "position": 1 + }, + { + "id": 300002, + "type": 6, + "unlock": 2, + "group": 22003002, + "position": 1 + }, + { + "id": 300003, + "type": 6, + "unlock": 3, + "group": 22003003, + "position": 1 + }, + { + "id": 300004, + "type": 6, + "unlock": 1, + "group": 22004001, + "position": 2 + }, + { + "id": 300005, + "type": 6, + "unlock": 2, + "group": 22004002, + "position": 2 + }, + { + "id": 300006, + "type": 6, + "unlock": 3, + "group": 22004003, + "position": 2 + }, + { + "id": 300007, + "type": 6, + "unlock": 1, + "group": 22005001, + "position": 3 + }, + { + "id": 300008, + "type": 6, + "unlock": 2, + "group": 22005002, + "position": 3 + }, + { + "id": 300009, + "type": 6, + "unlock": 3, + "group": 22005003, + "position": 3 } ] \ No newline at end of file diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index 84efa1db4..cf225d0b1 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -25019,117 +25019,9 @@ "mapidmin": 101, "mapidmax": 9999 }, - { - "key": 712, - "id": 13004, - "iteminfo": [ - { - "a": "item", - "t": "10000001", - "n": 1 - } - ], - "preview": false, - "probability": 1000, - "need": [ - { - "a": "attr", - "t": "arenacoin", - "n": 250 - } - ], - "sale": 1000, - "salelist": [ - 1000, - 1000, - 1000, - 1000, - 1000, - 1000 - ], - "buyminnum": 3, - "buymaxnum": 3, - "vip": 0, - "lvmin": 1, - "lvmax": 60, - "mapidmin": 101, - "mapidmax": 9999 - }, - { - "key": 713, - "id": 13005, - "iteminfo": [ - { - "a": "item", - "t": "10000001", - "n": 1 - } - ], - "preview": false, - "probability": 1000, - "need": [ - { - "a": "attr", - "t": "arenacoin", - "n": 250 - } - ], - "sale": 1000, - "salelist": [ - 1000, - 1000, - 1000, - 1000, - 1000, - 1000 - ], - "buyminnum": 3, - "buymaxnum": 3, - "vip": 0, - "lvmin": 1, - "lvmax": 60, - "mapidmin": 101, - "mapidmax": 9999 - }, - { - "key": 714, - "id": 13006, - "iteminfo": [ - { - "a": "item", - "t": "10000001", - "n": 1 - } - ], - "preview": false, - "probability": 1000, - "need": [ - { - "a": "attr", - "t": "arenacoin", - "n": 250 - } - ], - "sale": 1000, - "salelist": [ - 1000, - 1000, - 1000, - 1000, - 1000, - 1000 - ], - "buyminnum": 3, - "buymaxnum": 3, - "vip": 0, - "lvmin": 1, - "lvmax": 60, - "mapidmin": 101, - "mapidmax": 9999 - }, { "key": 715, - "id": 13007, + "id": 13004, "iteminfo": [ { "a": "item", diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go index 9784153a2..0ae921fcb 100644 --- a/sys/configure/structs/Game.MainStageData.go +++ b/sys/configure/structs/Game.MainStageData.go @@ -44,6 +44,8 @@ type GameMainStageData struct { Commonaward []*Gameatn BattleReadyID int32 FormatList []int32 + Helphero []string + Banhero []string Star []int32 StarType []int32 StarValue []int32 @@ -194,6 +196,34 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error) } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["helphero"].([]interface{}); !_ok_ { err = errors.New("helphero error"); return } + + _v.Helphero = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Helphero = append(_v.Helphero, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["banhero"].([]interface{}); !_ok_ { err = errors.New("banhero error"); return } + + _v.Banhero = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Banhero = append(_v.Banhero, _list_v_) + } + } + { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.ShopCenterControlData.go b/sys/configure/structs/Game.ShopCenterControlData.go index 4fac1f435..02483e746 100644 --- a/sys/configure/structs/Game.ShopCenterControlData.go +++ b/sys/configure/structs/Game.ShopCenterControlData.go @@ -17,6 +17,7 @@ type GameShopCenterControlData struct { Index int32 Slogan string Point string + Props []*Gameatn Restriction int32 Lv int32 On int32 @@ -39,6 +40,20 @@ func (_v *GameShopCenterControlData)Deserialize(_buf map[string]interface{}) (er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["slogan"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Slogan error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Slogan, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["props"].([]interface{}); !_ok_ { err = errors.New("props error"); return } + + _v.Props = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Props = append(_v.Props, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["restriction"].(float64); !_ok_ { err = errors.New("restriction error"); return }; _v.Restriction = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["on"].(float64); !_ok_ { err = errors.New("on error"); return }; _v.On = int32(_tempNum_) } From a8d81946057274a69760e395129fe305b13b1db3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 18:46:50 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=95=86=E9=98=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/api_getlist.go | 11 ++++++----- modules/caravan/model_caravan.go | 11 +++++------ modules/caravan/module.go | 12 ++++++++---- modules/guildgve/modelrank.go | 2 +- modules/hero/hero_test.go | 2 +- modules/stonehenge/api_getlist.go | 2 +- modules/stonehenge/modelStonehenge.go | 6 +++--- modules/stonehenge/modelworldbuff.go | 2 +- modules/timer/caravanrank.go | 2 +- utils/time.go | 10 ++++++++-- utils/utils_test.go | 2 +- 11 files changed, 36 insertions(+), 26 deletions(-) diff --git a/modules/caravan/api_getlist.go b/modules/caravan/api_getlist.go index 901a1582b..ef721c0e6 100644 --- a/modules/caravan/api_getlist.go +++ b/modules/caravan/api_getlist.go @@ -2,9 +2,8 @@ package caravan import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" + "go_dreamfactory/utils" ) //参数校验 @@ -21,9 +20,9 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe if errdata = this.GetListCheck(session, req); errdata != nil { return // 参数校验失败直接返回 } - list, err := this.module.modelCaravan.getCaravanList(session.GetUserId()) - - if configure.Now().Unix() >= list.Resettime || err == mgo.MongodbNil { // 初始化门票和虚拟币 + list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) + endtime := utils.WeekIntervalTime() + if list.Resettime != endtime { // 初始化门票和虚拟币 if conf, err := this.module.configure.GetCaravanLv(list.Lv); err == nil { this.module.ModuleItems.CleanItemById(session, conf.Tickettop.T) // 清理之前的门票数据 } else { @@ -45,6 +44,8 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe list.Profit = 0 update["reward"] = list.Reward // 初始化利润奖励 update["profit"] = list.Profit // 初始化商品利润 + list.Resettime = endtime + update["resettime"] = list.Resettime this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) } } diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go index a9d0aed45..cf54d91df 100644 --- a/modules/caravan/model_caravan.go +++ b/modules/caravan/model_caravan.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" + "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" @@ -47,11 +48,8 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err // 创建一条数据 result.Id = primitive.NewObjectID().Hex() // 活动持续时间 - sTime := int64(this.module.ModuleTools.GetGlobalConf().BusinessRewardday * 24 * 3600) // 单位s - openTime := this.module.service.GetOpentime().Unix() // 获取开服时间 - subTime := configure.Now().Unix() - openTime - result.Resettime = configure.Now().Unix() - (subTime % sTime) + sTime - //result.Resettime = +int64(this.module.ModuleTools.GetGlobalConf().BusinessRewardday * 24 * 3600) + + result.Resettime = utils.WeekIntervalTime() result.Citystime = configure.Now().Unix() result.Rtime = configure.Now().Unix() @@ -63,9 +61,10 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err this.module.InitCaravanCityData(uid, result) // 初始1级 this.module.InitCaravanItemData(uid, result) this.Add(uid, result) + err = nil return } - err = nil + return result, err } func (this *modelCaravan) modifyCaravanDataByObjId(uid string, data map[string]interface{}) error { diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 39aef14fb..074d0ad0e 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -122,6 +122,7 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) { city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重 data.City[v.Id] = city } + //data.Citystime = utils.GetZeroTime(configure.Now().Unix()) data.Rtime = configure.Now().Unix() // 修改时间 } @@ -167,7 +168,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) { changeTime = this.configure.GetCityRefreshTime() // 3分钟 // 刷新城市货物信息 - if !utils.IsToday(caravan.Citystime) { + if !utils.IsNextToday(caravan.Citystime) { list := this.configure.GetAllCaravanCity() for _, conf := range list { if v, ok := caravan.City[conf.Id]; ok { @@ -182,7 +183,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) { v.Special = append(v.Special, conf.Special...) } - if utils.IsToday(caravan.Citystime - 24*3600) { + if utils.IsToday(caravan.Citystime) { v.Exspecial = make([]string, 0) v.Exspecial = append(v.Exspecial, v.Nextexspecial...) v.ExspecialPCT = v.NextexspecialPCT @@ -215,17 +216,20 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) { } } - caravan.Citystime = configure.Now().Unix() // 设置今天的时间 + caravan.Citystime = utils.GetZeroTime(configure.Now().Unix()) // 设置第二天0点的时间 update["city"] = caravan.City update["citystime"] = caravan.Citystime } + if caravan.Itemtime == 0 { + caravan.Itemtime = configure.Now().Unix() + } subTime := int32(curTime - caravan.Itemtime) if subTime >= changeTime { bChange = true icount := int32(subTime / changeTime) // 循环周期 caravan.Itemtime += int64(changeTime * icount) - update["citystime"] = caravan.Itemtime + update["itemtime"] = caravan.Itemtime for k, v := range caravan.Goods { if c, err := this.configure.GetCaravanGoods(k); err == nil { caravan.Oldprice[k] = v.Price diff --git a/modules/guildgve/modelrank.go b/modules/guildgve/modelrank.go index f88069f58..1f5440583 100644 --- a/modules/guildgve/modelrank.go +++ b/modules/guildgve/modelrank.go @@ -62,7 +62,7 @@ func (this *modelRank) updateRank(guilds ...*pb.DBGuildGve) (err error) { ) menbers = make([]*redis.Z, len(guilds)) for i, v := range guilds { - endtime := time.Unix(utils.WeekIntervalTime(0), 0) + endtime := time.Unix(utils.WeekIntervalTime(), 0) start := time.Unix(v.Lastkilltime, 0) seconds := endtime.Sub(start).Seconds() Integral := float64(v.Kills)*float64(10000000000) + seconds diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 99c119fe1..16a7f47ca 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -115,7 +115,7 @@ type sumy struct { func Test_Main(t *testing.T) { value, err := strconv.Atoi("944005411") - fmt.Printf("%v,%v", value, err) + fmt.Printf("%v,%v,%d", value, err, utils.WeekIntervalTime()) ids := utils.RandomNumbers(0, 10, 5) for _, v := range ids { fmt.Printf("%d", v) diff --git a/modules/stonehenge/api_getlist.go b/modules/stonehenge/api_getlist.go index 0798033a9..d7879d0af 100644 --- a/modules/stonehenge/api_getlist.go +++ b/modules/stonehenge/api_getlist.go @@ -40,7 +40,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.StonehengeGetLis update["hero"] = stone.Hero stone.Addweight = make(map[int32]int32, 0) update["addweight"] = stone.Addweight - stone.Etime = utils.WeekIntervalTime(0) + stone.Etime = utils.WeekIntervalTime() update["etime"] = stone.Etime this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update) } diff --git a/modules/stonehenge/modelStonehenge.go b/modules/stonehenge/modelStonehenge.go index e2365770f..7184865c6 100644 --- a/modules/stonehenge/modelStonehenge.go +++ b/modules/stonehenge/modelStonehenge.go @@ -59,7 +59,7 @@ func (this *MStonehenge) GetStonehengeData(uid string) *pb.DBStonehenge { stone.Userbuff = make(map[int32]int32, 0) stone.Reward = make(map[int32]bool, 0) stone.Addweight = make(map[int32]int32, 0) - stone.Etime = utils.WeekIntervalTime(0) + stone.Etime = utils.WeekIntervalTime() stone.Hero = make(map[string]*pb.BattleRole) this.Add(uid, stone) @@ -78,13 +78,13 @@ func (this *MStonehenge) reLoadStoneBoos() (err error) { s := &pb.DBStoneBoss{} this.module.ModuleTools.GetGlobalData(StoneBossKey, s) - if len(s.Bossstage) == 0 || utils.WeekIntervalTime(0) != s.Rtime { + if len(s.Bossstage) == 0 || utils.WeekIntervalTime() != s.Rtime { this.lock.Lock() this.bossStage = this.module.configure.CheckStage() this.lock.Unlock() this.module.ModuleTools.UpdateGlobalData(StoneBossKey, map[string]interface{}{ "BossStage": this.bossStage, - "rtime": utils.WeekIntervalTime(0), + "rtime": utils.WeekIntervalTime(), }) } else { this.lock.Lock() diff --git a/modules/stonehenge/modelworldbuff.go b/modules/stonehenge/modelworldbuff.go index ea12129e4..4352680d6 100644 --- a/modules/stonehenge/modelworldbuff.go +++ b/modules/stonehenge/modelworldbuff.go @@ -40,7 +40,7 @@ func (this *MWorldBuff) GetStonehengeData(uid string) *pb.DBStonehenge { stone.Userbuff = make(map[int32]int32, 0) stone.Reward = make(map[int32]bool, 0) stone.Addweight = make(map[int32]int32, 0) - stone.Etime = utils.WeekIntervalTime(0) + stone.Etime = utils.WeekIntervalTime() this.Add(uid, stone) return nil } diff --git a/modules/timer/caravanrank.go b/modules/timer/caravanrank.go index 4da1ca653..6f843d1f1 100644 --- a/modules/timer/caravanrank.go +++ b/modules/timer/caravanrank.go @@ -83,7 +83,7 @@ func (this *CaravanRank) Start() (err error) { } func (this *CaravanRank) TimerSeason() { - endTime := utils.WeekIntervalTime(0) + endTime := utils.WeekIntervalTime() this.module.Debugf("TimerSeason end: %d,cur time:%d", endTime, configure.Now().Unix()) if err := this.service.RpcCall( diff --git a/utils/time.go b/utils/time.go index 320d9895f..56cc73040 100644 --- a/utils/time.go +++ b/utils/time.go @@ -15,6 +15,12 @@ func IsToday(d int64) bool { now := configure.Now() return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day() } +func IsNextToday(d int64) bool { + d += 24 * 3600 + tt := time.Unix(d, 0) + now := configure.Now() + return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day() +} // 判断是否是出于同一周 func IsSameWeek(d int64) bool { @@ -170,7 +176,7 @@ func DiffDays(t1, t2 int64) int { return diffDays } -func WeekIntervalTime(week int) (endTime int64) { +func WeekIntervalTime() (endTime int64) { now := time.Now() offset := int(time.Monday - now.Weekday()) //周日做特殊判断 因为time.Monday = 0 @@ -181,7 +187,7 @@ func WeekIntervalTime(week int) (endTime int64) { year, month, day := now.Date() thisWeek := time.Date(year, month, day, 0, 0, 0, 0, time.Local) //startTime = thisWeek.AddDate(0, 0, offset+7*week).Unix() - endTime = thisWeek.AddDate(0, 0, offset+6+7*week).Unix() + endTime = thisWeek.AddDate(0, 0, offset+7).Unix() return endTime } diff --git a/utils/utils_test.go b/utils/utils_test.go index a3a581bd1..f04bc6ef9 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -119,7 +119,7 @@ func TestIsSameWeek(t *testing.T) { } func TestWeekIntervalTime(t *testing.T) { - ti := utils.WeekIntervalTime(0) + ti := utils.WeekIntervalTime() format := "2006-01-02 15:04:05" formattedTime := time.Unix(ti, 0).Format(format) fmt.Println(formattedTime) From f93f6de715c03d764a9adc7a92259482318afd9b Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 18:47:17 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 57 +++++++- bin/json/game_mainstage.json | 67 +++++----- bin/json/game_monsterformat.json | 20 +++ bin/json/game_namelibrary.json | 2 +- bin/json/game_reddot.json | 160 +++++++++++------------ sys/configure/structs/Game.RedDotData.go | 4 +- 6 files changed, 192 insertions(+), 118 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index bffecd295..a7cde10e8 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -446,7 +446,7 @@ "disableAiCamera": 0, "ChoseCamp": [], "DisableCamp": [], - "DefaultHero": 0, + "DefaultHero": 720015, "ChoseHero": [], "DisableHero": [], "LockSlots": [], @@ -870,5 +870,60 @@ "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 50 + }, + { + "id": 136, + "PlayType": 0, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_03", + "battleScenes": [ + "scenesfight_05_01" + ], + "HideAlienSpace": 1, + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 720015, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [ + "13002" + ], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 + }, + { + "id": 137, + "PlayType": 0, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_03", + "battleScenes": [ + "scenesfight_05_01" + ], + "HideAlienSpace": 1, + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [ + "44005", + "34004" + ], + "LockSlots": [], + "HeroCheck": [ + "13002" + ], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 8e686c932..48a09588f 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -132,12 +132,8 @@ "FormatList": [ 101011 ], - "helphero": [ - "25001" - ], - "banhero": [ - "13004" - ], + "helphero": [], + "banhero": [], "star": [ 1, 1, @@ -235,11 +231,9 @@ 101021 ], "helphero": [ - "25001" - ], - "banhero": [ - "13004" + "44005" ], + "banhero": [], "star": [ 1, 1, @@ -337,11 +331,9 @@ 101031 ], "helphero": [ - "25001" - ], - "banhero": [ - "13004" + "44005" ], + "banhero": [], "star": [ 1, 1, @@ -444,11 +436,9 @@ 101041 ], "helphero": [ - "25001" - ], - "banhero": [ - "13004" + "44005" ], + "banhero": [], "star": [ 1, 1, @@ -607,12 +597,13 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 136, "FormatList": [ 101051 ], "helphero": [ - "25001" + "13002", + "44005" ], "banhero": [], "star": [ @@ -678,7 +669,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -759,7 +756,7 @@ "chapterid": 11001, "group_id": 100109, "previous_group_id": [ - 100107 + 100108 ], "previoustage": 0, "Episodetype": 7, @@ -823,7 +820,7 @@ "chapterid": 11001, "group_id": 100110, "previous_group_id": [ - 100107 + 100109 ], "previoustage": 0, "Episodetype": 7, @@ -887,9 +884,7 @@ "chapterid": 11001, "group_id": 100111, "previous_group_id": [ - 100110, - 100108, - 100109 + 100110 ], "previoustage": 0, "Episodetype": 3, @@ -1073,15 +1068,16 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 137, "FormatList": [ 101061 ], "helphero": [ - "25001" + "13002" ], "banhero": [ - "44005" + "44005", + "34004" ], "star": [ 1, @@ -1178,15 +1174,16 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 137, "FormatList": [ 101071 ], "helphero": [ - "25001" + "13002" ], "banhero": [ - "44005" + "44005", + "34004" ], "star": [ 1, @@ -1538,11 +1535,13 @@ "n": 6000 } ], - "BattleReadyID": 122, + "BattleReadyID": 137, "FormatList": [ 101081 ], - "helphero": [], + "helphero": [ + "13002" + ], "banhero": [ "44005", "34004" diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index fef30bb01..7627a3183 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -238239,6 +238239,26 @@ "speed": 80, "modelsize": 1 }, + { + "Id": 720015, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 44005, + "star": 4, + "equip": [], + "newskill": [], + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 80, + "modelsize": 1 + }, { "Id": 800001, "pos": 1, diff --git a/bin/json/game_namelibrary.json b/bin/json/game_namelibrary.json index 6880ecbb1..7723b6555 100644 --- a/bin/json/game_namelibrary.json +++ b/bin/json/game_namelibrary.json @@ -487,7 +487,7 @@ }, "name": { "key": "name_name_name_41", - "text": "巴雷特" + "text": "吉吉亚" }, "sex": 2 }, diff --git a/bin/json/game_reddot.json b/bin/json/game_reddot.json index 1ec10993a..b33243cd9 100644 --- a/bin/json/game_reddot.json +++ b/bin/json/game_reddot.json @@ -4,7 +4,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Task", "header": "" }, @@ -13,7 +13,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Daily", "header": "赵长远" }, @@ -22,7 +22,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Week", "header": "赵长远" }, @@ -31,7 +31,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Achievement", "header": "赵长远" }, @@ -40,7 +40,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Task|Daily", "header": "" }, @@ -49,7 +49,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Daily|Active", "header": "" }, @@ -58,7 +58,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Task|Week", "header": "" }, @@ -67,7 +67,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "task", + "opencond_id": "", "path": "Root|Task|Week|Active", "header": "" }, @@ -76,7 +76,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "mail", "path": "Root|Email", "header": "" }, @@ -85,7 +85,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "mail", "path": "Root|Email|Btn", "header": "" }, @@ -94,7 +94,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "mail", "path": "Root|Email|UnreadBtn", "header": "" }, @@ -103,7 +103,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|ViKingExpedition", "header": "" }, @@ -112,7 +112,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|ViKingExpedition|MainPage", "header": "" }, @@ -121,7 +121,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|ViKingExpedition|MainPage|Btn", "header": "" }, @@ -130,7 +130,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hunting", "header": "" }, @@ -139,7 +139,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hunting|MainPage", "header": "" }, @@ -148,7 +148,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hunting|MainPage|Btn", "header": "" }, @@ -157,7 +157,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1", "header": "" }, @@ -166,7 +166,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Heroup", "header": "" }, @@ -175,7 +175,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Awake", "header": "" }, @@ -184,7 +184,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Resonance", "header": "" }, @@ -193,7 +193,7 @@ "msg_type": 0, "show_type": 2, "count_type": 1, - "group": "", + "opencond_id": "", "path": "Root|Hero", "header": "" }, @@ -202,7 +202,7 @@ "msg_type": 1, "show_type": 2, "count_type": 1, - "group": "", + "opencond_id": "", "path": "Root|Hero|NewHero", "header": "" }, @@ -211,7 +211,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Equip", "header": "" }, @@ -220,7 +220,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Hero1|Equip|Wear", "header": "" }, @@ -229,7 +229,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild", "header": "赵长远" }, @@ -238,7 +238,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main", "header": "赵长远" }, @@ -247,7 +247,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main|Btn", "header": "赵长远" }, @@ -256,7 +256,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main|Apply", "header": "" }, @@ -265,7 +265,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "sociaty", + "opencond_id": "guild", "path": "Root|Guild|Main|Apply|Btn", "header": "" }, @@ -274,7 +274,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "guild", "path": "Root|Guild|Main|Task", "header": "" }, @@ -283,7 +283,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag", "header": "赵长远" }, @@ -292,7 +292,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag|Item", "header": "赵长远" }, @@ -301,7 +301,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag|Equip", "header": "赵长远" }, @@ -310,7 +310,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Bag|Shard", "header": "赵长远" }, @@ -319,7 +319,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy", "header": "" }, @@ -328,7 +328,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble", "header": "" }, @@ -337,7 +337,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page1", "header": "" }, @@ -346,7 +346,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page2", "header": "" }, @@ -355,7 +355,7 @@ "msg_type": 1, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page3", "header": "" }, @@ -364,7 +364,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Page4", "header": "" }, @@ -373,7 +373,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy|IllustratedBubble|Reward", "header": "" }, @@ -382,7 +382,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "goberblacksmithshop", "path": "Root|Smithy", "header": "" }, @@ -391,7 +391,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu", "header": "" }, @@ -400,7 +400,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|Pillar", "header": "" }, @@ -409,7 +409,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "", "header": "" }, @@ -418,7 +418,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "", "header": "" }, @@ -427,7 +427,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|Dispatch", "header": "" }, @@ -436,7 +436,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|Dispatch|Reward", "header": "" }, @@ -445,7 +445,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|DailyFitness", "header": "" }, @@ -454,7 +454,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble", "header": "" }, @@ -463,7 +463,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble|Page1", "header": "" }, @@ -472,7 +472,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble|Page2", "header": "" }, @@ -481,7 +481,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "kungfu", "path": "Root|KungFu|IllustratedBubble|Page3", "header": "" }, @@ -490,7 +490,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability", "header": "" }, @@ -499,7 +499,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble", "header": "" }, @@ -508,7 +508,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List", "header": "" }, @@ -517,7 +517,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List|Reward", "header": "" }, @@ -526,7 +526,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List|Biography", "header": "" }, @@ -535,7 +535,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|List|Biography|Reward", "header": "" }, @@ -544,7 +544,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters", "header": "" }, @@ -553,7 +553,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters|ListPage", "header": "" }, @@ -562,7 +562,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters|ListPage|Activation", "header": "" }, @@ -571,7 +571,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "", "path": "Root|Favorability|Bubble|Fetters|ListPage|UpLv", "header": "" }, @@ -580,7 +580,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "cooking", "path": "Root|Gourmet", "header": "" }, @@ -589,7 +589,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "cooking", "path": "Root|Gourmet|Atlas", "header": "" }, @@ -598,7 +598,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "friend", "path": "Root|Friend", "header": "" }, @@ -607,7 +607,7 @@ "msg_type": 2, "show_type": 1, "count_type": 0, - "group": "", + "opencond_id": "friend", "path": "Root|Friend|Apply", "header": "" }, @@ -616,16 +616,16 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena", "header": "" }, { "id": 22101, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena|Num", "header": "" }, @@ -634,7 +634,7 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "", "header": "" }, @@ -643,7 +643,7 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena|ChallengeNpc", "header": "" }, @@ -652,7 +652,7 @@ "msg_type": 0, "show_type": 0, "count_type": 1, - "group": "", + "opencond_id": "arena", "path": "Root|Arena|ChallengeNpc|Page", "header": "" }, @@ -661,7 +661,7 @@ "msg_type": 0, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "trials1", "path": "Root|MLine", "header": "" }, @@ -670,7 +670,7 @@ "msg_type": 2, "show_type": 0, "count_type": 0, - "group": "", + "opencond_id": "trials1", "path": "Root|MLine|Reward", "header": "" }, @@ -679,7 +679,7 @@ "msg_type": 0, "show_type": 1, "count_type": 1, - "group": "", + "opencond_id": "", "path": "", "header": "" }, @@ -688,16 +688,16 @@ "msg_type": 0, "show_type": 1, "count_type": 1, - "group": "", + "opencond_id": "", "path": "", - "header": "红点出现：当聊天系统中公会，私聊，跨服，系统存在玩家未接受消息时，触发聊天红点。" + "header": "" }, { "id": 29101, "msg_type": 2, "show_type": 1, "count_type": 1, - "group": "", + "opencond_id": "RacePagoda", "path": "", "header": "" } diff --git a/sys/configure/structs/Game.RedDotData.go b/sys/configure/structs/Game.RedDotData.go index f62bf7c3b..ecd2b829b 100644 --- a/sys/configure/structs/Game.RedDotData.go +++ b/sys/configure/structs/Game.RedDotData.go @@ -15,7 +15,7 @@ type GameRedDotData struct { MsgType int32 ShowType int32 CountType int32 - Group string + OpencondId string Path string Header string } @@ -31,7 +31,7 @@ func (_v *GameRedDotData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["msg_type"].(float64); !_ok_ { err = errors.New("msg_type error"); return }; _v.MsgType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show_type"].(float64); !_ok_ { err = errors.New("show_type error"); return }; _v.ShowType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count_type"].(float64); !_ok_ { err = errors.New("count_type error"); return }; _v.CountType = int32(_tempNum_) } - { var _ok_ bool; if _v.Group, _ok_ = _buf["group"].(string); !_ok_ { err = errors.New("group error"); return } } + { var _ok_ bool; if _v.OpencondId, _ok_ = _buf["opencond_id"].(string); !_ok_ { err = errors.New("opencond_id error"); return } } { var _ok_ bool; if _v.Path, _ok_ = _buf["path"].(string); !_ok_ { err = errors.New("path error"); return } } { var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } } return From 297fbdfca668cae0f889b413557a5b8e37060ef5 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 19:12:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/module.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 074d0ad0e..7fcb90e91 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -219,6 +219,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) { caravan.Citystime = utils.GetZeroTime(configure.Now().Unix()) // 设置第二天0点的时间 update["city"] = caravan.City update["citystime"] = caravan.Citystime + bChange = true } if caravan.Itemtime == 0 { caravan.Itemtime = configure.Now().Unix() From 5d555698ab66b6f21f8d89a8c475007945357c6f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 20:34:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E9=97=A8=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/model_caravan.go | 3 +-- modules/caravan/module.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go index cf54d91df..710684984 100644 --- a/modules/caravan/model_caravan.go +++ b/modules/caravan/model_caravan.go @@ -8,7 +8,6 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" @@ -49,7 +48,7 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err result.Id = primitive.NewObjectID().Hex() // 活动持续时间 - result.Resettime = utils.WeekIntervalTime() + //result.Resettime = utils.WeekIntervalTime() result.Citystime = configure.Now().Unix() result.Rtime = configure.Now().Unix() diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 7fcb90e91..04480e465 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -122,7 +122,7 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) { city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重 data.City[v.Id] = city } - //data.Citystime = utils.GetZeroTime(configure.Now().Unix()) + data.Citystime = utils.GetZeroTime(configure.Now().Unix()) data.Rtime = configure.Now().Unix() // 修改时间 } From 032f664e613f7bbdd4ffd86783ac105edfe279b4 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 20:57:34 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_mainstage.json | 39 ++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 48a09588f..168f64dc5 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -231,7 +231,7 @@ 101021 ], "helphero": [ - "44005" + "34004" ], "banhero": [], "star": [ @@ -331,7 +331,7 @@ 101031 ], "helphero": [ - "44005" + "34004" ], "banhero": [], "star": [ @@ -436,7 +436,7 @@ 101041 ], "helphero": [ - "44005" + "34004" ], "banhero": [], "star": [ @@ -597,13 +597,12 @@ "n": 6000 } ], - "BattleReadyID": 136, + "BattleReadyID": 118, "FormatList": [ 101051 ], "helphero": [ - "13002", - "44005" + "13004" ], "banhero": [], "star": [ @@ -669,13 +668,7 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], + "firstaward": [], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -756,7 +749,7 @@ "chapterid": 11001, "group_id": 100109, "previous_group_id": [ - 100108 + 100107 ], "previoustage": 0, "Episodetype": 7, @@ -820,7 +813,7 @@ "chapterid": 11001, "group_id": 100110, "previous_group_id": [ - 100109 + 100107 ], "previoustage": 0, "Episodetype": 7, @@ -884,7 +877,9 @@ "chapterid": 11001, "group_id": 100111, "previous_group_id": [ - 100110 + 100110, + 100108, + 100109 ], "previoustage": 0, "Episodetype": 3, @@ -1068,12 +1063,12 @@ "n": 6000 } ], - "BattleReadyID": 137, + "BattleReadyID": 118, "FormatList": [ 101061 ], "helphero": [ - "13002" + "13004" ], "banhero": [ "44005", @@ -1174,12 +1169,12 @@ "n": 6000 } ], - "BattleReadyID": 137, + "BattleReadyID": 118, "FormatList": [ 101071 ], "helphero": [ - "13002" + "13004" ], "banhero": [ "44005", @@ -1535,12 +1530,12 @@ "n": 6000 } ], - "BattleReadyID": 137, + "BattleReadyID": 122, "FormatList": [ 101081 ], "helphero": [ - "13002" + "13004" ], "banhero": [ "44005", From 63d1275a8ed6af67cd6103e638990827d1e48813 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 21:32:10 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 24 + bin/json/game_caravancity.json | 954 +++++++++++++++++++++++++++--- bin/json/game_caravanlv.json | 176 ++---- bin/json/game_caravanrank.json | 603 ++++++++++++++++++- bin/json/game_caravanreward.json | 42 +- bin/json/game_caravanthing.json | 966 +++++++++++++++++++++---------- bin/json/game_mainstage.json | 45 +- 7 files changed, 2247 insertions(+), 563 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index a7cde10e8..5e1bab4be 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -925,5 +925,29 @@ "AssistTeam": 0, "CanFriendHelp": 0, "Numrounds": 0 + }, + { + "id": 138, + "PlayType": 0, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_03", + "battleScenes": [ + "scenesfight_05_01" + ], + "HideAlienSpace": 1, + "ShowBuff": 0, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": 0, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 0, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "AssistTeam": 0, + "CanFriendHelp": 0, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json index 3ed9c6931..f52521e08 100644 --- a/bin/json/game_caravancity.json +++ b/bin/json/game_caravancity.json @@ -2,8 +2,10 @@ { "id": 101, "citylink": [ - 102, - 104 + 104, + 110, + 103, + 106 ], "cityticket": [ { @@ -20,7 +22,7 @@ "cityman": 34006, "cityname": { "key": "caravan_caravan_city_cityname_1", - "text": "贝特曼" + "text": "中轴城" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_1", @@ -31,49 +33,65 @@ "text": "贝特曼城生活着具有一定高级文明的人，他们用灶炉生火、能够引水洗澡、有独立的房间睡觉。" }, "citytype": 2, - "citytypenum": 2, + "citytypenum": 6, "special": [ - "21000002", - "21000003", - "21000004", - "21000005" - ], - "specialnum": 500, - "exspecial_num": 2, - "exspecial": [ "21000009", + "21000015", + "21000018", + "21000019", + "21000024", + "21000025", + "21000029", + "21000033" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ "21000004", - "21000021" + "21000008", + "21000015" ], "exspecial_weight": [ 3000, 1000, - 3000 + 3001 ], "exspecialnum": [ - 150000, - 130000, - 160000 + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 ], "exspecialnum_weight": [ - 3000, - 1000, - 3000 + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 ], - "Orspecial": 1000, + "Orspecial": 110, "checktime": 1, "extalk": 11001, "ortalk": 11002, "sptalk": 11003, "buytalk": 11004, "weitalk": 11005, - "cityeventpro": 50000, + "cityeventpro": 400, "cityevent": 1 }, { "id": 102, "citylink": [ - 101, + 111, 103 ], "cityticket": [ @@ -91,7 +109,7 @@ "cityman": 24004, "cityname": { "key": "caravan_caravan_city_cityname_2", - "text": "和平" + "text": "宝贝老板" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_2", @@ -102,15 +120,19 @@ "text": "在和平城里，所有人都乐忠于学功夫，大家友好的用功夫进行交流，也让和平城免受外敌入侵。" }, "citytype": 1, - "citytypenum": 3, + "citytypenum": 6, "special": [ - "21000006", - "21000007", - "21000008", - "21000009" + "21000009", + "21000015", + "21000018", + "21000019", + "21000024", + "21000025", + "21000029", + "21000033" ], - "specialnum": 500, - "exspecial_num": 2, + "specialnum": 600, + "exspecial_num": 1, "exspecial": [ "21000004", "21000008", @@ -122,31 +144,43 @@ 3001 ], "exspecialnum": [ - 160000, - 120000, - 140000 + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 ], "exspecialnum_weight": [ - 3000, - 1000, - 3001 + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 ], - "Orspecial": 1000, + "Orspecial": 110, "checktime": 1, "extalk": 11001, "ortalk": 11002, "sptalk": 11003, "buytalk": 11004, "weitalk": 11005, - "cityeventpro": 100000, + "cityeventpro": 200, "cityevent": 1 }, { "id": 103, "citylink": [ 102, - 105, - 104 + 101, + 108 ], "cityticket": [ { @@ -163,7 +197,7 @@ "cityman": 25001, "cityname": { "key": "caravan_caravan_city_cityname_3", - "text": "加菲斯特" + "text": "疯狂外星人" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_3", @@ -174,15 +208,19 @@ "text": "加菲斯特城生活着往来务工的人，所有人都在为各自的工作奋斗，鲜少有什么娱乐生活。" }, "citytype": 1, - "citytypenum": 4, + "citytypenum": 6, "special": [ - "21000010", "21000011", - "21000012", - "21000013" + "21000015", + "21000016", + "21000017", + "21000018", + "21000024", + "21000025", + "21000033" ], - "specialnum": 500, - "exspecial_num": 2, + "specialnum": 600, + "exspecial_num": 1, "exspecial": [ "21000005", "21000012", @@ -194,31 +232,43 @@ 3002 ], "exspecialnum": [ - 170000, - 140000, - 130000 + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 ], "exspecialnum_weight": [ - 3000, - 1000, - 3002 + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 ], - "Orspecial": 1000, + "Orspecial": 110, "checktime": 1, "extalk": 11001, "ortalk": 11002, "sptalk": 11003, "buytalk": 11004, "weitalk": 11005, - "cityeventpro": 50000, + "cityeventpro": 200, "cityevent": 1 }, { "id": 104, "citylink": [ 101, - 103, - 105 + 113, + 109 ], "cityticket": [ { @@ -235,7 +285,7 @@ "cityman": 45001, "cityname": { "key": "caravan_caravan_city_cityname_4", - "text": "沼泽" + "text": "疯狂原始人" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_4", @@ -246,15 +296,19 @@ "text": "沼泽城常年被沼泽覆盖，和外界处于隔绝的状态，靠往来的商人让各种物品保持流通状态。" }, "citytype": 1, - "citytypenum": 3, + "citytypenum": 6, "special": [ + "21000002", "21000014", - "21000015", "21000016", - "21000017" + "21000019", + "21000022", + "21000023", + "21000028", + "21000031" ], - "specialnum": 500, - "exspecial_num": 2, + "specialnum": 600, + "exspecial_num": 1, "exspecial": [ "21000006", "21000016", @@ -266,30 +320,42 @@ 3003 ], "exspecialnum": [ - 180000, - 170000, - 150000 + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 ], "exspecialnum_weight": [ - 3000, - 1000, - 3003 + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 ], - "Orspecial": 1000, + "Orspecial": 110, "checktime": 1, "extalk": 11001, "ortalk": 11002, "sptalk": 11003, "buytalk": 11004, "weitalk": 11005, - "cityeventpro": 100000, + "cityeventpro": 200, "cityevent": 1 }, { "id": 105, "citylink": [ - 104, - 103 + 108, + 106 ], "cityticket": [ { @@ -306,7 +372,7 @@ "cityman": 14007, "cityname": { "key": "caravan_caravan_city_cityname_5", - "text": "博克" + "text": "功夫熊猫" }, "cityinformation": { "key": "caravan_caravan_city_cityinformation_5", @@ -317,15 +383,18 @@ "text": "博科城有一种特殊的飞行工具——龙，这也让这座城市的人出行很方便，只要想去一个地方，龙都能够快速将他带过去。" }, "citytype": 1, - "citytypenum": 4, + "citytypenum": 6, "special": [ - "21000018", - "21000019", - "21000020", - "21000021" + "21000003", + "21000016", + "21000021", + "21000023", + "21000026", + "21000030", + "21000032" ], - "specialnum": 500, - "exspecial_num": 2, + "specialnum": 600, + "exspecial_num": 1, "exspecial": [ "21000007", "21000020", @@ -337,23 +406,728 @@ 3004 ], "exspecialnum": [ - 190000, - 230000, - 120000 + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 ], "exspecialnum_weight": [ - 3000, - 1000, - 3004 + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 ], - "Orspecial": 1000, + "Orspecial": 110, "checktime": 1, "extalk": 11001, "ortalk": 11002, "sptalk": 11003, "buytalk": 11004, "weitalk": 11005, - "cityeventpro": 50000, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 106, + "citylink": [ + 107, + 105, + 101 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 34006, + "cityname": { + "key": "caravan_caravan_city_cityname_6", + "text": "怪物史莱克" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_6", + "text": "在贝特曼城卖着各种原始的小玩意。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_6", + "text": "贝特曼城生活着具有一定高级文明的人，他们用灶炉生火、能够引水洗澡、有独立的房间睡觉。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000005", + "21000017", + "21000020", + "21000022", + "21000026", + "21000027", + "21000033" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000009", + "21000004", + "21000021" + ], + "exspecial_weight": [ + 3000, + 1000, + 3003 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 107, + "citylink": [ + 113, + 106 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 24004, + "cityname": { + "key": "caravan_caravan_city_cityname_7", + "text": "坏蛋联盟" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_7", + "text": "在和平城卖各种防身的武器。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_7", + "text": "在和平城里，所有人都乐忠于学功夫，大家友好的用功夫进行交流，也让和平城免受外敌入侵。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000004", + "21000015", + "21000017", + "21000020", + "21000025", + "21000027", + "21000029" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000004", + "21000008", + "21000015" + ], + "exspecial_weight": [ + 3000, + 1000, + 3004 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 108, + "citylink": [ + 103, + 105 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 25001, + "cityname": { + "key": "caravan_caravan_city_cityname_8", + "text": "巨怪猎人" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_8", + "text": "在加菲斯特城，商人都喜欢售卖能高效办公的用具。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_8", + "text": "加菲斯特城生活着往来务工的人，所有人都在为各自的工作奋斗，鲜少有什么娱乐生活。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000013", + "21000014", + "21000015", + "21000017", + "21000019", + "21000022", + "21000024", + "21000025" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000005", + "21000012", + "21000008" + ], + "exspecial_weight": [ + 3000, + 1000, + 3003 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 109, + "citylink": [ + 112, + 104 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 45001, + "cityname": { + "key": "caravan_caravan_city_cityname_9", + "text": "马达加斯加" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_9", + "text": "在沼泽城的商人都以售卖轻便的商品为生。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_9", + "text": "沼泽城常年被沼泽覆盖，和外界处于隔绝的状态，靠往来的商人让各种物品保持流通状态。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000010", + "21000016", + "21000023", + "21000028", + "21000029", + "21000031", + "21000033" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000006", + "21000016", + "21000013" + ], + "exspecial_weight": [ + 3000, + 1000, + 3004 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 110, + "citylink": [ + 111, + 101 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 14007, + "cityname": { + "key": "caravan_caravan_city_cityname_10", + "text": "魔发精灵" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_10", + "text": "在博克城的商人对龙有很深的研究，喜欢卖各种和龙有关的商品。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_10", + "text": "博科城有一种特殊的飞行工具——龙，这也让这座城市的人出行很方便，只要想去一个地方，龙都能够快速将他带过去。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000008", + "21000016", + "21000018", + "21000020", + "21000024", + "21000028", + "21000030" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000007", + "21000020", + "21000006" + ], + "exspecial_weight": [ + 3000, + 1000, + 3003 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 111, + "citylink": [ + 110, + 112, + 102 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 34006, + "cityname": { + "key": "caravan_caravan_city_cityname_11", + "text": "守护者联盟" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_11", + "text": "在贝特曼城卖着各种原始的小玩意。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_11", + "text": "贝特曼城生活着具有一定高级文明的人，他们用灶炉生火、能够引水洗澡、有独立的房间睡觉。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000012", + "21000015", + "21000017", + "21000020", + "21000024", + "21000025", + "21000029" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000009", + "21000004", + "21000021" + ], + "exspecial_weight": [ + 3000, + 1000, + 3004 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 112, + "citylink": [ + 109, + 111 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 24004, + "cityname": { + "key": "caravan_caravan_city_cityname_12", + "text": "驯龙高手" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_12", + "text": "在和平城卖各种防身的武器。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_12", + "text": "在和平城里，所有人都乐忠于学功夫，大家友好的用功夫进行交流，也让和平城免受外敌入侵。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000006", + "21000014", + "21000019", + "21000021", + "21000022", + "21000026", + "21000031", + "21000032" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000004", + "21000008", + "21000015" + ], + "exspecial_weight": [ + 3000, + 1000, + 3003 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, + "cityevent": 1 + }, + { + "id": 113, + "citylink": [ + 104, + 107 + ], + "cityticket": [ + { + "a": "item", + "t": "10000005", + "n": 2 + } + ], + "cityexlock": [ + 0 + ], + "citylvlock": 1, + "citymainlock": 0, + "cityman": 25001, + "cityname": { + "key": "caravan_caravan_city_cityname_13", + "text": "野性精神" + }, + "cityinformation": { + "key": "caravan_caravan_city_cityinformation_13", + "text": "在加菲斯特城，商人都喜欢售卖能高效办公的用具。" + }, + "citytxt": { + "key": "caravan_caravan_city_citytxt_13", + "text": "加菲斯特城生活着往来务工的人，所有人都在为各自的工作奋斗，鲜少有什么娱乐生活。" + }, + "citytype": 1, + "citytypenum": 6, + "special": [ + "21000007", + "21000015", + "21000021", + "21000027", + "21000028", + "21000029", + "21000030", + "21000032" + ], + "specialnum": 600, + "exspecial_num": 1, + "exspecial": [ + "21000005", + "21000012", + "21000008" + ], + "exspecial_weight": [ + 3000, + 1000, + 3004 + ], + "exspecialnum": [ + 1200, + 1300, + 1400, + 1500, + 1600, + 1700, + 1800, + 1900, + 2000 + ], + "exspecialnum_weight": [ + 30, + 120, + 200, + 300, + 150, + 100, + 50, + 30, + 20 + ], + "Orspecial": 110, + "checktime": 1, + "extalk": 11001, + "ortalk": 11002, + "sptalk": 11003, + "buytalk": 11004, + "weitalk": 11005, + "cityeventpro": 200, "cityevent": 1 } ] \ No newline at end of file diff --git a/bin/json/game_caravanlv.json b/bin/json/game_caravanlv.json index 6cd3cc326..3bb4d7061 100644 --- a/bin/json/game_caravanlv.json +++ b/bin/json/game_caravanlv.json @@ -2,17 +2,17 @@ { "lv": 0, "newmoneyexp": 0, - "bagtop": 50, + "bagtop": 3000, "bagtagnum": 10, "tickettop": { "a": "item", "t": "21000001", - "n": 50 + "n": 20 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10000 + "n": 100000 }, "bargainpro": 10000, "bargainnum": 1, @@ -20,301 +20,251 @@ }, { "lv": 1, - "newmoneyexp": 100000, - "bagtop": 60, + "newmoneyexp": 500000, + "bagtop": 3500, "bagtagnum": 12, "tickettop": { "a": "item", "t": "21000001", - "n": 60 + "n": 21 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10001 + "n": 110000 }, "bargainpro": 12000, "bargainnum": 1, "reward": [ { "a": "attr", - "t": "gold", - "n": 1000 + "t": "diamond", + "n": 200 } ] }, { "lv": 2, - "newmoneyexp": 200000, - "bagtop": 70, + "newmoneyexp": 1000000, + "bagtop": 4000, "bagtagnum": 14, "tickettop": { "a": "item", "t": "21000001", - "n": 70 + "n": 22 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10002 + "n": 120000 }, "bargainpro": 14000, "bargainnum": 1, "reward": [ { "a": "attr", - "t": "gold", - "n": 2000 + "t": "diamond", + "n": 200 } ] }, { "lv": 3, - "newmoneyexp": 300000, - "bagtop": 80, + "newmoneyexp": 3000000, + "bagtop": 4500, "bagtagnum": 16, "tickettop": { "a": "item", "t": "21000001", - "n": 80 + "n": 23 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10003 + "n": 130000 }, "bargainpro": 16000, "bargainnum": 2, "reward": [ { "a": "attr", - "t": "gold", - "n": 3000 + "t": "diamond", + "n": 200 } ] }, { "lv": 4, - "newmoneyexp": 400000, - "bagtop": 90, + "newmoneyexp": 5000000, + "bagtop": 5000, "bagtagnum": 18, "tickettop": { "a": "item", "t": "21000001", - "n": 90 + "n": 24 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10004 + "n": 140000 }, "bargainpro": 20000, "bargainnum": 2, "reward": [ { "a": "attr", - "t": "gold", - "n": 4000 + "t": "diamond", + "n": 200 } ] }, { "lv": 5, - "newmoneyexp": 500000, - "bagtop": 100, + "newmoneyexp": 10000000, + "bagtop": 5500, "bagtagnum": 20, "tickettop": { "a": "item", "t": "21000001", - "n": 100 + "n": 25 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10005 + "n": 150000 }, "bargainpro": 25000, "bargainnum": 2, "reward": [ { "a": "attr", - "t": "gold", - "n": 5000 + "t": "diamond", + "n": 200 } ] }, { "lv": 6, - "newmoneyexp": 600000, - "bagtop": 110, + "newmoneyexp": 15000000, + "bagtop": 6000, "bagtagnum": 22, "tickettop": { "a": "item", "t": "21000001", - "n": 110 + "n": 26 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10006 + "n": 160000 }, "bargainpro": 30000, "bargainnum": 3, "reward": [ { "a": "attr", - "t": "gold", - "n": 6000 + "t": "diamond", + "n": 200 } ] }, { "lv": 7, - "newmoneyexp": 700000, - "bagtop": 120, + "newmoneyexp": 20000000, + "bagtop": 6500, "bagtagnum": 24, "tickettop": { "a": "item", "t": "21000001", - "n": 120 + "n": 27 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10007 + "n": 170000 }, "bargainpro": 35000, "bargainnum": 3, "reward": [ { "a": "attr", - "t": "gold", - "n": 7000 + "t": "diamond", + "n": 200 } ] }, { "lv": 8, - "newmoneyexp": 800000, - "bagtop": 130, + "newmoneyexp": 30000000, + "bagtop": 7000, "bagtagnum": 26, "tickettop": { "a": "item", "t": "21000001", - "n": 130 + "n": 28 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10008 + "n": 180000 }, "bargainpro": 40000, "bargainnum": 3, "reward": [ { "a": "attr", - "t": "gold", - "n": 8000 + "t": "diamond", + "n": 200 } ] }, { "lv": 9, - "newmoneyexp": 900000, - "bagtop": 140, + "newmoneyexp": 40000000, + "bagtop": 7500, "bagtagnum": 28, "tickettop": { "a": "item", "t": "21000001", - "n": 140 + "n": 29 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10009 + "n": 190000 }, "bargainpro": 45000, "bargainnum": 4, "reward": [ { "a": "attr", - "t": "gold", - "n": 9000 + "t": "diamond", + "n": 200 } ] }, { "lv": 10, - "newmoneyexp": 1000000, - "bagtop": 150, + "newmoneyexp": 50000000, + "bagtop": 8000, "bagtagnum": 30, "tickettop": { "a": "item", "t": "21000001", - "n": 150 + "n": 30 }, "moneynumtop": { "a": "attr", "t": "merchantmoney", - "n": 10010 + "n": 200000 }, "bargainpro": 50000, "bargainnum": 4, "reward": [ { "a": "attr", - "t": "gold", - "n": 10000 - } - ] - }, - { - "lv": 11, - "newmoneyexp": 1100000, - "bagtop": 160, - "bagtagnum": 30, - "tickettop": { - "a": "item", - "t": "21000001", - "n": 160 - }, - "moneynumtop": { - "a": "attr", - "t": "merchantmoney", - "n": 10011 - }, - "bargainpro": 55000, - "bargainnum": 4, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 11000 - } - ] - }, - { - "lv": 12, - "newmoneyexp": 1200000, - "bagtop": 200, - "bagtagnum": 35, - "tickettop": { - "a": "item", - "t": "21000001", - "n": 170 - }, - "moneynumtop": { - "a": "attr", - "t": "merchantmoney", - "n": 10012 - }, - "bargainpro": 60000, - "bargainnum": 5, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 12000 + "t": "diamond", + "n": 200 } ] } diff --git a/bin/json/game_caravanrank.json b/bin/json/game_caravanrank.json index 3cde2bbce..dbd913a92 100644 --- a/bin/json/game_caravanrank.json +++ b/bin/json/game_caravanrank.json @@ -6,7 +6,12 @@ { "a": "attr", "t": "gold", - "n": 3000 + "n": 1000000 + }, + { + "a": "attr", + "t": "diamond", + "n": 300 } ] }, @@ -17,18 +22,28 @@ { "a": "attr", "t": "gold", - "n": 2000 + "n": 800000 + }, + { + "a": "attr", + "t": "diamond", + "n": 250 } ] }, { "id": 3, - "group": 3, + "group": 2, "reward": [ { "a": "attr", "t": "gold", - "n": 1000 + "n": 800000 + }, + { + "a": "attr", + "t": "diamond", + "n": 250 } ] }, @@ -39,7 +54,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -50,7 +70,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -61,7 +86,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -72,7 +102,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -83,7 +118,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -94,7 +134,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -105,7 +150,12 @@ { "a": "attr", "t": "gold", - "n": 500 + "n": 600000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 } ] }, @@ -116,7 +166,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -127,7 +182,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -138,7 +198,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -149,7 +214,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -160,7 +230,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -171,7 +246,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -182,7 +262,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -193,7 +278,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -204,7 +294,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -215,7 +310,12 @@ { "a": "attr", "t": "gold", - "n": 300 + "n": 500000 + }, + { + "a": "attr", + "t": "diamond", + "n": 180 } ] }, @@ -226,7 +326,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -237,7 +342,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -248,7 +358,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -259,7 +374,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -270,7 +390,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -281,7 +406,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -292,7 +422,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -303,7 +438,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -314,7 +454,12 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, @@ -325,18 +470,412 @@ { "a": "attr", "t": "gold", - "n": 200 + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 } ] }, { "id": 31, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 32, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 33, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 34, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 35, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 36, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 37, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 38, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 39, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 40, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 41, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 42, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 43, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 44, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 45, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 46, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 47, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 48, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 49, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 50, + "group": 21, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 400000 + }, + { + "a": "attr", + "t": "diamond", + "n": 160 + } + ] + }, + { + "id": 51, + "group": 31, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "attr", + "t": "diamond", + "n": 140 + } + ] + }, + { + "id": 200, + "group": 31, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 300000 + }, + { + "a": "attr", + "t": "diamond", + "n": 140 + } + ] + }, + { + "id": 201, + "group": 41, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 200000 + }, + { + "a": "attr", + "t": "diamond", + "n": 120 + } + ] + }, + { + "id": 500, + "group": 41, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 200000 + }, + { + "a": "attr", + "t": "diamond", + "n": 120 + } + ] + }, + { + "id": 501, "group": 0, "reward": [ { "a": "attr", "t": "gold", - "n": 10 + "n": 100000 + }, + { + "a": "attr", + "t": "diamond", + "n": 100 } ] } diff --git a/bin/json/game_caravanreward.json b/bin/json/game_caravanreward.json index 53b4d4063..812f305a6 100644 --- a/bin/json/game_caravanreward.json +++ b/bin/json/game_caravanreward.json @@ -1,61 +1,83 @@ [ { "id": 1, - "key": 3000, + "key": 50000, "reward": [ { "a": "attr", "t": "gold", - "n": 100 + "n": 300000 } ] }, { "id": 2, - "key": 4000, + "key": 100000, "reward": [ { "a": "attr", "t": "gold", - "n": 1000 + "n": 350000 } ] }, { "id": 3, - "key": 5000, + "key": 200000, "reward": [ { "a": "attr", "t": "gold", - "n": 2000 + "n": 400000 } ] }, { "id": 4, - "key": 6000, + "key": 300000, "reward": [ { "a": "attr", "t": "gold", - "n": 3000 + "n": 450000 } ] }, { "id": 5, - "key": 7000, + "key": 500000, "reward": [ { "a": "attr", "t": "gold", - "n": 9999 + "n": 500000 } ] }, { "id": 6, + "key": 1000000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 550000 + } + ] + }, + { + "id": 7, + "key": 2000000, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 600000 + } + ] + }, + { + "id": 8, "key": -10, "reward": [ { diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json index c8de86435..41f2c8664 100644 --- a/bin/json/game_caravanthing.json +++ b/bin/json/game_caravanthing.json @@ -1,622 +1,994 @@ [ { "itemid": "21000002", - "goodsprice": 1000, + "goodsprice": 1400, "changeperiod": [ - 5, - 15 + 6, + 8 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 1 + "pricemin": 840, + "pricemax": 1960, + "goodsnum": 25, + "weight": 85 }, { "itemid": "21000003", - "goodsprice": 900, + "goodsprice": 500, "changeperiod": [ - 5, - 15 + 8, + 10 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 2 + "pricemin": 300, + "pricemax": 700, + "goodsnum": 100, + "weight": 25 }, { "itemid": "21000004", - "goodsprice": 500, + "goodsprice": 1850, "changeperiod": [ - 5, - 15 + 4, + 6 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 3 + "pricemin": 1110, + "pricemax": 2590, + "goodsnum": 15, + "weight": 100 }, { "itemid": "21000005", - "goodsprice": 1500, + "goodsprice": 400, "changeperiod": [ - 5, - 15 + 10, + 12 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 4 + "pricemin": 240, + "pricemax": 560, + "goodsnum": 190, + "weight": 20 }, { "itemid": "21000006", - "goodsprice": 2300, + "goodsprice": 700, "changeperiod": [ - 5, - 15 + 8, + 10 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 5 + "pricemin": 420, + "pricemax": 980, + "goodsnum": 70, + "weight": 40 }, { "itemid": "21000007", - "goodsprice": 1130, + "goodsprice": 900, "changeperiod": [ - 5, - 15 + 8, + 10 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 6 + "pricemin": 540, + "pricemax": 1260, + "goodsnum": 70, + "weight": 60 }, { "itemid": "21000008", - "goodsprice": 1000, + "goodsprice": 600, "changeperiod": [ - 5, - 15 + 8, + 10 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 7 + "pricemin": 360, + "pricemax": 840, + "goodsnum": 85, + "weight": 30 }, { "itemid": "21000009", - "goodsprice": 900, + "goodsprice": 1750, "changeperiod": [ - 5, - 15 + 4, + 6 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 8 + "pricemin": 1050, + "pricemax": 2450, + "goodsnum": 10, + "weight": 50 }, { "itemid": "21000010", - "goodsprice": 500, + "goodsprice": 1100, "changeperiod": [ - 5, - 15 + 6, + 8 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 9 + "pricemin": 660, + "pricemax": 1540, + "goodsnum": 35, + "weight": 50 }, { "itemid": "21000011", - "goodsprice": 1500, + "goodsprice": 2000, "changeperiod": [ - 5, - 15 + 4, + 6 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, + "pricemin": 1200, + "pricemax": 2800, + "goodsnum": 6, "weight": 10 }, { "itemid": "21000012", - "goodsprice": 2300, + "goodsprice": 1350, "changeperiod": [ - 5, - 15 + 6, + 8 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 11 + "pricemin": 810, + "pricemax": 1890, + "goodsnum": 25, + "weight": 50 }, { "itemid": "21000013", - "goodsprice": 1130, + "goodsprice": 600, "changeperiod": [ - 5, - 15 + 8, + 10 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, + "pricemin": 360, + "pricemax": 840, "goodsnum": 80, - "weight": 12 + "weight": 30 }, { "itemid": "21000014", - "goodsprice": 1000, + "goodsprice": 1200, "changeperiod": [ - 5, - 15 + 6, + 8 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 13 + "pricemin": 720, + "pricemax": 1680, + "goodsnum": 50, + "weight": 150 }, { "itemid": "21000015", - "goodsprice": 900, + "goodsprice": 1000, "changeperiod": [ - 5, - 15 + 6, + 8 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 14 + "pricemin": 600, + "pricemax": 1400, + "goodsnum": 35, + "weight": 55 }, { "itemid": "21000016", - "goodsprice": 500, + "goodsprice": 700, "changeperiod": [ - 5, - 15 + 8, + 10 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 15 + "pricemin": 420, + "pricemax": 980, + "goodsnum": 70, + "weight": 40 }, { "itemid": "21000017", - "goodsprice": 1500, + "goodsprice": 250, "changeperiod": [ - 5, - 15 + 10, + 12 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 16 + "pricemin": 150, + "pricemax": 350, + "goodsnum": 300, + "weight": 15 }, { "itemid": "21000018", - "goodsprice": 2300, + "goodsprice": 100, "changeperiod": [ - 5, - 15 + 10, + 12 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 17 + "pricemin": 60, + "pricemax": 140, + "goodsnum": 750, + "weight": 4 }, { "itemid": "21000019", - "goodsprice": 1130, + "goodsprice": 1600, "changeperiod": [ - 5, - 15 + 4, + 6 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 18 + "pricemin": 960, + "pricemax": 2240, + "goodsnum": 15, + "weight": 75 }, { "itemid": "21000020", - "goodsprice": 1000, + "goodsprice": 200, "changeperiod": [ - 5, - 15 + 10, + 12 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, - "weight": 19 + "pricemin": 120, + "pricemax": 280, + "goodsnum": 375, + "weight": 8 }, { "itemid": "21000021", - "goodsprice": 900, + "goodsprice": 450, "changeperiod": [ - 5, - 15 + 10, + 12 ], - "changetime": 600, + "changetime": 7200, "PriceChangeWeight": [ - 40, - 20, - 40 + 35, + 30, + 35 ], "PriceChangeWeight_one": [ - 80, - 20 + 70, + 30 ], "PriceChangeWeight_two": [ 50, 50 ], "PriceChangeWeight_three": [ - 20, - 80 + 30, + 70 ], "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80, + "pricemin": 270, + "pricemax": 630, + "goodsnum": 200, + "weight": 40 + }, + { + "itemid": "21000022", + "goodsprice": 1500, + "changeperiod": [ + 4, + 6 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 900, + "pricemax": 2100, + "goodsnum": 15, + "weight": 60 + }, + { + "itemid": "21000023", + "goodsprice": 1250, + "changeperiod": [ + 6, + 8 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 750, + "pricemax": 1750, + "goodsnum": 30, + "weight": 60 + }, + { + "itemid": "21000024", + "goodsprice": 800, + "changeperiod": [ + 8, + 10 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 480, + "pricemax": 1120, + "goodsnum": 60, + "weight": 40 + }, + { + "itemid": "21000025", + "goodsprice": 300, + "changeperiod": [ + 10, + 12 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 180, + "pricemax": 420, + "goodsnum": 250, "weight": 20 + }, + { + "itemid": "21000026", + "goodsprice": 1300, + "changeperiod": [ + 6, + 8 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 780, + "pricemax": 1820, + "goodsnum": 28, + "weight": 80 + }, + { + "itemid": "21000027", + "goodsprice": 2000, + "changeperiod": [ + 4, + 6 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 1200, + "pricemax": 2800, + "goodsnum": 15, + "weight": 120 + }, + { + "itemid": "21000028", + "goodsprice": 650, + "changeperiod": [ + 8, + 10 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 390, + "pricemax": 910, + "goodsnum": 100, + "weight": 60 + }, + { + "itemid": "21000029", + "goodsprice": 150, + "changeperiod": [ + 10, + 12 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 90, + "pricemax": 210, + "goodsnum": 500, + "weight": 8 + }, + { + "itemid": "21000030", + "goodsprice": 1500, + "changeperiod": [ + 4, + 6 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 900, + "pricemax": 2100, + "goodsnum": 16, + "weight": 90 + }, + { + "itemid": "21000031", + "goodsprice": 1800, + "changeperiod": [ + 4, + 6 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 1080, + "pricemax": 2520, + "goodsnum": 12, + "weight": 75 + }, + { + "itemid": "21000032", + "goodsprice": 1450, + "changeperiod": [ + 6, + 8 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 870, + "pricemax": 2030, + "goodsnum": 25, + "weight": 75 + }, + { + "itemid": "21000033", + "goodsprice": 100, + "changeperiod": [ + 10, + 12 + ], + "changetime": 7200, + "PriceChangeWeight": [ + 35, + 30, + 35 + ], + "PriceChangeWeight_one": [ + 70, + 30 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 30, + 70 + ], + "FluctuationRange": 500, + "pricemin": 60, + "pricemax": 140, + "goodsnum": 750, + "weight": 4 } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 168f64dc5..9d15359c4 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -128,7 +128,7 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 138, "FormatList": [ 101011 ], @@ -163,10 +163,8 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, - "ventureavatar": [ - "Person/44005/44005_q.prefab" - ], + "venturetype": 0, + "ventureavatar": [], "herocolor": 1, "heroimg": "zxgq_qp_icon_zd", "bubbletext": { @@ -231,7 +229,7 @@ 101021 ], "helphero": [ - "34004" + "44005" ], "banhero": [], "star": [ @@ -331,7 +329,7 @@ 101031 ], "helphero": [ - "34004" + "44005" ], "banhero": [], "star": [ @@ -436,7 +434,7 @@ 101041 ], "helphero": [ - "34004" + "44005" ], "banhero": [], "star": [ @@ -597,12 +595,13 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 136, "FormatList": [ 101051 ], "helphero": [ - "13004" + "13002", + "44005" ], "banhero": [], "star": [ @@ -668,7 +667,13 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "attr", + "t": "gold", + "n": 6000 + } + ], "lotteryward": 0, "commonaward": [], "BattleReadyID": 0, @@ -749,7 +754,7 @@ "chapterid": 11001, "group_id": 100109, "previous_group_id": [ - 100107 + 100108 ], "previoustage": 0, "Episodetype": 7, @@ -813,7 +818,7 @@ "chapterid": 11001, "group_id": 100110, "previous_group_id": [ - 100107 + 100109 ], "previoustage": 0, "Episodetype": 7, @@ -877,9 +882,7 @@ "chapterid": 11001, "group_id": 100111, "previous_group_id": [ - 100110, - 100108, - 100109 + 100110 ], "previoustage": 0, "Episodetype": 3, @@ -1063,12 +1066,12 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 137, "FormatList": [ 101061 ], "helphero": [ - "13004" + "13002" ], "banhero": [ "44005", @@ -1169,12 +1172,12 @@ "n": 6000 } ], - "BattleReadyID": 118, + "BattleReadyID": 137, "FormatList": [ 101071 ], "helphero": [ - "13004" + "13002" ], "banhero": [ "44005", @@ -1535,7 +1538,7 @@ 101081 ], "helphero": [ - "13004" + "13002" ], "banhero": [ "44005", From d8221d1ce9e76d5d3867af08369fdceacfc073df Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 4 Aug 2023 22:12:26 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=95=86=E9=98=9F=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91=E6=A6=82=E7=8E=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/caravan/api_gotocity.go | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index 1833ddd30..fab7b2e67 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -76,20 +76,25 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity } if bNewTask { // 到该城市随机一个新的任务 if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil { - if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil { - var sz []*cfg.GameCaravanEventData - for _, v := range elist { - if _, ok := list.Group[v.Worldtask]; !ok { - sz = append(sz, v) + //newCity.Cityeventpro + if newCity.Cityeventpro > comm.GetRandNum(0, 1000) { + if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil { + var sz []*cfg.GameCaravanEventData + for _, v := range elist { + if _, ok := list.Group[v.Worldtask]; !ok { + sz = append(sz, v) + } + } + if len(sz) > 0 { // 容错处理 + var randW []int32 + for _, v := range sz { + randW = append(randW, v.Eventweight) + } + list.Eventid = sz[comm.GetRandW(randW)].Id } } - if len(sz) > 0 { // 容错处理 - var randW []int32 - for _, v := range sz { - randW = append(randW, v.Eventweight) - } - list.Eventid = sz[comm.GetRandW(randW)].Id - } + } else { + bNewTask = false } } else { @@ -98,6 +103,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: e.Error(), } + return } } if list.Curcity == req.City {