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 |
gaoxin
|
8692e6cec9
|
【四灵试炼】修复计算助战神将战斗力报错
|
2021-09-29 08:32:40 +08:00 |
gaoxin
|
788d18e332
|
【装备对比】背包中的装备信息界面修改
|
2021-09-28 21:00:50 +08:00 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +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 |
wangzhenxing
|
81ace8ae2e
|
玉虚论道入口修改
|
2021-09-28 17:29:33 +08:00 |
jiaoyangna
|
d7dc0425cb
|
玲珑宝镜修改提交
|
2021-09-28 17:22:00 +08:00 |
wangzhenxing
|
d45abf6fcf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-28 15:54:33 +08:00 |
wangzhenxing
|
ae3efee379
|
提交修改
|
2021-09-28 15:50:09 +08:00 |
jiaoyangna
|
26832c2350
|
去掉log
|
2021-09-28 13:43:23 +08:00 |
jiaoyangna
|
d9162dbbe3
|
选中框修改提交
|
2021-09-28 13:39:24 +08:00 |
wangzhenxing
|
f580f14a44
|
段位特效修改提交
|
2021-09-28 11:51:20 +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 |
wangzhenxing
|
e42540ade8
|
排行榜修改提交
|
2021-09-28 10:29:33 +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 |
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 |
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 |
wangzhenxing
|
433ae25590
|
[战斗]======被动351 353 修改
|
2021-09-27 13:47:27 +08:00 |
ZhangBiao
|
90d9530b2b
|
【乾坤宝盒】报错修改
|
2021-09-27 11:46:17 +08:00 |
jiaoyangna
|
fb2bcaff48
|
好感度增加返回提示
|
2021-09-27 11:22:17 +08:00 |
jiaoyangna
|
4e17b829ba
|
红点修改提交,挂机界面预览修改提交
|
2021-09-27 10:58:41 +08:00 |
jiaoyangna
|
d4e3a3294c
|
引导修改提交
|
2021-09-27 10:41:32 +08:00 |
ZhangBiao
|
cdd6499fe8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 10:34:19 +08:00 |
ZhangBiao
|
0842438fdf
|
【装备分解】不可分解白金装备and增加mask点击
|
2021-09-27 10:34:03 +08:00 |
jiaoyangna
|
683e71ae89
|
好感度入口调整
|
2021-09-27 09:45:57 +08:00 |
jiaoyangna
|
13428bc854
|
神将排序修改
|
2021-09-26 21:49:05 +08:00 |
jiaoyangna
|
a0778d0173
|
新手引导修改
|
2021-09-26 21:46:01 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
gaoxin
|
ace42823db
|
【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题
|
2021-09-26 20:48:32 +08:00 |
gaoxin
|
2bce8547c7
|
【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害
|
2021-09-26 20:31:51 +08:00 |
jiaoyangna
|
d39ef472dc
|
好感度提交
|
2021-09-26 20:23:08 +08:00 |
wangzhenxing
|
3ff3649284
|
【功能】======白金装备合成 最少显示信息修改
|
2021-09-26 20:03:14 +08:00 |
wangzhenxing
|
306ab999b9
|
[功能]=============白金装备合成红点修改
|
2021-09-26 19:47:18 +08:00 |
gaoxin
|
f282fe046b
|
【白金装备】修改白金装备字体显示
|
2021-09-26 18:41:47 +08:00 |
gaoxin
|
54afaef65a
|
【GM】一键顶级装备红色一星装备生成错误
|
2021-09-26 17:43:38 +08:00 |
gaoxin
|
e318ca197f
|
【GM】一键顶级装备,增加白金装备
|
2021-09-26 17:40:48 +08:00 |
gaoxin
|
8310c29aaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:38:39 +08:00 |
gaoxin
|
b21e7efe0d
|
【角色信息】修复跳转到角色信息界面,点击左右箭头报错
|
2021-09-26 17:38:23 +08:00 |
wangzhenxing
|
e763b6472b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:31:16 +08:00 |
wangzhenxing
|
a3e1782007
|
【功能】==========白金装备合成提交
|
2021-09-26 17:30:35 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
d7276eae64
|
战力修改提交
|
2021-09-26 15:23:33 +08:00 |
gaoxin
|
e671673389
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 15:02:49 +08:00 |
gaoxin
|
59311a8d88
|
【跨服】算错了跨服前七天的事件
|
2021-09-26 15:02:33 +08:00 |
wangzhenxing
|
221939e1ec
|
[战斗]==========御甲条显示修改
|
2021-09-26 14:56:07 +08:00 |
jiaoyangna
|
330b36b55a
|
好感度等级修改
|
2021-09-26 14:21:22 +08:00 |
jiaoyangna
|
e59f160387
|
好感度等级修改提交
|
2021-09-26 13:55:57 +08:00 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +08:00 |
jiaoyangna
|
14b967185b
|
好感度提交
|
2021-09-26 10:18:51 +08:00 |
ZhangBiao
|
59e51aefef
|
【七界试炼】提交
|
2021-09-26 10:08:15 +08:00 |
ZhangBiao
|
8f9743d127
|
【七界试炼】激活遗物提示,奖励遮盖
|
2021-09-26 10:01:37 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
ZhangBiao
|
bac86d5ec8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 19:23:43 +08:00 |
ZhangBiao
|
1a866b1068
|
【七界试炼】提交
|
2021-09-24 19:23:30 +08:00 |
gaoxin
|
8c76d476a2
|
【编队】修复保存编队接口名修改导致的报错
|
2021-09-24 17:49:32 +08:00 |
wangzhenxing
|
d83cf97ae2
|
【战斗】==========被动93 307 309 351修改
|
2021-09-24 17:40:08 +08:00 |
ZhangBiao
|
1505647241
|
【七界试炼】框位不齐
|
2021-09-24 17:02:38 +08:00 |
ZhangBiao
|
35091621dc
|
【七界试炼】提交
|
2021-09-24 16:52:05 +08:00 |
ZhangBiao
|
a823984187
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 16:47:19 +08:00 |
ZhangBiao
|
028f97c195
|
【七界试炼】红点和跳转i需改
|
2021-09-24 16:47:06 +08:00 |
yuanshuai
|
77a47432bf
|
【四象心法】强化按钮点击强化两次bug修改
|
2021-09-24 15:59:01 +08:00 |
yuanshuai
|
ad8f5ac73e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:45:50 +08:00 |
yuanshuai
|
7f94f9e185
|
思想心法bug修改
|
2021-09-24 15:45:20 +08:00 |
wangzhenxing
|
34f52e18e7
|
[战斗]=====被动352 描述修改
|
2021-09-24 15:20:59 +08:00 |
wangzhenxing
|
e8b7af1cf7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:14:29 +08:00 |
wangzhenxing
|
8ffd86ee19
|
Merge branch 'china/dev-c-battle' into china/dev
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 15:13:46 +08:00 |
ZhangBiao
|
ff9d22e14d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 15:12:42 +08:00 |
ZhangBiao
|
ce1a5f25ea
|
【七界试炼】奖励位置调整
|
2021-09-24 15:11:57 +08:00 |
wangzhenxing
|
19f7984f01
|
[战斗]=============新增352被动
|
2021-09-24 14:59:54 +08:00 |
ZhangBiao
|
c862eac46e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:57:14 +08:00 |
ZhangBiao
|
b0e24676b3
|
【七界试炼】增加秘宝入口开启处理
|
2021-09-24 14:57:04 +08:00 |
wangzhenxing
|
9abf1ef390
|
Merge branch 'china/dev-c-battle' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-09-24 14:56:13 +08:00 |
wangzhenxing
|
48cc9357c1
|
[战斗]==========被动194修改 新增被动251 额外行动修改
|
2021-09-24 14:46:02 +08:00 |
jiaoyangna
|
136d872fbd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:20:32 +08:00 |
jiaoyangna
|
003583db7b
|
无尽副本报错修改
|
2021-09-24 14:19:50 +08:00 |
ZhangBiao
|
9ff1957ff7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 14:06:26 +08:00 |
ZhangBiao
|
c9305b4247
|
【七界试炼】提交
|
2021-09-24 14:06:09 +08:00 |
wangzhenxing
|
5c174efcbd
|
排行榜修改
|
2021-09-24 11:09:09 +08:00 |
gaoxin
|
ddb97196d9
|
【首充】金额改为special表配置
|
2021-09-24 11:05:39 +08:00 |
ZhangBiao
|
35e6c617fb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-24 10:28:10 +08:00 |
ZhangBiao
|
8bd1896aba
|
【七界试炼】敌方英雄展示修改
|
2021-09-24 10:27:56 +08:00 |
gaoxin
|
2473fb149a
|
【ID1018513】【魂印分解】选择多个魂印分解时就算紫色也会提示选择了金色,单个魂印分解时就算白金也不提示
【ID1018512】【魂印分解】列表拖动到底部,点击筛选页签,不回弹
|
2021-09-24 10:17:25 +08:00 |
gaoxin
|
65efa9336c
|
【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题
|
2021-09-23 20:59:44 +08:00 |
ZhangBiao
|
a2d7bedb5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:47:32 +08:00 |
ZhangBiao
|
d0c38ec9d7
|
【七界试炼】提交
|
2021-09-23 19:47:17 +08:00 |
wangzhenxing
|
212cc1f946
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-23 19:46:09 +08:00 |
gaoxin
|
65df3f1a37
|
【名字】添加名称正确性检测
|
2021-09-23 19:43:24 +08:00 |
gaoxin
|
c3820f13ae
|
【编队】修复无法复制编队的问题
|
2021-09-23 19:42:45 +08:00 |
ZhangBiao
|
6ced770ef1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:23:37 +08:00 |
ZhangBiao
|
5af10faa57
|
【七界试炼】提交
|
2021-09-23 19:23:27 +08:00 |
xuexinpeng
|
02f840ee83
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-23 18:04:24 +08:00 |
xuexinpeng
|
ff74924ea9
|
添加gm
|
2021-09-23 17:59:28 +08:00 |
gaoxin
|
0d76922c85
|
【编队】刷新编队时,保存编队的方法错误
|
2021-09-23 17:54:29 +08:00 |
jiaoyangna
|
ee5182dced
|
玲珑宝镜领取状态修改提交
|
2021-09-23 16:59:30 +08:00 |
jiaoyangna
|
fcae70ae04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:50:48 +08:00 |
jiaoyangna
|
80e2cab589
|
玲珑宝镜跳转修改提交
|
2021-09-23 16:50:24 +08:00 |
ZhangBiao
|
170d4886e3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:46:50 +08:00 |