Commit Graph

8086 Commits (9a4c92baa1d16b4b38d98c37eeeb99847a61bd59)
 

Author SHA1 Message Date
wangzhenxing 2490fbb496 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-19 17:34:37 +08:00
wangzhenxing 38d384e9a7 [bug]=========【ID1017466】
【首充按钮】武将预览修改成神将预览
2021-07-19 17:34:04 +08:00
ZhangBiao effe3bdfa1 【十绝阵】跨天状态刷新 2021-07-19 17:30:17 +08:00
ZhangBiao d19d2f7dd3 【优化】心愿抽卡将孙悟空从心愿池去除 2021-07-19 15:50:35 +08:00
jiaoyangna 190fa0b1a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-19 14:10:15 +08:00
jiaoyangna 4d8bf852d4 Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
2021-07-19 14:10:11 +08:00
jiaoyangna 01b3f79c43 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40 2021-07-19 14:09:40 +08:00
ZhangBiao 8df0d462f8 【惊喜礼盒】顺序错乱修改 2021-07-19 13:51:57 +08:00
jiaoyangna a8523745fb 抽卡界面 选中位置修改提交 2021-07-19 11:58:43 +08:00
jiaoyangna 61a2da78cd 超值基金跳转 2021-07-19 11:48:41 +08:00
DESKTOP-98AVA47\Administrator 9331a9916d 概率修改提交 2021-07-19 11:31:13 +08:00
zhangqiang f40c3bd33a 【动游】场景 2021-07-19 11:12:24 +08:00
zhangqiang ea0e707e7e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-19 11:02:45 +08:00
zhangqiang baf39fc1a3 【动游】场景 2021-07-19 11:02:25 +08:00
liujiaqi 57fade3e9d 罗浮争锋称号 2021-07-28 10:31:29 +08:00
DESKTOP-98AVA47\Administrator 13e6b5e522 乾坤宝盒报错修改提交 2021-07-19 10:59:13 +08:00
JieLing 8f3c0ca5a9 Merge remote-tracking branch 'origin/china/test' into china/zf_test 2021-07-17 13:04:03 +08:00
gaoxin 658a87f499 【热更配置】添加游心渠道 2021-07-17 13:02:27 +08:00
gaoxin 3205cdf5d0 【热更配置】添加游心渠道 2021-07-17 12:57:43 +08:00
JieLing 69685b2d9a Merge remote-tracking branch 'origin/china/test' into china/zf_test 2021-07-17 11:15:04 +08:00
jiaoyangna 641e3205bc 幸运探宝十连报错修改 2021-07-17 10:35:22 +08:00
jiaoyangna b966fec333 幸运探宝十连报错修改 2021-07-17 10:14:25 +08:00
JieLing 2d01acfcff Merge remote-tracking branch 'origin/china/test' into china/zf_test 2021-07-16 19:51:04 +08:00
luyao 9a65f93211 玲珑宝镜修改 2021-07-16 19:12:35 +08:00
jiaoyangna 17d01c95ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 19:03:45 +08:00
jiaoyangna 05d12558b7 玲珑宝镜 2021-07-16 19:03:41 +08:00
wangzhenxing 59b36cbf94 [战斗]==========被动292 修改 追加得技能一次行动只追加一次,且不触发任何特性 2021-07-16 18:36:52 +08:00
jiaoyangna f631bb3c15 玲珑宝镜修改提交 2021-07-16 18:11:50 +08:00
jiaoyangna 6ed3b05885 四元阵修改提交 2021-07-16 17:59:22 +08:00
jiaoyangna ea704d62c3 Revert "四元阵修改提交"
This reverts commit f33d64871a.
2021-07-16 17:58:13 +08:00
jiaoyangna f33d64871a 四元阵修改提交 2021-07-16 17:57:45 +08:00
jiaoyangna 05358f15f5 玲珑宝镜修改提交 2021-07-16 17:52:33 +08:00
jiaoyangna 4f0f69b17e 玲珑报警 2021-07-16 17:41:56 +08:00
jiaoyangna c1a7cba724 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 17:41:41 +08:00
jiaoyangna a2fa26e67e 玲珑宝镜修改提交 2021-07-16 17:41:38 +08:00
ZhangBiao 309486e443 【点将台】报错修改提交 2021-07-16 16:54:17 +08:00
luyao 8aeb433618 玲珑宝镜道具图标 ——镜纹秘钥 2021-07-16 16:44:02 +08:00
JieLing f71af87cde Merge branch 'china/local' into china/test 2021-07-16 16:35:58 +08:00
jiaoyangna ef35e0bca0 玲珑宝镜帮助修改提交 2021-07-16 16:24:56 +08:00
jiaoyangna 360a8d3cae 主题活动限时召唤,乾坤宝盒卡死提交 2021-07-16 16:23:35 +08:00
wangzhenxing a70f45e7a5 [乾坤宝盒]==========提示文字颜色修改 2021-07-16 16:19:59 +08:00
gaoxin 2504268b55 【stream资源】修改StreamingAsset中的资源配置,添加视频配置 2021-07-16 16:06:35 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
gaoxin 09c438a341 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:55:07 +08:00
zhangqiang 80fe4f0ae3 【包配置】添加游心专服和内网包的打包配置 2021-07-16 15:54:53 +08:00
jiaoyangna 2d6f5f3fb1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:51:12 +08:00
jiaoyangna bec2eca580 适配修改 2021-07-16 15:51:06 +08:00
JLIOSM1 56e7492a91 【商店】修复妖精商店资源回收导致白片 2021-07-16 15:37:48 +08:00
luyao aa3c2f7694 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:16:02 +08:00
luyao 3baf85791e 主题活动,限时召唤中。【更换武将】图片资源替换为【更换神将】 2021-07-16 15:15:25 +08:00