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

merge

Browse Source
This commit is contained in:
meixiongfeng 2023-02-06 11:12:34 +08:00
parent 834c6b106d
commit b79700e960
7 changed files with 233 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_global.json
View File

@ -533,15 +533,11 @@
"GuildBoss_troop3": 60,
"zhayantime": 5,
"rotateAngle": 360,
<<<<<<< HEAD
"rotateDizzyTime": 1,
"moonshopmoney": [
10,
20,
30
]
=======
"rotateDizzyTime": 1
>>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
}
]

488
bin/json/game_hero.json
View File

File diff suppressed because it is too large Load Diff

3
bin/json/game_item.json
View File

@ -6376,7 +6376,6 @@
"key": "itemtipstxt_625001",
"text": "阿宝的天赋点不足"
}
<<<<<<< HEAD
},
{
"id": "625002",
@ -6421,7 +6420,5 @@
"key": "itemtipstxt_625002",
"text": "阿宝的天赋点不足"
}
=======
>>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
}
]

228
bin/json/game_opencond.json
View File

@ -9,6 +9,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -31,6 +35,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -53,6 +61,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -75,6 +87,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -97,6 +113,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -119,6 +139,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -141,6 +165,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -163,6 +191,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -185,6 +217,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -207,6 +243,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -229,6 +269,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -251,6 +295,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -273,6 +321,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -295,6 +347,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -317,6 +373,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -339,6 +399,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -361,6 +425,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -383,6 +451,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -405,6 +477,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -427,6 +503,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -449,6 +529,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -471,6 +555,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -493,6 +581,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -515,6 +607,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -537,6 +633,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -559,6 +659,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -581,6 +685,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -603,6 +711,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -647,6 +759,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -669,6 +785,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -691,6 +811,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -713,6 +837,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -735,6 +863,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -757,6 +889,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -779,6 +915,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -801,6 +941,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -823,6 +967,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -845,6 +993,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -867,6 +1019,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -889,6 +1045,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -911,6 +1071,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -933,6 +1097,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -955,6 +1123,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -977,6 +1149,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -999,6 +1175,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1021,6 +1201,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1109,6 +1293,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1131,6 +1319,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1153,6 +1345,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1175,6 +1371,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1197,6 +1397,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1219,6 +1423,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1241,6 +1449,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1263,6 +1475,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1285,6 +1501,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1307,6 +1527,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",
@ -1329,6 +1553,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100101
}
],
"optional": "",

10
modules/worldtask/api_battlestart.go
View File

@ -47,11 +47,11 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
resp *pb.WorldtaskBattleStartResp
)
code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{
Ptype: pb.PlayType_rtask,
Format: req.Battle,
Sysformat: []int32{battleConf.DefaultHero},
Backupformat: []int32{battleConf.AssistTeam},
Buleformat: battleConf.FormatList,
Ptype: pb.PlayType_rtask,
Format: req.Battle,
// Sysformat: []int32{battleConf.DefaultHero},
// Backupformat: []int32{battleConf.AssistTeam},
Buleformat: battleConf.FormatList,
})
if code != pb.ErrorCode_Success {

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

@ -173,10 +173,7 @@ type GameGlobalData struct {
Zhayantime float32
RotateAngle float32
RotateDizzyTime float32
<<<<<<< HEAD
Moonshopmoney []int32
=======
>>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
}
const TypeId_GameGlobalData = 477542761
@ -725,7 +722,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["zhayantime"].(float64); !_ok_ { err = errors.New("zhayantime error"); return }; _v.Zhayantime = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateAngle"].(float64); !_ok_ { err = errors.New("rotateAngle error"); return }; _v.RotateAngle = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateDizzyTime"].(float64); !_ok_ { err = errors.New("rotateDizzyTime error"); return }; _v.RotateDizzyTime = float32(_tempNum_) }
<<<<<<< HEAD
{
var _arr_ []interface{}
var _ok_ bool
@ -740,8 +736,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
=======
>>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
return
}

6
sys/configure/structs/game.heroData.go
View File

@ -45,11 +45,8 @@ type GameHeroData struct {
Show int32
Herofrag []*Gameatn
Heroskillup []*Gameatn
<<<<<<< HEAD
Expitem []*Gameatn
Expitemnum int32
=======
>>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
}
const TypeId_GameHeroData = 1513828672
@ -164,7 +161,6 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
<<<<<<< HEAD
{
var _arr_ []interface{}
var _ok_ bool
@ -180,8 +176,6 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["expitemnum"].(float64); !_ok_ { err = errors.New("expitemnum error"); return }; _v.Expitemnum = int32(_tempNum_) }
=======
>>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
return
}