xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

关卡：PVP

Browse Source
This commit is contained in:
zhaolei
2021-12-10 15:39:32 +08:00
parent efc7b5a73f
commit 7e517f1e12
6 changed files with 6875 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
shared/resource/jsons/dic_zyz_gk_pvp.json
View File

@@ -67,13 +67,13 @@
"war_id": 4505,
"dispatchJsonId": 4505,
"bg_img": 543,
"mapid": 543,
"mapid": 4505,
"warType": 9,
"gk_name": "地图3",
"mapseid": "50205&50206&50207",
"victoryInfoInUI": "我军全员生存",
"loseInfoInUI": "我军有武将阵亡",
"pvpVictoryCondition": "102&0&",
"mapseid": "73001&73011",
"victoryInfoInUI": "击杀所有敌人",
"loseInfoInUI": "我军全部阵亡",
"pvpVictoryCondition": "114&",
"turnLimted": 10,
"needPrepare": 1,
"selectView": 1,
@@ -83,13 +83,13 @@
"war_id": 4506,
"dispatchJsonId": 4505,
"bg_img": 543,
"mapid": 543,
"mapid": 4505,
"warType": 9,
"gk_name": "地图3",
"mapseid": "50205&50206&50207",
"victoryInfoInUI": "我军全员生存",
"loseInfoInUI": "我军有武将阵亡",
"pvpVictoryCondition": "102&0&",
"mapseid": "73001&73011",
"victoryInfoInUI": "击杀所有敌人",
"loseInfoInUI": "我军全部阵亡",
"pvpVictoryCondition": "114&",
"turnLimted": 10,
"needPrepare": 1,
"selectView": 0,

88
shared/resource/jsons/dic_zyz_job_walk.json
View File

@@ -96,7 +96,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 2,
@@ -195,7 +203,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 3,
@@ -294,7 +310,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 4,
@@ -393,7 +417,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 5,
@@ -492,7 +524,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 6,
@@ -591,7 +631,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 7,
@@ -690,7 +738,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 8,
@@ -789,7 +845,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 9,
@@ -888,7 +952,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 10,
@@ -987,7 +1059,15 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
},
{
"id": 15,
@@ -1086,6 +1166,14 @@
"93": 1,
"94": 1,
"95": 255,
<<<<<<< Updated upstream
"96": 1
=======
"96": 1,
"97": 1,
"98": 1,
"99": 1,
"100": 1
>>>>>>> Stashed changes
}
]

38
shared/resource/jsons/dic_zyz_map_terrain.json
View File

@@ -751,7 +751,10 @@
"spine": "bingying_red",
"transparent": 1
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
=======
>>>>>>> Stashed changes
},
{
"mapid": 95,
@@ -768,6 +771,41 @@
"description": "吊桥",
"spine": "diaoqiao_open",
"transparent": 1
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
},
{
"mapid": 97,
"name": "平原（恢复）",
"seid": "73021&",
"description": "很平常的平原",
"spine": "&",
"transparent": 1
},
{
"mapid": 98,
"name": "箭塔（防御）",
"seid": "73031&",
"description": "防御性很好的箭塔",
"spine": "jianta",
"transparent": 1
},
{
"mapid": 99,
"name": "树林（策攻）",
"seid": "73041&",
"description": "很平常的树林",
"spine": "&",
"transparent": 1
},
{
"mapid": 100,
"name": "高地箭塔（远射）",
"seid": "73051&",
"description": "射程很远的箭塔",
"spine": "jianta",
"transparent": 1
>>>>>>> Stashed changes
}
]

5623
shared/resource/jsons/dic_zyz_se.json
View File

File diff suppressed because it is too large Load Diff

2572
shared/resource/jsons/dic_zyz_state.json
View File

File diff suppressed because it is too large Load Diff

77
shared/resource/jsons/dic_zyz_terrain_eff.json
View File

@@ -96,6 +96,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 1
},
{
@@ -195,6 +202,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 2
},
{
@@ -294,6 +308,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 3
},
{
@@ -393,6 +414,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 4
},
{
@@ -492,6 +520,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 5
},
{
@@ -591,6 +626,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 6
},
{
@@ -690,6 +732,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 7
},
{
@@ -789,6 +838,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 8
},
{
@@ -888,6 +944,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 9
},
{
@@ -987,6 +1050,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 10
},
{
@@ -1086,6 +1156,13 @@
"94": 100,
"95": 100,
"96": 100,
<<<<<<< Updated upstream
=======
"97": 100,
"98": 100,
"99": 100,
"100": 100,
>>>>>>> Stashed changes
"id": 15
}
]