Commit Graph

91 Commits (3bc2b74ce5995784f77d4850a186f297ddf5a24f)

Author SHA1 Message Date
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
jiaoyangna 9e7cd31376 逍遥游云游宝玉修改提交 2020-10-29 11:03:13 +08:00
ZhangBiao 01cbb3fba0 【社稷大典】提交5 2020-10-24 18:49:32 +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
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 91778b2f77 【逍遥游】归元弹窗添加 2020-10-19 21:38:25 +08:00
ZhangBiao 767ac32ee1 回春散手动使用 数量不刷新 修复 2020-10-12 16:08:13 +08:00
jiaoyangna 8759e04261 购买等级报错修改 2020-10-15 16:38:32 +08:00
JieLing e5b42a0840 修复第四周活动二级弹窗显示错误 2020-09-28 11:33:49 +08:00
gaoxin 701db5bb17 充值接口修改,sdk和本地走同一套接口 2020-09-09 20:13:23 +08:00
zhangqiang 40610b0c19 献祭修改 2020-08-31 18:19:38 +08:00
ZhangBiao 50dd63cd06 小游戏18按钮大小调整,前往下一层文字大小修改、 2020-08-31 16:06:57 +08:00
ZhangBiao a2c8352e29 装备文字过长、仙缘宝箱优化、充值妖晶提示问题 2020-08-28 18:37:16 +08:00
ZhangBiao cdc5c07b84 天宫秘宝在副本界面的红点 2020-08-28 10:36:09 +08:00
ZhangBiao 4f64e56b95 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 10:19:03 +08:00
ZhangBiao 7c02e82218 森罗回春散bug修复 2020-08-28 10:14:46 +08:00
gaoxin c933276cea 试炼增益添加滑动效果 2020-08-28 00:24:06 +08:00
ZhangBiao 4a452addd1 天宫秘宝报错修改 2020-08-27 22:10:08 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao e3b872d31a 元-》$ 2020-08-25 14:37:28 +08:00
ZhangBiao 6f182e075a 天宫秘宝 解锁额外奖励文字提示修改,提示”置换玉不足“ 2020-08-25 10:05:15 +08:00
ZhangBiao 1382118441 成就点击进入是青龙 问题修复 2020-08-24 21:09:36 +08:00
ZhangBiao d02a997cb0 天宫秘宝额外奖励界面 2020-08-24 20:37:41 +08:00
jiaoyangna 1ad1aaa2d4 qinglong update 2020-08-24 19:45:18 +08:00
zhangqiang b36ebe510c 修改宝物分解 2020-08-24 16:29:27 +08:00
zhangqiang 6deae3c54c 公会副本次数修改 送神祠修改bug 2020-08-24 13:59:08 +08:00
jiaoyangna cf0747566b qinglong commit 2020-08-22 21:28:44 +08:00
jiaoyangna 4604d95f9d qinglong commit 2020-08-22 21:20:12 +08:00
jiaoyangna adff7af35a qinglong commit 2020-08-22 20:22:30 +08:00
ZhangBiao b01a3f31f9 Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/MonsterGroup.xlsx
2020-08-20 15:00:23 +08:00
ZhangBiao f9ffc1aa39 无尽细节修改 2020-08-19 19:37:59 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
jiaoyangna a9ebd162ec 轩辕 提交 2020-08-12 21:10:36 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
zhangqiang 22ad34291b 献祭 和 吞卡 掉落身上装备不显示提交 2020-08-10 14:16:48 +08:00
zhangqiang cca8355c33 神将合成提交 2020-08-10 11:28:25 +08:00
zhangqiang 7749211534 合成修改 2020-08-08 19:27:10 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
zhangqiang 3bb0906865 法宝归元中文表 2020-08-06 10:38:55 +08:00
zhangqiang 0a37b3cb11 法宝回归协议提交 2020-08-07 12:41:35 +08:00
ZhangBiao 879331e416 森罗炸弹数量刷新,奖励和generalpanel界面适配 2020-08-05 18:02:47 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao 24381aba57 森罗bug修复 2020-08-04 16:18:48 +08:00
ZhangBiao 9b28e7c140 森罗bug修改 2020-08-03 16:59:37 +08:00
jiaoyangna 89dbd09856 resolve hero tails update 2020-08-03 10:32:20 +08:00
zhangqiang 1ac12b1721 妖精单抽提示数量错误修改 2020-08-15 23:23:38 +08:00
ZhangBiao ee4ecf49c2 森罗环境 炸弹 终于完了 2020-07-29 20:18:19 +08:00