ZhangBiao
|
ad9bcaa2fa
|
【七界试炼】提交
|
2021-09-15 14:02:39 +08:00 |
ZhangBiao
|
599fe0dcee
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
|
2021-09-14 17:54:18 +08:00 |
wangzhenxing
|
d056a2dd70
|
玉虚论道提交
|
2021-09-14 10:10:57 +08:00 |
ZhangBiao
|
20dc2526d6
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
|
2021-09-13 18:09:27 +08:00 |
ZhangBiao
|
b609616b6b
|
【七界试炼】提交
|
2021-09-13 18:06:39 +08:00 |
wangzhenxing
|
b3eb686222
|
bug修改提交
|
2021-09-13 14:11:48 +08:00 |
ZhangBiao
|
94ed6ad618
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-13 13:56:43 +08:00 |
ZhangBiao
|
c68496654f
|
【七界试炼】遗物
|
2021-09-13 13:54:58 +08:00 |
ZhangBiao
|
8c9f31f028
|
【七界试炼】遗物
|
2021-09-13 11:42:14 +08:00 |
wangzhenxing
|
441e5ba1cc
|
aaaaa
|
2021-09-13 10:06:50 +08:00 |
gaoxin
|
6a3d4b99f7
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-11 20:26:49 +08:00 |
gaoxin
|
8e55ed2fff
|
【玉虚】角色信息界面大小动态变化
|
2021-09-11 20:26:43 +08:00 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +08:00 |
wangzhenxing
|
683b48fb0c
|
玉虚论道提交
|
2021-09-11 18:53:58 +08:00 |
wangzhenxing
|
d9214666c2
|
玉虚论道回放优化
|
2021-09-11 16:00:39 +08:00 |
ZhangBiao
|
41282c144c
|
【七界试炼】七界币增加加号
|
2021-09-11 15:47:19 +08:00 |
wangzhenxing
|
4b5c55a1ab
|
qqq
|
2021-09-11 15:05:37 +08:00 |
wangzhenxing
|
cbb088a491
|
他人队伍灵兽修改
|
2021-09-10 22:13:48 +08:00 |
wangzhenxing
|
489f6f7e37
|
编对拖动英雄保存队伍修改
|
2021-09-10 21:34:45 +08:00 |
ZhangBiao
|
4eb8e566fe
|
【七界试炼】战斗结束提交
|
2021-09-10 18:36:39 +08:00 |
wangzhenxing
|
16289857a5
|
aaaa
|
2021-09-10 18:21:04 +08:00 |
gaoxin
|
5af9e9f0ed
|
【编队】修复报错
|
2021-09-10 17:30:26 +08:00 |
ZhangBiao
|
d6725f3320
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:39:43 +08:00 |
gaoxin
|
f7d1601c79
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:26:34 +08:00 |
gaoxin
|
16633b37a8
|
【编队优化】
|
2021-09-10 16:25:38 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +08:00 |
ZhangBiao
|
42df2f4af5
|
【七界试炼】提交
|
2021-09-10 15:23:15 +08:00 |
ZhangBiao
|
2d003aaafd
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-10 10:33:44 +08:00 |
ZhangBiao
|
cef2b42bcc
|
【七界试炼】提交
|
2021-09-10 10:30:50 +08:00 |
wangzhenxing
|
3257b89e70
|
eeeeeeee
|
2021-09-09 23:01:23 +08:00 |
wangzhenxing
|
159f2e2494
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua
|
2021-09-09 20:37:53 +08:00 |
wangzhenxing
|
a1c21eb441
|
qqqqq
|
2021-09-09 20:32:02 +08:00 |
gaoxin
|
8bb679214b
|
【玉虚】QA提示添加
|
2021-09-09 19:21:50 +08:00 |
gaoxin
|
ed1f153fa1
|
【玉虚】挑战界面动画添加,优化界面显示,挑战完成后关闭界面时刷新挑战列表
|
2021-09-09 18:04:56 +08:00 |
wangzhenxing
|
48e25d05e7
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 16:47:34 +08:00 |
wangzhenxing
|
21a222cb27
|
aaaaaaaa
|
2021-09-09 16:47:18 +08:00 |
gaoxin
|
1094c3678a
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 16:40:34 +08:00 |
gaoxin
|
b29d7b43fe
|
【玉虚】每日挑战奖励显示优化
|
2021-09-09 16:40:29 +08:00 |
wangzhenxing
|
ea457002be
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 16:27:53 +08:00 |
wangzhenxing
|
c27379226c
|
aaaaaaaaaaaaa
|
2021-09-09 16:27:36 +08:00 |
gaoxin
|
b1c987b16f
|
【玉虚】界面显示优化,星星显示优化
|
2021-09-09 16:22:35 +08:00 |
wangzhenxing
|
49a7a2b242
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-09 15:44:33 +08:00 |
wangzhenxing
|
0d82056bc2
|
主界面显示修改
|
2021-09-09 15:44:19 +08:00 |
gaoxin
|
065734184e
|
【玉虚】商店跳转添加
|
2021-09-09 15:16:41 +08:00 |
gaoxin
|
60b842e2ab
|
【排行榜】报错修复
|
2021-09-09 14:05:44 +08:00 |
wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +08:00 |
ZhangBiao
|
1fefbb43e6
|
【七界试炼】提交
|
2021-09-09 11:10:43 +08:00 |
ZhangBiao
|
b05227f79e
|
【七界试炼】提交
|
2021-09-08 17:32:48 +08:00 |
ZhangBiao
|
2fe984719b
|
【七界试炼】遗物1/2
|
2021-09-08 16:26:40 +08:00 |
ZhangBiao
|
6ec532f769
|
【七界试炼】排行奖励
|
2021-09-08 14:36:37 +08:00 |