Commit Graph

7013 Commits (4ee928c2d4d3be3140fc9098695e8e348e720148)
 

Author SHA1 Message Date
gaoxin 4ee928c2d4 Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c 2021-06-10 22:56:18 +08:00
JieLing 0f0ba0dfc2 【包配置】灵动正式服数数appid修改 2021-06-10 22:53:46 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
jiaoyangna b76f517cbb [战斗]===============被动200修改 同阵营这个被动只会触发一次 2021-06-10 22:08:51 +08:00
wangzhenxing 4165e6acd5 【战斗】=======注释之前被动200修改 2021-06-10 22:02:35 +08:00
wangzhenxing 77121e01e3 [战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个 2021-06-10 21:57:00 +08:00
jiaoyangna 83553d8aef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 20:17:03 +08:00
jiaoyangna 04633b4ece 无尽副本快速返回主城报错 2021-06-10 20:16:44 +08:00
zhangqiang 23f90ccf52 【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差 2021-06-10 18:37:16 +08:00
JieLing 2e798c6888 【资源名重复】 2021-06-10 18:24:59 +08:00
zhangqiang 5d57464da8 【森罗音效】福星高照老头的音效,界面关闭不停 2021-06-10 17:56:07 +08:00
jiaoyangna 529067bb2f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 17:44:20 +08:00
jiaoyangna e087d4c57c ID1016424】
【无尽副本】反复从无尽地图返回主城报错
2021-06-10 17:43:52 +08:00
zhangqiang 4915842ee2 【山河社稷图】奖励排序 2021-06-10 17:05:51 +08:00
jiaoyangna ddd0ece70b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:38:43 +08:00
jiaoyangna 819278dd3d 【ID1016436】
【无尽副本】战斗结算界面有经验
2021-06-10 16:38:19 +08:00
gaoxin fbe1acdf43 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:38:18 +08:00
gaoxin 8494dd02d7 【立绘错位】尝试修复神将卡牌上有时会出现立绘错位 2021-06-10 16:37:44 +08:00
zhangqiang 3506d2bb2c 【页签图标替换】局部 + 修行提示文字修改 2021-06-10 16:33:43 +08:00
jiaoyangna 8115705d1a 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:30:49 +08:00
gaoxin 0458ee7bf7 【debug】修复部分报错导致报错的问题。。。 2021-06-10 16:11:02 +08:00
gaoxin 4382e822e0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:10:18 +08:00
gaoxin aa4f3df8b0 【拍脸】优化短时间触发拍脸有可能导致报错的问题 2021-06-10 16:10:12 +08:00
jiaoyangna f5a9a1368d 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:08:26 +08:00
jiaoyangna fed713464c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:00:23 +08:00
gaoxin dd19b43dd6 【特效】修复特权商城扫光特效显示错误 2021-06-10 15:54:57 +08:00
jiaoyangna cd4232304a 【ID1016435】
【首充】修改“赠40连抽”文字
2021-06-10 15:54:21 +08:00
gaoxin 3f47beac93 【支付】透传参数添加cc值 2021-06-10 15:20:31 +08:00
gaoxin ad2c3b84df Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 15:17:46 +08:00
gaoxin 43ae66d0d1 【音效】新增孙悟空,玉皇大帝,哪吒普攻特效,崇黑虎、蚩尤技能音效 2021-06-10 15:17:35 +08:00
gaoxin 0915c18368 【ID1009452】 增加森罗幻境老虎机音效 2021-06-10 15:16:17 +08:00
zhangqiang b3578a5ba4 【音效】跳转不同界面再返回,音效没有跟着切换 2021-06-10 14:50:28 +08:00
zhangqiang 18950a2326 【山河社稷图】章节图标修改 2021-06-10 14:43:45 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
gaoxin a943681b63 【工具】热更工具添加同步GIT的功能 2021-06-10 10:32:10 +08:00
gaoxin 06a1d63a1e 【配置】本地添加ccid的配置 2021-06-10 10:17:18 +08:00
gaoxin 5005b0975a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 20:30:42 +08:00
gaoxin 362e7ab9aa 【打包工具】修改出包的记录时间为24小时制 2021-06-09 20:30:10 +08:00
zhangqiang 8b4aa53984 【心魔试炼】3 2021-06-09 20:29:50 +08:00
gaoxin 1a12b261d5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 20:20:38 +08:00
gaoxin 07a35aec13 【幸运探宝】按钮位置修改 2021-06-09 20:20:16 +08:00
zhangqiang d21ebe57bb 【心魔试炼】2 2021-06-09 20:12:11 +08:00
zhangqiang d91c57f6ea 【心魔试炼】 2021-06-09 19:48:28 +08:00
jiaoyangna ad0da1e940 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:48:52 +08:00
jiaoyangna 7c1d58b3eb 青龙秘宝修改 提交 2021-06-09 18:48:24 +08:00
gaoxin bfb77649ba Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:29:14 +08:00
gaoxin d96a03bd57 【特效】修复崇黑虎技能显示错误 2021-06-09 18:27:55 +08:00
jiaoyangna cf47376987 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:24:56 +08:00
jiaoyangna fdc4d2f203 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 18:24:27 +08:00
gaoxin 53b2ae451f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:18:52 +08:00