Commit Graph

7322 Commits (99b2c98128911444915ea20d2ff9497299f0fd73)
 

Author SHA1 Message Date
gaoxin 99b2c98128 【成长基金】修复红点不消失的问题 2021-07-01 12:30:56 +08:00
jiaoyangna a175e18946 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 20:39:23 +08:00
jiaoyangna fbfb637231 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 20:39:20 +08:00
wangzhenxing 4aca30c5ec 图片字预设修改提交 2021-06-30 20:17:59 +08:00
jiaoyangna bb9b58d489 Merge branch '0功能/神将来源' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-06-30 19:57:49 +08:00
gaoxin 38b1a22a2d 【bug】尝试修复打开游戏时花瓶的问题 2021-06-30 19:50:47 +08:00
jiaoyangna bfd653a98f 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:48:05 +08:00
jiaoyangna 349404d50e 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:28:43 +08:00
jiaoyangna 2cbb0b0a59 添加特效 2021-06-30 18:46:15 +08:00
zhangqiang 34fbfe02d1 【线上问题】十绝阵挑战次数显示负数 2021-06-30 18:28:51 +08:00
jiaoyangna 3fadc63852 商店物品添加特效 2021-06-30 18:12:24 +08:00
wangzhenxing 2578107be4 【战斗】============战斗图片字显示修改 2021-06-30 18:06:56 +08:00
wangzhenxing b99c52d22c 【bug】========【ID1016790】
灼烧 中毒等buff 在携带者被杀死的情况不提示清除
2021-06-30 18:03:13 +08:00
wangzhenxing b3650db6ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 18:01:13 +08:00
wangzhenxing 4ad64a41f2 [bug]==========福利红包红点修改 2021-06-30 18:00:52 +08:00
jiaoyangna 3c9b593dfa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 17:19:59 +08:00
jiaoyangna 3f6d1af735 首充不能领取修改提交 2021-06-30 17:19:55 +08:00
zhangqiang dbe2b1f3ea 【心魔试炼】资源替换2 2021-06-30 16:29:37 +08:00
jiaoyangna 9d11a48f70 跳转返回报错修改 2021-06-30 16:21:37 +08:00
jiaoyangna 36cb3db3af 底图修改提交 2021-06-30 16:17:50 +08:00
jiaoyangna a4281ed031 四元阵跳转修改 2021-06-30 16:07:37 +08:00
zhangqiang bd27e2094b 【心魔试炼】资源替换 2021-06-30 16:03:40 +08:00
jiaoyangna e44449391d 神将来源修改提交 2021-06-30 15:47:13 +08:00
jiaoyangna b5324c165a 神将来源碎皮合成修改提交 2021-06-30 15:27:27 +08:00
ZhangBiao 3675ec9699 【心愿抽卡】取消按钮入场动画 2021-06-30 14:41:02 +08:00
jiaoyangna a1c397d1f3 无尽商店添加需刷新 2021-06-30 14:32:58 +08:00
ZhangBiao cebee6a95b 【邮件】置顶邮件报错修改 2021-06-30 14:26:05 +08:00
jiaoyangna b65e6c7bac 神将来源修改提交 2021-06-30 14:21:02 +08:00
jiaoyangna 6e0eccfde5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 14:11:00 +08:00
jiaoyangna a556ee7e2d 关闭界面时 称号预设未关闭 错误 问题修改 2021-06-30 14:10:30 +08:00
ZhangBiao 4507a0d139 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 13:51:56 +08:00
ZhangBiao 00ad684deb 【心愿抽卡】QA 2021-06-30 13:51:47 +08:00
gaoxin de8479ba3d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 13:46:34 +08:00
gaoxin fdba4e7aa3 【充值】添加第四个透传参数 平台(ANDROID或IOS) 2021-06-30 13:46:28 +08:00
ZhangBiao 55bdc21a99 【心愿抽卡】增加初始化操作 2021-06-30 12:01:39 +08:00
ZhangBiao 782b20fa0c 【心愿抽卡】初始化抽卡总次数 2021-06-30 11:56:23 +08:00
jiaoyangna ed1cf199a2 神将来源修改 2021-06-30 11:50:11 +08:00
jiaoyangna 58994f5a38 神将来源修改 2021-06-30 11:42:22 +08:00
jiaoyangna 6429cba1d4 代码报错修改 2021-06-30 11:37:33 +08:00
jiaoyangna de0b9be884 添加首充和至尊降世的 显示 2021-06-30 11:36:07 +08:00
ZhangBiao 194c610b14 Merge branch 'china/dev' into 0功能/心愿抽卡 2021-06-30 11:00:00 +08:00
ZhangBiao 83fd6716e4 【心愿抽卡】增加长按查看操作 2021-06-30 10:58:35 +08:00
ZhangBiao 7d366000be 【心愿抽卡】完成 2021-06-30 10:52:05 +08:00
jiaoyangna de642a3572 去掉点击事件 2021-06-30 10:48:50 +08:00
wangzhenxing aeed1703bd 【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交 2021-06-30 10:40:52 +08:00
ZhangBiao 37e854190b 【心愿抽卡】增加所有抽卡类型和输出 2021-06-30 10:36:48 +08:00
ZhangBiao ecb43803f4 【心愿抽卡】提交 2021-06-30 10:23:57 +08:00
jiaoyangna f834e2e17d 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-30 10:12:44 +08:00
ZhangBiao fc5a91522a 【心愿抽卡】提交 2021-06-29 20:29:22 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00