Commit Graph

3585 Commits (607104b4caa407a91c769eec050ba4ca4ab0e537)

Author SHA1 Message Date
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
jiaoyangna 1fcdf5b2a6 【皮肤】添加皮肤属性加成 2020-11-03 19:37:05 +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
gaoxin d00d3e803c 【商店】删除商店的动画显示 2020-11-03 01:00:58 +08:00
gaoxin ba42282cc3 【战斗】修改会自己动的指定目标特效的显示时长 2020-11-03 01:00:53 +08:00
gaoxin 108e5b2568 【战斗】前摇特效添加指定位置释放的类型 2020-11-02 23:24:43 +08:00
zhangqiang 342a1bd373 【灵兽系统】 放生选择数量修改 2020-11-02 23:09:58 +08:00
gaoxin 34b4b5db51 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:55:24 +08:00
gaoxin d10134216c 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2 2020-11-02 22:13:34 +08:00
gaoxin 9dc9ca2b2a 【战斗】修复战斗界面资源回收时报错 2020-11-02 22:13:30 +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
liujiaqi 7a70acff6c 灵兽相关道具图标资源占坑 2020-11-02 17:46:08 +08:00
zhangqiang 869f54799e 【灵兽系统】 加新手 加升级动画 2020-11-02 17:28:52 +08:00
wangzhenxing 92d5b659a1 [放生灵兽]灵兽放生显示返还货币修改 2020-11-02 17:36:08 +09:00
wangzhenxing 5eaa5a725d [灵兽抽卡]灵兽抽卡显示修改 2020-11-02 17:19:06 +09:00
gaoxin 25f88a2a98 【LOG】删除无用log,添加凤凰技能概率log 2020-11-02 16:53:26 +08:00
gaoxin ad4ebc14a0 【战斗】修复凤凰概率技能无法生效的问题 2020-11-02 16:31:57 +08:00
wangzhenxing 6c388f5d94 【效果】添加119效果 2020-11-02 16:21:06 +09:00
zhangqiang 65b5cff36d 【灵兽系统】 修改bug 2020-11-02 16:17:33 +08:00
gaoxin acaece5483 【战斗】前端添加自动上传结果不一致的战斗数据的功能。 2020-11-02 16:07:43 +08:00
zhangqiang df8f8d6dd0 【灵兽系统】 加引导 和 特权加15日礼包 判断 2020-11-02 15:56:06 +08:00
wangzhenxing ce0e5a8229 【灵兽放生】灵兽放生界面数量超过一屏,选中底部灵兽选中状态错误修改 2020-11-02 15:02:47 +09:00
zhangqiang 3bbaab27be 【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序 2020-11-02 14:36:21 +08:00
gaoxin c90e209fd6 【战斗】修复技能效果修改导致被动技能报错的问题 2020-11-02 14:12:28 +08:00
wangzhenxing 52fbe638f6 [灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数 2020-11-02 13:59:55 +09:00
gaoxin 02a57e692c 【战斗】修复部分被动技能报错 2020-11-02 13:49:53 +08:00
zhangqiang 148b068c79 【达人排行榜】 达人排行榜底部显示问题 2020-11-02 12:54:36 +08:00
gaoxin 9b65cbba0f 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:55:28 +08:00
zhangqiang 4cb30990e1 【灵兽系统】 bug 需同步 2020-11-02 11:52:00 +08:00
zhangqiang c206f6487e 【灵兽系统】 漏合 2020-11-02 10:59:17 +08:00
zhangqiang 8f71eb7672 【灵兽系统】bug 同步到dev 2020-11-02 10:58:48 +08:00
zhangqiang 1cb323a700 【灵兽系统】 预设修改 2020-11-02 10:16:36 +08:00
gaoxin 230788670d 【战斗】主动效果117,118添加 2020-11-02 10:00:32 +08:00
gaoxin 3cdc100777 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
gaoxin 23253f96a2 【社稷大典】名字重复的资源处理 2020-11-01 16:23:08 +08:00
gaoxin 21ec70a29e 【灵兽】抽卡特效位置移动 2020-11-01 16:20:04 +08:00
gaoxin 9ed00e0ba5 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
gaoxin a2bfc34833 【音效】打开界面播放音效时不再播放点击音效 2020-11-01 14:45:09 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
gaoxin d7a33ed404 【逍遥游】首通需要显示奖励数量 2020-10-30 13:28:57 +08:00
gaoxin f519c35bbd 【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。 2020-10-30 13:28:19 +08:00
liujiaqi c16a291063 逍遥特权图标资源 2020-10-30 13:28:10 +08:00
jiaoyangna 39dbd3f640 逍遥游幸运转盘提交 2020-10-30 13:27:45 +08:00
yuanshuai 1eba61731e 【逍遥游】首通奖励显示脚本提交 2020-10-30 11:03:50 +08:00
yuanshuai ec3defb2c4 【逍遥游】首通奖励协议提交 2020-10-30 11:03:39 +08:00
zhangqiang 018c571a93 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:27:57 +08:00
jiaoyangna 1e2688e84c 【运筹帷幄】乾坤宝盒活动详情中的概率公示,少一个魂印 2020-10-30 10:09:11 +08:00
jiaoyangna 4b88ce6eb3 【运筹帷幄】限时召唤界面,up将白片 2020-10-30 10:09:04 +08:00
zhangqiang c4a9cb99cf 【主题活动】commit 2020-10-30 10:08:54 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
JieLing 48bf02ce81 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-27 19:29:35 +08:00
ZhangBiao 31edeb3ab5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-27 16:32:53 +08:00
ZhangBiao 33e1ba20e8 【社稷大典】商店适配 2020-10-27 16:32:43 +08:00
JieLing 0752b7694e 【排行榜】 排行榜显示 2020-10-27 16:23:35 +08:00
ZhangBiao 35f6a6c430 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
2020-10-27 16:16:10 +08:00
ZhangBiao acd3f336e9 【设计大典】特效添加 2020-10-27 16:15:34 +08:00
gaoxin ec7e498b87 【战斗】修复持续伤害会出现小数的问题 2020-10-27 15:16:04 +08:00
gaoxin 9add8d8dbf 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 13:53:32 +08:00
JieLing 4b522dd9ea 【积天豪礼】$1 -> $0.99 2020-10-27 13:51:11 +08:00
JieLing e1a8028ec6 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +08:00
gaoxin 9808cad9b9 【逍遥游】骰子音效替换 2020-10-26 20:20:51 +08:00
gaoxin 88516ad0e2 【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫 2020-10-26 19:43:04 +08:00
JieLing 7870934f0c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 18:58:03 +08:00
yuanshuai 0ea67ffa33 【逍遥游】骰子动画优化,隐藏动画下面的黑影 2020-10-26 18:57:45 +08:00
jiaoyangna 29789b6c0d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 18:45:12 +08:00
jiaoyangna 5d3d65871a [主题活动-社稷大典]商店立绘重叠提交 2020-10-26 18:44:57 +08:00
ZhangBiao 3d19d05b04 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 18:07:40 +08:00
ZhangBiao d7ad797ce5 【车迟斗法】点击抢夺下方名字修改 2020-10-26 18:07:28 +08:00
JieLing 837d7d8886 【社稷大典】 公会排行显示问题 2020-10-26 17:59:58 +08:00
ZhangBiao 6eea05fa06 【竞技场】领奖界面报错修改 2020-10-26 17:30:26 +08:00
ZhangBiao 6149e88620 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 17:04:28 +08:00
ZhangBiao c2612e2ca8 【社稷大典】捐献后 左上角 按钮状态切换修复 2020-10-26 17:04:07 +08:00
JieLing 0b8abaeabf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:51:53 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
ZhangBiao a9e8cad755 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:50:03 +08:00
ZhangBiao 5a20d41b77 【社稷大典】左上公会排行空白修改 2020-10-26 16:49:47 +08:00
JieLing a33ac4576f 添加一个特效打包路径 2020-10-26 16:45:43 +08:00
ZhangBiao 0340b7d468 【社稷大典】打开社稷大典界面 时被提出公会 检测 2020-10-26 16:37:56 +08:00
ZhangBiao b2c841e572 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:11:11 +08:00
ZhangBiao 709dc1a5bd 【社稷大典】时间弹跳修复,物品边框颜色修改 2020-10-26 16:10:58 +08:00
liujiaqi e80c0f8e0d 【社稷大典】商店标题资源替换 2020-10-26 16:06:55 +08:00
JieLing 21f0e6abfb 【逍遥游】动画资源引用错误 2020-10-26 15:46:24 +08:00
JieLing 0b2a309b60 【逍遥游】删除旧骰子资源 2020-10-26 15:39:49 +08:00
gaoxin 76dadc8077 【逍遥游】合并后资源缺失 2020-10-26 15:30:24 +08:00
yuanshuai 0fee60ea37 【逍遥游】骰子动画修改 2020-10-26 15:19:33 +08:00
gaoxin 71dc347456 【逍遥游】删除旧骰子动画,修复新动画缺失的问题 2020-10-26 15:18:32 +08:00
gaoxin c2db80b5bf 【逍遥游】骰子资源提交 2020-10-26 15:15:56 +08:00
jiaoyangna 942849cdcf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 15:06:24 +08:00
jiaoyangna ce5db82250 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:05:59 +08:00
zhangqiang 0a5816a4ec 线上问题工会技能战力修改 2020-10-26 14:47:14 +08:00
zhangqiang b6f48c4910 线上战力 属性取整问题 2020-10-26 14:46:43 +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
zhangqiang f696619328 【编队战力】 修改战力显示 2 未合 local 2020-11-30 10:17:44 +08:00
zhangqiang 6c4afae844 【编队战力】 编队界面的那个英雄战力计算修改 2020-11-30 10:17:34 +08:00
wangzhenxing a711c30c64 [战斗] 99被动修改 屏蔽金翅大鹏不灭 2020-11-28 17:59:38 +09:00
wangzhenxing 30f953f6de 【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和 没有不灭的无序列表 103效果改成治疗随机多个单位 276被动 改为给随机英雄加 2020-11-28 17:58:36 +09:00
wangzhenxing ce8c206717 【战斗】效果:103修改添加1个参数 被动 147 206修改 被动添加271-284 2020-11-28 17:56:58 +09:00
gaoxin 8c86335070 【资源】三四星技能音效添加,孟姜女立绘修改 2020-11-27 18:04:14 +08:00
gaoxin 2627341766 【特效】三四星部分特效裁切处理 2020-11-27 17:35:02 +08:00
gaoxin 15c862fd23 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-27 17:28:08 +08:00
zhangqiang 6a7c9b920d 【车迟斗法】 修改抢夺 挑战时会报错修复 2020-11-27 17:20:42 +08:00
zhangqiang 17882656fe 【竞技场】 修复积分规则修改别的pvp 战斗结束后报错 bug 2020-11-27 17:20:29 +08:00
zhangqiang f8dd59fdfc 【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理 2020-11-27 17:19:53 +08:00
gaoxin 4b165e3551 Merge branch '0功能/背包最大值限制提示添加' into master_xma_local 2020-11-27 17:18:01 +08:00
gaoxin b173c4384a Merge branch '0功能/系统消息结构处理' into master_xma_local 2020-11-27 17:17:57 +08:00
gaoxin 8eb823937e 【系统消息】暂时屏蔽法宝详情的显示 2020-11-27 15:06:58 +08:00
gaoxin 7ee6f446b3 【背包】背包已满提示方式改为tips 2020-11-27 14:00:53 +08:00
gaoxin d0cb62fab6 【背包】物品最大数量限制提示添加 2020-11-27 13:31:24 +08:00
zhangqiang 80c949c54d 【灵兽】 灵兽数据分页 2020-11-27 10:57:50 +08:00
gaoxin ad9c72717a 【系统消息】修改系统消息点击法宝相关消息显示为一级的法宝信息 2020-11-27 10:49:20 +08:00
gaoxin ce78226529 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
ZhangBiao 2df4f34c76 【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
2020-11-26 16:09:22 +08:00
ZhangBiao 13e2fbb98d Merge branch '0功能/竞技场胜负奖励' into master_xma_local 2020-11-26 11:11:57 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
ZhangBiao 80538ec42f 【竞技场】增加产出 2020-11-25 18:24:23 +08:00
ZhangBiao be9b79897e 【竞技场】增加产出 2020-11-25 18:23:33 +08:00
zhangqiang cf7068da1c 【灵兽特惠】 适配问题 2020-11-24 14:55:46 +08:00
wangzhenxing 4b6578e957 [战斗] 91 112 115 196 256 被动添加特性屏蔽修改 2020-11-24 11:31:02 +09:00
wangzhenxing 2cc096cd18 【战斗】147,206被动修改回原来的效果 2020-11-24 11:24:29 +09:00
wangzhenxing e3e609c87e [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-24 11:23:31 +09:00
ZhangBiao 3bcc15d21d 【主题活动】降龙伏虎banner替换 2020-11-24 11:08:03 +08:00
gaoxin 34ae0ed497 【战斗】无用log删除,技能数量限制初始化数据位置错误 2020-11-23 21:36:34 +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
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
ZhangBiao 08657b4ffd 【编队优化】车迟 十绝 增加一键 2020-11-18 10:48:35 +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
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
ZhangBiao de32379f8e 【竞技场】竞技场增加输赢奖励 2020-11-07 18:52:04 +08:00
jiaoyangna 4b2ffbdfae Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-20 05:21:38 +08:00
jiaoyangna 0def846f60 金乌 立绘资源提交 2020-09-20 05:21:32 +08:00
jiaoyangna ed6842d354 [变幻莫测] 资源提交 2020-09-20 00:15:43 +08:00
jiaoyangna 665e8f8d42 灵兽宝阁 2020-09-18 11:51:20 +08:00
jiaoyangna 85bd3ae52b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-18 10:48:46 +08:00
zhangqiang 21683ce406 【神将升级 优化】 觉醒提示文字修改 2020-12-05 10:10:41 +08:00
gaoxin 7417f279bb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-03 17:10:29 +08:00
gaoxin 18e6ce1181 【战斗】被动技能outdata添加胜利场数数据,修改被动225根据胜利场数计算, 2020-12-03 17:10:24 +08:00
zhangqiang 253c80412f 【资源导入】 音效替换 2 个 2020-12-03 15:52:51 +08:00
ZhangBiao 491d770619 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-03 15:18:39 +08:00
ZhangBiao 27b178a215 【青龙秘宝】购买等级为0修改 2020-12-03 15:18:30 +08:00
zhangqiang b7103ae709 百上回时间调整 2020-12-03 15:03:52 +08:00
zhangqiang 593aa53688 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-03 15:01:02 +08:00
zhangqiang 26d1bba3dc 变幻莫测 提交 2020-12-03 15:00:49 +08:00
gaoxin 527e6f2245 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-03 11:45:03 +08:00
gaoxin 9eaf7f8d6b 【战斗】修复回收机制错误,导致立绘重叠的问题,删除无用log 2020-12-03 11:44:57 +08:00
zhangqiang 32d2fd1c66 【资源导入】 音效 三个 2020-12-03 11:38:15 +08:00
liujiaqi e6c834e309 新增3个灵兽小头像 2020-12-07 11:02:59 +08:00
zhangqiang e8a1e94830 【背包 bug】 装备页签显示的 当前数量 不应是种类 是总数量 修复 2020-12-02 20:39:28 +08:00
zhangqiang c0f208b7d1 【巅峰赛 bug】 三局两胜 第三场不刷新bug 2021-01-21 21:33:36 +08:00
zhangqiang 852694c967 【竞技场】 防守记录积分显示修改 2021-01-19 23:00:13 +08:00
gaoxin b83f326e5f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-02 17:08:12 +08:00
zhangqiang 9e8b497537 【资源导入】 live2d 新将 + 新灵兽 2021-01-19 21:49:12 +08:00
zhangqiang 47c6e02d56 【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效 2021-01-17 21:45:17 +08:00
gaoxin 0b1b24bbc2 【策划】添加灵兽立绘位置调整 2020-12-02 17:07:49 +08:00
ZhangBiao 4b0332f12c 【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
2020-12-02 10:35:44 +08:00
zhangqiang c77327b1f0 【巅峰赛 bug】 竞猜修改2 + 巅峰赛结束后 竞猜界面没有刷新问题修改 2020-12-31 22:59:34 +08:00
ZhangBiao d2689eba03 【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
2020-12-01 15:59:15 +08:00
zhangqiang 972e83ec2f 【巅峰赛】 竞猜结果前端显示错误 2020-12-14 00:20:10 +08:00
gaoxin f5823409cf 【角色】修复角色被动技能数量计算错误,兼容多合一被动 2020-11-30 21:17:24 +08:00
gaoxin 2f857869de 【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错 2020-11-30 19:43:37 +08:00
gaoxin 98900329fc 【战斗】尝试修复退出战斗界面,资源回收错误,偶现报错的问题 2020-11-30 14:18:02 +08:00
gaoxin d3c6c76fb1 【GM工具】添加添加圣物的GM 2020-11-30 14:17:12 +08:00
gaoxin d1ba9b766e 【黑名单】修复跳转黑名单报错 2020-11-30 10:27:07 +08:00
wangzhenxing 560b58480d [战斗] 99被动修改 屏蔽金翅大鹏不灭 2020-11-28 17:32:30 +09:00
zhangqiang b0e4b6606e 【编队战力】 修改战力显示 2 未合 local 2020-11-28 17:20:44 +08:00
zhangqiang a6339681ab 【编队战力】 编队界面的那个英雄战力计算修改 2020-11-28 17:13:01 +08:00
wangzhenxing 08f8a0ba9e 【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和 没有不灭的无序列表 103效果改成治疗随机多个单位 276被动 改为给随机英雄加 2020-11-28 16:18:50 +09:00
zhangqiang ac18c8e0d3 【uidata】 2020-11-28 15:15:39 +08:00
gaoxin b6ce4c8840 【特效】三四星部分特效裁切处理 2020-11-27 17:34:35 +08:00
zhangqiang 60a168fe48 【车迟斗法】 修改抢夺 挑战时会报错修复 2020-11-27 16:34:34 +08:00
zhangqiang 7ff9932661 【竞技场】 修复积分规则修改别的pvp 战斗结束后报错 bug 2020-11-27 15:17:36 +08:00
gaoxin 998a085caa Merge remote-tracking branch 'origin/0功能/系统消息结构处理' into master_develop 2020-11-27 15:08:46 +08:00
liujiaqi 87cfb4ed03 【技能】太极特效字更换为青丝 2020-12-06 14:02:48 +08:00
gaoxin 0378485c97 Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop 2020-11-27 14:01:17 +08:00
gaoxin f98156b5cc Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop 2020-11-27 13:41:44 +08:00
zhangqiang ff49cae4bb 【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理 2020-11-27 11:45:31 +08:00
zhangqiang 1b68c9d93b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-27 11:04:07 +08:00
liujiaqi 1fa4626d47 【技能】3星技能文字 2020-12-06 10:56:02 +08:00
zhangqiang 79fb88aa93 Merge branch 'master_xma_local' into master_develop 2020-11-27 11:03:33 +08:00
gaoxin 681a030c45 【资源】特效技能音效更新 2020-11-26 20:09:21 +08:00
jiaoyangna 9626006a2b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-20 17:09:15 +08:00
gaoxin 04a1291830 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-26 17:05:00 +08:00
gaoxin 54c82824a0 【音效】技能音效更新 2020-11-26 17:04:47 +08:00
ZhangBiao 1dcb1a8eb2 【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
2020-11-26 16:08:48 +08:00
wangzhenxing 6f3d3e0f38 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-26 15:48:29 +09:00
wangzhenxing febcd00a5f 【战斗】效果:103修改添加1个参数 被动 147 206修改 被动添加271-284 2020-11-26 15:48:15 +09:00
ZhangBiao 101c23c794 Merge branch '0功能/竞技场胜负奖励' into master_develop 2020-11-26 14:29:54 +08:00
gaoxin b1ab868a17 【适配】添加ui默认实际大小 2020-11-26 11:22:56 +08:00
gaoxin 3692b7d6f8 【音效】三四星英雄技能音效优化 2020-11-26 11:21:07 +08:00
gaoxin d8566aaea4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-26 00:32:55 +08:00
DESKTOP-98AVA47\Administrator 175edb6219 【鸿蒙阵】添加界面 2020-11-25 20:39:48 +08:00
gaoxin defcf8684e 【工具】特效资源整理工具优化 2020-11-25 17:11:02 +08:00
gaoxin ef682f80a4 【sdk】添加自定义事件上传接口,并将所有的按钮点击事件上传 2020-11-25 17:09:35 +08:00
gaoxin b382a91ba8 【资源】孟姜女立绘删除老旧资源 2020-11-25 15:58:22 +08:00
gaoxin aec7dbd25d 【屏幕适配】修改ipad适配的方式 2020-11-25 15:11:04 +08:00
gongjiawei 955af5caa9 音频更新 2020-11-25 14:17:23 +08:00
gaoxin 82d325bb59 【特效】孟姜女技能裁切处理 2020-11-24 20:35:53 +08:00
gaoxin d8be2456ea 【战斗】修复技能单回合限制会导致战斗卡死的问题 2020-11-24 19:18:59 +08:00
gaoxin e3429b5547 【资源】三四星技能音效添加 2020-11-24 14:32:53 +08:00
wangzhenxing 26519a2158 [战斗] 91 112 115 196 256 被动添加特性屏蔽修改 2020-11-23 15:08:22 +09:00
zhangqiang 8bc7d38cb5 【特效】 巨锟 皮丘 2020-11-23 14:26:03 +08:00
gaoxin 393dfb6c0d 【资源】特效节点改为recttransform 2020-11-20 19:23:11 +08:00
gaoxin bdde50f26a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-20 18:42:49 +08:00
gaoxin 908fdc05a8 【资源】迦楼罗,聂小倩特效修改 2020-11-20 18:42:39 +08:00
zhangqiang 298d19ef1a 【孟姜女】特效替换 2020-11-20 18:21:48 +08:00
gaoxin a4315b19a1 【资源】名称重复修改 2020-11-20 16:29:29 +08:00
gaoxin 2b2df7a106 【资源】孟姜女,迦楼罗特效资源修改,幽魂姬资源新增 2020-11-20 16:16:56 +08:00
gaoxin d0c0cd3f2c Merge branch 'master_xma_local' into master_develop 2020-11-20 15:39:30 +08:00
wangzhenxing 53e473c325 【战斗】147,206被动修改回原来的效果 2020-11-20 10:00:16 +09:00
wangzhenxing 6ce8000c0b [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-19 20:24:30 +09:00
gaoxin 1a88c57864 Merge remote-tracking branch 'origin/master_xma_local' into master_develop 2020-11-19 15:44:53 +08:00
gaoxin b516397443 Merge branch 'master_xma_local' into master_develop 2020-11-19 14:54:12 +08:00
gaoxin 680e3eb9e6 【资源】阿修罗特效裁切问题修改 2020-11-19 14:51:48 +08:00
gaoxin 8c692349db 【资源】修复聂小倩光效切割问题,修复阿修罗释放特效错误的问题 2020-11-19 14:37:51 +08:00
gaoxin a96b128965 【资源】鬼差,木吒,水德星君光效切割问题修复 2020-11-19 13:52:44 +08:00
gongjiawei 06b3930263 音频更新 2020-11-18 17:35:12 +08:00
gaoxin 6be65652c5 Merge branch 'master_xma_local' into master_develop 2020-11-17 20:40:29 +08:00
gaoxin ea5afc1ac3 【战斗】无用log删除 2020-11-17 20:40:23 +08:00
gaoxin f7676f2c93 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Prefab/Effect_c_dhdj_00042_s1_attack_PG_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Texture/H_shandian_82.tga.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials/Effect_c_swk_00015_s1_attack_PG_014_mat.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82.tga.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Texture/H_shandian_82_tga.tga.meta
2020-11-17 18:38:24 +08:00
zhangqiang 7cf3d312d2 【特效】 特效添加RectTransform 2020-11-17 17:04:19 +08:00
gaoxin 479c836292 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-17 15:14:31 +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
ZhangBiao db9facba90 【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
(cherry picked from commit 04f8571692)
2020-11-17 11:54:58 +08:00
ZhangBiao 90f0ea6b67 【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
(cherry picked from commit 69d818118c)
2020-11-17 10:59:48 +08:00
ZhangBiao e6d0c6b0f2 【公告】打开公告前获取公告信息 2020-11-17 10:58:54 +08:00
gaoxin 9c158f1f99 Merge branch 'master_xma_local' into master_develop
# Conflicts:
2020-11-16 20:16:17 +08:00
zhangqiang a22effc57c 【东华帝君】 音效替换 技能预设 修改 2020-11-16 18:08:01 +08:00
ZhangBiao bef1181f19 【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
2020-11-16 17:50:46 +08:00
gaoxin 5ab9688089 Merge branch 'master_xma_local' into master_develop 2020-11-16 16:46:33 +08:00
zhangqiang 51c7033220 【东华帝君】 音效提交 2020-11-16 15:48:29 +08:00
gaoxin 64dc9d0181 Merge branch 'master_xma_local' into master_develop 2020-11-16 11:51:44 +08:00
gaoxin 6639b42bed Merge branch 'master_xma_local' into master_develop 2020-11-16 10:13:01 +08:00
gaoxin 8b001af5b6 Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Atlas/RoleInfoAtlas/r_hero_juexinchengong.png.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
2020-11-13 19:48:27 +08:00
gaoxin f17d8daa9f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-13 17:25:47 +08:00
gaoxin a62598207c 【测试战斗】修复添加属性被动时报错 2020-11-13 17:25:40 +08:00
ZhangBiao 10b3c375e7 【灵兽宝阁】增加假战斗
(cherry picked from commit 933f2d4768)
2020-11-13 16:38:41 +08:00
ZhangBiao 1e5e64db1e 【灵兽宝阁】倒计时显示刷新问题修复
(cherry picked from commit d739896793)
2020-11-13 16:36:13 +08:00
gaoxin 9e49e3e5ce Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-13 16:06:42 +08:00
gaoxin 779f61cc15 【封禁】添加封禁提示 2020-11-13 16:06:35 +08:00
wangzhenxing 7129226ff4 257,261,267被动修改 2020-11-13 16:05:56 +09:00
liujiaqi 762e35b2c1 灵兽山 觉醒图标 2020-11-20 15:24:41 +08:00
gaoxin 523e5c7328 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-13 14:51:19 +08:00
gaoxin 59a62755c8 【资源】修复东华帝君普攻技能报错的问题 2020-11-13 14:51:00 +08:00
ZhangBiao c2933ddb96 Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
2020-11-13 14:20:49 +08:00
ZhangBiao 8185be7c27 【灵兽抽卡】增加可选灵兽 2020-11-13 12:12:06 +08:00
gaoxin 31378d1a76 【工具】刷新资源路径工具不再自动重命名 2020-11-13 11:30:50 +08:00
gaoxin 26cbfccf57 【工具】特效资源整理工具 2020-11-13 11:30:01 +08:00