Commit Graph

6957 Commits (c40c6640c9551016287a89d3074f43ca23a4232f)
 

Author SHA1 Message Date
jiaoyangna 32750ffa34 【无尽副本】未激活五星神将或未选择五星神将不允许进入地图 2021-06-01 17:10:07 +08:00
wangzhenxing 54d0501bed Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:59:42 +08:00
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
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