Commit Graph

1163 Commits (793daedcb4756ff66b8477ef902d672375d8fab3)

Author SHA1 Message Date
ZhangBiao f83bffaf75 【固定活动】提交 2021-11-26 10:16:46 +08:00
ZhangBiao 45df1fb982 【寻仙招募】增加心愿阵营条 2021-11-26 09:54:12 +08:00
ZhangBiao fd97f584cb 【固定活动】调整 2021-11-25 18:51:36 +08:00
ZhangBiao a8f666e901 【删除活动类型43】 2021-11-25 17:27:02 +08:00
ZhangBiao e4b0fd1824 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-24 18:14:37 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
gaoxin 4607bd2fed Merge branch '0功能/账号id校验' into china/dev 2021-11-24 16:03:34 +08:00
ZhangBiao 18648a7622 【云游商人】装备文字叠加、显示人名错误修改 2021-11-24 10:18:36 +08:00
ZhangBiao fbb58dbfdc 【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名 2021-11-22 18:44:32 +08:00
gaoxin 95382d530e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 17:37:38 +08:00
gaoxin 487c0d327a 【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印 2021-11-22 17:37:26 +08:00
ZhangBiao f4febd8ed8 【灵脉秘境】竞技场pvp切磋报错修改 2021-11-22 17:20:04 +08:00
gaoxin e800f29b33 【竞技场】查看玩家信息报错 2021-11-22 16:06:52 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
ZhangBiao 5e09e0b9a3 【灵脉秘境】切磋 2021-11-19 16:16:45 +08:00
ZhangBiao c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
ZhangBiao 6454e84172 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 19:07:50 +08:00
gaoxin cd291429f1 【坐骑碎片合成】删除无用代码 2021-11-18 16:05:26 +08:00
gaoxin 77c3376d82 【坐骑碎片合成】 2021-11-18 16:03:34 +08:00
ZhangBiao 79d2113bc2 【灵脉秘境】提交 2021-11-18 14:10:57 +08:00
ZhangBiao de7a516a87 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 13:30:03 +08:00
ZhangBiao 03cdea5c83 【灵脉秘境】纪录提交 2021-11-18 11:35:20 +08:00
gaoxin 3565dc2b2a 【改名时上报事件】 2021-11-18 11:34:54 +08:00
ZhangBiao 790fe1c88f 【灵脉秘境】提交 2021-11-17 18:28:59 +08:00
gaoxin 1aa2efc1b1 【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误 2021-11-17 16:58:06 +08:00
ZhangBiao 2b2a77a129 【灵脉秘境】提交 2021-11-17 16:14:47 +08:00
ZhangBiao b6ce191bff 【装备界面】无法卸下调整 2021-11-17 12:34:39 +08:00
ZhangBiao 0a7d343e20 【灵脉】提交 2021-11-17 11:12:49 +08:00
ZhangBiao 6012b533ca 【灵脉秘境】提交 2021-11-16 17:34:37 +08:00
ZhangBiao 336ea6b8d3 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 17:19:01 +08:00
gaoxin 5be38dacb1 【新手剧情】起名界面添加回调 2021-11-15 13:10:59 +08:00
ZhangBiao ff3fcf3db9 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 09:56:59 +08:00
jiaoyangna 075de29090 编队界面看神将情报错误修改
(cherry picked from commit c8e7d0cdd4)
2021-11-12 15:52:09 +08:00
jiaoyangna 021b0e03be 魂灵宝界面修改提交 2021-11-12 11:26:02 +08:00
jiaoyangna 63b1f6456e 魂灵宝界面修改提交 2021-11-12 11:14:26 +08:00
jiaoyangna 9a261f5c13 法宝界面文字大小修改 2021-11-12 09:55:00 +08:00
ZhangBiao 36f24a4d3c 【魂印界面】界面背景颜色随物品品质更改 2021-11-11 17:58:40 +08:00
ZhangBiao db15950d6a Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:56:10 +08:00
jiaoyangna d1cb61fc18 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:48:59 +08:00
ZhangBiao 3eca9bec47 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:11:04 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
jiaoyangna bdb08206df Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 18:35:53 +08:00
jiaoyangna ceb7ee3602 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-10 18:35:38 +08:00
ZhangBiao cc316086e9 【新·物品】界面提交 2021-11-10 15:03:18 +08:00
ZhangBiao f74ce2f895 【新·物品】界面提交 2021-11-10 14:53:35 +08:00
ZhangBiao 7efdfd5029 【新·装备】增加战力对比图标 2021-11-09 18:24:38 +08:00
ZhangBiao c627c5cd28 【新·魂灵宝】增加战力对比图片 2021-11-09 17:35:27 +08:00
ZhangBiao aa9cc34792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 17:06:59 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
gaoxin f23a455797 【魂印】详情界面优化 2021-11-09 15:48:56 +08:00
ZhangBiao 76c3c5c0bf 【新·魂灵宝】提交 2021-11-09 14:39:27 +08:00
ZhangBiao fdffaf846e 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
gaoxin 5f0dc622a5 【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面 2021-11-08 15:12:48 +08:00
wangzhenxing e99f8c285f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 14:02:57 +08:00
wangzhenxing 95b7fceb34 [神魂]======神魂升级后技能描述修改 2021-11-08 14:02:33 +08:00
ZhangBiao 0fc2ec5b08 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:07:35 +08:00
ZhangBiao 2621f0f9f8 【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情 2021-11-08 11:07:11 +08:00
jiaoyangna 024b684999 排行榜神魂放大镜显示错误修改 2021-11-08 10:51:51 +08:00
wangzhenxing 99452354bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:21:30 +08:00
wangzhenxing a92a76e3ab 【神魂】=====技能描述修改 2021-11-05 17:21:18 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
gaoxin 89957b0787 【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次 2021-11-05 17:12:35 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +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 2fd25aced5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 16:59:15 +08:00
ZhangBiao 81dadae61f 【界面优化】提交 2021-11-02 16:58:48 +08:00
gaoxin 44415cfded 【坐骑】获取新坐骑,点击前往,展示新坐骑 2021-11-02 16:42:36 +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
ZhangBiao 0903782f0e 【界面优化】法宝界面错位调整 2021-10-28 16:51:00 +08:00
ZhangBiao 79f7339a3a 【三界降魔】提交 2021-10-28 16:03:23 +08:00
jiaoyangna 58044a3e91 神魂界面星星修改提交 2021-10-28 11:07:50 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
ZhangBiao 779cb4d99e 【界面优化】技能 2021-10-26 18:18:36 +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 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
ZhangBiao cc2cfd7a21 【百宝商会、御剑行】按钮一致性提交、显示修改 2021-10-22 18:15:55 +08:00
jiaoyangna fa36828e1c Revert "至尊降世活动结束不关闭提交"
This reverts commit 031895a9d1.
2021-10-22 17:28:09 +08:00
jiaoyangna 031895a9d1 至尊降世活动结束不关闭提交 2021-10-22 17:24:41 +08:00
jiaoyangna f7db9fc907 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 17:22:18 +08:00
jiaoyangna 73b9fad19d 至尊降世活动兼容提交 2021-10-22 17:21:31 +08:00
ZhangBiao 22941d0af5 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
ZhangBiao 31e8f4c726 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
ZhangBiao e48606b648 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:21:53 +08:00
ZhangBiao 1215e46af8 【御剑行】点击商店返回后增加请求 2021-10-22 11:21:42 +08:00
jiaoyangna bfd2e06ecc 至尊降世修改提交 2021-10-22 11:20:24 +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
jiaoyangna 68cbb5905a 至尊降世修改提交 2021-10-21 18:58:36 +08:00
jiaoyangna b24061ccd0 至尊降世报错修改提交 2021-10-21 18:12:28 +08:00
jiaoyangna 8fa8a9d690 至尊降世界面修改提交 2021-10-21 17:38:53 +08:00
ZhangBiao bb489b08e8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 18:33:02 +08:00
ZhangBiao 1e3b3c9f27 【御剑行】修改提交 2021-10-20 18:31:59 +08:00
gaoxin 85b15d6cb7 Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡 2021-10-20 15:14:38 +08:00
ZhangBiao f75e42d9c9 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
2021-10-20 13:41:32 +08:00
jiaoyangna 2ec0a28cf3 去掉log 2021-10-19 13:34:03 +08:00
jiaoyangna 005468635f 页签添加红点 2021-10-19 13:25:08 +08:00
jiaoyangna 1f077cbcdc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 11:04:25 +08:00
jiaoyangna c091c55bef 【ID1010437】
【优化】开服玉帝御剑坐骑活动
2021-10-19 11:04:06 +08:00
gaoxin a23791e07c 【战斗】失败界面添加我要变强跳转 2021-10-19 10:46:12 +08:00
gaoxin 11d5f735c7 【七界试炼】排行榜删除切磋和加入黑名单按钮 2021-10-18 21:06:01 +08:00
gaoxin 3a559c912c 【挚礼月卡】月卡功能数据剥离到MonthCardManager 2021-10-18 16:22:11 +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 67026aa355 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-14 16:13:07 +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
jiaoyangna 262aa7a7e7 装备界面适配修改提交
(cherry picked from commit 45d29ef264)
(cherry picked from commit edfe797ddd)
2021-10-12 15:51:32 +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 878f0410ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-08 11:54:09 +08:00
ZhangBiao eb816dcc89 【七界试炼】修复无法取消激活 2021-10-08 11:53:54 +08:00
gaoxin 788d18e332 【装备对比】背包中的装备信息界面修改 2021-09-28 21:00:50 +08:00
ZhangBiao 77eccdd8b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-28 11:24:04 +08:00
ZhangBiao 8ec75376da 【限时召唤】报错修改 2021-09-28 11:23:50 +08:00
gaoxin 4d4e8cf55e 【副本战斗】战斗结算时报错 2021-09-28 11:20:42 +08:00
ZhangBiao 422806200e 【御剑行】提交 2021-09-28 10:34:05 +08:00
gaoxin 38f41e7517 【战斗】修复无尽副本战斗结束后报错 2021-09-27 16:57:40 +08:00
ZhangBiao 90d9530b2b 【乾坤宝盒】报错修改 2021-09-27 11:46:17 +08:00
ZhangBiao cdd6499fe8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 10:34:19 +08:00
ZhangBiao 0842438fdf 【装备分解】不可分解白金装备and增加mask点击 2021-09-27 10:34:03 +08:00
wangzhenxing e763b6472b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:31:16 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00
ZhangBiao b0e24676b3 【七界试炼】增加秘宝入口开启处理 2021-09-24 14:57:04 +08:00
ZhangBiao a2d7bedb5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 19:47:32 +08:00
ZhangBiao d0c38ec9d7 【七界试炼】提交 2021-09-23 19:47:17 +08:00
gaoxin 65df3f1a37 【名字】添加名称正确性检测 2021-09-23 19:43:24 +08:00
ZhangBiao 0422b5c738 【七界试炼】提交 2021-09-23 16:08:02 +08:00
gaoxin 4f9cc3ee44 【奖励界面】部分界面胡乱显示经验调 2021-09-22 20:54:46 +08:00
gaoxin 34f3f42a04 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
2021-09-22 15:36:10 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00
ZhangBiao 8307fbe7e1 【七界试炼】完成!!! 2021-09-17 19:57:45 +08:00
ZhangBiao 949d159010 【七界试炼】提交 2021-09-17 19:29:58 +08:00
ZhangBiao 488ad1caad 【七界试炼】七界秘宝提交 2021-09-17 17:42:18 +08:00
ZhangBiao 163950a4a1 【七界试炼】提交 2021-09-17 16:29:21 +08:00
gaoxin feae377b4f Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-17 15:25:56 +08:00
ZhangBiao 2925de34e8 【七界试炼】结算界面提交 2021-09-17 14:38:05 +08:00
ZhangBiao 60c954bf38 【七界试炼】提交 2021-09-16 19:36:16 +08:00
ZhangBiao 20c122e096 【寻宝迷踪】红点修改 2021-09-16 16:52:22 +08:00
gaoxin 2494b16f89 Merge branch 'china/dev' into 0功能/角色战斗力计算2 2021-09-16 13:37:16 +08:00
gaoxin 66efc9d4e3 【战斗力】新战斗力计算系统完成 2021-09-16 13:35:33 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
gaoxin b26cbe30ae 【奖励界面】修复部分奖励界面显示异常的问题 2021-09-15 10:24:57 +08:00
gaoxin 3622d49888 【奖励界面】修复部分奖励界面显示异常的问题 2021-09-15 10:17:02 +08:00
ZhangBiao c68496654f 【七界试炼】遗物 2021-09-13 13:54:58 +08:00
ZhangBiao 8c9f31f028 【七界试炼】遗物 2021-09-13 11:42:14 +08:00
gaoxin 7df51e8929 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
2021-09-11 16:52:33 +08:00
ZhangBiao 4eb8e566fe 【七界试炼】战斗结束提交 2021-09-10 18:36:39 +08:00
ZhangBiao d6725f3320 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
2021-09-10 16:39:43 +08:00
gaoxin 16633b37a8 【编队优化】 2021-09-10 16:25:38 +08:00
ZhangBiao 42df2f4af5 【七界试炼】提交 2021-09-10 15:23:15 +08:00
ZhangBiao 2d003aaafd Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-10 10:33:44 +08:00
ZhangBiao cef2b42bcc 【七界试炼】提交 2021-09-10 10:30:50 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +08:00
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +08:00
gaoxin 5e938b5141 【巅峰赛】选拔赛组界面添加角色信息展示-修复查看编队是主线编队的问题 2021-09-09 10:45:40 +08:00
gaoxin 29d1b095e5 【碎片详情】碎片详情添加灵兽和神将的查看-特殊碎片不显示查看按钮 2021-09-08 18:28:50 +08:00
jiaoyangna 7abd0955e2 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 12:19:59 +08:00
jiaoyangna a012ece114 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 10:27:26 +08:00
ZhangBiao 1693300255 【七界试炼】目标特性 2021-09-08 10:06:24 +08:00
gaoxin 79832f3232 【碎片详情】碎片详情添加灵兽和神将的查看 2021-09-07 11:40:12 +08:00
zhangshanxue 8c277426e5 【奖励】修复关闭界面时部分数据未还原 2021-09-06 13:55:12 +08:00
zhangshanxue 54cae546af Merge branch 'china/test' into china/xq 2021-09-06 11:47:33 +08:00
gaoxin 11495d1076 【山河社稷图】修复奖励界面报错导致卡死 2021-09-06 11:45:30 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 615aaa0d88 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 19:59:37 +08:00
jiaoyangna 5b8001ce28 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物

