zhangqiang
|
3ae4ed1d41
|
【英雄合成】 添加提示
|
2020-11-03 19:19:13 +08:00 |
ZhangBiao
|
ab757a2543
|
【特权商城】最后一分钟报错修改
|
2020-11-03 19:10:32 +08:00 |
ZhangBiao
|
5d40b102dc
|
【易经宝库】添加type 拼数据
|
2020-11-03 19:01:47 +08:00 |
gaoxin
|
5a861ade95
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:01:31 +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
|
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
|
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 |
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 |
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 |
ZhangBiao
|
8640018b87
|
【易经宝库】开坑 搭界面 和做动画
|
2020-11-02 18:05:24 +08:00 |
wangzhenxing
|
92d5b659a1
|
[放生灵兽]灵兽放生显示返还货币修改
|
2020-11-02 17:36:08 +09:00 |
zhangqiang
|
869f54799e
|
【灵兽系统】 加新手 加升级动画
|
2020-11-02 17:28:52 +08: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 |
gaoxin
|
230788670d
|
【战斗】主动效果117,118添加
|
2020-11-02 10:00:32 +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 |
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 |
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 |
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 |
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 |
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
|
5a20d41b77
|
【社稷大典】左上公会排行空白修改
|
2020-10-26 16:49:47 +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 |
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 |
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 |
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 |
ZhangBiao
|
01cbb3fba0
|
【社稷大典】提交5
|
2020-10-24 18:49:32 +08:00 |
ZhangBiao
|
a2a870f421
|
【社稷大典】提交4
|
2020-10-24 18:41:21 +08:00 |
ZhangBiao
|
8a1a1b2442
|
【社稷大典】提交3
|
2020-10-24 18:29:05 +08:00 |
ZhangBiao
|
0349671074
|
【社稷大典】提交2
|
2020-10-24 18:23:50 +08:00 |
ZhangBiao
|
a62dc62ead
|
【社稷大典】提交
|
2020-10-24 18:20:43 +08:00 |
jiaoyangna
|
06dcc9f41c
|
勇往直前 提交
|
2020-10-21 14:13:07 +08:00 |
gaoxin
|
f4cfce396c
|
Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit 1f9165688f .
|
2020-10-20 21:02:13 +08:00 |
gaoxin
|
1f9165688f
|
【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题
|
2020-10-20 20:37:51 +08:00 |
gaoxin
|
cd03b49824
|
【战斗0.0.6】修复判断数据是否存在接口错误
|
2020-10-20 20:27:14 +08:00 |
gaoxin
|
619ce2ea52
|
【逍遥游】筛子摇动和事件触发音效添加
|
2020-10-20 17:43:18 +08:00 |
wangzhenxing
|
b5b8f79dca
|
技能期间只触发一次被动触发条件修改
|
2020-10-20 16:29:44 +08:00 |
yuanshuai
|
885de6fe9b
|
逍遙游自动游历开启 相关脚本资源提交
|
2020-10-20 16:17:13 +08:00 |
ZhangBiao
|
958234c826
|
【推送礼包】推送最新礼包的拍脸
|
2020-10-20 14:58:50 +08:00 |
JieLing
|
cb6c7d393b
|
【竞技场】修复奖励不刷新2
|
2020-10-20 02:49:25 +08:00 |
JieLing
|
9007ed845a
|
【逍遥游】修复行动力不会恢复满的问题
|
2020-10-20 02:36:12 +08:00 |
JieLing
|
534ee58f6a
|
【竞技场】添加挑战次数显示,修复挑战后奖励显示不刷新的问题
|
2020-10-20 02:31:13 +08:00 |
JieLing
|
bb2b8b1818
|
【竞技场】修复奖励界面打不开的问题
|
2020-10-20 01:56:42 +08:00 |
JieLing
|
d514b3e0f8
|
【特效】修复获取不到特效节点的问题
|
2020-10-20 01:10:42 +08:00 |
gaoxin
|
3625da459f
|
【战斗】修复桃子技能错误
|
2020-10-20 00:39:27 +08:00 |
gaoxin
|
c6704e6ed4
|
【逍遥游】修复白片问题
|
2020-10-20 00:38:49 +08:00 |
gaoxin
|
f57b10696f
|
【逍遥游】云游值自动恢复修改
|
2020-10-20 00:29:09 +08:00 |
gaoxin
|
d9434f425d
|
修复部分奖励不刷新的问题
|
2020-10-20 00:28:41 +08:00 |
yuanshuai
|
a3c461aff9
|
云游值恢复问题修改
|
2020-10-20 00:28:09 +08:00 |
yuanshuai
|
aa9c366242
|
逍遥bug修改
|
2020-10-20 00:27:34 +08:00 |
jiaoyangna
|
93db6c028a
|
竞技场奖励显示错误
|
2020-10-20 00:21:08 +08:00 |
jiaoyangna
|
6c4f4f5b2d
|
boss commit
|
2020-10-19 23:40:50 +08:00 |
jiaoyangna
|
d39c078888
|
xiaoyao commit
|
2020-10-19 23:37:24 +08:00 |
jiaoyangna
|
589e535e73
|
generalpopup commit
|
2020-10-19 23:18:54 +08:00 |
gaoxin
|
f53a566ce8
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:57:02 +08:00 |
yuanshuai
|
0d4fd1a210
|
骰子动画添加提交
|
2020-10-19 22:56:56 +08:00 |
jiaoyangna
|
dc7e1c71d4
|
逍遥commit
|
2020-10-19 22:42:39 +08:00 |
ZhangBiao
|
a40b0dab17
|
逍遥游 commit
|
2020-10-19 22:38:57 +08:00 |
ZhangBiao
|
021692dc42
|
逍遥commit
|
2020-10-19 22:36:43 +08:00 |
jiaoyangna
|
6f0294902f
|
Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441 .
|
2020-10-19 22:25:23 +08:00 |
jiaoyangna
|
4aa18b7ac1
|
推送礼包派脸修改
|
2020-10-19 22:01:44 +08:00 |
jiaoyangna
|
61a07de094
|
拍脸commit
|
2020-10-19 22:01:34 +08:00 |
jiaoyangna
|
a4dd2ffd38
|
心魔试炼 1
|
2020-10-19 22:01:15 +08:00 |
yuanshuai
|
3b8317a897
|
逍遥游红点提交
|
2020-10-19 21:40:48 +08:00 |
yuanshuai
|
131d1aab1b
|
【逍遥游】红点和帮助弹窗提交
|
2020-10-19 21:39:48 +08:00 |
jiaoyangna
|
91778b2f77
|
【逍遥游】归元弹窗添加
|
2020-10-19 21:38:25 +08:00 |
gaoxin
|
ed26e9e758
|
公会副本刷新次数打印提交
|
2020-10-19 21:30:19 +08:00 |
ZhangBiao
|
1c955039ec
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-19 21:25:22 +08:00 |
ZhangBiao
|
e3bd86ef08
|
轩辕 修改 提交
(cherry picked from commit 27f8331e62 )
|
2020-10-19 21:25:12 +08:00 |
gaoxin
|
73063a72e3
|
【战斗0.0.4】代码遗漏补齐,
|
2020-10-19 21:06:01 +08:00 |
gaoxin
|
19135670ce
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-19 20:40:14 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
cd782feb4d
|
Merge branch '0活动开发聚集地/竞技场界面修改' into master_xma_local
|
2020-10-19 20:14:31 +08:00 |
ZhangBiao
|
56f5856a71
|
宝箱个数减负
|
2020-10-19 20:10:53 +08:00 |
ZhangBiao
|
43201d2172
|
每日 赛季奖励 显示错误修复
|
2020-10-19 19:41:36 +08:00 |
ZhangBiao
|
b52ebf46f4
|
竞技场 bug修改
|
2020-10-19 19:34:48 +08:00 |
ZhangBiao
|
4c5065ccf7
|
竞技场界面修改
|
2020-10-19 18:52:36 +08:00 |
gaoxin
|
d33fe98ef1
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 18:38:15 +08:00 |
gaoxin
|
05780afedb
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 18:37:59 +08:00 |
gaoxin
|
321aa22ec6
|
【战斗 0.0.3】尝试修复偶现战斗卡死得问题
|
2020-10-19 18:37:51 +08:00 |
ZhangBiao
|
e39706e312
|
遴选 社稷大典中对奖励界面的修改,到竞技场界面修改
|
2020-10-19 14:01:30 +08:00 |
ZhangBiao
|
09c3da664e
|
通用奖励界面 设计大典->竞技场界面修改
|
2020-10-19 13:54:08 +08:00 |
gaoxin
|
5dc4062a46
|
【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题
|
2020-10-17 20:08:40 +08:00 |
gaoxin
|
6326a8ab9a
|
【战斗0.0.1-同步local】添加引导战斗暂停接口
|
2020-10-17 19:03:34 +08:00 |
gaoxin
|
0baed21bf6
|
战斗逻辑同步
|
2020-10-17 18:35:52 +08:00 |
gaoxin
|
3810fc2da1
|
修复关卡推送礼包报错的问题
|
2020-10-17 18:19:03 +08:00 |
gaoxin
|
5e7bcff321
|
【竞技场周任务减负-1】前端还没做,表提交错误处理
|
2020-10-17 16:50:32 +08:00 |
ZhangBiao
|
bae7d6550e
|
竞技场界面修改
|
2020-10-16 19:36:21 +08:00 |
ZhangBiao
|
0dbf805ef8
|
限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d )
|
2020-10-23 17:38:45 +08:00 |
ZhangBiao
|
3b3a41c432
|
主题活动,势不可挡 霸哥修改
(cherry picked from commit dcf74880bc )
|
2020-10-23 17:38:33 +08:00 |
JieLing
|
386992eaa9
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-16 18:13:36 +08:00 |
ZhangBiao
|
9ac6eac395
|
礼包拍脸时机修复
|
2020-10-16 18:11:24 +08:00 |
ZhangBiao
|
4c55e3f1f0
|
推送礼包 special表id更改
|
2020-10-16 18:09:13 +08:00 |
ZhangBiao
|
8c4ff7e148
|
推送礼包 完事儿
|
2020-10-16 17:59:16 +08:00 |
jiaoyangna
|
435590808a
|
推送礼包修改
|
2020-10-16 17:59:00 +08:00 |
jiaoyangna
|
0fe316420a
|
推送礼包修改
|
2020-10-16 17:58:46 +08:00 |
ZhangBiao
|
f0e9063c97
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-16 17:56:39 +08:00 |
jiaoyangna
|
d340795646
|
主题活动修改 提交
|
2020-10-10 17:59:30 +08:00 |
jiaoyangna
|
9706c45942
|
主题活动修改
|
2020-10-10 16:15:27 +08:00 |
jiaoyangna
|
d51468cdca
|
势不可挡页签修改提交
|
2020-10-10 16:14:33 +08:00 |
jiaoyangna
|
aa9878a1f2
|
势不可挡 提交
|
2020-10-10 16:14:18 +08:00 |
jiaoyangna
|
8c5132185b
|
轩辕宝镜黑屏问题解决
|
2020-10-10 16:05:02 +08:00 |
gaoxin
|
8e3e25a450
|
修复无尽副本过渡期间依然可以进入的问题
|
2020-10-13 22:32:37 +08:00 |
jiaoyangna
|
f35bad0ee2
|
神州令跳转修改
|
2020-10-15 21:36:16 +08:00 |
jiaoyangna
|
14986fb3f5
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-15 21:30:32 +08:00 |
jiaoyangna
|
98c80ed67c
|
森罗幻境 修改
|
2020-10-15 21:26:56 +08:00 |
jiaoyangna
|
36559e89a7
|
【青龙秘宝】秘宝试炼页签下领取积分,升级时,青龙秘宝页签不会出现红点
|
2020-10-22 01:25:03 +08:00 |
jiaoyangna
|
72c09f393c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-21 23:18:44 +08:00 |
jiaoyangna
|
97bb590c24
|
主题活动修改
|
2020-10-21 23:18:39 +08:00 |
JieLing
|
bff69e473d
|
招募玩家详情展示魂印有问题
|
2020-10-13 15:51:20 +08:00 |
JieLing
|
602c8e9e02
|
监听事件未移除正确
|
2020-10-12 20:44:15 +08:00 |
zhangqiang
|
fe8c903b31
|
限时升级活动打开后 退出一段时间再返回报错
|
2020-10-12 19:34:33 +08:00 |
jiaoyangna
|
2b6705f176
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 17:13:44 +08:00 |
jiaoyangna
|
31895e8e25
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:56:44 +08:00 |
jiaoyangna
|
13b9886ddb
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-12 16:56:10 +08:00 |
jiaoyangna
|
e84efa0961
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:56:05 +08:00 |
ZhangBiao
|
e2b0244881
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-12 16:08:23 +08:00 |
ZhangBiao
|
767ac32ee1
|
回春散手动使用 数量不刷新 修复
|
2020-10-12 16:08:13 +08:00 |
zhangqiang
|
721418b30a
|
线上问题 宝器分解bug
|
2020-10-12 15:55:04 +08:00 |
JieLing
|
d58311bb2b
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-12 15:43:06 +08:00 |
gaoxin
|
199326c74b
|
修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。
|
2020-10-12 15:42:12 +08:00 |
ZhangBiao
|
aec2eb929c
|
(cherry picked from commit f087c0258b )
|
2020-10-12 15:39:57 +08:00 |
ZhangBiao
|
ff33dd07db
|
森罗回春散使用bug修改
(cherry picked from commit 62f185c859 )
|
2020-10-12 15:15:02 +08:00 |
ZhangBiao
|
a47d882155
|
森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f )
|
2020-10-12 15:14:27 +08:00 |
zhangqiang
|
2f31dad427
|
线上问题 vip 战力计算打开 只是表的 pvp 评分配成0
|
2020-10-12 14:48:22 +08:00 |
zhangqiang
|
b92be60aef
|
线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错
|
2020-10-12 14:47:56 +08:00 |
gaoxin
|
d9fbacce65
|
修改bug 限时活动itemView报错
|
2020-10-12 14:47:42 +08:00 |
zhangqiang
|
89d70855a4
|
线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3
|
2020-10-12 14:47:20 +08:00 |
zhangqiang
|
d2792bdb8b
|
线上活动 森罗幻境达人前端修改2
|
2020-10-12 14:47:02 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
gaoxin
|
36b366bf97
|
修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。
|
2020-10-12 14:35:23 +08:00 |
jiaoyangna
|
49e94e9204
|
森罗幻境动画删除
|
2020-10-12 14:00:55 +08:00 |
jiaoyangna
|
0c91a81329
|
【跳转】碧海卷使用按钮跳转位置不正确
|
2020-10-15 16:05:53 +08:00 |
jiaoyangna
|
b574323186
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-15 16:01:07 +08:00 |
jiaoyangna
|
0b0776c220
|
【丹心碧血】限时兑换活动界面黑屏
|
2020-10-15 16:00:58 +08:00 |
ZhangBiao
|
eb7b46f992
|
大闹天宫节点商店名称与内容不符修复
(cherry picked from commit 314dee578a )
|
2020-10-10 14:51:45 +08:00 |
jiaoyangna
|
0d99260d1a
|
【丹心碧血】限时召唤,up卡显示不正确
|
2020-10-10 13:39:50 +08:00 |
gaoxin
|
77b3855221
|
如果宝物被分解了,重复穿戴检测会报错
|
2020-10-10 10:35:49 +08:00 |
gaoxin
|
b95a75310c
|
再次修复登录时区服显示错误的问题
|
2020-10-10 10:00:07 +08:00 |
JieLing
|
bd09adfcba
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-10 09:59:35 +08:00 |
jiaoyangna
|
e7a695553f
|
轩辕宝镜关闭时销毁时间
|
2020-10-24 09:44:56 +08:00 |
gaoxin
|
9ff73bfa4c
|
添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上
|
2020-10-09 21:46:03 +08:00 |
JieLing
|
b50602d94c
|
Merge branch 'master_xma_test' into master_xma_local
|
2020-10-09 17:02:03 +08:00 |
jiaoyangna
|
3deee80779
|
限时抢购界面修改
|
2020-10-15 21:28:23 +08:00 |
jiaoyangna
|
4ba6146a46
|
限时抢购界面修改
|
2020-10-15 21:24:08 +08:00 |
jiaoyangna
|
7b9a4140f7
|
青龙秘宝任务报错修改
|
2020-10-15 18:18:46 +08:00 |
jiaoyangna
|
8b75d0a9d1
|
百宝商会修改提交
|
2020-10-15 17:16:32 +08:00 |
jiaoyangna
|
8759e04261
|
购买等级报错修改
|
2020-10-15 16:38:32 +08:00 |
jiaoyangna
|
feda1432e3
|
Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test
|
2020-10-15 16:32:08 +08:00 |
jiaoyangna
|
8b1012892f
|
青龙秘宝礼包状态修改
|
2020-10-15 16:31:53 +08:00 |
zhangqiang
|
297d71d2ff
|
线上问题 无尽副本轮换前5分钟无法进入
|
2020-10-09 15:21:00 +08:00 |
zhangqiang
|
f56fa9d4e8
|
线上问题 大闹天宫招募带宝器的英雄是报错
|
2020-10-09 15:20:53 +08:00 |
gaoxin
|
422a8abaa4
|
修复属性类被动会导致战斗日志报错的问题
|
2020-10-09 14:26:28 +08:00 |
jiaoyangna
|
8ff0382e41
|
丹心碧血主界面icon 修改提交
|
2020-10-15 14:06:16 +08:00 |
jiaoyangna
|
2e272debe3
|
一键宝物重复穿戴宝物bug 修改
|
2020-10-15 14:06:06 +08:00 |
jiaoyangna
|
d249eb412f
|
丹心碧血提交
|
2020-10-15 14:05:56 +08:00 |
jiaoyangna
|
8a43d1c9da
|
主题活动修改
|
2020-10-15 14:05:41 +08:00 |
jiaoyangna
|
7c38428100
|
丹心碧血图片提交
|
2020-10-15 14:04:45 +08:00 |
zhangqiang
|
a697e38584
|
修改为正式服
|
2020-09-30 11:15:56 +08:00 |
JieLing
|
bd5d9da3bf
|
部分功能通过判断提审服和正式服进行开启和关闭
|
2020-09-30 11:14:43 +08:00 |
zhangqiang
|
79309899b0
|
青龙秘宝礼包更新问题
|
2020-09-30 11:00:12 +08:00 |
zhangqiang
|
42f0f9b5fe
|
修复三界降魔头像框点击无反应
|
2020-09-30 10:34:07 +08:00 |
zhangqiang
|
48a462f37f
|
打点包名判断修改
|
2020-09-29 15:15:58 +08:00 |
jiaoyangna
|
fd2f210c5b
|
【ID1010112】【魂印】在大闹天宫中招募神将后,神将身上的魂印会显示在玩家装备魂印时的列表中
|
2020-09-29 11:30:52 +08:00 |
jiaoyangna
|
c7836b8aea
|
编队界面修改提交
|
2020-09-28 21:08:12 +08:00 |
jiaoyangna
|
fc28d51836
|
VIPpanel2修改
|
2020-09-28 20:02:36 +08:00 |
jiaoyangna
|
ce14511e3c
|
Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test
|
2020-09-28 20:00:20 +08:00 |
jiaoyangna
|
c6142a96f8
|
青龙秘宝等级界面时间销毁修改
|
2020-09-28 19:58:56 +08:00 |
JieLing
|
83b1d46e2a
|
勇冠三军累计充值领取按钮状态修复
|
2020-09-28 18:15:07 +08:00 |
zhangqiang
|
95dcbfb0c7
|
四元阵去掉没有的音效
|
2020-09-28 17:54:04 +08:00 |
JieLing
|
62072b5b1e
|
限时活动显示兑换显示问题
|
2020-09-28 17:41:24 +08:00 |
gaoxin
|
75a8cade8b
|
默认头像修改
|
2020-09-28 17:35:34 +08:00 |
jiaoyangna
|
6f0b87c858
|
轩辕适配修改,文字颜色修改
|
2020-09-28 16:56:22 +08:00 |
jiaoyangna
|
74d675ee95
|
Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test
|
2020-09-28 16:33:21 +08:00 |
jiaoyangna
|
9875595535
|
添加进入轩辕宝镜编队界面的逻辑
|
2020-09-28 16:32:59 +08:00 |
ZhangBiao
|
5cef7f561a
|
女人物大小修改
(cherry picked from commit 5320fb5211 )
|
2020-09-28 16:06:31 +08:00 |
JieLing
|
8afa0c96a8
|
签到修改
|
2020-09-28 15:43:39 +08:00 |
JieLing
|
0fdac5e7d3
|
成长基金领取报错修改,签到报错修改,天赋提示文字
|
2020-09-28 15:41:17 +08:00 |
JieLing
|
ee65632939
|
成长基金修改
|
2020-09-28 15:35:28 +08:00 |
JieLing
|
39105d8de3
|
轩猿修改
|
2020-09-28 15:20:27 +08:00 |
JieLing
|
f4f505eb6c
|
轩辕提示修改提交
|
2020-09-28 15:16:49 +08:00 |
JieLing
|
bd21a12b98
|
轩辕commit
|
2020-09-28 15:08:35 +08:00 |
JieLing
|
b7cd64f977
|
开服狂欢不可完成奖励修改,日常任务弹活动关闭异常
|
2020-09-28 14:11:00 +08:00 |
JieLing
|
e5b42a0840
|
修复第四周活动二级弹窗显示错误
|
2020-09-28 11:33:49 +08:00 |
JieLing
|
823ae72aec
|
修复0元礼包无法购买的问题,修复引导合成碎片卡死
|
2020-09-28 10:27:06 +08:00 |
JieLing
|
223f8b11b4
|
修复在手机上战斗报错
|
2020-09-27 20:54:50 +08:00 |
jiaoyangna
|
947d647266
|
轩辕修改提交
|
2020-09-27 20:40:30 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
zhangqiang
|
46a9536c19
|
线上 : 战力计算 注释 VIP属性加成
|
2020-09-27 19:16:33 +08:00 |
gaoxin
|
673070438b
|
头像默认显示复原
|
2020-09-27 19:05:09 +08:00 |
jiaoyangna
|
fc727e1061
|
时间销毁
|
2020-09-27 18:29:41 +08:00 |
jiaoyangna
|
b7b6b4189c
|
碎片属性图片修改提交
|
2020-09-27 18:29:20 +08:00 |
JieLing
|
907d092c04
|
遗漏同步提交
|
2020-09-27 18:27:20 +08:00 |
gaoxin
|
bf3641d6c3
|
物品框添加头像框的特效
|
2020-09-27 16:58:21 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
gaoxin
|
541b4fc271
|
战斗逻辑同步
|
2020-09-27 16:56:15 +08:00 |
JieLing
|
c3cce0b06e
|
百宝商会活动添加
|
2020-09-27 16:52:40 +08:00 |
ZhangBiao
|
def3e829ff
|
三界降魔
|
2020-09-27 16:44:39 +08:00 |
ZhangBiao
|
97f9b8f671
|
遴选三界除魔
|
2020-09-27 16:44:31 +08:00 |
ZhangBiao
|
d601794a17
|
三界降魔
|
2020-09-27 16:43:49 +08:00 |
ZhangBiao
|
e9b994126e
|
三界降魔
|
2020-09-27 16:43:42 +08:00 |
ZhangBiao
|
c4706208ef
|
三界除魔功能添加
|
2020-09-27 16:43:33 +08:00 |
JieLing
|
c6391090f2
|
三界除魔界面添加
|
2020-09-27 16:38:44 +08:00 |
jiaoyangna
|
6a764f569e
|
跳转限时兑换修改
|
2020-09-27 16:21:42 +08:00 |
gaoxin
|
5b7e3c7a9b
|
每日一键购买礼包金额显示添加
|
2020-09-27 16:15:46 +08:00 |
zhangqiang
|
55e159d665
|
线上活动 : 四周活动 天宫达人 问题
|
2020-09-27 16:15:21 +08:00 |
zhangqiang
|
96ab48c22f
|
遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表
|
2020-09-27 16:14:42 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
JieLing
|
e9159cc1ca
|
修复大闹天宫招募带有宝物的英雄会导致登陆卡死的问题,针对装备丢失添加判空操作避免登陆卡死
|
2020-09-27 15:09:28 +08:00 |
JieLing
|
4c9db13851
|
修复青龙秘宝不关闭bug
|
2020-09-23 17:41:48 +08:00 |
JieLing
|
443a157006
|
【破阵诛仙】点金达人任务,跳转点金,不计数,修复乾坤宝盒快速切换报错的问题
|
2020-09-22 18:13:49 +08:00 |