Merge branch 'master' of http://gitlab.llewan.com/llewan/cdn

d6ccaf51 · zengsijie · ad8c0102 · 498155d9 · d6ccaf51 · d6ccaf51
Commit d6ccaf51 authored Dec 22, 2018 by zengsijie
12 changed files
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/nx.jpg
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/nx.jpg
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/ny.jpg
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/ny.jpg
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/nz.jpg
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/nz.jpg
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/px.jpg
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/px.jpg
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/py.jpg
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/py.jpg
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/pz.jpg
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/pz.jpg
--- a/jinjibazuqiu-weixin/v1.0.8/res/skyBox/skyCube.ltc
+++ b/jinjibazuqiu-weixin/v1.0.8/res/skyBox/skyCube.ltc
+{
+ "px": "px.jpg",
+ "nx": "nx.jpg",
+ "py": "py.jpg",
+ "ny": "ny.jpg",
+ "pz": "pz.jpg",
+ "nz": "nz.jpg",
+ "size": 1024
+}
\ No newline at end of file
--- a/qubapikashu-weixin/v2.0.1/res/import/0f/0fcd183ea.json
+++ b/qubapikashu-weixin/v2.0.1/res/import/0f/0fcd183ea.json
--- a/qubapikashu-weixin/v2.0.1/res/import/a2/a2f6ef38-925d-48f0-b56c-43446eb6df18.json
+++ b/qubapikashu-weixin/v2.0.1/res/import/a2/a2f6ef38-925d-48f0-b56c-43446eb6df18.json
--- a/qubapikashu-weixin/v2.0.1/res/import/dd/dd3562ab-8a5b-4b1a-8fe7-02e031fc8e73.json
+++ b/qubapikashu-weixin/v2.0.1/res/import/dd/dd3562ab-8a5b-4b1a-8fe7-02e031fc8e73.json
--- a/qubapikashu-weixin/v2.0.1/res/raw-assets/resources/monster/b043/json/b043.atlas
+++ b/qubapikashu-weixin/v2.0.1/res/raw-assets/resources/monster/b043/json/b043.atlas
--- a/qubapikashu-weixin/v2.0.1/res/raw-assets/resources/monster/b043/json/b043.png
+++ b/qubapikashu-weixin/v2.0.1/res/raw-assets/resources/monster/b043/json/b043.png