Commit Graph

1014 Commits (4f64e56b9545a3c9eccbcdefea3edbba0e667dfa)

Author SHA1 Message Date
ZhangBiao 4f64e56b95 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 10:19:03 +08:00
ZhangBiao 7c02e82218 森罗回春散bug修复 2020-08-28 10:14:46 +08:00
gaoxin 259e0a1209 祈福文字修改 2020-08-28 03:12:54 +08:00
gaoxin 5d03b4fea8 巅峰赛按钮当日五点开始显示 2020-08-28 01:24:32 +08:00
gaoxin 1452da3489 修复在地图中直接退出游戏,再进入游戏时部分功能提示在地图中的问题 2020-08-28 00:34:02 +08:00
gaoxin 0f5c4ad6d0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 00:24:12 +08:00
gaoxin c933276cea 试炼增益添加滑动效果 2020-08-28 00:24:06 +08:00
jiaoyangna cc32ffadec hecheng 2020-08-28 00:15:32 +08:00
jiaoyangna 8e5e508494 置换 commit 2020-08-28 00:09:07 +08:00
gaoxin e6c8e81c82 修复小游戏反复打开会报错的问题 2020-08-27 23:01:07 +08:00
jiaoyangna efd5a46eed 大闹天宫死亡置换修改提交 2020-08-27 22:52:51 +08:00
ZhangBiao d87f14b479 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 22:25:19 +08:00
ZhangBiao 013bed75d7 2020-08-27 22:25:10 +08:00
jiaoyangna 7aff7b3c5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 22:23:09 +08:00
jiaoyangna 80f59d54f1 置换编队检测还原 2020-08-27 22:23:04 +08:00
ZhangBiao fbbe8db26f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua
2020-08-27 22:11:02 +08:00
ZhangBiao 4a452addd1 天宫秘宝报错修改 2020-08-27 22:10:08 +08:00
jiaoyangna 94e0dc10df Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 21:42:25 +08:00
jiaoyangna 010f44b1b0 commit zhihuan 2020-08-27 21:41:30 +08:00
gaoxin a7fea145f6 修复日周月礼包不显示的问题 2020-08-27 21:40:01 +08:00
gaoxin aea5077487 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 21:34:43 +08:00
gaoxin b78d3e667e 每日充值金额显示不在计算差值 2020-08-27 21:34:38 +08:00
jiaoyangna f2f3b77260 biandui update 2020-08-27 21:29:03 +08:00
jiaoyangna f25bdb2d17 神将置换去掉检测编队 2020-08-27 21:17:47 +08:00
jiaoyangna 283ffca275 神将置换不检测无尽副本 2020-08-27 21:01:05 +08:00
jiaoyangna 3961935716 【神将置换】在大闹天宫编队中不需要提示已上阵,可以直接操作置换 2020-08-27 20:45:27 +08:00
jiaoyangna ff4d3e35c1 pozhenzhuxian redpoint update 2020-08-27 19:52:05 +08:00
jiaoyangna 9ed09dc1d2 tiangong serecttreasure commit 2020-08-27 19:41:51 +08:00
zhangqiang fa3003fdc6 云梦祈福修改提交 2020-08-27 19:28:06 +08:00
gaoxin 51abf7d496 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:35:51 +08:00
gaoxin 82606d8fbe 每日周月礼包根据后端数据判断显隐 2020-08-27 18:35:32 +08:00
ZhangBiao a69ef6ca5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:31:56 +08:00
ZhangBiao 2a2eac8cbb 森罗战斗失败两次弹出失败 2020-08-27 18:31:39 +08:00
jiaoyangna 227f5a9a38 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:24:44 +08:00
jiaoyangna 6aaa749852 activitydetail effect commit 2020-08-27 18:24:05 +08:00
ZhangBiao 82ec03a605 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:16:02 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
gaoxin 1ce0e4b15c 战斗怒气文字修改 2020-08-27 17:26:55 +08:00
zhangqiang d452d76d05 显示活动选中修改 替换出包图片资源 2020-08-27 16:54:26 +08:00
jiaoyangna cb50189d13 处于传记页签时,切换后仍选中传记,但显示变为情报页签内容 2020-08-27 16:50:04 +08:00
jiaoyangna a6382ff8d2 选中传记页签后,按钮变为“传说” 2020-08-27 16:44:25 +08:00
jiaoyangna a350ec795d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 16:05:51 +08:00
jiaoyangna ca618e9f33 add xuanyuan des 2020-08-27 16:05:46 +08:00
zhangqiang fe3ff00677 增加魂印战力 2020-08-27 15:21:08 +08:00
ZhangBiao 114c910cd8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 15:18:27 +08:00
ZhangBiao 52643c3937 大闹天宫入口开启修改 2020-08-27 15:18:17 +08:00
jiaoyangna 1c17724594 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 15:02:03 +08:00
jiaoyangna cb69e474b9 qinglong task redpoint commit 2020-08-27 14:53:27 +08:00
JieLing 987ad6a325 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 14:29:21 +08:00
JieLing 78729f680d 修复公会界面监听事件错误,导致公会技能升级卡顿的问题 2020-08-27 14:29:14 +08:00