From 2d4fe2be3b4ed3292ceee32bddbf5ecce302328e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 18 六月 2019 17:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Editor/MapCollideFiles/map_10040.json | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/Editor/MapCollideFiles/map_10040.json b/Assets/Editor/MapCollideFiles/map_10040.json
index f2f2332..9865a6b 100644
--- a/Assets/Editor/MapCollideFiles/map_10040.json
+++ b/Assets/Editor/MapCollideFiles/map_10040.json
@@ -1 +1 @@
-{"id":10040,"triggerList": [{"id":1,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":82.95,"py":-0.02,"pz":28.52,"sx":60,"sz":60,"ey":0,"eventIDList":[1]},{"id":2,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":50.05,"py":-0.02,"pz":75.52,"sx":40,"sz":30,"ey":0,"eventIDList":[]}],"eventList": [{"type":0,"id":0,"px":76.79,"py":2.95,"pz":37.33,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"Zs_skill15_02","npcID":10404102,"ai":10404102,"faceDir":0,"px":73.03,"py":3.28,"pz":45.65},{"resName":"Zs_skill15_02","npcID":10404102,"ai":10404102,"faceDir":0,"px":69.77,"py":2.95,"pz":26.38}]},{"type":0,"id":1,"px":74.22,"py":2.95,"pz":39.84,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M028","npcID":10402001,"ai":10402001,"faceDir":0,"px":51.15,"py":4.39,"pz":73.69}]}],"transferList": []}
\ No newline at end of file
+{"id":10040,"triggerList": [{"id":1,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":82.95,"py":-0.02,"pz":28.52,"sx":60,"sz":60,"ey":0,"eventIDList":[1]},{"id":2,"triggerType":0,"type":0,"prevID":-1,"nextID":-1,"px":50.05,"py":-0.02,"pz":75.52,"sx":40,"sz":30,"ey":0,"eventIDList":[]}],"eventList": [{"type":0,"id":0,"px":76.79,"py":2.95,"pz":37.33,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"Zs_skill15_02","npcID":10404102,"ai":10404102,"faceDir":0,"px":78.34,"py":3.28,"pz":43.58},{"resName":"Zs_skill15_02","npcID":10404102,"ai":10404102,"faceDir":0,"px":70.14,"py":2.95,"pz":27.12}]},{"type":0,"id":1,"px":74.22,"py":2.95,"pz":39.84,"overCondition":0,"refreshType":0,"conditionParam":0,"overParam":0,"nextEventID":-1,"monsterList":[{"resName":"M028","npcID":10402001,"ai":10402001,"faceDir":0,"px":51.15,"py":4.39,"pz":73.69}]}],"transferList": []}
\ No newline at end of file
--
Gitblit v1.8.0