Compare commits

..

6 Commits

Author SHA1 Message Date
dy
e95928b060 Merge branch 'master' into dev 2023-12-31 18:48:42 +08:00
dy
428033b26f Merge branch 'bugfix' into release 2023-12-31 17:43:30 +08:00
dy
4448b2dfa8 Merge branch 'bugfix' into release 2023-12-31 16:30:16 +08:00
dy
087b8ff146 Merge branch 'feature/json' into release 2023-12-31 16:01:52 +08:00
dy
3ba27f5180 cehua public json 2023-12-31 16:01:41 +08:00
dy
d8a7fa14d0 Merge remote-tracking branch 'origin/bugfix' into release 2023-12-31 15:59:30 +08:00
5 changed files with 23852 additions and 14644 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -537,8 +537,8 @@
"mapId": 420, "mapId": 420,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -550,8 +550,8 @@
"mapId": 430, "mapId": 430,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -589,8 +589,8 @@
"mapId": 460, "mapId": 460,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -615,8 +615,8 @@
"mapId": 480, "mapId": 480,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -641,8 +641,8 @@
"mapId": 500, "mapId": 500,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -680,8 +680,8 @@
"mapId": 530, "mapId": 530,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -693,8 +693,8 @@
"mapId": 540, "mapId": 540,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -797,8 +797,8 @@
"mapId": 620, "mapId": 620,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -810,8 +810,8 @@
"mapId": 630, "mapId": 630,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -849,8 +849,8 @@
"mapId": 660, "mapId": 660,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -875,8 +875,8 @@
"mapId": 680, "mapId": 680,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -901,8 +901,8 @@
"mapId": 700, "mapId": 700,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -940,8 +940,8 @@
"mapId": 730, "mapId": 730,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -953,8 +953,8 @@
"mapId": 740, "mapId": 740,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -1057,8 +1057,8 @@
"mapId": 820, "mapId": 820,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -1070,8 +1070,8 @@
"mapId": 830, "mapId": 830,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -1109,8 +1109,8 @@
"mapId": 860, "mapId": 860,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -1135,8 +1135,8 @@
"mapId": 880, "mapId": 880,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -1161,8 +1161,8 @@
"mapId": 900, "mapId": 900,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -1200,8 +1200,8 @@
"mapId": 930, "mapId": 930,
"prize": [ "prize": [
{ {
"a": "attr", "a": "item",
"t": "rmbmoney", "t": "4",
"n": 5 "n": 5
} }
], ],
@ -1213,8 +1213,8 @@
"mapId": 940, "mapId": 940,
"prize": [ "prize": [
{ {
"a": "item", "a": "attr",
"t": "4", "t": "rmbmoney",
"n": 100 "n": 100
} }
], ],
@ -1298,5 +1298,109 @@
], ],
"chapter": 14, "chapter": 14,
"des": "intr_guanqia_des_1" "des": "intr_guanqia_des_1"
},
"101": {
"id": 101,
"mapId": 1010,
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"102": {
"id": 102,
"mapId": 1020,
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"103": {
"id": 103,
"mapId": 1030,
"prize": [
{
"a": "item",
"t": "4",
"n": 5
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"104": {
"id": 104,
"mapId": 1040,
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"105": {
"id": 105,
"mapId": 1050,
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"106": {
"id": 106,
"mapId": 1060,
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"107": {
"id": 107,
"mapId": 1070,
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
},
"108": {
"id": 108,
"mapId": 1080,
"prize": [
{
"a": "item",
"t": "4",
"n": 5
}
],
"chapter": 14,
"des": "intr_guanqia_des_1"
} }
} }

File diff suppressed because it is too large Load Diff