Commit Graph

131 Commits (15c655cbf5ca2c3fdd778828c5e337be813fa09a)

Author SHA1 Message Date
zhangqiang d36dfd9e25 【山河社稷图】是否通关 2021-05-18 16:51:43 +08:00
zhangqiang 32eace4be7 【山河社稷图】一键上阵修改 2021-05-17 19:34:23 +08:00
ZhangBiao 0fa0f251ba 【修行】巅峰赛名字颜色修改 2021-05-17 17:42:08 +08:00
ZhangBiao 8e1b42c0ac 【修行】名字颜色修改 2021-05-17 17:28:37 +08:00
ZhangBiao 10481bc650 【修行】名字颜色修改 2021-05-17 14:15:55 +08:00
zhangqiang 810139a324 【协议合并提交】刷资源提交 2021-05-17 11:28:54 +08:00
zhangqiang e763e54799 Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.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/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-05-17 11:04:01 +08:00
ZhangBiao 87f18cb049 【修行】提交 2021-05-14 17:48:47 +08:00
zhangqiang 364ce0526b 【山河社稷图】提交 2021-05-13 22:50:34 +08:00
ZhangBiao 8df2338780 【修行】提交 2021-05-13 17:37:47 +08:00
zhangqiang da33b98dfb 【山河社稷图】提交 2021-05-13 09:56:11 +08:00
ZhangBiao b6854deccd 【修行】协议提交 2021-05-12 18:47:47 +08:00
zhangqiang effe90990f 【山河社稷图】提交 2021-05-11 15:12:37 +08:00
zhangqiang 9f69ba9d7c 【新的协议】 2021-04-27 16:23:25 +08:00
ZhangBiao 2770e6da31 Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-04-26 17:18:02 +08:00
zhangqiang b4ed183fc6 【前端拍脸修改】提交——1 2021-04-26 13:44:31 +08:00
ZhangBiao 39329ce5cc 【踏碎凌霄提交】 2021-04-25 15:07:36 +08:00
ZhangBiao 1f9c73e6ed 【踏碎凌霄】 2021-04-23 17:59:56 +08:00
ZhangBiao 325421e04c 【踏碎凌霄】提交 2021-04-23 17:56:57 +08:00
zhangqiang 9706cd776d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:46:34 +08:00
zhangqiang de76c697c4 【英雄升星祭品】提交——01 2021-04-19 13:46:24 +08:00
ZhangBiao 034d0846c5 【森罗幻境】提交 2021-04-17 17:12:24 +08:00
ZhangBiao d5879c2445 【森罗幻境】暂时还原 2021-04-15 14:24:40 +08:00
ZhangBiao 5d47d0b42e 【森罗】排序,选择相同将,修复 2021-04-15 12:26:47 +08:00
gaoxin 839a9e4d1d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:03:11 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00
zhangqiang 8ab2496c28 【邮件】增加协议 点击邮件再获取内容 2021-04-10 15:37:10 +08:00
ZhangBiao 685ace078a 【福星高照】增加协议 2021-03-30 18:50:15 +08:00
gaoxin c8327cbb92 【森罗幻境】临时修改数据类型不统一导致战斗报错的问题 2021-03-25 10:43:53 +08:00
zhangqiang a56d71c4f8 【公会副本】bug修改 2021-03-23 15:25:00 +08:00
gaoxin 7e0e5e198a 【sdk】添加上传支付订单id的接口 2021-03-20 22:12:51 +08:00
gaoxin 99e373bda2 【协议】修复登录成功确认协议丢失 2021-03-05 14:53:03 +08:00
gaoxin c97b14319c 【本地化】随即名字本地化处理 2021-03-05 14:43:27 +08:00
gaoxin 0babcc640b 【报警】添加用于确认登录成功的接口,后端用于登录监测告警 2021-02-25 14:33:23 +08:00
zhangqiang dc42a492e7 【排行榜优化】排行榜信息分页读取 2021-02-24 10:13:43 +08:00
zhangqiang ef48b0678a 【协议】 2021-02-19 11:54:15 +08:00
zhangqiang 1c95b576f0 Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-02-19 10:54:36 +08:00
jiaoyangna e0cd83e0f3 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
2021-02-02 18:49:05 +08:00
ZhangBiao 78bc7e8ab3 Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤 2021-01-26 13:49:08 +08:00
ZhangBiao 70abfa742a 【邮件领取】协议提交 2021-01-25 16:30:55 +08:00
ZhangBiao b8fb19e8c4 【邮件领取】协议提交 2021-01-25 16:30:29 +08:00
ZhangBiao 9e14cada49 【牛转钱坤】完事了 2021-01-21 15:10:27 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
jiaoyangna be993c9905 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-12 19:21:20 +08:00
guowei 83316e4724 【鸿蒙阵协议】 2021-01-07 15:31:33 +08:00
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
2021-01-06 20:05:35 +08:00
ZhangBiao fc8f74cd3a 【森罗幻境】在进入下一层后,下方的神将头像位置会发生变化 修复 2021-01-04 10:41:35 +08:00
guowei 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
zhangqiang 35f211a2a4 【工会技能】 优化 连续升级 2020-12-29 16:15:11 +08:00