Commit Graph

2791 Commits (9e7d48da21dff04557c0aa0ff52a82e43203bd26)

Author SHA1 Message Date
wangzhenxing e3e609c87e [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-24 11:23:31 +09:00
ZhangBiao 3bcc15d21d 【主题活动】降龙伏虎banner替换 2020-11-24 11:08:03 +08:00
JieLing 37422c3eb3 Merge branch 'master_xma_local' into master_xma_test 2020-11-23 21:49:58 +08:00
gaoxin 34ae0ed497 【战斗】无用log删除,技能数量限制初始化数据位置错误 2020-11-23 21:36:34 +08:00
JieLing 8e787f65c0 Merge branch 'master_xma_local' into master_xma_test 2020-11-23 20:56:09 +08:00
gaoxin d2d88d6d15 v1.0.7
1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题
2020-11-23 10:12:02 +08:00
gaoxin 5e4f1a5165 v1.0.7
1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题
2020-11-23 10:08:36 +08:00
ZhangBiao d938acc273 【竞技场】增加输赢奖励掉落 2020-11-23 09:58:22 +08:00
JieLing 0dd925c924 Merge branch 'master_xma_test' into master_online_hw 2020-11-20 19:47:23 +08:00
gaoxin 626980a1bc 【战斗】添加超时检测 2020-11-20 18:50:03 +08:00
gaoxin 74f46826a9 【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限
2020-11-20 18:49:53 +08:00
zhangqiang ddb5f1b299 【日常任务】 11.25 bug 宝箱位置修改 2020-11-20 17:36:42 +08:00
gaoxin 85a608d21a Revert "Revert "【战斗】v1.0.5""
This reverts commit 941cb86845.
2020-11-20 15:15:45 +08:00
gaoxin 941cb86845 Revert "【战斗】v1.0.5"
This reverts commit 0548b16015.
2020-11-20 15:07:27 +08:00
gaoxin 2331c8d013 【战斗】添加超时检测 2020-11-20 15:07:08 +08:00
gaoxin 0548b16015 【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限
2020-11-20 14:27:23 +08:00
zhangqiang 899903104f 【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
2020-11-19 19:30:46 +08:00
jiaoyangna 1303495f3d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 18:31:19 +08:00
jiaoyangna ffdb9c20eb 图片提交 2020-11-19 18:31:11 +08:00
ZhangBiao 532e766de5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 17:37:28 +08:00
ZhangBiao d789b9e98e 【编队优化】轩辕宝镜一键特殊处理 2020-11-19 17:37:13 +08:00
ZhangBiao c5c4efef63 Merge branch '0功能/增加一键上阵' into master_xma_local 2020-12-03 05:30:39 +08:00
jiaoyangna 8198b24720 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 17:22:33 +08:00
jiaoyangna 1299b62feb 灵兽宝阁位置名称修改 2020-11-19 17:22:10 +08:00
gaoxin 37631ebc67 【战斗】技能特效播放层级修改 2020-11-19 15:44:23 +08:00
jiaoyangna 8ceb1b4a51 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 15:28:27 +08:00
ZhangBiao 68cf2e356a 【竞技场】在线刷新没红点修复 2020-12-03 05:10:15 +08:00
ZhangBiao 3b4826c235 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-03 04:56:01 +08:00
ZhangBiao 2fbe5aa120 【大闹天宫】重置前五分钟踢出玩家 2020-12-03 04:55:51 +08:00
jiaoyangna 20564aee0f 【日常副本】解锁所有副本后,没有自动滚动到最后一个副本 2020-11-19 15:28:21 +08:00
jiaoyangna 0914dd6dc8 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 15:09:24 +08:00
jiaoyangna 2c72089def 【逍遥游】掷骰子播放时需要加限制,不能点击关闭,或者直接显示结果 2020-11-19 15:09:00 +08:00
gaoxin 59937a1132 【战斗】修改自动下落特效的时间为表配置 2020-11-19 14:53:45 +08:00
jiaoyangna d8f31bab35 主题活动修改提交 2020-11-19 14:26:57 +08:00
jiaoyangna 2a9b4cb5ab 动态立绘修改 2020-11-19 11:49:34 +08:00
jiaoyangna e09872eb7f 限时招募修改提交 2020-11-19 10:35:21 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
JieLing 30d5959d7f Merge branch 'master_xma_test' into master_online_hw 2020-11-18 11:32:59 +08:00
ZhangBiao 08657b4ffd 【编队优化】车迟 十绝 增加一键 2020-11-18 10:48:35 +08:00
JieLing 33775341d2 Merge branch 'master_xma_local' into master_xma_test 2020-11-17 21:44:17 +08:00
gaoxin ca1a509cb8 【战斗】修复资源回收顺序错误导致跳过战斗时黑屏的问题 2020-11-17 21:40:36 +08:00
JieLing 4ad9fb0fc5 Merge branch 'master_xma_local' into master_xma_test 2020-11-17 20:51:16 +08:00
gaoxin 77934cd274 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-17 20:39:38 +08:00
gaoxin 4eb60838b4 【战斗】修复被动112参数错误 2020-11-17 20:39:28 +08:00
JieLing 0d8feb7b5a Merge branch 'master_xma_local' into master_xma_test 2020-11-17 20:13:07 +08:00
zhangqiang a109678fb4 【逍遥游】 天赋图标显示赋值 2020-11-17 20:12:36 +08:00
ZhangBiao 646e3e8061 【编队优化】轩辕宝镜增加一键 2020-11-17 20:01:13 +08:00
ZhangBiao a68a068746 【编队优化】巅峰赛增加一键 2020-11-17 19:59:18 +08:00
ZhangBiao 462484db66 【编队优化】竞技场防守编队增加一键 2020-11-17 19:57:17 +08:00
ZhangBiao c8aa6b5971 【编队优化】公会副本增加一键 2020-11-17 19:54:02 +08:00
ZhangBiao 188dc707a9 【编队优化】大闹天宫增加一键 2020-11-17 19:42:08 +08:00
JieLing a70496fe67 Merge branch 'master_xma_local' into master_xma_test 2020-11-17 19:40:55 +08:00
wangzhenxing 84a28f8a28 [战斗] 196 被动 添加类型判断 2020-11-17 18:44:31 +09:00
gaoxin f174c68db7 【资源】东华帝君普通攻击特效添加 2020-11-17 18:32:38 +08:00
gaoxin be0195af18 【战斗】战斗表现添加射线类型特凶啊 2020-11-17 18:31:11 +08:00
gaoxin 05076eb743 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-17 18:30:45 +08:00
gaoxin d3a276cdca 【测试战斗】皮肤加入本地数据保存 2020-11-17 18:30:37 +08:00
ZhangBiao cf34f4d377 resourcePath上传 2020-11-17 17:41:42 +08:00
ZhangBiao 75c04b2c43 【编队优化】心魔试炼增加一键上阵 2020-11-17 17:41:06 +08:00
ZhangBiao 233ff1b361 【编队优化】无尽副本增加一键 2020-11-17 17:12:52 +08:00
wangzhenxing 3308ce4479 [战斗] 被动处理 舍身济世200 ,及伏虎罗汉特性被动添加额外技能屏蔽 2020-11-17 17:35:25 +09:00
zhangqiang 8980c6be4a 【英雄战力】 乘减算修改 2020-11-17 15:33:45 +08:00
ZhangBiao bdf45413bc 【森罗幻境】敌将详情 敌将位置调整
(cherry picked from commit 2dd30f9ca3)
2020-11-17 14:56:42 +08:00
gaoxin 6a515c2374 【战斗】优化战斗资源回收机制,修复跳过战斗时灵兽报错 2020-11-17 14:05:46 +08:00
gaoxin 8f3325ad5f 【战斗】修复灵兽释放技能时跳过战斗,下次战斗会显示上次战斗的casting的问题 2020-11-17 14:04:23 +08:00
ZhangBiao 13496de590 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-17 11:54:04 +08:00
ZhangBiao 04f8571692 【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复 2020-11-17 11:53:49 +08:00
zhangqiang cd332c80d0 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-17 10:58:09 +08:00
zhangqiang cae41baf71 【图鉴】 升星点亮图鉴 调整献祭坛预设 2020-11-17 10:57:16 +08:00
ZhangBiao 69d818118c 【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复 2020-11-17 10:56:21 +08:00
ZhangBiao d433d2a690 【公告】打开公告前获取公告信息 2020-11-17 10:44:55 +08:00
wangzhenxing 383f20aa32 【战斗】 被动266去除无用log 2020-11-17 10:02:29 +09:00
zhangqiang 2955a067fa 【觉醒】 图鉴未开觉醒功能点进去报错修复提交 2020-11-16 21:00:23 +08:00
zhangqiang 26e7460699 【孙悟空】皮肤攻击音效 2020-11-16 19:55:06 +08:00
zhangqiang aed62d755a Merge branch 'master_xma_local' into master_xma_test 2020-11-16 18:45:42 +08:00
gaoxin 58c538e41b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-16 18:34:24 +08:00
gaoxin 46750846f8 【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。 2020-11-16 18:34:12 +08:00
zhangqiang c73c2404f1 【东华帝君】 音效替换 技能预设 修改 2020-11-16 18:07:29 +08:00
ZhangBiao f384e25ad6 【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19)
2020-11-16 17:51:25 +08:00
zhangqiang 8531323faa 推送礼包剔除过期的礼包 2020-11-16 17:30:38 +08:00
gaoxin f517b5e955 【资源】东华帝君技能特效资源显示错误修改 2020-11-16 16:45:37 +08:00
ZhangBiao 6f1b687e9e Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-16 16:20:25 +08:00
ZhangBiao 9601af33e7 【神将详情】排行榜查看他人装备显示出售按钮修复 2020-11-16 16:20:15 +08:00
zhangqiang e8f15add7f 【东华帝君】 音效提交 2020-11-16 15:47:47 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
zhangqiang 2000240f64 【觉醒】 提示文字 2020-11-16 14:57:46 +08:00
gaoxin 5301a91738 【战斗】修复被动270普通攻击也能触发的问题 2020-11-16 14:04:58 +08:00
liujiaqi cec062c993 灵兽山 觉醒图标 2020-11-16 13:55:15 +08:00
gaoxin 8edf7dd781 【战斗】被动添加
270:技能直接伤害[a]%转化为生命治疗自己
2020-11-16 11:50:38 +08:00
zhangqiang 3348d60c65 【觉醒】 图鉴属性取整 2020-11-16 10:27:41 +08:00
wangzhenxing 1287453f10 【战斗】 额外技能添加5技能 2020-11-14 20:20:06 +09:00
wangzhenxing 406cf2e1f7 【战斗】 被动265效果修改 2020-11-14 19:52:47 +09:00
wangzhenxing b1549b470b [战斗] 被动268修改 2020-11-14 19:20:55 +09:00
gaoxin af915fb480 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-14 17:37:42 +08:00
gaoxin ede48e5063 【测试战斗】添加总伤害数值打印 2020-11-14 17:37:24 +08:00
gaoxin e6ac0a8845 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-14 17:20:38 +08:00
gaoxin b7269ccf89 【测试战斗】修复测试战斗按钮层级过高遮挡伤害数字的问题 2020-11-14 17:20:33 +08:00
wangzhenxing d64ed5e92d [战斗] 268 被动效果修改 2020-11-14 17:32:09 +09:00
wangzhenxing 5e0384b847 [战斗]免疫盾修改提交 2020-11-14 17:13:37 +09:00
wangzhenxing 6821324fb1 [战斗]减伤盾效果修改提交 2020-11-14 15:43:40 +09:00
wangzhenxing deb8603b98 [战斗]减伤盾效果修改 2020-11-14 15:11:32 +09:00
gaoxin 4fd822a333 【战斗】删除战斗艺术字配置,改为即时判断 2020-11-13 19:44:55 +08:00
gaoxin 142d8dee0f Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 19:38:10 +08:00
gaoxin 56afe786be 【战斗】战斗关闭时不再回收灵兽立绘资源,直接销毁,避免在UI上立绘不停播放攻击动作的问题 2020-11-13 19:38:04 +08:00
gaoxin 1face65dbb 【战斗】免疫效果自定义类型添加,免疫效果文字显示恢复 2020-11-13 19:34:41 +08:00
ZhangBiao 9424037d9e Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 18:58:47 +08:00
ZhangBiao 4a0a702fec 【灵兽宝阁】凤凰无限飞bug缓解 2020-11-13 18:58:35 +08:00
ZhangBiao 6c8a011528 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 18:01:05 +08:00
ZhangBiao 46eeceb79d 【主题活动】bug修复 2020-11-13 18:00:56 +08:00
wangzhenxing 70e019f837 gm 测试战斗添加设置皮肤 2020-11-13 17:48:11 +08:00
gaoxin bd083a67a3 【测试战斗】同步界面修改 2020-11-13 17:47:54 +08:00
wangzhenxing fee4501004 [战斗] 266被动修改 2020-11-13 18:42:27 +09:00
wangzhenxing d6d5f5cdfa 257 561 267 技能修改 2020-11-13 17:38:35 +08:00
gaoxin 1568e2f288 【测试战斗】修复添加属性被动时报错 2020-11-13 17:27:15 +08:00
wangzhenxing 8a87f0a8a2 【战斗】91 被动修改 2020-11-13 18:23:56 +09:00
ZhangBiao f091914b4f Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 17:07:44 +08:00
ZhangBiao ee04d93830 【灵兽宝阁】增加结束时间 2020-11-13 17:07:32 +08:00
jiaoyangna 97cdd13df9 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 16:35:29 +08:00
jiaoyangna 384750e0e9 [限时折扣] 修改 2020-11-13 16:35:25 +08:00
ZhangBiao 933f2d4768 【灵兽宝阁】增加假战斗 2020-11-13 16:25:42 +08:00
ZhangBiao e4f48eb668 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 16:10:34 +08:00
ZhangBiao d739896793 【灵兽宝阁】倒计时显示刷新问题修复 2020-11-13 16:10:26 +08:00
jiaoyangna f1dfa111f1 灵兽特惠 价格修改 2020-11-13 15:56:21 +08:00
jiaoyangna d4f79a0abb 限时招募提交 2020-11-13 15:50:42 +08:00
jiaoyangna 29312b211f Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-13 15:47:11 +08:00
jiaoyangna 44a1d94860 神医天降修改 2020-11-13 15:47:04 +08:00
JieLing 2cb5ee9176 【放生】 删除之前背景 2020-11-13 15:23:25 +08:00
ZhangBiao 8a5d51e2a3 【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
2020-11-13 12:12:44 +08:00
zhangqiang 21988be4e2 【觉醒】 觉醒成功替换资源 2020-11-13 11:18:46 +08:00
zhangqiang 2f5b2c2d4f 【觉醒】 觉醒成功界面显示bug 2020-11-13 10:11:41 +08:00
zhangqiang e9d984b329 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-12 19:34:29 +08:00
ZhangBiao debaf0210c 【易经宝库】加号位置调整 2020-11-12 18:32:53 +08:00
ZhangBiao c5117b9fc1 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-12 18:18:33 +08:00
ZhangBiao 2563c6bdd6 【灵兽宝阁】货币显示修复 2020-11-12 18:17:56 +08:00
zhangqiang 8b15fe28eb 【献祭坛】11.5 资源提换 2020-11-12 18:12:02 +08:00
ZhangBiao 5f596eef04 【灵兽宝阁】bug修复,增加等级限制 2020-11-12 17:53:49 +08:00
ZhangBiao 32afdddb4f 【灵兽宝阁】合并到local 预设提交 2020-11-12 17:24:14 +08:00
ZhangBiao 2c143deea9 Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
2020-11-12 17:21:42 +08:00
ZhangBiao a5c36cf58a 【灵兽宝阁】未开启更换灵兽版本 2020-11-12 17:11:18 +08:00
zhangqiang b1eba4887a 【灵兽】灵兽上阵主界面名字颜色变化 2020-11-12 17:05:50 +08:00
zhangqiang b1128dd88e 【献祭坛】适配调试 2020-11-12 17:05:34 +08:00
zhangqiang 8a73056eac 【献祭坛】预设微调 2020-11-12 17:04:06 +08:00
jiaoyangna 7fc14ec822 [主题活动] 修改提交 2020-11-12 16:07:19 +08:00
gaoxin da372f48df Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-12 15:13:38 +08:00
gaoxin 9919674980 【战斗】假战斗加入对MonsterGroup配置的灵兽数据的处理 2020-11-12 15:12:59 +08:00
jiaoyangna 358ecb8166 [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
zhangqiang 492d969a4f 【觉醒】bug 修改 公会成员灵兽显示错误 2020-11-12 14:38:40 +08:00
zhangqiang cbf9f5cade 【觉醒】问题修改 2020-11-12 13:55:46 +08:00
jiaoyangna 45c088e6b7 [灵兽特惠] 提交 2020-11-12 11:37:12 +08:00
jiaoyangna 7aa7244d06 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-12 11:31:49 +08:00
jiaoyangna a6483b3181 [灵兽特惠] 提交 2020-11-12 11:31:33 +08:00
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
zhangqiang adf9c87ac2 【灵兽提交】bug修改 2020-11-11 20:21:13 +08:00
gaoxin 0887de50d5 【特效】孙悟空普通攻击受击特效材质丢失修复 2020-11-11 20:13:01 +08:00
gaoxin 740cfa0e20 【特效】孙悟空技能特效材质丢失修复 2020-11-11 20:00:12 +08:00
gaoxin 74b6294c2a 【特效】孙悟空皮肤技能特效修改 2020-11-11 19:39:55 +08:00
zhangqiang 36f8d28974 【孙悟空技能】普工特效添加 2020-11-11 18:33:06 +08:00
gaoxin 4f635cf42d 【战斗】修复特效层级显示错误 2020-11-11 18:10:06 +08:00
ZhangBiao 1ba753044f 【灵兽宝阁】抽卡逻辑完善了 2020-11-11 16:53:04 +08:00
gaoxin a65c528256 【GM】战斗种子数据类型错误 2020-11-11 16:10:21 +08:00
gaoxin a3d6f49e15 【gm】修复战斗数据gm报错的问题 2020-11-11 16:04:01 +08:00
zhangqiang 629eb98f1b Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-11 11:37:26 +08:00
zhangqiang 90e9e84c64 【觉醒】十一星的星级展示修改 2020-11-11 11:12:14 +08:00
JieLing c9b22fb912 Merge branch 'master_xma_test' into master_online_hw 2020-11-11 10:04:31 +08:00
zhangqiang 053de93608 【神将觉醒】 提交 2020-11-10 18:35:37 +08:00
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +08:00
ZhangBiao ffd6ba5168 【易经宝库】漏题 2020-11-10 16:56:24 +08:00
ZhangBiao ebe03eff48 【易经宝库】漏题 2020-11-10 16:43:24 +08:00
ZhangBiao e9ad50ac90 【易经宝库】抽取灵兽报错修复 2020-11-10 16:28:47 +08:00
ZhangBiao 1ece0c1a77 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 16:25:56 +08:00
ZhangBiao ec9458aac7 【易经宝库】抽取灵兽报错修复 2020-11-10 16:25:42 +08:00
JieLing 87a0001023 Merge branch 'master_xma_local' into master_xma_test 2020-11-10 15:46:45 +08:00
gaoxin b8c6bf7a62 【白泽】音效修改 2020-11-10 15:46:26 +08:00
JieLing 44260c0321 Merge branch 'master_xma_local' into master_xma_test 2020-11-10 15:29:03 +08:00
gongjiawei 0d56c34220 白泽灵兽语音修改 2020-11-10 15:28:25 +08:00
jiaoyangna 0d26c4d0ab Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 15:26:42 +08:00
jiaoyangna 2e125eaa47 新手引导修改 2020-11-10 15:26:33 +08:00
JieLing 66aa56da26 Merge branch 'master_xma_local' into master_xma_test 2020-11-10 14:56:53 +08:00
liujiaqi 21248cf571 定卦神锄资源 2020-11-10 14:56:03 +08:00
JieLing 915d45b4b4 Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
2020-11-10 14:53:25 +08:00
JieLing 3e24ba9bcf Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
2020-11-10 14:47:18 +08:00
JieLing 1967b0a5da Merge branch 'master_xma_local' into master_xma_test 2020-11-10 12:12:38 +08:00
ZhangBiao d493246f2f 【灵兽抽卡】 开坑 2020-11-10 11:34:19 +08:00
zhangqiang 53e538ea0d 【音效】 替换 2020-11-10 11:32:30 +08:00
zhangqiang 7f5287baa2 【音效】 替换 2020-11-10 11:32:06 +08:00
jiaoyangna 05911e105c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 11:04:28 +08:00
jiaoyangna 89a90ae5c5 神医天降修改 2020-11-10 11:04:19 +08:00
gaoxin 8ef89acdde 【bug】修复部分界面文字显示错误的问题 2020-11-10 10:37:53 +08:00
gaoxin a12003191c 【音效】孙悟空技能音效添加 2020-11-10 10:26:01 +08:00
jiaoyangna 22d3761937 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 10:24:07 +08:00
jiaoyangna 3f7ae45011 皮肤修改 2020-11-10 10:23:55 +08:00
zhangqiang 6278bb0cc8 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:23 +08:00
zhangqiang 92d85c4200 【神将升级】 升星未卡住 and 神将合成报错 2020-11-10 10:16:01 +08:00
zhangqiang 6a1693939c 【觉醒】 觉醒添加图鉴 2020-11-09 20:05:51 +08:00
liujiaqi 495ea6e24e 定卦神锄新图标上传
(cherry picked from commit 89c73695e2)
2020-11-09 18:10:50 +08:00
zhangqiang 85b21b27f0 Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-09 18:04:54 +08:00
JieLing 77e0eb53f3 Merge branch 'master_xma_local' into master_xma_test 2020-11-09 16:32:51 +08:00
zhangqiang c4a466637f 【神将升级】 太快优化 2020-11-09 16:29:06 +08:00
ZhangBiao 46b8e52524 【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
2020-11-09 16:02:34 +08:00
wangzhenxing 4fa66650f0 [皮肤]伤害统计界面添加皮肤显示 2020-11-09 15:54:36 +08:00
ZhangBiao dca4f2511a Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-09 15:29:42 +08:00
ZhangBiao e6eb5d7673 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:28:24 +08:00
zhangqiang d6ab502c45 【逍遥游】 通关后返回问题修复 2020-11-09 15:24:38 +08:00
DESKTOP-98AVA47\Administrator 4be2045801 添加容错 --by 焦杨钠 2020-11-13 07:12:51 +08:00
zhangqiang f94c84f1cd 【觉醒】 增加觉醒页签 2020-11-09 15:04:48 +08:00
ZhangBiao c4745e8c7c 【易经宝库】最终奖励选择bug修复 2020-11-09 13:47:37 +08:00
zhangqiang de677bee2f 【觉醒】增加脚本 2020-11-09 11:13:53 +08:00
ZhangBiao d0e2133cbc Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-09 11:09:50 +08:00
ZhangBiao 9ca403ebff 【易经宝库】第三层抽取完成后bug修复 2020-11-09 11:09:42 +08:00
jiaoyangna 5d24bbb8a8 森罗环境英雄皮肤提交 2020-11-09 10:32:17 +08:00
zhangqiang 192d325508 【逍遥游】新增地图 xbhz 2020-11-09 10:28:21 +08:00
zhangqiang 5c73587f89 Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-11-09 10:16:16 +08:00
ZhangBiao de32379f8e 【竞技场】竞技场增加输赢奖励 2020-11-07 18:52:04 +08:00
jiaoyangna f26214ac58 清楚红点提交 2020-11-07 17:23:10 +08:00
jiaoyangna 6cb1610d31 神医天降修改 2020-11-07 16:56:53 +08:00
jiaoyangna bc097708e9 不满足进阶条件,显示红点 2020-11-07 16:41:25 +08:00
jiaoyangna e2b29242c7 有孙悟空皮肤,东华帝君皮肤点不到获取途径 2020-11-07 15:52:20 +08:00
jiaoyangna 4cf115e655 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-07 15:45:02 +08:00
jiaoyangna f2f288c682 进阶页签属性图标显示错误 2020-11-07 15:44:53 +08:00
gaoxin c3916271aa Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-07 15:43:07 +08:00
gaoxin bd6e61d92a 【语言工具】添加代码语言还原工具 2020-11-07 15:42:11 +08:00
jiaoyangna e517e2a175 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-07 15:39:10 +08:00
jiaoyangna 04fac7f216 魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗 2020-11-07 15:39:01 +08:00
jiaoyangna 77047346dd 神医天降价格修改 2020-11-14 14:43:48 +08:00
jiaoyangna ef4c4fccba power change update 2020-11-14 14:31:38 +08:00
jiaoyangna c639ea1c6b delete log 2020-11-14 14:16:41 +08:00
jiaoyangna 069d42baca 皮肤到期刷新 2020-11-14 14:16:10 +08:00
zhangqiang b113f94a6d 【幻境达人】 排行奖励显示问题 2020-11-07 15:20:44 +08:00
zhangqiang 68979d577e 【神将觉醒】 觉醒成功界面 2020-11-07 15:15:49 +08:00
jiaoyangna 8f1c52c5e3 属性加成修改 2020-11-06 21:23:24 +08:00
jiaoyangna d4687b2b74 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 21:05:43 +08:00
jiaoyangna 3a481d6d5f [皮肤]修改提交 2020-11-06 21:05:39 +08:00
gaoxin 05fb2f5e7f 【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误 2020-11-06 20:45:44 +08:00
jiaoyangna 93d9212f85 皮肤加成属性修改 2020-11-06 20:39:00 +08:00
jiaoyangna 0a772f466b 皮肤提交 2020-11-06 20:36:38 +08:00
jiaoyangna 98ff210ae2 皮肤解锁提示 2020-11-06 20:21:20 +08:00
jiaoyangna bd92d5339d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 19:54:49 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
zhangqiang 34d67b93f6 【巅峰赛】 赛程 三局第一局结果有问题 修改 2020-11-06 18:32:48 +08:00
wangzhenxing 5128a02eba [皮肤] 胜利最佳输出界面显示皮肤 2020-11-06 17:58:28 +08:00
JieLing 7913bda03f 【资源】重名资源修改 2020-11-06 17:56:55 +08:00
gaoxin 5b0ac7cd0b 【音效】灵兽音效资源同步 2020-11-06 17:45:18 +08:00
jiaoyangna a6904526d3 协议提交 2020-11-06 17:26:58 +08:00
jiaoyangna 41f62176f2 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 17:19:34 +08:00
jiaoyangna fe9b73aa0b 协议提交 2020-11-06 17:19:24 +08:00
zhangqiang 98d4b3b024 【达人奖励排行】 显示问题修复 2020-11-06 17:18:17 +08:00
wangzhenxing 9eb5161c7e 【皮肤】东华帝君 ,孙悟空技能特效修改提交 2020-11-06 17:02:42 +08:00
zhangqiang aa2db3e25e 【大闹天宫】 节点boss 站位错误 修复 2020-11-06 16:51:44 +08:00
zhangqiang 7121be9c04 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:49:18 +08:00
zhangqiang ac64980843 【易经宝库】 特效层级调整 2020-11-06 16:49:12 +08:00
jiaoyangna 6a95033b8b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:39:45 +08:00
jiaoyangna cd99dd509b 立绘加载错误修改 2020-11-06 16:37:52 +08:00
zhangqiang 1a4349d93b 【觉醒】 界面提交 2020-11-06 16:23:02 +08:00
ZhangBiao fab6570a26 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:17:21 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
jiaoyangna ccdba2b2df Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:11:47 +08:00
jiaoyangna 5251bc4059 [神将界面修改] 2020-11-06 16:11:37 +08:00
ZhangBiao 36759d8044 【易经宝库】增加稿子动效 2020-11-06 16:06:08 +08:00
zhangqiang 44350558c5 【巅峰赛】 头像特效设置层级有问题 线上 2020-11-06 15:49:08 +08:00
yuanshuai 327584750a 【逍遥游】预设修改提交 2020-11-06 15:48:59 +08:00
gaoxin 34617d419d 【资源】新增英雄icon资源位置移动 2020-11-06 15:48:21 +08:00
ZhangBiao b98490f233 【易经宝库】差一个稿子的动效 2020-11-06 15:11:19 +08:00
gaoxin f1ca8398d3 【战斗】假战斗随机种子读表 2020-11-06 15:04:11 +08:00
wangzhenxing 4a6d8b393f 技能提交去除log 2020-11-06 15:04:05 +08:00
wangzhenxing ab4f97fa0a 皮肤修改提交 2020-11-06 15:03:56 +08:00
gaoxin c3422f1c8d 【资源】资源名重复修改 2020-11-06 15:02:46 +08:00
gaoxin 013ff84d34 【资源】孙悟空,东华帝君皮肤技能特效资源添加 2020-11-06 15:02:36 +08:00
jiaoyangna 767541c1a6 编队界面皮肤位置修改 2020-11-06 14:30:44 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
wangzhenxing 04fce03cd8 battlemanager修改提交 2020-11-06 13:32:04 +08:00
wangzhenxing 1123b38709 协议提交 2020-11-06 13:31:45 +08:00
wangzhenxing 3e917799bb 解决冲突提交 2020-11-06 13:31:30 +08:00
jiaoyangna b7b4fb9d5d meta 提交 2020-11-06 13:27:52 +08:00
gaoxin 927f2280e8 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 11:41:49 +08:00
gaoxin 857f97f2ab 【战斗】假战斗数据组建错误修复 2020-11-06 11:41:40 +08:00
liujiaqi b637d17a9b 孙悟空东华帝君皮肤资源 2020-11-06 11:21:29 +08:00
gaoxin d668e4ffc3 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
2020-11-06 11:19:46 +08:00
gaoxin 1ac0e6fc53 【战斗】添加新的假战斗功能 2020-11-06 11:18:09 +08:00
zhangqiang 3ae2d1048e 【GM】gm工具优化 2020-11-06 11:16:24 +08:00
jiaoyangna a109c2f93f 【皮肤】 战斗提交 2020-11-06 10:51:41 +08:00
jiaoyangna e8be02de87 [移山倒海] 提交 2020-11-06 10:49:08 +08:00
jiaoyangna beec28a8b8 Merge branch 'master_xma_local' into 0功能/皮肤 2020-11-06 10:34:22 +08:00
zhangqiang ea24696722 【逍遥游】新增地图 xbhz 2020-11-06 10:15:06 +08:00
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
jiaoyangna ccf02fb171 【皮肤】添加倒计时 2020-11-05 18:26:38 +08:00
jiaoyangna 5026bdd0c3 【皮肤】提交 2020-11-05 16:02:49 +08:00
jiaoyangna 3bc2b74ce5 皮肤分解提交 2020-11-05 14:18:32 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
jiaoyangna 14812dab65 [皮肤]倒计时修改 2020-11-04 18:29:49 +08:00
jiaoyangna d7b9563e35 【皮肤】神将合成修改 2020-11-04 16:56:24 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
jiaoyangna 6930561350 [皮肤]神将界面修改提交 2020-11-04 14:24:35 +08:00
jiaoyangna 644d984c0a 登陆报错修改 2020-11-04 14:24:08 +08:00
jiaoyangna b18b4cfd58 【皮肤】协议提交 2020-11-04 13:52:10 +08:00
jiaoyangna 79a5bcb74c 皮肤资源提交 2020-11-04 12:02:57 +08:00
jiaoyangna 4cb31d8f38 [皮肤]提交 2020-11-04 10:59:04 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
ZhangBiao 809c6daa01 【易经宝库】数据调试 2020-11-04 10:53:02 +08:00
JieLing f88884aa12 Merge branch 'master_xma_test' into master_online_hw 2020-11-04 10:49:28 +08:00
jiaoyangna 1fcdf5b2a6 【皮肤】添加皮肤属性加成 2020-11-03 19:37:05 +08:00
JieLing 04e3f5adca Merge branch 'master_xma_local' into master_xma_test 2020-11-03 19:24:35 +08:00
zhangqiang 3ae4ed1d41 【英雄合成】 添加提示 2020-11-03 19:19:13 +08:00
ZhangBiao ab757a2543 【特权商城】最后一分钟报错修改 2020-11-03 19:10:32 +08:00
ZhangBiao d1c0d3e41f 【易经宝库】资源路径提交 2020-11-03 19:02:31 +08:00
ZhangBiao 5d40b102dc 【易经宝库】添加type 拼数据 2020-11-03 19:01:47 +08:00
gaoxin 5a861ade95 【商店】前端从表里判断商品的显示状态添加 2020-11-03 18:01:31 +08:00
ZhangBiao e7b132952c 【特权商城】报错修改 2020-11-03 17:53:14 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
gaoxin e1625e6bed 【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题 2020-11-03 17:17:46 +08:00
ZhangBiao c3537b3486 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-03 17:05:15 +08:00
ZhangBiao 81e26c3128 【特权商城】增加 灵兽特权礼包 文字描述 2020-11-03 17:04:45 +08:00
zhangqiang 0918acadd4 【灵兽系统】 羁绊预设微调 2020-11-03 16:10:45 +08:00
zhangqiang 0a8498b95e 【灵兽系统】 召唤界面按钮文字位置 2020-11-03 16:08:10 +08:00
gaoxin 49576b20ad 【战斗】修复战斗内名称不显示和我方元素显示错误的问题 2020-11-03 15:34:22 +08:00
gaoxin 23717d6fc9 【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题 2020-11-03 15:34:12 +08:00
jiaoyangna d040e4dded 神将界面结构修改 2020-11-03 15:17:48 +08:00
zhangqiang 5d6db87650 【灵兽系统】召唤界面 按钮位置有问题 2020-11-03 14:51:58 +08:00
wangzhenxing 18401c0663 合并PokemonSummonOneResultPanel.prefab 2020-11-03 14:19:09 +09:00
zhangqiang f8b4befd3c 【灵兽系统】 按钮位置调整 2020-11-03 14:17:33 +08:00
gaoxin 9380675560 【资源】新增灵兽特权icon图标 2020-11-03 14:16:36 +08:00
wangzhenxing 5f518babce [灵兽]灵兽奖励预览排序 抽卡再来一次字体位置修改 2020-11-03 14:18:02 +09:00
ZhangBiao f79499faea 【易经宝库】开始获取活动数据 2020-11-03 09:58:37 +08:00
JieLing 8c228f8de6 Merge branch 'master_xma_local' into master_xma_test 2020-11-03 01:01:13 +08:00
gaoxin d00d3e803c 【商店】删除商店的动画显示 2020-11-03 01:00:58 +08:00
gaoxin ba42282cc3 【战斗】修改会自己动的指定目标特效的显示时长 2020-11-03 01:00:53 +08:00
JieLing 162ab88e56 Merge branch 'master_xma_local' into master_xma_test 2020-11-02 23:27:09 +08:00
gaoxin 108e5b2568 【战斗】前摇特效添加指定位置释放的类型 2020-11-02 23:24:43 +08:00
JieLing a913a2de4e Merge branch 'master_xma_local' into master_xma_test 2020-11-02 23:21:00 +08:00
zhangqiang 342a1bd373 【灵兽系统】 放生选择数量修改 2020-11-02 23:09:58 +08:00
gaoxin 34b4b5db51 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:55:24 +08:00
JieLing 4ef41f8aa1 Merge branch 'master_xma_local' into master_xma_test 2020-11-02 22:26:55 +08:00
gaoxin d10134216c 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2 2020-11-02 22:13:34 +08:00
gaoxin 9dc9ca2b2a 【战斗】修复战斗界面资源回收时报错 2020-11-02 22:13:30 +08:00
JieLing 9aba7f9efa Merge branch 'master_xma_local' into master_xma_test 2020-11-02 22:12:36 +08:00
liujiaqi 355d843b30 灵兽相关道具资源图标正式 2020-11-02 22:05:10 +08:00
gaoxin cb10b3ff1d 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。 2020-11-02 21:49:33 +08:00
gaoxin 9779a99414 【战斗】修复灵兽释放技能顺序错误 2020-11-02 21:24:00 +08:00
gaoxin 8b9276f6a2 【战斗】修复上一场残留数据会出现在下一场的问题 2020-11-02 21:23:55 +08:00
zhangqiang 8e9b7b49e7 【特权礼包】 购买后到期 报错 尝试修复 2020-11-02 20:51:25 +08:00
wangzhenxing 36b9ffce91 【bug】分解界面等级星级显示修改 2020-11-02 20:13:57 +09:00
wangzhenxing 868eb64ae1 [bug] 分解神将等级显示999 2020-11-02 20:09:24 +09:00
JieLing 04ba352791 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
gaoxin 54f1660bc2 【好友切磋】修复战斗结果显示错误的问题 2020-11-02 19:17:19 +08:00
gaoxin 4cb8bee4ae 【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题 2020-11-02 19:17:14 +08:00
zhangqiang cbe24364ec 【灵兽系统】 调主城的位置 2020-11-02 18:16:28 +08:00
gaoxin 3a542e5c63 【战斗】技能特效添加会自己动的指定目标特效 2020-11-02 18:09:04 +08:00
gaoxin d94d5bc15c 【特效】应龙技能受击特效改三个为一个 2020-11-02 18:08:59 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
zhangqiang e19412791d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-02 17:46:15 +08:00