Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
c5aa6e64bc
@ -4,20 +4,20 @@
|
||||
"name": "右屏商人",
|
||||
"information": "这是一位熊猫商人",
|
||||
"ico": "action_11001",
|
||||
"time": 10
|
||||
"time": 300
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"name": "上屏商人",
|
||||
"information": "这是一位波比商人再此",
|
||||
"ico": "action_11003",
|
||||
"time": 10
|
||||
"time": 300
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"name": "左屏商人",
|
||||
"information": "这是一位滑板鞋王子",
|
||||
"ico": "ytx_js_14007",
|
||||
"time": 10
|
||||
"time": 300
|
||||
}
|
||||
]
|
Loading…
Reference in New Issue
Block a user