(cherry picked from commit 41831fad79)
2021-09-01 19:36:19 +08:00
jiaoyangna 41831fad79 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
2021-09-01 19:35:28 +08:00
jiaoyangna f49deb2471 回放修改提交 2021-09-01 18:13:58 +08:00
jiaoyangna ae71f6941d 四灵修改提交 2021-09-01 18:10:51 +08:00
jiaoyangna 7713a65826 排行榜宝器修改 2021-08-31 11:08:12 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
ZhangBiao 2612c2e01e Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-08-17 19:53:05 +08:00
jiaoyangna faf7591cf5 玲珑宝镜修改 2021-08-17 17:14:03 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-08-17 13:47:27 +08:00
ZhangBiao e678864743 【魂灵宝】装备界面增加等级上限 2021-08-12 20:01:56 +08:00
jiaoyangna 76dbc01270 Merge branch 'china/dev' into 0功能/silingshilian 2021-08-12 15:54:58 +08:00
ZhangBiao 939d577624 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-10 20:21:06 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
zhangqiang c957a96983 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-09 14:48:14 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
zhangqiang abb9873f80 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-04 17:42:47 +08:00
zhangqiang 98649b66c1 【跨服排行】 2021-07-30 17:52:49 +08:00
zhangqiang 78ec831ca1 【跨服详情】修改提交 2021-07-30 11:59:39 +08:00
gaoxin a61602eae4 【角色信息】删除服务器名称只在JUMPSERVER类型下显示的限制 2021-07-29 11:50:59 +08:00
gaoxin 1b3e5c196b 【跨服聊天】完善跨服聊天角色信息显示 2021-07-29 11:46:59 +08:00
zhangqiang 1969dd31ab Revert "【跨服切磋】"
This reverts commit cc8974c016.
2021-07-29 11:11:16 +08:00
zhangqiang cc8974c016 【跨服切磋】 2021-07-28 18:38:06 +08:00
jiaoyangna 7ee1ef9910 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity5.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
#	Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
2021-07-28 17:45:59 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
jiaoyangna 4805b041e8 宝物使用跳转错误修改 2021-07-28 15:07:57 +08:00
jiaoyangna 1123d9dc2d 宝物修改提交 2021-07-28 11:52:47 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
ZhangBiao 8a90b87942 【新副本界面】心魔次数文字错误修改,和弹窗修改 2021-07-23 17:43:30 +08:00
DESKTOP-98AVA47\Administrator 6f8cb042bb 报错修改提交 2021-07-23 11:17:50 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
ZhangBiao 30edf664da Merge branch 'china/dev' into 0优化/新增心愿神将提示 2021-07-21 18:26:34 +08:00
jiaoyangna 1d2ed2a4f7 装备详情弹窗下方获取途径位置显示错误 2021-07-21 18:03:23 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
zhangqiang 99cad10435 【跨服天梯】国内提交+1 2021-07-19 15:49:48 +08:00
wangzhenxing 65a6edeba5 [乾坤宝盒]======改成只能选择3个 2021-07-16 14:20:25 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
zhangqiang f7932b9e8c 【罗浮争锋】国内提交+1 2021-07-13 17:40:25 +08:00
zhangqiang 5162b3247c 【跨服天梯】国内提交+1 2021-07-13 11:28:36 +08:00
jiaoyangna 763c45ebd0 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面

