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 |
zhangqiang
|
e7bc488e08
|
【跨服天梯】bug提交 1
|
2020-12-23 19:53:32 +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 |
zhangqiang
|
fbf9ce6ba8
|
【跨服天梯】bug提交
|
2020-12-22 21:04:16 +08:00 |
zhangqiang
|
fff1a9934a
|
【跨服天梯】红点修改提交
|
2020-12-22 16:15:20 +08:00 |
zhangqiang
|
782af971de
|
【跨服天梯】提交
|
2020-12-22 15:39:32 +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 |
zhangqiang
|
c49f65998f
|
【跨服天梯】修改
|
2020-12-21 19:25:53 +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 |
gaoxin
|
f26796653d
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:03 +08:00 |
ZhangBiao
|
8d245aab44
|
【降妖夺宝】开坑
|
2020-12-21 17:13:05 +08:00 |
gaoxin
|
93f1fe8655
|
【优化】橙色改为金色
|
2020-12-21 16:31:40 +08:00 |
gaoxin
|
03e3d77bb6
|
【优化】橙色改为金色
|
2020-12-21 16:15:17 +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
|
f6ab1f2c6e
|
【跨服天梯】 提交
|
2020-12-18 20:43:31 +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 |
jiaoyangna
|
9f01de23ea
|
[主题活动]
|
2020-12-18 11:22:54 +08:00 |
zhangqiang
|
7f89708bf0
|
【跨服天梯】修改
|
2020-12-18 10:57:58 +08:00 |
zhangqiang
|
004c56ce90
|
【跨服天梯】修改
|
2020-12-18 10:57:29 +08:00 |
wangzhenxing
|
3a1bbf7cac
|
【战斗】 188被动修改 间接伤害不会被义结金兰分摊
|
2020-12-18 11:23:41 +09:00 |
wangzhenxing
|
c4320e59e2
|
【战斗】 142被动效果修改 间接伤害不会触发回血
|
2020-12-18 11:22:58 +09:00 |
wangzhenxing
|
2dd63c7986
|
[战斗]284效果修改,非技能伤害不会回血
|
2020-12-18 11:22:24 +09:00 |
wangzhenxing
|
297b36eb2b
|
[战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动
|
2020-12-18 11:21:10 +09:00 |
gaoxin
|
9b83785b6d
|
【系统消息】添加法宝等级的显示
|
2020-12-18 09:56:39 +08:00 |
zhangqiang
|
0ff72cb455
|
【跨服天梯】修改
|
2020-12-17 19:25:53 +08:00 |
zhangqiang
|
6c57e730dd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-17 19:24:52 +08:00 |
zhangqiang
|
c4fb8f85a8
|
【跨服天梯】修改
|
2020-12-17 19:24:43 +08:00 |
gaoxin
|
f784532f31
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-17 18:36:12 +08:00 |
gaoxin
|
abc76576b6
|
【战报系统】代码添加
|
2020-12-17 18:36:08 +08:00 |
wangzhenxing
|
96ab4566ba
|
【战斗】 188被动修改 间接伤害不会被义结金兰分摊
|
2020-12-17 18:24:44 +09:00 |
wangzhenxing
|
3e6c6a8fe5
|
【战斗】 142被动效果修改 间接伤害不会触发回血
|
2020-12-17 18:00:15 +09:00 |
wangzhenxing
|
4184907033
|
[战斗]284效果修改,非技能伤害不会回血
|
2020-12-17 17:41:12 +09:00 |
wangzhenxing
|
ce527ef108
|
[战斗] 链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害 ,舍身济世伤害不触发284被动
|
2020-12-17 16:51:22 +09:00 |
jiaoyangna
|
cfc4f0f0f6
|
[天相几人]图片提交
|
2020-12-17 15:46:28 +08:00 |
jiaoyangna
|
bcef9f04f5
|
[主题活动]
|
2020-12-17 15:34:21 +08:00 |
zhangqiang
|
74aef8e711
|
Merge branch '0功能/跨服十绝阵' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-16 20:27:53 +08:00 |
zhangqiang
|
d24f8c2c14
|
【跨服天梯】 修改提交
|
2020-12-16 20:20:47 +08:00 |
zhangqiang
|
476edb6428
|
【跨服天梯】 修改提交
|
2020-12-16 20:18:46 +08:00 |
zhangqiang
|
76db4f2db9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-16 17:25:01 +08:00 |
zhangqiang
|
e7f6bf85de
|
【跨服天梯】代码修改提交
|
2020-12-16 17:24:31 +08:00 |
ZhangBiao
|
d847323693
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-12-16 17:24:02 +08:00 |
ZhangBiao
|
56eb6c613a
|
【森罗幻境】移动过程中打开其他界面问题修复
|
2020-12-16 17:23:52 +08:00 |
zhangqiang
|
ec7b10d08e
|
Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-12-16 17:21:11 +08:00 |
zhangqiang
|
37336acb66
|
【跨服天梯】提交
|
2020-12-16 17:04:17 +08:00 |
ZhangBiao
|
a03b4e9c5a
|
【青龙秘宝】青龙秘宝等级购买报错修复
|
2020-12-16 14:23:44 +08:00 |
gaoxin
|
f4096cb18b
|
【战斗】v1.0.11
1、修复圣物效果数据错误
2、不灭buff实现方式修改
3、灵兽buff回合计算方式修改
|
2020-12-16 11:36:29 +08:00 |
zhangqiang
|
fd28024dc2
|
【跨服天梯】提交
|
2020-12-16 11:28:57 +08:00 |
jiaoyangna
|
f5fface274
|
【十绝阵】修改提交
|
2020-12-15 13:59:29 +08:00 |
JieLing
|
652217ab37
|
【宝物合成】显示有问题
|
2020-12-15 11:51:40 +08:00 |
zhangqiang
|
9630a4a016
|
【套装属性】 bug修改
|
2020-12-14 17:52:37 +08:00 |
zhangqiang
|
74df46d7a8
|
【套装属性】 bug修改
|
2020-12-14 17:51:44 +08:00 |
gaoxin
|
06f487a176
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-12 18:00:38 +08:00 |
ZhangBiao
|
4c73219b39
|
【森罗幻境】诸多bug 修复
|
2020-12-12 18:00:18 +08:00 |
ZhangBiao
|
4da5b2ac46
|
【易经宝库】
|
2020-12-12 17:53:34 +08:00 |
ZhangBiao
|
242a85a27e
|
【道具自选箱】宝箱开启数量不能为0
|
2020-12-12 17:53:27 +08:00 |
jiaoyangna
|
720d4f5d8c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-12-12 17:22:07 +08:00 |
zhangqiang
|
475badacc1
|
博闻强识图片修改
|
2020-12-12 17:21:28 +08:00 |
jiaoyangna
|
0a1e1666f7
|
【博文多识】
|
2020-12-12 17:21:13 +08:00 |
zhangqiang
|
1e91b33cdd
|
Merge branch 'master_xma_local' into 0功能/1209更新内容
|
2020-12-12 17:08:37 +08:00 |