更新json

game-server/app/servers/battle/handler/eventBattleHandler.ts

@@ -40,8 +40,7 @@ export class EventBattleHandler {
         }
         let { status, type, eventId: dataEventId, question } = event;
 
-        let flag = checkEventStatus(type, status);
+        if(status != EVENT_RECORD_STATUS.WAITING) {
-        if(!flag) {
             return resResult(STATUS.EVENT_STATUS_ERROR);
         }
         if(dataEventId != eventId) {
@@ -51,7 +50,24 @@ export class EventBattleHandler {
         if(!curQuestion) return resResult(STATUS.EVENT_QUESTION_NOT_FOUND);
 
         let {isCorrect, answerNo} = checkQuiz(questionId, answer);
-        await EventRecordModel.saveEventAnswer(eventCode, questionId, isCorrect?EVENT_ANSWER_STATUS.CORRECT:EVENT_ANSWER_STATUS.WRONG);
+        let result = await EventRecordModel.saveEventAnswer(eventCode, questionId, isCorrect?EVENT_ANSWER_STATUS.CORRECT:EVENT_ANSWER_STATUS.WRONG);
+        if(!result) {
+            return resResult(STATUS.EVENT_RECORD_NOT_FOUND);
+        }
+        let { question: newQuestion } = result;
+        let isClear = true, allCorrect = true;
+        for(let {status} of newQuestion) {
+            if(status) {
+                if(status == EVENT_ANSWER_STATUS.WRONG) {
+                    allCorrect = false; 
+                } 
+            }else {
+                isClear = false; allCorrect = false; 
+            }
+        }
+        if(isClear) {
+            await EventRecordModel.setStatusByCode(roleId, eventCode, allCorrect?EVENT_RECORD_STATUS.BATTLE_SUCCESS:EVENT_RECORD_STATUS.BATTLE_FAIL);
+        }
 
         return resResult(STATUS.SUCCESS, { eventCode, eventId, questionId, isCorrect, answerNo });
     }

game-server/app/services/eventSercive.ts

@@ -299,7 +299,7 @@ function pushEventMsg(app: Application, roleId: string, channelName: string, msg
 export function checkEventStatus(type: number, status: number) {
 
     let flag: boolean; // 检查状态是否正确
-    if(type == EVENT_TYPE.BATTLE) {
+    if(type == EVENT_TYPE.BATTLE||type ==EVENT_TYPE.QUIZ) {
         if(status == EVENT_RECORD_STATUS.BATTLE_SUCCESS) {
             flag = true;
         } else if (status == EVENT_RECORD_STATUS.BATTLE_FAIL) {

shared/db/EventRecord.ts

@@ -81,7 +81,6 @@ export default class EventRecord extends BaseModel {
     }
 
     public static async setBattleStatus(roleId: string, battleId: number, battleCode: string, status: number , lean=true ) {
-      console.log('********', roleId, battleId, battleCode)
       let result = await EventRecordModel.findOneAndUpdate({roleId, battleId, battleCode}, {$set:{ status }}).lean(lean);
       return result;
     }

shared/resource/jsons/const.json

@@ -1,4 +1,4 @@
-[
+[
   {
     "IsTestService":true,
     "OpenIosAliPay":false,

shared/resource/jsons/dic_goods.json

@@ -37,7 +37,7 @@
 		"name": "青铜剑",
 		"lvLimted": 21,
 		"quality": 2,
-		"image_id": 1,
+		"image_id": 2,
 		"itid": 1,
 		"goodType": 1,
 		"hid": 0,
@@ -70,7 +70,7 @@
 		"name": "环首刀",
 		"lvLimted": 41,
 		"quality": 3,
-		"image_id": 1,
+		"image_id": 3,
 		"itid": 1,
 		"goodType": 1,
 		"hid": 0,
@@ -103,7 +103,7 @@
 		"name": "大环刀",
 		"lvLimted": 61,
 		"quality": 4,
-		"image_id": 1,
+		"image_id": 4,
 		"itid": 1,
 		"goodType": 1,
 		"hid": 0,
@@ -136,7 +136,7 @@
 		"name": "百炼刀",
 		"lvLimted": 81,
 		"quality": 5,
-		"image_id": 1,
+		"image_id": 5,
 		"itid": 1,
 		"goodType": 1,
 		"hid": 0,

shared/resource/jsons/dic_zyz_atk_area.json

@@ -31,8 +31,8 @@
 	"name": "对自己释放",
 	"cname": "以自身为中心",
 	"isFullScene": false,
-	"toSelf": true,
+	"toSelf": false,
-	"json": "[{\"x\":0,\"y\":0}]"
+	"json": "[{\"x\":995,\"y\":995}]"
 }, {
 	"atkid": 6,
 	"name": "9格Boss普通攻击",

shared/resource/jsons/dic_zyz_buttonNote.json

@@ -0,0 +1,97 @@
+[
+    {
+        "id": 1,
+        "titleName": "武将界面",
+        "content": "武将界面是游戏养成系统所在，包含了武将列表和武将信息两部分，玩家从列表进入信息界面，武将信息包含了武将，装备，宝物，时装四个一级界面，武将界面中又包含了属性，职业，升星，好感四个养成界面，装备界面中包含了制作（升品），强化，精炼，共鸣四个养成界面，宝物界面中包含了强化，套装，随机属性三部分。"
+    },
+    {
+        "id": 2,
+        "titleName": "任务界面",
+        "content": "任务界面包含新手，主线，每日，成就四个页签。"
+    },
+    {
+        "id": 3,
+        "titleName": "背包界面",
+        "content": "背包界面包含材料，宝物，消耗品等页签。"
+    },
+    {
+        "id": 4,
+        "titleName": "招募界面",
+        "content": "招募界面即抽卡界面，包含普通抽卡，高级抽卡，心愿单和最高品质定向抽卡四部分。"
+    },
+    {
+        "id": 5,
+        "titleName": "助阵界面",
+        "content": "助阵界面包含所有的全局加成，包括神像（主次属性固定值加成），爵位（主属性固定值加成和PVP百分比），兵营（驻守型|主属性百分比加成），名将谱（任一角色获取、养成都可以带来的主属性固定值加成）"
+    },
+    {
+        "id": 6,
+        "titleName": "军团界面",
+        "content": "军团界面，包含军团成员，军团日活，军团贡献消耗，军团活跃boss和军团拍卖等模块。"
+    },
+    {
+        "id": 7,
+        "titleName": "每日关卡",
+        "content": "每日关卡，投放基础材料，如铜币，经验书，装备强化材料等，随战力提升开放多种难度。"
+    },
+    {
+        "id": 8,
+        "titleName": "远征关卡",
+        "content": "玩家数据映射的战力验证关卡，战斗间状态，血量延续上一场结束时的数值。"
+    },
+    {
+        "id": 9,
+        "titleName": "爬塔关卡",
+        "content": "战力验证（含纵横双向）关卡，只可通关一次，无限上升，其中还包括挂机和派遣模块"
+    },
+    {
+        "id": 10,
+        "titleName": "组队关卡",
+        "content": "玩家协同完成的boss关卡，三人成队，全服可见，投放游戏中的宝物相关道具。"
+    },
+    {
+        "id": 11,
+        "titleName": "遗迹关卡",
+        "content": "主线剧情补充，一次性关卡，每州一处，会出现难度较高较复杂的战斗。"
+    },
+    {
+        "id": 12,
+        "titleName": "秘境关卡",
+        "content": "每州一处，中等难度，随等级开放，每日重置，投放装备相关道具"
+    },
+    {
+        "id": 13,
+        "titleName": "活动界面",
+        "content": "各种运营活动的集合"
+    },
+    {
+        "id": 14,
+        "titleName": "首充界面",
+        "content": "首充界面"
+    },
+    {
+        "id": 15,
+        "titleName": "商城界面",
+        "content": "各种商店的集合"
+    },
+    {
+        "id": 16,
+        "titleName": "拍卖界面",
+        "content": "当每日的定时活跃boss（12：00，20：00）完成后，或者是军团副本完成后，系统会根据军团战果发放道具供军团人员拍卖。"
+    },
+    {
+        "id": 17,
+        "titleName": "好友界面",
+        "content": "玩家的好友界面"
+    },
+    {
+        "id": 18,
+        "titleName": "邮件界面",
+        "content": "玩家的邮件界面"
+    },
+    {
+        "id": 19,
+        "titleName": "排行界面",
+        "content": "各种排行榜的集合"
+    }
+]

shared/resource/jsons/dic_zyz_camp.json

@@ -1,178 +1,146 @@
 [
-  {
+	{
-    "camp": 1,
+		"camp": 1,
-    "num": 2,
+		"num": 2,
-    "hp": 5,
+		"atk": 0,
-    "atk": 5,
+		"matk": 5,
-    "matk": 5,
+		"def": 0,
-    "def": 5,
+		"mdef": 5,
-    "mdef": 5,
+		"agi": 0,
-    "agi": 0,
+		"luk": 5,
-    "luk": 0
+		"name": "魏武一",
-  },
+		"decription": "策攻+5%，策防+5%，幸运+5%"
-  {
+	},
-    "camp": 1,
+	{
-    "num": 3,
+		"camp": 1,
-    "hp": 5,
+		"num": 4,
-    "atk": 5,
+		"atk": 0,
-    "matk": 5,
+		"matk": 10,
-    "def": 5,
+		"def": 0,
-    "mdef": 5,
+		"mdef": 10,
-    "agi": 0,
+		"agi": 0,
-    "luk": 0
+		"luk": 10,
-  },
+		"name": "魏武二",
-  {
+		"decription": "策攻+10%，策防+10%，幸运+10%"
-    "camp": 1,
+	},
-    "num": 4,
+	{
-    "hp": 10,
+		"camp": 1,
-    "atk": 10,
+		"num": 5,
-    "matk": 10,
+		"atk": 0,
-    "def": 10,
+		"matk": 15,
-    "mdef": 10,
+		"def": 0,
-    "agi": 0,
+		"mdef": 15,
-    "luk": 0
+		"agi": 0,
-  },
+		"luk": 15,
-  {
+		"name": "魏武三",
-    "camp": 1,
+		"decription": "策攻+15%，策防+15%，幸运+15%"
-    "num": 5,
+	},
-    "hp": 15,
+	{
-    "atk": 15,
+		"camp": 2,
-    "matk": 15,
+		"num": 2,
-    "def": 15,
+		"atk": 5,
-    "mdef": 15,
+		"matk": 0,
-    "agi": 0,
+		"def": 0,
-    "luk": 0
+		"mdef": 5,
-  },
+		"agi": 0,
-  {
+		"luk": 5,
-    "camp": 2,
+		"name": "汉烈一",
-    "num": 2,
+		"decription": "幸运+5%，物攻+5%，策防+5%"
-    "hp": 5,
+	},
-    "atk": 5,
+	{
-    "matk": 5,
+		"camp": 2,
-    "def": 5,
+		"num": 4,
-    "mdef": 5,
+		"atk": 10,
-    "agi": 0,
+		"matk": 0,
-    "luk": 0
+		"def": 0,
-  },
+		"mdef": 10,
-  {
+		"agi": 0,
-    "camp": 2,
+		"luk": 10,
-    "num": 3,
+		"name": "汉烈二",
-    "hp": 5,
+		"decription": "幸运+10%，物攻+10%，策防+10%"
-    "atk": 5,
+	},
-    "matk": 5,
+	{
-    "def": 5,
+		"camp": 2,
-    "mdef": 5,
+		"num": 5,
-    "agi": 0,
+		"atk": 15,
-    "luk": 0
+		"matk": 0,
-  },
+		"def": 0,
-  {
+		"mdef": 15,
-    "camp": 2,
+		"agi": 0,
-    "num": 4,
+		"luk": 15,
-    "hp": 10,
+		"name": "汉烈三",
-    "atk": 10,
+		"decription": "幸运+15%，物攻+15%，策防+15%"
-    "matk": 10,
+	},
-    "def": 10,
+	{
-    "mdef": 10,
+		"camp": 3,
-    "agi": 0,
+		"num": 2,
-    "luk": 0
+		"atk": 0,
-  },
+		"matk": 5,
-  {
+		"def": 5,
-    "camp": 2,
+		"mdef": 5,
-    "num": 5,
+		"agi": 0,
-    "hp": 15,
+		"luk": 0,
-    "atk": 15,
+		"name": "吴炎一",
-    "matk": 15,
+		"decription": "策攻+5%，策防+5%，物防+5%"
-    "def": 15,
+	},
-    "mdef": 15,
+	{
-    "agi": 0,
+		"camp": 3,
-    "luk": 0
+		"num": 4,
-  },
+		"atk": 0,
-  {
+		"matk": 10,
-    "camp": 3,
+		"def": 10,
-    "num": 2,
+		"mdef": 10,
-    "hp": 5,
+		"agi": 0,
-    "atk": 5,
+		"luk": 0,
-    "matk": 5,
+		"name": "吴炎二",
-    "def": 5,
+		"decription": "策攻+10%，策防+10%，物防+10%"
-    "mdef": 5,
+	},
-    "agi": 0,
+	{
-    "luk": 0
+		"camp": 3,
-  },
+		"num": 5,
-  {
+		"atk": 0,
-    "camp": 3,
+		"matk": 15,
-    "num": 3,
+		"def": 15,
-    "hp": 5,
+		"mdef": 15,
-    "atk": 5,
+		"agi": 0,
-    "matk": 5,
+		"luk": 0,
-    "def": 5,
+		"name": "吴炎三",
-    "mdef": 5,
+		"decription": "策攻+15%，策防+15%，物防+15%"
-    "agi": 0,
+	},
-    "luk": 0
+	{
-  },
+		"camp": 4,
-  {
+		"num": 2,
-    "camp": 3,
+		"atk": 0,
-    "num": 4,
+		"matk": 0,
-    "hp": 10,
+		"def": 5,
-    "atk": 10,
+		"mdef": 5,
-    "matk": 10,
+		"agi": 5,
-    "def": 10,
+		"luk": 0,
-    "mdef": 10,
+		"name": "群雄一",
-    "agi": 0,
+		"decription": "策防+5%，敏捷+5%，物防+5%"
-    "luk": 0
+	},
-  },
+	{
-  {
+		"camp": 4,
-    "camp": 3,
+		"num": 4,
-    "num": 5,
+		"atk": 0,
-    "hp": 15,
+		"matk": 0,
-    "atk": 15,
+		"def": 10,
-    "matk": 15,
+		"mdef": 10,
-    "def": 15,
+		"agi": 10,
-    "mdef": 15,
+		"luk": 0,
-    "agi": 0,
+		"name": "群雄二",
-    "luk": 0
+		"decription": "策防+10%，敏捷+10%，物防+10%"
-  },
+	},
-  {
+	{
-    "camp": 4,
+		"camp": 4,
-    "num": 2,
+		"num": 5,
-    "hp": 5,
+		"atk": 0,
-    "atk": 5,
+		"matk": 0,
-    "matk": 5,
+		"def": 15,
-    "def": 5,
+		"mdef": 15,
-    "mdef": 5,
+		"agi": 15,
-    "agi": 0,
+		"luk": 0,
-    "luk": 0
+		"name": "群雄三",
-  },
+		"decription": "策防+15%，敏捷+15%，物防+15%"
-  {
+	}
-    "camp": 4,
-    "num": 3,
-    "hp": 5,
-    "atk": 5,
-    "matk": 5,
-    "def": 5,
-    "mdef": 5,
-    "agi": 0,
-    "luk": 0
-  },
-  {
-    "camp": 4,
-    "num": 4,
-    "hp": 10,
-    "atk": 10,
-    "matk": 10,
-    "def": 10,
-    "mdef": 10,
-    "agi": 0,
-    "luk": 0
-  },
-  {
-    "camp": 4,
-    "num": 5,
-    "hp": 15,
-    "atk": 15,
-    "matk": 15,
-    "def": 15,
-    "mdef": 15,
-    "agi": 0,
-    "luk": 0
-  }
 ]

shared/resource/jsons/dic_zyz_dialogue.json

@@ -0,0 +1,154 @@
+[
+    {
+        "dialogueId": 1,
+        "leftCharId": 19,
+        "midCharId": 0,
+        "rightCharId": 53,
+        "bgId": 0,
+        "content": "&19\\n这地方真是不错，山清水秀的，说不定还有什么天材地宝呢。"
+    },
+    {
+        "dialogueId": 2,
+        "leftCharId": 53,
+        "midCharId": 0,
+        "rightCharId": 1008,
+        "bgId": 0,
+        "content": "&53\\n又是黄巾贼!受死！"
+    },
+    {
+        "dialogueId": 3,
+        "leftCharId": 0,
+        "midCharId": 1008,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&1008\\n女侠，饶命啊！\\n我愿意将所得财宝全部献给你，从此回家安心务农。\\n还请女侠放我一马。"
+    },
+    {
+        "dialogueId": 4,
+        "leftCharId": 0,
+        "midCharId": 1050,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&1050\\n少侠，老夫看你骨骼惊奇，相貌堂堂，现有一场富贵送你。\\n收下吧。"
+    },
+    {
+        "dialogueId": 5,
+        "leftCharId": 0,
+        "midCharId": 1008,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&1008\\n太平军在此！\\n尔等凡夫俗子快快将财宝献上，饶你们一命！\\n否则，送你们去见黄天！"
+    },
+    {
+        "dialogueId": 6,
+        "leftCharId": 0,
+        "midCharId": 19,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&19\\n黄巾小贼，劫掠百姓，受死吧！"
+    },
+    {
+        "dialogueId": 7,
+        "leftCharId": 0,
+        "midCharId": 1008,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&1008\\n呸！\\n看了几本传奇侠客就敢出来打抱不平。\\n还是回家喝奶去吧！哈哈哈哈！"
+    },
+    {
+        "dialogueId": 8,
+        "leftCharId": 1048,
+        "midCharId": 0,
+        "rightCharId": 1008,
+        "bgId": 0,
+        "content": "&1048\\n救命啊！有人劫色啊！"
+    },
+    {
+        "dialogueId": 9,
+        "leftCharId": 19,
+        "midCharId": 0,
+        "rightCharId": 53,
+        "bgId": 0,
+        "content": "&19\\n有人呼救！我们赶紧去看看发生了什么！"
+    },
+    {
+        "dialogueId": 10,
+        "leftCharId": 1048,
+        "midCharId": 0,
+        "rightCharId": 1008,
+        "bgId": 0,
+        "content": "&1008\\n嘿嘿嘿，小娘子~\\n安心和大爷一起去快活吧~"
+    },
+    {
+        "dialogueId": 11,
+        "leftCharId": 0,
+        "midCharId": 19,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&19\\n大胆色徒！"
+    },
+    {
+        "dialogueId": 12,
+        "leftCharId": 0,
+        "midCharId": 1048,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&1048\\n多谢公子相救，不然妾身清白……呜呜呜"
+    },
+    {
+        "dialogueId": 13,
+        "leftCharId": 0,
+        "midCharId": 1048,
+        "rightCharId": 0,
+        "bgId": 0,
+        "content": "&1048\\n妾身无以为报，只能……以这些钱财报答少侠救命之恩，还请不要推辞。"
+    },
+    {
+        "dialogueId": 14,
+        "leftCharId": 0,
+        "midCharId": 1008,
+        "rightCharId": 0,
+        "bgId": 2,
+        "content": "&1008\\n哪来的小鬼敢坏大爷好事！"
+    },
+    {
+        "dialogueId": 15,
+        "leftCharId": 0,
+        "midCharId": 1008,
+        "rightCharId": 0,
+        "bgId": 6,
+        "content": "&1008\\n可恶！那小娘子居然趁乱跑了……"
+    },
+    {
+        "dialogueId": 16,
+        "leftCharId": 0,
+        "midCharId": 14,
+        "rightCharId": 0,
+        "bgId": 7,
+        "content": "&14\\n行行重行行……\\n下一句该是什么呢…"
+    },
+    {
+        "dialogueId": 17,
+        "leftCharId": 19,
+        "midCharId": 0,
+        "rightCharId": 14,
+        "bgId": 6,
+        "content": "&14\\n啊，这位兄台，不好意思打搅了。\\n观兄台相貌堂堂，一表人才，在下有些诗句尚未摸透\\n能否请兄台帮在下解答一二？"
+    },
+    {
+        "dialogueId": 18,
+        "leftCharId": 0,
+        "midCharId": 14,
+        "rightCharId": 0,
+        "bgId": 6,
+        "content": "&14\\n兄台好文采！\\n在下收获颇多，真是多谢兄台了。\\n区区心意敢接兄台点播，希望兄台能够接受。"
+    },
+    {
+        "dialogueId": 19,
+        "leftCharId": 0,
+        "midCharId": 14,
+        "rightCharId": 0,
+        "bgId": 6,
+        "content": "&14\\n哈哈，兄台思路清奇，不落窠臼，让在下有所心得。\\n区区薄礼以作打扰兄台之赔偿，还请兄台收下。\\n在下先行离开了。"
+    }
+]

shared/resource/jsons/dic_zyz_eff_area.json

@@ -7,12 +7,12 @@
 	"mpid": 2,
 	"name": "近身伤害",
 	"cname": "攻击最多8个目标",
-	"json": "[{\"x\":0,\"y\":0},{\"x\":-1,\"y\":0},{\"x\":1,\"y\":0},{\"x\":0,\"y\":-1},{\"x\":0,\"y\":1},{\"x\":-1,\"y\":-1},{\"x\":1,\"y\":-1},{\"x\":-1,\"y\":1},{\"x\":1,\"y\":1}]"
+	"json": "[{\"x\":-1,\"y\":0},{\"x\":1,\"y\":0},{\"x\":0,\"y\":-1},{\"x\":0,\"y\":1},{\"x\":-1,\"y\":-1},{\"x\":1,\"y\":-1},{\"x\":-1,\"y\":1},{\"x\":1,\"y\":1}]"
 }, {
 	"mpid": 3,
 	"name": "远程伤害",
 	"cname": "攻击近中距12格",
-	"json": "[{\"x\":0,\"y\":0},{\"x\":-1,\"y\":0},{\"x\":1,\"y\":0},{\"x\":0,\"y\":-1},{\"x\":0,\"y\":1},{\"x\":-1,\"y\":-1},{\"x\":1,\"y\":-1},{\"x\":-1,\"y\":1},{\"x\":1,\"y\":1},{\"x\":-2,\"y\":0},{\"x\":2,\"y\":0},{\"x\":0,\"y\":-2},{\"x\":0,\"y\":2}]"
+	"json": "[{\"x\":-1,\"y\":0},{\"x\":1,\"y\":0},{\"x\":0,\"y\":-1},{\"x\":0,\"y\":1},{\"x\":-1,\"y\":-1},{\"x\":1,\"y\":-1},{\"x\":-1,\"y\":1},{\"x\":1,\"y\":1},{\"x\":-2,\"y\":0},{\"x\":2,\"y\":0},{\"x\":0,\"y\":-2},{\"x\":0,\"y\":2}]"
 }, {
 	"mpid": 4,
 	"name": "广域伤害",

shared/resource/jsons/dic_zyz_gk_event.json

@@ -2,8 +2,8 @@
     {
         "war_id": 2001,
         "dispatchJsonId": 2001,
-        "bg_img_id": 2001,
+        "bg_img_id": 604,
-        "script_id": 0,
+        "script_id": "&",
         "fixReward": "&",
         "warType": 3,
         "gk_name": "奇遇&拦路山贼",
@@ -14,14 +14,15 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消失所有敌军",
         "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "无",
         "cost": 15,
         "recommendedPower": 10008
     },
     {
         "war_id": 2002,
         "dispatchJsonId": 2002,
-        "bg_img_id": 2002,
+        "bg_img_id": 605,
-        "script_id": 0,
+        "script_id": "&",
         "fixReward": "&",
         "warType": 3,
         "gk_name": "奇遇&比武切磋",
@@ -32,17 +33,18 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消失所有敌军",
         "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "无",
         "cost": 15,
         "recommendedPower": 10008
     },
     {
         "war_id": 2003,
         "dispatchJsonId": 2003,
-        "bg_img_id": 2003,
+        "bg_img_id": 601,
-        "script_id": 0,
+        "script_id": "&",
         "fixReward": "&",
         "warType": 3,
-        "gk_name": "奇遇&比武切磋",
+        "gk_name": "奇遇&拦路山贼",
         "kingExp": 100,
         "lvLimted": 1,
         "turnLimted": 20,
@@ -50,6 +52,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消失所有敌军",
         "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "无",
         "cost": 15,
         "recommendedPower": 10008
     }

shared/resource/jsons/dic_zyz_gk_mainElite.json

@@ -1 +1,152 @@
-[{"war_id":9001,"dispatchJsonId":9001,"bg_img_id":107,"script_id":9001,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":12,"gk_name":"第一章&真定之战(精英)","kingExp":100,"lvLimted":3,"turnLimted":30,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"消灭所有敌军","loseInfoInUI":"我方全部阵亡","starInfoInUI":"1.我方无人阵亡；\n2.在5回合内获得胜利","cost":3,"sSpineInUI":"1&daobing|1&gongbing|2&lidian","recommendedPower":20000,"previousGk":107,"relatednormalGk":107}]
+[
+    {
+        "war_id": 9001,
+        "dispatchJsonId": 9001,
+        "bg_img_id": 107,
+        "script_id": "R_9001&S_9001",
+        "fixReward": "31001&1006",
+        "conditionReward": "16004&1&0|31002&50&0|31002&100&1",
+        "RandomReward": "17003&10&1|15013&1&3|17008&1&2",
+        "warType": 12,
+        "gk_name": "第一章&真定之战(精英)",
+        "kingExp": 100,
+        "lvLimted": 3,
+        "turnLimted": 30,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "cost": 3,
+        "heroInUI": "1&1001|1&1004|2&312",
+        "detailUIBg": "1_2",
+        "recommendedPower": 20000,
+        "previousGk": 107,
+        "relatednormalGk": 107
+    },
+    {
+        "war_id": 9002,
+        "dispatchJsonId": 9002,
+        "bg_img_id": 111,
+        "script_id": "R_9002&S_9002",
+        "fixReward": "31001&1006",
+        "conditionReward": "16004&1&0|31002&50&0|31002&100&1",
+        "RandomReward": "17003&10&1|15013&1&3|17008&1&2",
+        "warType": 12,
+        "gk_name": "第一章&真定之战(精英)",
+        "kingExp": 100,
+        "lvLimted": 3,
+        "turnLimted": 30,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "cost": 3,
+        "heroInUI": "1&1001|1&1004|2&312",
+        "detailUIBg": "1_3",
+        "recommendedPower": 20000,
+        "previousGk": 111,
+        "relatednormalGk": 111
+    },
+    {
+        "war_id": 9003,
+        "dispatchJsonId": 9003,
+        "bg_img_id": 115,
+        "script_id": "R_9003&S_9003",
+        "fixReward": "31001&1006",
+        "conditionReward": "16004&1&0|31002&50&0|31002&100&1",
+        "RandomReward": "17003&10&1|15013&1&3|17008&1&2",
+        "warType": 12,
+        "gk_name": "第一章&真定之战(精英)",
+        "kingExp": 100,
+        "lvLimted": 3,
+        "turnLimted": 30,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "cost": 3,
+        "heroInUI": "1&1001|1&1004|2&312",
+        "detailUIBg": "1_4",
+        "recommendedPower": 20000,
+        "previousGk": 115,
+        "relatednormalGk": 115
+    },
+    {
+        "war_id": 9004,
+        "dispatchJsonId": 9004,
+        "bg_img_id": 119,
+        "script_id": "R_9004&S_9004",
+        "fixReward": "31001&1006",
+        "conditionReward": "16004&1&0|31002&50&0|31002&100&1",
+        "RandomReward": "17003&10&1|15013&1&3|17008&1&2",
+        "warType": 12,
+        "gk_name": "第一章&真定之战(精英)",
+        "kingExp": 100,
+        "lvLimted": 3,
+        "turnLimted": 30,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "cost": 3,
+        "heroInUI": "1&1001|1&1004|2&312",
+        "detailUIBg": "1_5",
+        "recommendedPower": 20000,
+        "previousGk": 119,
+        "relatednormalGk": 119
+    },
+    {
+        "war_id": 9005,
+        "dispatchJsonId": 9005,
+        "bg_img_id": 123,
+        "script_id": "R_9005&S_9005",
+        "fixReward": "31001&1006",
+        "conditionReward": "16004&1&0|31002&50&0|31002&100&1",
+        "RandomReward": "17003&10&1|15013&1&3|17008&1&2",
+        "warType": 12,
+        "gk_name": "第一章&真定之战(精英)",
+        "kingExp": 100,
+        "lvLimted": 3,
+        "turnLimted": 30,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "cost": 3,
+        "heroInUI": "1&1001|1&1004|2&312",
+        "detailUIBg": "1_7",
+        "recommendedPower": 20000,
+        "previousGk": 123,
+        "relatednormalGk": 123
+    },
+    {
+        "war_id": 9006,
+        "dispatchJsonId": 9006,
+        "bg_img_id": 127,
+        "script_id": "R_9006&S_9006",
+        "fixReward": "31001&1006",
+        "conditionReward": "16004&1&0|31002&50&0|31002&100&1",
+        "RandomReward": "17003&10&1|15013&1&3|17008&1&2",
+        "warType": 12,
+        "gk_name": "第一章&真定之战(精英)",
+        "kingExp": 100,
+        "lvLimted": 3,
+        "turnLimted": 30,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "cost": 3,
+        "heroInUI": "1&1001|1&1004|2&312",
+        "detailUIBg": "1_8",
+        "recommendedPower": 20000,
+        "previousGk": 127,
+        "relatednormalGk": 127
+    }
+]

shared/resource/jsons/dic_zyz_map_terrain.json

@@ -1,332 +1,431 @@
 [
-  {
+	{
-    "mapid": 1,
+		"mapid": 1,
-    "name": "平原",
+		"name": "平原",
-    "music": 0,
+		"music": 0,
-    "type": 971,
+		"type": 971,
-    "int_hp": 0,
+		"int_hp": 0,
-    "int_mp": 0,
+		"int_mp": 0,
-    "percent_hp": 0,
+		"percent_hp": 0,
-    "percent_mp": 0
+		"percent_mp": 0,
-  },
+		"seid": 0,
-  {
+		"effect": 0,
-    "mapid": 2,
+		"description": "很平常的平原"
-    "name": "草原",
+	},
-    "music": 2,
+	{
-    "type": 971,
+		"mapid": 2,
-    "int_hp": 0,
+		"name": "草原",
-    "int_mp": 0,
+		"music": 2,
-    "percent_hp": 0,
+		"type": 971,
-    "percent_mp": 0
+		"int_hp": 0,
-  },
+		"int_mp": 0,
-  {
+		"percent_hp": 0,
-    "mapid": 3,
+		"percent_mp": 0,
-    "name": "树林",
+		"seid": 0,
-    "music": 2,
+		"effect": 0,
-    "type": 971,
+		"description": "很平常的草原"
-    "int_hp": 0,
+	},
-    "int_mp": 0,
+	{
-    "percent_hp": 0,
+		"mapid": 3,
-    "percent_mp": 0
+		"name": "树林",
-  },
+		"music": 2,
-  {
+		"type": 971,
-    "mapid": 4,
+		"int_hp": 0,
-    "name": "荒地",
+		"int_mp": 0,
-    "music": 0,
+		"percent_hp": 0,
-    "type": 973,
+		"percent_mp": 0,
-    "int_hp": 0,
+		"seid": 0,
-    "int_mp": 0,
+		"effect": 0,
-    "percent_hp": 0,
+		"description": "很平常的树林"
-    "percent_mp": 0
+	},
-  },
+	{
-  {
+		"mapid": 4,
-    "mapid": 5,
+		"name": "荒地",
-    "name": "山地",
+		"music": 0,
-    "music": 0,
+		"type": 973,
-    "type": 973,
+		"int_hp": 0,
-    "int_hp": 0,
+		"int_mp": 0,
-    "int_mp": 0,
+		"percent_hp": 0,
-    "percent_hp": 0,
+		"percent_mp": 0,
-    "percent_mp": 0
+		"seid": 0,
-  },
+		"effect": 0,
-  {
+		"description": "很平常的荒地"
-    "mapid": 6,
+	},
-    "name": "岩山",
+	{
-    "music": 0,
+		"mapid": 5,
-    "type": 973,
+		"name": "山地",
-    "int_hp": 0,
+		"music": 0,
-    "int_mp": 0,
+		"type": 973,
-    "percent_hp": 0,
+		"int_hp": 0,
-    "percent_mp": 0
+		"int_mp": 0,
-  },
+		"percent_hp": 0,
-  {
+		"percent_mp": 0,
-    "mapid": 7,
+		"seid": 0,
-    "name": "沙漠",
+		"effect": 0,
-    "music": 0,
+		"description": "很平常的山地"
-    "type": 973,
+	},
-    "int_hp": 0,
+	{
-    "int_mp": 0,
+		"mapid": 6,
-    "percent_hp": 0,
+		"name": "岩山",
-    "percent_mp": 0
+		"music": 0,
-  },
+		"type": 973,
-  {
+		"int_hp": 0,
-    "mapid": 8,
+		"int_mp": 0,
-    "name": "雪原",
+		"percent_hp": 0,
-    "music": 1,
+		"percent_mp": 0,
-    "type": 972,
+		"seid": 0,
-    "int_hp": 0,
+		"effect": 0,
-    "int_mp": 0,
+		"description": "很平常的岩山"
-    "percent_hp": 0,
+	},
-    "percent_mp": 0
+	{
-  },
+		"mapid": 7,
-  {
+		"name": "沙漠",
-    "mapid": 9,
+		"music": 0,
-    "name": "桥梁",
+		"type": 973,
-    "music": 0,
+		"int_hp": 0,
-    "type": 972,
+		"int_mp": 0,
-    "int_hp": 0,
+		"percent_hp": 0,
-    "int_mp": 0,
+		"percent_mp": 0,
-    "percent_hp": 0,
+		"seid": 0,
-    "percent_mp": 0
+		"effect": 0,
-  },
+		"description": "很平常的沙漠"
-  {
+	},
-    "mapid": 10,
+	{
-    "name": "浅滩",
+		"mapid": 8,
-    "music": 3,
+		"name": "雪原",
-    "type": 972,
+		"music": 1,
-    "int_hp": 0,
+		"type": 972,
-    "int_mp": 0,
+		"int_hp": 0,
-    "percent_hp": 0,
+		"int_mp": 0,
-    "percent_mp": 0
+		"percent_hp": 0,
-  },
+		"percent_mp": 0,
-  {
+		"seid": 0,
-    "mapid": 11,
+		"effect": 0,
-    "name": "沼泽",
+		"description": "很平常的雪原"
-    "music": 3,
+	},
-    "type": 972,
+	{
-    "int_hp": 0,
+		"mapid": 9,
-    "int_mp": 0,
+		"name": "桥梁",
-    "percent_hp": 0,
+		"music": 0,
-    "percent_mp": 0
+		"type": 972,
-  },
+		"int_hp": 0,
-  {
+		"int_mp": 0,
-    "mapid": 12,
+		"percent_hp": 0,
-    "name": "池塘",
+		"percent_mp": 0,
-    "music": 0,
+		"seid": 0,
-    "type": 972,
+		"effect": 0,
-    "int_hp": 0,
+		"description": "很平常的桥梁"
-    "int_mp": 0,
+	},
-    "percent_hp": 0,
+	{
-    "percent_mp": 0
+		"mapid": 10,
-  },
+		"name": "浅滩",
-  {
+		"music": 3,
-    "mapid": 13,
+		"type": 972,
-    "name": "小河",
+		"int_hp": 0,
-    "music": 0,
+		"int_mp": 0,
-    "type": 972,
+		"percent_hp": 0,
-    "int_hp": 0,
+		"percent_mp": 0,
-    "int_mp": 0,
+		"seid": 0,
-    "percent_hp": 0,
+		"effect": 0,
-    "percent_mp": 0
+		"description": "很平常的浅滩"
-  },
+	},
-  {
+	{
-    "mapid": 14,
+		"mapid": 11,
-    "name": "大河",
+		"name": "沼泽",
-    "music": 4,
+		"music": 3,
-    "type": 972,
+		"type": 972,
-    "int_hp": 0,
+		"int_hp": 0,
-    "int_mp": 0,
+		"int_mp": 0,
-    "percent_hp": 0,
+		"percent_hp": 0,
-    "percent_mp": 0
+		"percent_mp": 0,
-  },
+		"seid": 0,
-  {
+		"effect": 0,
-    "mapid": 15,
+		"description": "很平常的沼泽"
-    "name": "栅栏",
+	},
-    "music": 0,
+	{
-    "type": 976,
+		"mapid": 12,
-    "int_hp": 0,
+		"name": "池塘",
-    "int_mp": 0,
+		"music": 0,
-    "percent_hp": 0,
+		"type": 972,
-    "percent_mp": 0
+		"int_hp": 0,
-  },
+		"int_mp": 0,
-  {
+		"percent_hp": 0,
-    "mapid": 16,
+		"percent_mp": 0,
-    "name": "城墙",
+		"seid": 0,
-    "music": 0,
+		"effect": 0,
-    "type": 976,
+		"description": "很平常的池塘"
-    "int_hp": 0,
+	},
-    "int_mp": 0,
+	{
-    "percent_hp": 0,
+		"mapid": 13,
-    "percent_mp": 0
+		"name": "小河",
-  },
+		"music": 0,
-  {
+		"type": 972,
-    "mapid": 17,
+		"int_hp": 0,
-    "name": "城内",
+		"int_mp": 0,
-    "music": 0,
+		"percent_hp": 0,
-    "type": 974,
+		"percent_mp": 0,
-    "int_hp": 0,
+		"seid": 0,
-    "int_mp": 0,
+		"effect": 0,
-    "percent_hp": 0,
+		"description": "很平常的小河"
-    "percent_mp": 0
+	},
-  },
+	{
-  {
+		"mapid": 14,
-    "mapid": 18,
+		"name": "大河",
-    "name": "城门",
+		"music": 4,
-    "music": 0,
+		"type": 972,
-    "type": 974,
+		"int_hp": 0,
-    "int_hp": 0,
+		"int_mp": 0,
-    "int_mp": 0,
+		"percent_hp": 0,
-    "percent_hp": 0,
+		"percent_mp": 0,
-    "percent_mp": 0
+		"seid": 0,
-  },
+		"effect": 0,
-  {
+		"description": "很平常的大河"
-    "mapid": 19,
+	},
-    "name": "城池",
+	{
-    "music": 0,
+		"mapid": 15,
-    "type": 975,
+		"name": "栅栏",
-    "int_hp": 0,
+		"music": 0,
-    "int_mp": 0,
+		"type": 976,
-    "percent_hp": 10,
+		"int_hp": 0,
-    "percent_mp": 0
+		"int_mp": 0,
-  },
+		"percent_hp": 0,
-  {
+		"percent_mp": 0,
-    "mapid": 20,
+		"seid": 0,
-    "name": "关隘",
+		"effect": 0,
-    "music": 0,
+		"description": "很平常的栅栏"
-    "type": 975,
+	},
-    "int_hp": 0,
+	{
-    "int_mp": 0,
+		"mapid": 16,
-    "percent_hp": 10,
+		"name": "城墙",
-    "percent_mp": 0
+		"music": 0,
-  },
+		"type": 976,
-  {
+		"int_hp": 0,
-    "mapid": 21,
+		"int_mp": 0,
-    "name": "鹿砦",
+		"percent_hp": 0,
-    "music": 0,
+		"percent_mp": 0,
-    "type": 975,
+		"seid": 0,
-    "int_hp": 0,
+		"effect": 0,
-    "int_mp": 0,
+		"description": "很平常的城墙"
-    "percent_hp": 10,
+	},
-    "percent_mp": 0
+	{
-  },
+		"mapid": 17,
-  {
+		"name": "城内",
-    "mapid": 22,
+		"music": 0,
-    "name": "村庄",
+		"type": 974,
-    "music": 0,
+		"int_hp": 0,
-    "type": 975,
+		"int_mp": 0,
-    "int_hp": 0,
+		"percent_hp": 0,
-    "int_mp": 0,
+		"percent_mp": 0,
-    "percent_hp": 10,
+		"seid": 0,
-    "percent_mp": 0
+		"effect": 0,
-  },
+		"description": "很平常的城内"
-  {
+	},
-    "mapid": 23,
+	{
-    "name": "兵营",
+		"mapid": 18,
-    "music": 0,
+		"name": "城门",
-    "type": 975,
+		"music": 0,
-    "int_hp": 0,
+		"type": 974,
-    "int_mp": 0,
+		"int_hp": 0,
-    "percent_hp": 10,
+		"int_mp": 0,
-    "percent_mp": 0
+		"percent_hp": 0,
-  },
+		"percent_mp": 0,
-  {
+		"seid": 0,
-    "mapid": 24,
+		"effect": 0,
-    "name": "民居",
+		"description": "很平常的城门"
-    "music": 0,
+	},
-    "type": 975,
+	{
-    "int_hp": 0,
+		"mapid": 19,
-    "int_mp": 0,
+		"name": "城池",
-    "percent_hp": 0,
+		"music": 0,
-    "percent_mp": 0
+		"type": 975,
-  },
+		"int_hp": 0,
-  {
+		"int_mp": 0,
-    "mapid": 25,
+		"percent_hp": 10,
-    "name": "宝物库",
+		"percent_mp": 0,
-    "music": 0,
+		"seid": 0,
-    "type": 975,
+		"effect": 0,
-    "int_hp": 0,
+		"description": "很平常的城池"
-    "int_mp": 0,
+	},
-    "percent_hp": 10,
+	{
-    "percent_mp": 0
+		"mapid": 20,
-  },
+		"name": "关隘",
-  {
+		"music": 0,
-    "mapid": 26,
+		"type": 975,
-    "name": "祭坛",
+		"int_hp": 0,
-    "music": 0,
+		"int_mp": 0,
-    "type": 976,
+		"percent_hp": 10,
-    "int_hp": 0,
+		"percent_mp": 0,
-    "int_mp": 0,
+		"seid": 0,
-    "percent_hp": 0,
+		"effect": 0,
-    "percent_mp": 0
+		"description": "很平常的关隘"
-  },
+	},
-  {
+	{
-    "mapid": 27,
+		"mapid": 21,
-    "name": "火",
+		"name": "鹿砦",
-    "music": 0,
+		"music": 0,
-    "type": 976,
+		"type": 975,
-    "int_hp": 0,
+		"int_hp": 0,
-    "int_mp": 0,
+		"int_mp": 0,
-    "percent_hp": 0,
+		"percent_hp": 10,
-    "percent_mp": 0
+		"percent_mp": 0,
-  },
+		"seid": 0,
-  {
+		"effect": 0,
-    "mapid": 28,
+		"description": "很平常的鹿砦"
-    "name": "船",
+	},
-    "music": 0,
+	{
-    "type": 976,
+		"mapid": 22,
-    "int_hp": 0,
+		"name": "村庄",
-    "int_mp": 0,
+		"music": 0,
-    "percent_hp": 0,
+		"type": 975,
-    "percent_mp": 0
+		"int_hp": 0,
-  },
+		"int_mp": 0,
-  {
+		"percent_hp": 10,
-    "mapid": 29,
+		"percent_mp": 0,
-    "name": "冰面",
+		"seid": 0,
-    "music": 0,
+		"effect": 0,
-    "type": 976,
+		"description": "很平常的村庄"
-    "int_hp": 0,
+	},
-    "int_mp": 0,
+	{
-    "percent_hp": 0,
+		"mapid": 23,
-    "percent_mp": 0
+		"name": "兵营",
-  },
+		"music": 0,
-  {
+		"type": 975,
-    "mapid": 30,
+		"int_hp": 0,
-    "name": "边界",
+		"int_mp": 0,
-    "music": 0,
+		"percent_hp": 10,
-    "type": 976,
+		"percent_mp": 0,
-    "int_hp": 0,
+		"seid": 0,
-    "int_mp": 0,
+		"effect": 0,
-    "percent_hp": 0,
+		"description": "很平常的兵营"
-    "percent_mp": 0
+	},
-  },
+	{
-  {
+		"mapid": 24,
-    "mapid": 31,
+		"name": "民居",
-    "name": "泉水",
+		"music": 0,
-    "music": 0,
+		"type": 975,
-    "type": 976,
+		"int_hp": 0,
-    "int_hp": 0,
+		"int_mp": 0,
-    "int_mp": 0,
+		"percent_hp": 0,
-    "percent_hp": 0,
+		"percent_mp": 0,
-    "percent_mp": 0
+		"seid": 0,
-  },
+		"effect": 0,
-  {
+		"description": "很平常的民居"
-    "mapid": 32,
+	},
-    "name": "火堆",
+	{
-    "music": 0,
+		"mapid": 25,
-    "type": 976,
+		"name": "宝物库",
-    "int_hp": 0,
+		"music": 0,
-    "int_mp": 0,
+		"type": 975,
-    "percent_hp": 0,
+		"int_hp": 0,
-    "percent_mp": 0
+		"int_mp": 0,
-  },
+		"percent_hp": 10,
-  {
+		"percent_mp": 0,
-    "mapid": 33,
+		"seid": 0,
-    "name": "冰面",
+		"effect": 0,
-    "music": 0,
+		"description": "很平常的宝物库"
-    "type": 976,
+	},
-    "int_hp": 0,
+	{
-    "int_mp": 0,
+		"mapid": 26,
-    "percent_hp": 0,
+		"name": "祭坛",
-    "percent_mp": 0
+		"music": 0,
-  }
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的祭坛"
+	},
+	{
+		"mapid": 27,
+		"name": "火",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的火"
+	},
+	{
+		"mapid": 28,
+		"name": "船",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的船"
+	},
+	{
+		"mapid": 29,
+		"name": "冰面",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的冰面"
+	},
+	{
+		"mapid": 30,
+		"name": "边界",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的边界"
+	},
+	{
+		"mapid": 31,
+		"name": "泉水",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的泉水"
+	},
+	{
+		"mapid": 32,
+		"name": "火堆",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的火堆"
+	},
+	{
+		"mapid": 33,
+		"name": "冰面",
+		"music": 0,
+		"type": 976,
+		"int_hp": 0,
+		"int_mp": 0,
+		"percent_hp": 0,
+		"percent_mp": 0,
+		"seid": 0,
+		"effect": 0,
+		"description": "很平常的冰面"
+	}
 ]

shared/resource/jsons/dic_zyz_movePoint.json

@@ -0,0 +1,234 @@
+[
+    {
+        "pointId": 1,
+        "position": "-1212&1273",
+        "previousPoint": "1&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "出生点"
+    },
+    {
+        "pointId": 2,
+        "position": "-1068&1253",
+        "previousPoint": "1&",
+        "wayPoints": "-1198&1278",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 3,
+        "position": "-969&1524",
+        "previousPoint": "2&26",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 4,
+        "position": "-880&1621",
+        "previousPoint": "3&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 5,
+        "position": "-601&1781",
+        "previousPoint": "4&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&真定之战"
+    },
+    {
+        "pointId": 6,
+        "position": "-558&1561",
+        "previousPoint": "5&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 7,
+        "position": "-555&1363",
+        "previousPoint": "6&28",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 8,
+        "position": "-566&1172",
+        "previousPoint": "7&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 9,
+        "position": "-702&993",
+        "previousPoint": "8&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&巨鹿之战"
+    },
+    {
+        "pointId": 10,
+        "position": "-370&919",
+        "previousPoint": "9&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 11,
+        "position": "-252&1158",
+        "previousPoint": "10&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 12,
+        "position": "-206&1353",
+        "previousPoint": "11&27",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 13,
+        "position": "-247&1627",
+        "previousPoint": "12&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&河间之战"
+    },
+    {
+        "pointId": 14,
+        "position": "-3&1568",
+        "previousPoint": "13&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 15,
+        "position": "201&1548",
+        "previousPoint": "14&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 16,
+        "position": "369&1606",
+        "previousPoint": "15&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 17,
+        "position": "633&1739",
+        "previousPoint": "16&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&渤海之战"
+    },
+    {
+        "pointId": 18,
+        "position": "501&1471",
+        "previousPoint": "17&29",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 19,
+        "position": "355&1237",
+        "previousPoint": "18&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 20,
+        "position": "178&953",
+        "previousPoint": "19&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 21,
+        "position": "-112&798",
+        "previousPoint": "20&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&界桥之战"
+    },
+    {
+        "pointId": 22,
+        "position": "-389&598",
+        "previousPoint": "21&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 23,
+        "position": "-574&517",
+        "previousPoint": "22&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 24,
+        "position": "-810&461",
+        "previousPoint": "23&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&拦路官军"
+    },
+    {
+        "pointId": 25,
+        "position": "-1100&511",
+        "previousPoint": "24&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&邺城之战"
+    },
+    {
+        "pointId": 26,
+        "position": "-965&1687",
+        "previousPoint": "3&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&奇遇点1"
+    },
+    {
+        "pointId": 27,
+        "position": "-368&1892",
+        "previousPoint": "12&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&奇遇点2"
+    },
+    {
+        "pointId": 28,
+        "position": "-769&1158",
+        "previousPoint": "7&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&奇遇点3"
+    },
+    {
+        "pointId": 29,
+        "position": "542&1289",
+        "previousPoint": "18&",
+        "wayPoints": "&",
+        "chapater": 1,
+        "tips": "第一章&奇遇点4"
+    }
+]

shared/resource/jsons/dic_zyz_se_add.json

@@ -1,120 +1,162 @@
-[{
+[
-	"type": 1,
+	{
-	"isSeid": 0,
+		"type": 1,
-	"isBuff": 1,
+		"isSeid": 0,
-	"isHalo": 0,
+		"isBuff": 1,
-	"olyType": 102,
+		"isHalo": 0,
-	"haloObject": 0
+		"olyType": 102,
-}, {
+		"haloObject": 0
-	"type": 18,
+	},
-	"isSeid": 0,
+	{
-	"isBuff": 1,
+		"type": 5,
-	"isHalo": 0,
+		"isSeid": 0,
-	"olyType": 101,
+		"isBuff": 1,
-	"haloObject": 0
+		"isHalo": 0,
-},{
+		"olyType": 102,
-	"type": 27,
+		"haloObject": 0
-	"isSeid": 0,
+	},
-	"isBuff": 1,
+	{
-	"isHalo": 0,
+		"type": 8,
-	"olyType": 101,
+		"isSeid": 0,
-	"haloObject": 0
+		"isBuff": 1,
-}, {
+		"isHalo": 0,
-	"type": 35,
+		"olyType": 102,
-	"isSeid": 1,
+		"haloObject": 0
-	"isBuff": 0,
+	},
-	"isHalo": 0,
+	{
-	"olyType": 102,
+		"type": 13,
-	"haloObject": 0
+		"isSeid": 0,
-}, {
+		"isBuff": 1,
-	"type": 34,
+		"isHalo": 0,
-	"isSeid": 0,
+		"olyType": 102,
-	"isBuff": 1,
+		"haloObject": 0
-	"isHalo": 0,
+	},
-	"olyType": 101,
+	{
-	"haloObject": 0
+		"type": 18,
-}, {
+		"isSeid": 0,
-	"type": 101,
+		"isBuff": 1,
-	"isSeid": 1,
+		"isHalo": 0,
-	"isBuff": 0,
+		"olyType": 101,
-	"isHalo": 0,
+		"haloObject": 0
-	"olyType": 101,
+	},
-	"haloObject": 0
+	{
-}, {
+		"type": 21,
-	"type": 102,
+		"isSeid": 0,
-	"isSeid": 1,
+		"isBuff": 1,
-	"isBuff": 0,
+		"isHalo": 0,
-	"isHalo": 0,
+		"olyType": 101,
-	"olyType": 101,
+		"haloObject": 0
-	"haloObject": 0
+	},
-}, {
+	{
-	"type": 31,
+		"type": 22,
-	"isSeid": 0,
+		"isSeid": 0,
-	"isBuff": 1,
+		"isBuff": 1,
-	"isHalo": 0,
+		"isHalo": 0,
-	"olyType": 101,
+		"olyType": 101,
-	"haloObject": 0
+		"haloObject": 0
-}, {
+	},
-	"type": 22,
+	{
-	"isSeid": 0,
+		"type": 27,
-	"isBuff": 1,
+		"isSeid": 0,
-	"isHalo": 0,
+		"isBuff": 1,
-	"olyType": 101,
+		"isHalo": 0,
-	"haloObject": 0
+		"olyType": 101,
-}, {
+		"haloObject": 0
-	"type": 435,
+	},
-	"isSeid": 1,
+	{
-	"isBuff": 0,
+		"type": 28,
-	"isHalo": 0,
+		"isSeid": 0,
-	"olyType": 101,
+		"isBuff": 1,
-	"haloObject": 0
+		"isHalo": 0,
-}, {
+		"olyType": 101,
-	"type": 13,
+		"haloObject": 0
-	"isSeid": 0,
+	},
-	"isBuff": 1,
+	{
-	"isHalo": 0,
+		"type": 31,
-	"olyType": 102,
+		"isSeid": 0,
-	"haloObject": 0
+		"isBuff": 1,
-}, {
+		"isHalo": 0,
-	"type": 303,
+		"olyType": 101,
-	"isSeid": 1,
+		"haloObject": 0
-	"isBuff": 0,
+	},
-	"isHalo": 0,
+	{
-	"olyType": 101,
+		"type": 32,
-	"haloObject": 0
+		"isSeid": 0,
-}, {
+		"isBuff": 1,
-	"type": 8,
+		"isHalo": 0,
-	"isSeid": 0,
+		"olyType": 101,
-	"isBuff": 1,
+		"haloObject": 0
-	"isHalo": 0,
+	},
-	"olyType": 102,
+	{
-	"haloObject": 0
+		"type": 33,
-}, {
+		"isSeid": 0,
-	"type": 312,
+		"isBuff": 1,
-	"isSeid": 1,
+		"isHalo": 0,
-	"isBuff": 0,
+		"olyType": 101,
-	"isHalo": 0,
+		"haloObject": 0
-	"olyType": 101,
+	},
-	"haloObject": 0
+	{
-}, {
+		"type": 34,
-	"type": 5,
+		"isSeid": 0,
-	"isSeid": 0,
+		"isBuff": 1,
-	"isBuff": 1,
+		"isHalo": 0,
-	"isHalo": 0,
+		"olyType": 101,
-	"olyType": 102,
+		"haloObject": 0
-	"haloObject": 0
+	},
-}, {
+	{
-	"type": 32,
+		"type": 35,
-	"isSeid": 0,
+		"isSeid": 1,
-	"isBuff": 1,
+		"isBuff": 0,
-	"isHalo": 0,
+		"isHalo": 0,
-	"olyType": 101,
+		"olyType": 102,
-	"haloObject": 0
+		"haloObject": 0
-}, {
+	},
-	"type": 114,
+	{
-	"isSeid": 1,
+		"type": 101,
-	"isBuff": 0,
+		"isSeid": 1,
-	"isHalo": 0,
+		"isBuff": 0,
-	"olyType": 101,
+		"isHalo": 0,
-	"haloObject": 0
+		"olyType": 101,
-}]
+		"haloObject": 0
+	},
+	{
+		"type": 102,
+		"isSeid": 1,
+		"isBuff": 0,
+		"isHalo": 0,
+		"olyType": 101,
+		"haloObject": 0
+	},
+	{
+		"type": 114,
+		"isSeid": 1,
+		"isBuff": 0,
+		"isHalo": 0,
+		"olyType": 101,
+		"haloObject": 0
+	},
+	{
+		"type": 303,
+		"isSeid": 1,
+		"isBuff": 0,
+		"isHalo": 0,
+		"olyType": 101,
+		"haloObject": 0
+	},
+	{
+		"type": 312,
+		"isSeid": 1,
+		"isBuff": 0,
+		"isHalo": 0,
+		"olyType": 101,
+		"haloObject": 0
+	},
+	{
+		"type": 435,
+		"isSeid": 1,
+		"isBuff": 0,
+		"isHalo": 0,
+		"olyType": 101,
+		"haloObject": 0
+	}
+]

shared/resource/jsons/dic_zyz_skill.json

@@ -1,256 +1,308 @@
 [
-  {
+	{
-    "id": 1,
+		"id": 1,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"name": "砍一刀",
-    "gain_formula": "&",
+		"hurt_formula": "ownAtk*200%-oppoDef*100",
-    "rage_cost": 100,
+		"gain_formula": "&",
-    "cd": 0,
+		"rage_cost": 100,
-    "attack_area": 2,
+		"cd": 0,
-    "strike_area": 2,
+		"attack_area": 2,
-    "object": 0,
+		"strike_area": 2,
-    "skill_class": 1,
+		"object": 0,
-    "effect": "1&",
+		"skill_class": 1,
-    "actionName": "skill1",
+		"effect": "1&",
-    "secondActionName": "&"
+		"actionName": "skill1",
-  },
+		"secondActionName": "&",
-  {
+		"skill_info": "大伤害技能",
-    "id": 2,
+		"skilNameImage": 0,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"skillSceneSpine": "nuqiguochang"
-    "gain_formula": "&",
+	},
-    "rage_cost": 100,
+	{
-    "cd": 0,
+		"id": 2,
-    "attack_area": 5,
+		"name": "无双画戟",
-    "strike_area": 2,
+		"hurt_formula": "ownAtk*200%-oppoDef*100",
-    "object": 0,
+		"gain_formula": "&",
-    "skill_class": 1,
+		"rage_cost": 100,
-    "effect": "3348&",
+		"cd": 0,
-    "actionName": "skill1",
+		"attack_area": 5,
-    "secondActionName": "skill1_B"
+		"strike_area": 2,
-  },
+		"object": 0,
-  {
+		"skill_class": 1,
-    "id": 3,
+		"effect": "3348&",
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"actionName": "skill1",
-    "gain_formula": "&",
+		"secondActionName": "skill1_B",
-    "rage_cost": 0,
+		"skill_info": "猛击地面造成200%的范围伤害，范围内人数越多总伤害越高，同时给目标添加封怒的以及物攻下降效果，命中的目标会降低少量怒气",
-    "cd": 3,
+		"skilNameImage": 0,
-    "attack_area": 1,
+		"skillSceneSpine": "nuqiguochang"
-    "strike_area": 1,
+	},
-    "object": 0,
+	{
-    "skill_class": 2,
+		"id": 3,
-    "effect": "3352&",
+		"name": "温侯斩",
-    "actionName": "skill2",
+		"hurt_formula": "ownAtk*200%-oppoDef*100",
-    "secondActionName": "&"
+		"gain_formula": "&",
-
+		"rage_cost": 0,
-  },
+		"cd": 3,
-  {
+		"attack_area": 1,
-    "id": 4,
+		"strike_area": 1,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"object": 0,
-    "gain_formula": "&",
+		"skill_class": 2,
-    "rage_cost": 100,
+		"effect": "3352&",
-    "cd": 0,
+		"actionName": "skill2",
-    "attack_area": 2,
+		"secondActionName": "&",
-    "strike_area": 1,
+		"skill_info": "对敌人连续攻击两次，每击造成200%的伤害",
-    "object": 0,
+		"skilNameImage": 0,
-    "skill_class": 1,
+		"skillSceneSpine": "&"
-    "effect": "3068&",
+	},
-    "actionName": "skill1",
+	{
-    "secondActionName": "&",
+		"id": 4,
-    "oppoSecondActionName": "skill1_B"
+		"name": "长枪投射",
-
+		"hurt_formula": "ownAtk*200%-oppoDef*100",
-  },
+		"gain_formula": "&",
-  {
+		"rage_cost": 100,
-    "id": 5,
+		"cd": 0,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100)*0.2",
+		"attack_area": 2,
-    "gain_formula": "&",
+		"strike_area": 1,
-    "rage_cost": 0,
+		"object": 0,
-    "cd": 3,
+		"skill_class": 1,
-    "attack_area": 5,
+		"effect": "3068&",
-    "strike_area": 1,
+		"actionName": "skill1",
-    "object": 1,
+		"secondActionName": "skill1_B",
-    "skill_class": 2,
+		"skill_info": "远距离投射长枪，对目标造成200%的伤害，目标为策略职业时，伤害提升20%，并且给目标添加一个策略伤害加深降低10%的效果，持续4回合",
-    "effect": "4002&",
+		"skilNameImage": 1,
-    "actionName": "skill2",
+		"skillSceneSpine": "nuqiguochang"
-    "secondActionName": "&"
+	},
-
+	{
-  },
+		"id": 5,
-  {
+		"name": "赦免",
-    "id": 6,
+		"hurt_formula": 0,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"gain_formula": "&",
-    "gain_formula": "&",
+		"rage_cost": 0,
-    "rage_cost": 100,
+		"cd": 3,
-    "cd": 0,
+		"attack_area": 5,
-    "attack_area": 4,
+		"strike_area": 1,
-    "strike_area": 1,
+		"object": 1,
-    "object": 0,
+		"skill_class": 2,
-    "skill_class": 1,
+		"effect": "3072&",
-    "effect": "3092&",
+		"actionName": "skill2",
-    "actionName": "skill1",
+		"secondActionName": "&",
-    "secondActionName": "&"
+		"skill_info": "回复自身10%生命值，并且自身的策略伤害减免上升20%，持续2回合",
-
+		"skilNameImage": 0,
-  },
+		"skillSceneSpine": "&"
-  {
+	},
-    "id": 7,
+	{
-    "hurt_formula": "0",
+		"id": 6,
-    "gain_formula": "&",
+		"name": "连珠三箭",
-    "rage_cost": 0,
+		"hurt_formula": "ownAtk*120%-oppoDef*100",
-    "cd": 3,
+		"gain_formula": "&",
-    "attack_area": 2,
+		"rage_cost": 100,
-    "strike_area": 1,
+		"cd": 0,
-    "object": 1,
+		"attack_area": 4,
-    "skill_class": 2,
+		"strike_area": 4,
-    "effect": "3096&",
+		"object": 0,
-    "actionName": "skill2",
+		"skill_class": 1,
-    "secondActionName": "&"
+		"effect": "3092&",
-
+		"actionName": "skill1",
-  },
+		"secondActionName": "&",
-  {
+		"skill_info": "对范围内的多个目标（最多3个）造成120%的伤害，被攻击目标有33%的概率获得一个物理伤害加深减少25%的减益效果，持续4回合",
-    "id": 8,
+		"skilNameImage": 2,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"skillSceneSpine": "nuqiguochang"
-    "gain_formula": "&",
+	},
-    "rage_cost": 100,
+	{
-    "cd": 0,
+		"id": 7,
-    "attack_area": 2,
+		"name": "鼓舞",
-    "strike_area": 1,
+		"hurt_formula": 0,
-    "object": 0,
+		"gain_formula": "&",
-    "skill_class": 1,
+		"rage_cost": 0,
-    "effect": "3108&",
+		"cd": 3,
-    "actionName": "skill1",
+		"attack_area": 2,
-    "secondActionName": "&"
+		"strike_area": 1,
-
+		"object": 1,
-  },
+		"skill_class": 2,
-  {
+		"effect": "3096&",
-    "id": 9,
+		"actionName": "skill2",
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"secondActionName": "&",
-    "gain_formula": "&",
+		"skill_info": "使我方指定目标获得幸运提升20%的效果，持续4回合",
-    "rage_cost": 0,
+		"skilNameImage": 0,
-    "cd": 3,
+		"skillSceneSpine": "&"
-    "attack_area": 2,
+	},
-    "strike_area": 1,
+	{
-    "object": 0,
+		"id": 8,
-    "skill_class": 2,
+		"name": "猛毒迷雾",
-    "effect": "3112&",
+		"hurt_formula": "ownMAtk*200%-oppoMDef*100",
-    "actionName": "skill2",
+		"gain_formula": "&",
-    "secondActionName": "&"
+		"rage_cost": 100,
-
+		"cd": 0,
-  },
+		"attack_area": 2,
-  {
+		"strike_area": 4,
-    "id": 10,
+		"object": 0,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"skill_class": 1,
-    "gain_formula": "&",
+		"effect": "3108&",
-    "rage_cost": 100,
+		"actionName": "skill1",
-    "cd": 0,
+		"secondActionName": "&",
-    "attack_area": 3,
+		"skill_info": "对目标进行毒雾攻击，造成200%伤害，附加中毒效果，造成每回合25%策攻伤害，持续4回合，对已有中毒效果的单位立即生成一段毒伤害，同时降低目标20%的敏捷，持续3回合",
-    "strike_area": 1,
+		"skilNameImage": 3,
-    "object": 0,
+		"skillSceneSpine": "nuqiguochang"
-    "skill_class": 1,
+	},
-    "effect": "3116&",
+	{
-    "actionName": "skill1",
+		"id": 9,
-    "secondActionName": "skill1_B"
+		"name": "投毒",
-
+		"hurt_formula": "ownMAtk*200%-oppoMDef*100",
-  },
+		"gain_formula": "&",
-  {
+		"rage_cost": 0,
-    "id": 11,
+		"cd": 3,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100)*0.2",
+		"attack_area": 2,
-    "gain_formula": "&",
+		"strike_area": 1,
-    "rage_cost": 0,
+		"object": 0,
-    "cd": 3,
+		"skill_class": 2,
-    "attack_area": 5,
+		"effect": "3112&",
-    "strike_area": 1,
+		"actionName": "skill2",
-    "object": 1,
+		"secondActionName": "&",
-    "skill_class": 2,
+		"skill_info": "对目标下毒，造成200%伤害，附加中毒效果，造成每回合25%策攻伤害，持续4回合，对已有中毒效果的单位立即生成一段毒伤害",
-    "effect": "3120&",
+		"skilNameImage": 0,
-    "actionName": "skill2",
+		"skillSceneSpine": "&"
-    "secondActionName": "&"
+	},
-
+	{
-  },
+		"id": 10,
-  {
+		"name": "巨锤震击",
-    "id": 12,
+		"hurt_formula": "ownAtk*200%-oppoDef*100",
-    "hurt_formula": "own_MAtk*100%",
+		"gain_formula": "&",
-    "gain_formula": "&",
+		"rage_cost": 100,
-    "rage_cost": 100,
+		"cd": 0,
-    "cd": 0,
+		"attack_area": 3,
-    "attack_area": 4,
+		"strike_area": 1,
-    "strike_area": 1,
+		"object": 0,
-    "object": 1,
+		"skill_class": 1,
-    "skill_class": 1,
+		"effect": "3116&",
-    "effect": "3364&",
+		"actionName": "skill1",
-    "actionName": "skill12",
+		"secondActionName": "skill1_B",
-    "secondActionName": "&"
+		"skill_info": "造成200%物理伤害，并且击退1格，如果不能击退则这次攻击伤害加深提升20%",
-
+		"skilNameImage": 4,
-  },
+		"skillSceneSpine": "nuqiguochang"
-  {
+	},
-    "id": 13,
+	{
-    "hurt_formula": "own_MAtk*100%",
+		"id": 11,
-    "gain_formula": "&",
+		"name": "虎痴",
-    "rage_cost": 0,
+		"hurt_formula": 0,
-    "cd": 3,
+		"gain_formula": "&",
-    "attack_area": 4,
+		"rage_cost": 0,
-    "strike_area": 1,
+		"cd": 3,
-    "object": 1,
+		"attack_area": 5,
-    "skill_class": 2,
+		"strike_area": 1,
-    "effect": "3368&",
+		"object": 1,
-    "actionName": "skill13",
+		"skill_class": 2,
-    "secondActionName": "&"
+		"effect": "3120&",
-
+		"actionName": "skill2",
-  },
+		"secondActionName": "&",
-  {
+		"skill_info": "恢复自身10%攻击力的血量，并且给自身附加伤害减免10%，4回合内作用2次",
-    "id": 14,
+		"skilNameImage": 0,
-    "hurt_formula": "(ownAtk*ownTerAddtion/100 - oppoDef*oppoTerAddtion/100)*(1 + ownDamInc/100000 - oppoDamDec/100000)",
+		"skillSceneSpine": "&"
-    "gain_formula": "&",
+	},
-    "rage_cost": 100,
+	{
-    "cd": 0,
+		"id": 12,
-    "attack_area": 3,
+		"name": "薤叶芸香",
-    "strike_area": 1,
+		"hurt_formula": "ownMAtk*100%",
-    "object": 0,
+		"gain_formula": "&",
-    "skill_class": 1,
+		"rage_cost": 100,
-    "effect": "3084&",
+		"cd": 0,
-    "actionName": "skill1",
+		"attack_area": 4,
-    "secondActionName": "&"
+		"strike_area": 1,
-
+		"object": 1,
-  },
+		"skill_class": 1,
-  {
+		"effect": "3364&",
-    "id": 15,
+		"actionName": "skill1",
-    "hurt_formula": "0",
+		"secondActionName": "&",
-    "gain_formula": "&",
+		"skill_info": "不错的技能",
-    "rage_cost": 0,
+		"skilNameImage": 0,
-    "cd": 3,
+		"skillSceneSpine": "nuqiguochang"
-    "attack_area": 2,
+	},
-    "strike_area": 1,
+	{
-    "object": 1,
+		"id": 13,
-    "skill_class": 2,
+		"name": "麻沸散",
-    "effect": "3088&",
+		"hurt_formula": "ownMAtk*100%",
-    "actionName": "skill2",
+		"gain_formula": "&",
-    "secondActionName": "&"
+		"rage_cost": 0,
-
+		"cd": 3,
-  },
+		"attack_area": 4,
-  {
+		"strike_area": 1,
-    "id": 16,
+		"object": 1,
-    "hurt_formula": "own_MAtk*60%",
+		"skill_class": 2,
-    "gain_formula": "&",
+		"effect": "3368&",
-    "rage_cost": 100,
+		"actionName": "skill2",
-    "cd": 0,
+		"secondActionName": "&",
-    "attack_area": 5,
+		"skill_info": "大伤害技能",
-    "strike_area": 4,
+		"skilNameImage": 0,
-    "object": 1,
+		"skillSceneSpine": "&"
-    "skill_class": 1,
+	},
-    "effect": "3316&",
+	{
-    "actionName": "skill16",
+		"id": 14,
-    "secondActionName": "&"
+		"name": "敌阵突破",
-
+		"hurt_formula": "ownAtk*200%-oppoDef*100",
-  },
+		"gain_formula": "&",
-  {
+		"rage_cost": 100,
-    "id": 17,
+		"cd": 0,
-    "hurt_formula": "own_MAtk*100%",
+		"attack_area": 3,
-    "gain_formula": "&",
+		"strike_area": 1,
-    "rage_cost": 0,
+		"object": 0,
-    "cd": 3,
+		"skill_class": 1,
-    "attack_area": 4,
+		"effect": "3084&",
-    "strike_area": 1,
+		"actionName": "skill1",
-    "object": 1,
+		"secondActionName": "&",
-    "skill_class": 2,
+		"skill_info": "向目标冲锋造成200%伤害，同时会生成自身攻击30%的护盾，持续4回合，冲锋会位移到目标的身后",
-    "effect": "3320&",
+		"skilNameImage": 5,
-    "actionName": "skill17",
+		"skillSceneSpine": "nuqiguochang"
-    "secondActionName": "&"
+	},
-
+	{
-  }
+		"id": 15,
+		"name": "坚壁",
+		"hurt_formula": 0,
+		"gain_formula": "&",
+		"rage_cost": 0,
+		"cd": 3,
+		"attack_area": 2,
+		"strike_area": 1,
+		"object": 1,
+		"skill_class": 2,
+		"effect": "3088&",
+		"actionName": "skill2",
+		"secondActionName": "&",
+		"skill_info": "使我方指定目标获得物理伤害减免提升20%，持续3回合",
+		"skilNameImage": 0,
+		"skillSceneSpine": "&"
+	},
+	{
+		"id": 16,
+		"name": "回春",
+		"hurt_formula": "ownMAtk*60%",
+		"gain_formula": "&",
+		"rage_cost": 100,
+		"cd": 0,
+		"attack_area": 5,
+		"strike_area": 4,
+		"object": 1,
+		"skill_class": 1,
+		"effect": "3316&",
+		"actionName": "skill1",
+		"secondActionName": "&",
+		"skill_info": "垃圾技能",
+		"skilNameImage": 0,
+		"skillSceneSpine": "nuqiguochang"
+	},
+	{
+		"id": 17,
+		"name": "反馈",
+		"hurt_formula": "ownMAtk*100%",
+		"gain_formula": "&",
+		"rage_cost": 0,
+		"cd": 3,
+		"attack_area": 4,
+		"strike_area": 1,
+		"object": 1,
+		"skill_class": 2,
+		"effect": "3320&",
+		"actionName": "skill2",
+		"secondActionName": "&",
+		"skill_info": "极品技能",
+		"skilNameImage": 0,
+		"skillSceneSpine": "&"
+	}
 ]

shared/resource/jsons/dic_zyz_tower.json

@@ -1,24 +1,324 @@
 [
-    {
+	{
-        "lv": 1,
+		"towerFloor": 1,
-        "warIds": "10001|10002",
+		"warArray": "10001&",
-        "fixReward": "1&2|2&1",
+		"reward": "13005&1|17002&10|17006&2|17006&3",
-        "bonus": "&",
+		"rewardOfcollect": "&",
-        "timeReward": "5&2|6&1",
+		"heroGroup": "1004&1001&312&1001&1004"
-        "name": ""
+	},
-    }, {
+	{
-        "lv": 2,
+		"towerFloor": 2,
-        "warIds": "10003",
+		"warArray": "10002&",
-        "fixReward": "1&3|2&2",
+		"reward": "13005&1|17002&10|17006&2|17006&3",
-        "bonus": "&",
+		"rewardOfcollect": "&",
-        "timeReward": "5&3|6&2",
+		"heroGroup": "1004&1001&314&1001&1004"
-        "name": ""
+	},
-    }, {
+	{
-        "lv": 3,
+		"towerFloor": 3,
-        "warIds": "10004|10005|10006",
+		"warArray": "10003&",
-        "fixReward": "1&4|2&3",
+		"reward": "13005&1|17002&10|17006&2|17006&3",
-        "bonus": "&",
+		"rewardOfcollect": "&",
-        "timeReward": "5&4|6&3",
+		"heroGroup": "1004&1001&1004&309&1004"
-        "name": ""
+	},
-    }
+	{
+		"towerFloor": 4,
+		"warArray": "10004&",
+		"reward": "13005&1|17002&10|17006&2|17006&3",
+		"rewardOfcollect": "&",
+		"heroGroup": "1004&1001&312&1001&1004"
+	},
+	{
+		"towerFloor": 5,
+		"warArray": "10005&10006",
+		"reward": "13010&1|17003&30|17006&20|17006&20",
+		"rewardOfcollect": "&",
+		"heroGroup": "1004&1001&1006&315&1004|1004&1001&1006&344&1004"
+	},
+	{
+		"towerFloor": 6,
+		"warArray": "10007&",
+		"reward": "13005&1|17002&10|17006&2|17006&8",
+		"rewardOfcollect": "&",
+		"heroGroup": "1004&309&1006&311&1004"
+	},
+	{
+		"towerFloor": 7,
+		"warArray": "10008&",
+		"reward": "13005&1|17002&10|17006&2|17006&9",
+		"rewardOfcollect": "&",
+		"heroGroup": "1004&344&314&1001&1004"
+	},
+	{
+		"towerFloor": 8,
+		"warArray": "10009&",
+		"reward": "13005&1|17002&10|17006&2|17006&10",
+		"rewardOfcollect": "&",
+		"heroGroup": "312&1001&1004&1001&314"
+	},
+	{
+		"towerFloor": 9,
+		"warArray": "10010&",
+		"reward": "13005&1|17002&10|17006&2|17006&11",
+		"rewardOfcollect": "&",
+		"heroGroup": "1004&1001&314&315&312"
+	},
+	{
+		"towerFloor": 10,
+		"warArray": "10011&10012&10013",
+		"reward": "13015&1|17004&30|17006&30|17006&30",
+		"rewardOfcollect": "&",
+		"heroGroup": "312&344&314&315&311|312&309&314&315&311|312&344&314&315&309"
+	},
+	{
+		"towerFloor": 11,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 12,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 13,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 14,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 15,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 16,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 17,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 18,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 19,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 20,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 21,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 22,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 23,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 24,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 25,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 26,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 27,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 28,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 29,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 30,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 31,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 32,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 33,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 34,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 35,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 36,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 37,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 38,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 39,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 40,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 41,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 42,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 43,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 44,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 45,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	},
+	{
+		"towerFloor": 46,
+		"warArray": "&",
+		"reward": 0,
+		"rewardOfcollect": "&",
+		"heroGroup": 0
+	}
 ]

shared/resource/jsons/testActorList.json

@@ -0,0 +1,10 @@
+[
+    {
+        "actorId":1,
+        "actorLv":50
+    },
+	{
+        "actorId":2,
+        "actorLv":30
+    }
+]