Commit Graph

352 Commits (683b48fb0c9e67a5b373507362b3c7ecd2cb5e98)

Author SHA1 Message Date
wangzhenxing 16289857a5 aaaa 2021-09-10 18:21:04 +08:00
wangzhenxing a1c21eb441 qqqqq 2021-09-09 20:32:02 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +08:00
wangzhenxing 03b2acbb91 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 18:45:25 +08:00
wangzhenxing 5f0bfe53bd 玉虚论道提交 2021-09-07 17:05:46 +08:00
ZhangBiao d3f7213de0 【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑 2021-09-02 11:34:15 +08:00
ZhangBiao 12c2fd7316 【推荐公会】增加分页请求 2021-08-27 15:59:22 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
ZhangBiao bd7383f063 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 16:47:26 +08:00
jiaoyangna ca656636ac 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:09:43 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-08-17 13:47:27 +08:00
jiaoyangna 5c4696ad6c 太初秘卷修改提交 2021-08-12 17:32:34 +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 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
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
gaoxin 35b9a89503 Merge branch 'gx/充值前校验' into china/dev 2021-08-02 19:24:53 +08:00
gaoxin 2df20e2f91 【充值】充值前先请求订单号,并通过透传参数传递给后端 2021-08-02 19:24:44 +08:00
zhangqiang 14d50731a8 【十绝阵】显示修改 罗浮争锋 适配 2021-08-02 17:35:27 +08:00
gaoxin 64077a2e28 【跨服聊天】重新分配跨服分组时,清空跨服聊天 2021-08-02 16:25:08 +08:00
gaoxin 066f603cb1 Merge branch 'gx/packID打点' into china/dev 2021-07-31 16:03:07 +08:00
zhangqiang c0243afe6c 【跨服分组】推送 2021-07-30 15:14:52 +08:00
zhangqiang 78ec831ca1 【跨服详情】修改提交 2021-07-30 11:59:39 +08:00
wangzhenxing 31c19def0a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 17:34:55 +08:00
wangzhenxing d8801cae6c [称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送 2021-07-29 17:34:40 +08:00
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
gaoxin d4e78afcab 【packID】数数打点新增字段 2021-07-27 10:04:22 +08:00
jiaoyangna efc0f62cc5 【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励

(cherry picked from commit 76fad397de)
2021-07-26 16:06:21 +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
zhangqiang e01694fa28 【跨服天梯】战斗记录协议修改 2021-07-26 11:03:45 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
jiaoyangna 7959f803c4 取消注释 2021-07-22 16:15:47 +08:00
jiaoyangna b0f868485e 无尽秘宝推送 2021-07-22 16:05:58 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +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
ZhangBiao effe3bdfa1 【十绝阵】跨天状态刷新 2021-07-19 17:30:17 +08:00
gaoxin e34f6a79cb 【log】关闭鸿蒙阵推送log 2021-07-16 14:49:35 +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 c3a456af52 【跨服天梯】国内提交+1 2021-07-14 22:12:40 +08:00
zhangqiang 98362ef902 【跨服天梯】国内提交+1 2021-07-14 20:27:04 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
ZhangBiao e250223aa2 【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a)
2021-07-08 15:55:04 +08:00
gaoxin 8297176603 Merge remote-tracking branch 'origin/china/quick' into china/dev
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.atlas.txt
#	Assets/ManagedResources/Spine/c_0035_s1/c_0035_s1.png
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-07-06 15:37:43 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
wangzhenxing b3650db6ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 18:01:13 +08:00
wangzhenxing 4ad64a41f2 [bug]==========福利红包红点修改 2021-06-30 18:00:52 +08:00
ZhangBiao 37e854190b 【心愿抽卡】增加所有抽卡类型和输出 2021-06-30 10:36:48 +08:00