Commit Graph

14545 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)
 

Author SHA1 Message Date
gaoxin 3f54c121b1 sdk=接口完善 2020-07-13 12:25:55 +08:00
jiaoyangna 0ae50e09be Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 12:01:47 +08:00
jiaoyangna 40fa614a52 限时召唤】点十连,单抽的免费不显示了 2020-07-13 12:01:39 +08:00
shihongyi af24467d74 转盘积分箱内容丢失bugfix 2020-07-13 11:45:24 +08:00
jiaoyangna fb8a020790 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-13 11:16:03 +08:00
jiaoyangna 6ff6b5315b 分解、重置相关功能修改 2020-07-13 11:15:53 +08:00
shihongyi 053e8f6daa 调整通关奖励 2020-07-13 10:47:08 +08:00
zhangqiang 9dfb75b169 竞猜币 2020-07-11 18:40:16 +08:00
gaoxin 58cc4bc0c3 部分字段改为前后端读取 2020-07-11 18:04:39 +08:00
gaoxin 717e09168b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-11 18:03:56 +08:00
gaoxin 8d25e6f9b2 修复VIP引导报错 2020-07-11 18:03:27 +08:00
jiaoyangna f654f744a6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-11 18:00:16 +08:00
jiaoyangna fdf82e47ac 分解、重置相关功能修改 2020-07-11 18:00:07 +08:00
gaoxin 870666f0f5 部分字段改为前后端读取 2020-07-11 17:56:39 +08:00
JieLing 325d9c7224 内网测试 0.15.28 2020-07-11 17:33:26 +08:00
gaoxin d075aaf11f 引导vip报错修改 2020-07-11 17:19:25 +08:00
altair c43233121f 修改传记文字 2020-07-11 17:17:13 +08:00
zhangqiang 4edc074ca3 抛弹竞猜结束 打开 ATM_GuessTipView时机修改 2020-07-11 17:16:14 +08:00
altair a9bb118ded 修改技能配置 2020-07-11 16:49:50 +08:00
altair 45d89d395b 修改技能配置 2020-07-11 16:49:07 +08:00
altair 507b634350 技能音效配置添加 2020-07-11 16:30:16 +08:00
altair 079e7acbb2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-11 16:27:12 +08:00
gaoxin 8be0056346 技能名称音效添加 2020-07-11 16:26:33 +08:00
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