Commit Graph

3269 Commits (76765a51a43859c332677a3f0e09b9280c198628)
 

Author SHA1 Message Date
ZhangBiao 9d0c6a30c2 【特效】混乱特效添加 2020-12-26 21:03:21 +08:00
gaoxin f2715c77bc 【特效】混乱特效资源文件缺失补齐 2020-12-26 20:39:31 +08:00
gaoxin f29b6518fa 【协议】误删恢复 2020-12-26 20:27:54 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
gaoxin 9e67dcb248 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-26 19:57:14 +08:00
gaoxin f043773668 【资源】遗漏资源补齐 2020-12-26 19:56:59 +08:00
wangzhenxing ed9efaf4e8 【战斗】 白骨精追加普攻必定暴击修改 2020-12-26 19:54:46 +09:00
wangzhenxing fcc8724fca 【战斗】=====292被动位置修改 2020-12-26 19:52:51 +09:00
wangzhenxing 4bc92b8b21 [战斗]白骨精法宝添加普攻不触发任何特性 2020-12-26 19:49:45 +09:00
wangzhenxing e9c4cab292 [战斗]289被动修改,协议数据提交 2020-12-26 19:48:59 +09:00
wangzhenxing 8503667fc8 【战斗】==========混乱特效名称修改 2020-12-26 19:48:06 +09:00
wangzhenxing f07b8a14d2 [战斗]修改切磋判断胜负条件 2020-12-26 19:46:18 +09:00
wangzhenxing 96f31b63ad [优化]魂宝灵宝加号点击区域扩大 2020-12-26 19:45:44 +09:00
wangzhenxing e4596beb99 【宝物】==========宝物添加加号提示 2020-12-26 19:44:48 +09:00
wangzhenxing 8ad04c122c [优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗 2020-12-26 19:36:11 +09:00
wangzhenxing f0c2913433 [战斗] 修改初始怒气无法增加修改 2020-12-26 19:29:44 +09:00
wangzhenxing 064e00c029 [战斗]白骨精技能,被动,魂印效果提交 2020-12-26 19:28:29 +09:00
jiaoyangna f0f423bbd4 红点报错 修改 2020-12-26 18:40:28 +08:00
jiaoyangna c1f87eb208 逍遥红点 提交 2020-12-26 18:39:47 +08:00
gaoxin 1171415e74 【技能Tip】修复大小不能自适应文字的问题 2020-12-26 18:34:08 +08:00
gaoxin 7fe3b4f39f 【战斗】魂印力战之躯不再免疫间接伤害 2020-12-26 18:34:02 +08:00
gaoxin f548b3647a 【特效】金乌特效动画文件修改 2020-12-26 18:33:46 +08:00
gaoxin 741f7d0448 【特效】修复白骨精特效全屏显示 2020-12-26 18:33:11 +08:00
gaoxin bf4fbffe3d 【幸运探宝】修复奖池奖励显示错误 2020-12-26 18:33:04 +08:00
gaoxin f4b682db17 【资源】增加活动及系统需求图片资源 meta文件提交 2020-12-26 18:32:56 +08:00
liuyipeng 56ffc108b1 增加活动及系统需求图片资源 2020-12-26 18:32:14 +08:00
liuyipeng 715670308f 替换白骨精法宝图片 2020-12-26 18:30:54 +08:00
gaoxin 104505622a Merge branch 'gx/xma_local' into master_xma_local 2020-12-26 18:28:21 +08:00
zhangqiang a90dc5ff6b 【抽卡修改】提交 2020-12-26 17:20:38 +08:00
zhangqiang 26778992fa 【资源导入】 buff图标 和 状态字混乱 2020-12-26 11:57:58 +08:00
jiaoyangna d5d30fd6a8 刷新礼包修改 2020-12-26 11:47:16 +08:00
gaoxin aaf7a4f470 【引导】修复会部分功能重复开启会重复引导的问题 2020-12-25 15:34:38 +08:00
ZhangBiao 6945cbcacf 【森罗幻境】红点修改 2020-12-25 12:05:23 +08:00
ZhangBiao 6befa383c8 【降妖夺宝】界面调整 2020-12-24 18:36:38 +08:00
ZhangBiao 49dc0f172c 【无尽副本】重置事件点无法触碰修复
(cherry picked from commit e5b00c5cd9)
2020-12-24 18:01:11 +08:00
ZhangBiao 3516c10cc6 [森罗环境] 扎小怪计入击杀奖励 2020-12-24 17:16:33 +08:00
ZhangBiao 601eefb120 【降妖夺宝】点击抽卡时可以切换其他界面修复 2020-12-24 16:57:39 +08:00
zhangqiang 95c753a70e 【大闹天宫】上阵纯治疗神将,战斗失败后选择保留状态,报错 2020-12-24 16:52:46 +08:00
jiaoyangna cb5e374ebf 冲突提交 2020-12-24 16:49:53 +08:00
jiaoyangna a6a596746d Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-24 16:46:48 +08:00
jiaoyangna 6e96218bc3 逍遥 红点 2020-12-24 16:45:36 +08:00
jiaoyangna 4fea51e35f 逍遥红点 2020-12-24 16:45:13 +08:00
ZhangBiao c5022043fd 【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f)
2020-12-24 16:43:37 +08:00
ZhangBiao 28a3341fa1 【增加跳转】化灵符跳转零售特惠
(cherry picked from commit bc582d93e0)
2020-12-24 16:43:22 +08:00
ZhangBiao 4faa39ab2a 【道具使用跳转】使用跳转修改,活动道具要大于10000
(cherry picked from commit b2f8d14470)
2020-12-24 16:42:24 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna e95ae4724b 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:32 +08:00
jiaoyangna 29c5c08ea4 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:22 +08:00
zhangqiang 26d714e1c5 【优化】等级成长礼 2020-12-24 16:06:10 +08:00
ZhangBiao c57944e742 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-24 15:13:15 +08:00