配置同步

This commit is contained in:
meixiongfeng 2023-09-18 17:50:34 +08:00
parent b622edae29
commit 3447e7ac63
6 changed files with 44 additions and 297 deletions

View File

@ -1776,7 +1776,7 @@
"disableAiCamera": 1,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 14003,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [
@ -2081,45 +2081,6 @@
"key": "",
"text": ""
},
"battleEvents": [
111,
114
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [
"24004",
"24001"
],
"RedAssistTeam": 0,
"BlueAssistTeam": 720016,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10400001,
"PlayType": 4,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,

View File

@ -21280,11 +21280,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_724",
<<<<<<< HEAD
"text": "调查喷泉花园处的恐惧灵气息"
=======
"text": "调查左侧恐惧灵气息"
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
},
"type": 20001,
"valid": 1,
@ -21309,11 +21305,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_725",
<<<<<<< HEAD
"text": "调查圣桃树前的恐惧灵气息"
=======
"text": "调查未知恐惧灵气息"
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
},
"type": 20001,
"valid": 1,
@ -21338,11 +21330,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_726",
<<<<<<< HEAD
"text": "调查擂台旁的恐惧灵气息"
=======
"text": "调查右侧恐惧灵气息"
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
},
"type": 20001,
"valid": 1,

View File

@ -73,15 +73,15 @@
},
{
"id": 10301,
"drop": 1001
"drop": 16001001
},
{
"id": 10302,
"drop": 1002
"drop": 16001001
},
{
"id": 10303,
"drop": 1003
"drop": 16001001
},
{
"id": 10401,

View File

@ -90478,5 +90478,29 @@
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 3771,
"lotteryid": 16001001,
"description": "记忆碎片第1章第1关",
"type": 1,
"groupwt": 1,
"groupid": 1001,
"subtype": 1,
"groupnum": 2,
"itemid": {
"a": "item",
"t": "16001001",
"n": 1
},
"itemdes": "",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
}
]

View File

@ -224,7 +224,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 200040,
"frontstoryid": 200050,
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -1707,11 +1707,7 @@
"destroy": 1,
"progress": 1,
"stroyshow": 0,
<<<<<<< HEAD
"frontstoryid": 200240,
=======
"frontstoryid": 0,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"afterstoryid": 0,
"maingroupName": {
"key": "",
@ -1791,8 +1787,6 @@
"text": ""
},
"mainlineName": {
<<<<<<< HEAD
=======
"key": "",
"text": ""
},
@ -1830,89 +1824,6 @@
"previoustage": 0,
"Episodetype": 3,
"stage_param": 0,
"battle_fail": 0,
"venturemodelspeed": 9,
"venturemodelscale": 2,
"move_type": 1,
"venturemodel": "Person/mount/54021_q.prefab",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 2,
"ventureavatar": [
"player",
"sbkp_js_24004",
"sbkp_js_35002"
],
"scene_effect": [
"miwu"
],
"scene_effectfilter": "",
"is_near": 0,
"openlevel": 1,
"EditorStage": 0,
"herocolor": 0,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
},
"animation": [],
"hide": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"maingroupName": {
"key": "",
"text": ""
},
"mainlineName": {
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"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": 1100121,
"chapterid": 11001,
"group_id": 100119,
"previous_group_id": [
100118
],
"previoustage": 0,
<<<<<<< HEAD
"Episodetype": 3,
"stage_param": 0,
=======
"Episodetype": 5,
"stage_param": 10001,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"battle_fail": 0,
"venturemodelspeed": 9,
"venturemodelscale": 2,
@ -2421,8 +2332,6 @@
},
{
"id": 1100126,
<<<<<<< HEAD
=======
"chapterid": 11001,
"group_id": 100124,
"previous_group_id": [
@ -2494,90 +2403,12 @@
},
{
"id": 1100127,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"chapterid": 11001,
"group_id": 100125,
"previous_group_id": [
100124
],
"previoustage": 0,
<<<<<<< HEAD
"Episodetype": 2,
"stage_param": 1,
=======
"Episodetype": 3,
"stage_param": 0,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"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": 0,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
},
"animation": [],
"hide": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 200330,
"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": 1100128,
"chapterid": 11001,
"group_id": 100126,
"previous_group_id": [
100125
],
"previoustage": 0,
<<<<<<< HEAD
"Episodetype": 3,
"stage_param": 0,
"battle_fail": 0,
@ -2652,11 +2483,6 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
=======
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
@ -2732,11 +2558,7 @@
"n": 6000
}
],
<<<<<<< HEAD
"BattleReadyID": 10100001,
=======
"BattleReadyID": 10103001,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"FormatList": [
102041,
102042,
@ -11688,11 +11510,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 9,
=======
"venturemodelspeed": 6,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/yacht/yacht.prefab",
@ -11811,11 +11629,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -11934,11 +11748,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12057,11 +11867,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12180,11 +11986,7 @@
"Episodetype": 7,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12255,11 +12057,7 @@
"Episodetype": 7,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12330,11 +12128,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12453,11 +12247,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12576,11 +12366,7 @@
"Episodetype": 7,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12651,11 +12437,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",
@ -12774,11 +12556,7 @@
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1,
"move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab",

View File

@ -1831,11 +1831,7 @@
"newskill": [],
"lv": 4,
"hppro": 1.21,
<<<<<<< HEAD
"atkpro": 0.5,
=======
"atkpro": 1,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
@ -232511,7 +232507,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 24004,
"star": 3,
"equip": [],
"newskill": [],
@ -232571,7 +232567,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 24004,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -232736,7 +232732,7 @@
"equip": [],
"newskill": [],
"lv": 4,
"hppro": 0.5,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
@ -232756,7 +232752,7 @@
"equip": [],
"newskill": [],
"lv": 4,
"hppro": 0.5,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
@ -232796,7 +232792,7 @@
"equip": [],
"newskill": [],
"lv": 4,
"hppro": 0.5,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
@ -232816,7 +232812,7 @@
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.6,
"hppro": 0.3,
"atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
@ -232836,7 +232832,7 @@
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.55,
"hppro": 0.3,
"atkpro": 0.2,
"defpro": 0.8,
"skill1": 1,
@ -232856,7 +232852,7 @@
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.6,
"hppro": 0.3,
"atkpro": 0.2,
"defpro": 0.8,
"skill1": 1,
@ -232876,7 +232872,7 @@
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.5,
"hppro": 0.3,
"atkpro": 0.2,
"defpro": 0.8,
"skill1": 1,
@ -232896,7 +232892,7 @@
"equip": [],
"newskill": [],
"lv": 3,
"hppro": 0.6,
"hppro": 0.3,
"atkpro": 0.3,
"defpro": 0.8,
"skill1": 1,
@ -232916,7 +232912,7 @@
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 0.4,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.8,
"skill1": 1,
@ -232936,7 +232932,7 @@
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 0.5,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.8,
"skill1": 1,
@ -232956,7 +232952,7 @@
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 0.4,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.8,
"skill1": 1,
@ -232976,7 +232972,7 @@
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 0.4,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.8,
"skill1": 1,
@ -232996,7 +232992,7 @@
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 0.6,
"hppro": 0.3,
"atkpro": 0.5,
"defpro": 0.8,
"skill1": 1,