From 9e1d7a2c6b84cac633ad5157fe07a486dd85811b Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 05 七月 2019 09:42:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Editor/MapCollideFiles/map_10090.json | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/Editor/MapCollideFiles/map_10090.json b/Assets/Editor/MapCollideFiles/map_10090.json
index 3c927ea..76f80c9 100644
--- a/Assets/Editor/MapCollideFiles/map_10090.json
+++ b/Assets/Editor/MapCollideFiles/map_10090.json
@@ -1 +1 @@
-{"id":10090,"triggerList": [{"id":1,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":55,"py":22.53,"pz":36,"sx":16,"sz":20,"ey":0,"eventIDList":[0]},{"id":3,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":31.8,"py":24.81,"pz":67.6,"sx":16,"sz":16,"ey":0,"eventIDList":[2]},{"id":5,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":52.67,"py":24.9,"pz":35.63,"sx":30,"sz":30,"ey":0,"eventIDList":[4]},{"id":6,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":32.8,"py":26.6,"pz":68.5,"sx":30,"sz":30,"ey":0,"eventIDList":[5]},{"id":7,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":6.02,"py":28.3,"pz":83.58,"sx":15,"sz":15,"ey":0,"eventIDList":[6]},{"id":8,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":56.67,"py":23.41,"pz":15.09,"sx":30,"sz":30,"ey":0,"eventIDList":[7]}],"eventList": [{"type":0,"id":0,"px":-25.52,"py":2.08,"pz":25.89,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M009","npcID":10902002,"ai":10902002,"faceDir":0,"px":54.61,"py":23.94,"pz":38},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":57.37,"py":23.94,"pz":38},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":52.06,"py":23.94,"pz":38},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":53.36,"py":23.94,"pz":39.54},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":56,"py":23.94,"pz":39.37},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":53.52,"py":23.94,"pz":36.72},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":56.17,"py":23.94,"pz":36.79},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":52.12,"py":23.94,"pz":35.96},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":54.71,"py":23.94,"pz":35.45},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":57.74,"py":23.94,"pz":36.42},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":56.57,"py":23.94,"pz":34.85}]},{"type":0,"id":2,"px":29.61,"py":26.6,"pz":67.7,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M821","npcID":10902003,"ai":10902003,"faceDir":0,"px":31.85,"py":26.6,"pz":69.43}]},{"type":0,"id":4,"px":55.5,"py":24.36,"pz":25.3,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"N043","npcID":10904201,"ai":10904201,"faceDir":0,"px":43.56,"py":24.85,"pz":41.05}]},{"type":0,"id":5,"px":-0.46,"py":0,"pz":0.49,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"N043","npcID":10904200,"ai":10904200,"faceDir":320,"px":37.81,"py":26.91,"pz":70.71}]},{"type":0,"id":6,"px":37.2,"py":26.91,"pz":67.4,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M014","npcID":10903001,"ai":10903001,"faceDir":0,"px":6,"py":27.8,"pz":83.43}]},{"type":0,"id":7,"px":0,"py":0,"pz":0,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M159","npcID":60403029,"ai":60403029,"faceDir":0,"px":57.93,"py":22.91,"pz":13.91}]}],"transferList": []}
\ No newline at end of file
+{"id":10090,"triggerList": [{"id":1,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":55,"py":22.53,"pz":36,"sx":16,"sz":20,"ey":0,"eventIDList":[0]},{"id":3,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":31.8,"py":24.81,"pz":67.6,"sx":16,"sz":16,"ey":0,"eventIDList":[2]},{"id":5,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":52.67,"py":24.9,"pz":35.63,"sx":30,"sz":30,"ey":0,"eventIDList":[4]},{"id":6,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":32.8,"py":26.6,"pz":68.5,"sx":30,"sz":30,"ey":0,"eventIDList":[5]},{"id":7,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":6.02,"py":28.3,"pz":83.58,"sx":15,"sz":15,"ey":0,"eventIDList":[6]},{"id":8,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":56.67,"py":23.41,"pz":15.09,"sx":30,"sz":30,"ey":0,"eventIDList":[7]}],"eventList": [{"type":0,"id":0,"px":-25.52,"py":2.08,"pz":25.89,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M009","npcID":10902002,"ai":10902002,"faceDir":0,"px":54.61,"py":23.94,"pz":38},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":57.37,"py":23.94,"pz":38},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":52.06,"py":23.94,"pz":38},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":53.36,"py":23.94,"pz":39.54},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":56,"py":23.94,"pz":39.37},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":53.52,"py":23.94,"pz":36.72},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":56.17,"py":23.94,"pz":36.79},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":52.12,"py":23.94,"pz":35.96},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":54.71,"py":23.94,"pz":35.45},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":57.74,"py":23.94,"pz":36.42},{"resName":"M009","npcID":10901003,"ai":10901003,"faceDir":0,"px":56.57,"py":23.94,"pz":34.85}]},{"type":0,"id":2,"px":29.61,"py":26.6,"pz":67.7,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M821","npcID":10902003,"ai":10902003,"faceDir":0,"px":31.85,"py":26.6,"pz":69.43}]},{"type":0,"id":4,"px":55.5,"py":24.36,"pz":25.3,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"N043","npcID":10904201,"ai":10904201,"faceDir":0,"px":43.56,"py":24.85,"pz":41.05}]},{"type":0,"id":5,"px":-8.97,"py":0,"pz":2.52,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"N043","npcID":10904200,"ai":10904200,"faceDir":30,"px":29.3,"py":26.91,"pz":72.74}]},{"type":0,"id":6,"px":37.2,"py":26.91,"pz":67.4,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M014","npcID":10903001,"ai":10903001,"faceDir":0,"px":6,"py":27.8,"pz":83.43}]},{"type":0,"id":7,"px":0,"py":0,"pz":0,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M159","npcID":60403029,"ai":60403029,"faceDir":0,"px":57.93,"py":22.91,"pz":13.91}]}],"transferList": []}
\ No newline at end of file
--
Gitblit v1.8.0