ZhangBiao
|
95f71667fe
|
【灵脉秘境】提交
|
2021-11-19 17:23:06 +08:00 |
ZhangBiao
|
f79de8970c
|
【灵脉秘境】提交
|
2021-11-18 15:45:21 +08:00 |
ZhangBiao
|
790fe1c88f
|
【灵脉秘境】提交
|
2021-11-17 18:28:59 +08:00 |
jiaoyangna
|
6e294df15a
|
删除log
|
2021-11-11 16:07:33 +08:00 |
ZhangBiao
|
22941d0af5
|
【弹窗优化】公会、公告、服务器列表】英雄信息
|
2021-10-22 13:53:10 +08:00 |
ZhangBiao
|
31e8f4c726
|
【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗
|
2021-10-22 13:22:39 +08:00 |
gaoxin
|
34a58a310c
|
【排行榜】修复膜拜后页签红点刷新不及时,修复跨服前七天跨服按钮会显示红点
|
2021-10-21 17:02:05 +08:00 |
gaoxin
|
11d5f735c7
|
【七界试炼】排行榜删除切磋和加入黑名单按钮
|
2021-10-18 21:06:01 +08:00 |
jiaoyangna
|
f31f62ec09
|
排行榜上小人方向修改
|
2021-10-15 11:51:38 +08:00 |
jiaoyangna
|
851bd2450c
|
排行榜上小人朝侧面修改提交
|
2021-10-15 11:40:01 +08:00 |
wangzhenxing
|
36d542ba9d
|
玉虚论道优化提交
|
2021-09-30 15:12:02 +08:00 |
wangzhenxing
|
d45abf6fcf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-28 15:54:33 +08:00 |
wangzhenxing
|
e42540ade8
|
排行榜修改提交
|
2021-09-28 10:29:33 +08:00 |
ZhangBiao
|
a8c9c836a9
|
【排行榜】膜拜转圈儿修复
|
2021-09-27 17:46:40 +08:00 |
gaoxin
|
59311a8d88
|
【跨服】算错了跨服前七天的事件
|
2021-09-26 15:02:33 +08:00 |
ZhangBiao
|
9b24649f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:08:13 +08:00 |
ZhangBiao
|
0422b5c738
|
【七界试炼】提交
|
2021-09-23 16:08:02 +08:00 |
gaoxin
|
1e011b560a
|
【跨服】开服前七天无法进入跨服
|
2021-09-23 15:52:01 +08:00 |
ZhangBiao
|
016f0159e5
|
【七界试炼】提交
|
2021-09-23 14:51:04 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# 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/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
wangzhenxing
|
a7f0c42cae
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-18 11:52:01 +08:00 |
ZhangBiao
|
b1265379f9
|
【七界试炼】排行榜和开启时间显示
|
2021-09-18 11:24:11 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36:16 +08:00 |
wangzhenxing
|
4b5c55a1ab
|
qqq
|
2021-09-11 15:05:37 +08:00 |
gaoxin
|
60b842e2ab
|
【排行榜】报错修复
|
2021-09-09 14:05:44 +08:00 |
wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +08:00 |
jiaoyangna
|
3b8fc3700f
|
排行榜修改提交
|
2021-09-01 17:21:33 +08:00 |
jiaoyangna
|
bfe127012e
|
排行榜修改提交
|
2021-09-01 16:39:09 +08:00 |
ZhangBiao
|
74f0e3f8a2
|
【玉虚论道】编队界面提交
|
2021-08-27 13:45:09 +08:00 |
ZhangBiao
|
c0ea5e1b7f
|
【玉虚论道】其他人编队信息界面
|
2021-08-26 17:14:13 +08:00 |
ZhangBiao
|
391c538ceb
|
【玉虚论道】提交
|
2021-08-26 09:59:59 +08:00 |
zhangqiang
|
617d4d39c3
|
【十绝阵】排行榜修改
|
2021-08-13 16:35:33 +08:00 |
zhangqiang
|
0ab8247704
|
【跨服排行榜】修改
|
2021-08-03 10:12:54 +08:00 |
zhangqiang
|
acf647d9c5
|
【罗浮争锋】
|
2021-07-31 17:20:07 +08:00 |
zhangqiang
|
fa203e1dc8
|
【跨服排行】
|
2021-07-30 19:20:53 +08:00 |
zhangqiang
|
c1e192943c
|
【排行榜】踏碎凌霄称号大小修改
|
2021-07-30 18:29:44 +08:00 |
zhangqiang
|
80392134af
|
【跨服排行】红点显示修改
|
2021-07-30 15:57:11 +08:00 |
zhangqiang
|
c0243afe6c
|
【跨服分组】推送
|
2021-07-30 15:14:52 +08:00 |
zhangqiang
|
78ec831ca1
|
【跨服详情】修改提交
|
2021-07-30 11:59:39 +08:00 |
zhangqiang
|
edbfbc9afc
|
【主城优化】跨服战入口变更位置
|
2021-07-30 10:20:35 +08:00 |
zhangqiang
|
8b56e352ba
|
【跨服排行榜】
|
2021-07-29 17:11:10 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
zhangqiang
|
c3b68ef28a
|
【跨服】修改跨服排行未解锁提示文字
|
2021-07-22 19:30:53 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
zhangqiang
|
3b9af50a15
|
【跨服天梯】国内提交+1
|
2021-07-14 20:52:54 +08:00 |
zhangqiang
|
b034028ad1
|
【跨服天梯】国内提交+1
|
2021-07-14 20:47:49 +08:00 |
zhangqiang
|
2c9d4f5c51
|
【跨服天梯】国内提交+1
|
2021-07-13 19:48:14 +08:00 |
zhangqiang
|
f7932b9e8c
|
【罗浮争锋】国内提交+1
|
2021-07-13 17:40:25 +08:00 |
ZhangBiao
|
36ccbe968b
|
【森罗幻境】排行榜信息冗余修改
|
2021-07-01 15:42:23 +08:00 |
zhangqiang
|
71540fcfd2
|
【跨服天梯】国内提交1
|
2021-06-25 15:23:55 +08:00 |