Commit Graph

2737 Commits (e91b3caf0923f36ff59cb7345909fa776af65b63)

Author SHA1 Message Date
jiaoyangna e91b3caf09 所向披靡修改 2020-12-24 10:21:26 +08:00
jiaoyangna 8b4ea01eea 【逍遥游优化】逍遥游玩法优化内容 红点修改 2020-12-24 09:55:03 +08:00
jiaoyangna 2c454127f9 Merge branch '0功能/1230版本优化内容' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
2020-12-23 20:27:57 +08:00
jiaoyangna 3a6e07bf1c 【逍遥游优化】逍遥游玩法优化内容 2020-12-23 20:18:43 +08:00
ZhangBiao 3133777d21 【新将活动】连续抽卡妖精次数不足修复
(cherry picked from commit bb8321b4e3)
2020-12-23 17:45:50 +08:00
ZhangBiao 32a2704416 【新将活动】商店跳转修复
(cherry picked from commit 8801a84c2b)
2020-12-23 17:29:15 +08:00
zhangqiang 1ba79f4627 【装备页面】神将一键装备功能提示 已为最强装备 2020-12-23 16:46:41 +08:00
ZhangBiao 37925e0aeb 【降妖夺宝】抽卡妖晶限购计数错误修复
(cherry picked from commit 8477ecf347)
2020-12-23 16:38:14 +08:00
jiaoyangna 4a6d8d0561 【优化】移除点将台界面的进入动画 2020-12-23 15:06:56 +08:00
guowei 47cc019082 【拍脸优化】 2020-12-23 14:54:53 +08:00
jiaoyangna 4520616bd0 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-23 14:52:22 +08:00
jiaoyangna 41977a85f5 【优化】删除十绝阵敌方阵容上的血条和怒气条 2020-12-23 14:52:13 +08:00
wangzhenxing 31359a8648 [战斗] 修改初始怒气无法增加修改 2020-12-23 15:33:49 +09:00
ZhangBiao 246f19b256 Merge branch '0活动开发聚集地/新将活动3个' into master_develop
# Conflicts:
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/BoWenQiangShi.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_02.prefab.meta
#	Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab_prefab.prefab.meta
#	Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto.meta
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/Expedition.proto.meta
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/gtGprotos.meta
#	Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Message/gtwprotos.meta
#	Assets/ManagedResources/~Lua/Message/gtwprotos/WorldProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua.meta
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua.meta
2020-12-23 15:27:52 +08:00
ZhangBiao 0222dcb7fc Revert "【新将活动】新将来袭、新疆招募、升星有礼 提交"
This reverts commit efaedd38f2.
2020-12-23 15:10:56 +08:00
ZhangBiao efaedd38f2 【新将活动】新将来袭、新疆招募、升星有礼 提交 2020-12-23 14:42:11 +08:00
ZhangBiao d0b94a1c3b 【新将活动】新将来袭、新疆招募、升星有礼 提交 2020-12-23 14:36:15 +08:00
zhangqiang 47397d8b06 【优化】优化编队界面,现在拖动下阵/换位的操作不流畅,经常失败 2020-12-23 14:32:59 +08:00
gaoxin 67bbfae105 【装备】装备出售界面文字显示修改 2020-12-23 14:01:57 +08:00
ZhangBiao 02fe110563 【社稷大典】公会检查跳转失败修复
(cherry picked from commit 6d5a9f9f42)
2020-12-23 11:38:00 +08:00
ZhangBiao 6fc63af086 【增加跳转】增加跳转id 2020-12-23 11:31:58 +08:00
ZhangBiao 38a1eeee9a Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:29:12 +08:00
ZhangBiao e40364082c Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-12-23 11:21:27 +08:00
ZhangBiao 30f8049ef5 Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-12-23 11:13:48 +08:00
ZhangBiao f7f0d4099f 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00
guowei fcb2e4604a 【优化】提交 2020-12-23 10:10:48 +08:00
ZhangBiao 6d5a9f9f42 【社稷大典】公会检查跳转失败修复 2020-12-22 14:20:04 +08:00
wangzhenxing 607104b4ca [战斗]白骨精技能,被动,魂印效果提交 2020-12-22 11:59:26 +09:00
ZhangBiao f97901cbe0 【增加跳转】增加跳转id 2020-12-22 10:14:54 +08:00
gaoxin 88ba4edad9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-21 19:30:39 +08:00
gaoxin d910facacf 【装备】装备出售界面文字显示修改 2020-12-21 19:30:19 +08:00
zhangqiang f4ea0eddfc 【跨服天梯】修改 2020-12-21 19:26:55 +08:00
gaoxin a0f059ca9b 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:58 +08:00
DESKTOP-98AVA47\Administrator b11cf4dfe3 【巅峰赛】拍脸修改 有表 张强提交 2020-12-24 21:04:33 +08:00
gaoxin cd3548164a 【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误 2020-12-21 18:45:43 +08:00
DESKTOP-98AVA47\Administrator c9d8df2c74 【巅峰赛】拍脸修改 有表 张强提交 2020-12-24 21:02:20 +08:00
ZhangBiao 8d245aab44 【降妖夺宝】开坑 2020-12-21 17:13:05 +08:00
gaoxin 93f1fe8655 【优化】橙色改为金色 2020-12-21 16:31:40 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
ZhangBiao 3262a6203c 【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7)
2020-12-21 14:19:41 +08:00
zhangqiang 642ae52cfa 【跨服天梯】 提交 2020-12-18 20:42:53 +08:00
gaoxin ec47ec2b1c 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:51:28 +08:00
gaoxin ef1ced3ef7 【战报系统】基础功能添加 2020-12-18 16:51:13 +08:00
gaoxin c699c2f216 【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据 2020-12-18 16:27:24 +08:00
ZhangBiao 0692fbf799 【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285)
2020-12-18 12:02:42 +08:00
ZhangBiao c50ba93285 【森罗幻境】重置事件点不触发修复 2020-12-18 12:00:52 +08:00
ZhangBiao 1431423c4f 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-18 11:39:01 +08:00
ZhangBiao 223b816a98 【青龙秘宝】青龙秘宝等级购买报错修复 2020-12-18 11:38:47 +08:00
gaoxin 57ef5e73cf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-18 11:32:23 +08:00
jiaoyangna 22785d4675 [天相几人]图片提交 2020-12-18 11:23:00 +08:00