Commit Graph

58 Commits (2a5a23f3ed3a2eabb57ccf08959e1f04291f4da6)

Author SHA1 Message Date
ZhangBiao 2e57796328 礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
2020-10-13 19:12:24 +08:00
ZhangBiao e063c2c23d 推送礼包。。。。 2020-10-13 18:39:55 +08:00
ZhangBiao 63a1588f66 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-13 13:51:11 +08:00
zhangqiang 2c9d7c7224 线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错 2020-10-12 14:02:17 +08:00
gaoxin 285a41ae05 修改bug 限时活动itemView报错 2020-10-12 11:28:20 +08:00
jiaoyangna 25d4148059 【丹心碧血】限时兑换活动界面黑屏 2020-10-12 11:00:31 +08:00
zhangqiang cfb6870a31 线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3 2020-10-10 19:37:50 +08:00
zhangqiang d2f9ffd2db 线上活动 森罗幻境达人前端显示 2020-10-10 14:51:50 +08:00
zhangqiang c2677fe193 限时升级活动打开后 退出一段时间再返回报错 2020-10-10 14:13:30 +08:00
gaoxin 525e229273 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
zhangqiang 89a7256077 线上活动 : 四周活动 天宫达人 问题 2020-09-25 09:49:44 +08:00
zhangqiang 121901c06e 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-23 15:49:48 +08:00
zhangqiang 5f8b1027ee 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-23 14:51:33 +08:00
ZhangBiao e13026857d 限时兑换onhide function增加 2020-09-17 09:49:43 +08:00
ZhangBiao 5cd8e621dc 限时活动,限时兑换、礼包抢购增加动效 2020-09-16 14:09:31 +08:00
ZhangBiao dd4c91a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 16:53:23 +08:00
ZhangBiao ca65ebbe49 限时兑换添加到叱咤风云中 2020-09-10 16:53:06 +08:00
gaoxin 70a575cbb3 部分界面不再常驻内存 2020-09-10 14:25:02 +08:00
gaoxin 64f382c54d 充值接口修改,sdk和本地走同一套接口 2020-09-09 18:47:17 +08:00
gaoxin b9481babee 部分界面音效添加 2020-09-09 13:59:22 +08:00
zhangqiang 4bcb51e164 添加寻宝排行榜 和 巅峰赛赛季更新修改 2020-09-09 11:20:29 +08:00
zhangqiang bf541ed4b0 寻宝达人替换资源 2020-09-09 10:36:55 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
ZhangBiao 40266d1120 删除一些log、修复升级豪礼红点bug 2020-08-31 16:32:27 +08:00
ZhangBiao d1e0e6e133 升级豪礼红点显示错误修复 2020-08-31 14:35:35 +08:00
zhangqiang d452d76d05 显示活动选中修改 替换出包图片资源 2020-08-27 16:54:26 +08:00
zhangqiang 47a16583ee 达人排行点击事件修复 2020-08-26 23:07:04 +08:00
ZhangBiao d644b64450 删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵 2020-08-26 15:14:27 +08:00
JieLing fcc9a5eb2a 修复打开限时活动界面报错的问题 2020-08-25 21:55:13 +08:00
JieLing 5a89f52577 充值商品价格改为按配置显示 2020-08-25 17:59:34 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao 6f6758bf14 元—>$的替换 2020-08-25 13:57:21 +08:00
JieLing c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +08:00
jiaoyangna 887329a458 hondian 2020-08-22 20:57:19 +08:00
jiaoyangna a63f5e92d2 急速达人红点提交 2020-08-22 20:46:06 +08:00
jiaoyangna 4477c38a25 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 19:40:19 +08:00
jiaoyangna 056815a8b6 patch commit 2020-08-22 19:40:14 +08:00
zhangqiang 8f72af20cc 公会副本提交 达人排行修改 2020-08-22 18:03:43 +08:00
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
zhangqiang b279baaa41 公会副本提交 2020-08-22 13:49:47 +08:00
jiaoyangna fa1f5a7c35 五星成长礼提交 2020-08-19 22:03:47 +08:00
ZhangBiao f18973cea9 极速达人修改 2020-08-18 19:17:20 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
jiaoyangna 1f7b161087 五星成长礼修改提交 2020-08-14 13:32:55 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
ZhangBiao 971622a4c5 限时兑换 文字修改 2020-07-29 18:36:36 +08:00
zhangqiang b63e9b7e81 英雄添加按战力排序 2020-07-31 14:45:32 +08:00
gaoxin db1118aa9c 修复打包后不能充值得bug 2020-07-13 16:48:50 +08:00
2han9B1a0 e2c5b69f38 星级成长里bug修复 2020-07-03 16:02:57 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00