Commit Graph

305 Commits (fd97f584cbc0bde49a1859a04e28b6fcc38f1029)

Author SHA1 Message Date
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
ZhangBiao a8f666e901 【删除活动类型43】 2021-11-25 17:27:02 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
ZhangBiao 18648a7622 【云游商人】装备文字叠加、显示人名错误修改 2021-11-24 10:18:36 +08:00
ZhangBiao fbb58dbfdc 【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名 2021-11-22 18:44:32 +08:00
ZhangBiao c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
jiaoyangna d1cb61fc18 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:48:59 +08:00
jiaoyangna ceb7ee3602 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-10 18:35:38 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
ZhangBiao bccd6751eb 【无尽密保】文字显示错误修改 2021-11-04 15:44:13 +08:00
jiaoyangna 154aa77cd3 神魂特效修改提交 2021-11-04 10:46:25 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
ZhangBiao 81dadae61f 【界面优化】提交 2021-11-02 16:58:48 +08:00
ZhangBiao 0e5e559220 【界面优化】法宝归元 2021-11-02 13:52:48 +08:00
ZhangBiao 1e203c822c 【界面优化】好感度,天枢密卷 2021-11-02 13:41:27 +08:00
ZhangBiao 68525db92e 【界面优化】提交 2021-11-02 11:06:13 +08:00
ZhangBiao 8a9d52656f 【界面优化】山河社稷图、仙缘汇聚箱 2021-11-02 09:29:07 +08:00
gaoxin 0c1044ab67 Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
This reverts commit d2c8daffce.
2021-11-01 18:59:21 +08:00
zhangshanxue d2c8daffce Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
This reverts commit 87210b9d73.
2021-11-01 18:53:39 +08:00
ZhangBiao 87210b9d73 【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法 2021-11-01 17:21:59 +08:00
ZhangBiao 55f2561db3 【英雄归元】英雄归元后属性值没有重置 2021-10-29 15:11:48 +08:00
ZhangBiao 5d15c33605 【优化】跨服战红点跨天后不显示,完成所有操作后红点不消失,需要重新进入 2021-10-29 13:28:04 +08:00
jiaoyangna 766710dc6b Merge branch 'china/dev' into 0功能/神魂 2021-10-29 13:25:35 +08:00
ZhangBiao c1f3658da4 【界面优化】提交 2021-10-29 11:13:29 +08:00
jiaoyangna ec3cee0ebb Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-10-28 16:52:28 +08:00
jiaoyangna 58044a3e91 神魂界面星星修改提交 2021-10-28 11:07:50 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
ZhangBiao d5cf1c5395 【界面优化】归元、技能 2021-10-26 17:55:49 +08:00
ZhangBiao 353a9774c5 【界面优化】定位、恭送 2021-10-26 17:36:08 +08:00
jiaoyangna edcdd0e81e Merge branch 'china/dev' into 0功能/神魂 2021-10-26 16:01:24 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +08:00
ZhangBiao cc2cfd7a21 【百宝商会、御剑行】按钮一致性提交、显示修改 2021-10-22 18:15:55 +08:00
ZhangBiao fa818dac35 【御剑行】提交 2021-10-22 10:41:20 +08:00
ZhangBiao a732dadb5f 【御剑行】修改提交 2021-10-22 10:25:20 +08:00
ZhangBiao 747cb5b179 【御剑行】修改提交 2021-10-22 10:00:19 +08:00
ZhangBiao 1e3b3c9f27 【御剑行】修改提交 2021-10-20 18:31:59 +08:00
ZhangBiao 132dc11c6b 【御剑行】提交 2021-10-15 13:33:58 +08:00
ZhangBiao 6ebe5720a6 【御剑行】红点提交 2021-10-14 18:28:27 +08:00
ZhangBiao 4b6079d4e8 【御剑行】提价 2021-10-14 17:10:40 +08:00
ZhangBiao 3d1a5ebd4c 【御剑行】提交 2021-10-14 15:30:46 +08:00
ZhangBiao 4eb6e1d9ae 【御剑行】提交 2021-10-14 11:25:44 +08:00
ZhangBiao 2101e974ad 【御剑行】增加投注滑动条 2021-10-14 09:53:51 +08:00
ZhangBiao bb9533781d 【御剑行】提交 2021-10-13 19:15:39 +08:00
ZhangBiao f2b5f62ddd Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-10-09 11:00:18 +08:00
ZhangBiao eb816dcc89 【七界试炼】修复无法取消激活 2021-10-08 11:53:54 +08:00
ZhangBiao 422806200e 【御剑行】提交 2021-09-28 10:34:05 +08:00
ZhangBiao 90d9530b2b 【乾坤宝盒】报错修改 2021-09-27 11:46:17 +08:00