ZhangBiao
|
3b42cd525e
|
【三界降魔】新活动完成
|
2021-10-27 18:08:16 +08:00 |
gaoxin
|
7a5f41ef46
|
【积天豪礼】分离到主城
|
2021-11-10 00:58:39 +08:00 |
ZhangBiao
|
448ec131e8
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-10-21 13:07:13 +08:00 |
ZhangBiao
|
3293656507
|
【新百宝商会】提交
|
2021-10-21 13:06:25 +08:00 |
ZhangBiao
|
1e3b3c9f27
|
【御剑行】修改提交
|
2021-10-20 18:31:59 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
jiaoyangna
|
c091c55bef
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-19 11:04:06 +08:00 |
ZhangBiao
|
6ebe5720a6
|
【御剑行】红点提交
|
2021-10-14 18:28:27 +08:00 |
ZhangBiao
|
3d1a5ebd4c
|
【御剑行】提交
|
2021-10-14 15:30:46 +08:00 |
ZhangBiao
|
9604225256
|
【御剑行】可以完成循环_提交
|
2021-10-12 17:21:46 +08:00 |
ZhangBiao
|
533bd25780
|
【御剑行】提交
|
2021-10-12 15:53:57 +08:00 |
ZhangBiao
|
359ca6b299
|
【御剑行】提交
|
2021-10-12 11:26:48 +08:00 |
ZhangBiao
|
99d80454f5
|
【御剑行】增加开始动画
|
2021-10-11 17:25:48 +08:00 |
ZhangBiao
|
294147b9ba
|
【御剑行】提交
|
2021-10-11 14:37:33 +08:00 |
ZhangBiao
|
422806200e
|
【御剑行】提交
|
2021-09-28 10:34:05 +08:00 |
jiaoyangna
|
5b7b607725
|
主城玲珑宝镜入口提交
|
2021-09-23 16:21:51 +08:00 |
gaoxin
|
ec14782e3f
|
【红点】没删干净
|
2021-09-14 17:40:37 +08:00 |
gaoxin
|
fcc1e17cad
|
【红点】无用红点绑定事件删除
|
2021-09-14 17:37:44 +08:00 |
gaoxin
|
c19cfb3d49
|
【提审】关闭太初密卷显示
|
2021-08-28 15:26:35 +08:00 |
gaoxin
|
642ea1f7cd
|
【太初密卷】喜扑和动游渠道关闭
|
2021-08-25 07:25:38 +08:00 |
jiaoyangna
|
6ea8e96e59
|
太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
|
2021-08-23 14:34:08 +08:00 |
jiaoyangna
|
6a36e5ffd3
|
太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
|
2021-08-23 14:27:49 +08:00 |
jiaoyangna
|
16ca4f84d6
|
太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
|
2021-08-23 14:27:41 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
jiaoyangna
|
5c4696ad6c
|
太初秘卷修改提交
|
2021-08-12 17:32:34 +08:00 |
jiaoyangna
|
a5af78f2c9
|
主城界面修改
|
2021-08-12 12:00:36 +08:00 |
jiaoyangna
|
792b533fa0
|
太初秘卷修改提交
|
2021-08-12 11:02:21 +08:00 |
jiaoyangna
|
b83ee5e000
|
太初秘卷修改
|
2021-08-11 17:14:20 +08:00 |
jiaoyangna
|
c3d45f1316
|
【ID1010059】
【新功能】太初密卷
|
2021-08-11 15:15:41 +08:00 |
zhangqiang
|
0de6e3f63a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 11:00:06 +08:00 |
zhangqiang
|
8ef10cb100
|
【主城小人层级】
|
2021-08-03 10:59:41 +08:00 |
ZhangBiao
|
fef7ea4d0b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 10:39:57 +08:00 |
ZhangBiao
|
53dc964596
|
【十绝阵】主界面倒计时超框修改
|
2021-08-03 10:39:40 +08:00 |
zhangqiang
|
3c899d20d5
|
【主城】主城小人层级错误
|
2021-08-03 10:36:55 +08:00 |
zhangqiang
|
acf647d9c5
|
【罗浮争锋】
|
2021-07-31 17:20:07 +08:00 |
zhangqiang
|
c0243afe6c
|
【跨服分组】推送
|
2021-07-30 15:14:52 +08:00 |
zhangqiang
|
23d4f9548f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:21:45 +08:00 |
zhangqiang
|
edbfbc9afc
|
【主城优化】跨服战入口变更位置
|
2021-07-30 10:20:35 +08:00 |
gaoxin
|
f5584b0fbe
|
【巅峰赛】添加未开放状态兼容处理
|
2021-07-29 20:00:02 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
jiaoyangna
|
24363d5c03
|
【ID1009862】
15日登录送白泽活动加入预告功能
|
2021-07-24 15:46:00 +08:00 |
wangzhenxing
|
3dc2970f1f
|
[功能]============15日登陆预告预设修改,整点自动刷新
|
2021-07-23 16:27:33 +08:00 |
wangzhenxing
|
d0d533cecc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:08:03 +08:00 |
wangzhenxing
|
f7029c2ef0
|
[功能]==============15日登陆添加 预告
|
2021-07-23 11:07:46 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +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 |
DESKTOP-98AVA47\Administrator
|
0aa779f177
|
添加左右切换按钮
|
2021-07-16 14:18:25 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
695a61abaa
|
Merge branch '0优化/主题活动' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-07-15 18:52:59 +08:00 |