liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

商队修改

Browse Source
This commit is contained in:
meixiongfeng 2023-07-10 18:39:33 +08:00
parent 4558c28595
commit bd70b4a435
15 changed files with 93 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/json/game_bubblegroup.json
View File

@ -778,5 +778,17 @@
"key": "bubblegroup_bubblegroup_Text_Bubble_65",
"text": "玩家购买成功语录"
}
},
{
"KeyId": 66,
"GroupID": 11005,
"Type": 2,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_bubblegroup_Text_Bubble_66",
"text": "你的背包装不下啦，卖掉一些再来购买吧。"
}
}
]

5
bin/json/game_caravancity.json
View File

@ -49,6 +49,7 @@
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"weitalk": 11005,
"cityeventpro": 50000,
"cityevent": 1
},
@ -102,6 +103,7 @@
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"weitalk": 11005,
"cityeventpro": 100000,
"cityevent": 1
},
@ -156,6 +158,7 @@
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"weitalk": 11005,
"cityeventpro": 50000,
"cityevent": 1
},
@ -210,6 +213,7 @@
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"weitalk": 11005,
"cityeventpro": 100000,
"cityevent": 1
},
@ -263,6 +267,7 @@
"ortalk": 11002,
"sptalk": 11003,
"buytalk": 11004,
"weitalk": 11005,
"cityeventpro": 50000,
"cityevent": 1
}

30
bin/json/game_caravanreward.json
View File

@ -1,8 +1,6 @@
[
{
"key": 1,
"moneystart": -1,
"moneyend": 10000,
"key": 1000,
"reward": [
{
"a": "attr",
@ -12,9 +10,7 @@
]
},
{
"key": 2,
"moneystart": 10000,
"moneyend": 20000,
"key": 2000,
"reward": [
{
"a": "attr",
@ -24,9 +20,7 @@
]
},
{
"key": 3,
"moneystart": 20000,
"moneyend": 30000,
"key": 3000,
"reward": [
{
"a": "attr",
@ -36,9 +30,7 @@
]
},
{
"key": 4,
"moneystart": 30000,
"moneyend": 50000,
"key": 4000,
"reward": [
{
"a": "attr",
@ -48,9 +40,7 @@
]
},
{
"key": 5,
"moneystart": 50000,
"moneyend": -1,
"key": 5000,
"reward": [
{
"a": "attr",
@ -58,5 +48,15 @@
"n": 9999
}
]
},
{
"key": 0,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 10
}
]
}
]

4
bin/json/game_global.json
View File

@ -705,6 +705,7 @@
"business_bag": 20,
"business_rewardday": 1,
"business_renovatething": 180,
"business_change": 0.5,
"favorability_likes": 1500,
"favorability_dislikes": 500,
"buzkashi_time": 180,
@ -787,6 +788,7 @@
"a": "item",
"t": "10000035",
"n": 0
}
},
"passlvmax": 50
}
]

24
bin/json/game_item.json
View File

