Commit Graph

9013 Commits (31304cc25259f3af21b8c65dcb36ba4cee137b3e)
 

Author SHA1 Message Date
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
zhangshanxue 51d59cd8ef Merge branch 'china/dev' into china/test 2021-08-27 18:24:42 +08:00
wangzhenxing 6ef1d6c643 【战斗】===========被动115 DOT类Buff 清除逻辑修改 2021-08-27 18:02:50 +08:00
zhangshanxue 0946e743ba 【覆盖安装包时清除缓存】 2021-08-27 16:46:26 +08:00
zhangshanxue 00a25c6bc1 【覆盖安装包时清除缓存】 2021-08-27 16:44:29 +08:00
zhangshanxue ab15ece104 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta
#	Assets/ManagedResources/Spine/c_0038_02.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat
#	Assets/ManagedResources/Spine/c_0043_02.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-27 16:42:18 +08:00
ZhangBiao 7ca7e78761 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-27 15:59:38 +08:00
ZhangBiao 12c2fd7316 【推荐公会】增加分页请求 2021-08-27 15:59:22 +08:00
wangzhenxing 58f34e049b 【战斗】=============被动91,160 修改提交 2021-08-27 15:27:53 +08:00
gaoxin a3f9967651 【提审服】精卫穿秋裤,慈航穿棉袄 2021-08-27 15:23:03 +08:00
zhangqiang 4abca9f0a2 漏提 2021-08-27 15:15:42 +08:00
zhangqiang 50268807c3 【十绝阵】左上角数据刷新不及时,得重进界面才变化 2021-08-27 15:12:22 +08:00
gaoxin 792a72676a 【适龄提示】 2021-08-27 14:20:36 +08:00
zhangqiang 037c4a5ac8 【十绝阵】左上角数据刷新不及时,得重进界面才变化 2021-08-27 11:14:12 +08:00
gaoxin 2c7ef85e6b 【判空方法】修复组件无法判断空值的问题 2021-08-26 22:30:45 +08:00
zhangshanxue c542bf612d 【资源】循环依赖处理 2021-08-26 22:29:58 +08:00
gaoxin 672ca7db26 【判空方法】修复组件无法判断空值的问题 2021-08-26 22:29:19 +08:00
zhangshanxue 78c3cd8adf 【资源】循环依赖处理 2021-08-26 20:25:22 +08:00
ZhangBiao 868939fa06 【觉醒】神将界面觉醒显示 2021-08-26 18:55:42 +08:00
ZhangBiao 3a102c93fa 【觉醒】神将界面觉醒显示 2021-08-26 18:54:14 +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 be3afeb82a 【资源】重名资源修改 2021-08-26 17:02:42 +08:00
gaoxin f25148fb68 【资源】重名资源修改 2021-08-26 17:02:29 +08:00
gaoxin ea4599e860 Revert 回滚错误的合并 4f19f12612 2021-08-26 16:46:41 +08:00
gaoxin 68ac132040 【太初密卷】修改为拉伸的方式 2021-08-26 16:46:36 +08:00
zhangqiang 8cf472017b 【失败界面按钮位置调整】 2021-08-26 16:46:26 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin 2f9357608a 【太初密卷】修改为拉伸的方式 2021-08-26 16:30:52 +08:00
zhangshanxue 8d05854eb0 Merge commit '20554f8fd82082607fa75e9c89606a576faa6669' into china/test 2021-08-26 16:19:34 +08:00
zhangqiang 0202985814 【失败界面按钮位置调整】 2021-08-26 14:12:54 +08:00
zhangqiang 5b9542d391 【跨服十绝阵】请求跨服排行 2021-08-26 14:12:28 +08:00
zhangqiang 20554f8fd8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-26 11:49:11 +08:00
zhangqiang 17e4c209c7 【神将列表】排序修改-张彪 2021-08-26 11:48:36 +08:00
gaoxin 8e01aafe51 【出包场景】所有线上包关闭日志打印 2021-08-25 21:04:49 +08:00
gaoxin dd45768117 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 21:02:11 +08:00
gaoxin 0193d9a22e 【数数】修改部分数据到进入游戏时上报 2021-08-25 21:01:50 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
gaoxin a6e93212d0 【数数】修改部分数据到进入游戏时上报 2021-08-25 19:38:49 +08:00
zhangqiang b44c1a3e8f 【装备界面】装备界面替换魂灵宝,会生成一个假的宝物 2021-08-25 18:07:05 +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
jiaoyangna 404a30a57d 四灵修改提交 2021-08-25 15:15:50 +08:00
wangzhenxing 690db47d68 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
gaoxin 7fc6ee71f0 【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题 2021-08-25 14:34:47 +08:00
zhangqiang 8c46f74e45 【跨服十绝阵】 回退特殊处理 2021-08-25 14:34:42 +08:00
gaoxin f778b03879 【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题 2021-08-25 14:27:08 +08:00
zhangqiang c8a06d9c5d 【重复名】特效重复名提交 2021-08-25 13:55:37 +08:00
zhangqiang dd37961be0 【跨服十绝阵】 回退特殊处理 2021-08-25 13:53:40 +08:00
gaoxin 158d663639 【太初密卷】喜扑和动游渠道关闭 2021-08-25 07:32:07 +08:00
gaoxin 7efb32c51c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-25 07:25:44 +08:00