76 Commits (f132189ea456a479c77cfe85d6bdabdbf3592023)

Author SHA1 Message Date
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
5 years ago
ELF bb2996dbee 迁移忽略结算 5 years ago
ELF 289b40329f 添加换绑时金额 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
liaojinling c637a8bfe0 打包 5 years ago
ELF 81a968947b 修改bug 5 years ago
liaojinling ca4f1954e4 修改bug 5 years ago
liaojinling 1204b1a0e8 修改 5 years ago
liaojinling fe6dd1ddff 改成旧的打包方式 5 years ago
ELF ef60ca85cf 修改 5 years ago
ELF a91a5d5759 修改 5 years ago
ELF 128c11f5b8 修改 5 years ago
ELF 25fa79ea55 修改玩家迁移 5 years ago
ELF 1f167778a7 调试 5 years ago
ELF 88385b2f87 调试 5 years ago
ELF 1e976d620b 调试 5 years ago
ELF b08c7748c9 调试 5 years ago
ELF 494098abc1 修改分包 5 years ago
elf@home 8d6c547468 支持分片文件上传 5 years ago
sunke 401edecd61 target_level 5 years ago
ELF c0f19228d2 修改bug 5 years ago
ELF 3af8fe116d 修改bu 5 years ago
sunke 8951a502c2 修改bug 5 years ago
sunke 94bede9a41 平台币修改 5 years ago
sunke c3caed08b3 bug 5 years ago
ELF 3b681670df 上传 5 years ago
ELF 6cdee448c0 修改bug 5 years ago
ELF 1bffd62357 修改bug 5 years ago
ELF 1a0175e583 修改结构 5 years ago
ELF 9e83202467 修改bug 5 years ago
ELF 16d458155a 修改打包日志 5 years ago
ELF ed82ea4103 添加打包日志记录 5 years ago
ELF f2765313fd 优化打包 5 years ago
ELF 6c636a92f5 修改 5 years ago
ELF e56256ba1d 修改bug 5 years ago
ELF c4d35c26d4 修改bug 5 years ago
ELF 85e466c3fd 修改bug 5 years ago
ELF e27c5a5266 修改bug 5 years ago
ELF b2df7e0fe3 修改bug 5 years ago
ELF fbce375679 修改bug 5 years ago
ELF 3d46a55811 修改bug 5 years ago
ELF c88892ec59 修改 5 years ago
ELF 784de48bf9 修改bug 5 years ago
ELF c2c8f11d01 修改 5 years ago
ELF 070cc2e7c2 修改bug 5 years ago
ELF 679acf6cf1 修改分包 5 years ago
ELF 09672d13b4 修改分包bug 5 years ago
ELF c6627a53c2 将plist demo写入php文件 5 years ago