Commit Graph

192 Commits (cbb088a491433ed30202fb62ef511fe7c3ba1ba4)

Author SHA1 Message Date
wangzhenxing e2f7284507 qqqq 2021-09-10 15:50:24 +08:00
wangzhenxing a1c21eb441 qqqqq 2021-09-09 20:32:02 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +08:00
ZhangBiao 12c2fd7316 【推荐公会】增加分页请求 2021-08-27 15:59:22 +08:00
ZhangBiao 6fc59dbe11 【太初密卷】协议提交 2021-08-23 20:46:50 +08:00
ZhangBiao a0ef88e58d Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-08-12 14:56:26 +08:00
jiaoyangna c3d45f1316 【ID1010059】
【新功能】太初密卷
2021-08-11 15:15:41 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
gaoxin 2df20e2f91 【充值】充值前先请求订单号,并通过透传参数传递给后端 2021-08-02 19:24:44 +08:00
gaoxin 1006de499c 【巅峰赛】添加未解锁状态显示 2021-07-31 15:59:14 +08:00
zhangqiang c0243afe6c 【跨服分组】推送 2021-07-30 15:14:52 +08:00
zhangqiang 78ec831ca1 【跨服详情】修改提交 2021-07-30 11:59:39 +08:00
zhangqiang 529f8e3bd2 【协议提交】 2021-07-29 16:45:06 +08:00
zhangqiang c11d9849fd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-07-29 16:38:35 +08:00
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
gaoxin 1b3e5c196b 【跨服聊天】完善跨服聊天角色信息显示 2021-07-29 11:46:59 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
zhangqiang 042644bdcb 【资源】冲突处理 2021-07-27 13:53:37 +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 b0f868485e 无尽秘宝推送 2021-07-22 16:05:58 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
zhangqiang a359ff284f 【跨服主城按钮修改】 2021-07-20 18:32:02 +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
wangzhenxing e2f4a55226 【乾坤宝盒】=============协议提交 2021-07-15 17:19:41 +08:00
DESKTOP-98AVA47\Administrator 27b0f524f9 协议提交 2021-07-15 16:40:48 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
zhangqiang 98362ef902 【跨服天梯】国内提交+1 2021-07-14 20:27:04 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
zhangqiang 5162b3247c 【跨服天梯】国内提交+1 2021-07-13 11:28:36 +08:00
ZhangBiao ee1da4348c 【站内信】协议漏题 2021-07-02 16:10:47 +08:00
ZhangBiao 37e854190b 【心愿抽卡】增加所有抽卡类型和输出 2021-06-30 10:36:48 +08:00
ZhangBiao ecb43803f4 【心愿抽卡】提交 2021-06-30 10:23:57 +08:00
ZhangBiao cc16057438 【心愿抽卡】接协议 2021-06-29 15:25:05 +08:00
zhangqiang 71540fcfd2 【跨服天梯】国内提交1 2021-06-25 15:23:55 +08:00
ZhangBiao 9bdbc9e123 【站内信】协议增加置顶和标识 2021-06-24 18:09:53 +08:00
jiaoyangna 733b11e1bd Revert "Revert "玲珑宝镜提交""
This reverts commit f0b9e1d8e6.
2021-06-09 17:11:13 +08:00
jiaoyangna f0b9e1d8e6 Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78.
2021-06-09 17:09:14 +08:00
jiaoyangna 719bfe5a1a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 17:08:05 +08:00
jiaoyangna 8c0a90ef78 玲珑宝镜提交 2021-06-09 17:07:48 +08:00
gaoxin 06d6e90b49 【添加CC值】用于判断渠道 2021-06-09 16:04:38 +08:00
jiaoyangna 9681a00816 【ID1009395】
点将台增加剩余保底次数显示
2021-06-08 15:15:13 +08:00
ZhangBiao 6d0e6a9e1a 【名字颜色】公会申请 2021-05-31 15:18:02 +08:00
ZhangBiao 0259117f7b 【名字颜色】修改 2021-05-31 15:00:28 +08:00
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
ZhangBiao 4b54176492 【协议提交】 2021-05-27 20:08:32 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00