Commit Graph

1417 Commits (92b2c3d6fb97f28a756fb0261d0f80c94c0b68e1)

Author SHA1 Message Date
zhangqiang 92b2c3d6fb 提交 2020-10-19 10:56:55 +08:00
wangzhenxing 711986c6a9 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-17 14:11:47 +09:00
wangzhenxing bd4f93309f 灵兽涅槃,召唤,商店提交 2020-10-17 14:11:34 +09:00
zhangqiang c6627d93e5 提交 2020-10-16 17:03:53 +08:00
zhangqiang 179242de4c 提交 2020-10-16 16:50:27 +08:00
zhangqiang 425023d697 提交 2020-10-15 20:52:15 +08:00
wangzhenxing 45be005e63 灵兽抽卡放生功能提交 2020-10-15 20:27:41 +09:00
zhangqiang b93d7d0435 提交 2020-10-15 15:43:35 +08:00
zhangqiang eaf610e9c2 提交 2020-10-14 19:41:33 +08:00
zhangqiang b37b584d68 提交 2020-10-14 17:10:36 +08:00
wangzhenxing aa82e7f13f Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-14 16:58:43 +09:00
wangzhenxing be7ba4315a 抽卡活动添加灵兽类型 2020-10-14 16:58:28 +09:00
zhangqiang c939bab156 提交 2020-10-13 19:14:34 +08:00
zhangqiang f28501a893 提交 2020-10-13 16:32:50 +08:00
zhangqiang bf2804f080 提交 2020-10-13 13:56:41 +08:00
zhangqiang 49d2f4e347 添加界面 和表 2020-10-13 11:47:35 +08:00
wangzhenxing ed1d0e6150 灵兽修改提交 2020-09-29 16:13:06 +09:00
wangzhenxing b7ecba8fab 合并冲突提交 2020-09-28 14:57:46 +09:00
wangzhenxing 663a54c9ed language表提交 2020-09-28 14:54:15 +09:00
zhangqiang cccab99a11 灵兽提交 2020-09-28 11:22:47 +08:00
zhangqiang 0a3f59befa 灵兽提交 2020-09-27 11:46:09 +08:00
zhangqiang 637d910b5c 灵 受 2020-09-25 18:41:07 +08:00
zhangqiang f40b2050ad 灵兽培养部分初始脚本 2020-09-25 14:48:10 +08:00
wangzhenxing e92fb73587 灵兽逻辑提交 2020-09-25 11:45:43 +09:00
jiaoyangna cfd1f8d51b 添加动画 2020-09-18 13:43:52 +08:00
gaoxin 2eeb4af779 修复切磋战斗结果只会显示失败的问题 2020-09-17 16:23:26 +08:00
zhangqiang d700e0da1c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-17 14:16:04 +08:00
ZhangBiao 4041b229cc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 12:22:19 +08:00
ZhangBiao e13026857d 限时兑换onhide function增加 2020-09-17 09:49:43 +08:00
zhangqiang cbdac88541 xuanyuan commit 2020-09-16 19:24:32 +08:00
zhangqiang b00d112660 xuanyaun commit 2020-09-16 18:54:48 +08:00
zhangqiang d423f61e4b 轩辕commit 2020-09-16 18:48:21 +08:00
zhangqiang 97b10ca124 打印 2020-09-16 18:36:41 +08:00
ZhangBiao e6b1832121 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 18:18:36 +08:00
ZhangBiao 6be45b4e89 幸运探宝增加动效 2020-09-16 18:18:07 +08:00
wangxiaolong 293ac2b2f2 Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 14:45:28 +08:00
wangxiaolong 209ba84534 添加冗余代码调用 + 修改私有方法名称 2020-09-16 14:45:10 +08:00
ZhangBiao 60a335684d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 14:09:41 +08:00
ZhangBiao 5cd8e621dc 限时活动,限时兑换、礼包抢购增加动效 2020-09-16 14:09:31 +08:00
jiaoyangna 568d7c8ee2 万象境入口修改 2020-09-16 11:26:06 +08:00
ZhangBiao 60172f3089 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 10:52:16 +08:00
ZhangBiao 13fff17277 在线奖励一键领取 2020-09-16 10:52:09 +08:00
zhangqiang 7332783723 音效修改 2020-09-16 10:26:34 +08:00
zhangqiang e5c91eff67 音效 2020-09-16 10:14:43 +08:00
jiaoyangna b202a02455 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-18 18:34:14 +08:00
jiaoyangna 35c5de3561 适配修改提交 2020-09-18 18:34:02 +08:00
jiaoyangna 52d4ff90c5 修改标题 2020-09-18 18:17:35 +08:00
zhangqiang eab93ec002 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 18:16:09 +08:00
zhangqiang 6f107f78fa 音效 2020-09-15 18:16:01 +08:00
gaoxin a0d4042475 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 18:07:43 +08:00