Commit Graph

3079 Commits (a4254e28cb0f859f5a40deda5ad93d63923a6f57)
 

Author SHA1 Message Date
zhangqiang 7452d795e8 灵兽提交 2020-10-22 20:50:11 +08:00
liujiaqi 95072a98c5 灵兽商店社稷大典商店标题资源灵兽小头像 2020-10-22 19:00:10 +08:00
jiaoyangna dbccde8b77 累计充值修改提交 2020-11-04 05:30:12 +08:00
jiaoyangna b6e5225bcf 累计充值修改提交 2020-11-04 05:23:46 +08:00
jiaoyangna aac7afa586 主题活动修改 2020-11-04 04:34:51 +08:00
jiaoyangna 205340e73a 累计充值修改 2020-11-04 04:05:20 +08:00
jiaoyangna fca650d5b3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-04 03:51:10 +08:00
jiaoyangna 14b7b6f4cf 累计充值修改 2020-11-04 03:51:04 +08:00
zhangqiang 6d200caf1d 灵兽提交 战力改变 2020-10-22 18:32:11 +08:00
wangzhenxing c5b73fed7f 抽卡灵兽修改 2020-10-22 16:25:40 +09:00
wangzhenxing b49c3f220d Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-22 16:15:57 +09:00
zhangqiang eb153fdaa6 灵兽提交 2020-10-22 16:13:44 +08:00
wangzhenxing e193bc2c21 灵兽抽卡剩余时间修改 2020-10-22 16:15:09 +09:00
wangzhenxing 1dbfab0029 灵兽抽卡显示修改 2020-10-22 16:07:38 +09:00
wangzhenxing e516aa6c14 被动效果修改 2020-10-22 14:53:49 +09:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
jiaoyangna b93bef6237 剔除id为0 的礼包 2020-10-22 11:26:00 +08:00
jiaoyangna 7931e3ed1c Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-22 11:12:17 +08:00
zhangqiang 83088ea429 提交 2020-10-22 10:03:46 +08:00
jiaoyangna 420cef2355 无效的红点检测 2020-10-21 18:24:17 +08:00
wangzhenxing 11ccf2ab6f 灵兽分解预设提交 2020-10-21 17:25:12 +09:00
jiaoyangna d555d983ea 累计充值修改提交, 灵兽提交 2020-10-21 16:05:33 +08:00
wangzhenxing 02c55bcdb3 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-21 16:41:22 +09:00
wangzhenxing 80ebcccbbc 灵兽放生提交 2020-10-21 16:41:11 +09:00
zhangqiang 74858bdbe7 灵兽提交 2020-10-21 15:40:23 +08:00
jiaoyangna b26ba765bc 勇往直前 提交 2020-10-21 14:16:02 +08:00
zhangqiang f8d6c63368 灵兽提交 上阵提交 2020-10-21 11:58:16 +08:00
gaoxin b72d6b46bb Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit b8eabfe641.
2020-10-20 21:17:26 +08:00
gaoxin b8eabfe641 【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题 2020-10-20 20:36:44 +08:00
gaoxin 8081350fbe 【战斗0.0.6】修复判断数据是否存在接口错误 2020-10-20 20:26:44 +08:00
zhangqiang 3a6c14f607 灵兽提交 2020-10-20 20:18:02 +08:00
gaoxin 711b240235 骰子音效遴选提交 2020-10-20 18:10:07 +08:00
yuanshuai 8cb68ceaa4 逍遥游地图界面优化:1.自动游历返回时提示二级确认弹窗 2.记录自动游历状态 2020-10-20 18:05:33 +08:00
jiaoyangna ecd0cc8f22 逍遥游云游宝玉修改提交 2020-10-20 17:40:47 +08:00
yuanshuai c3a67ef9aa Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-20 16:07:02 +08:00
yuanshuai 85507e2f6a 逍遙游自动游历开启 相关脚本资源提交 2020-10-20 16:06:52 +08:00
wangzhenxing a3b8be0abe 技能期间只触发一次被动触发条件修改 2020-10-20 16:20:14 +09:00
wangzhenxing ab4fa7925d Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-20 16:17:21 +09:00
zhangqiang c6f34794f3 灵兽提交 2020-10-20 16:08:51 +08:00
wangzhenxing 4e047140a8 灵兽提交 2020-10-20 16:17:08 +09:00
JieLing 3666441445 【逍遥游】修复行动力不会恢复满的问题 2020-10-20 15:16:07 +08:00
JieLing e3cac704d0 【逍遥游】优化奖励界面显示 2020-10-20 15:16:01 +08:00
ZhangBiao 23f4b9c65d 【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
2020-10-20 14:59:25 +08:00
gaoxin 8aa4abdbeb 【逍遥游】云游值自动恢复修改 2020-10-20 00:23:42 +08:00
gaoxin 7ea442ff5d Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-19 23:52:22 +08:00
gaoxin 27eaa02a88 修复部分奖励不刷新的问题 2020-10-19 23:51:15 +08:00
yuanshuai 92af021625 倒计时云游值回复问题修改 2020-10-19 23:49:21 +08:00
yuanshuai 7e0f32ec1f 逍遥游bug修改 2020-10-19 23:24:07 +08:00
gaoxin 4eb846d8c3 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys 2020-10-19 22:56:22 +08:00
gaoxin ba87f5c181 【逍遥游】功能入口随功能开启添加 2020-10-19 22:56:05 +08:00