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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2023-08-18 11:09:12 +08:00
commit 06f149e4b9
6 changed files with 418 additions and 1764 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/json/game_global.json
View File

@ -670,6 +670,7 @@
"t": "merchantmoney",
"n": 1
},
"business_rankmoney": 1000,
"business_moneynum": 10000,
"business_minint_reward": {
"a": "attr",

14
bin/json/game_skillafteratk.json
View File

@ -133,7 +133,7 @@
"Argu": [
1,
4,
1700
1600
],
"FollowSK": [
225004132
@ -182,7 +182,7 @@
"Argu": [
1,
4,
1800
1700
],
"FollowSK": [
225004142
@ -231,7 +231,7 @@
"Argu": [
1,
4,
1900
1700
],
"FollowSK": [
225004152
@ -280,7 +280,7 @@
"Argu": [
1,
4,
2000
1800
],
"FollowSK": [
225004162
@ -756,7 +756,7 @@
"Argu": [
1,
4,
1500
1600
],
"FollowSK": [],
"SucFollowSK": [
@ -805,7 +805,7 @@
"Argu": [
1,
4,
1500
1600
],
"FollowSK": [],
"SucFollowSK": [
@ -854,7 +854,7 @@
"Argu": [
1,
4,
1500
1700
],
"FollowSK": [],
"SucFollowSK": [

2161
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

3
modules/caravan/model_caravan.go
View File

@ -72,7 +72,8 @@ func (this *modelCaravan) modifyCaravanDataByObjId(uid string, data map[string]i
func (this *modelCaravan) GetRankListData(rankNum int32, uid string) (list []*pb.CaravanRankInfo, rankid int32) {
var ipos int32
if _data, err := this.DBModel.DB.Find(comm.TableUser, bson.M{}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(int64(rankNum))); err == nil {
min := this.module.ModuleTools.GetGlobalConf().BusinessRankmoney
if _data, err := this.DBModel.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": min}}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(int64(rankNum))); err == nil {
for _data.Next(context.TODO()) {
temp := &pb.DBUser{}
if err = _data.Decode(temp); err == nil {

1
modules/timer/caravanrank.go
View File

@ -79,6 +79,7 @@ func (this *CaravanRank) Start() (err error) {
// 0 0 0 ? * MON // 每周一零点
cron.AddFunc("0 0 0 ? * MON", this.TimerSeason)
//this.TimerSeason()
return
}

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

@ -211,6 +211,7 @@ type GameGlobalData struct {
FitnessModelId string
BusinessTicket int32
BusinessMoney *Gameatn
BusinessRankmoney int32
BusinessMoneynum int32
BusinessMinintReward *Gameatn
BusinessMaxintReward *Gameatn
@ -886,6 +887,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_ticket"].(float64); !_ok_ { err = errors.New("business_ticket error"); return }; _v.BusinessTicket = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_money"].(map[string]interface{}); !_ok_ { err = errors.New("business_money error"); return }; if _v.BusinessMoney, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rankmoney"].(float64); !_ok_ { err = errors.New("business_rankmoney error"); return }; _v.BusinessRankmoney = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_moneynum"].(float64); !_ok_ { err = errors.New("business_moneynum error"); return }; _v.BusinessMoneynum = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_minint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_minint_reward error"); return }; if _v.BusinessMinintReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_maxint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_maxint_reward error"); return }; if _v.BusinessMaxintReward, err = DeserializeGameatn(_x_); err != nil { return } }