Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
c580f74eb2
@ -218,5 +218,269 @@
|
||||
"rank_up": -1,
|
||||
"grade": "gh_img_ex1",
|
||||
"score": 22
|
||||
},
|
||||
{
|
||||
"id": 2001,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 10000,
|
||||
"rank_up": 19999,
|
||||
"grade": "",
|
||||
"score": 1
|
||||
},
|
||||
{
|
||||
"id": 2001,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"grade": "",
|
||||
"score": 2
|
||||
},
|
||||
{
|
||||
"id": 2001,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"grade": "",
|
||||
"score": 3
|
||||
},
|
||||
{
|
||||
"id": 2001,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 80000,
|
||||
"rank_up": -1,
|
||||
"grade": "",
|
||||
"score": 4
|
||||
},
|
||||
{
|
||||
"id": 2002,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 10000,
|
||||
"rank_up": 19999,
|
||||
"grade": "",
|
||||
"score": 5
|
||||
},
|
||||
{
|
||||
"id": 2002,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"grade": "",
|
||||
"score": 6
|
||||
},
|
||||
{
|
||||
"id": 2002,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"grade": "",
|
||||
"score": 7
|
||||
},
|
||||
{
|
||||
"id": 2002,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 80000,
|
||||
"rank_up": -1,
|
||||
"grade": "",
|
||||
"score": 8
|
||||
},
|
||||
{
|
||||
"id": 2003,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 10000,
|
||||
"rank_up": 19999,
|
||||
"grade": "",
|
||||
"score": 9
|
||||
},
|
||||
{
|
||||
"id": 2003,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"grade": "",
|
||||
"score": 10
|
||||
},
|
||||
{
|
||||
"id": 2003,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"grade": "",
|
||||
"score": 11
|
||||
},
|
||||
{
|
||||
"id": 2003,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 80000,
|
||||
"rank_up": -1,
|
||||
"grade": "",
|
||||
"score": 12
|
||||
},
|
||||
{
|
||||
"id": 2004,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 10000,
|
||||
"rank_up": 19999,
|
||||
"grade": "",
|
||||
"score": 13
|
||||
},
|
||||
{
|
||||
"id": 2004,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"grade": "",
|
||||
"score": 14
|
||||
},
|
||||
{
|
||||
"id": 2004,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"grade": "",
|
||||
"score": 15
|
||||
},
|
||||
{
|
||||
"id": 2004,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 80000,
|
||||
"rank_up": -1,
|
||||
"grade": "",
|
||||
"score": 16
|
||||
},
|
||||
{
|
||||
"id": 2005,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 10000,
|
||||
"rank_up": 19999,
|
||||
"grade": "",
|
||||
"score": 17
|
||||
},
|
||||
{
|
||||
"id": 2005,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"grade": "",
|
||||
"score": 18
|
||||
},
|
||||
{
|
||||
"id": 2005,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"grade": "",
|
||||
"score": 19
|
||||
},
|
||||
{
|
||||
"id": 2005,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 80000,
|
||||
"rank_up": -1,
|
||||
"grade": "",
|
||||
"score": 20
|
||||
},
|
||||
{
|
||||
"id": 2006,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 10000,
|
||||
"rank_up": 19999,
|
||||
"grade": "",
|
||||
"score": 21
|
||||
},
|
||||
{
|
||||
"id": 2006,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"grade": "",
|
||||
"score": 22
|
||||
},
|
||||
{
|
||||
"id": 2006,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"grade": "",
|
||||
"score": 23
|
||||
},
|
||||
{
|
||||
"id": 2006,
|
||||
"score_name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"rank_low": 80000,
|
||||
"rank_up": -1,
|
||||
"grade": "",
|
||||
"score": 24
|
||||
}
|
||||
]
|
||||
@ -24196,7 +24196,7 @@
|
||||
"notify": [],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_723",
|
||||
"key": "buried_buried_condi_tasktxt_724",
|
||||
"text": "击退恐惧灵"
|
||||
},
|
||||
"type": 70,
|
||||
@ -24537,8 +24537,8 @@
|
||||
"Npc_event_type": 3,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "提示话语",
|
||||
"text": "tipstxt_01"
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [],
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_1",
|
||||
"text": "2"
|
||||
},
|
||||
"pic": "item_10000001",
|
||||
"pic": "bug_10001",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -24,7 +24,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_2",
|
||||
"text": "3"
|
||||
},
|
||||
"pic": "ytx_js_15005",
|
||||
"pic": "bug_10002",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -38,7 +38,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_3",
|
||||
"text": "4"
|
||||
},
|
||||
"pic": "item_10000003",
|
||||
"pic": "bug_10003",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -52,7 +52,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_4",
|
||||
"text": "5"
|
||||
},
|
||||
"pic": "item_10000004",
|
||||
"pic": "bug_10004",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -66,7 +66,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_5",
|
||||
"text": "6"
|
||||
},
|
||||
"pic": "item_10000005",
|
||||
"pic": "bug_10005",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -80,7 +80,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_6",
|
||||
"text": "7"
|
||||
},
|
||||
"pic": "item_10000006",
|
||||
"pic": "bug_10006",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -94,7 +94,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_7",
|
||||
"text": "8"
|
||||
},
|
||||
"pic": "item_10000007",
|
||||
"pic": "bug_10007",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -108,7 +108,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_8",
|
||||
"text": "9"
|
||||
},
|
||||
"pic": "item_10000008",
|
||||
"pic": "bug_10008",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -122,7 +122,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_9",
|
||||
"text": "10"
|
||||
},
|
||||
"pic": "item_10000009",
|
||||
"pic": "bug_10009",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -136,7 +136,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_10",
|
||||
"text": "11"
|
||||
},
|
||||
"pic": "item_10000010",
|
||||
"pic": "bug_100010",
|
||||
"weights": 1000
|
||||
},
|
||||
{
|
||||
@ -150,7 +150,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_11",
|
||||
"text": "12"
|
||||
},
|
||||
"pic": "item_10000011",
|
||||
"pic": "bug_100011",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -164,7 +164,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_12",
|
||||
"text": "13"
|
||||
},
|
||||
"pic": "item_10000012",
|
||||
"pic": "bug_100012",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -178,7 +178,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_13",
|
||||
"text": "14"
|
||||
},
|
||||
"pic": "item_10000013",
|
||||
"pic": "bug_100013",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -192,7 +192,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_14",
|
||||
"text": "15"
|
||||
},
|
||||
"pic": "wp_icon_10020",
|
||||
"pic": "bug_100014",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -206,7 +206,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_15",
|
||||
"text": "16"
|
||||
},
|
||||
"pic": "item_10000022",
|
||||
"pic": "bug_100015",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -220,7 +220,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_16",
|
||||
"text": "17"
|
||||
},
|
||||
"pic": "wp_icon_10022",
|
||||
"pic": "bug_100016",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -234,7 +234,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_17",
|
||||
"text": "18"
|
||||
},
|
||||
"pic": "wp_icon_10024",
|
||||
"pic": "bug_100017",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -248,7 +248,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_18",
|
||||
"text": "19"
|
||||
},
|
||||
"pic": "wp_icon_10020",
|
||||
"pic": "bug_100018",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -262,7 +262,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_19",
|
||||
"text": "20"
|
||||
},
|
||||
"pic": "wp_icon_10021",
|
||||
"pic": "bug_100019",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -276,7 +276,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_20",
|
||||
"text": "21"
|
||||
},
|
||||
"pic": "wp_icon_10022",
|
||||
"pic": "bug_100020",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -290,7 +290,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_21",
|
||||
"text": "22"
|
||||
},
|
||||
"pic": "wp_icon_10024",
|
||||
"pic": "bug_100021",
|
||||
"weights": 500
|
||||
},
|
||||
{
|
||||
@ -304,7 +304,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_22",
|
||||
"text": "23"
|
||||
},
|
||||
"pic": "wp_icon_10023",
|
||||
"pic": "bug_100022",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
@ -318,7 +318,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_23",
|
||||
"text": "24"
|
||||
},
|
||||
"pic": "item_50013001",
|
||||
"pic": "bug_100023",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
@ -332,77 +332,7 @@
|
||||
"key": "catchbugs_Illustrated_carddescribe_24",
|
||||
"text": "25"
|
||||
},
|
||||
"pic": "item_50013002",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
"id": 100025,
|
||||
"rarity": 3,
|
||||
"cardname": {
|
||||
"key": "catchbugs_Illustrated_cardname_25",
|
||||
"text": "25"
|
||||
},
|
||||
"carddescribe": {
|
||||
"key": "catchbugs_Illustrated_carddescribe_25",
|
||||
"text": "26"
|
||||
},
|
||||
"pic": "item_50013003",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
"id": 100026,
|
||||
"rarity": 3,
|
||||
"cardname": {
|
||||
"key": "catchbugs_Illustrated_cardname_26",
|
||||
"text": "26"
|
||||
},
|
||||
"carddescribe": {
|
||||
"key": "catchbugs_Illustrated_carddescribe_26",
|
||||
"text": "27"
|
||||
},
|
||||
"pic": "item_50013004",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
"id": 100027,
|
||||
"rarity": 3,
|
||||
"cardname": {
|
||||
"key": "catchbugs_Illustrated_cardname_27",
|
||||
"text": "27"
|
||||
},
|
||||
"carddescribe": {
|
||||
"key": "catchbugs_Illustrated_carddescribe_27",
|
||||
"text": "28"
|
||||
},
|
||||
"pic": "item_50013001",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
"id": 100028,
|
||||
"rarity": 3,
|
||||
"cardname": {
|
||||
"key": "catchbugs_Illustrated_cardname_28",
|
||||
"text": "28"
|
||||
},
|
||||
"carddescribe": {
|
||||
"key": "catchbugs_Illustrated_carddescribe_28",
|
||||
"text": "29"
|
||||
},
|
||||
"pic": "item_50013002",
|
||||
"weights": 100
|
||||
},
|
||||
{
|
||||
"id": 100029,
|
||||
"rarity": 3,
|
||||
"cardname": {
|
||||
"key": "catchbugs_Illustrated_cardname_29",
|
||||
"text": "29"
|
||||
},
|
||||
"carddescribe": {
|
||||
"key": "catchbugs_Illustrated_carddescribe_29",
|
||||
"text": "30"
|
||||
},
|
||||
"pic": "item_50013003",
|
||||
"pic": "bug_100024",
|
||||
"weights": 100
|
||||
}
|
||||
]
|
||||
@ -2,12 +2,30 @@
|
||||
{
|
||||
"id": 1001,
|
||||
"cardnum": {
|
||||
"k": 2,
|
||||
"v": 2
|
||||
"k": 4,
|
||||
"v": 4
|
||||
},
|
||||
"stagetime": 120,
|
||||
"skill": [],
|
||||
"skilltime": []
|
||||
"skilltime": [],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_1",
|
||||
"text": "第1关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1002,
|
||||
@ -17,7 +35,25 @@
|
||||
},
|
||||
"stagetime": 120,
|
||||
"skill": [],
|
||||
"skilltime": []
|
||||
"skilltime": [],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_2",
|
||||
"text": "第2关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1003,
|
||||
@ -27,7 +63,25 @@
|
||||
},
|
||||
"stagetime": 120,
|
||||
"skill": [],
|
||||
"skilltime": []
|
||||
"skilltime": [],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_3",
|
||||
"text": "第3关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_3",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1004,
|
||||
@ -41,7 +95,25 @@
|
||||
],
|
||||
"skilltime": [
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_4",
|
||||
"text": "第4关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_4",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1005,
|
||||
@ -55,7 +127,25 @@
|
||||
],
|
||||
"skilltime": [
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_5",
|
||||
"text": "第5关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_5",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1006,
|
||||
@ -69,7 +159,25 @@
|
||||
],
|
||||
"skilltime": [
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_6",
|
||||
"text": "第6关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_6",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1007,
|
||||
@ -83,7 +191,25 @@
|
||||
],
|
||||
"skilltime": [
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_7",
|
||||
"text": "第7关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_7",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1008,
|
||||
@ -97,7 +223,25 @@
|
||||
],
|
||||
"skilltime": [
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_8",
|
||||
"text": "第8关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_8",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1009,
|
||||
@ -111,7 +255,25 @@
|
||||
],
|
||||
"skilltime": [
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_9",
|
||||
"text": "第9关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_9",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 1010,
|
||||
@ -127,6 +289,24 @@
|
||||
"skilltime": [
|
||||
20,
|
||||
20
|
||||
]
|
||||
],
|
||||
"deducttime": [
|
||||
1,
|
||||
2,
|
||||
3
|
||||
],
|
||||
"rewardtime": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"stagedetail": {
|
||||
"key": "catchbugs_stage_stagedetail_10",
|
||||
"text": "第10关"
|
||||
},
|
||||
"stageskill": {
|
||||
"key": "catchbugs_stage_stageskill_10",
|
||||
"text": ""
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -533,7 +533,7 @@
|
||||
"mask": 1,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5001,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
@ -571,7 +571,7 @@
|
||||
"mask": 1,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5002,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
@ -621,11 +621,11 @@
|
||||
"group": 4,
|
||||
"type": 3,
|
||||
"startPar": "StopTime",
|
||||
"parameter": "",
|
||||
"parameter": "ResiveTime",
|
||||
"interface": "",
|
||||
"condition": "flytrigger_Guide1",
|
||||
"followtj": "",
|
||||
"followguide": 1000402,
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"flymain",
|
||||
"btn_left$"
|
||||
@ -634,7 +634,7 @@
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.3,
|
||||
"fingerTime": 0,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
@ -643,7 +643,7 @@
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "1000109",
|
||||
"txt": "1000112",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
@ -658,10 +658,10 @@
|
||||
"id": 1000402,
|
||||
"group": 4,
|
||||
"type": 1,
|
||||
"startPar": "",
|
||||
"startPar": "StopTime",
|
||||
"parameter": "ResiveTime",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"condition": "flytrigger_Guide3",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
@ -672,7 +672,7 @@
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.3,
|
||||
"fingerTime": 0,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
@ -681,10 +681,10 @@
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "1000110",
|
||||
"txt": "1000113",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 1,
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
@ -695,36 +695,37 @@
|
||||
{
|
||||
"id": 1000403,
|
||||
"group": 4,
|
||||
"type": 3,
|
||||
"type": 1,
|
||||
"startPar": "StopTime",
|
||||
"parameter": "ResiveTime",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"condition": "flytrigger_Guide2",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"GRoot"
|
||||
"3d",
|
||||
"Root/程序/scenes_dragons_01_场景组件/track_story(Clone)/point"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.3,
|
||||
"fingerTime": 0,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
"x": 400,
|
||||
"y": 400
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
"x": -200,
|
||||
"y": -200
|
||||
},
|
||||
"txt": "1000111",
|
||||
"txt": "1000114",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5001,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
|
||||
@ -5,9 +5,6 @@
|
||||
"key": "guild_guild_boss_score_name_1",
|
||||
"text": "e"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 0,
|
||||
"rank_up": 19999,
|
||||
"hp": 30,
|
||||
"drop": 19100001,
|
||||
"grade": "gh_img_e"
|
||||
@ -18,9 +15,6 @@
|
||||
"key": "guild_guild_boss_score_name_2",
|
||||
"text": "e+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 20000,
|
||||
"rank_up": 49999,
|
||||
"hp": 32,
|
||||
"drop": 19100001,
|
||||
"grade": "gh_img_e1"
|
||||
@ -31,9 +25,6 @@
|
||||
"key": "guild_guild_boss_score_name_3",
|
||||
"text": "d"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 50000,
|
||||
"rank_up": 79999,
|
||||
"hp": 36,
|
||||
"drop": 19100001,
|
||||
"grade": "gh_img_d"
|
||||
@ -44,9 +35,6 @@
|
||||
"key": "guild_guild_boss_score_name_4",
|
||||
"text": "d+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 80000,
|
||||
"rank_up": 99999,
|
||||
"hp": 38,
|
||||
"drop": 19100001,
|
||||
"grade": "gh_img_d1"
|
||||
@ -57,9 +45,6 @@
|
||||
"key": "guild_guild_boss_score_name_5",
|
||||
"text": "c"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 100000,
|
||||
"rank_up": 149999,
|
||||
"hp": 40,
|
||||
"drop": 19100002,
|
||||
"grade": "gh_img_c"
|
||||
@ -70,9 +55,6 @@
|
||||
"key": "guild_guild_boss_score_name_6",
|
||||
"text": "c+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 150000,
|
||||
"rank_up": 199999,
|
||||
"hp": 42,
|
||||
"drop": 19100002,
|
||||
"grade": "gh_img_c1"
|
||||
@ -83,9 +65,6 @@
|
||||
"key": "guild_guild_boss_score_name_7",
|
||||
"text": "b"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 200000,
|
||||
"rank_up": 249999,
|
||||
"hp": 44,
|
||||
"drop": 19100002,
|
||||
"grade": "gh_img_b"
|
||||
@ -96,9 +75,6 @@
|
||||
"key": "guild_guild_boss_score_name_8",
|
||||
"text": "b+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 250000,
|
||||
"rank_up": 319999,
|
||||
"hp": 46,
|
||||
"drop": 19100002,
|
||||
"grade": "gh_img_b1"
|
||||
@ -109,9 +85,6 @@
|
||||
"key": "guild_guild_boss_score_name_9",
|
||||
"text": "a"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 320000,
|
||||
"rank_up": 399999,
|
||||
"hp": 48,
|
||||
"drop": 19100003,
|
||||
"grade": "gh_img_a"
|
||||
@ -122,9 +95,6 @@
|
||||
"key": "guild_guild_boss_score_name_10",
|
||||
"text": "a+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 400000,
|
||||
"rank_up": 499999,
|
||||
"hp": 50,
|
||||
"drop": 19100003,
|
||||
"grade": "gh_img_a1"
|
||||
@ -135,9 +105,6 @@
|
||||
"key": "guild_guild_boss_score_name_11",
|
||||
"text": "s"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 500000,
|
||||
"rank_up": 599999,
|
||||
"hp": 55,
|
||||
"drop": 19100004,
|
||||
"grade": "gh_img_s"
|
||||
@ -148,9 +115,6 @@
|
||||
"key": "guild_guild_boss_score_name_12",
|
||||
"text": "ss"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 600000,
|
||||
"rank_up": 699999,
|
||||
"hp": 60,
|
||||
"drop": 19100004,
|
||||
"grade": "gh_img_ss"
|
||||
@ -161,9 +125,6 @@
|
||||
"key": "guild_guild_boss_score_name_13",
|
||||
"text": "sss"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 700000,
|
||||
"rank_up": 999999,
|
||||
"hp": 65,
|
||||
"drop": 19100004,
|
||||
"grade": "gh_img_sss"
|
||||
@ -174,9 +135,6 @@
|
||||
"key": "guild_guild_boss_score_name_14",
|
||||
"text": "sss+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 1000000,
|
||||
"rank_up": 1199999,
|
||||
"hp": 70,
|
||||
"drop": 19100005,
|
||||
"grade": "gh_img_sss1"
|
||||
@ -187,9 +145,6 @@
|
||||
"key": "guild_guild_boss_score_name_15",
|
||||
"text": "ex"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 1200000,
|
||||
"rank_up": 1599999,
|
||||
"hp": 80,
|
||||
"drop": 19100005,
|
||||
"grade": "gh_img_ex3"
|
||||
@ -200,9 +155,6 @@
|
||||
"key": "guild_guild_boss_score_name_16",
|
||||
"text": "ex+"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 1600000,
|
||||
"rank_up": 3799999,
|
||||
"hp": 90,
|
||||
"drop": 19100005,
|
||||
"grade": "gh_img_ex2"
|
||||
@ -213,9 +165,6 @@
|
||||
"key": "guild_guild_boss_score_name_17",
|
||||
"text": "ex++"
|
||||
},
|
||||
"score": 1,
|
||||
"rank_low": 3800000,
|
||||
"rank_up": -1,
|
||||
"hp": 100,
|
||||
"drop": 19100006,
|
||||
"grade": "gh_img_ex1"
|
||||
|
||||
@ -41,8 +41,8 @@
|
||||
{
|
||||
"event": 1004,
|
||||
"node_id": 1,
|
||||
"type": 2,
|
||||
"value": 0,
|
||||
"type": 3,
|
||||
"value": 810301,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -133,7 +133,7 @@
|
||||
{
|
||||
"event": 2004,
|
||||
"node_id": 2,
|
||||
"type": 2,
|
||||
"type": 3,
|
||||
"value": 0,
|
||||
"reward": [
|
||||
{
|
||||
@ -225,7 +225,7 @@
|
||||
{
|
||||
"event": 3004,
|
||||
"node_id": 3,
|
||||
"type": 2,
|
||||
"type": 3,
|
||||
"value": 0,
|
||||
"reward": [
|
||||
{
|
||||
@ -317,7 +317,7 @@
|
||||
{
|
||||
"event": 4004,
|
||||
"node_id": 4,
|
||||
"type": 2,
|
||||
"type": 3,
|
||||
"value": 0,
|
||||
"reward": [
|
||||
{
|
||||
@ -409,7 +409,7 @@
|
||||
{
|
||||
"event": 5004,
|
||||
"node_id": 5,
|
||||
"type": 2,
|
||||
"type": 3,
|
||||
"value": 0,
|
||||
"reward": [
|
||||
{
|
||||
@ -501,7 +501,7 @@
|
||||
{
|
||||
"event": 6004,
|
||||
"node_id": 6,
|
||||
"type": 2,
|
||||
"type": 3,
|
||||
"value": 0,
|
||||
"reward": [
|
||||
{
|
||||
|
||||
@ -219,5 +219,96 @@
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 18,
|
||||
"boss_id": 810302,
|
||||
"rank_low": 0,
|
||||
"rank_up": 0,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 19,
|
||||
"boss_id": 810303,
|
||||
"rank_low": 1,
|
||||
"rank_up": 1,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 3
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 20,
|
||||
"boss_id": 810304,
|
||||
"rank_low": 2,
|
||||
"rank_up": 2,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 4
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
"boss_id": 810305,
|
||||
"rank_low": 3,
|
||||
"rank_up": 3,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 5
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 22,
|
||||
"boss_id": 810306,
|
||||
"rank_low": 4,
|
||||
"rank_up": 4,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 6
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 23,
|
||||
"boss_id": 810307,
|
||||
"rank_low": 5,
|
||||
"rank_up": 5,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 7
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 24,
|
||||
"boss_id": 810308,
|
||||
"rank_low": 6,
|
||||
"rank_up": 6,
|
||||
"reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 8
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -952,12 +952,12 @@
|
||||
"Levelid": 0,
|
||||
"datas": [
|
||||
"GameMain",
|
||||
"20380-菲奥娜",
|
||||
"梅林飞船组件",
|
||||
"901"
|
||||
],
|
||||
"event": [
|
||||
2,
|
||||
10202
|
||||
102033
|
||||
],
|
||||
"goto": 0
|
||||
},
|
||||
|
||||
@ -2895,5 +2895,21 @@
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "catchbugsmain",
|
||||
"subId": "",
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -60,11 +60,6 @@
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 20
|
||||
},
|
||||
{
|
||||
"a": "hero",
|
||||
"t": "24004",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -81,8 +81,9 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR
|
||||
}
|
||||
if !keep {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
Message: "no fund Invite Data",
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
|
||||
if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
|
||||
return
|
||||
}
|
||||
if score, err = this.module.configure.getguildbossscore(conf.Group, req.Report.Harm); err != nil {
|
||||
if score, err = this.module.configure.getguildbossscore(conf.Group, req.Report.Score); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
|
||||
@ -125,22 +125,20 @@ func (this *MCompConfigure) getguildbossByNext(id int32, lv int32) (results *cfg
|
||||
}
|
||||
|
||||
// 获取伤害对应的评分组
|
||||
func (this *MCompConfigure) getguildbossscore(group int32, harm int32) (results *cfg.GameGuildBossScoreData, err error) {
|
||||
func (this *MCompConfigure) getguildbossscore(group int32, score int32) (conf *cfg.GameGuildBossScoreData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
|
||||
if v, err = this.GetConfigure(game_guildbossscore); err != nil {
|
||||
return
|
||||
} else {
|
||||
for _, v := range v.(*cfg.GameGuildBossScore).GetDataList() {
|
||||
if harm >= v.RankLow && (harm <= v.RankUp || v.RankUp == -1) {
|
||||
results = v
|
||||
return
|
||||
}
|
||||
if conf, ok = v.(*cfg.GameGuildBossScore).GetDataMap()[score]; !ok {
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_guildbossscore, score)
|
||||
this.module.Errorf("err:%v", err)
|
||||
return
|
||||
}
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_guildbossscore, fmt.Sprintf("group:%d harm%d", group, harm))
|
||||
this.module.Errorf("err:%v", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -68,7 +68,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
|
||||
if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
|
||||
return
|
||||
}
|
||||
if sconf, err = this.module.configure.getGamePuggsyScoreDatas(item.Level[req.Level], req.Report.Harm); err != nil {
|
||||
if sconf, err = this.module.configure.getGamePuggsyScoreDatas(item.Level[req.Level], req.Report.Score); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
|
||||
@ -376,6 +376,10 @@ func (this *Parkour) avoid(id string, uid string, distance float32, atype int32,
|
||||
} else {
|
||||
member.Scores += conf.Value
|
||||
member.Energy += conf.Energy
|
||||
member.Weekintegral += conf.Matchvalue
|
||||
if conf.Num == 1 {
|
||||
member.Dodge++
|
||||
}
|
||||
teamScores += conf.Matchvalue
|
||||
if winSide == 1 {
|
||||
battle.RedScore = teamScores
|
||||
|
||||
@ -16,6 +16,10 @@ type GameCatchbugStageData struct {
|
||||
Stagetime int32
|
||||
Skill []int32
|
||||
Skilltime []int32
|
||||
Deducttime []int32
|
||||
Rewardtime []int32
|
||||
Stagedetail string
|
||||
Stageskill string
|
||||
}
|
||||
|
||||
const TypeId_GameCatchbugStageData = -494646541
|
||||
@ -56,6 +60,36 @@ func (_v *GameCatchbugStageData)Deserialize(_buf map[string]interface{}) (err er
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["deducttime"].([]interface{}); !_ok_ { err = errors.New("deducttime error"); return }
|
||||
|
||||
_v.Deducttime = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.Deducttime = append(_v.Deducttime, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["rewardtime"].([]interface{}); !_ok_ { err = errors.New("rewardtime error"); return }
|
||||
|
||||
_v.Rewardtime = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.Rewardtime = append(_v.Rewardtime, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["stagedetail"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stagedetail error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stagedetail, _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["stageskill"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stageskill error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stageskill, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -13,9 +13,6 @@ import "errors"
|
||||
type GameGuildBossScoreData struct {
|
||||
Id int32
|
||||
ScoreName string
|
||||
Score int32
|
||||
RankLow int32
|
||||
RankUp int32
|
||||
Hp int32
|
||||
Drop int32
|
||||
Grade string
|
||||
@ -30,9 +27,6 @@ func (*GameGuildBossScoreData) GetTypeId() int32 {
|
||||
func (_v *GameGuildBossScoreData)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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["score_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["drop"].(float64); !_ok_ { err = errors.New("drop error"); return }; _v.Drop = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Grade, _ok_ = _buf["grade"].(string); !_ok_ { err = errors.New("grade error"); return } }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user