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:
meixiongfeng 2023-09-15 16:03:04 +08:00
commit e94f325002
7 changed files with 2090 additions and 1837 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
bin/json/game_battleready.json
View File

@ -1626,6 +1626,49 @@
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
}, },
{
"id": 10100001,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_naturetitan_02",
"bossfight_naturetitan_04"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [
120,
121,
122,
123,
124,
125,
126
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [
4
],
"HeroCheck": [],
"RedAssistTeam": 720019,
"BlueAssistTeam": 720020,
"CanFriendHelp": 0,
"Numrounds": 0
},
{ {
"id": 10111001, "id": 10111001,
"PlayType": 1, "PlayType": 1,
@ -1836,276 +1879,6 @@
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
}, },
{
"id": 10300001,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_08"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [
109
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720014,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300002,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_08"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [
110
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720014,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300003,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"battleScenes": [
"scenesfight_06"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [
111,
114
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [
"24004",
"24001"
],
"RedAssistTeam": 0,
"BlueAssistTeam": 720016,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300004,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [
112
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300005,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300006,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720017,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300007,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
"scenesfight_08"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720018,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10300008,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [
113
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720017,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{ {
"id": 10400001, "id": 10400001,
"PlayType": 4, "PlayType": 4,
@ -2315,7 +2088,9 @@
"key": "", "key": "",
"text": "" "text": ""
}, },
"battleEvents": [], "battleEvents": [
113
],
"ScoreGroupID": 0, "ScoreGroupID": 0,
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [], "ChoseCamp": [],

38
bin/json/game_dragonplay.json
View File

@ -5,7 +5,7 @@
"type": 1, "type": 1,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000111, "bubble": 2003000111,
@ -17,7 +17,7 @@
"type": 2, "type": 2,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000121, "bubble": 2003000121,
@ -29,7 +29,7 @@
"type": 2, "type": 2,
"interact": 2, "interact": 2,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000122, "bubble": 2003000122,
@ -41,7 +41,7 @@
"type": 2, "type": 2,
"interact": 4, "interact": 4,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000124, "bubble": 2003000124,
@ -53,7 +53,7 @@
"type": 3, "type": 3,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000131, "bubble": 2003000131,
@ -65,7 +65,7 @@
"type": 3, "type": 3,
"interact": 2, "interact": 2,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000132, "bubble": 2003000132,
@ -77,7 +77,7 @@
"type": 3, "type": 3,
"interact": 4, "interact": 4,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000134, "bubble": 2003000134,
@ -89,7 +89,7 @@
"type": 1, "type": 1,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000211, "bubble": 2003000211,
@ -101,7 +101,7 @@
"type": 2, "type": 2,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000221, "bubble": 2003000221,
@ -113,7 +113,7 @@
"type": 3, "type": 3,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000231, "bubble": 2003000231,
@ -125,7 +125,7 @@
"type": 3, "type": 3,
"interact": 2, "interact": 2,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000232, "bubble": 2003000232,
@ -137,7 +137,7 @@
"type": 3, "type": 3,
"interact": 4, "interact": 4,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000234, "bubble": 2003000234,
@ -149,7 +149,7 @@
"type": 1, "type": 1,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000311, "bubble": 2003000311,
@ -161,7 +161,7 @@
"type": 2, "type": 2,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000321, "bubble": 2003000321,
@ -173,7 +173,7 @@
"type": 2, "type": 2,
"interact": 2, "interact": 2,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000322, "bubble": 2003000322,
@ -185,7 +185,7 @@
"type": 2, "type": 2,
"interact": 4, "interact": 4,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000324, "bubble": 2003000324,
@ -197,7 +197,7 @@
"type": 3, "type": 3,
"interact": 1, "interact": 1,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000331, "bubble": 2003000331,
@ -209,7 +209,7 @@
"type": 3, "type": 3,
"interact": 2, "interact": 2,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000332, "bubble": 2003000332,
@ -221,7 +221,7 @@
"type": 3, "type": 3,
"interact": 4, "interact": 4,
"exp": 200, "exp": 200,
"time": 1, "time": 3,
"cd": 0, "cd": 0,
"deplete": [], "deplete": [],
"bubble": 2003000334, "bubble": 2003000334,

153
bin/json/game_fightglobalevent.json
View File

@ -713,5 +713,158 @@
"Args": [ "Args": [
"2" "2"
] ]
},
{
"Id": 120,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 20,
"FromCheck": "Side=1,HeroID=24004",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [],
"Execution": 2,
"Args": [
"6000070"
]
},
{
"Id": 121,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 1,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [
"WaveEqual=2"
],
"Execution": 3,
"Args": [
"1"
]
},
{
"Id": 122,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 20,
"FromCheck": "Side=2",
"TargetCheck": "Side=1,Hpproless=300",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [],
"Execution": 2,
"Args": [
"6000080"
]
},
{
"Id": 123,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 25,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [
"WaveEqual=2"
],
"Execution": 2,
"Args": [
"6000090"
]
},
{
"Id": 124,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 1,
"FromCheck": "",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [
"WaveEqual=3"
],
"Execution": 3,
"Args": [
"2"
]
},
{
"Id": 125,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 15,
"FromCheck": "",
"TargetCheck": "Side=2,HeroID=53007",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [],
"Execution": 2,
"Args": [
"6000100"
]
},
{
"Id": 126,
"Count": 1,
"LoopTime": 0,
"desc": {
"key": "",
"text": ""
},
"When": 20,
"FromCheck": "Side=2",
"TargetCheck": "Side=1,Hpproless=300",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"FightEndCheck": "",
"AddCon": [],
"Execution": 5,
"Args": [
"2"
]
} }
] ]

300
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

3112
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

5
modules/mainline/api_challengeover.go
View File

@ -69,6 +69,11 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
if errdata != nil { if errdata != nil {
return return
} }
if !isWin && conf.BattleFail == 1 { //战斗失败特殊处理
isWin = true
}
if !isWin { // 战斗失败返还扣除的体力 if !isWin { // 战斗失败返还扣除的体力
if errdata = this.module.DispenseRes(session, conf.PsConsume, true); errdata != nil { // 返还预扣体力 if errdata = this.module.DispenseRes(session, conf.PsConsume, true); errdata != nil { // 返还预扣体力
return return

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

@ -17,6 +17,7 @@ type GameMainStageData struct {
PreviousGroupId []int32 PreviousGroupId []int32
Previoustage int32 Previoustage int32
Episodetype int32 Episodetype int32
BattleFail int32
StageParam int32 StageParam int32
Venturemodelspeed float32 Venturemodelspeed float32
Venturemodelscale float32 Venturemodelscale float32
@ -87,6 +88,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battle_fail"].(float64); !_ok_ { err = errors.New("battle_fail error"); return }; _v.BattleFail = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage_param"].(float64); !_ok_ { err = errors.New("stage_param error"); return }; _v.StageParam = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage_param"].(float64); !_ok_ { err = errors.New("stage_param error"); return }; _v.StageParam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturemodelspeed"].(float64); !_ok_ { err = errors.New("venturemodelspeed error"); return }; _v.Venturemodelspeed = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturemodelspeed"].(float64); !_ok_ { err = errors.New("venturemodelspeed error"); return }; _v.Venturemodelspeed = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturemodelscale"].(float64); !_ok_ { err = errors.New("venturemodelscale error"); return }; _v.Venturemodelscale = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturemodelscale"].(float64); !_ok_ { err = errors.New("venturemodelscale error"); return }; _v.Venturemodelscale = float32(_tempNum_) }