上传配置
This commit is contained in:
liwei1dao
parent
189433915a
commit
c4b3ddd73f
@ -1419,5 +1419,27 @@
|
||||
"filter": [
|
||||
"eq"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 245,
|
||||
"insert": 2,
|
||||
"filter": [
|
||||
"eq",
|
||||
"eq"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 246,
|
||||
"insert": 1,
|
||||
"filter": [
|
||||
"eq"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 247,
|
||||
"insert": 2,
|
||||
"filter": [
|
||||
"eq"
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -9536,83 +9536,6 @@
|
||||
"star_value": [],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1101096,
|
||||
"chapterid": 11001,
|
||||
"group_id": 100133,
|
||||
"previous_group_id": [],
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 9,
|
||||
"stage_param": 0,
|
||||
"inherit": 0,
|
||||
"battle_fail": 0,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
"move_type": 0,
|
||||
"venturemodel": "",
|
||||
"bubbletalk": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
"herocolor": 2,
|
||||
"heroimg": "zxgq_qp_icon_zd",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"animation": [],
|
||||
"prewarbubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"hide": 0,
|
||||
"destroy": 0,
|
||||
"progress": 0,
|
||||
"stroyshow": 0,
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"mainlineName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"title": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 0,
|
||||
"ps_consume": [],
|
||||
"ps_mg": [],
|
||||
"firstaward": [],
|
||||
"lotteryward": 0,
|
||||
"commonaward": [],
|
||||
"BattleReadyID": 0,
|
||||
"FormatList": [],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1102000,
|
||||
"chapterid": 11002,
|
||||
|
||||
@ -9,11 +9,7 @@
|
||||
"text": "这好像不是熊猫？"
|
||||
},
|
||||
"time": 90,
|
||||
<<<<<<< HEAD
|
||||
"speed": 7443
|
||||
=======
|
||||
"speed": 12722
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "2",
|
||||
@ -24,13 +20,8 @@
|
||||
"key": "playerinfor_barrage_2",
|
||||
"text": "看起来像个画家。"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 227,
|
||||
"speed": 8235
|
||||
=======
|
||||
"time": 190,
|
||||
"speed": 12237
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "3",
|
||||
@ -41,13 +32,8 @@
|
||||
"key": "playerinfor_barrage_3",
|
||||
"text": "为什么会觉得是熊猫啊？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 329,
|
||||
"speed": 12333
|
||||
=======
|
||||
"time": 292,
|
||||
"speed": 10498
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "4",
|
||||
@ -58,13 +44,8 @@
|
||||
"key": "playerinfor_barrage_4",
|
||||
"text": "从石头里蹦出来的人？怎么感觉有点熟悉……"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 512,
|
||||
"speed": 10906
|
||||
=======
|
||||
"time": 529,
|
||||
"speed": 12429
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "5",
|
||||
@ -75,13 +56,8 @@
|
||||
"key": "playerinfor_barrage_5",
|
||||
"text": "你可能是听说过从石头里蹦出来的猴子。"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 649,
|
||||
"speed": 8359
|
||||
=======
|
||||
"time": 688,
|
||||
"speed": 10088
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "6",
|
||||
@ -92,13 +68,8 @@
|
||||
"key": "playerinfor_barrage_6",
|
||||
"text": "你是从石头里蹦出来的？！"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 833,
|
||||
"speed": 12133
|
||||
=======
|
||||
"time": 909,
|
||||
"speed": 12947
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "7",
|
||||
@ -109,13 +80,8 @@
|
||||
"key": "playerinfor_barrage_7",
|
||||
"text": "不！那不是我！"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 996,
|
||||
"speed": 10803
|
||||
=======
|
||||
"time": 1059,
|
||||
"speed": 12696
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "8",
|
||||
@ -126,13 +92,8 @@
|
||||
"key": "playerinfor_barrage_8",
|
||||
"text": "哦，传承之人……"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1217,
|
||||
"speed": 10424
|
||||
=======
|
||||
"time": 1225,
|
||||
"speed": 9592
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "9",
|
||||
@ -143,13 +104,8 @@
|
||||
"key": "playerinfor_barrage_9",
|
||||
"text": "月光能量都汇集在他身上了！"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1445,
|
||||
"speed": 7151
|
||||
=======
|
||||
"time": 1385,
|
||||
"speed": 11311
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "10",
|
||||
@ -160,13 +116,8 @@
|
||||
"key": "playerinfor_barrage_10",
|
||||
"text": "那应该不会爆炸吧？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1575,
|
||||
"speed": 12447
|
||||
=======
|
||||
"time": 1606,
|
||||
"speed": 10931
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "11",
|
||||
@ -177,13 +128,8 @@
|
||||
"key": "playerinfor_barrage_11",
|
||||
"text": "阿宝，你为什么站那么远？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1714,
|
||||
"speed": 7131
|
||||
=======
|
||||
"time": 1802,
|
||||
"speed": 12145
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "312",
|
||||
@ -195,11 +141,7 @@
|
||||
"text": "哦！那是什么？"
|
||||
},
|
||||
"time": 90,
|
||||
<<<<<<< HEAD
|
||||
"speed": 11318
|
||||
=======
|
||||
"speed": 7982
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "313",
|
||||
@ -210,13 +152,8 @@
|
||||
"key": "playerinfor_barrage_313",
|
||||
"text": "我有种被她注视的感觉……"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 209,
|
||||
"speed": 11012
|
||||
=======
|
||||
"time": 266,
|
||||
"speed": 7864
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "314",
|
||||
@ -227,13 +164,8 @@
|
||||
"key": "playerinfor_barrage_314",
|
||||
"text": "好像是一种叫做“照相”的魔法……"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 309,
|
||||
"speed": 8982
|
||||
=======
|
||||
"time": 468,
|
||||
"speed": 9856
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "315",
|
||||
@ -244,13 +176,8 @@
|
||||
"key": "playerinfor_barrage_315",
|
||||
"text": "我看这魔法不是很疼。"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 432,
|
||||
"speed": 7914
|
||||
=======
|
||||
"time": 652,
|
||||
"speed": 11970
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "316",
|
||||
@ -261,13 +188,8 @@
|
||||
"key": "playerinfor_barrage_316",
|
||||
"text": "据说它的作用是封印灵魂？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 626,
|
||||
"speed": 11866
|
||||
=======
|
||||
"time": 816,
|
||||
"speed": 8057
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "317",
|
||||
@ -278,13 +200,8 @@
|
||||
"key": "playerinfor_barrage_317",
|
||||
"text": "月中人的传承居然这么可怕？！"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 813,
|
||||
"speed": 12580
|
||||
=======
|
||||
"time": 928,
|
||||
"speed": 9966
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "318",
|
||||
@ -295,13 +212,8 @@
|
||||
"key": "playerinfor_barrage_318",
|
||||
"text": "哦！你们真是够了！"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 973,
|
||||
"speed": 9024
|
||||
=======
|
||||
"time": 1028,
|
||||
"speed": 8227
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "319",
|
||||
@ -312,13 +224,8 @@
|
||||
"key": "playerinfor_barrage_319",
|
||||
"text": "照相不是魔法！也不能封印灵魂！"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1203,
|
||||
"speed": 11977
|
||||
=======
|
||||
"time": 1260,
|
||||
"speed": 11801
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "320",
|
||||
@ -329,13 +236,8 @@
|
||||
"key": "playerinfor_barrage_320",
|
||||
"text": "那她是在干什么？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1371,
|
||||
"speed": 9562
|
||||
=======
|
||||
"time": 1485,
|
||||
"speed": 11645
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "321",
|
||||
@ -346,13 +248,8 @@
|
||||
"key": "playerinfor_barrage_321",
|
||||
"text": "……别问。"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1554,
|
||||
"speed": 11969
|
||||
=======
|
||||
"time": 1587,
|
||||
"speed": 11333
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "322",
|
||||
@ -363,13 +260,8 @@
|
||||
"key": "playerinfor_barrage_322",
|
||||
"text": "那可以教我吗？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1666,
|
||||
"speed": 11148
|
||||
=======
|
||||
"time": 1746,
|
||||
"speed": 8330
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "323",
|
||||
@ -380,13 +272,8 @@
|
||||
"key": "playerinfor_barrage_323",
|
||||
"text": "我也想学。"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1792,
|
||||
"speed": 10475
|
||||
=======
|
||||
"time": 1970,
|
||||
"speed": 12972
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
},
|
||||
{
|
||||
"id": "324",
|
||||
@ -397,12 +284,7 @@
|
||||
"key": "playerinfor_barrage_324",
|
||||
"text": "要不你们问问这个传承者？"
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"time": 1922,
|
||||
"speed": 11895
|
||||
=======
|
||||
"time": 2136,
|
||||
"speed": 12942
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
}
|
||||
]
|
||||
@ -78,11 +78,7 @@
|
||||
107
|
||||
],
|
||||
"url": "",
|
||||
<<<<<<< HEAD
|
||||
"tips": 10001,
|
||||
=======
|
||||
"tips": 10000,
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
"resources": "Person/10000/10000M.prefab",
|
||||
"pvpAnimator": "Person/10000/10000_MPvp.controller",
|
||||
"mainq": "Person/10000/10000M_q.prefab",
|
||||
@ -105,11 +101,7 @@
|
||||
107
|
||||
],
|
||||
"url": "",
|
||||
<<<<<<< HEAD
|
||||
"tips": 10001,
|
||||
=======
|
||||
"tips": 10000,
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
"resources": "Person/10000/10000W.prefab",
|
||||
"pvpAnimator": "Person/10000/10000_WPvp.controller",
|
||||
"mainq": "Person/10000/10000W_q.prefab",
|
||||
@ -132,11 +124,7 @@
|
||||
107
|
||||
],
|
||||
"url": "",
|
||||
<<<<<<< HEAD
|
||||
"tips": 10002,
|
||||
=======
|
||||
"tips": 10000,
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
"resources": "Person/10000/10000M.prefab",
|
||||
"pvpAnimator": "Person/10000/10000_MPvp.controller",
|
||||
"mainq": "Person/10000/10000M_q.prefab",
|
||||
@ -159,11 +147,7 @@
|
||||
107
|
||||
],
|
||||
"url": "",
|
||||
<<<<<<< HEAD
|
||||
"tips": 10002,
|
||||
=======
|
||||
"tips": 10000,
|
||||
>>>>>>> 7e1c0cdb51b0b179779164cc6afa596bd529fc46
|
||||
"resources": "Person/10000/10000W.prefab",
|
||||
"pvpAnimator": "Person/10000/10000_WPvp.controller",
|
||||
"mainq": "Person/10000/10000W_q.prefab",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user