(cherry picked from commit 7371405fbd)
2021-07-12 11:16:54 +08:00
jiaoyangna a233fb2c7d 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面

(cherry picked from commit 4d588e2948)
2021-07-12 10:19:54 +08:00
jiaoyangna fa30243bf5 玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
2021-07-08 18:30:29 +08:00
jiaoyangna 9fa4e26f7e 仙缘汇聚箱修改提交 2021-07-05 09:55:02 +08:00
jiaoyangna 82f1650edf 神将来源定位描述错误修改 2021-07-02 12:11:29 +08:00
jiaoyangna 9b01d308e8 孙悟空添加新人商城 2021-07-02 11:13:59 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
jiaoyangna 4f34d6ed42 神将来源返回时打开 2021-07-01 18:12:20 +08:00
jiaoyangna 8b187bfd5f 获取途径报错修改 2021-07-01 15:27:04 +08:00
jiaoyangna bb9b58d489 Merge branch '0功能/神将来源' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-06-30 19:57:49 +08:00
jiaoyangna 36cb3db3af 底图修改提交 2021-06-30 16:17:50 +08:00
jiaoyangna a4281ed031 四元阵跳转修改 2021-06-30 16:07:37 +08:00
jiaoyangna e44449391d 神将来源修改提交 2021-06-30 15:47:13 +08:00
jiaoyangna b5324c165a 神将来源碎皮合成修改提交 2021-06-30 15:27:27 +08:00
jiaoyangna a556ee7e2d 关闭界面时 称号预设未关闭 错误 问题修改 2021-06-30 14:10:30 +08:00
jiaoyangna ed1cf199a2 神将来源修改 2021-06-30 11:50:11 +08:00
jiaoyangna 58994f5a38 神将来源修改 2021-06-30 11:42:22 +08:00
jiaoyangna 6429cba1d4 代码报错修改 2021-06-30 11:37:33 +08:00
jiaoyangna de0b9be884 添加首充和至尊降世的 显示 2021-06-30 11:36:07 +08:00
jiaoyangna f834e2e17d 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-30 10:12:44 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
zhangqiang 6dc2f5e09f 【跨服天梯】国内提交2 2021-06-26 13:35:59 +08:00
gaoxin 04c89ccaa9 【月卡】月卡激活提示修改到关闭奖励界面之后 2021-06-19 15:45:13 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
jiaoyangna 65860bb337 删除剧情对话挂机地图音效 2021-06-10 22:59:26 +08:00
jiaoyangna 819278dd3d 【ID1016436】
【无尽副本】战斗结算界面有经验
2021-06-10 16:38:19 +08:00
jiaoyangna 7c1d58b3eb 青龙秘宝修改 提交 2021-06-09 18:48:24 +08:00
jiaoyangna fdc4d2f203 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 18:24:27 +08:00
jiaoyangna 970a96b4f4 【ID1016342】
【解锁秘宝优化】激活可直接领取奖励预览中,没有显示专属奖励
2021-06-09 17:45:13 +08:00
jiaoyangna 67bed99433 【ID1009324】
剧情动画中去掉背景挂机时的音效(战斗,走路脚步声)
2021-06-09 14:58:11 +08:00
jiaoyangna a54e1088e6 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 11:25:05 +08:00
jiaoyangna bf5c4197ce 【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
2021-06-09 11:03:18 +08:00
jiaoyangna 2ed4480d92 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-08 17:57:59 +08:00
wangzhenxing 9bd4103768 【称号】====称号特效显示修改提交 2021-06-02 18:26:31 +08:00
ZhangBiao b4dc20a3bb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:01:19 +08:00
ZhangBiao 9ebd4c5e05 【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面 2021-05-31 18:00:42 +08:00
jiaoyangna e1b523c394 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:08:07 +08:00
jiaoyangna 0268a71c9b 无尽秘宝描述修改提交 2021-05-31 17:07:49 +08:00
zhangqiang a86b66a2eb 【十一星】英雄未获得详情报错修复 2021-05-31 14:46:56 +08:00
wangzhenxing 10f97f9b8b [许愿神将]===活动修改 2021-05-31 11:31:15 +08:00
gaoxin 92a04cc440 【抽卡】修复第一次抽卡报错的问题 2021-05-31 11:06:20 +08:00
zhangqiang 2c27d19046 【关卡属性提升】修改提交 2021-05-29 22:49:43 +08:00
jiaoyangna acfc98c16f 延续时间修改 2021-05-29 22:47:20 +08:00
zhangqiang 028a31941f 【背包】背包中道具详情没有“使用”按钮 2021-05-29 20:44:43 +08:00
jiaoyangna 9eee295a1f 价格修改提交 2021-05-29 20:17:50 +08:00
jiaoyangna b071e12e29 秘宝描述修改 2021-05-29 20:04:48 +08:00
zhangqiang f7be239ea7 【踏碎凌霄】排行榜 2021-05-29 18:37:45 +08:00
wangzhenxing a7de414589 [限时抽卡活动] 抽卡优化,奖励展示修改 2021-05-29 18:27:03 +08:00
wangzhenxing 62f5514f80 [限时抽卡] 【公会福利红包】bug修改 2021-05-29 16:26:05 +08:00
wangzhenxing b49fcce742 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 15:37:09 +08:00
wangzhenxing 574d95b607 [限时祈愿活动]======修改bug提交 2021-05-29 15:35:52 +08:00
zhangqiang 4b289f571b 【关卡属性提升界面修改】 2021-05-29 15:06:16 +08:00
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00
gaoxin 1e36398a50 【内存优化】Util.Loadsprite 替换为 spLoader 2021-05-28 14:41:58 +08:00
zhangqiang ffed262485 【bug】 2021-05-28 13:48:43 +08:00
wangzhenxing 675ef2efd7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
zhangqiang fe6b69bfe6 【bug】提交 2021-05-28 10:32:42 +08:00
zhangqiang 4bfbd360dd 【山河社稷图】特效层级调整 2021-05-27 23:20:09 +08:00
zhangqiang 9922678210 【山河社稷图】开启章节界面修改 2021-05-27 23:09:37 +08:00
gaoxin 38e4008d81 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 20:45:26 +08:00
gaoxin f5071a9845 【bug】修复战斗结算报错,修复挂机奖励提升白片 2021-05-27 20:45:20 +08:00
zhangqiang 0b2ef33938 【山河社稷图】特效修改提交 2021-05-27 20:29:05 +08:00
jiaoyangna d9c94e250f 删除log 2021-05-27 20:24:10 +08:00
zhangqiang b92e659e53 【山河社稷图】特效提交 2021-05-27 20:17:53 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
jiaoyangna 20f117702c 无尽副本修改提交 2021-05-27 18:37:51 +08:00
zhangqiang fd964d842b 【提交】 2021-05-27 16:51:29 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
zhangqiang 56463b82bb 【漏提】 2021-05-27 15:20:21 +08:00
jiaoyangna 7779c1dbb1 无尽副本修改提交 2021-05-27 15:04:21 +08:00
ZhangBiao a6512d2778 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:44:59 +08:00
ZhangBiao f832ecfc33 【修行】玩家信息界面显示的神印图标,在一行和两行的玩家之间切换,有遮挡 2021-05-27 14:44:49 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
jiaoyangna 7d5ff8c3f1 设置按钮修改 2021-05-27 14:05:05 +08:00
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
ZhangBiao 9d4ec4495d 【云游商人】无可替换装备时,去除二次弹窗,改为系统提示 2021-05-27 09:23:45 +08:00
jiaoyangna 35d0927881 无尽副本修改提交 2021-05-26 22:00:33 +08:00
jiaoyangna 736293cbe9 头像框颜色提交 2021-05-26 20:53:18 +08:00
zhangqiang aca4aa47ac 【音效修改】 2021-05-26 19:40:03 +08:00
jiaoyangna 618d8094ea 无尽副本修改提交 2021-05-26 17:27:47 +08:00
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
jiaoyangna bb2cd6a263 无尽副本修改提交 2021-05-26 14:57:28 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
ZhangBiao 51576888a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 11:53:54 +08:00
ZhangBiao 5155b4aeb3 【主界面】提交 2021-05-26 11:53:45 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
ZhangBiao 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
jiaoyangna 3846170f2d 属性提升界面修改提交 2021-05-25 21:40:41 +08:00
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
ZhangBiao d09ff174d2 【修行】取消玩家信息界面神印神将头像,练气期预览报错修改 2021-05-25 15:50:41 +08:00
gaoxin e7c8d5290d 【仙缘抽】修复报错 2021-05-25 10:30:18 +08:00
gaoxin bfbc185604 【抽卡】仙缘汇聚箱加入山河社稷图星数条件 2021-05-24 20:33:26 +08:00
jiaoyangna 33834cc9b2 Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-05-24 16:39:34 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
jiaoyangna 7cc12e74a8 无尽修改提交 2021-05-22 14:08:34 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00
ZhangBiao 3f7e243b70 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
ZhangBiao be1085d2bb Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
2021-05-19 20:01:57 +08:00
gaoxin 989361e574 Merge branch 'china/ios' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
2021-05-19 15:15:13 +08:00
gaoxin 6d551869be 【内存优化】新内存内存优化修改 2021-05-19 15:06:02 +08:00
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
zhangqiang 491b7b54a7 【化虚坛优化】化虚坛中有可合成的将时,在神将头像、页签按钮,和化虚坛入口上添加红点提示 2021-05-19 10:27:55 +08:00
jiaoyangna deeaa0221d 每日礼包界面内,点击妖晶快捷获取按钮,再点击商店,商店内点击妖晶快捷获取,退出时会重复显示界面的bug; 2021-05-18 21:04:58 +08:00
ZhangBiao 9b1c6ac930 【修行】资源提交 2021-05-18 21:00:38 +08:00
jiaoyangna 83697a9de4 Merge branch 'china/dev' into china/dev-c 2021-05-18 20:53:23 +08:00
ZhangBiao bcf845ae38 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
zhangqiang c27ddeb2a4 【山河社稷图】编队加职能 调副关卡恭喜获得背景层级 2021-05-18 15:17:05 +08:00
ZhangBiao 93b8746cfe 【修行】玩家信息界面神印提交 2021-05-18 14:59:47 +08:00
zhangqiang 433bcf9ddb 【添加音效】 2021-05-18 14:24:09 +08:00
gaoxin e76fb1dede 【社稷大典】修复未加入公会时,取消无限循环的问题 2021-05-17 15:49:59 +08:00
zhangqiang e763e54799 Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-05-17 11:04:01 +08:00
ZhangBiao c5df85efae 【修行】提交 2021-05-17 10:54:36 +08:00
ZhangBiao 5fe75af0bf Merge branch 'china/dev' into 0功能/修行玩法 2021-05-17 10:15:42 +08:00
zhangqiang 78e1a2b5a4 【山河社稷图】提交 2021-05-15 16:16:46 +08:00
zhangqiang 9ccd6f9002 【车迟斗法】倒计时问题 2021-05-15 14:40:43 +08:00
zhangqiang 57e1e32e32 【山河社稷图】提交 2021-05-14 15:03:48 +08:00
ZhangBiao b3e40bac95 【修行】提交 2021-05-14 14:54:57 +08:00
ZhangBiao 410262cee8 Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-14 13:27:01 +08:00
ZhangBiao 3229d0693b 【修行】提交 2021-05-14 13:21:38 +08:00
ZhangBiao 4b20254ddd 【修行】提交 2021-05-13 21:03:27 +08:00
zhangqiang e4eda3017e 【山河社稷图】提交 2021-05-13 20:30:10 +08:00
zhangqiang da33b98dfb 【山河社稷图】提交 2021-05-13 09:56:11 +08:00
ZhangBiao 7d63d1e191 【修行】提交 2021-05-12 17:40:38 +08:00
jiaoyangna 3c04e8dbe1 [主题活动修改提交]
(cherry picked from commit f88ccd8f68)
2021-05-12 17:37:59 +08:00
ZhangBiao 92b22fdc0c 【修行】提交 2021-05-12 10:35:58 +08:00
gaoxin b7b3f610ed 【翻译文字导出】 2021-05-11 17:03:09 +08:00
zhangqiang effe90990f 【山河社稷图】提交 2021-05-11 15:12:37 +08:00
ZhangBiao 165c8650a7 【恭喜获得】背包已满会弹空的恭喜获得2 2021-05-10 16:20:41 +08:00
ZhangBiao 181306059d 【恭喜获得】背包已满会弹空的恭喜获得 2021-05-10 16:12:09 +08:00
ZhangBiao 16e5b894e3 【天尊降世】增加第三个奖励红点 2021-05-10 10:35:08 +08:00
jiaoyangna f88ccd8f68 [主题活动修改提交] 2021-05-10 10:06:53 +08:00
ZhangBiao 9fda08c7ba 【碎片合成】神将达上限,选择合成数量时没有合理提示 2021-05-08 11:03:46 +08:00
gaoxin 65454a8e23 【bug】车迟斗法挑战报错,再次延长天尊降世的可关闭时间 2021-04-30 14:07:24 +08:00
gaoxin 7c54586379 Merge branch 'china/dev-c' into china/dev 2021-04-30 12:43:11 +08:00
jiaoyangna 08ef62eb2b 至尊降世 前往修改 2021-04-30 12:42:31 +08:00
gaoxin de827b3ae3 【至尊降世】延时四秒后才能关闭界面否则会出现立绘消失的问题 2021-04-30 11:29:40 +08:00
gaoxin 5f09e64257 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 20:19:10 +08:00
jiaoyangna 3578f57882 关闭假战斗回放 2021-04-29 20:16:37 +08:00
gaoxin 7bae49b1c2 【至尊降世】特效修改 2021-04-29 17:53:40 +08:00
ZhangBiao 2133dc0209 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 17:23:16 +08:00
ZhangBiao 441495fcfe 【踏碎凌霄】奖励增加序号 2021-04-29 17:23:06 +08:00
jiaoyangna ed9c058ece 修改剧情入口 2021-04-29 17:00:12 +08:00
jiaoyangna f352c53b6f 关闭主城临时剧情入口 2021-04-28 00:16:08 +08:00
jiaoyangna cad4f57850 添加天尊降世的剧情动画 2021-04-28 00:14:50 +08:00
ZhangBiao 1308a7bf69 【踏碎凌霄】提交 2021-04-27 23:43:20 +08:00
ZhangBiao ba024be162 【踏碎凌霄】已未达成提交 2021-04-27 23:37:11 +08:00
wangzhenxing d2a7fdcee1 天尊降世活动资源提交 2021-04-27 22:16:42 +08:00
ZhangBiao 5401776a8d 【踏碎凌霄】界面显示调整 2021-04-27 21:28:48 +08:00
zhangqiang a46c7f3413 【恭喜获得修改】 2021-04-27 20:48:45 +08:00
gaoxin 1e7142008c 【云游商人】选中武器点确定,再选中护甲点取消,最后合成的是护甲 2021-04-27 20:26:10 +08:00
ZhangBiao 90fd541e99 【限时活动】删除timer 2021-04-27 17:50:26 +08:00