@ -9664,7 +9664,7 @@
"img": "item_15000101",
"intr": {
"key": "item_item_intr_251",
"text": "狩猎头目的初级掉落物，可用于守护者回响。"
"text": "狩猎头目的初级掉落物，可用于真诚阵营守护者回响。"
},
"sale": [
{
@ -9715,7 +9715,7 @@
"img": "item_15000102",
"intr": {
"key": "item_item_intr_252",
"text": "狩猎头目的初级掉落物，可用于守护者回响。"
"text": "狩猎头目的初级掉落物，可用于直觉阵营守护者回响。"
},
"sale": [
{
@ -9766,7 +9766,7 @@
"img": "item_15000103",
"intr": {
"key": "item_item_intr_253",
"text": "狩猎头目的初级掉落物，可用于守护者回响。"
"text": "狩猎头目的初级掉落物，可用于共情阵营守护者回响。"
},
"sale": [
{
@ -9817,7 +9817,7 @@
"img": "item_15000104",
"intr": {
"key": "item_item_intr_254",
"text": "狩猎头目的初级掉落物，可用于守护者回响。"
"text": "狩猎头目的初级掉落物，可用于责任阵营守护者回响。"
},
"sale": [
{
@ -9880,7 +9880,7 @@
"img": "item_15000201",
"intr": {
"key": "item_item_intr_255",
"text": "狩猎头目的中级掉落物，可用于守护者回响。"
"text": "狩猎头目的中级掉落物，可用于真诚阵营守护者回响。"
},
"sale": [
{
@ -9943,7 +9943,7 @@
"img": "item_15000202",
"intr": {
"key": "item_item_intr_256",
"text": "狩猎头目的中级掉落物，可用于守护者回响。"
"text": "狩猎头目的中级掉落物，可用于直觉阵营守护者回响。"
},
"sale": [
{
@ -10006,7 +10006,7 @@
"img": "item_15000203",
"intr": {
"key": "item_item_intr_257",
"text": "狩猎头目的中级掉落物，可用于守护者回响。"
"text": "狩猎头目的中级掉落物，可用于共情阵营守护者回响。"
},
"sale": [
{
@ -10069,7 +10069,7 @@
"img": "item_15000204",
"intr": {
"key": "item_item_intr_258",
"text": "狩猎头目的中级掉落物，可用于守护者回响。"
"text": "狩猎头目的中级掉落物，可用于责任阵营守护者回响。"
},
"sale": [
{
@ -10120,7 +10120,7 @@
"img": "item_15000301",
"intr": {
"key": "item_item_intr_259",
"text": "狩猎头目的高级掉落物，可用于守护者回响。"
"text": "狩猎头目的高级掉落物，可用于真诚阵营守护者回响。"
},
"sale": [
{
@ -10171,7 +10171,7 @@
"img": "item_15000302",
"intr": {
"key": "item_item_intr_260",
"text": "狩猎头目的高级掉落物，可用于守护者回响。"
"text": "狩猎头目的高级掉落物，可用于直觉阵营守护者回响。"
},
"sale": [
{
@ -10222,7 +10222,7 @@
"img": "item_15000303",
"intr": {
"key": "item_item_intr_261",
"text": "狩猎头目的高级掉落物，可用于守护者回响。"
"text": "狩猎头目的高级掉落物，可用于共情阵营守护者回响。"
},
"sale": [
{
@ -10273,7 +10273,7 @@
"img": "item_15000304",
"intr": {
"key": "item_item_intr_262",
"text": "狩猎头目的高级掉落物，可用于守护者回响。"
"text": "狩猎头目的高级掉落物，可用于责任阵营守护者回响。"
},
"sale": [
{

2
bin/json/game_skillafteratk.json
View File

@ -13483,7 +13483,7 @@
"Type": 3,
"Argu": [
390001007,
1000,
500,
1,
2
],

6
bin/json/game_skillatk.json
View File

@ -9569,7 +9569,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_135005211_1",
"text": "幸运·普雷斯科特对敌方目标造成350%伤害。"
"text": "幸运·普雷斯科特对敌方目标造成350%伤害。50%的概率为目标附加2回合[color=#e5621b]防御下降[/color]。"
},
"buffid": [],
"map": ""
@ -12686,7 +12686,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_143002211_1",
"text": "果酱教授每次攻击可减少目标15%行动值。"
"text": "果酱教授每次攻击可减少目标15%行动值。目标行动值低于30%时，附加1回合[color=#e5621b]石化[/color] 。"
},
"buffid": [
390001108
@ -16604,7 +16604,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_134007111_1",
"text": "菲奥娜对敌方1个目标造成2次攻击力750%的伤害，若发生暴击，则为自身附加1回合[color=#37d8a9]免疫[/color]状态。"
"text": "菲奥娜对敌方1个目标造成2次攻击力75%的伤害，若发生暴击，则为自身附加1回合[color=#37d8a9]免疫[/color]状态。"
},
"buffid": [
390001111

2
bin/json/game_skillbuff.json
View File

@ -4128,7 +4128,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001452",
"text": "喜悦"
"text": "全体友方受到伤害降低25%，效果期间自身无法行动。"
},
"BuffType": 0,
"EffectArgu": [],

13
modules/caravan/comp_configure.go
View File

@ -208,6 +208,19 @@ func (this *configureComp) GetCaravanReward() (reward []*cfg.GameCaravanRewardDa
return
}
func (this *configureComp) GetCaravanMoreReward() (reward []*cfg.Gameatn) {
if v, err := this.GetConfigure(game_caravan_reward); err == nil {
if configure, ok := v.(*cfg.GameCaravanReward); ok {
if configure.Get(0) != nil {
return configure.Get(0).Reward
}
}
} else {
log.Errorf("get GetCaravanInitCity conf err:%v", err)
}
return
}
func (this *configureComp) GetCaravanRank(index int32) (reward *cfg.GameCaravanRankData, err error) {
var (
v interface{}

43
modules/caravan/module.go
View File

@ -388,6 +388,13 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E
}
}
}
var maxKey int32
for _, v := range this.configure.GetCaravanReward() {
if v.Key > maxKey {
maxKey = v.Key
}
}
moreReard := this.configure.GetCaravanMoreReward() // 超过部分
// 发送虚拟币奖励
if _data, err := this.modelCaravan.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": comm.CaravanMerchantmoney}}); err == nil {
for _data.Next(context.TODO()) {
@ -395,32 +402,20 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E
if err = _data.Decode(temp); err == nil {
for _, v := range this.configure.GetCaravanReward() {
s := v.Moneystart
e := v.Moneyend
more := false
if e == -1 {
e = math.MaxInt32
more = true
}
if s < temp.Merchantmoney && e <= temp.Merchantmoney {
var res []*cfg.Gameatn
if more { // 超过的部分
r := this.ModuleTools.GetGlobalConf().BusinessMaxintReward
m := this.ModuleTools.GetGlobalConf().BusinessMaxint
n := (temp.Merchantmoney - s) / m
atn := &cfg.Gameatn{
A: r.A,
T: r.T,
N: r.N * n,
}
res = append(res, atn)
if maxKey <= temp.Merchantmoney {
var res []*cfg.Gameatn
for _, v := range moreReard {
if v.N == 0 {
continue
}
res = append(res, v.Reward...)
this.mail.SendMailByUID(temp.Uid, "CaravanRewards", v.Reward, []string{})
atn := &cfg.Gameatn{
A: v.A,
T: v.T,
N: v.N * (temp.Merchantmoney - maxKey),
}
res = append(res, atn)
}
this.mail.SendMailByUID(temp.Uid, "CaravanRewards", res, []string{})
}
}
}

6
modules/hunting/api_challengeover.go
View File

@ -96,8 +96,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
key := strconv.Itoa(int(req.BossType)) + "_" + strconv.Itoa(int(req.Difficulty))
if hunting.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励
hunting.BossTime[key] = req.Report.Costtime
mapData["bossTime"] = hunting.BossTime
//hunting.BossTime[key] = req.Report.Costtime
//mapData["bossTime"] = hunting.BossTime
if errdata = this.module.DispenseRes(session, cfgHunting.Firstprize, true); errdata != nil {
return
}
@ -110,7 +110,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
}
}
// 耗时校验 当前战斗胜利时间消耗小于之前刷新数据
if hunting.BossTime[key] > req.Report.Costtime {
if hunting.BossTime[key] == 0 || hunting.BossTime[key] > req.Report.Costtime {
hunting.BossTime[key] = req.Report.Costtime
mapData["bossTime"] = hunting.BossTime // 更新时间
this.module.CheckRank(session.GetUserId(), req.BossType, req.Difficulty, req.Report)

2
modules/pagoda/comp_configure.go
View File

@ -46,8 +46,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
configure.RegisterConfigure(game_pagoda, cfg.NewGamePagoda, this.LoadPagoda)
configure.RegisterConfigure(game_circulate, cfg.NewGameCirculate, this.LoadCirculate)
this.GetPagodaRaceConfById(11000027)
this.GetPagodaCirculateConf(0, 25)
return
}

2
sys/configure/structs/Game.CaravanCityData.go
View File

@ -33,6 +33,7 @@ type GameCaravanCityData struct {
Ortalk int32
Sptalk int32
Buytalk int32
Weitalk int32
Cityeventpro int32
Cityevent int32
}
@ -131,6 +132,7 @@ func (_v *GameCaravanCityData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ortalk"].(float64); !_ok_ { err = errors.New("ortalk error"); return }; _v.Ortalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sptalk"].(float64); !_ok_ { err = errors.New("sptalk error"); return }; _v.Sptalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buytalk"].(float64); !_ok_ { err = errors.New("buytalk error"); return }; _v.Buytalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weitalk"].(float64); !_ok_ { err = errors.New("weitalk error"); return }; _v.Weitalk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityeventpro"].(float64); !_ok_ { err = errors.New("cityeventpro error"); return }; _v.Cityeventpro = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityevent"].(float64); !_ok_ { err = errors.New("cityevent error"); return }; _v.Cityevent = int32(_tempNum_) }
return

4
sys/configure/structs/Game.CaravanRewardData.go
View File

@ -12,8 +12,6 @@ import "errors"
type GameCaravanRewardData struct {
Key int32
Moneystart int32
Moneyend int32
Reward []*Gameatn
}
@ -25,8 +23,6 @@ func (*GameCaravanRewardData) GetTypeId() int32 {
func (_v *GameCaravanRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["moneystart"].(float64); !_ok_ { err = errors.New("moneystart error"); return }; _v.Moneystart = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["moneyend"].(float64); !_ok_ { err = errors.New("moneyend error"); return }; _v.Moneyend = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool

4
sys/configure/structs/game.globalData.go
View File

@ -213,6 +213,7 @@ type GameGlobalData struct {
BusinessBag int32
BusinessRewardday int32
BusinessRenovatething int32
BusinessChange float32
FavorabilityLikes int32
FavorabilityDislikes int32
BuzkashiTime int32
@ -240,6 +241,7 @@ type GameGlobalData struct {
MrylReward []*Gameatn
OverexpReward *Gameatn
Voucher *Gameatn
Passlvmax int32
}
const TypeId_GameGlobalData = 477542761
@ -880,6 +882,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_bag"].(float64); !_ok_ { err = errors.New("business_bag error"); return }; _v.BusinessBag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rewardday"].(float64); !_ok_ { err = errors.New("business_rewardday error"); return }; _v.BusinessRewardday = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_change"].(float64); !_ok_ { err = errors.New("business_change error"); return }; _v.BusinessChange = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_time"].(float64); !_ok_ { err = errors.New("buzkashi_time error"); return }; _v.BuzkashiTime = int32(_tempNum_) }
@ -985,6 +988,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["overexp_reward"].(map[string]interface{}); !_ok_ { err = errors.New("overexp_reward error"); return }; if _v.OverexpReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["voucher"].(map[string]interface{}); !_ok_ { err = errors.New("voucher error"); return }; if _v.Voucher, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passlvmax"].(float64); !_ok_ { err = errors.New("passlvmax error"); return }; _v.Passlvmax = int32(_tempNum_) }
return
}