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

d39df1db · zengsijie · 5a6c955f · 1935cfd8 · d39df1db · d39df1db
Commit d39df1db authored Oct 09, 2018 by zengsijie
80 changed files
--- a/qubapikashu-weixin/v1.0.0/res/import/01/0144d8c34.json
+++ b/qubapikashu-weixin/v1.0.0/res/import/01/0144d8c34.json
--- a/qubapikashu-weixin/v1.0.0/res/import/03/0388b1a21.json
+++ b/qubapikashu-weixin/v1.0.0/res/import/03/0388b1a21.json
--- a/qubapikashu-weixin/v1.0.0/res/import/0d/0d3193d37.json
+++ b/qubapikashu-weixin/v1.0.0/res/import/0d/0d3193d37.json
--- a/qubapikashu-weixin/v1.0.0/res/import/0f/0f2306bcf.json
+++ b/qubapikashu-weixin/v1.0.0/res/import/0f/0f2306bcf.json
--- a/qubapikashu-weixin/v1.0.0/res/import/48/487ded32-3289-47bd-b70e-696b501d7667.json
+++ b/qubapikashu-weixin/v1.0.0/res/import/48/487ded32-3289-47bd-b70e-696b501d7667.json
--- a/qubapikashu-weixin/v1.0.0/res/import/d9/d921625a-6ee2-4ea6-8065-1e9319e2f70b.json
+++ b/qubapikashu-weixin/v1.0.0/res/import/d9/d921625a-6ee2-4ea6-8065-1e9319e2f70b.json
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster1/b001.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster1/b001.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster2/b002.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster2/b002.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster3/monster301/b025.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster3/monster301/b025.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster3/monster301/b025.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster3/monster301/b025.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster4/monster401/b006.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster4/monster401/b006.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster4/monster401/b006.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster4/monster401/b006.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster6/b009.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster6/b009.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster6/b009.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster6/b009.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster7/b010.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster7/b010.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster7/b010.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Action/monster/monster7/b010.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/New Folder/b001.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/New Folder/b001.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/New Folder/b001.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/New Folder/b001.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/Texture/Bg/underGround/back_underGround2.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/Texture/Bg/underGround/back_underGround2.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/digEffect/c005.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/digEffect/c005.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/digEffect/c005.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/digEffect/c005.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/goldStar/c007.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/goldStar/c007.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/goldStar/c007.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/goldStar/c007.png
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/sceneUp/c012.atlas
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/sceneUp/c012.atlas
--- a/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/sceneUp/c012.png
+++ b/qubapikashu-weixin/v1.0.0/res/raw-assets/effects/sceneUp/c012.png
--- a/qubapikashu-weixin/v1.0.1/res/import/01/0144d8c34.json
+++ b/qubapikashu-weixin/v1.0.1/res/import/01/0144d8c34.json
--- a/qubapikashu-weixin/v1.0.1/res/import/03/0388b1a21.json
+++ b/qubapikashu-weixin/v1.0.1/res/import/03/0388b1a21.json
--- a/qubapikashu-weixin/v1.0.1/res/import/07/071895a8b.json
+++ b/qubapikashu-weixin/v1.0.1/res/import/07/071895a8b.json
--- a/qubapikashu-weixin/v1.0.1/res/import/0d/0d1b8f8fd.json
+++ b/qubapikashu-weixin/v1.0.1/res/import/0d/0d1b8f8fd.json
--- a/qubapikashu-weixin/v1.0.1/res/import/48/487ded32-3289-47bd-b70e-696b501d7667.json
+++ b/qubapikashu-weixin/v1.0.1/res/import/48/487ded32-3289-47bd-b70e-696b501d7667.json
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/Gold/c011.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/Gold/c011.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/Gold/c011.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/Gold/c011.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster1/b001.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster1/b001.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster1/b001.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster1/b001.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster2/b002.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster2/b002.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster2/b002.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster2/b002.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/b004.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/b004.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/b004.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/b004.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/monster301/b025.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/monster301/b025.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/monster301/b025.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster3/monster301/b025.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/b007.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/b007.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/b007.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/b007.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/monster401/b006.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/monster401/b006.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/monster401/b006.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster4/monster401/b006.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster5/b008.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster5/b008.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster5/b008.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster5/b008.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster6/b009.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster6/b009.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster6/b009.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster6/b009.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster7/b010.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster7/b010.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster7/b010.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Action/monster/monster7/b010.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/Gold/goldNum1.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/Gold/goldNum1.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/bonusFont1.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/bonusFont1.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/expNum.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/expNum.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/lvNum.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Font/lvNum.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/New Folder/b001.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/New Folder/b001.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/New Folder/b001.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/New Folder/b001.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/back1_ground3.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/back1_ground3.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/back_ground2.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/back_ground2.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/back_underGround2.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/back_underGround2.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/back_underGround3.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/back_underGround3.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/under_ground_p.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/under_ground_p.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/under_wall_p.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/Bg/underGround/under_wall_p.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/ShootBall/ballImg.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/ShootBall/ballImg.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/obj/objImg.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/obj/objImg.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/tuJian/zukanImg.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/tuJian/zukanImg.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/ui/uiImg.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/Texture/ui/uiImg.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/collect/c002.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/collect/c002.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/collect/c002.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/collect/c002.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/digEffect/c005.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/digEffect/c005.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/digEffect/c005.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/digEffect/c005.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/goldStar/c007.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/goldStar/c007.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/goldStar/c007.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/goldStar/c007.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitNo/c003.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitNo/c003.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitNo/c003.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitNo/c003.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitYes/c001.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitYes/c001.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitYes/c001.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/hitYes/c001.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/sceneUp/c012.atlas
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/sceneUp/c012.atlas
--- a/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/sceneUp/c012.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-assets/effects/sceneUp/c012.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-internal/image/default_panel.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-internal/image/default_panel.png
--- a/qubapikashu-weixin/v1.0.1/res/raw-internal/image/default_sprite_splash.png
+++ b/qubapikashu-weixin/v1.0.1/res/raw-internal/image/default_sprite_splash.png