gaoxin
|
79f6090afb
|
【协议】回滚系统消息item字段类型
|
2020-12-18 18:22:52 +08:00 |
gaoxin
|
eeb7ecba91
|
【资源】资源名重复修改
|
2020-12-18 18:01:08 +08:00 |
guowei
|
f84e97f531
|
【鸿蒙阵选人界面】
|
2020-12-18 17:41:33 +08:00 |
guowei
|
2a1546b7a4
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab
|
2020-12-18 17:28:22 +08:00 |
guowei
|
d7414a03bd
|
【鸿蒙阵选人界面】
|
2020-12-18 17:24:03 +08:00 |
gaoxin
|
ec47ec2b1c
|
【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据
|
2020-12-18 16:51:28 +08:00 |
gaoxin
|
ef1ced3ef7
|
【战报系统】基础功能添加
|
2020-12-18 16:51:13 +08:00 |
zhangqiang
|
00980feb57
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
|
2020-12-18 16:38:03 +08:00 |
zhangqiang
|
e09ed9fdfc
|
【鸿蒙阵】 限制
|
2020-12-18 16:37:56 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
ZhangBiao
|
72f2dd0e90
|
【主题活动】删除多余的预设
|
2020-12-18 14:05:17 +08:00 |
guowei
|
8438bb9de6
|
【补充 鸿蒙阵贴图】
|
2020-12-18 13:40:59 +08:00 |
guowei
|
4f4542d53a
|
【鸿蒙阵】
|
2020-12-18 13:39:35 +08:00 |
ZhangBiao
|
0692fbf799
|
【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285 )
|
2020-12-18 12:02:42 +08:00 |
ZhangBiao
|
1431423c4f
|
【森罗幻境】移动过程中打开其他界面问题修复
|
2020-12-18 11:39:01 +08:00 |
ZhangBiao
|
223b816a98
|
【青龙秘宝】青龙秘宝等级购买报错修复
|
2020-12-18 11:38:47 +08:00 |
gaoxin
|
57ef5e73cf
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-18 11:32:23 +08:00 |
jiaoyangna
|
22785d4675
|
[天相几人]图片提交
|
2020-12-18 11:23:00 +08:00 |
jiaoyangna
|
9f01de23ea
|
[主题活动]
|
2020-12-18 11:22:54 +08:00 |
zhangqiang
|
cf83adb214
|
【资源导入】 zbj音效替换
|
2020-12-18 11:22:27 +08:00 |
zhangqiang
|
85c47c5ce5
|
【资源导入】 zbj技能音效提交
|
2020-12-18 11:22:17 +08:00 |
liujiaqi
|
1ecb31cb89
|
【资源】猪八戒小头像大卡牌
|
2020-12-18 11:22:06 +08:00 |
zhangqiang
|
282e557425
|
【资源导入】 猪八戒新皮肤 live2d
|
2020-12-18 11:21:59 +08:00 |
zhangqiang
|
5ac11ac291
|
【资源导入】猪八戒新皮肤特效
|
2020-12-18 11:21:53 +08:00 |
wangzhenxing
|
3a1bbf7cac
|
【战斗】 188被动修改 间接伤害不会被义结金兰分摊
|
2020-12-18 11:23:41 +09:00 |
wangzhenxing
|
c4320e59e2
|
【战斗】 142被动效果修改 间接伤害不会触发回血
|
2020-12-18 11:22:58 +09:00 |
wangzhenxing
|
2dd63c7986
|
[战斗]284效果修改,非技能伤害不会回血
|
2020-12-18 11:22:24 +09:00 |
wangzhenxing
|
297b36eb2b
|
[战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动
|
2020-12-18 11:21:10 +09:00 |
guowei
|
90df0aef7e
|
【UI占位 变更】
|
2020-12-17 11:29:16 +08:00 |
guowei
|
52d493ebc7
|
【鸿蒙阵】二次提交
|
2020-12-17 10:41:00 +08:00 |
ZhangBiao
|
45b8899cfe
|
【建木神树】排行榜查看其他人信息
|
2020-12-16 13:49:56 +08:00 |
JieLing
|
72893d588f
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-16 11:38:24 +08:00 |
gaoxin
|
f4096cb18b
|
【战斗】v1.0.11
1、修复圣物效果数据错误
2、不灭buff实现方式修改
3、灵兽buff回合计算方式修改
|
2020-12-16 11:36:29 +08:00 |
ZhangBiao
|
0b6c8362b6
|
【建木神树】提交
|
2020-12-15 17:27:16 +08:00 |
JieLing
|
eb93ce3f48
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-15 12:04:53 +08:00 |
JieLing
|
652217ab37
|
【宝物合成】显示有问题
|
2020-12-15 11:51:40 +08:00 |
guowei
|
861b02f0c8
|
【鸿蒙阵初版】
|
2020-12-15 11:03:34 +08:00 |
zhangqiang
|
74df46d7a8
|
【套装属性】 bug修改
|
2020-12-14 17:51:44 +08:00 |
ZhangBiao
|
72e22a7234
|
【建木神树】战力对上了,就差调两个界面了
|
2020-12-14 17:14:42 +08:00 |
JieLing
|
3c67f34b18
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-14 11:53:15 +08:00 |
jiaoyangna
|
4519f70c54
|
四灵试炼commit
|
2020-12-14 09:54:50 +08:00 |
gaoxin
|
06f487a176
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-12 18:00:38 +08:00 |
ZhangBiao
|
4c73219b39
|
【森罗幻境】诸多bug 修复
|
2020-12-12 18:00:18 +08:00 |
ZhangBiao
|
4da5b2ac46
|
【易经宝库】
|
2020-12-12 17:53:34 +08:00 |
ZhangBiao
|
242a85a27e
|
【道具自选箱】宝箱开启数量不能为0
|
2020-12-12 17:53:27 +08:00 |
jiaoyangna
|
720d4f5d8c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-12 17:22:07 +08:00 |
zhangqiang
|
475badacc1
|
博闻强识图片修改
|
2020-12-12 17:21:28 +08:00 |
jiaoyangna
|
0a1e1666f7
|
【博文多识】
|
2020-12-12 17:21:13 +08:00 |
zhangqiang
|
1e91b33cdd
|
Merge branch 'master_xma_local' into 0功能/1209更新内容
|
2020-12-12 17:08:37 +08:00 |
zhangqiang
|
328af3f66b
|
【装备套装】
|
2020-12-12 17:07:22 +08:00 |