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

上传战斗同步

Browse Source
This commit is contained in:
liwei1dao 2023-08-15 20:10:28 +08:00
parent 6026f8fed7
commit f4a80c4a30
9 changed files with 132 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
bin/json/game_battleready.json
View File

@ -23,7 +23,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -51,7 +52,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -79,7 +81,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -107,7 +110,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -135,7 +139,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -163,7 +168,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -191,7 +197,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -219,7 +226,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -247,7 +255,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -275,7 +284,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -303,7 +313,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -331,7 +342,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -359,7 +371,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 10
},
@ -387,7 +400,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -415,7 +429,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -443,7 +458,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -471,7 +487,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -499,7 +516,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 100
},
@ -527,7 +545,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -555,7 +574,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -583,7 +603,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -611,7 +632,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 100
},
@ -639,7 +661,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -667,7 +690,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -695,7 +719,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -723,7 +748,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -751,7 +777,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -779,7 +806,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -807,7 +835,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -835,7 +864,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 100
},
@ -865,7 +895,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 100
},
@ -895,7 +926,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 100
},
@ -925,7 +957,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 100
},
@ -953,7 +986,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -981,7 +1015,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1011,7 +1046,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 50
},
@ -1041,7 +1077,8 @@
"HeroCheck": [
"13002"
],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1074,7 +1111,8 @@
"HeroCheck": [
"13002"
],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1102,7 +1140,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1110,7 +1149,7 @@
"id": 201,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_08"
],
@ -1132,7 +1171,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1140,7 +1180,7 @@
"id": 202,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_08"
],
@ -1162,7 +1202,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1170,7 +1211,7 @@
"id": 203,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_08"
],
@ -1192,7 +1233,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 720016,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1222,7 +1264,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1252,7 +1295,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1280,7 +1324,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
@ -1288,9 +1333,9 @@
"id": 207,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_05_01"
"scenesfight_08"
],
"HideAlienSpace": 0,
"ShowBuff": 0,
@ -1308,7 +1353,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
}

2
bin/json/game_coin.json
View File

@ -9,7 +9,7 @@
"color": 1,
"effects": "",
"access": [
123
11001
],
"img": "attr_gold",
"intr": {

4
bin/json/game_fightglobalevent.json
View File

@ -225,7 +225,9 @@
"FightEndCheck": "",
"AddCon": [],
"Execution": 3,
"Args": []
"Args": [
"1"
]
},
{
"Id": 13,

2
bin/json/game_stonetalent.json
View File

@ -831,7 +831,7 @@
"n": 2000
}
],
"PrivilegeId": 7,
"PrivilegeId": 6,
"AttributeDesc": {
"key": "",
"text": ""

15
modules/battle/modelBattle.go
View File

@ -153,8 +153,8 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
record.Redflist[0].Leadpos = captain
}
}
if conf.AssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil {
if conf.RedAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil {
return
}
record.Redflist[0].Backupteam = masters
@ -297,8 +297,8 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
record.Redflist[0].Leadpos = captain
}
}
if conf.AssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.AssistTeam); errdata != nil {
if conf.RedAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil {
return
}
record.Redflist[0].Backupteam = masters
@ -322,6 +322,13 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
}
}
if conf.BlueAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(200, 0, conf.BlueAssistTeam); errdata != nil {
return
}
record.Buleflist[0].Backupteam = masters
}
return
}

6
sys/configure/structs/Game.BattleReadyData.go
View File

@ -29,7 +29,8 @@ type GameBattleReadyData struct {
DisableHero []string
LockSlots []int32
HeroCheck []string
AssistTeam int32
RedAssistTeam int32
BlueAssistTeam int32
CanFriendHelp int32
Numrounds int32
}
@ -163,7 +164,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RedAssistTeam"].(float64); !_ok_ { err = errors.New("RedAssistTeam error"); return }; _v.RedAssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
return

11
sys/configure/structs/Game.BuffType.go
View File

@ -107,4 +107,15 @@ const (
GameBuffType_FIGHT_VOLITION = 114
GameBuffType_WEAKENS = 115
GameBuffType_CONCEAL = 116
GameBuffType_BUFF_COUNT_ADD_BE_DMG = 117
GameBuffType_TRE_BY_FRIEND_TRE = 118
GameBuffType_HAS_BUFF_ADD_BE_DMG = 119
GameBuffType_IGNORE_DEF_PER_HAS_PROB = 120
GameBuffType_ADJUST_PRO_BY_PRO = 121
GameBuffType_ADJUST_PRO_BY_REAL_DMG = 122
GameBuffType_ADJUST_PRO_BY_PRO_OVERFLOW = 123
GameBuffType_HAS_SHIELD_REFLEX_DMG = 124
GameBuffType_ADJUST_PRO_FULL_EMIT_SKILL = 125
GameBuffType_APPEND_DMG = 126
GameBuffType_PRO_HIGH_IGNORE_IMMUNITY = 127
)

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

@ -24,6 +24,7 @@ type GameHeroupstoryChapterData struct {
Startstory int32
Battle int32
Reward []*Gameatn
Tipstxt string
Txt string
Circle string
Qq int32
@ -95,6 +96,7 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e
}
}
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Circle, _ok_ = _buf["circle"].(string); !_ok_ { err = errors.New("circle error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qq"].(float64); !_ok_ { err = errors.New("qq error"); return }; _v.Qq = int32(_tempNum_) }

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

@ -14,6 +14,7 @@ type GameStoneStoryData struct {
Id int32
StoryGroupId int32
StepId int32
TitleName string
StoryDesc string
OptionEventIdGroup1 []string
EndEventId1 int32
@ -36,6 +37,7 @@ func (_v *GameStoneStoryData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StoryGroupId"].(float64); !_ok_ { err = errors.New("StoryGroupId error"); return }; _v.StoryGroupId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["StepId"].(float64); !_ok_ { err = errors.New("StepId error"); return }; _v.StepId = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["TitleName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TitleName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TitleName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["StoryDesc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StoryDesc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StoryDesc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}