Commit Graph

14545 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)
 

Author SHA1 Message Date
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
2han9B1a0 10a2181305 小游戏18bugxiugai 2020-07-09 16:14:44 +08:00
kansa 7185629090 修改森罗幻境怪物属性 2020-07-09 16:10:31 +08:00
shihongyi 9383c02d40 幻境杀怪掉落初调 2020-07-09 15:58:07 +08:00
gaoxin 6e33a3e2a7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 15:18:45 +08:00
gaoxin 6303805bfa 修复未命中时报错的问题 2020-07-09 15:18:02 +08:00
kansa 55155cc2c3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 15:17:45 +08:00
kansa cca639cfba 修改森罗幻境商店错误 2020-07-09 15:15:19 +08:00
liujiaqi 83d578fbee 橙色4星装备名描述修改 2020-07-09 15:15:13 +08:00
shihongyi ac28494c82 保底优化 2020-07-09 15:02:35 +08:00
liujiaqi 2e22a79119 怪物命中率修改 2020-07-09 15:00:32 +08:00
skuld 77c2b75175 修改每日召唤上限 2020-07-09 14:51:16 +08:00
skuld 67ed992681 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
2020-07-09 14:47:26 +08:00
shihongyi 047721e3a4 修复bug 2020-07-09 14:12:39 +08:00
jiaoyangna c3e1aaff6e 【限时召唤】奖池预览,去掉一二星神将
【心魔试炼】奖励预览,数量多的时候,需要调整
2020-07-09 13:35:59 +08:00
2han9B1a0 8e853b2758 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 11:53:10 +08:00
2han9B1a0 47b34f9d6e 宝囊 2020-07-09 11:52:40 +08:00
liujiaqi 790c38edeb 英雄初始命中修改 2020-07-09 11:36:57 +08:00
shihongyi f6421e9533 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 10:54:09 +08:00
jiaoyangna 62462bd83d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 10:53:26 +08:00
jiaoyangna f9c49d00e3 宝物bug修改 2020-07-09 10:53:15 +08:00
shihongyi 6614cf3e70 乾坤宝囊up展示 2020-07-09 10:52:51 +08:00
kansa 3bd5576d98 删除怪物闪避和命中初始属性值 2020-07-09 10:52:42 +08:00
shihongyi ccfb9132f3 去掉云游商店,增加乾坤商店 2020-07-09 10:45:37 +08:00
jiaoyangna 37c7c839c4 限时召唤提交 2020-07-09 10:04:20 +08:00
zhangqiang 6bdc5a1db8 巅峰战竞猜记录显示 2020-07-08 21:38:36 +08:00
gaoxin 3e43ea4876 Merge branch '优化cardrenderer' into master_develop 2020-07-08 21:23:04 +08:00
gaoxin b5ab2384c3 优化rendertexture的数量20->6 2020-07-08 21:21:49 +08:00