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

4046d3ad · zengsijie · 08b11e06 · 01c5df64 · 4046d3ad · 4046d3ad
Commit 4046d3ad authored Dec 03, 2018 by zengsijie
87 changed files
--- a/daomaobiji-weixin/dmTest/res/import/0a/0afa1b9aa.json
+++ b/daomaobiji-weixin/dmTest/res/import/0a/0afa1b9aa.json
--- a/daomaobiji-weixin/dmTest/res/import/0b/0bfac377f.json
+++ b/daomaobiji-weixin/dmTest/res/import/0b/0bfac377f.json
--- a/daomaobiji-weixin/dmTest/res/import/0d/0d3a73fa0.json
+++ b/daomaobiji-weixin/dmTest/res/import/0d/0d3a73fa0.json
--- a/daomaobiji-weixin/dmTest/res/import/0d/0dcdeaf0a.json
+++ b/daomaobiji-weixin/dmTest/res/import/0d/0dcdeaf0a.json
--- a/daomaobiji-weixin/dmTest/res/import/0e/0e57256e.json
+++ b/daomaobiji-weixin/dmTest/res/import/0e/0e57256e.json
--- a/daomaobiji-weixin/dmTest/res/raw-assets/Texture/Room/cdcg.png
+++ b/daomaobiji-weixin/dmTest/res/raw-assets/Texture/Room/cdcg.png
--- a/daomaobiji-weixin/dmTest/res/raw-assets/Texture/Room/xiumaosong.png
+++ b/daomaobiji-weixin/dmTest/res/raw-assets/Texture/Room/xiumaosong.png
--- a/daomaobiji-weixin/dmTest/res/raw-internal/image/default_sprite.png
+++ b/daomaobiji-weixin/dmTest/res/raw-internal/image/default_sprite.png
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/tex/tiqiu.jpg
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/tex/tiqiu.jpg
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls001.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls001.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls002.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls002.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls003.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls003.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls004.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls004.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls005.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls005.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls006.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls006.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls007.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls007.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls008.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls008.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls009.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls009.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls010.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls010.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls011.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls011.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls012.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls012.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls013.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls013.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls014.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls014.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls015.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls015.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls016.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls016.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls017.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls017.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls018.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls018.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls019.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls019.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls020.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls020.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls021.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls021.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls022.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls022.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls023.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls023.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls024.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls024.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls025.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls025.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls026.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls026.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls027.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls027.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls028.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls028.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls029.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls029.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls030.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls030.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls031.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls031.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls032.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls032.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls033.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls033.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls034.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls034.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls035.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls035.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls036.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls036.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls037.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls037.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls038.lm
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/Assets/zuqiu-balls038.lm
--- a/jinjibazuqiu-weixin/v1.0.3/res/3d/football.ls
+++ b/jinjibazuqiu-weixin/v1.0.3/res/3d/football.ls
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls001.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls001.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls002.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls002.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls003.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls003.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls004.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls004.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls005.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls005.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls006.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls006.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls007.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls007.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls008.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls008.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls009.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls009.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls010.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls010.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls011.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls011.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls012.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls012.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls013.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls013.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls014.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls014.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls015.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls015.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls016.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls016.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls017.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls017.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls018.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls018.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls019.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls019.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls020.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls020.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls021.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls021.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls022.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls022.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls023.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls023.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls024.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls024.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls025.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls025.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls026.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls026.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls027.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls027.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls028.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls028.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls029.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls029.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls030.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls030.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls031.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls031.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls032.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls032.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls033.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls033.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls034.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls034.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls035.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls035.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls036.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls036.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls037.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls037.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls038.lm
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/Assets/zuqiu-balls038.lm
--- a/jinjibazuqiu-weixin/v1.0.4/res/3d/football.ls
+++ b/jinjibazuqiu-weixin/v1.0.4/res/3d/football.ls