Commit Graph

205 Commits (c6c11c937461a0b2d43d5e1351471135eecbc5f1)

Author SHA1 Message Date
zhangqiang 580b43eff8 跨服排行榜里,查看玩家信息,战力显示超框问题 2021-07-30 10:33:29 +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
jiaoyangna 1123d9dc2d 宝物修改提交 2021-07-28 11:52:47 +08:00
zhangqiang 0204573ad9 【玩家信息】跨服排行榜里,查看玩家信息,战力显示超框问题 2021-07-28 10:52:49 +08:00
jiaoyangna 527295f30c 宝物优化 2021-07-28 10:51:39 +08:00
ZhangBiao 5fa9f25c09 【点将台】白片修改 2021-07-22 10:53:27 +08:00
ZhangBiao 683e0eefc4 【心愿抽卡】界面调整 2021-07-21 18:37:15 +08:00
ZhangBiao 30edf664da Merge branch 'china/dev' into 0优化/新增心愿神将提示 2021-07-21 18:26:34 +08:00
ZhangBiao 183cd238d3 【心愿抽卡】完成 2021-07-21 18:22:24 +08:00
jiaoyangna 1d2ed2a4f7 装备详情弹窗下方获取途径位置显示错误 2021-07-21 18:03:23 +08:00
jiaoyangna 8477043738 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:38:27 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
jiaoyangna 399d90809d 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:32:07 +08:00
jiaoyangna d1abaf403c 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:23:14 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
zhangqiang 803fcee6bf 【碎片图标】点击碎片图标弹出弹窗,再点击弹窗中图标,显示错误 2021-07-07 15:16:31 +08:00
jiaoyangna 36cb3db3af 底图修改提交 2021-06-30 16:17:50 +08:00
jiaoyangna f834e2e17d 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-30 10:12:44 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
ZhangBiao 18d4289e39 【锻器阁】合成装备超框 2021-06-24 14:11:51 +08:00
jiaoyangna cb37edbba0 秘宝间隔调整 2021-06-21 18:26:31 +08:00
jiaoyangna 9275f0f011 字修改提交 2021-05-29 20:22:55 +08:00
jiaoyangna 9eee295a1f 价格修改提交 2021-05-29 20:17:50 +08:00
jiaoyangna b78b006009 神将情报界面修改提交 2021-05-28 12:30:47 +08:00
wangzhenxing 560089c1f5 [限时祈愿活动] 预设 协议提交 2021-05-28 10:58:20 +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 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
jiaoyangna b197244667 无尽副本修改提交 2021-05-27 09:46:56 +08:00
jiaoyangna 8f6fce191b 无尽任务提交 2021-05-26 18:07:09 +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 172f98c207 【修行】玩家界面预览报错修改 2021-05-26 11:28:59 +08:00
jiaoyangna 911f443e40 添加属性提升 2021-05-26 09:51:41 +08:00
ZhangBiao 41152acae9 【修行】排行榜界面,神将界面、神将替换提示调整 2021-05-25 11:54:19 +08:00
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00
ZhangBiao 93b8746cfe 【修行】玩家信息界面神印提交 2021-05-18 14:59:47 +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 f3cb51c858 【预设冲突】冲突修改后提交 2021-05-17 10:35:58 +08:00
ZhangBiao 8003c43f71 Merge branch 'china/dev-c' into 0功能/修行玩法 2021-05-17 10:32:30 +08:00
ZhangBiao 307c2c1e37 【冲突处理】复制general(big)popup 2021-05-17 10:31:45 +08:00
ZhangBiao 29b8fd144e Revert "【修行】提交,预设冲突处理"
This reverts commit 79910218c5.
2021-05-17 10:29:34 +08:00
ZhangBiao 79910218c5 【修行】提交,预设冲突处理 2021-05-17 10:21:08 +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
jiaoyangna 3c04e8dbe1 [主题活动修改提交]
(cherry picked from commit f88ccd8f68)
2021-05-12 17:37:59 +08:00
gaoxin 58618e2062 【帮助】修复界面可以穿透点击事件的问题 2021-05-11 11:06:41 +08:00