Commit Graph

3621 Commits (2a65148fe95415aaa4b92f582d7e0f68b5f97071)
 

Author SHA1 Message Date
JieLing e1a8028ec6 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +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 9808cad9b9 【逍遥游】骰子音效替换 2020-10-26 20:20:51 +08:00
gaoxin 4139589270 【逍遥游】骰子音效替换 2020-10-26 20:20:32 +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
wangzhenxing f3d5640893 人物信息显示详情修改 2020-10-26 19:04:56 +09:00
yuanshuai f97263ff09 【逍遥游】骰子动画优化,隐藏动画下面的黑影 2020-10-26 18:56:35 +08: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 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
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
liujiaqi e80c0f8e0d 【社稷大典】商店标题资源替换 2020-10-26 16:06:55 +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
JieLing 21f0e6abfb 【逍遥游】动画资源引用错误 2020-10-26 15:46:24 +08:00
wangzhenxing c5b97f3cda 灵兽去除log 2020-10-26 16:42:48 +09:00
JieLing 0b2a309b60 【逍遥游】删除旧骰子资源 2020-10-26 15:39:49 +08:00
gaoxin 76dadc8077 【逍遥游】合并后资源缺失 2020-10-26 15:30:24 +08:00