Commit Graph

105 Commits (004c56ce90be91c9c5fbcd6e2831b7f0c99617f1)

Author SHA1 Message Date
ZhangBiao 56eb6c613a 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-16 17:23:52 +08:00
ZhangBiao 82eeaa5084 【森罗幻境】诸多bug修复 2020-12-11 17:21:04 +08:00
ZhangBiao 620862f64f Merge branch '0活动开发聚集地/新将来袭' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_bgj_00091.prefab
#	Assets/ManagedResources/Prefabs/Live2d/live2d_c_mjn_00063.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua
2020-12-07 10:33:26 +08:00
ZhangBiao ecb948a613 【神将来袭】真·差战斗 和为小游戏转盘增加log 2020-12-02 15:42:38 +08:00
ZhangBiao bdf45413bc 【森罗幻境】敌将详情 敌将位置调整
(cherry picked from commit 2dd30f9ca3)
2020-11-17 14:56:42 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
jiaoyangna 5d24bbb8a8 森罗环境英雄皮肤提交 2020-11-09 10:32:17 +08:00
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
ZhangBiao 2dd30f9ca3 【森罗幻境】敌将详情 敌将位置调整 2020-11-17 14:55:21 +08:00
ZhangBiao 88d1be5daf Revert "【森罗幻境】敌将详情 敌将位置调整"
This reverts commit f1402772f9.
2020-11-17 14:53:27 +08:00
ZhangBiao f1402772f9 【森罗幻境】敌将详情 敌将位置调整 2020-11-17 14:51:25 +08:00
gaoxin 5ab9688089 Merge branch 'master_xma_local' into master_develop 2020-11-16 16:46:33 +08:00
gaoxin 5a6b83ebe6 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Language.lua
2020-11-10 10:41:02 +08:00
jiaoyangna be7be732d3 Merge branch 'master_develop' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-11-06 10:54:04 +08:00
jiaoyangna 2a5a23f3ed 显示优化提交 2020-10-16 17:37:54 +08:00
ZhangBiao 9265a8883c 无尽副本出图多次请求商店 修复 2020-10-14 11:55:40 +08:00
jiaoyangna 5a17813275 森罗幻境 修改 2020-10-15 21:26:19 +08:00
ZhangBiao 252fec5bbd 回春散手动使用次数不刷新修复 2020-10-12 16:10:04 +08:00
ZhangBiao f087c0258b 2020-10-12 15:39:23 +08:00
ZhangBiao 62f185c859 森罗回春散使用bug修改 2020-10-12 15:13:37 +08:00
ZhangBiao 69fee1514f 森罗回春散使用 问题修复 2020-10-12 14:43:44 +08:00
ZhangBiao 7adae7f006 森罗召唤boss后使用炸弹报错问题修复 2020-09-17 11:50:44 +08:00
zhangqiang fafbaa3617 音效 2020-09-14 15:11:07 +08:00
zhangqiang c27c237fac 音效 2020-09-10 16:30:52 +08:00
ZhangBiao e3e95e2379 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
ZhangBiao 91061ae00a 无尽红点刷新修复 2020-09-01 15:32:24 +08:00
ZhangBiao 822f4a2294 森罗界面适配 2020-09-01 14:53:12 +08:00
ZhangBiao 9942bd50bb 回春散使用bug修复 2020-08-31 19:54:14 +08:00
ZhangBiao b5ac787e16 数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
2020-08-31 15:45:16 +08:00
ZhangBiao a99aa6ef6e 还是红点检测 2020-08-28 17:29:38 +08:00
ZhangBiao 0c3b0e6326 车迟斗法副本界面红点 2020-08-28 16:35:08 +08:00
ZhangBiao 01fc7cae51 森罗幻境奖励红点 2020-08-28 13:48:09 +08:00
gaoxin e6c8e81c82 修复小游戏反复打开会报错的问题 2020-08-27 23:01:07 +08:00
ZhangBiao 2a2eac8cbb 森罗战斗失败两次弹出失败 2020-08-27 18:31:39 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
ZhangBiao 1e4f936810 无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复 2020-08-27 10:49:44 +08:00
ZhangBiao dc9615b4fc 无尽进图武神将问题、取消对话战斗结束神将数据界面 2020-08-26 16:22:37 +08:00
ZhangBiao 09ed357e08 森罗敌人信息显示界面空白问题修改 2020-08-26 10:18:31 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna 98c80ed67c 森罗幻境 修改 2020-10-15 21:26:56 +08:00
ZhangBiao 767ac32ee1 回春散手动使用 数量不刷新 修复 2020-10-12 16:08:13 +08:00
ZhangBiao aec2eb929c (cherry picked from commit f087c0258b) 2020-10-12 15:39:57 +08:00
ZhangBiao ff33dd07db 森罗回春散使用bug修改
(cherry picked from commit 62f185c859)
2020-10-12 15:15:02 +08:00
ZhangBiao a47d882155 森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f)
2020-10-12 15:14:27 +08:00
ZhangBiao 17465d2f3d 2020-08-20 14:56:29 +08:00
ZhangBiao e9b8083148 2020-08-20 14:43:48 +08:00
ZhangBiao f93c57fd31 副本快结束啦! 2020-08-19 20:57:04 +08:00
ZhangBiao f9ffc1aa39 无尽细节修改 2020-08-19 19:37:59 +08:00