Commit Graph

14522 Commits (c9fca972fef549577be7ae3c87182c906b317669)
 

Author SHA1 Message Date
gaoxin 679752e628 技能音效添加 2020-07-11 16:26:27 +08:00
altair 5686fb219d 增加配音配置 2020-07-11 16:26:03 +08:00
jiaoyangna 106a7f7763 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
2020-07-11 16:25:30 +08:00
jiaoyangna 0fb81547d3 分解提交 2020-07-11 16:21:15 +08:00
zhangqiang 28f2a1c4f4 去掉每秒刷新赔率 2020-07-11 16:04:39 +08:00
gaoxin f96f07865f meta文件提交 2020-07-11 15:45:39 +08:00
gaoxin 5c1e235228 技能名称音效添加 2020-07-11 15:42:56 +08:00
gaoxin 27f46f4572 添加技能音效列 2020-07-11 15:22:03 +08:00
gaoxin ee0c035731 技能音效添加 2020-07-11 15:19:49 +08:00
gaoxin f03214aa1a 技能音效添加 2020-07-11 15:19:08 +08:00
gaoxin fdb4c66ed5 访客id接口修改 2020-07-11 15:05:23 +08:00
ZhangBiao 310802e967 language导出 2020-07-10 19:13:29 +08:00
ZhangBiao 7279a7edd1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 19:03:03 +08:00
ZhangBiao 3ab971eaea 宝囊红点 2020-07-10 19:02:54 +08:00
jiaoyangna 27343e6fca 【特权】白片 2020-07-10 18:34:38 +08:00
jiaoyangna 32ca04e2e4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 18:29:48 +08:00
jiaoyangna 3a85c6e339 分解,限时召唤提交 2020-07-10 18:29:38 +08:00
JieLing 9b97aef3d7 内网 0.15.15 2020-07-10 18:20:58 +08:00
shihongyi c2370f561d 保底次数限时 2020-07-10 18:02:22 +08:00
ZhangBiao 0a5212d265 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 17:55:37 +08:00
ZhangBiao b89c0582c0 宝囊 2020-07-10 17:55:11 +08:00
altair be89bc0c42 修改引导内容 2020-07-10 17:48:24 +08:00
liujiaqi b61fc5fb1e 法宝资源 2020-07-10 16:50:00 +08:00
liujiaqi 32d653d138 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 16:34:01 +08:00
liujiaqi d02a3adee8 法宝资源部分替换 2020-07-10 16:33:26 +08:00
gaoxin 4bd77a0b82 忽略文件添加 2020-07-10 16:32:56 +08:00
gaoxin ab724d407e 嫦娥,东华帝君,洛神特效添加 2020-07-10 16:22:40 +08:00
gaoxin 6bf07e8cbe Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 16:21:35 +08:00
gaoxin e004a4142a 忽略文件添加 2020-07-10 16:21:21 +08:00
shihongyi b23f6fc806 乾坤宝囊分别红橙计数 2020-07-10 15:35:57 +08:00
zhangqiang 4a0ee0c3dc 巅峰赛打印提交 2020-07-10 15:16:50 +08:00
skuld 81a5da6cfc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-10 15:06:40 +08:00
skuld fb91f85cab 修改8日奖励描述和奖励 2020-07-10 15:06:26 +08:00
liujiaqi 1e9c838e34 英雄命中 2020-07-10 14:08:12 +08:00
zhangqiang 13283fe135 巅峰战提交 2020-07-10 13:38:50 +08:00
shihongyi 603c9803de 下调VIP1、2升级难度 2020-07-10 11:45:01 +08:00
shihongyi b6e3410145 点金描述bug 2020-07-10 10:51:00 +08:00
shihongyi 220da97000 bug狂欢普通抽 2020-07-10 10:35:36 +08:00
liujiaqi 99c11f8305 英雄阵营备注修改 2020-07-10 10:24:37 +08:00
shihongyi b449f521e6 另一个云游商店 2020-07-10 10:18:25 +08:00
gaoxin cb33f92b67 添加忽略文件 2020-07-10 10:00:46 +08:00
gaoxin 465ca19e84 sdk相关文档提交 2020-07-10 09:59:56 +08:00
shihongyi 3e749c1862 bug 2020-07-10 09:53:20 +08:00
shihongyi 78fca78236 bugfix 2020-07-09 20:31:18 +08:00
2han9B1a0 ce1d7014f3 2020-07-09 19:59:23 +08:00
2han9B1a0 827c8d9165 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 18:21:26 +08:00
2han9B1a0 12b0fa9f73 特权修改,宝囊商店 2020-07-09 18:20:53 +08:00
shihongyi d56cefc732 乾坤商店匹配活动 2020-07-09 17:24:30 +08:00
shihongyi 339550d9e7 幻境杀怪掉落修改之2 2020-07-09 16:58:25 +08:00
2han9B1a0 f158fa6536 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 16:14:56 +08:00