Commit Graph

3533 Commits (bdb9eeba2dab0f3627bdefdb50ca6dcd27f836f9)

Author SHA1 Message Date
zhangqiang bdb9eeba2d 【资源导入】 猪八戒新皮肤 live2d 2020-12-15 10:21:05 +08:00
zhangqiang cd4735e17f 【资源导入】猪八戒新皮肤特效 2020-12-15 10:11:02 +08:00
zhangqiang 9630a4a016 【套装属性】 bug修改 2020-12-14 17:52:37 +08:00
zhangqiang 66c74f5a76 【装备套装】 2020-12-12 17:08:14 +08:00
zhangqiang 09cea38bbd 【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复 2020-12-12 13:58:37 +08:00
gaoxin 8b98b9e7e3 【战斗】检测不灭的方式修改 2020-12-11 18:10:46 +08:00
zhangqiang cedbc1222f 【装备套装】 套装属性向下兼容 2020-12-11 17:33:24 +08:00
ZhangBiao 82eeaa5084 【森罗幻境】诸多bug修复 2020-12-11 17:21:04 +08:00
zhangqiang 6ef26cdc8f 博闻强识图片修改 2020-12-11 15:33:50 +08:00
ZhangBiao e151ca86c7 【易经宝库】 2020-12-10 16:57:26 +08:00
ZhangBiao d2d9818fa9 【道具自选箱】宝箱开启数量不能为0 2020-12-10 16:41:06 +08:00
zhangqiang 200d59bb4d 【灵兽召唤】 1209bug 抽灵兽的动画,有一瞬间的黑屏 2020-12-10 14:42:22 +08:00
zhangqiang b8871d725c 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 14:41:45 +08:00
jiaoyangna 84f6ea27ed 【博文多识】 2020-12-10 11:38:11 +08:00
zhangqiang 5aa90e75ac 【特效】 金乌特效移动位置 2020-12-10 10:53:59 +08:00
wangzhenxing 9b6e041a27 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-10 10:29:33 +09:00
wangzhenxing f6ef3b3d3b 战斗结束输出单位剩余血量日志 2020-12-10 10:28:56 +09:00
ZhangBiao f9f31f5a44 【道具自选箱】选择的数量为0直接关闭调整 2020-12-09 18:02:15 +08:00
ZhangBiao 0937827967 【道具自选箱】bug修复
(cherry picked from commit 6df7f2ef10)
2020-12-09 17:28:43 +08:00
ZhangBiao 8289957799 【易经宝库】最中间的未开启 拿到大奖报错修改 2020-12-09 09:57:49 +08:00
zhangqiang 934e74672e 【首冲】 首冲测试战斗修改提交 2020-12-08 16:13:23 +08:00
zhangqiang b46e0f9105 【大闹天宫 bug】 失败后保存血量前端报错修改 2020-12-08 15:24:00 +08:00
ZhangBiao 4ef08d456e 【GM】钱降一位、一键宝物、一键装备(顶级) 2020-12-08 15:03:59 +08:00
liujiaqi 75a878e9d7 【资源】白骨精法宝占坑资源。白骨精技能字资源白骨精技能图标资源 2020-11-08 19:23:17 +08:00
ZhangBiao 1d5551eee7 【社稷大典】连续捐献-1修复 2020-12-07 20:15:49 +08:00
gaoxin 9e4e1e7a99 【音效】白骨精技能音效添加 2020-12-07 17:02:20 +08:00
jiaoyangna be56177071 伏虎罗汉 修改 2020-09-17 12:25:03 +08:00
jiaoyangna f602a40132 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-20 06:44:30 +08:00
ZhangBiao e3bd258f8d 【新将来袭】立绘更改 2020-12-07 10:45:07 +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 523932cc25 【新将来袭】宝箱显示修改 2020-12-07 10:22:43 +08:00
zhangqiang 626099d62d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-05 15:17:23 +08:00
zhangqiang 4dc5059bed 【战斗 】 给英雄附加战斗单位类型 2020-12-05 15:16:54 +08:00
wangzhenxing d92e67a866 [战斗] 修改灵兽给英雄附加的buff的刷新机制,改为大回合刷新,如果灵兽是在回合后释放,配置的持续回合数+1 2020-12-05 15:14:02 +09:00
zhangqiang 8388b950ff 【巅峰赛 bug】 三局两胜 第三场不刷新bug 2 2020-12-05 14:01:46 +08:00
ZhangBiao 1fcb892050 【新将来袭】宝箱位置调整 2020-12-04 19:42:47 +08:00
ZhangBiao 2c2e208bc1 【新将来袭】预设微调 2020-12-04 16:10:00 +08:00
wangzhenxing cf54cff4b8 [战斗] 神女庇佑最佳技能表现修改,吞鲸魂印修改 2020-12-04 16:43:42 +09:00
ZhangBiao b3e374e336 【神将来袭】基本完事儿 2020-12-03 18:36:01 +08:00
ZhangBiao b2e53f8ae5 【新将来袭】战斗血条 2020-12-03 15:11:24 +08:00
ZhangBiao 86d190572a 【神将来袭】加战斗了 2020-12-02 17:14:52 +08:00
ZhangBiao ecb948a613 【神将来袭】真·差战斗 和为小游戏转盘增加log 2020-12-02 15:42:38 +08:00
ZhangBiao 2f07beaa08 【新将来袭】差战斗了 2020-12-02 09:51:17 +08:00
ZhangBiao d860871ba6 path上传 2020-12-01 15:57:35 +08:00
ZhangBiao 2d51e11e10 【神将来袭】代码完善 2020-12-01 15:52:34 +08:00
ZhangBiao 758c59dcae 【青龙秘宝】修复延时 2020-12-01 13:51:42 +08:00
ZhangBiao 1222f1df0c 【新将来袭】开坑 2020-12-01 13:51:13 +08:00
gaoxin 119be29c7d 【角色】修复角色被动技能数量计算错误,兼容多合一被动 2020-11-30 21:17:56 +08:00
gaoxin 4dbbbc7929 【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错 2020-11-30 20:35:14 +08:00
zhangqiang b0f9e59672 【车迟】抢夺空队伍 提示错误 2020-11-30 11:09:07 +08:00