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 2022-11-24 11:05:37 +08:00
commit dd626f44f4
10 changed files with 3864 additions and 3237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_drawcard.json
View File

@ -5,7 +5,7 @@
"card_pool_type": "base_pool1",
"star": 3,
"race": 1,
"id": "13003",
"id": "25001",
"weight": 1000
},
{
@ -14,7 +14,7 @@
"card_pool_type": "base_pool1",
"star": 4,
"race": 1,
"id": "14007",
"id": "25001",
"weight": 1000
},
{
@ -23,7 +23,7 @@
"card_pool_type": "base_pool1",
"star": 5,
"race": 1,
"id": "14007",
"id": "25001",
"weight": 1000
},
{

6717
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

55
bin/json/game_rdtaskcondi.json
View File

@ -1021,6 +1021,61 @@
"data4": 0,
"data5": 0
},
{
"id": 189,
"datatype": 2,
"type": 70,
"inited": [],
"data1": 1,
"data2": 110,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 190,
"datatype": 2,
"type": 70,
"inited": [],
"data1": 1,
"data2": 111,
"data3": 1,
"data4": 1,
"data5": 1
},
{
"id": 191,
"datatype": 2,
"type": 70,
"inited": [],
"data1": 1,
"data2": 112,
"data3": 2,
"data4": 2,
"data5": 2
},
{
"id": 192,
"datatype": 2,
"type": 70,
"inited": [],
"data1": 1,
"data2": 113,
"data3": 3,
"data4": 3,
"data5": 3
},
{
"id": 193,
"datatype": 2,
"type": 70,
"inited": [],
"data1": 1,
"data2": 114,
"data3": 4,
"data4": 4,
"data5": 4
},
{
"id": 10001,
"datatype": 2,

294
bin/json/game_worldbattle.json
View File

@ -4,323 +4,167 @@
"FormatList": [
700011
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 102,
"FormatList": [
700011
700012
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 103,
"FormatList": [
700011
700013
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 104,
"FormatList": [
700011
700014
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 105,
"FormatList": [
700011
700015
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 106,
"FormatList": [
700011
700016
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 107,
"FormatList": [
700011
700017
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 108,
"FormatList": [
700011
700018
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 109,
"FormatList": [
700011
700019
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 110,
"FormatList": [
700011
700020
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 111,
"FormatList": [
700011
700021
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 112,
"FormatList": [
700011
700022
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 113,
"FormatList": [
700011
700023
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
},
{
"id": 114,
"FormatList": [
700011
700024
],
"DefaultHero": 700011,
"DefaultHero": 0,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"playexp": 1000
},
{
"id": 115,
"FormatList": [
700011
],
"DefaultHero": 700011,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"playexp": 1000
},
{
"id": 116,
"FormatList": [
700011
],
"DefaultHero": 700011,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"playexp": 1000
},
{
"id": 117,
"FormatList": [
700011
],
"DefaultHero": 700011,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"playexp": 1000
},
{
"id": 118,
"FormatList": [
700011
],
"DefaultHero": 700011,
"SelectableHero": [],
"LockSlots": [
3,
4
],
"AssistTeam": 710003,
"EventList": [
12,
14
],
"LockSlots": [],
"AssistTeam": 0,
"EventList": [],
"playexp": 1000
}
]

2
bin/json/game_worldtask.json
View File

@ -56,7 +56,7 @@
100002
],
"completetask": 0,
"auto_accept": 0,
"auto_accept": 1,
"overtips": 1,
"reword": [],
"day": "",

6
modules/battle/modelBattle.go
View File

@ -118,6 +118,9 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
}
if req.Sysformat != nil && len(req.Sysformat) > 0 {
for i, v := range req.Sysformat {
if v == 0 {
continue
}
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
return
}
@ -129,6 +132,9 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
}
if req.Backupformat != nil && len(req.Backupformat) > 0 {
for i, v := range req.Backupformat {
if v == 0 {
continue
}
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
return
}

5
modules/friend/api_cross_getreward.go
View File

@ -37,8 +37,9 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar
return
}
if code = this.moduleFriend.DispenseRes(session, this.moduleFriend.globalConf.FriendPeize, true); code != pb.ErrorCode_Success {
this.moduleFriend.Error("好友领奖励", log.Fields{"uid": uid, "reward": this.moduleFriend.globalConf.FriendPeize, "code": code})
globalConf := this.moduleFriend.configure.GetGlobalConf()
if code = this.moduleFriend.DispenseRes(session, globalConf.FriendPeize, true); code != pb.ErrorCode_Success {
this.moduleFriend.Error("好友领奖励", log.Fields{"uid": uid, "reward": globalConf.FriendPeize, "code": code})
return
}

3
modules/hero/api_drawCard.go
View File

@ -200,6 +200,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
if int32(len(v)) > randomIndex {
if star == 5 { // 抽出5星英雄后A次抽奖内不会再抽到5星英雄（普通卡池+阵营卡池）
curDrawCount := drawCount - req.DrawCount
if curDrawCount <= 10 { // 首次十连不计算
continue
}
newID := this.module.ContinuousRestriction(session.GetUserId(), v[randomIndex].Id, curDrawCount+int32(index), strPool[index])
szCards = append(szCards, newID)
continue

5
modules/hero/module.go
View File

@ -65,7 +65,8 @@ func (this *Hero) Start() (err error) {
//创建单个叠加英雄
func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string, num int32, bPush bool) (hero *pb.DBHero, code pb.ErrorCode) {
_hero, err := this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num)
var err error
hero, err = this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num)
if err == nil {
go func(uid string, heroCfgId string) { // 携程处理 图鉴数据
if db.IsCross() {
@ -109,7 +110,7 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string,
}
if bPush { //推送
session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{_hero}})
session.SendMsg("hero", "change", &pb.HeroChangePush{List: []*pb.DBHero{hero}})
}
return
}

4
modules/rtask/module.go
View File

@ -263,11 +263,13 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
}
if v.find == nil {
this.Warn("未设置find Handle", log.Fields{"uid": uid, "condiId": codi.Id})
return
}
if condiId, err = v.find(v.cfg, params...); condiId == 0 {
if err != nil {
this.Warn(errors.WithMessage(err, uid).Error(), log.Fields{})
this.Warnln(errors.WithMessage(err, uid).Error())
}
} else {
condis = append(condis, v)