guowei
|
f25f253479
|
【合成优化修改】
|
2020-12-24 15:03:14 +08:00 |
jiaoyangna
|
3848c3d684
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-24 14:36:17 +08:00 |
jiaoyangna
|
79ce16086e
|
【优化】放生灵兽添加开启等级。
|
2020-12-24 14:36:06 +08:00 |
jiaoyangna
|
54ea5e41b7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-24 14:23:34 +08:00 |
jiaoyangna
|
12724f650e
|
【优化】放生灵兽添加开启等级。
|
2020-12-24 14:23:29 +08:00 |
ZhangBiao
|
8376d74230
|
【无尽副本】战斗失败自动复位时,自动进行一次一键上阵
|
2020-12-24 14:13:58 +08:00 |
ZhangBiao
|
43372fd0f5
|
【新将来袭】左上货币刷新不及时修复
(cherry picked from commit 8f9a58468f)
|
2020-12-24 14:07:56 +08:00 |
guowei
|
df79f56b72
|
【优化五星成长礼包、心魔试炼礼包】
|
2020-12-24 13:52:28 +08:00 |
wangzhenxing
|
22d9049fae
|
[优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗
|
2020-12-24 14:30:28 +09:00 |
zhangqiang
|
96a89a9c33
|
【跨服天梯】bug提交 2
|
2020-12-24 10:59:34 +08:00 |
jiaoyangna
|
9ad8d2f635
|
【优化】巅峰赛,十绝阵预告图标双行文字优化
|
2020-12-24 10:45:50 +08:00 |
jiaoyangna
|
171e9a4690
|
【优化】巅峰赛,十绝阵预告图标双行文字优化
|
2020-12-24 10:45:15 +08:00 |
jiaoyangna
|
3a796df0db
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-24 10:38:32 +08:00 |
jiaoyangna
|
bf33602c32
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:38:28 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
jiaoyangna
|
c0547ab372
|
[所向披靡] 提交
|
2020-12-24 10:25:09 +08:00 |
jiaoyangna
|
d0982716b3
|
[所向披靡] 提交
|
2020-12-24 10:24:11 +08:00 |
jiaoyangna
|
5a0bece22e
|
所向披靡修改
|
2020-12-24 10:23:02 +08:00 |
jiaoyangna
|
e91b3caf09
|
所向披靡修改
|
2020-12-24 10:21:26 +08:00 |
jiaoyangna
|
58de2dc2b5
|
【逍遥游优化】逍遥游玩法优化内容 红点修改
|
2020-12-24 09:55:57 +08:00 |
jiaoyangna
|
8b4ea01eea
|
【逍遥游优化】逍遥游玩法优化内容 红点修改
|
2020-12-24 09:55:03 +08:00 |
jiaoyangna
|
d8a46ba5b7
|
冲突提交
|
2020-12-23 20:30:43 +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 |
zhangqiang
|
e7bc488e08
|
【跨服天梯】bug提交 1
|
2020-12-23 19:53:32 +08:00 |
liuyipeng
|
7e8c10dcb3
|
增加新将来袭相关图片
|
2020-12-23 18:03:16 +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 |
zhangqiang
|
9d6574d3b3
|
【优化】公会援助赠送的按钮时间间隔过长,优化按钮连续点击的效果。只加了按钮点击动画
|
2020-12-23 16:00:10 +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
|
611ecc0575
|
Revert "【新将】漏提"
This reverts commit 7324e6af45.
|
2020-12-23 15:10:24 +08:00 |
ZhangBiao
|
7324e6af45
|
【新将】漏提
|
2020-12-23 14:57:58 +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 |
zhangqiang
|
878b76d7a3
|
【资源导入】音效提交
|
2020-12-23 11:53:33 +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
|
239dc826df
|
【升星有礼】合并分支资源名修改
|
2020-12-23 11:22:44 +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 |