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

上传配置文件改动

Browse Source
This commit is contained in:
liwei1dao 2023-01-12 15:28:25 +08:00
parent 409ecdf987
commit 84b5763e3a
4 changed files with 112 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
bin/json/game_global.json
View File

@ -382,7 +382,7 @@
], ],
"VIP_DaysSent": 7, "VIP_DaysSent": 7,
"MonthlyCard_DaysSent": 30, "MonthlyCard_DaysSent": 30,
"opennewguide": 1, "opennewguide": 0,
"library_StoryUnlocking": 3, "library_StoryUnlocking": 3,
"ps_recovery": 300, "ps_recovery": 300,
"ps_ul": 2000, "ps_ul": 2000,
@ -444,45 +444,84 @@
"n": 1 "n": 1
}, },
"Inletopening": 1, "Inletopening": 1,
"VikingExpedition_cos": { "gold": {
"a": "item", "a": "attr",
"t": "100100", "t": "gold",
"n": 6 "n": 0
}, },
"dreamland_cos": { "diamond": {
"a": "item", "a": "attr",
"t": "100100", "t": "diamond",
"n": 3 "n": 0
}, },
"enchantboss_cos": { "ps": {
"a": "item", "a": "attr",
"t": "100100", "t": "ps",
"n": 9 "n": 0
}, },
"hunting_cos": { "recruit": {
"a": "item", "a": "item",
"t": "100100", "t": "30001",
"n": 6 "n": 0
}, },
"VikingExpedition_Return": { "GuildBoss_buy": [
"a": "item", {
"t": "100100", "a": "attr",
"n": 5 "t": "diamond",
"n": 1000
}, },
"dreamland_Return": { {
"a": "item", "a": "attr",
"t": "100100", "t": "diamond",
"n": 2 "n": 1000
}, },
"enchantboss_Return": { {
"a": "item", "a": "attr",
"t": "100100", "t": "diamond",
"n": 8 "n": 1000
}, },
"hunting_Return": { {
"a": "item", "a": "attr",
"t": "100100", "t": "diamond",
"n": 5 "n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1000
} }
],
"GuildBoss_InitialNum": 5,
"GuildBoss_BuyGet": {
"a": "item",
"t": "100006",
"n": 1
},
"GuildBoss_MaxBuyNum": 5
} }
] ]

2
modules/moonfantasy/api_battle.go
View File

@ -81,7 +81,7 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
// if umfantasy, err = this.module.modelUserMF.queryUsermfantasy(session.GetUserId()); err != nil { // if umfantasy, err = this.module.modelUserMF.queryUsermfantasy(session.GetUserId()); err != nil {
// cd = pb.ErrorCode_CacheReadError // cd = pb.ErrorCode_CacheReadError
// } // }
if cd = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.configure.GetGlobalConf().DreamlandCos}, true); cd != pb.ErrorCode_Success { if cd = this.module.CheckRes(session, boss.PsConsume); cd != pb.ErrorCode_Success {
return return
} }
// if umfantasy.Ticket < this.module.configure.GetGlobalConf().DreamlandCos { // if umfantasy.Ticket < this.module.configure.GetGlobalConf().DreamlandCos {

9
modules/moonfantasy/api_receive.go
View File

@ -35,10 +35,17 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei
return return
} }
if !iswin { if !iswin {
code = pb.ErrorCode_MoonfantasyBattleNoWin if code = this.module.ConsumeRes(session, boss.PsMg, true); code != pb.ErrorCode_Success {
return
}
return
} else {
if code = this.module.ConsumeRes(session, boss.PsConsume, true); code != pb.ErrorCode_Success {
return return
} }
this.module.DispenseRes(session, boss.Prize, true) this.module.DispenseRes(session, boss.Prize, true)
}
session.SendMsg(string(this.module.GetType()), "receive", &pb.MoonfantasyReceiveResp{Issucc: true}) session.SendMsg(string(this.module.GetType()), "receive", &pb.MoonfantasyReceiveResp{Issucc: true})
return return
} }

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

