Commit Graph

6586 Commits (f61895540979ed4491b0be9cf845aa049492ad5f)
 

Author SHA1 Message Date
zhangqiang f618955409 【限时抽卡】报错修复 2021-05-31 17:15:24 +08:00
jiaoyangna e1b523c394 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:08:07 +08:00
jiaoyangna 0268a71c9b 无尽秘宝描述修改提交 2021-05-31 17:07:49 +08:00
gaoxin 7f0e97dd32 【资源】名字重复修正 2021-05-31 16:29:01 +08:00
gaoxin 1bf055be80 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:29:21 +08:00
gaoxin 3645d39b93 【场景】添加喜扑入口场景 2021-05-31 15:29:10 +08:00
ZhangBiao 337cb0a203 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:18:13 +08:00
ZhangBiao 6d0e6a9e1a 【名字颜色】公会申请 2021-05-31 15:18:02 +08:00
gaoxin 3d412a4b85 【登录】登录接口添加新的参数 2021-05-31 15:15:20 +08:00
gaoxin bddb02cf81 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:02:06 +08:00
gaoxin 9b3a837d4d 【资源】踏碎凌霄称号资源上传 2021-05-31 15:01:58 +08:00
ZhangBiao f61ac46634 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 15:00:43 +08:00
ZhangBiao 0259117f7b 【名字颜色】修改 2021-05-31 15:00:28 +08:00
zhangqiang a86b66a2eb 【十一星】英雄未获得详情报错修复 2021-05-31 14:46:56 +08:00
jiaoyangna 5ac8072007 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 14:22:54 +08:00
jiaoyangna 4a204eaba2 【无尽副本】在秘宝界面,刷新无尽副本,秘宝界面不关闭 2021-05-31 14:22:40 +08:00
ZhangBiao 581be265af Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 11:58:56 +08:00
ZhangBiao a6b6b2222b 【牛气冲天】奖励位置修改 2021-05-31 11:58:45 +08:00
wangzhenxing 10f97f9b8b [许愿神将]===活动修改 2021-05-31 11:31:15 +08:00
gaoxin c90a961032 【音乐】story_1_2 修改 2021-05-31 11:29:02 +08:00
gaoxin d311f479a4 【工具】热更工具添加 2021-05-31 11:24:20 +08:00
gaoxin 1b366fb607 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 11:07:06 +08:00
jiaoyangna 0d7f28a9fa 百宝修改提交 2021-05-31 11:06:23 +08:00
gaoxin 92a04cc440 【抽卡】修复第一次抽卡报错的问题 2021-05-31 11:06:20 +08:00
jiaoyangna 7db0e3be54 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 10:47:02 +08:00
jiaoyangna 59c3bbf5ae 百宝 修改 2021-05-31 10:46:34 +08:00
gaoxin 928a64f435 【物品】添加一个碎片类型 2021-05-31 10:37:50 +08:00
ZhangBiao df955dac39 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 10:28:32 +08:00
ZhangBiao 4f406045a6 【御兽斋】显示妖晶抽不足修改 2021-05-31 10:28:21 +08:00
zhangqiang 4ca111da25 【山河社稷图】数据修改 2021-05-29 23:14:16 +08:00
zhangqiang cfc4e57482 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 22:50:07 +08:00
zhangqiang 2c27d19046 【关卡属性提升】修改提交 2021-05-29 22:49:43 +08:00
ZhangBiao a1e7cb334a 【成长礼包】玉帝立绘下调 2021-05-29 22:49:24 +08:00
jiaoyangna acfc98c16f 延续时间修改 2021-05-29 22:47:20 +08:00
jiaoyangna b91e550147 百宝商会 提交 2021-05-29 22:16:50 +08:00
jiaoyangna 4898fb0ed7 百宝商会 修改提交 2021-05-29 21:56:10 +08:00
jiaoyangna 45307d2d3f 百宝商会提交 2021-05-29 21:42:41 +08:00
jiaoyangna 2666db8cf6 百宝商会修改提交 2021-05-29 21:31:39 +08:00
jiaoyangna 78f87d2b52 百宝商会 修改提交 2021-05-29 21:31:01 +08:00
jiaoyangna c08a8f2556 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 21:06:27 +08:00
jiaoyangna 37b818abb5 图片提交 2021-05-29 21:06:11 +08:00
ZhangBiao 5fbad73cbe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 20:48:14 +08:00
ZhangBiao 6ea9015bed 【修行】印记提交4 2021-05-29 20:48:07 +08:00
zhangqiang 028a31941f 【背包】背包中道具详情没有“使用”按钮 2021-05-29 20:44:43 +08:00
wangzhenxing b1fcc5d4e5 [限时活动,福利红包]=======bug修改 2021-05-29 20:36:26 +08:00
gaoxin e1759216d2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 20:25:57 +08:00
gaoxin 6fbec8a36e 【森罗幻境】转盘小游戏修复抽中非物品时报错的问题 2021-05-29 20:25:52 +08:00
jiaoyangna 9275f0f011 字修改提交 2021-05-29 20:22:55 +08:00
jiaoyangna 9eee295a1f 价格修改提交 2021-05-29 20:17:50 +08:00
jiaoyangna e0089a98da Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 20:05:14 +08:00