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

d49c154b · liuxinjun · 43c5586e · a5bb0f10 · 43c5586e · d49c154b
Commit d49c154b authored Nov 29, 2018 by liuxinjun
44 changed files
--- a/maomidaluandou-weixin/v1.0.0/res/import/02/026f7f987.ed3b3.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/02/026f7f987.ed3b3.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/02/026f7f987.f0b69.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/02/026f7f987.f0b69.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/03/039c1e026.58970.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/03/039c1e026.58970.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/03/039c1e026.7a792.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/03/039c1e026.7a792.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/03/03d09ae64.2c627.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/03/03d09ae64.2c627.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/03/03d09ae64.3e9b0.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/03/03d09ae64.3e9b0.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/05/059a9b977.b06c5.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/05/059a9b977.b06c5.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/05/05b3d2ba8.2c880.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/05/05b3d2ba8.2c880.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/05/05b3d2ba8.d1a2d.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/05/05b3d2ba8.d1a2d.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/06/06e3515dd.cb975.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/06/06e3515dd.cb975.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/06/06e3515dd.e73d6.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/06/06e3515dd.e73d6.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/08/089cea541.03863.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/08/089cea541.03863.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/08/089cea541.32b7d.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/08/089cea541.32b7d.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/0b/0b06b6312.29207.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/0b/0b06b6312.29207.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/0c/0c2872f6e.964d5.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/0c/0c2872f6e.964d5.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/0c/0c2872f6e.d6319.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/0c/0c2872f6e.d6319.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/0d/0d56d5c5e.0138d.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/0d/0d56d5c5e.0138d.json
--- a/maomidaluandou-weixin/v1.0.0/res/import/0d/0d56d5c5e.e7f7d.json
+++ b/maomidaluandou-weixin/v1.0.0/res/import/0d/0d56d5c5e.e7f7d.json
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/goldStacksTipImg/gongxihuode.c67df.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/goldStacksTipImg/gongxihuode.c67df.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/goldStacksTipImg/queding.5a36b.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/goldStacksTipImg/queding.5a36b.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/goldStacksTipImg/shanguangtxiao.cab36.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/goldStacksTipImg/shanguangtxiao.cab36.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/libaoImg/ditu_zhiying.77e40.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/libaoImg/ditu_zhiying.77e40.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/libaoImg/zhiyinbiaoti.6d230.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/libaoImg/zhiyinbiaoti.6d230.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/libaoImg/zhiyintu.7105b.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/libaoImg/zhiyintu.7105b.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/gameBg.187ed.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/gameBg.187ed.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/kaishiyouxi2.3e323.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/kaishiyouxi2.3e323.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/lijishiwan.30435.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/lijishiwan.30435.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/swljb.64c97.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/swljb.64c97.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/title_bg.013a9.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/title_bg.013a9.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/yilingqubiaoqian.3bea2.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/shiwanImg/yilingqubiaoqian.3bea2.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/again.3a3d0.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/again.3a3d0.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/bolou.f7c17.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/bolou.f7c17.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/cheli.f027d.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/cheli.f027d.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/chengzi.16e5a.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/chengzi.16e5a.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/line.1b44f.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/line.1b44f.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/lizi.13a80.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/lizi.13a80.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/mangguo.9a8dd.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/mangguo.9a8dd.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/moguo.2d7e6.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/moguo.2d7e6.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/pinguo.49af9.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/pinguo.49af9.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/qiyiguo.77113.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/qiyiguo.77113.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/start.5f1ca.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/start.5f1ca.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/xiangjiao.8175b.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/xiangjiao.8175b.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/xigua.03d5f.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/xigua.03d5f.png
--- a/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/zhuanpan.fcc8c.png
+++ b/yiqiqieshuiguo-weixin/v2.0.15/res/raw-assets/img/waterGlassImg/zhuanpan.fcc8c.png