@ -158,14 +158,14 @@ type GameGlobalData struct {
PsBuy []*Gameatn PsBuy []*Gameatn
PsItem *Gameatn PsItem *Gameatn
Inletopening int32 Inletopening int32
VikingExpeditionCos *Gameatn Gold *Gameatn
DreamlandCos *Gameatn Diamond *Gameatn
EnchantbossCos *Gameatn Ps *Gameatn
HuntingCos *Gameatn Recruit *Gameatn
VikingExpeditionReturn *Gameatn GuildBossBuy []*Gameatn
DreamlandReturn *Gameatn GuildBossInitialNum int32
EnchantbossReturn *Gameatn GuildBossBuyGet *Gameatn
HuntingReturn *Gameatn GuildBossMaxBuyNum int32
} }
const TypeId_GameGlobalData = 477542761 const TypeId_GameGlobalData = 477542761
@ -673,14 +673,27 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ps_item"].(map[string]interface{}); !_ok_ { err = errors.New("ps_item error"); return }; if _v.PsItem, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ps_item"].(map[string]interface{}); !_ok_ { err = errors.New("ps_item error"); return }; if _v.PsItem, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Inletopening"].(float64); !_ok_ { err = errors.New("Inletopening error"); return }; _v.Inletopening = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Inletopening"].(float64); !_ok_ { err = errors.New("Inletopening error"); return }; _v.Inletopening = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["VikingExpedition_cos"].(map[string]interface{}); !_ok_ { err = errors.New("VikingExpedition_cos error"); return }; if _v.VikingExpeditionCos, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["gold"].(map[string]interface{}); !_ok_ { err = errors.New("gold error"); return }; if _v.Gold, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["dreamland_cos"].(map[string]interface{}); !_ok_ { err = errors.New("dreamland_cos error"); return }; if _v.DreamlandCos, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["diamond"].(map[string]interface{}); !_ok_ { err = errors.New("diamond error"); return }; if _v.Diamond, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["enchantboss_cos"].(map[string]interface{}); !_ok_ { err = errors.New("enchantboss_cos error"); return }; if _v.EnchantbossCos, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ps"].(map[string]interface{}); !_ok_ { err = errors.New("ps error"); return }; if _v.Ps, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["hunting_cos"].(map[string]interface{}); !_ok_ { err = errors.New("hunting_cos error"); return }; if _v.HuntingCos, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["recruit"].(map[string]interface{}); !_ok_ { err = errors.New("recruit error"); return }; if _v.Recruit, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["VikingExpedition_Return"].(map[string]interface{}); !_ok_ { err = errors.New("VikingExpedition_Return error"); return }; if _v.VikingExpeditionReturn, err = DeserializeGameatn(_x_); err != nil { return } } {
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["dreamland_Return"].(map[string]interface{}); !_ok_ { err = errors.New("dreamland_Return error"); return }; if _v.DreamlandReturn, err = DeserializeGameatn(_x_); err != nil { return } } var _arr_ []interface{}
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["enchantboss_Return"].(map[string]interface{}); !_ok_ { err = errors.New("enchantboss_Return error"); return }; if _v.EnchantbossReturn, err = DeserializeGameatn(_x_); err != nil { return } } var _ok_ bool
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["hunting_Return"].(map[string]interface{}); !_ok_ { err = errors.New("hunting_Return error"); return }; if _v.HuntingReturn, err = DeserializeGameatn(_x_); err != nil { return } } if _arr_, _ok_ = _buf["GuildBoss_buy"].([]interface{}); !_ok_ { err = errors.New("GuildBoss_buy error"); return }
_v.GuildBossBuy = 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.GuildBossBuy = append(_v.GuildBossBuy, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_InitialNum"].(float64); !_ok_ { err = errors.New("GuildBoss_InitialNum error"); return }; _v.GuildBossInitialNum = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["GuildBoss_BuyGet"].(map[string]interface{}); !_ok_ { err = errors.New("GuildBoss_BuyGet error"); return }; if _v.GuildBossBuyGet, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_MaxBuyNum"].(float64); !_ok_ { err = errors.New("GuildBoss_MaxBuyNum error"); return }; _v.GuildBossMaxBuyNum = int32(_tempNum_) }
return return
} }