ZhangBiao
|
43a8da3f2f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:25:08 +08:00 |
ZhangBiao
|
7f258a4aa2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:24:44 +08:00 |
jiaoyangna
|
8fd4b5e367
|
神魂提交
|
2021-11-05 10:24:41 +08:00 |
ZhangBiao
|
005ac1e5df
|
【光效穿透】编队界面上阵觉醒神将,长按神将打开神将情报,觉醒光效穿透
|
2021-11-05 10:24:32 +08:00 |
jiaoyangna
|
5ac1f04718
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:18:28 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
wangzhenxing
|
c04ee81117
|
【玉虚论道】======战斗信息界面报错修改提交
|
2021-11-05 10:17:45 +08:00 |
ZhangBiao
|
cf6837cbba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:04:43 +08:00 |
ZhangBiao
|
cd8f61cbed
|
【无尽副本】行动力不减修复
|
2021-11-05 10:04:32 +08:00 |
gaoxin
|
c232f35436
|
【轩辕宝镜 】修复还是可能会上阵重复神将的问题
|
2021-11-05 10:01:46 +08:00 |
wangzhenxing
|
51dfdede03
|
[战斗]===========被动371 368修改
|
2021-11-05 09:50:28 +08:00 |
ZhangBiao
|
4cb826b9e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 19:10:24 +08:00 |
ZhangBiao
|
08e6f334a4
|
【装备界面】特效调整
|
2021-11-04 19:10:06 +08:00 |
gaoxin
|
e39bbe2dc1
|
【轩辕宝镜】修复如果玩家有两个相同的战力较高的神将,会导致少上阵一个位置的问题
|
2021-11-04 18:53:11 +08:00 |
gaoxin
|
671de83349
|
【天书密卷】修复返回按钮和页签遮挡问题
|
2021-11-04 18:10:18 +08:00 |
wangzhenxing
|
661ea27421
|
[战斗]======被动357修改 御甲buff修改
|
2021-11-04 16:57:06 +08:00 |
gaoxin
|
96c77fd033
|
【周卡】数量过长用万字省略
|
2021-11-04 16:48:34 +08:00 |
jiaoyangna
|
90c2171f2c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 16:21:03 +08:00 |
jiaoyangna
|
ce86215f53
|
星星数少了修改
|
2021-11-04 16:20:50 +08:00 |
ZhangBiao
|
285068bb66
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 16:11:38 +08:00 |
ZhangBiao
|
5f28703681
|
【法宝界面】法宝描述超框修改
|
2021-11-04 16:11:27 +08:00 |
gaoxin
|
7f3d044ec3
|
【周卡】数据不存在时不再显示周卡页签
|
2021-11-04 16:10:40 +08:00 |
gaoxin
|
ee463b3103
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 15:50:53 +08:00 |
gaoxin
|
2d669fd354
|
【周卡】修改礼包ID字段获取方式
|
2021-11-04 15:50:47 +08:00 |
jiaoyangna
|
7e2e3d8449
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 15:48:08 +08:00 |
jiaoyangna
|
028790a379
|
神魂星星修改提交
|
2021-11-04 15:47:49 +08:00 |
ZhangBiao
|
f3e9bed33f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 15:45:13 +08:00 |
ZhangBiao
|
1321b32caf
|
【装备界面】增加特效
|
2021-11-04 15:44:59 +08:00 |
ZhangBiao
|
bccd6751eb
|
【无尽密保】文字显示错误修改
|
2021-11-04 15:44:13 +08:00 |
wangzhenxing
|
b6ec2b0f89
|
【战斗】======被动360修改
|
2021-11-04 15:40:14 +08:00 |
wangzhenxing
|
113e1ebefa
|
【战斗】=====被动356 修改
|
2021-11-04 14:13:28 +08:00 |
gaoxin
|
de71cd524b
|
【周卡】特效不能被裁切修改
|
2021-11-04 14:02:48 +08:00 |
gaoxin
|
4ba1a7ba68
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-15 00:18:46 +08:00 |
gaoxin
|
0237d3f351
|
【神魂】修复特效在3.5版本不显示的问题
|
2021-11-15 00:18:34 +08:00 |
gaoxin
|
761cdeffcf
|
【周卡】策划反馈优化
|
2021-11-15 00:03:12 +08:00 |
wangzhenxing
|
41044877f1
|
[战斗]=============被动357修改
|
2021-11-04 13:43:05 +08:00 |
jiaoyangna
|
5973a400ef
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 12:16:01 +08:00 |
jiaoyangna
|
84ee79fd1e
|
meta 文件提交
|
2021-11-04 12:15:48 +08:00 |
ZhangBiao
|
4ce0eb548a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 11:43:34 +08:00 |
ZhangBiao
|
dd0801e149
|
【界面优化】技能描述
|
2021-11-04 11:43:24 +08:00 |
gaoxin
|
4209ed1141
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 11:37:04 +08:00 |
gaoxin
|
01b322ad9b
|
【周卡】协议误删恢复
|
2021-11-04 11:36:47 +08:00 |
jiaoyangna
|
92c5dde48f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 11:35:30 +08:00 |
jiaoyangna
|
f9f92262a8
|
巅峰赛神魂图标提交
|
2021-11-04 11:35:15 +08:00 |
ZhangBiao
|
4f19c5eaaf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 11:30:20 +08:00 |
ZhangBiao
|
0aa460f151
|
【界面优化】技能具中
|
2021-11-04 11:30:10 +08:00 |
jiaoyangna
|
3a1139c0a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-04 10:46:39 +08:00 |
jiaoyangna
|
154aa77cd3
|
神魂特效修改提交
|
2021-11-04 10:46:25 +08:00 |
wangzhenxing
|
878b12f574
|
【战斗】===============被动364-371 提交 307 360修改
|
2021-11-04 10:27:02 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
jiaoyangna
|
34d8cf4440
|
神魂位置提交
|
2021-11-04 09:27:56 +08:00 |
jiaoyangna
|
4941110a7b
|
神魂提交
|
2021-11-03 18:38:13 +08:00 |
jiaoyangna
|
b11e859557
|
神魂提交
|
2021-11-03 18:16:26 +08:00 |
jiaoyangna
|
6f0d51ddb2
|
神魂提交
|
2021-11-03 18:11:08 +08:00 |
gaoxin
|
29df41d399
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-03 17:44:08 +08:00 |
gaoxin
|
5b3073f0eb
|
【周卡】修复0点刷新不及时问题
|
2021-11-03 17:44:02 +08:00 |
ZhangBiao
|
38544fd273
|
【逍遥游】触发仙缘界面中,事件图标显示不对
|
2021-11-03 17:12:20 +08:00 |
ZhangBiao
|
fc6d13a4d7
|
【鸿蒙碑】升级鸿蒙碑不弹出战斗力变化提示,且升级后总战斗力数值错误,重新登录后战斗力会提升
|
2021-11-03 17:06:45 +08:00 |
jiaoyangna
|
358f9e13ba
|
底修改提交
|
2021-11-03 16:26:07 +08:00 |
gaoxin
|
24c550cee5
|
Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
# Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
|
2021-11-03 16:09:31 +08:00 |
gaoxin
|
820b45cfa0
|
【宝物】修复神树和四灵变化后,没有重新计算宝物评分的问题
|
2021-11-03 15:16:48 +08:00 |
jiaoyangna
|
4eed456628
|
神魂图标修改
|
2021-11-03 13:25:08 +08:00 |
jiaoyangna
|
604b1d6819
|
神魂提交
|
2021-11-03 11:18:37 +08:00 |
jiaoyangna
|
0468c865db
|
神魂提交
|
2021-11-03 10:32:55 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
wangzhenxing
|
6092ce28c0
|
【战斗】=========处理战斗伤害记录不显示敌方主角
|
2021-11-02 20:19:36 +08:00 |
ZhangBiao
|
68f92b5bd0
|
【山河社稷图】提交
|
2021-11-02 18:56:45 +08:00 |
wangzhenxing
|
46fe5a1b8d
|
【战斗】======战斗结果显示主角伤害治疗修改
|
2021-11-02 18:00:31 +08:00 |
ZhangBiao
|
251a91b7fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 17:45:28 +08:00 |
ZhangBiao
|
8a7ce09aa9
|
【山河社稷图】提交
|
2021-11-02 17:45:18 +08:00 |
gaoxin
|
15f2a8e424
|
【ID1010610】【魂印合成优化】选中材料后,切换合成目标不清除材料
|
2021-11-02 17:36:05 +08:00 |
ZhangBiao
|
8f2398c932
|
【山河社稷图优化】优化选关界面操作
|
2021-11-02 17:22:42 +08:00 |
ZhangBiao
|
46247d8224
|
【界面优化】QA界面提交
|
2021-11-02 17:04:17 +08:00 |
ZhangBiao
|
2fd25aced5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 16:59:15 +08:00 |
ZhangBiao
|
81dadae61f
|
【界面优化】提交
|
2021-11-02 16:58:48 +08:00 |
gaoxin
|
d43b8282ec
|
【ID1010611】【装备合成优化】合成装备后,下方的装备列表不再重置回默认位置
|
2021-11-02 16:57:19 +08:00 |
gaoxin
|
44415cfded
|
【坐骑】获取新坐骑,点击前往,展示新坐骑
|
2021-11-02 16:42:36 +08:00 |
ZhangBiao
|
99fd74ec10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 16:24:19 +08:00 |
ZhangBiao
|
f12a83ec53
|
【山河社稷图优化】关卡编队界面显示三星条件(主关卡)和特殊要求(副关卡)
|
2021-11-02 16:24:01 +08:00 |
gaoxin
|
eef70d053d
|
【坐骑】解锁的放前面
|
2021-11-02 15:53:42 +08:00 |
ZhangBiao
|
672fcaf974
|
【界面优化】魂印图鉴界面
|
2021-11-02 15:14:19 +08:00 |
ZhangBiao
|
2dd8f29d45
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 14:47:46 +08:00 |
ZhangBiao
|
7eb3eeb351
|
【道具来源】界面错位修改
|
2021-11-02 14:47:27 +08:00 |
wangzhenxing
|
bc37810f8b
|
【玉虚论道】=====修改对战完 点击确定主城列表不刷新问题
|
2021-11-02 14:43:47 +08:00 |
ZhangBiao
|
9303bfc856
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 14:31:30 +08:00 |
ZhangBiao
|
b634ce0d87
|
【界面优化】提交
|
2021-11-02 14:31:18 +08:00 |
jiaoyangna
|
eec3703429
|
预设漏提
(cherry picked from commit a5aa425168 )
|
2021-11-02 14:25:12 +08:00 |
jiaoyangna
|
a5aa425168
|
预设漏提
|
2021-11-02 14:24:27 +08:00 |
jiaoyangna
|
9e422d1772
|
玲珑宝镜修改提交
(cherry picked from commit eef7fbacdf )
|
2021-11-02 14:21:32 +08:00 |
jiaoyangna
|
eef7fbacdf
|
玲珑宝镜修改提交
|
2021-11-02 14:20:27 +08:00 |
ZhangBiao
|
0e5e559220
|
【界面优化】法宝归元
|
2021-11-02 13:52:48 +08:00 |
ZhangBiao
|
f97de03d43
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 13:41:39 +08:00 |
ZhangBiao
|
1e203c822c
|
【界面优化】好感度,天枢密卷
|
2021-11-02 13:41:27 +08:00 |
wangzhenxing
|
673892008d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 13:33:47 +08:00 |
wangzhenxing
|
7331cdb7d0
|
【战斗】======灵兽技能检测方法初始化时清空, 战斗治疗数据记录修改
|
2021-11-02 13:33:35 +08:00 |
gaoxin
|
89162f6294
|
【GM】优化快速战斗结果显示
|
2021-11-02 13:31:13 +08:00 |
ZhangBiao
|
624e6ffe05
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 11:06:26 +08:00 |
ZhangBiao
|
68525db92e
|
【界面优化】提交
|
2021-11-02 11:06:13 +08:00 |
gaoxin
|
5c8186b8cd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 10:55:58 +08:00 |
gaoxin
|
2b9457139b
|
【GM】添加快速战斗GM
|
2021-11-02 10:55:50 +08:00 |
wangzhenxing
|
9fd4d332bd
|
[玉虚论道]==============点击刷新敌方列表 偶先提示赛季结束修改
|
2021-11-02 10:52:48 +08:00 |
ZhangBiao
|
2b1c935d34
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-02 10:28:01 +08:00 |
ZhangBiao
|
16b65a6c8b
|
【神将来源】界面偏移修改
|
2021-11-02 10:27:48 +08:00 |
gaoxin
|
351e51eb0b
|
【灵兽】修复巨鲲获取界面文字遮挡
|
2021-11-02 10:26:26 +08:00 |
jiaoyangna
|
a41765d10b
|
神魂提交
|
2021-11-02 10:20:17 +08:00 |
ZhangBiao
|
8a9d52656f
|
【界面优化】山河社稷图、仙缘汇聚箱
|
2021-11-02 09:29:07 +08:00 |
wangzhenxing
|
a55388942b
|
【战斗】=========追加的技能显示皮肤的特效
|
2021-11-01 19:22:48 +08:00 |
jiaoyangna
|
e049612d3a
|
Merge branch '0功能/神魂' of http://60.1.1.230/gaoxin/JL_Client into 0功能/神魂
|
2021-11-01 19:12:18 +08:00 |
jiaoyangna
|
681f8d5a57
|
神魂提交
|
2021-11-01 19:11:59 +08:00 |
gaoxin
|
0c1044ab67
|
Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
This reverts commit d2c8daffce .
|
2021-11-01 18:59:21 +08:00 |
gaoxin
|
31264fff91
|
Revert "Revert "【界面优化】剧情界面、引导、itemview、邮件、背包""
This reverts commit 317895ecaf .
|
2021-11-01 18:59:16 +08:00 |
gaoxin
|
5044a79789
|
Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489 .
|
2021-11-01 18:59:11 +08:00 |
zhangshanxue
|
2901a60489
|
Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392 .
|
2021-11-01 18:53:54 +08:00 |
zhangshanxue
|
317895ecaf
|
Revert "【界面优化】剧情界面、引导、itemview、邮件、背包"
This reverts commit bd6a5f887d .
|
2021-11-01 18:53:45 +08:00 |
zhangshanxue
|
d2c8daffce
|
Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
This reverts commit 87210b9d73 .
|
2021-11-01 18:53:39 +08:00 |
gaoxin
|
de87e6bb56
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 17:47:47 +08:00 |
gaoxin
|
e1381636e1
|
【坐骑】修复展示界面不居中
|
2021-11-01 17:47:35 +08:00 |
ZhangBiao
|
36853599ae
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 17:22:10 +08:00 |
ZhangBiao
|
87210b9d73
|
【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法
|
2021-11-01 17:21:59 +08:00 |
gaoxin
|
e077b70f02
|
【图片压缩】修改spine动画图片的压缩配置
|
2021-11-01 17:19:18 +08:00 |
gaoxin
|
0ad86bba92
|
【坐骑】牛哥资源优化
|
2021-11-01 17:18:32 +08:00 |
gaoxin
|
0defc12b5a
|
【资源】头像卡牌资源优化
|
2021-11-01 16:46:30 +08:00 |
gaoxin
|
47e510c026
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:43:22 +08:00 |
liujiaqi
|
0438e7db6b
|
【资源】敖丙皮肤
|
2021-11-08 16:41:39 +08:00 |
gaoxin
|
c62c0bc549
|
【坐骑】修复人物变高的问题
|
2021-11-01 16:42:46 +08:00 |
gaoxin
|
10bfe9a7b7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:27:12 +08:00 |
gaoxin
|
1b0613673c
|
【坐骑】添加各个方向的偏移配置
|
2021-11-01 16:27:03 +08:00 |
ZhangBiao
|
cdc5b5854b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:20:40 +08:00 |
ZhangBiao
|
bd6a5f887d
|
【界面优化】剧情界面、引导、itemview、邮件、背包
|
2021-11-01 16:19:22 +08:00 |
gaoxin
|
44cb4eb282
|
【坐骑】坐骑和人物层级改为表配置
|
2021-11-01 15:53:33 +08:00 |
ZhangBiao
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
gaoxin
|
8a7b7c0ca3
|
【立绘】修复九尾狐动画闪烁的问题
|
2021-11-01 14:10:31 +08:00 |
gaoxin
|
4e68982a6a
|
【坐骑】新增九尾狐坐骑资源
|
2021-11-01 11:59:31 +08:00 |
wangzhenxing
|
e1e2f1f663
|
[玉虚论道]=======结算期战斗添加屏蔽
|
2021-11-01 10:53:11 +08:00 |
gaoxin
|
4a764de122
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-29 18:45:56 +08:00 |
DESKTOP-98AVA47\Administrator
|
689522120c
|
[战斗]============山河社稷图 星级检测条件修改 之前放逐的不会判断进人数
|
2021-11-02 06:42:19 +08:00 |
gaoxin
|
5a2d7abbfa
|
【立绘】牛哥立绘压缩格式修改
|
2021-10-29 18:45:36 +08:00 |
gaoxin
|
45228d507a
|
【立绘】牛哥立绘压缩格式修改
|
2021-10-29 18:45:16 +08:00 |
gaoxin
|
0c81ddfefe
|
【周卡】停留在周卡界面跨天时刷新界面显示
|
2021-10-29 18:27:23 +08:00 |
gaoxin
|
487a2c0a6f
|
【周卡】修复掉落参数错误
|
2021-10-29 18:12:32 +08:00 |
gaoxin
|
ef8ed01cd2
|
【资源】重复资源名修改
|
2021-10-29 17:51:23 +08:00 |
wangzhenxing
|
c33a6794a8
|
【特效】=========敖丙网球王子技能动画名称修改
|
2021-10-29 17:48:14 +08:00 |
wangzhenxing
|
47b1b26a75
|
【战斗】=====敖丙皮肤特效提交
|
2021-10-29 17:48:06 +08:00 |
jiaoyangna
|
53e664c775
|
敖丙立绘提交
|
2021-10-29 17:47:58 +08:00 |
gaoxin
|
947002e03a
|
【新增资源优化】
|
2021-10-29 17:44:46 +08:00 |
gaoxin
|
20b685f694
|
Merge branch '0功能/用户隐私协议' into china/dev
|
2021-10-29 16:50:20 +08:00 |
gaoxin
|
d23318b53d
|
【周卡】红点添加,协议修改,推送逻辑添加
|
2021-10-29 16:43:53 +08:00 |
ZhangBiao
|
af2789412d
|
【界面优化】提交
|
2021-10-29 16:26:03 +08:00 |
ZhangBiao
|
c4fdc6c86a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-29 16:22:41 +08:00 |
liujiaqi
|
750761f866
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-09 23:44:00 +08:00 |