Commit Graph

6673 Commits (fd8d35fabba613ca0cd26a3baf893a6c203b7643)
 

Author SHA1 Message Date
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
gaoxin 26511c3c5b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 11:05:20 +08:00
gaoxin 16eacf1a47 【打包工具】修改提交命令 2021-06-01 11:02:08 +08:00
gaoxin 8f29aa0cf8 【打包工具】添加是否要提交到GIt的判断 2021-06-01 11:01:04 +08:00
jiaoyangna df94ccee38 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 10:59:10 +08:00
jiaoyangna 5c778aad22 森罗幻境】试炼精气特效消失 2021-06-01 10:58:46 +08:00
JieLing e322108f26 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 10:56:50 +08:00
JieLing 4322ac35bd 【打包工具】调用GIT命令 2021-06-01 10:56:20 +08:00
jiaoyangna 1e4a316d3e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 10:50:38 +08:00
jiaoyangna d7947bcf75 关卡奖励与在线奖励存在,山河社稷图图标显示位置在在线奖励上方(图标位置应显示在其下方) 2021-06-01 10:50:22 +08:00
gaoxin 70bc51f319 【工具】自动打包工具GIT操作加入 2021-06-01 10:41:03 +08:00
JieLing 3e12b64118 【打包工具】修复拷贝提示错误 2021-05-31 21:54:13 +08:00
gaoxin 10deef53cf 【更新】更新界面背景加载方式修改 2021-05-31 21:36:05 +08:00
gaoxin 598b92f288 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 21:12:40 +08:00
gaoxin 9a98ff2e0a 【工具】拷贝过程添加界面显示 2021-05-31 21:12:34 +08:00
jiaoyangna 5bc754678e 报错修改 2021-05-31 20:39:46 +08:00
gaoxin d8ffbe8600 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 20:24:27 +08:00
gaoxin 595df075ed 【工具】打包工具优化 2021-05-31 20:24:15 +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
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