Commit Graph

1854 Commits (e9bd44d6d768b7b6516589e41e2164ba8d088536)
 

Author SHA1 Message Date
gaoxin e9bd44d6d7 尝试将新战斗力计算方式加入工程 2020-08-27 16:17:53 +08:00
gaoxin c6808594a0 剧情立绘替换 2020-08-26 23:09:32 +08:00
gaoxin 4fd397d9dd 修复副本界面通关后战斗力背景图标不关闭的问题 2020-08-26 22:36:45 +08:00
gaoxin 8ac5a6e7e2 修复连续点击导致战斗界面打开多次导致报错,立绘重叠的问题 2020-08-26 22:35:57 +08:00
gaoxin e542ba0fab 解决heroManager冲突 2020-08-26 21:09:26 +08:00
gaoxin aa2b9ebeb4 Merge branch 'master_develop' into 0优化/角色战斗力计算
# Conflicts:
#	Assets/ManagedResources/UpdatePanel/Atlas/UpdatePanelAtlas/loding1.jpg.meta
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2020-08-26 21:05:02 +08:00
gaoxin dbebfeddf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:54:37 +08:00
gaoxin ee71156c2c 修复背包界面装备战斗力不显示的问题 2020-08-26 20:53:56 +08:00
jiaoyangna 1482d308cb 日常副本修改 2020-08-26 20:37:31 +08:00
jiaoyangna b987f3124a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:31:07 +08:00
jiaoyangna 1cc497b2fd qinglong commit 2020-08-26 20:30:52 +08:00
gaoxin 8b0c138f68 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:20:53 +08:00
gaoxin 4b41b5def9 副本界面显示优化 2020-08-26 20:20:40 +08:00
jiaoyangna f28c176f18 add activity status 2020-08-26 20:17:37 +08:00
jiaoyangna 3c6a636d0d qinglong commit 2020-08-26 20:04:36 +08:00
jiaoyangna 03048116e4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:04:13 +08:00
jiaoyangna c2ec9c93f8 【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭 2020-08-26 20:04:02 +08:00
zhangqiang 86361419cc 神将合成bug 2020-08-26 19:44:29 +08:00
ZhangBiao f47dc8f441 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 19:08:31 +08:00
ZhangBiao 134b70ce33 成长礼包美元符号位置 2020-08-26 19:08:21 +08:00
gaoxin a972b4993b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:33:57 +08:00
gaoxin e834044de0 修复战斗最后一回合结束还会再打一次的问题 2020-08-26 18:33:47 +08:00
jiaoyangna 8a4f24ce77 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:29:35 +08:00
jiaoyangna f62a007edb qinglong commit 2020-08-26 18:29:27 +08:00
ZhangBiao 87891b2798 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:29:10 +08:00
ZhangBiao 42b0ffe95d 月基金价格修改 2020-08-26 18:29:02 +08:00
gaoxin 093c6d1f41 竞技场按钮功能未开启不再显示 2020-08-26 18:18:12 +08:00
gaoxin 46403f1431 创建角色界面显示优化 2020-08-26 18:17:43 +08:00
gaoxin 80e2f16169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:58:51 +08:00
gaoxin fcf0557f01 修复公会boss立绘会创建多次的问题 2020-08-26 17:58:46 +08:00
gaoxin bab4148db6 主界面十绝阵,巅峰赛按钮添加 2020-08-26 17:58:23 +08:00
ZhangBiao ed22b5b9d2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:57:12 +08:00
ZhangBiao 8dd4feeead 乾坤宝囊特效增加 2020-08-26 17:56:59 +08:00
zhangqiang 730a39cd69 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:45:32 +08:00
zhangqiang efaa3e51cc 公会副本刷新问题 2020-08-26 17:45:18 +08:00
ZhangBiao ca6862831a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:22:03 +08:00
ZhangBiao 09c72dc362 神将界面点击前往化虚坛提示75级问题修改 2020-08-26 17:21:50 +08:00
jiaoyangna 4fd97151a5 qinglong commit 2020-08-26 17:13:27 +08:00
jiaoyangna 265f0f8781 qinglong commit 2020-08-26 17:08:04 +08:00
ZhangBiao 1f35f84243 四元阵赠送20置换玉提示 2020-08-26 16:59:19 +08:00
zhangqiang 1b8f1631b7 巅峰战八强替换资源 2020-08-26 16:43:07 +08:00
jiaoyangna d8d8dc5721 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 16:32:17 +08:00
jiaoyangna 24b4852ea7 qinglong commit 2020-08-26 16:32:12 +08:00
gaoxin cafdcbcd40 聊天刷新时间延长为每5秒刷新一次 2020-08-26 16:29:52 +08:00
ZhangBiao c5e245fca4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 16:22:49 +08:00
ZhangBiao dc9615b4fc 无尽进图武神将问题、取消对话战斗结束神将数据界面 2020-08-26 16:22:37 +08:00
jiaoyangna e1a2a7cd52 qinglong commit 2020-08-26 16:15:52 +08:00
jiaoyangna b3774c7a44 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:57:12 +08:00
jiaoyangna 22fa2b0d4c qinglong commit 2020-08-26 15:57:06 +08:00
gaoxin ec45a9688d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:51:41 +08:00