Commit Graph

2461 Commits (92ff0628c5e56a215767c75d17087b4b415c942e)

Author SHA1 Message Date
zhangqiang df8f8d6dd0 【灵兽系统】 加引导 和 特权加15日礼包 判断 2020-11-02 15:56:06 +08:00
wangzhenxing 201fa0530a [效果 被动]添加119效果 109,136,160 被动修改(我方攻击加血不会触发) 2020-11-02 15:49:18 +09:00
zhangqiang d0a8e96d5e 【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序 2020-11-02 14:36:44 +08:00
gaoxin 5b2801755e 【战斗】修复技能效果修改导致被动技能报错的问题 2020-11-02 14:12:03 +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
gaoxin aaadcba680 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 13:49:26 +08:00
gaoxin a04b12c93d 【战斗】修复部分被动技能报错 2020-11-02 13:49:21 +08:00
wangzhenxing d5afae7352 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 14:14:05 +09:00
wangzhenxing 27bbe94ad9 [灵兽]灵兽放生修改,灵兽抽卡结果界面再来一次添加妖晶抽卡次数 2020-11-02 14:13:39 +09:00
wangzhenxing 52fbe638f6 [灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数 2020-11-02 13:59:55 +09:00
gaoxin 02a57e692c 【战斗】修复部分被动技能报错 2020-11-02 13:49:53 +08:00
zhangqiang ff68e3d0bc 【达人排行榜】 达人排行榜底部显示问题 2020-11-02 12:55:00 +08:00
zhangqiang 148b068c79 【达人排行榜】 达人排行榜底部显示问题 2020-11-02 12:54:36 +08:00
gaoxin 9b65cbba0f 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:55:28 +08:00
gaoxin cddc94f41e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 11:54:54 +08:00
gaoxin a4254e28cb 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:54:48 +08:00
zhangqiang 20795b326a 【灵兽系统】bug 2020-11-02 11:53:26 +08:00
zhangqiang 4cb30990e1 【灵兽系统】 bug 需同步 2020-11-02 11:52:00 +08:00
zhangqiang d5e4b46e45 【灵兽系统】bug 同步到dev 2020-11-02 11:00:21 +08:00
zhangqiang c206f6487e 【灵兽系统】 漏合 2020-11-02 10:59:17 +08:00
zhangqiang 8f71eb7672 【灵兽系统】bug 同步到dev 2020-11-02 10:58:48 +08:00
gaoxin 230788670d 【战斗】主动效果117,118添加 2020-11-02 10:00:32 +08:00
gaoxin 4201f2d7cd 【战斗】主动效果117,118添加 2020-11-02 10:00:05 +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
zhangqiang 005f36c524 【灵兽系统】 修改bug 2020-10-31 14:49:58 +08:00
zhangqiang 4f25b8cc98 【灵兽系统】 修改bug 2020-10-30 17:48:49 +08:00
wangzhenxing b50f468e33 [灵兽]战中施法特效提交 2020-10-30 17:44:20 +09:00
gaoxin d942fa6f67 【战斗】针对灵兽添加一些效果的屏蔽2 2020-10-30 17:32:40 +08:00
zhangqiang 349831895e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-02 06:30:53 +08:00
zhangqiang 66a603f429 [灵兽系统]召唤提交 2020-11-02 06:30:41 +08:00
zhangqiang 571a62a3c2 灵兽召唤提交 2020-11-02 05:03:34 +08:00
gaoxin 4a76f49f7f 【战斗】针对灵兽添加一些效果的屏蔽 2020-10-30 16:15:40 +08:00
gaoxin 26fa127b14 【战斗】修复敌方数据有灵兽时报错 2020-10-30 15:49:27 +08:00
zhangqiang 1d768be6b3 【灵兽系统】 拖拽层级错误修改 2020-10-30 13:48:14 +08:00
gaoxin d7a33ed404 【逍遥游】首通需要显示奖励数量 2020-10-30 13:28:57 +08:00
gaoxin f519c35bbd 【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。 2020-10-30 13:28:19 +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
wangzhenxing c2f46b2077 [灵兽]灵兽技能修改 2020-10-30 11:53:13 +09:00
gaoxin c58ae0e2f8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-30 11:00:33 +08:00
gaoxin 0ea86402c5 【逍遥游】首通需要显示奖励数量 2020-10-30 11:00:27 +08:00
zhangqiang 36d1d84cce 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:28:20 +08:00
zhangqiang 018c571a93 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:27:57 +08:00
gaoxin 6df6aa4a74 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-30 10:26:40 +08:00
gaoxin 09fc5118a0 【战斗】修复战斗界面销毁时未回收延迟资源,导致报错的问题 2020-10-30 10:26:35 +08:00
zhangqiang c4a9cb99cf 【主题活动】commit 2020-10-30 10:08:54 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
wangzhenxing 424cfead9a 灵兽特效层级修改 2020-10-29 20:37:43 +09:00
gaoxin be6e2ba6f4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 17:48:52 +08:00
gaoxin cc052b4aa7 【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。 2020-10-29 17:48:46 +08:00
zhangqiang 232e9b718c 【灵兽系统】 修改技能显示 2020-10-29 17:40:53 +08:00
wangzhenxing 68885da727 技能释放修改 2020-10-29 18:11:13 +09:00
wangzhenxing b330049037 【灵兽】灵兽逻辑修改 2020-10-29 17:12:21 +09:00
zhangqiang c22b0d34d5 【灵兽系统】 红点刷新 2020-10-29 16:58:00 +08:00
zhangqiang 5d2bfdc46b 【灵兽系统】 动画调整 2020-10-29 15:37:19 +08:00
wangzhenxing 02d4a3ab13 【灵兽】特效表现修改 2020-10-29 15:12:03 +09:00
jiaoyangna 452a3ac096 逍遥游幸运转盘提交 2020-10-29 14:12:51 +08:00
wangzhenxing 09cd47db46 【灵兽】bug修改 buffctr 报错修改 2020-10-29 11:18:11 +09:00
zhangqiang 17465d4d99 【灵兽系统】 bug 2020-10-29 11:01:03 +08:00
zhangqiang fc0eea1bb7 【灵兽系统】 bug 修改 2020-10-29 10:43:45 +08:00
zhangqiang 4d4cd55010 【灵兽系统】 bug 2020-10-28 19:49:14 +08:00
zhangqiang fee2af0b86 【主题活动】commit 2020-10-28 18:36:54 +08:00
zhangqiang b62e553e9e 【灵兽系统】 bug 2020-10-28 18:32:59 +08:00
wangzhenxing f5abd32d63 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-28 18:09:11 +09:00
zhangqiang 0f5583e0f9 【灵兽系统】bug 修改 2020-10-28 17:57:30 +08:00
wangzhenxing 0b9efcdd69 灵兽bug修改提交 2020-10-28 18:08:56 +09:00
wangzhenxing 4bcd3abe86 抽卡修改提交 2020-10-28 18:07:06 +09:00
zhangqiang afed2cad3b 【灵兽系统】 bug 2020-10-28 16:31:08 +08:00
wangzhenxing b108d3bc85 灵兽bug修改 2020-10-28 16:30:12 +09:00
zhangqiang 3fcc213718 【灵兽系统】 问题修改 2020-10-28 15:27:43 +08:00
zhangqiang 0ba57c8c82 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-28 14:10:34 +08:00
zhangqiang 73fc8282ee 运筹帷幄提交 2020-10-28 14:10:20 +08:00
zhangqiang e60d24f9a3 【灵兽系统】 修改bug 2020-10-28 11:48:36 +08:00
yuanshuai 83014b4f7d 【逍遥游】首通奖励显示脚本提交 2020-10-28 11:47:05 +08:00
yuanshuai 08a1d3a98d 【逍遥游】首通奖励协议提交 2020-10-28 11:31:00 +08:00
wangzhenxing 574a1df34a 灵兽战斗修改提交 2020-10-28 11:58:47 +09:00
zhangqiang 7e7316c52c 【灵兽系统】 星际修改 2020-10-28 10:50:16 +08:00
zhangqiang ef51dea897 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-28 10:35:58 +08:00
zhangqiang 8070a4fa47 【灵兽系统】 星级居中修改 2020-10-28 10:35:50 +08:00
wangzhenxing 132c49a807 [灵兽] 灵兽策划反馈bug修改 2020-10-28 10:17:20 +09:00
JieLing 8b22166237 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-28 07:48:30 +08:00
JieLing 48bf02ce81 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-27 19:29:35 +08:00
wangzhenxing 8bba3a3be4 [灵兽放生]灵兽放生修改 2020-10-27 17:27:16 +09:00
JieLing 87817d4c36 【排行榜】 排行榜显示 2020-10-27 17:03:18 +08:00
zhangqiang a20217223a 【灵兽系统】 添加碎片合成红点 2020-10-27 17:02:37 +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
zhangqiang 0d9ed28c23 【灵兽系统】 资源替换 拖拽修改 2020-10-27 15:59:53 +08:00
gaoxin ec7e498b87 【战斗】修复持续伤害会出现小数的问题 2020-10-27 15:16:04 +08:00
gaoxin 02863c2bb4 【战斗】修复持续伤害会出现小数的问题 2020-10-27 15:15:43 +08:00
zhangqiang e1d14466db 协议提交 2020-10-27 14:10:24 +08:00
gaoxin 9add8d8dbf 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 13:53:32 +08:00
gaoxin b128dc1b8b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-27 12:02:32 +08:00
gaoxin 6292afc225 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 12:02:28 +08:00
zhangqiang f2151b12fb 【灵兽系统】 主城挪位置 合成最大限制 2020-10-27 10:26:31 +08:00
wangzhenxing eb109ff09b 灵兽信息显示界面修改 2020-10-27 11:23:14 +09:00
gaoxin 13f37fa31a Merge branch '0功能/灵兽战斗' into master_develop 2020-10-27 10:07:29 +08:00
gaoxin c4ca00dfd3 【战斗】灵兽加入测试战斗 2020-10-27 10:07:18 +08:00
gaoxin 88516ad0e2 【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫 2020-10-26 19:43:04 +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
wangzhenxing f3d5640893 人物信息显示详情修改 2020-10-26 19:04:56 +09:00
zhangqiang 3107e9a00f 【灵兽系统】 技能显示修改 2020-10-26 18:26:23 +08:00
JieLing ef4f4232cb 【灵兽系统】 修改显示 排行榜显示修改 2020-10-26 18:04:45 +08:00
JieLing 837d7d8886 【社稷大典】 公会排行显示问题 2020-10-26 17:59:58 +08:00
jiaoyangna ce05f94695 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 17:41:06 +08:00
jiaoyangna 9c7839540a [灵兽系统]羁绊排序,羁绊红点修改 2020-10-26 17:40:54 +08:00
ZhangBiao 6eea05fa06 【竞技场】领奖界面报错修改 2020-10-26 17:30:26 +08:00
zhangqiang 388cb8a418 【灵兽系统】 修改合成逻辑 2020-10-26 17:23:08 +08:00
ZhangBiao 9a15a6e5b9 【社稷大典】捐献后 左上角 按钮状态切换修复
(cherry picked from commit c2612e2ca8)
2020-10-26 17:17:28 +08:00
ZhangBiao 79774302f5 【社稷大典】左上公会排行空白修改
(cherry picked from commit 5a20d41b77)
2020-10-26 17:17:20 +08:00
ZhangBiao e03d5449e5 【社稷大典】打开社稷大典界面 时被提出公会 检测
(cherry picked from commit 0340b7d468)
2020-10-26 17:17:12 +08:00
jiaoyangna f47ca02503 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 17:14:49 +08:00
jiaoyangna db98590cf3 【灵兽系统】召唤修改 2020-10-26 17:14:24 +08:00
zhangqiang 35f64de903 【灵兽系统】 修改预设加载 2020-10-26 17:11:04 +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 5a20d41b77 【社稷大典】左上公会排行空白修改 2020-10-26 16:49:47 +08:00
gaoxin 00f262d2f4 【灵兽】战斗内灵兽头像显示添加 2020-10-26 16:45:33 +08:00
jiaoyangna 37259287a4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:43:37 +08:00
jiaoyangna 94858e80ff 【主题活动-累计充值】 文字提示修改 2020-10-26 16:43:22 +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
jiaoyangna 573fc1d5f8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:01:34 +08:00
jiaoyangna 1ebd6a5727 灵兽召唤提交 2020-10-26 16:00:34 +08:00
zhangqiang 2a6954293a 【灵兽系统】 灵兽羁绊战力计算修改 2020-10-26 15:47:14 +08:00
wangzhenxing c5b97f3cda 灵兽去除log 2020-10-26 16:42:48 +09:00
wangzhenxing 443bdab87f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 16:27:38 +09:00
ZhangBiao d4b75e0d73 【社稷大典】时间弹跳修复,物品边框颜色修改
(cherry picked from commit 709dc1a5bd)
2020-10-26 16:24:16 +08:00
ZhangBiao ddd417b3f3 【社稷大典】捐献品价值修改
(cherry picked from commit d30209f844)
2020-10-26 16:24:06 +08:00
ZhangBiao 55f9ccdb86 【社稷大典】捐献品3 点击加号跳转
(cherry picked from commit 469235ff74)
2020-10-26 16:23:58 +08:00
ZhangBiao 8f0553c1f6 【社稷大典】长按贡献数量不够无法捐赠bug修复
(cherry picked from commit e6610518ce)
2020-10-26 16:23:50 +08:00
ZhangBiao 5bf6dfb39f 【社稷大典】提交8 漏题补 2020-10-26 16:23:40 +08:00
wangzhenxing 91ed513602 人物信息修改提交 2020-10-26 16:26:21 +09:00
yuanshuai 0fee60ea37 【逍遥游】骰子动画修改 2020-10-26 15:19:33 +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
gaoxin 343237ae6d 【灵兽】战斗数据协议添加,修复战斗数据组建错误 2020-10-26 14:56:03 +08:00
zhangqiang 0a5816a4ec 线上问题工会技能战力修改 2020-10-26 14:47:14 +08:00
zhangqiang b6f48c4910 线上战力 属性取整问题 2020-10-26 14:46:43 +08:00
wangzhenxing 71f365b3e4 人物信息显示修改 2020-10-26 15:35:03 +09:00
jiaoyangna bdfb518274 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:11:44 +08:00
jiaoyangna 88afa2d704 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 15:07:13 +08:00
yuanshuai e37e260678 Merge branch 'master_devlop_ys' into master_develop 2020-10-26 15:05:43 +08:00
yuanshuai afd0b542fe 骰子动画修改 2020-10-26 15:04:44 +08:00
gaoxin 1dc2b96916 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-26 14:57:05 +08:00
gaoxin e96bfbdbf5 【灵兽】获取全部灵兽信息接口修改返回数组,修复打开灵兽信息界面报错 2020-10-26 14:57:01 +08:00
zhangqiang 982e29b2ba 线上问题工会技能战力修改 2020-10-26 14:45:29 +08:00
gaoxin 9ac7e7b9a3 Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
2020-10-26 14:33:22 +08:00
gaoxin 4265c533c8 【战斗】GM战斗测试数据提交 2020-10-26 14:32:48 +08:00
zhangqiang 21f8a21aec 灵兽提交 2020-10-26 14:25:35 +08:00
gaoxin 8a455e2c9e 【灵兽】后端数据解析添加 2020-10-26 14:03:59 +08:00
zhangqiang 5a72414908 灵兽修改提交 2020-10-26 11:34:01 +08:00
zhangqiang af2364c075 线上战力 属性取整问题 2020-10-26 11:33:23 +08:00
gaoxin 3aa5ac3207 【社稷大典】特效资源添加 2020-10-26 10:26:36 +08:00
jiaoyangna 11d0d95bde Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 10:13:11 +08:00
jiaoyangna 0a610313a6 主题活动图片资源修改提交,累计重置红点检测修改提交 2020-10-29 10:12:47 +08:00
gaoxin fe7d22e4ae 【灵兽】灵兽战斗表现添加 2020-10-26 10:13:31 +08:00
zhangqiang 3fa9583f56 灵兽修改提交 2020-10-26 10:10:29 +08:00
zhangqiang aff128d50a 灵兽提交 2020-10-24 19:46:10 +08:00
gaoxin 043304eb18 Merge branch 'master_develop' into 0功能/灵兽战斗 2020-10-24 18:51:57 +08:00
wangzhenxing ac0c59e9a1 灵兽显示修改 2020-10-24 18:54:14 +09:00
wangzhenxing a0270d471b 灵兽提交 2020-10-24 18:41:20 +09:00
zhangqiang 1d67775000 灵兽提交 2020-10-24 18:14:00 +08:00
gaoxin bb66461441 Merge branch 'master_develop' into 0功能/灵兽战斗 2020-10-24 17:17:52 +08:00
gaoxin bb23a7541d 【灵兽】战斗逻辑添加 2020-10-24 17:17:07 +08:00
wangzhenxing e381b9e771 灵兽放生修改提交 2020-10-24 16:51:09 +09:00
ZhangBiao d2bc65ec48 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-24 16:47:57 +08:00
ZhangBiao 7b4f959687 Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2020-10-24 16:47:45 +08:00
jiaoyangna 2ad9c6cdeb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 16:17:15 +08:00
jiaoyangna 87b9c2dd0d 灵兽羁绊,御兽斋红点提交 2020-10-29 16:17:09 +08:00
jiaoyangna d3b53a0eba Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-29 15:56:41 +08:00
jiaoyangna 93758f24f8 Merge branch '0功能/灵兽系统' into master_develop 2020-10-29 15:55:50 +08:00
jiaoyangna 92946fe32d baocuo xiugai 2020-10-29 15:54:25 +08:00
jiaoyangna 94c6c2242e Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-29 15:38:39 +08:00
jiaoyangna f1c18bcb7b 报错修改 2020-10-29 15:38:34 +08:00
jiaoyangna 33b8067bf6 漏提 2020-10-29 15:10:42 +08:00
jiaoyangna 2238dc5db4 灵兽抽卡 修改 2020-10-29 15:08:22 +08:00
zhangqiang c791399431 灵兽提交 2020-10-24 16:44:05 +08:00
ZhangBiao c768775e06 【社稷大典】加完红点完事了 2020-10-24 16:18:57 +08:00
zhangqiang 3d72b9c0ea 灵兽提交 添加羁绊红点预设 2020-10-24 16:11:58 +08:00
zhangqiang 194187e5e5 灵兽提交 2020-10-24 15:55:41 +08:00
zhangqiang 3407f7d57e Merge branch '0功能/灵兽系统' into master_develop
# Conflicts:
#	Assets/ManagedResources/Icons/ls_01_qingluan_t1.png.meta
#	Assets/ManagedResources/Icons/ls_02_huodou_t1.png.meta
#	Assets/ManagedResources/Icons/ls_03_yinglong_t1.png.meta
#	Assets/ManagedResources/Icons/ls_04_zhulong_t1.png.meta
#	Assets/ManagedResources/Icons/ls_05_fenghuang_t1.png.meta
#	Assets/ManagedResources/Icons/ls_06_baize_t1.png.meta
#	Assets/ManagedResources/Icons/ls_07_jukun_t1.png.meta
2020-10-24 15:41:12 +08:00
wangzhenxing a853094356 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 15:33:00 +09:00
zhangqiang 19f13e3cf6 灵兽连续升级修改 2020-10-24 15:25:24 +08:00
wangzhenxing e30de8da3f 灵兽提交 2020-10-24 15:32:39 +09:00
zhangqiang 0f4cd6d43e Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 14:15:45 +08:00
zhangqiang 7a4cd7ba8f 零售品升级升星红点 2020-10-24 14:15:35 +08:00
ZhangBiao ce11afc1e8 添加公会检查 和排行细节修改,初始的进度条积分有问题 2020-10-24 13:18:04 +08:00
gaoxin ad2b935e26 Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_01.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua.meta
2020-10-23 20:58:07 +08:00
gaoxin 17261cdcda 【灵兽】灵兽技能特效资源添加 2020-10-23 20:47:17 +08:00
gaoxin cadc2d77b2 【战斗0.0.8】灵兽战斗结构搭建 2020-10-23 20:44:43 +08:00
jiaoyangna a595c770a1 累计充值修改 2020-11-04 00:57:23 +08:00
jiaoyangna 12967078f0 限时召唤修改提交 2020-11-04 00:15:26 +08:00
jiaoyangna 73dce1a7c3 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 20:02:33 +08:00
jiaoyangna 2e962b3cef 抽卡界面修改提交 2020-10-23 20:02:20 +08:00
jiaoyangna a21d28fb83 再来十次修改提交 2020-10-23 19:38:27 +08:00
ZhangBiao d57fc60aa1 社稷大典,差个加工会限制和领奖界面 2020-10-23 19:34:03 +08:00
jiaoyangna e6aad73af4 louti 2020-10-23 19:31:39 +08:00
jiaoyangna 1ef09a42f5 再来一次界面修改提交 2020-10-23 19:30:32 +08:00
jiaoyangna 7bfec03778 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 19:14:31 +08:00
jiaoyangna f882c9c70c 抽卡提交 2020-10-23 19:14:24 +08:00
jiaoyangna 911c4b9f54 xieyi commit 2020-11-05 04:11:09 +08:00
zhangqiang 291cddbb3f 灵兽提交 2020-10-23 19:10:00 +08:00
wangzhenxing 7072f53fab 合并冲突提交 2020-10-23 19:53:45 +09:00
wangzhenxing bfaed0d937 灵兽放生提交 2020-10-23 19:45:14 +09:00
zhangqiang e7c981763a language 修改 2020-10-23 15:58:38 +08:00
zhangqiang 2cf881c4d5 灵兽提交 2020-10-23 15:12:21 +08:00
jiaoyangna c1b227c26b Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-11-05 03:03:16 +08:00
jiaoyangna da88485b4c lingshou zhaohuan tijiao 2020-11-05 03:03:08 +08:00
jiaoyangna a39bc32ef6 灵兽羁绊提交 2020-11-04 23:00:32 +08:00
jiaoyangna e9f42ce609 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
2020-11-04 22:27:36 +08:00
jiaoyangna d49c1b97cb 灵兽羁绊提交 2020-11-04 22:25:59 +08:00
zhangqiang 6767828cdc Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/Spine/ls_06_baize.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-10-23 14:38:50 +08:00
wangzhenxing 91ee82c5e1 涅槃提交 2020-10-23 14:05:50 +09:00
wangzhenxing 1466227510 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 09:55:02 +09:00
wangzhenxing 22a2789d08 灵兽涅槃提交 2020-10-23 09:54:49 +09:00
zhangqiang 7452d795e8 灵兽提交 2020-10-22 20:50:11 +08:00
jiaoyangna dbccde8b77 累计充值修改提交 2020-11-04 05:30:12 +08:00
jiaoyangna b6e5225bcf 累计充值修改提交 2020-11-04 05:23:46 +08:00
jiaoyangna aac7afa586 主题活动修改 2020-11-04 04:34:51 +08:00
jiaoyangna 205340e73a 累计充值修改 2020-11-04 04:05:20 +08:00
jiaoyangna fca650d5b3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-04 03:51:10 +08:00
jiaoyangna 14b7b6f4cf 累计充值修改 2020-11-04 03:51:04 +08:00
zhangqiang 6d200caf1d 灵兽提交 战力改变 2020-10-22 18:32:11 +08:00
wangzhenxing c5b73fed7f 抽卡灵兽修改 2020-10-22 16:25:40 +09:00
wangzhenxing b49c3f220d Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-22 16:15:57 +09:00
zhangqiang eb153fdaa6 灵兽提交 2020-10-22 16:13:44 +08:00
wangzhenxing e193bc2c21 灵兽抽卡剩余时间修改 2020-10-22 16:15:09 +09:00
wangzhenxing 1dbfab0029 灵兽抽卡显示修改 2020-10-22 16:07:38 +09:00
wangzhenxing e516aa6c14 被动效果修改 2020-10-22 14:53:49 +09:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
jiaoyangna b93bef6237 剔除id为0 的礼包 2020-10-22 11:26:00 +08:00
jiaoyangna 7931e3ed1c Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
2020-10-22 11:12:17 +08:00
zhangqiang 83088ea429 提交 2020-10-22 10:03:46 +08:00
jiaoyangna 420cef2355 无效的红点检测 2020-10-21 18:24:17 +08:00
wangzhenxing 11ccf2ab6f 灵兽分解预设提交 2020-10-21 17:25:12 +09:00
jiaoyangna d555d983ea 累计充值修改提交, 灵兽提交 2020-10-21 16:05:33 +08:00
wangzhenxing 02c55bcdb3 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-21 16:41:22 +09:00