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

a8bcbbc4 · zengsijie · 7e644b74 · a6342f5c · 7e644b74 · a8bcbbc4
Commit a8bcbbc4 authored Oct 15, 2018 by zengsijie
14 changed files
--- a/daomaobiji-weixin/v1.0.0/res/import/0a/0a0160830.json
+++ b/daomaobiji-weixin/v1.0.0/res/import/0a/0a0160830.json
--- a/daomaobiji-weixin/v1.0.0/res/import/0f/0f8f15dec.json
+++ b/daomaobiji-weixin/v1.0.0/res/import/0f/0f8f15dec.json
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/bantoumingdikuang.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/bantoumingdikuang.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/caidan_dakai_icon.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/caidan_dakai_icon.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/fanhui_button.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/fanhui_button.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/jinbi1_icon.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/jinbi1_icon.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_cangku.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_cangku.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_riji.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_riji.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_shiping.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_shiping.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_xuanxiang.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_xuanxiang.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_yigui.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Menu/tsktc_yigui.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Room/bg1.jpg
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Room/bg1.jpg
--- a/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Room/caidan_icon.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-assets/Texture/Room/caidan_icon.png
--- a/daomaobiji-weixin/v1.0.0/res/raw-internal/image/default_sprite_splash.png
+++ b/daomaobiji-weixin/v1.0.0/res/raw-internal/image/default_sprite_splash.png