Commit Graph

5813 Commits (f265cb07ef971c0189b16b60546597d0b294a265)

Author SHA1 Message Date
wangzhenxing 5bcfe86999 【公会红包】====红包刷新逻辑修改 2021-06-01 16:59:27 +08:00
ZhangBiao 45df61f535 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:55:13 +08:00
ZhangBiao 0cfcbd8821 【星辰商店】入口光效穿透 2021-06-01 16:54:30 +08:00
jiaoyangna c4c0cb5a69 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:53:25 +08:00
jiaoyangna 259155fe52 【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
2021-06-01 16:53:08 +08:00
ZhangBiao be9a815d00 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:39:30 +08:00
ZhangBiao 9f586818c2 【修行】特效问题提交 2021-06-01 16:39:09 +08:00
gaoxin d688a013bb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:30:22 +08:00
gaoxin 2c7b62e2e4 【资源】物品资源导入 2021-06-01 16:30:17 +08:00
zhangqiang 3516118d51 【山河社稷图】宝箱节点加特效 2021-06-01 15:48:29 +08:00
gaoxin 58faec4feb 【红点】主界面鸿蒙阵红点没有清除 2021-06-01 15:44:18 +08:00
ZhangBiao 7befa27a1d 【功能引导】首充引导,在入口栏下拉状态下引导,会引导收起 2021-06-01 15:11:03 +08:00
ZhangBiao 857d52c057 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 14:59:07 +08:00
ZhangBiao 2a4927477c 【主题活动】跳转问题 2021-06-01 14:58:57 +08:00
jiaoyangna 8f31b07d52 主城百宝时间修改提交 2021-06-01 14:54:46 +08:00
jiaoyangna 162cea9631 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 14:50:10 +08:00
jiaoyangna 872a9c57ac 百宝修改提交 2021-06-01 14:49:51 +08:00
wangzhenxing aa3171aef7 [抽卡祈愿]======活动报错修改 2021-06-01 14:41:28 +08:00
jiaoyangna dd990fd4b2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 14:15:24 +08:00
jiaoyangna 1f1d9f6ff2 活动页签修改提交 2021-06-01 14:12:49 +08:00
gaoxin a7fad33250 【tip】修复会遮挡点击事件的问题 2021-06-01 14:09:14 +08:00
ZhangBiao 8c6ec719f0 【名字颜色】排行榜首页颜色 2021-06-01 14:02:25 +08:00
ZhangBiao 3ef54596d3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 13:54:32 +08:00
ZhangBiao c98aa8c703 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
jiaoyangna d82bbbf579 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 13:54:05 +08:00
jiaoyangna a1bc2ae463 活动修改提交 2021-06-01 13:53:47 +08:00
zhangqiang 7048691167 【心愿抽卡】十连没音效 2021-06-01 13:42:36 +08:00
jiaoyangna ad004ddc5e 限时召唤修改提交 2021-06-01 11:46:00 +08:00
jiaoyangna a60e73f5ef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 11:45:19 +08:00
jiaoyangna 12fcc3ea14 【百宝商会】剩余时间显示错误,应显示当天刷新时间 2021-06-01 11:44:49 +08:00
zhangqiang ba93c4e861 【抽卡跳过音效没有跳过】 2021-06-01 11:16:37 +08:00
jiaoyangna 5c778aad22 森罗幻境】试炼精气特效消失 2021-06-01 10:58:46 +08:00
jiaoyangna d7947bcf75 关卡奖励与在线奖励存在,山河社稷图图标显示位置在在线奖励上方(图标位置应显示在其下方) 2021-06-01 10:50:22 +08:00
jiaoyangna 5bc754678e 报错修改 2021-05-31 20:39:46 +08:00
ZhangBiao bfd8bee59e 【青龙秘宝】刷新不及时修改 2021-05-31 20:09:19 +08:00
gaoxin 081ff4c0d8 【资源】修行和困难副本预告图标上传 2021-05-31 19:20:37 +08:00
gaoxin 0def3449c3 【配置】loading界面背景实现配置 2021-05-31 19:19:57 +08:00
wangzhenxing 5ec2c38563 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:02:05 +08:00
wangzhenxing db6f172f70 [显示抽卡活动]============抽卡活动类型常量修改 2021-05-31 18:01:37 +08:00
ZhangBiao b4dc20a3bb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:01:19 +08:00
ZhangBiao 9ebd4c5e05 【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面 2021-05-31 18:00:42 +08:00
zhangqiang 78a6fe54d8 【大闹天宫】重置阶段,点主城也会提示 2021-05-31 17:39:13 +08:00
wangzhenxing b6787d229c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:34:50 +08:00
wangzhenxing 7387023dfe [战斗]======通关星级条件 检测逻辑 4 修改 2021-05-31 17:33:29 +08:00
gaoxin 8b35b8ccf7 【踏碎凌霄】称号icon上传 2021-05-31 17:32:18 +08:00
gaoxin 60e474f248 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 17:31:46 +08:00
gaoxin 6b0ff9668d 【配置】包配置添加 2021-05-31 17:31:31 +08:00
zhangqiang c5d1a11be2 【限时抽卡】 2021-05-31 17:22:30 +08:00
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
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 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
jiaoyangna b071e12e29 秘宝描述修改 2021-05-29 20:04:48 +08:00
ZhangBiao cb13866ba7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-29 19:59:00 +08:00
ZhangBiao 19bce27f34 【修行】提交3 2021-05-29 19:58:52 +08:00
jiaoyangna 9c932e0d8c 积分修改 2021-05-29 19:56:09 +08:00
ZhangBiao 717b0039cb 【修行】印记提交2 2021-05-29 19:49:25 +08:00