Commit Graph

6957 Commits (c40c6640c9551016287a89d3074f43ca23a4232f)
 

Author SHA1 Message Date
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
gaoxin 3a6806bb3b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:18:54 +08:00
gaoxin c76a7052a0 【配置】打开语音 2021-05-31 18:18:49 +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
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
ZhangBiao f52b234e1b 【御兽斋】显示妖晶抽不足修改
(cherry picked from commit 4f406045a6)
2021-05-31 10:51:18 +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
jiaoyangna 05279cc3c1 Revert "小游戲修改提交"
This reverts commit ec83a6301a.
2021-05-31 10:41:12 +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