Commit Graph

6142 Commits (31e8594a70216fd2f59368de772eecf5f0c67a05)

Author SHA1 Message Date
wangzhenxing 31e8594a70 [战斗]=========御甲添加 图片字提示表现 2021-09-30 09:53:31 +08:00
jiaoyangna b88bfef04f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 18:23:26 +08:00
jiaoyangna b44c4af217 好感度0点次数刷新修改 2021-09-29 18:23:13 +08:00
gaoxin 73709000a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 17:34:38 +08:00
gaoxin 971a457224 【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题 2021-09-29 17:34:20 +08:00
jiaoyangna 8abe248a24 逍遥游奖励界面修改提交 2021-09-29 16:21:24 +08:00
jiaoyangna 4dfdc507f7 绿色修改提交 2021-09-29 16:19:29 +08:00
jiaoyangna a62e656d7b Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-29 15:49:39 +08:00
gaoxin 0abe5663c6 【战斗力】debug时不再计算老版本的战斗力 2021-09-29 14:55:14 +08:00
jiaoyangna ee096187ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 14:35:15 +08:00
jiaoyangna f2273e427c 逍遥游改表代码修改提交 2021-09-29 14:34:59 +08:00
gaoxin 2352144ead 【四灵试炼】助战神将报错 2021-09-29 09:19:53 +08:00
gaoxin b1dff6a023 【四灵试炼】修复计算助战神将战斗力报错 2021-09-29 08:33:09 +08:00
jiaoyangna c242b86dd2 好感度详情提交 2021-09-28 18:23:37 +08:00
jiaoyangna b6a9cbc1c1 进度条修改提交
(cherry picked from commit 592845bf98)
2021-09-28 17:41:47 +08:00
jiaoyangna d7dc0425cb 玲珑宝镜修改提交 2021-09-28 17:22:00 +08:00
jiaoyangna 26832c2350 去掉log 2021-09-28 13:43:23 +08:00
jiaoyangna d9162dbbe3 选中框修改提交 2021-09-28 13:39:24 +08:00
jiaoyangna 5d9b93ca57 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-28 11:31:00 +08:00
jiaoyangna 46731f726f 玲珑宝镜修改提交 2021-09-28 11:30:44 +08:00
ZhangBiao 77eccdd8b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-28 11:24:04 +08:00
ZhangBiao 8ec75376da 【限时召唤】报错修改 2021-09-28 11:23:50 +08:00
gaoxin 4d4e8cf55e 【副本战斗】战斗结算时报错 2021-09-28 11:20:42 +08:00
jiaoyangna b0c02a7ff0 修改道具排序顺序 2021-09-28 10:12:12 +08:00
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 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
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