Commit Graph

9679 Commits (e01b39c8a471e43ea042a29a560c3b3b4d04d964)
 

Author SHA1 Message Date
jiaoyangna 33acb35f82 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-09-28 09:52:22 +08:00
jiaoyangna 92294c6239 赠送之后立绘动作修改 2021-09-28 09:47:56 +08:00
jiaoyangna a3a8e8c2a7 预设修改提交 2021-09-27 21:53:04 +08:00
jiaoyangna e54fc2faa9 去掉左右切换按钮 2021-09-27 21:43:04 +08:00
jiaoyangna ba7421ffa7 添加点击神将的互动 2021-09-27 21:39:43 +08:00
jiaoyangna 6de82cb731 好感度tips 提交 2021-09-27 21:35:55 +08:00
jiaoyangna 6e3dbffb64 报错修改 2021-09-27 20:33:45 +08:00
jiaoyangna 2e2a0d6edd 桃心位置修改 2021-09-27 20:26:45 +08:00
gaoxin 94782f7cf4 【ID1018635】 【唯一限制魂印】同时戴舍身济世和历战之躯,恭送掉该神将数据只会清一个,另一个依然是无法佩戴 2021-09-27 20:18:10 +08:00
jiaoyangna 75049d619c 好感度位置修改 2021-09-27 20:07:55 +08:00
jiaoyangna af63daaeaf 好感度到达最大值修改 2021-09-27 19:20:29 +08:00
gaoxin ed3f38f9cb 【战斗力】修复部分数据刷新不及时 2021-09-27 18:33:58 +08:00
ZhangBiao a67e3226ce 【寻宝迷踪】走到指定地点,返回,再进入挖宝图标亮起 2021-09-27 17:52:24 +08:00
ZhangBiao 1fd9f8a004 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:46:53 +08:00
jiaoyangna ad35e1646c 特权显示修改 2021-09-27 17:46:43 +08:00
ZhangBiao a8c9c836a9 【排行榜】膜拜转圈儿修复 2021-09-27 17:46:40 +08:00
gaoxin a2cd31dbd2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:35:48 +08:00
gaoxin eacf753e55 【战斗力】修复部分设置人物属性全部为脏数据时没有设置战斗力脏数据 2021-09-27 17:35:36 +08:00
wangzhenxing 1a808dfd54 [战斗]============被动137修改 添加查找没有触发不灭的技能目标 2021-09-27 17:33:51 +08:00
jiaoyangna ea52d01112 好感度新手引导修改提交 2021-09-27 17:26:35 +08:00
gaoxin f929826eba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:15:42 +08:00
gaoxin 07a96a88e4 【轩辕宝镜】修复只上阵了满足条件的神将,没有补位的问题 2021-09-27 17:13:48 +08:00
ZhangBiao a4ee19a351 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:02:59 +08:00
skuld 854f2df748 【四灵试炼】增加一行文字 2021-11-02 02:46:08 +08:00
ZhangBiao 5939c5b2f8 【七界试炼】跳转提交 2021-09-27 17:02:43 +08:00
gaoxin c8c003abb7 【无尽副本】修复编队无法保存的问题 2021-09-27 16:58:08 +08:00
gaoxin 38f41e7517 【战斗】修复无尽副本战斗结束后报错 2021-09-27 16:57:40 +08:00
jiaoyangna c778c334e5 添加道具属性显示 2021-09-27 16:49:25 +08:00
jiaoyangna 644d8e3790 长按短按效果添加 2021-09-27 16:43:01 +08:00
jiaoyangna 9276097bf4 神将不能拖动修改 2021-09-27 16:27:58 +08:00
wangzhenxing 70ebab2fe1 【功能】====装备合成添加特效 2021-09-27 16:25:20 +08:00
jiaoyangna 516ddb44ae 预设大小修改 2021-09-27 15:58:34 +08:00
yuanshuai f16bb7ed8e 【四象心法】长按强化bug修改 2021-09-27 15:57:36 +08:00
jiaoyangna 8aeb4f2416 添加逍遥游跳转 2021-09-27 15:50:25 +08:00
jiaoyangna 1d1e21a9e7 属性格式修改提交 2021-09-27 15:45:23 +08:00
gaoxin 0233ff87e7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 15:36:00 +08:00
gaoxin 34ade2489d 【无尽副本】修复报错 2021-09-27 15:35:48 +08:00
ZhangBiao 6bc25cd08c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 15:33:52 +08:00
ZhangBiao e4250d3fac 【七界试炼】红点不再请求数据 2021-09-27 15:33:30 +08:00
gaoxin 6c50cdfd09 【无尽副本】修复无尽副本编队没有人得问题 2021-09-27 14:57:27 +08:00
ZhangBiao 810614f226 【四象心法】增加跳转
(cherry picked from commit 98d3911f23)
2021-09-27 14:37:20 +08:00
jiaoyangna 9137d9f592 新手引导调整 2021-09-27 14:22:23 +08:00
gaoxin 919740cdae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 13:48:13 +08:00
gaoxin 5ae29d86cd 【织女】法宝资源名修改 2021-09-27 13:48:09 +08:00
gaoxin 2dca8dadf4 【资源】织女音效提交 2021-09-27 13:48:02 +08:00
liujiaqi f17f7cd6dc 【资源】织女技能字音效 2021-09-27 13:47:32 +08:00
wangzhenxing 433ae25590 [战斗]======被动351 353 修改 2021-09-27 13:47:27 +08:00
gaoxin f16fb2680b 【织女特效】资源名重复优化 2021-09-27 13:47:23 +08:00
wangzhenxing 5c5e0e26a3 【资源】=========织女 特效资源提交 2021-09-27 13:46:53 +08:00
ZhangBiao 90d9530b2b 【乾坤宝盒】报错修改 2021-09-27 11:46:17 +08:00