zhangqiang
|
e38c766348
|
Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua
|
2020-12-26 11:45:20 +08:00 |
zhangqiang
|
2b274d75de
|
Merge branch 'master_xma_local' into 0功能/跨服天梯
# Conflicts:
# 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
|
2020-12-26 11:43:39 +08:00 |
ZhangBiao
|
46500fd5f9
|
【森罗幻境】炸弹炸小怪也计入击杀
|
2020-12-24 17:13:29 +08:00 |
ZhangBiao
|
150ec3eb2f
|
【道具使用跳转】跳转后返回关闭弹窗界面
|
2020-12-24 16:33:15 +08:00 |
ZhangBiao
|
37a426d46d
|
Merge branch '0功能/1230版本优化内容' into master_develop
# Conflicts:
# Assets/LuaFramework/Scripts/SurplusScripts.meta
# Assets/LuaFramework/Scripts/SurplusScripts/Example.meta
# Assets/LuaFramework/Scripts/SurplusScripts/Mgr.meta
# Assets/LuaFramework/Scripts/SurplusScripts/MixCode.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_100912bgj_vo_01.mp3.meta
# Assets/ManagedResources/Audio/UI/common/UI_schl_loop.ogg.meta
# Assets/ManagedResources/PublicArtRes/Models/Materials.meta
|
2020-12-24 15:17:39 +08:00 |
guowei
|
f25f253479
|
【合成优化修改】
|
2020-12-24 15:03:14 +08:00 |
guowei
|
df79f56b72
|
【优化五星成长礼包、心魔试炼礼包】
|
2020-12-24 13:52:28 +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 |
guowei
|
47cc019082
|
【拍脸优化】
|
2020-12-23 14:54:53 +08:00 |
guowei
|
fcb2e4604a
|
【优化】提交
|
2020-12-23 10:10:48 +08:00 |
zhangqiang
|
fbf9ce6ba8
|
【跨服天梯】bug提交
|
2020-12-22 21:04:16 +08:00 |
ZhangBiao
|
6d5a9f9f42
|
【社稷大典】公会检查跳转失败修复
|
2020-12-22 14:20:04 +08:00 |
zhangqiang
|
f4ea0eddfc
|
【跨服天梯】修改
|
2020-12-21 19:26:55 +08:00 |
zhangqiang
|
c49f65998f
|
【跨服天梯】修改
|
2020-12-21 19:25:53 +08:00 |
gaoxin
|
93f1fe8655
|
【优化】橙色改为金色
|
2020-12-21 16:31:40 +08:00 |
ZhangBiao
|
223b816a98
|
【青龙秘宝】青龙秘宝等级购买报错修复
|
2020-12-18 11:38:47 +08:00 |
gaoxin
|
9b83785b6d
|
【系统消息】添加法宝等级的显示
|
2020-12-18 09:56:39 +08:00 |
zhangqiang
|
e7f6bf85de
|
【跨服天梯】代码修改提交
|
2020-12-16 17:24:31 +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 |
zhangqiang
|
9630a4a016
|
【套装属性】 bug修改
|
2020-12-14 17:52:37 +08:00 |
zhangqiang
|
74df46d7a8
|
【套装属性】 bug修改
|
2020-12-14 17:51:44 +08:00 |
zhangqiang
|
cedbc1222f
|
【装备套装】 套装属性向下兼容
|
2020-12-11 17:33:24 +08:00 |
zhangqiang
|
03e0e73665
|
【装备套装】 套装属性向下兼容
|
2020-12-11 17:31:11 +08:00 |
ZhangBiao
|
1c7ac7e8cc
|
【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
|
2020-12-07 19:18:04 +08:00 |
zhangqiang
|
bf1f26662a
|
【跨服天梯】
|
2020-12-05 13:13:19 +08:00 |
zhangqiang
|
a0b0a19654
|
【跨服天梯】 红点 + 世界等级
|
2020-11-20 15:00:08 +08:00 |
ZhangBiao
|
9601af33e7
|
【神将详情】排行榜查看他人装备显示出售按钮修复
|
2020-11-16 16:20:15 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
ZhangBiao
|
8a5d51e2a3
|
【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
|
2020-11-13 12:12:44 +08:00 |
zhangqiang
|
492d969a4f
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:40 +08:00 |
zhangqiang
|
0ca5e4ea13
|
【觉醒】bug
|
2020-11-11 20:21:37 +08:00 |
ZhangBiao
|
9ca403ebff
|
【易经宝库】第三层抽取完成后bug修复
|
2020-11-09 11:09:42 +08:00 |
jiaoyangna
|
98ff210ae2
|
皮肤解锁提示
|
2020-11-06 20:21:20 +08:00 |
jiaoyangna
|
bd92d5339d
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 19:54:49 +08:00 |
jiaoyangna
|
22038419b7
|
神医天降提交
|
2020-11-06 19:54:00 +08:00 |
wangzhenxing
|
5128a02eba
|
[皮肤] 胜利最佳输出界面显示皮肤
|
2020-11-06 17:58:28 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
ZhangBiao
|
b516a8c202
|
【易经宝库】没有QA 无法购买
|
2020-11-06 13:36:48 +08:00 |
jiaoyangna
|
e2fae0cc52
|
皮肤提交
|
2020-11-06 09:37:27 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
jiaoyangna
|
5026bdd0c3
|
【皮肤】提交
|
2020-11-05 16:02:49 +08:00 |
jiaoyangna
|
3bc2b74ce5
|
皮肤分解提交
|
2020-11-05 14:18:32 +08:00 |
jiaoyangna
|
360727419e
|
【皮肤】修改皮肤显示
|
2020-11-04 16:51:45 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
jiaoyangna
|
1fcdf5b2a6
|
【皮肤】添加皮肤属性加成
|
2020-11-03 19:37:05 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
zhangqiang
|
4cb30990e1
|
【灵兽系统】 bug 需同步
|
2020-11-02 11:52:00 +08:00 |
zhangqiang
|
c206f6487e
|
【灵兽系统】 漏合
|
2020-11-02 10:59:17 +08:00 |