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

This commit is contained in:
meixiongfeng 2023-03-10 09:54:13 +08:00
commit 1dba115251
2 changed files with 167 additions and 167 deletions

View File

@ -1,146 +1,146 @@
[ [
{ {
"id": 1, "id": 1,
"boxid": 11001, "boxid": 11001,
"starnum": 3, "starnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 100 "n": 100
} }
] ]
}, },
{ {
"id": 2, "id": 2,
"boxid": 11001, "boxid": 11001,
"starnum": 6, "starnum": 6,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 200 "n": 200
} }
] ]
}, },
{ {
"id": 3, "id": 3,
"boxid": 11001, "boxid": 11001,
"starnum": 9, "starnum": 9,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 300 "n": 300
} }
] ]
}, },
{ {
"id": 4, "id": 4,
"boxid": 11002, "boxid": 11002,
"starnum": 3, "starnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 100 "n": 100
} }
] ]
}, },
{ {
"id": 5, "id": 5,
"boxid": 11002, "boxid": 11002,
"starnum": 6, "starnum": 6,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 200 "n": 200
} }
] ]
}, },
{ {
"id": 6, "id": 6,
"boxid": 11002, "boxid": 11002,
"starnum": 9, "starnum": 9,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 300 "n": 300
} }
] ]
}, },
{ {
"id": 7, "id": 7,
"boxid": 11003, "boxid": 11003,
"starnum": 3, "starnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 100 "n": 100
} }
] ]
}, },
{ {
"id": 8, "id": 8,
"boxid": 11003, "boxid": 11003,
"starnum": 6, "starnum": 6,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 200 "n": 200
} }
] ]
}, },
{ {
"id": 9, "id": 9,
"boxid": 11003, "boxid": 11003,
"starnum": 9, "starnum": 9,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 300 "n": 300
} }
] ]
}, },
{ {
"id": 10, "id": 10,
"boxid": 11004, "boxid": 11004,
"starnum": 3, "starnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 100 "n": 100
} }
] ]
}, },
{ {
"id": 11, "id": 11,
"boxid": 11004, "boxid": 11004,
"starnum": 6, "starnum": 6,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 200 "n": 200
} }
] ]
}, },
{ {
"id": 12, "id": 12,
"boxid": 11004, "boxid": 11004,
"starnum": 9, "starnum": 9,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "diamond", "t": "diamond",
"n": 300 "n": 300
} }
] ]
} }
] ]

View File

@ -1,23 +1,23 @@
[ [
{ {
"id": 1, "id": 1,
"starName": { "starName": {
"key": "startype_name_1", "key": "startype_name_1",
"text": "成功通关" "text": "成功通关"
} }
}, },
{ {
"id": 2, "id": 2,
"starName": { "starName": {
"key": "startype_name_2", "key": "startype_name_2",
"text": "死亡人数不超过{0}人" "text": "死亡人数不超过{0}人"
} }
}, },
{ {
"id": 3, "id": 3,
"starName": { "starName": {
"key": "startype_name_3", "key": "startype_name_3",
"text": "不超过{0}回合通关" "text": "不超过{0}回合通关"
} }
} }
] ]