Commit Graph

71 Commits (903cd68134467671d4ac7f7a08045fc28b878cbe)
 

Author SHA1 Message Date
gaoxin 903cd68134 文件名修改 2020-07-06 11:59:53 +08:00
gaoxin 4508220751 bat文件添加 2020-07-06 11:58:59 +08:00
gaoxin 1251f17d4d 尝试命令行执行 2020-07-06 11:02:40 +08:00
gaoxin 5a2a3f83d2 excel 工具完善 2020-07-06 10:56:55 +08:00
gaoxin d62d808e80 提交 2020-07-06 10:09:45 +08:00
gaoxin 608c296452 导表工具优化 2020-07-05 19:21:15 +08:00
zhangqiang 9053926e02 bug 点将台卡池预览,再查看四元阵卡池,显示的是点将台卡池 2020-07-04 17:04:26 +08:00
zhangqiang 608558d3cd 中文表 不提竞技场报错 2020-07-04 16:19:47 +08:00
zhangqiang 16bf6d9f7e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-04 16:13:24 +08:00
zhangqiang 94a160d682 修改玩家信息时,应按照位置顺序显示该玩家主线阵容 2020-07-04 16:11:14 +08:00
gaoxin 55d52887a0 误删恢复 2020-07-04 15:34:30 +08:00
gaoxin a7fcbbc722 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-04 15:32:38 +08:00
gaoxin 2552afa72e 忽略lua数据表文件 2020-07-04 15:32:09 +08:00
zhangqiang 385a8c86a1 bug 新手引导福利位置偏 2020-07-04 15:26:36 +08:00
zhangqiang bc9dae0cff 漏提 2020-07-04 14:27:21 +08:00
zhangqiang 74830b4b90 开服狂欢奖励预览返回按钮不关闭预览bug 2020-07-04 14:24:30 +08:00
zhangqiang 4630199505 提交试试 2020-07-03 19:54:34 +08:00
zhangqiang ae8aa71edf 成员左右切换动画位置修改 2020-07-03 18:25:46 +08:00
2han9B1a0 f7c842eb9a add zhushi 2020-07-03 17:59:10 +08:00
2han9B1a0 e2c5b69f38 星级成长里bug修复 2020-07-03 16:02:57 +08:00
gaoxin 9d56a77869 添加忽略文件 2020-07-03 12:03:14 +08:00
JieLing 6a317d3f7b 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
zhangqiang 6f30179f57 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-07 13:33:51 +08:00
zhangqiang 70bbb3cee2 竞技场修改 2020-07-07 13:29:40 +08:00
2han9B1a0 abfbfc423b 心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改 2020-07-03 11:27:25 +08:00
2han9B1a0 1796c48583 森罗幻境bug修改 2020-07-02 20:50:49 +08:00
2han9B1a0 73c6cc9582 删除meta文件 2020-07-02 17:58:34 +08:00
JieLing e409bb2020 关闭红点显示 2020-07-02 17:05:21 +08:00
JieLing ab411b3d0d svn逻辑同步 2020-07-02 17:04:46 +08:00
gaoxin edc24d7efd 修复获取奖励卡顿的问题 2020-07-02 17:01:40 +08:00
JieLing 461c64b04a svn逻辑同步 2020-07-02 14:53:44 +08:00
skuld cadced19c9 修改每日召唤次数上限 2020-07-02 14:50:03 +08:00
JieLing b3c70f66e4 svn逻辑tongbu 2020-07-01 18:14:03 +08:00
gaoxin 956dcfbcd2 删除预制体中的立绘 2020-07-01 17:45:38 +08:00
gaoxin 52f8a9922f 无用meta文件删除 2020-07-01 17:43:55 +08:00
gaoxin 997ba146bf 奖励界面挂机时长显示修改 2020-07-01 12:09:54 +08:00
gaoxin a2c6290cc2 Merge branch '战斗优化v_n.0' into master_develop 2020-07-01 12:04:50 +08:00
gaoxin 0677aa9c04 离线挂机时常随vip增加 2020-07-01 12:04:25 +08:00
JieLing c4751eed0a svn逻辑同步 2020-07-01 10:54:39 +08:00
JieLing 5154fdbac0 外网0.16.14 内网0.15.25 2020-07-01 09:40:20 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 097c3acbc4 Merge branch '穿戴装备bug' 2020-06-28 17:56:48 +08:00
JieLing 5a5fa715c8 修复穿戴装备卡死的bug, 外网热更 0.16.11 2020-06-28 17:56:26 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing e3b6de5404 内网0.15.17 外网 0.16.8 2020-06-19 21:44:27 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing 7a410e1b60 内网测试 0.15.5 2020-06-19 16:18:05 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00