zhangqiang
|
e38c766348
|
Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua
|
2020-12-26 11:45:20 +08:00 |
zhangqiang
|
e7bc488e08
|
【跨服天梯】bug提交 1
|
2020-12-23 19:53:32 +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
|
e3960fc466
|
【跨服天梯】 提交
|
2020-11-20 17:35:49 +08:00 |
JieLing
|
837d7d8886
|
【社稷大典】 公会排行显示问题
|
2020-10-26 17:59:58 +08:00 |
JieLing
|
ef4f4232cb
|
【灵兽系统】 修改显示 排行榜显示修改
|
2020-10-26 18:04:45 +08:00 |
ZhangBiao
|
7b4f959687
|
Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2020-10-24 16:47:45 +08:00 |
ZhangBiao
|
c768775e06
|
【社稷大典】加完红点完事了
|
2020-10-24 16:18:57 +08:00 |
ZhangBiao
|
d57fc60aa1
|
社稷大典,差个加工会限制和领奖界面
|
2020-10-23 19:34:03 +08:00 |
zhangqiang
|
e7c981763a
|
language 修改
|
2020-10-23 15:58:38 +08:00 |
zhangqiang
|
af6186a43d
|
线上活动 森罗幻境达人前端修改2
|
2020-10-10 18:32:18 +08:00 |
zhangqiang
|
d07a74e490
|
线上问题 公会排行 首个没有显示公会名称
|
2020-10-10 14:52:31 +08:00 |
gaoxin
|
96ac81c098
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-27 13:33:39 +08:00 |
gaoxin
|
525e229273
|
部分界面头像特效添加
|
2020-09-27 13:33:10 +08:00 |
ZhangBiao
|
9b9c094f3b
|
Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-09-25 15:28:37 +08:00 |
ZhangBiao
|
bec9ecf6d3
|
三界降魔
|
2020-09-25 15:24:59 +08:00 |
zhangqiang
|
5f8b1027ee
|
线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-23 14:51:33 +08:00 |
zhangqiang
|
6f107f78fa
|
音效
|
2020-09-15 18:16:01 +08:00 |
zhangqiang
|
121901c06e
|
线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-23 15:49:48 +08:00 |
zhangqiang
|
c315cf768d
|
竞技场排行
|
2020-08-27 10:52:35 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
ZhangBiao
|
0bf6e05add
|
【社稷大典】提交6
|
2020-10-24 18:58:07 +08:00 |
ZhangBiao
|
a2a870f421
|
【社稷大典】提交4
|
2020-10-24 18:41:21 +08:00 |
zhangqiang
|
d2792bdb8b
|
线上活动 森罗幻境达人前端修改2
|
2020-10-12 14:47:02 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
ZhangBiao
|
97f9b8f671
|
遴选三界除魔
|
2020-09-27 16:44:31 +08:00 |
zhangqiang
|
96ab48c22f
|
遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-27 16:14:42 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
zhangqiang
|
9aec7d16e8
|
公会副本提交
|
2020-08-22 15:34:02 +08:00 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
13cad0dd5b
|
排行榜切磋玩回来立绘丢了问题修改
|
2020-08-03 19:41:54 +08:00 |
zhangqiang
|
b6de5d609a
|
排行切磋完出来 排行榜为空 修复
|
2020-08-19 04:47:37 +08:00 |
zhangqiang
|
a325bfb781
|
竞技场排名
|
2020-07-20 15:34:30 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |