Commit Graph

2073 Commits (79a5bcb74cb5fecd96ba5c4e6c2c74ef79a6c188)

Author SHA1 Message Date
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 0ba1161933 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-08-25 13:34:25 +08:00
ZhangBiao d30209f844 【社稷大典】捐献品价值修改 2020-10-26 12:35:29 +08:00
ZhangBiao 0d0b849435 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 12:28:08 +08:00
ZhangBiao 469235ff74 【社稷大典】捐献品3 点击加号跳转 2020-10-26 12:27:56 +08:00
ZhangBiao e6610518ce 【社稷大典】长按贡献数量不够无法捐赠bug修复 2020-10-26 12:23:04 +08:00
ZhangBiao 6407abc8c9 【社稷大典】提交8 漏题补 2020-10-26 11:53:53 +08:00
gaoxin c12c63bdaf 【language表】修复战斗中会出现错误文字 “抢夺成功,获得%s积分!” 的问题 2020-10-26 11:21:40 +08:00
JieLing ab0c5a4867 报错提交 2020-10-26 11:19:10 +08:00
jiaoyangna ebb2748b5c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-29 11:04:20 +08:00
jiaoyangna 9e7cd31376 逍遥游云游宝玉修改提交 2020-10-29 11:03:13 +08:00
jiaoyangna 68af385814 冲突提交 2020-10-29 10:29:14 +08:00
jiaoyangna 6d79dcab9a 活动修改提交 2020-10-29 09:50:47 +08:00
JieLing 43a370f5a8 报错提交 2020-10-26 10:56:46 +08:00
jiaoyangna 9763762e88 回滚提交 2020-10-24 19:31:41 +08:00
jiaoyangna 565ed0cc34 累计充值修改提交 2020-10-24 19:26:43 +08:00
jiaoyangna 0f5faff70f 累计充值修改提交 2020-10-24 19:26:37 +08:00
jiaoyangna 37ae683bf1 主题活动修改 2020-10-24 19:26:30 +08:00
jiaoyangna 2d7197298e 累计充值修改 2020-10-24 19:26:23 +08:00
jiaoyangna 43702ee6ca 累计充值修改 2020-10-24 19:25:52 +08:00
jiaoyangna 8db39458ca [累计充值修改提交] 2020-10-24 19:25:08 +08:00
jiaoyangna 0901d837be 限时召唤修改提交 2020-10-24 19:23:16 +08:00
jiaoyangna 9e8d773040 无效的红点检测 2020-10-24 19:22:29 +08:00
jiaoyangna c134dabe49 [累计充值]提交 2020-10-24 19:19:03 +08:00
jiaoyangna a9634c226f yongwangzhiqian commit 2020-10-24 19:12:28 +08:00
ZhangBiao 966e6ccdd1 【异妖】屏蔽 2020-10-24 19:08:02 +08:00
ZhangBiao 2a0d59849c 【设计大典】提交7 2020-10-24 19:02:06 +08:00
ZhangBiao 0bf6e05add 【社稷大典】提交6 2020-10-24 18:58:07 +08:00