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

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

Browse Source
This commit is contained in:
liwei1dao 2023-06-14 20:53:48 +08:00
commit d7c80fcde9
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bin/json/game_worldbattle.json
View File

@ -15,7 +15,7 @@
{
"id": 102,
"FormatList": [
700012
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -28,7 +28,7 @@
{
"id": 103,
"FormatList": [
700013
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -41,7 +41,7 @@
{
"id": 104,
"FormatList": [
700014
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -54,7 +54,7 @@
{
"id": 105,
"FormatList": [
700015
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -67,7 +67,7 @@
{
"id": 106,
"FormatList": [
700016
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -80,7 +80,7 @@
{
"id": 107,
"FormatList": [
700017
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -93,7 +93,7 @@
{
"id": 108,
"FormatList": [
700018
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -106,7 +106,7 @@
{
"id": 109,
"FormatList": [
700019
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -119,7 +119,7 @@
{
"id": 110,
"FormatList": [
700020
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -132,7 +132,7 @@
{
"id": 111,
"FormatList": [
700021
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -145,7 +145,7 @@
{
"id": 112,
"FormatList": [
700022
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -158,7 +158,7 @@
{
"id": 113,
"FormatList": [
700023
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -171,7 +171,7 @@
{
"id": 114,
"FormatList": [
700024
700011
],
"BattleReadyID": 100,
"EventList": [],
@ -184,9 +184,9 @@
{
"id": 115,
"FormatList": [
700025
700011
],
"BattleReadyID": 101,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -197,9 +197,9 @@
{
"id": 116,
"FormatList": [
700026
700011
],
"BattleReadyID": 102,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -210,9 +210,9 @@
{
"id": 117,
"FormatList": [
700027
700011
],
"BattleReadyID": 103,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -223,9 +223,9 @@
{
"id": 118,
"FormatList": [
700028
700011
],
"BattleReadyID": 104,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -236,9 +236,9 @@
{
"id": 119,
"FormatList": [
700029
700011
],
"BattleReadyID": 105,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -249,9 +249,9 @@
{
"id": 120,
"FormatList": [
700030
700011
],
"BattleReadyID": 106,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -262,9 +262,9 @@
{
"id": 121,
"FormatList": [
700031
700011
],
"BattleReadyID": 107,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -275,9 +275,9 @@
{
"id": 122,
"FormatList": [
700032
700011
],
"BattleReadyID": 108,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",
@ -288,9 +288,9 @@
{
"id": 123,
"FormatList": [
700033
700011
],
"BattleReadyID": 109,
"BattleReadyID": 100,
"EventList": [],
"playexp": {
"a": "attr",

6
bin/json/game_worldtask.json
View File

@ -1490,15 +1490,15 @@
"icon": "",
"task_name": {
"key": "worldtask_world_story_task_name_42",
"text": "9件装备强化+6"
"text": "4件装备强化+6"
},
"task_details": {
"key": "worldtask_world_story_task_details_42",
"text": "9件装备强化+6"
"text": "4件装备强化+6"
},
"npctxt": {
"key": "worldtask_world_story_npctxt_42",
"text": "9件装备强化+6"
"text": "4件装备强化+6"
},
"npc": 10410,
"completetask": [

5
modules/worldtask/api_battlestart.go
View File

@ -59,11 +59,6 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
})
if errdata != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: "创建Eve战斗失败",
}
return
}