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 |
zhangqiang
|
7f89708bf0
|
【跨服天梯】修改
|
2020-12-18 10:57:58 +08:00 |
zhangqiang
|
004c56ce90
|
【跨服天梯】修改
|
2020-12-18 10:57:29 +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 |
Fuhaifeng
|
798fe1debe
|
no message
|
2020-12-18 10:08:23 +08:00 |
gaoxin
|
9b83785b6d
|
【系统消息】添加法宝等级的显示
|
2020-12-18 09:56:39 +08:00 |
Fuhaifeng
|
1c89a5c8cd
|
Kua脚本优化。UI框架,RoleList Bag 协程加载。 UIManager1,2,3,4
|
2020-12-17 19:39:52 +08:00 |
zhangqiang
|
0ff72cb455
|
【跨服天梯】修改
|
2020-12-17 19:25:53 +08:00 |
zhangqiang
|
6c57e730dd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-17 19:24:52 +08:00 |
zhangqiang
|
c4fb8f85a8
|
【跨服天梯】修改
|
2020-12-17 19:24:43 +08:00 |
gaoxin
|
f784532f31
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-17 18:36:12 +08:00 |
gaoxin
|
abc76576b6
|
【战报系统】代码添加
|
2020-12-17 18:36:08 +08:00 |
wangzhenxing
|
96ab4566ba
|
【战斗】 188被动修改 间接伤害不会被义结金兰分摊
|
2020-12-17 18:24:44 +09:00 |
wangzhenxing
|
3e6c6a8fe5
|
【战斗】 142被动效果修改 间接伤害不会触发回血
|
2020-12-17 18:00:15 +09:00 |
wangzhenxing
|
4184907033
|
[战斗]284效果修改,非技能伤害不会回血
|
2020-12-17 17:41:12 +09:00 |
wangzhenxing
|
ce527ef108
|
[战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动
|
2020-12-17 16:51:22 +09:00 |
jiaoyangna
|
cfc4f0f0f6
|
[天相几人]图片提交
|
2020-12-17 15:46:28 +08:00 |
jiaoyangna
|
bcef9f04f5
|
[主题活动]
|
2020-12-17 15:34:21 +08:00 |
zhangqiang
|
6ca1f1980b
|
提交协议
|
2020-12-16 20:37:36 +08:00 |
zhangqiang
|
74aef8e711
|
Merge branch '0功能/跨服十绝阵' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-16 20:27:53 +08:00 |
zhangqiang
|
944cff4976
|
【跨服天梯】主界面修改提交
|
2020-12-16 20:25:19 +08:00 |
zhangqiang
|
d24f8c2c14
|
【跨服天梯】 修改提交
|
2020-12-16 20:20:47 +08:00 |
zhangqiang
|
476edb6428
|
【跨服天梯】 修改提交
|
2020-12-16 20:18:46 +08:00 |
zhangqiang
|
76db4f2db9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-16 17:25:01 +08:00 |
zhangqiang
|
e7f6bf85de
|
【跨服天梯】代码修改提交
|
2020-12-16 17:24:31 +08:00 |
ZhangBiao
|
d847323693
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-16 17:24:02 +08:00 |
ZhangBiao
|
56eb6c613a
|
【森罗幻境】移动过程中打开其他界面问题修复
|
2020-12-16 17:23:52 +08:00 |
zhangqiang
|
ec7b10d08e
|
Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-12-16 17:21:11 +08:00 |
zhangqiang
|
37336acb66
|
【跨服天梯】提交
|
2020-12-16 17:04:17 +08:00 |
zhangqiang
|
548d0af299
|
【资源导入】 zbj音效替换
|
2020-12-16 16:32:35 +08:00 |
ZhangBiao
|
a03b4e9c5a
|
【青龙秘宝】青龙秘宝等级购买报错修复
|
2020-12-16 14:23:44 +08:00 |
gaoxin
|
f4096cb18b
|
【战斗】v1.0.11
1、修复圣物效果数据错误
2、不灭buff实现方式修改
3、灵兽buff回合计算方式修改
|
2020-12-16 11:36:29 +08:00 |
zhangqiang
|
8ffc2047e5
|
【资源导入】 zbj技能音效提交
|
2020-12-16 11:35:55 +08:00 |
zhangqiang
|
fd28024dc2
|
【跨服天梯】提交
|
2020-12-16 11:28:57 +08:00 |
Fuhaifeng
|
7f517ca069
|
真机安卓打包测试A Splash之后黑屏
|
2020-12-16 10:23:09 +08:00 |
Fuhaifeng
|
b3eb231d0b
|
no message
|
2020-12-15 19:18:00 +08:00 |
liujiaqi
|
9546fe1477
|
【资源】猪八戒小头像大卡牌
|
2020-12-15 16:44:26 +08:00 |
jiaoyangna
|
f5fface274
|
【十绝阵】修改提交
|
2020-12-15 13:59:29 +08:00 |
JieLing
|
652217ab37
|
【宝物合成】显示有问题
|
2020-12-15 11:51:40 +08:00 |
zhangqiang
|
bdb9eeba2d
|
【资源导入】 猪八戒新皮肤 live2d
|
2020-12-15 10:21:05 +08:00 |