jiaoyangna
|
cdd6baeb5f
|
巅峰赛星星修改提交
|
2021-11-05 13:35:14 +08:00 |
jiaoyangna
|
29e279755e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 13:21:39 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
wangzhenxing
|
6ace7b50ab
|
[战斗]======被动154 200 360 修改
|
2021-11-05 13:17:17 +08:00 |
ZhangBiao
|
56530dbc93
|
【无尽副本】提交
|
2021-11-05 11:40:48 +08:00 |
gaoxin
|
2f65f4d391
|
【心魔试炼】界面报错修复
|
2021-11-05 11:06:10 +08:00 |
jiaoyangna
|
b78131766d
|
鸿蒙阵报错修改提交
|
2021-11-05 10:56:42 +08:00 |
jiaoyangna
|
2774ca08b1
|
玉虚论道编队报错修改提交
|
2021-11-05 10:42:37 +08:00 |
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 |
gaoxin
|
e39bbe2dc1
|
【轩辕宝镜】修复如果玩家有两个相同的战力较高的神将,会导致少上阵一个位置的问题
|
2021-11-04 18:53:11 +08:00 |
wangzhenxing
|
661ea27421
|
[战斗]======被动357修改 御甲buff修改
|
2021-11-04 16:57:06 +08:00 |
gaoxin
|
96c77fd033
|
【周卡】数量过长用万字省略
|
2021-11-04 16:48:34 +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 |
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 |
wangzhenxing
|
41044877f1
|
[战斗]=============被动357修改
|
2021-11-04 13:43:05 +08:00 |
gaoxin
|
761cdeffcf
|
【周卡】策划反馈优化
|
2021-11-15 00:03:12 +08:00 |
jiaoyangna
|
f9f92262a8
|
巅峰赛神魂图标提交
|
2021-11-04 11:35:15 +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
|
fc6d13a4d7
|
【鸿蒙碑】升级鸿蒙碑不弹出战斗力变化提示,且升级后总战斗力数值错误,重新登录后战斗力会提升
|
2021-11-03 17:06:45 +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
|
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
|
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 |
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
|
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 |
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
|
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
|
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
|
87210b9d73
|
【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法
|
2021-11-01 17:21:59 +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
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
wangzhenxing
|
e1e2f1f663
|
[玉虚论道]=======结算期战斗添加屏蔽
|
2021-11-01 10:53:11 +08:00 |
DESKTOP-98AVA47\Administrator
|
689522120c
|
[战斗]============山河社稷图 星级检测条件修改 之前放逐的不会判断进人数
|
2021-11-02 06:42:19 +08:00 |
gaoxin
|
0c81ddfefe
|
【周卡】停留在周卡界面跨天时刷新界面显示
|
2021-10-29 18:27:23 +08:00 |
gaoxin
|
487a2c0a6f
|
【周卡】修复掉落参数错误
|
2021-10-29 18:12:32 +08:00 |
gaoxin
|
d23318b53d
|
【周卡】红点添加,协议修改,推送逻辑添加
|
2021-10-29 16:43:53 +08:00 |
wangzhenxing
|
3815dc0ff3
|
[战斗]=======灵兽技能触发机制修改
|
2021-10-29 15:50:17 +08:00 |
wangzhenxing
|
d004e1d459
|
【神魂】======战斗中 和伤害记录界面加神魂显示
|
2021-10-29 15:14:01 +08:00 |
ZhangBiao
|
55f2561db3
|
【英雄归元】英雄归元后属性值没有重置
|
2021-10-29 15:11:48 +08:00 |
ZhangBiao
|
3b02c6296c
|
【宝器属性】穿戴宝器后,游戏退出重进宝器属性没有加上,导致战力值下降
|
2021-10-29 14:20:21 +08:00 |
ZhangBiao
|
32985c8912
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-29 13:28:20 +08:00 |
ZhangBiao
|
5d15c33605
|
【优化】跨服战红点跨天后不显示,完成所有操作后红点不消失,需要重新进入
|
2021-10-29 13:28:04 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
gaoxin
|
b181f4bd55
|
【GM】添加一些GM命令
|
2021-10-29 12:08:40 +08:00 |
ZhangBiao
|
c1f3658da4
|
【界面优化】提交
|
2021-10-29 11:13:29 +08:00 |
gaoxin
|
0fcf94a9c8
|
【周卡】协议,界面,逻辑搭建完成
|
2021-10-29 09:42:33 +08:00 |
jiaoyangna
|
1b13146915
|
【ID1018877】
【好感度逍遥游入口】云游值消耗还剩5点不足以继续操作,但是红点没有消失
|
2021-10-28 19:01:36 +08:00 |
jiaoyangna
|
4d4d2bfd99
|
删除log
|
2021-10-28 18:56:59 +08:00 |
jiaoyangna
|
6f8fa46ccd
|
添加log
|
2021-10-28 18:43:11 +08:00 |
jiaoyangna
|
02b161e84c
|
添加log
|
2021-10-28 18:42:02 +08:00 |
jiaoyangna
|
d05fe62424
|
添加log
|
2021-10-28 18:39:10 +08:00 |
jiaoyangna
|
30b3adbee6
|
【ID1018746】
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数
|
2021-10-28 18:32:21 +08:00 |
jiaoyangna
|
9926717bb9
|
【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
|
2021-10-28 18:20:18 +08:00 |
jiaoyangna
|
42ed8a1617
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 18:00:15 +08:00 |
jiaoyangna
|
acf33d10a3
|
【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
|
2021-10-28 17:59:56 +08:00 |
ZhangBiao
|
4d1496580a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 17:30:56 +08:00 |
ZhangBiao
|
dc689f3c25
|
【三界降魔】提交
|
2021-10-28 17:30:46 +08:00 |
jiaoyangna
|
e95f7f9e26
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 17:28:44 +08:00 |
ZhangBiao
|
a590e57c89
|
【三界降魔】坐骑显示调整
|
2021-10-28 17:28:10 +08:00 |
ZhangBiao
|
9c9beb78da
|
【三界降魔】
|
2021-10-28 17:23:56 +08:00 |
jiaoyangna
|
467a05b683
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 17:20:57 +08:00 |
jiaoyangna
|
ec3cee0ebb
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-28 16:52:28 +08:00 |
ZhangBiao
|
0903782f0e
|
【界面优化】法宝界面错位调整
|
2021-10-28 16:51:00 +08:00 |
ZhangBiao
|
871b2ad23b
|
【界面优化】大闹天宫调整
|
2021-10-28 16:40:54 +08:00 |
jiaoyangna
|
eaa1828752
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 16:38:50 +08:00 |
jiaoyangna
|
b41e5ed0b6
|
【ID1018877】
【好感度逍遥游入口】云游值消耗还剩5点不足以继续操作,但是红点没有消失
|
2021-10-28 16:38:35 +08:00 |
jiaoyangna
|
9249ed85cb
|
神魂预设修改
|
2021-10-28 16:19:59 +08:00 |
ZhangBiao
|
79f7339a3a
|
【三界降魔】提交
|
2021-10-28 16:03:23 +08:00 |
ZhangBiao
|
695dd0459a
|
【周卡】
|
2021-10-28 15:22:17 +08:00 |
jiaoyangna
|
04fff0d79b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-28 15:04:07 +08:00 |
jiaoyangna
|
d3bfde8830
|
三界降魔站立问题修改
|
2021-10-28 15:03:40 +08:00 |
wangzhenxing
|
e738e8eda8
|
【战斗】===========被动180 修改提交
|
2021-10-28 14:41:01 +08:00 |
ZhangBiao
|
87a95f0612
|
【界面优化】还原”特性“、大闹天宫
|
2021-10-28 14:14:30 +08:00 |
jiaoyangna
|
96a7a33743
|
恭送神将同步编队战力
|
2021-10-28 13:39:52 +08:00 |
jiaoyangna
|
58044a3e91
|
神魂界面星星修改提交
|
2021-10-28 11:07:50 +08:00 |
jiaoyangna
|
478676cd21
|
神魂位置修改提交
|
2021-10-28 10:38:19 +08:00 |
ZhangBiao
|
751e396cf6
|
Merge branch 'china/dev' into 0优化/界面优化
|
2021-10-28 09:53:51 +08:00 |
wangzhenxing
|
74dea991bc
|
[战斗]======被动355-363 提交
|
2021-10-28 09:48:01 +08:00 |
ZhangBiao
|
9ac870db81
|
Merge branch 'china/dev' into 0优化/界面优化
|
2021-10-28 09:34:12 +08:00 |
jiaoyangna
|
314398f5ba
|
保存支援神将后,若神魂效果为首次激活,需要神将条件和对应数量神魂效果变为绿色,激活神魂等级图标和神魂效果,并获得战斗力提升,若神将正处于主线编队,同时弹出主线战斗力变化提示。
|
2021-10-27 18:53:36 +08:00 |
jiaoyangna
|
f71c604cb2
|
每次切换至神魂页面时,自动滑动至已激活的最高神魂等级所在区域,
|
2021-10-27 18:28:07 +08:00 |
ZhangBiao
|
429366fa93
|
【三界降魔】调改
|
2021-10-27 18:26:51 +08:00 |
ZhangBiao
|
55090ed8cc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-27 18:08:28 +08:00 |
ZhangBiao
|
3b42cd525e
|
【三界降魔】新活动完成
|
2021-10-27 18:08:16 +08:00 |
jiaoyangna
|
82d0e28baa
|
神魂提交
|
2021-10-27 18:03:09 +08:00 |
jiaoyangna
|
eadf4a4f1c
|
神魂修改提交
|
2021-10-27 17:42:50 +08:00 |
jiaoyangna
|
9f59cb3b64
|
神魂提交
|
2021-10-27 17:04:33 +08:00 |
gaoxin
|
aabf86ba56
|
【山河社稷图】红点父节点错误
|
2021-10-27 16:36:56 +08:00 |
jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
gaoxin
|
a1449fd504
|
【七界试炼】修复跨天红点不刷新的维妮塔
|
2021-10-27 15:14:47 +08:00 |
ZhangBiao
|
19a67875f8
|
【界面优化】大闹天宫部分
|
2021-10-27 13:45:05 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
ZhangBiao
|
ac23ef4dbd
|
【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面
|
2021-10-27 10:37:29 +08:00 |
gaoxin
|
266d3088e7
|
【战斗】修复假战斗报错
|
2021-10-26 21:43:00 +08:00 |
ZhangBiao
|
779cb4d99e
|
【界面优化】技能
|
2021-10-26 18:18:36 +08:00 |
wangzhenxing
|
a38fe30800
|
[主角技能]=====注重主角立绘等级显示修改
|
2021-10-26 18:03:02 +08:00 |
ZhangBiao
|
d5cf1c5395
|
【界面优化】归元、技能
|
2021-10-26 17:55:49 +08:00 |
ZhangBiao
|
353a9774c5
|
【界面优化】定位、恭送
|
2021-10-26 17:36:08 +08:00 |
ZhangBiao
|
e29dd36c26
|
【界面优化】法宝界面
|
2021-10-26 16:33:20 +08:00 |
jiaoyangna
|
edcdd0e81e
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-26 16:01:24 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
jiaoyangna
|
bdff69b0e2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 15:29:04 +08:00 |
jiaoyangna
|
41966a1487
|
逍遥游报错修改提交
|
2021-10-26 15:28:44 +08:00 |
gaoxin
|
e7da10a595
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 14:45:34 +08:00 |
gaoxin
|
a692f8d9d4
|
【本场最佳】主角名颜色根据修行等级改变
|
2021-10-26 14:45:28 +08:00 |
jiaoyangna
|
b6475fb1b1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 14:17:56 +08:00 |
jiaoyangna
|
3d832f81cf
|
【ID1010556】
【优化】好感度解锁等级优化
|
2021-10-26 14:17:07 +08:00 |
ZhangBiao
|
26b5a670f9
|
【界面优化】背包装备优化
|
2021-10-26 14:04:02 +08:00 |
wangzhenxing
|
4c292035cf
|
[主角技能]======心魔试炼快速战斗不显示主角伤害记录修改
|
2021-10-26 14:00:23 +08:00 |
ZhangBiao
|
ccd2b2ffd7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-26 10:13:41 +08:00 |
ZhangBiao
|
cce7591927
|
【山河社稷图】小关卡单独上阵报错修改
|
2021-10-26 10:13:28 +08:00 |
gaoxin
|
7ac3b1bc14
|
【飘渺之旅】修复完成全部任务,无法领取的问题
|
2021-10-25 19:22:57 +08:00 |
ZhangBiao
|
f51c80b277
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 18:40:33 +08:00 |
ZhangBiao
|
7332c761b8
|
【御剑行】错别字
|
2021-10-25 18:40:22 +08:00 |
gaoxin
|
8fdb8942e1
|
【飘渺之旅】修复第一天显示了重复的任务的问题
|
2021-10-25 18:15:48 +08:00 |
wangzhenxing
|
fbf66138ca
|
[玉虚论道]======玉虚段位奖励界面特效层级修改提交
|
2021-10-25 17:19:01 +08:00 |
ZhangBiao
|
9c76f42161
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 16:47:15 +08:00 |
ZhangBiao
|
e8f0a9b4a1
|
【御剑行】界面黑屏倒计时结束后弹出排行榜
|
2021-10-25 16:46:51 +08:00 |
wangzhenxing
|
7b406e1c4b
|
【战斗】===========主角技能使用 队伍战斗力 接口修改
|
2021-10-25 16:37:41 +08:00 |
gaoxin
|
04a1196586
|
【战斗力】一旦战斗力改变就让后端重新计算战斗力
|
2021-10-25 16:13:48 +08:00 |
wangzhenxing
|
237767eb29
|
【战斗】=============灵兽技能 8 回合cd判断修改
|
2021-10-25 15:54:38 +08:00 |
wangzhenxing
|
09755c8d12
|
[战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力
|
2021-10-25 13:48:48 +08:00 |
ZhangBiao
|
0cef23209c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-25 11:54:13 +08:00 |
ZhangBiao
|
7871064069
|
【修为】Tips修改
|
2021-10-25 11:54:04 +08:00 |
wangzhenxing
|
7ae770a3b0
|
[战斗]=============伤害力公式修改 防御 乘2
|
2021-10-25 11:48:54 +08:00 |
ZhangBiao
|
abd9795933
|
【百宝商会】红点提交
|
2021-10-25 11:15:27 +08:00 |
wangzhenxing
|
b7a2cee564
|
玉虚战斗记录敌方分数显示修改
|
2021-10-22 18:37:42 +08:00 |
wangzhenxing
|
d51a4292f3
|
协议提交 主角技能图标显示修改 玉虚战斗记录敌方分数修改
|
2021-10-22 18:30:09 +08:00 |
ZhangBiao
|
929de39da9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 18:16:05 +08:00 |
ZhangBiao
|
cc2cfd7a21
|
【百宝商会、御剑行】按钮一致性提交、显示修改
|
2021-10-22 18:15:55 +08:00 |
jiaoyangna
|
7ed825b4c1
|
飘渺之旅修改提交
|
2021-10-22 18:06:44 +08:00 |
wangzhenxing
|
5e541238de
|
[战斗]=============128 129 130 131 修改 添加最大限制
|
2021-10-22 17:34:15 +08:00 |
jiaoyangna
|
fa36828e1c
|
Revert "至尊降世活动结束不关闭提交"
This reverts commit 031895a9d1 .
|
2021-10-22 17:28:09 +08:00 |
jiaoyangna
|
031895a9d1
|
至尊降世活动结束不关闭提交
|
2021-10-22 17:24:41 +08:00 |
jiaoyangna
|
f7db9fc907
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 17:22:18 +08:00 |
jiaoyangna
|
73b9fad19d
|
至尊降世活动兼容提交
|
2021-10-22 17:21:31 +08:00 |
ZhangBiao
|
e821387c93
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 16:47:39 +08:00 |
gaoxin
|
c1352e0a59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 02:52:56 +08:00 |
gaoxin
|
24ea182587
|
【最佳】加入主角伤害展示
|
2021-11-10 02:52:51 +08:00 |
gaoxin
|
3f2ce26aff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 01:17:33 +08:00 |
gaoxin
|
99985c442d
|
【积天豪礼】红点加入主界面下拉按钮红点
|
2021-11-10 01:17:28 +08:00 |
gaoxin
|
8d8a50a0ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-10 01:01:09 +08:00 |
gaoxin
|
7a5f41ef46
|
【积天豪礼】分离到主城
|
2021-11-10 00:58:39 +08:00 |
gaoxin
|
8125b21af3
|
【跨服】修复七界试炼红点刷新不及时的问题
|
2021-11-10 00:56:37 +08:00 |
ZhangBiao
|
0508d1d652
|
【御剑行】跨期修改
|
2021-10-22 16:47:30 +08:00 |
jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-10-22 15:52:33 +08:00 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
ac6dca4805
|
【御剑行】赛季结束不可打开竞猜
|
2021-10-22 15:46:35 +08:00 |
ZhangBiao
|
0f0c0586bf
|
【御剑行】红点
|
2021-10-22 15:44:19 +08:00 |
ZhangBiao
|
c16004cf3b
|
【百宝商会】增加次数显示
|
2021-10-22 15:41:49 +08:00 |
ZhangBiao
|
26e980b503
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:49:08 +08:00 |
ZhangBiao
|
0d94f23e41
|
【御剑行】红点提交
|
2021-10-22 14:48:56 +08:00 |
ZhangBiao
|
befea57bbc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:29:09 +08:00 |
ZhangBiao
|
7da9ee8b6d
|
【弹窗优化】邮件、每日任务
|
2021-10-22 14:28:59 +08:00 |
ZhangBiao
|
5aba21341c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 14:22:23 +08:00 |
ZhangBiao
|
1f5f4f15c3
|
【弹窗优化】提交
|
2021-10-22 14:22:12 +08:00 |
wangzhenxing
|
fc3edefd82
|
【战斗】=====hot buff修改提交
|
2021-10-22 14:11:25 +08:00 |
wangzhenxing
|
8035e3f6f3
|
[战斗]==============战斗消息位置修改
|
2021-10-22 14:04:15 +08:00 |
wangzhenxing
|
eefaa33687
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 13:59:08 +08:00 |
wangzhenxing
|
e0b7df4206
|
[战斗]==========被动199 历战之躯 被动修改 2
|
2021-10-22 13:57:51 +08:00 |
ZhangBiao
|
609b191785
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 13:53:22 +08:00 |
ZhangBiao
|
22941d0af5
|
【弹窗优化】公会、公告、服务器列表】英雄信息
|
2021-10-22 13:53:10 +08:00 |
wangzhenxing
|
2a6f3389b3
|
[战斗]=============被动199 历战之躯 修改
|
2021-10-22 13:35:44 +08:00 |
ZhangBiao
|
cdc17b555e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 13:22:51 +08:00 |
ZhangBiao
|
31e8f4c726
|
【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗
|
2021-10-22 13:22:39 +08:00 |
wangzhenxing
|
d93e0a9c4e
|
角色技能升级按钮添加动效
|
2021-10-22 13:15:08 +08:00 |
gaoxin
|
7b486f1559
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-23 03:01:26 +08:00 |
gaoxin
|
25a14f7a79
|
【商店】免费次数的商店,取消刷新后今日不再显示满次红点的功能,满次后刷新红点显示添加
|
2021-10-23 03:01:20 +08:00 |
gaoxin
|
582ab51299
|
【山河社稷图】每日奖励文字修改
|
2021-10-22 21:25:49 +08:00 |
wangzhenxing
|
4518c8c175
|
修行技能bug修改提交
|
2021-10-22 11:56:46 +08:00 |
ZhangBiao
|
7b20915c6c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 11:27:58 +08:00 |
ZhangBiao
|
39aa09f317
|
【点击黑色区域关闭】
|
2021-10-22 11:27:47 +08:00 |
ZhangBiao
|
e48606b648
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 11:21:53 +08:00 |
ZhangBiao
|
1215e46af8
|
【御剑行】点击商店返回后增加请求
|
2021-10-22 11:21:42 +08:00 |
jiaoyangna
|
bfd2e06ecc
|
至尊降世修改提交
|
2021-10-22 11:20:24 +08:00 |
ZhangBiao
|
abbcc52f01
|
【御剑行】提交
|
2021-10-22 10:57:01 +08:00 |
ZhangBiao
|
fa818dac35
|
【御剑行】提交
|
2021-10-22 10:41:20 +08:00 |
ZhangBiao
|
9fd8d6d886
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 10:25:36 +08:00 |
ZhangBiao
|
a732dadb5f
|
【御剑行】修改提交
|
2021-10-22 10:25:20 +08:00 |
wangzhenxing
|
eb5867b31c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 10:21:36 +08:00 |
wangzhenxing
|
c494145ff8
|
主角技能添加屏蔽
|
2021-10-22 10:21:07 +08:00 |
ZhangBiao
|
19d4f27f76
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 10:20:42 +08:00 |
ZhangBiao
|
85819fcbae
|
【御剑行】红点调整
|
2021-10-22 10:20:30 +08:00 |
wangzhenxing
|
ae47df29bb
|
【红点】=============修行技能红点提交
|
2021-10-22 10:08:53 +08:00 |
ZhangBiao
|
747cb5b179
|
【御剑行】修改提交
|
2021-10-22 10:00:19 +08:00 |
ZhangBiao
|
cef99194af
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-22 09:26:20 +08:00 |
ZhangBiao
|
2ab4be658d
|
【主角修为】图标顺序调整
|
2021-10-22 09:26:09 +08:00 |
jiaoyangna
|
68cbb5905a
|
至尊降世修改提交
|
2021-10-21 18:58:36 +08:00 |
jiaoyangna
|
4e89351ef8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 18:12:41 +08:00 |
jiaoyangna
|
b24061ccd0
|
至尊降世报错修改提交
|
2021-10-21 18:12:28 +08:00 |
gaoxin
|
6c9f0098cf
|
【逍遥游】修复加速状态下,转盘卡死问题
|
2021-10-21 18:02:33 +08:00 |
jiaoyangna
|
ad84124cd9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 18:00:20 +08:00 |
jiaoyangna
|
bdb8510d92
|
坐骑界面修改提交
|
2021-10-21 18:00:05 +08:00 |
wangzhenxing
|
fb7ad25c56
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:49:46 +08:00 |
wangzhenxing
|
7261a428fb
|
主角技能伤害提交
|
2021-10-21 17:47:49 +08:00 |
ZhangBiao
|
869b65dd95
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
|
2021-10-21 17:47:34 +08:00 |
jiaoyangna
|
36b574a645
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:39:09 +08:00 |
jiaoyangna
|
8fa8a9d690
|
至尊降世界面修改提交
|
2021-10-21 17:38:53 +08:00 |
ZhangBiao
|
a6ebd138e4
|
【新百宝商会】提交
|
2021-10-21 17:28:53 +08:00 |
gaoxin
|
6cb068ea60
|
【建木神树】红点刷新不及时
|
2021-10-21 17:18:40 +08:00 |
gaoxin
|
34a58a310c
|
【排行榜】修复膜拜后页签红点刷新不及时,修复跨服前七天跨服按钮会显示红点
|
2021-10-21 17:02:05 +08:00 |
gaoxin
|
f4912f5772
|
【逍遥游】转盘再加速
|
2021-10-21 16:43:19 +08:00 |
gaoxin
|
aa9ce7f992
|
【逍遥游】优化转盘速度
|
2021-10-21 16:30:38 +08:00 |
wangzhenxing
|
5575ba2245
|
[战斗]=====灵兽技能修改提交
|
2021-10-21 16:17:10 +08:00 |
wangzhenxing
|
3d9bf0041f
|
[战斗]============灵兽技能伤害不检测是否命中
|
2021-10-21 13:25:41 +08:00 |
ZhangBiao
|
448ec131e8
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-10-21 13:07:13 +08:00 |
ZhangBiao
|
3293656507
|
【新百宝商会】提交
|
2021-10-21 13:06:25 +08:00 |
wangzhenxing
|
bb849d4b93
|
主角技能界面修改
|
2021-10-21 11:58:33 +08:00 |
ZhangBiao
|
b5d4d87f63
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 11:14:36 +08:00 |
ZhangBiao
|
984bb12611
|
【主角修为】问号文字调整
|
2021-10-21 11:14:24 +08:00 |
gaoxin
|
04613652fd
|
【公会战】不再请求公会战数据
|
2021-10-21 11:10:55 +08:00 |
ZhangBiao
|
afaf672de4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 10:58:21 +08:00 |
ZhangBiao
|
205200268d
|
【主角修为】提交
|
2021-10-21 10:58:09 +08:00 |
wangzhenxing
|
18da581061
|
[战斗]=====技能添加空判断
|
2021-10-21 10:41:57 +08:00 |
gaoxin
|
da665cc148
|
【编队】取消公会战相关编队判断,获取编队信息时不再检测公会战防守编队信息
|
2021-10-21 10:22:00 +08:00 |
wangzhenxing
|
a17242b0c0
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
Assets/ManagedResources/~Lua/Data/ConfigData.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
|
2021-10-20 22:13:29 +08:00 |
wangzhenxing
|
7b7879ce89
|
[战斗]=========效果130修改
|
2021-10-20 22:00:01 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
gaoxin
|
630271bf6c
|
【挚礼月卡】修复金额刷新不及时的问题
|
2021-10-20 19:15:40 +08:00 |
jiaoyangna
|
ce28ba9362
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 18:50:47 +08:00 |
jiaoyangna
|
5425fc980a
|
坐骑界面技能描述修改提交
|
2021-10-20 18:50:34 +08:00 |
ZhangBiao
|
6a3c9ccd25
|
【主角修为】问号提交
|
2021-10-20 18:35:30 +08:00 |
ZhangBiao
|
bb489b08e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 18:33:02 +08:00 |
ZhangBiao
|
1e3b3c9f27
|
【御剑行】修改提交
|
2021-10-20 18:31:59 +08:00 |
jiaoyangna
|
06a8251a40
|
神魂界面提交
|
2021-10-20 18:02:09 +08:00 |
gaoxin
|
09ca5f98ad
|
Merge branch '0活动开发聚集地/挚礼月卡' into china/dev
|
2021-10-20 16:36:56 +08:00 |
gaoxin
|
a712ddee3b
|
【挚礼月卡】功能完善
|
2021-10-20 16:36:36 +08:00 |
jiaoyangna
|
e420c89429
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:17:38 +08:00 |
jiaoyangna
|
f3f416e202
|
添加天书秘卷登陆请求
|
2021-10-20 15:17:22 +08:00 |
gaoxin
|
85b15d6cb7
|
Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡
|
2021-10-20 15:14:38 +08:00 |
ZhangBiao
|
4299fdd035
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:10:09 +08:00 |
ZhangBiao
|
0d8af528ff
|
【主角修为】引导提交
|
2021-10-20 15:09:59 +08:00 |
jiaoyangna
|
dd89fb59e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:06:59 +08:00 |
jiaoyangna
|
9aa975cd7b
|
羁绊打印
|
2021-10-20 15:06:23 +08:00 |
ZhangBiao
|
e2cb67caf3
|
【修行】点击加成按钮后 游戏崩溃修改
|
2021-10-20 14:27:43 +08:00 |
ZhangBiao
|
557b9cc523
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
|
2021-10-20 14:05:15 +08:00 |
gaoxin
|
32cabdd75c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 13:52:00 +08:00 |
gaoxin
|
74f3c07aa4
|
【山河每日奖励】新增二次确认
|
2021-10-20 13:51:55 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
ZhangBiao
|
7bd64b6a13
|
Merge branch 'china/dev' into 0功能/主角修为
|
2021-10-20 13:16:07 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
jiaoyangna
|
7d1f1d7f01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 11:17:27 +08:00 |
xuexinpeng
|
0eaaf0fc77
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 19:07:25 +08:00 |
xuexinpeng
|
c1483a7438
|
玉虚论道 战斗记录添加空判断
|
2021-10-19 19:06:12 +08:00 |
gaoxin
|
e6af50143c
|
【山河社稷图】修复小人方向错误
|
2021-10-19 19:03:02 +08:00 |
gaoxin
|
b2a163ae3d
|
【百宝商会第二季】预设上传
|
2021-10-19 19:01:40 +08:00 |
ZhangBiao
|
a387432369
|
【主角修为】提交
|
2021-10-19 18:34:10 +08:00 |
gaoxin
|
7a9cdc15b2
|
Merge branch '0功能/山河社稷图每日奖励' into china/dev
|
2021-10-19 18:02:20 +08:00 |
gaoxin
|
e01b39c8a4
|
【山河每日奖励】优化宝箱显示
|
2021-10-19 18:01:50 +08:00 |
gaoxin
|
3c371623d7
|
【山河每日奖励】完善奖励领取逻辑
|
2021-10-19 17:07:32 +08:00 |
ZhangBiao
|
8f05e215fe
|
【我要变强】增加评分进度条显隐控制
|
2021-10-19 15:40:42 +08:00 |
ZhangBiao
|
2d982e67d3
|
【主角修为】提交
|
2021-10-19 15:34:43 +08:00 |
gaoxin
|
335bc04645
|
【每日豪礼】选中时也显示红点
|
2021-10-19 13:52:58 +08:00 |
jiaoyangna
|
2ec0a28cf3
|
去掉log
|
2021-10-19 13:34:03 +08:00 |
jiaoyangna
|
47a5fe6e3f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 13:25:21 +08:00 |
jiaoyangna
|
005468635f
|
页签添加红点
|
2021-10-19 13:25:08 +08:00 |
ZhangBiao
|
2f92759e9f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 11:20:22 +08:00 |
ZhangBiao
|
db87d4925a
|
【灵兽山】放生10只整灵兽后,可以同时选择整只灵兽和碎片,恭送后消耗是正确的,仅显示问题
|
2021-10-19 11:20:11 +08:00 |
gaoxin
|
89d93783b7
|
【优化】每日豪礼充值以后没有红点提示领取
|
2021-10-19 11:08:35 +08:00 |
jiaoyangna
|
1f077cbcdc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 11:04:25 +08:00 |
jiaoyangna
|
c091c55bef
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-19 11:04:06 +08:00 |
gaoxin
|
a23791e07c
|
【战斗】失败界面添加我要变强跳转
|
2021-10-19 10:46:12 +08:00 |
ZhangBiao
|
48236ba797
|
【天枢密卷】增加跳转
|
2021-10-19 10:34:45 +08:00 |
wangzhenxing
|
54b07410bf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-19 10:12:38 +08:00 |
wangzhenxing
|
b5f27a64af
|
主角技能提交
|
2021-10-19 10:00:34 +08:00 |
ZhangBiao
|
47791f3711
|
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数(尝试修复)
|
2021-10-19 09:38:05 +08:00 |
ZhangBiao
|
f10cd9dc35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 09:33:51 +08:00 |
ZhangBiao
|
a9e430c755
|
【七界试炼】【优化】七界试炼优化上下层提示
|
2021-10-19 09:33:37 +08:00 |
gaoxin
|
11d5f735c7
|
【七界试炼】排行榜删除切磋和加入黑名单按钮
|
2021-10-18 21:06:01 +08:00 |
jiaoyangna
|
d3ca843ae5
|
罗浮争锋去掉log
|
2021-10-18 18:26:32 +08:00 |
jiaoyangna
|
fca015215c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 18:23:19 +08:00 |
jiaoyangna
|
f2e06a8bc4
|
罗浮争锋小人朝向错误修改
|
2021-10-18 18:23:06 +08:00 |
gaoxin
|
47d6de27ff
|
【山河社稷图】添加每日奖励按钮及领取逻辑添加
|
2021-10-18 18:06:47 +08:00 |
ZhangBiao
|
cb3803a413
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-18 16:30:27 +08:00 |
gaoxin
|
3a559c912c
|
【挚礼月卡】月卡功能数据剥离到MonthCardManager
|
2021-10-18 16:22:11 +08:00 |
ZhangBiao
|
bc7e316531
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 16:19:19 +08:00 |
ZhangBiao
|
1c137cc911
|
【寻宝迷踪】骑着坐骑寻宝,特效显示分割线,需要修改
|
2021-10-18 16:18:59 +08:00 |
jiaoyangna
|
022a7f46c6
|
天书秘卷没有秘卷时滑动修改提交
|
2021-10-18 11:53:09 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
ZhangBiao
|
034d727a6f
|
【御剑行】提交
|
2021-10-18 11:32:06 +08:00 |
ZhangBiao
|
8f03ae0485
|
【御剑行】提交
|
2021-10-18 10:56:14 +08:00 |
jiaoyangna
|
b50e5ee2bf
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-18 10:38:49 +08:00 |
jiaoyangna
|
097d5cf1cc
|
神魂初版提交
|
2021-10-18 10:36:32 +08:00 |
wangzhenxing
|
35c1987c26
|
Merge branch '0功能/玉虚论道' into china/dev
|
2021-10-18 09:59:26 +08:00 |
wangzhenxing
|
c23a1e9bd0
|
赛季重置修改
|
2021-10-18 09:56:38 +08:00 |
wangzhenxing
|
23438def99
|
对战信息界面添加动效
|
2021-10-16 19:31:03 +08:00 |
wangzhenxing
|
23ed8a7a2b
|
【战斗】==========被动344添加空判断
|
2021-10-16 18:12:56 +08:00 |
wangzhenxing
|
267598d53b
|
Revert "【战斗】=======被动199"
This reverts commit c8603f010f .
|
2021-10-16 18:07:30 +08:00 |
jiaoyangna
|
c1cf0e4a79
|
牛气冲天进度显示修改
|
2021-10-16 17:59:38 +08:00 |
ZhangBiao
|
56067b59af
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-16 17:52:59 +08:00 |
ZhangBiao
|
381551df78
|
牛气冲天 神将升星添加进度
|
2021-10-16 17:52:50 +08:00 |
jiaoyangna
|
d0c9f01122
|
去掉log
|
2021-10-16 17:48:07 +08:00 |
wangzhenxing
|
c8603f010f
|
【战斗】=======被动199
|
2021-10-16 16:47:57 +08:00 |
ZhangBiao
|
27e433ca6b
|
【牛气冲天】增加进度
|
2021-10-16 16:37:44 +08:00 |
ZhangBiao
|
617a4f640b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-16 15:38:12 +08:00 |
ZhangBiao
|
e86a0c04a6
|
【乾坤宝盒】跳转进入乾坤宝盒界面,查看魂印特效穿透
|
2021-10-16 15:37:58 +08:00 |
wangzhenxing
|
61dddc3c02
|
段位变化展示修改提交
|
2021-10-16 15:27:03 +08:00 |
jiaoyangna
|
6917dc8e1c
|
背包神将碎片合成最大数量修改
|
2021-10-16 15:12:54 +08:00 |
ZhangBiao
|
45b9f3f3bb
|
【御剑行】增加特效
|
2021-10-16 15:08:29 +08:00 |
ZhangBiao
|
bd79f13e27
|
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数
|
2021-10-16 13:45:47 +08:00 |
wangzhenxing
|
c30f236943
|
阵容拖拽问题
|
2021-10-15 20:44:11 +08:00 |
wangzhenxing
|
20e70dfffb
|
进度条修改
|
2021-10-15 20:32:35 +08:00 |
wangzhenxing
|
08f87f8623
|
bug修改
|
2021-10-15 18:39:46 +08:00 |
ZhangBiao
|
550ae985be
|
【牛气冲天】跳转提交
|
2021-10-15 17:52:05 +08:00 |
ZhangBiao
|
d76713abf2
|
【牛气冲天】更改标签顺序
|
2021-10-15 17:39:04 +08:00 |
ZhangBiao
|
3dca94f9aa
|
【牛气冲天】提交
|
2021-10-15 17:14:27 +08:00 |
ZhangBiao
|
4ccaca133e
|
【牛气冲天】修改提交
|
2021-10-15 16:49:00 +08:00 |
wangzhenxing
|
d1796fdab6
|
bug修改
|
2021-10-15 15:47:55 +08:00 |
ZhangBiao
|
08ea8c3be8
|
【御剑行】提交
|
2021-10-15 15:09:59 +08:00 |
ZhangBiao
|
a162e6aa64
|
【御剑行】
|
2021-10-15 14:50:59 +08:00 |
ZhangBiao
|
decf1b869c
|
【御剑行】提交
|
2021-10-15 14:47:14 +08:00 |
jiaoyangna
|
e026881024
|
ID1010484】
易经宝库可选奖励优化
|
2021-10-15 14:35:57 +08:00 |
ZhangBiao
|
e43abf17b2
|
【御剑行】提交
|
2021-10-15 14:14:04 +08:00 |
ZhangBiao
|
a16b8c5e75
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-15 14:06:35 +08:00 |
ZhangBiao
|
cbef4e021b
|
【御剑行】提交
|
2021-10-15 14:02:33 +08:00 |
ZhangBiao
|
132dc11c6b
|
【御剑行】提交
|
2021-10-15 13:33:58 +08:00 |
jiaoyangna
|
234c17cfe4
|
挂机奖励预览四舍五入显示
(cherry picked from commit 09ef1c8981 )
|
2021-10-15 12:13:47 +08:00 |
jiaoyangna
|
3e616a0462
|
排行榜上小人方向修改
(cherry picked from commit f31f62ec09 )
|
2021-10-15 12:13:28 +08:00 |
jiaoyangna
|
83ceaa43b7
|
排行榜上小人朝侧面修改提交
(cherry picked from commit 851bd2450c )
|
2021-10-15 12:13:14 +08:00 |
jiaoyangna
|
09ef1c8981
|
挂机奖励预览四舍五入显示
|
2021-10-15 12:12:38 +08:00 |
jiaoyangna
|
f31f62ec09
|
排行榜上小人方向修改
|
2021-10-15 11:51:38 +08:00 |
jiaoyangna
|
851bd2450c
|
排行榜上小人朝侧面修改提交
|
2021-10-15 11:40:01 +08:00 |
ZhangBiao
|
35eb36384e
|
【御剑行】提交
|
2021-10-15 11:15:42 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
wangzhenxing
|
474549ea24
|
bug修改
|
2021-10-14 21:36:29 +08:00 |
wangzhenxing
|
444f8259ee
|
玉虚论道主界面请求添加类型
|
2021-10-14 21:30:35 +08:00 |
jiaoyangna
|
f852ba73ed
|
长按赠完礼物时多提示一次礼物数量不足
|
2021-10-14 20:39:37 +08:00 |
jiaoyangna
|
101f406a4c
|
【ID1010469】
好感度优化
|
2021-10-14 20:15:53 +08:00 |
ZhangBiao
|
2fda9c77ff
|
【御剑行】提交
|
2021-10-14 19:57:40 +08:00 |
ZhangBiao
|
4d911a4ea4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 18:28:55 +08:00 |
ZhangBiao
|
6ebe5720a6
|
【御剑行】红点提交
|
2021-10-14 18:28:27 +08:00 |
ZhangBiao
|
46d38b01ec
|
【御剑行】提交
|
2021-10-14 18:02:30 +08:00 |
jiaoyangna
|
3b5772be75
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-14 17:15:53 +08:00 |
jiaoyangna
|
9e46ffd910
|
神将天赋界面修改提交
|
2021-10-14 17:14:51 +08:00 |
wangzhenxing
|
fbb1c387c7
|
【战斗】=======伤害公式 修改 去点 防御0.5的容错
|
2021-10-14 17:12:01 +08:00 |
ZhangBiao
|
cd04fc3d37
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-14 17:11:12 +08:00 |
ZhangBiao
|
4b6079d4e8
|
【御剑行】提价
|
2021-10-14 17:10:40 +08:00 |
wangzhenxing
|
072c44d495
|
[bug]======【ID1018713】
【成就】战力目标成就进度超框,需要改为缩写
|
2021-10-14 16:35:34 +08:00 |
ZhangBiao
|
5a4a42594d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-14 16:17:25 +08:00 |
ZhangBiao
|
b08af858a9
|
【牛气冲天】提交
|
2021-10-14 16:16:52 +08:00 |
ZhangBiao
|
67026aa355
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-14 16:13:07 +08:00 |
ZhangBiao
|
8ad554a64d
|
【御剑行】提交
|
2021-10-14 16:10:54 +08:00 |
wangzhenxing
|
66c50b6731
|
添加屏蔽,点挑战后不能再拖动
|
2021-10-14 15:48:30 +08:00 |
wangzhenxing
|
25bce8b8d4
|
bug修改提交
|
2021-10-14 15:38:47 +08:00 |
ZhangBiao
|
3d1a5ebd4c
|
【御剑行】提交
|
2021-10-14 15:30:46 +08:00 |
jiaoyangna
|
ac0221b89f
|
白金装备修改提交
|
2021-10-14 15:05:36 +08:00 |
wangzhenxing
|
f0fcd144f2
|
[战斗]===========被动添加 354 355
|
2021-10-14 13:54:07 +08:00 |
jiaoyangna
|
842c9b7592
|
白金装备属性加成添加
|
2021-10-14 12:39:40 +08:00 |
jiaoyangna
|
3cbffeab4a
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-14 12:14:26 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
ZhangBiao
|
4eb6e1d9ae
|
【御剑行】提交
|
2021-10-14 11:25:44 +08:00 |
ZhangBiao
|
2101e974ad
|
【御剑行】增加投注滑动条
|
2021-10-14 09:53:51 +08:00 |
ZhangBiao
|
81166ae892
|
【牛气冲天】修改,待后端修改数据,待增加新活动类型
|
2021-10-13 19:43:25 +08:00 |
wangzhenxing
|
7dce99c08c
|
玉虚修改
|
2021-10-13 19:35:30 +08:00 |
ZhangBiao
|
bb9533781d
|
【御剑行】提交
|
2021-10-13 19:15:39 +08:00 |
ZhangBiao
|
414ab1f3d9
|
【御剑行】提交
|
2021-10-13 17:38:32 +08:00 |
ZhangBiao
|
018c09d69c
|
【御剑行】竞猜,差一个三级弹窗
|
2021-10-13 17:30:26 +08:00 |
yuanshuai
|
dd56c24ae8
|
点金前端显示bug修改
|
2021-10-13 16:02:23 +08:00 |
wangzhenxing
|
ee434c85cc
|
结算界面名字显示修改
|
2021-10-13 15:45:42 +08:00 |
ZhangBiao
|
6870073129
|
【御剑行】排行完成
|
2021-10-13 15:39:47 +08:00 |
wangzhenxing
|
5b41289cd0
|
玉虚论道阵容界面修改
|
2021-10-13 15:26:12 +08:00 |
wangzhenxing
|
1ad72ca981
|
红点检测修改
|
2021-10-12 20:41:57 +08:00 |
wangzhenxing
|
e9b740510f
|
红点修改
|
2021-10-12 20:21:54 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
wangzhenxing
|
e28ca0087f
|
红点提交
|
2021-10-12 19:50:41 +08:00 |
jiaoyangna
|
1495f42672
|
好感度特效修改提交
|
2021-10-12 18:35:17 +08:00 |
wangzhenxing
|
a1f3f67bed
|
我的队伍信息英雄下方序号修改
|
2021-10-12 18:28:46 +08:00 |
jiaoyangna
|
686d9345f4
|
长按赠送道具数量不变修改
|
2021-10-12 18:01:39 +08:00 |
jiaoyangna
|
25f3f927d6
|
位置修改提交
|
2021-10-12 17:51:04 +08:00 |
ZhangBiao
|
9604225256
|
【御剑行】可以完成循环_提交
|
2021-10-12 17:21:46 +08:00 |
jiaoyangna
|
134e52feeb
|
赠予抖动修改提交
|
2021-10-12 17:17:16 +08:00 |
jiaoyangna
|
0740005166
|
好感度位置修改提交
|
2021-10-12 17:09:58 +08:00 |
wangzhenxing
|
7a83198c6f
|
播放战斗对碰时添加按钮屏蔽
|
2021-10-12 16:39:58 +08:00 |
jiaoyangna
|
3f92309d78
|
好感度添加特效
|
2021-10-12 16:33:10 +08:00 |
wangzhenxing
|
89216b64a5
|
玉虚队伍战斗显示不一致修改
|
2021-10-12 16:13:19 +08:00 |
ZhangBiao
|
533bd25780
|
【御剑行】提交
|
2021-10-12 15:53:57 +08:00 |
jiaoyangna
|
262aa7a7e7
|
装备界面适配修改提交
(cherry picked from commit 45d29ef264 )
(cherry picked from commit edfe797ddd )
|
2021-10-12 15:51:32 +08:00 |
wangzhenxing
|
c4d7edc289
|
玉虚bug修改
|
2021-10-12 15:33:39 +08:00 |
jiaoyangna
|
60b53f2d7b
|
神将详情,装备修改提交
|
2021-10-12 15:32:07 +08:00 |
jiaoyangna
|
e70329e605
|
神将详情显示错误修改
|
2021-10-12 14:54:12 +08:00 |
jiaoyangna
|
e7cfacdccd
|
神奖详情界面修改提交
|
2021-10-12 14:26:19 +08:00 |
jiaoyangna
|
79e751197f
|
战力不一致修改提交
|
2021-10-12 13:20:24 +08:00 |
jiaoyangna
|
b0f9b28036
|
神将详情报错修改提交
|
2021-10-12 12:17:33 +08:00 |
jiaoyangna
|
1a165839fd
|
点击神将详情界面查看属性按钮报错修改必现
|
2021-10-12 12:16:31 +08:00 |
wangzhenxing
|
1b2c8cc693
|
回方添加战斗力显示,解决青铜1升青铜2 进度条时间太长问题
|
2021-10-12 11:51:43 +08:00 |
ZhangBiao
|
359ca6b299
|
【御剑行】提交
|
2021-10-12 11:26:48 +08:00 |
wangzhenxing
|
4317d1df54
|
奖励显示修改
|
2021-10-12 10:27:49 +08:00 |
jiaoyangna
|
fb0aec52e6
|
好感度优化
|
2021-10-12 10:05:10 +08:00 |
wangzhenxing
|
2f31f6c588
|
上阵界面排序修改
|
2021-10-12 10:03:20 +08:00 |
wangzhenxing
|
d2c2b39b8b
|
[战斗]==========被动312修改
|
2021-10-11 17:46:01 +08:00 |
ZhangBiao
|
99d80454f5
|
【御剑行】增加开始动画
|
2021-10-11 17:25:48 +08:00 |
wangzhenxing
|
d8a0a0e8c1
|
玉虚提交
|
2021-10-11 16:30:33 +08:00 |
jiaoyangna
|
457b40b1e2
|
点击报错修改
|
2021-10-11 15:25:55 +08:00 |
jiaoyangna
|
4a338b9d4c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-11 15:15:50 +08:00 |
jiaoyangna
|
750f4afaef
|
ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 15:15:34 +08:00 |
ZhangBiao
|
853933b0ea
|
【优化】服务器列表排序
|
2021-10-11 15:01:49 +08:00 |
ZhangBiao
|
294147b9ba
|
【御剑行】提交
|
2021-10-11 14:37:33 +08:00 |
jiaoyangna
|
4ff2e1dc8d
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 13:53:02 +08:00 |
jiaoyangna
|
d9dce4e4ca
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 12:45:23 +08:00 |
jiaoyangna
|
5f15c8549e
|
【ID1010432】
【四灵试炼】编队界面的神将排序改为与心魔试炼相同
|
2021-10-11 11:33:55 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
wangzhenxing
|
453216c6c7
|
【战斗】==========被动344修改
|
2021-10-09 18:23:45 +08:00 |
ZhangBiao
|
a0911448b2
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
|
2021-10-09 18:18:32 +08:00 |
ZhangBiao
|
110a6d64c0
|
【御剑行】导入资源,剑
|
2021-10-09 18:17:59 +08:00 |
wangzhenxing
|
79addd132d
|
[战斗]=========被动250 修改
|
2021-10-09 18:10:11 +08:00 |
wangzhenxing
|
4bd1047ccc
|
[战斗]=====被动116 258 281 312 344修改
|
2021-10-09 17:13:24 +08:00 |
ZhangBiao
|
895916a53a
|
【御剑行】提交
|
2021-10-09 16:24:34 +08:00 |
jiaoyangna
|
ad690ffc38
|
去掉次数修改
|
2021-10-09 15:26:33 +08:00 |
jiaoyangna
|
f4997e7a57
|
【ID1018706】
【巅峰赛】准备阶段一键上阵可以换人
|
2021-10-09 15:22:42 +08:00 |
jiaoyangna
|
4b7838584b
|
红点修改提交
|
2021-10-09 15:04:43 +08:00 |
jiaoyangna
|
89f66bc294
|
特权收益描述修改提交
|
2021-10-09 14:53:22 +08:00 |
jiaoyangna
|
e3bb67c8a1
|
特权收益显示修改提交
|
2021-10-09 14:34:34 +08:00 |
ZhangBiao
|
f1e5f69614
|
【御剑行】提交
|
2021-10-09 14:33:09 +08:00 |
jiaoyangna
|
7737449829
|
【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
|
2021-10-09 12:14:34 +08:00 |
jiaoyangna
|
d58e38fcea
|
【ID1018684】
【好感度】好感度挂机加成没在挂机奖励预览处显示数量
|
2021-10-09 12:04:01 +08:00 |
jiaoyangna
|
32a38b6053
|
【ID1018679】
【好感度】礼物图标在背包没阵营标记
|
2021-10-09 11:39:09 +08:00 |
ZhangBiao
|
5d4dc1ab37
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-09 11:15:04 +08:00 |
ZhangBiao
|
e8bfd73a9d
|
【织女】立绘不动修改
|
2021-10-09 11:14:24 +08:00 |
jiaoyangna
|
e23d1259f1
|
ID1018689】
【好感度】好感度详情界面,好感等级进度,已达成的固定显示好感度
|
2021-10-09 11:09:53 +08:00 |
jiaoyangna
|
8b13f803c8
|
ID1018691】
【好感度】背包里所有5星好感度都满了,好感度入口还显示红点
|
2021-10-09 11:06:59 +08:00 |
ZhangBiao
|
f2b5f62ddd
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-10-09 11:00:18 +08:00 |
ZhangBiao
|
09bb4fc688
|
【御剑行】可以读取剧本移动了
|
2021-10-09 10:56:49 +08:00 |
jiaoyangna
|
845373e12d
|
好感度长按修改提交
|
2021-10-09 10:53:32 +08:00 |
ZhangBiao
|
21bdecb465
|
【御剑行】提交
|
2021-10-08 20:49:25 +08:00 |
jiaoyangna
|
c72d3af853
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:32:16 +08:00 |
jiaoyangna
|
937096d445
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:17:59 +08:00 |
jiaoyangna
|
7b88415339
|
好感度优化提交
|
2021-10-08 18:53:06 +08:00 |
ZhangBiao
|
81a3db0446
|
【御剑行】提交
|
2021-10-08 15:45:28 +08:00 |
jiaoyangna
|
6700723aaa
|
好感度0级挂机收益显示错误修改
|
2021-10-08 14:31:28 +08:00 |
jiaoyangna
|
14008964fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:55:25 +08:00 |
jiaoyangna
|
f449016952
|
添加容错
|
2021-10-08 11:55:01 +08:00 |
ZhangBiao
|
878f0410ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-08 11:54:09 +08:00 |
ZhangBiao
|
eb816dcc89
|
【七界试炼】修复无法取消激活
|
2021-10-08 11:53:54 +08:00 |
jiaoyangna
|
e019ef8f22
|
【ID1010392】
点石成金基础收益随着玩家等级提升
|
2021-10-08 11:51:37 +08:00 |
jiaoyangna
|
8de35750c6
|
【ID1010413】
【新功能】玩家等级提升时 发放道具进背包
|
2021-10-08 11:34:48 +08:00 |
gaoxin
|
2dbb544a46
|
【登录】登录接口编号增加
|
2021-09-30 15:19:10 +08:00 |