Commit Graph

8011 Commits (0db39ccbe3ab303f1759fb33f57811a016607584)
 

Author SHA1 Message Date
gaoxin 6405a0ad4d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 17:06:01 +08:00
gaoxin 1f4499e8bb 【物品特效】修复魂印特效显示错误 2021-07-09 17:05:55 +08:00
jiaoyangna 2686f970d7 无尽副本修改提交 2021-07-09 17:04:25 +08:00
ZhangBiao a00e8d0966 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 16:56:33 +08:00
ZhangBiao 958254f93d 【神将升级】升级加校验 2021-07-09 16:56:05 +08:00
jiaoyangna dd1f598515 【ID1009609】
【优化】无尽副本优化
2021-07-09 15:22:10 +08:00
gaoxin 1a33172a27 【地图】节点27是特效节点 2021-07-09 15:02:11 +08:00
gaoxin c33b24ba18 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 14:57:02 +08:00
gaoxin be7cc055a1 【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示 2021-07-09 14:56:57 +08:00
jiaoyangna 21b85bedff 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移  调整间距

(cherry picked from commit eae0af74e5)
2021-07-09 14:47:17 +08:00
jiaoyangna eae0af74e5 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移  调整间距
2021-07-09 14:45:11 +08:00
gaoxin 5d60ef45ab 【地图】添加第27号事件点 2021-07-09 14:37:40 +08:00
jiaoyangna 92c22544e0 修改抽卡界面描述 2021-07-09 14:08:17 +08:00
gaoxin 49b55f863a 【地图资源导入】 2021-07-09 13:59:43 +08:00
jiaoyangna 894e7d7c46 抽卡动画播放时。去掉跳过按钮,改为点击屏幕任意位置,即可跳过动画,界面内增加 2021-07-09 13:39:24 +08:00
jiaoyangna 55b4379c47 【ID1009654】
【优化】优化抽卡界面
2021-07-09 12:01:28 +08:00
gaoxin b11fe20dfd 【Android】删除对某特殊sdk的配置 2021-07-09 11:58:35 +08:00
gaoxin b45278e389 【version】删除AssetBundles中无用的version配置 2021-07-09 11:57:46 +08:00
gaoxin 9b48609229 【C#Log】C#层log打印走log等级控制 2021-07-09 11:56:53 +08:00
wangzhenxing 33b37451e1 【战斗】=============被动 108 200 283 322 修改 新增被动 337 2021-07-09 11:54:02 +08:00
ZhangBiao 5e1897515b 【商店】商店黑屏修复 2021-07-09 11:10:38 +08:00
ZhangBiao 3194181f65 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-08 18:42:23 +08:00
ZhangBiao b02b315f78 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-08 18:41:26 +08:00
jiaoyangna 23c58e1bd0 九元露图片提交
(cherry picked from commit 75b93cdff1)
2021-07-08 18:41:24 +08:00
ZhangBiao fc8e199a43 【鸿蒙阵】使者处于突破等级且突破,共鸣神将不算突破 2021-07-08 18:41:14 +08:00
jiaoyangna 30ab410f00 抽卡优化 2021-07-08 18:40:43 +08:00
jiaoyangna 75b93cdff1 九元露图片提交 2021-07-08 18:39:39 +08:00
jiaoyangna fa30243bf5 玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
2021-07-08 18:30:29 +08:00
jiaoyangna 6ea9ee51c0 玉皇大帝修改提交 2021-07-08 18:29:28 +08:00
zhangqiang 21ec904da5 【心魔试炼】点击快速战斗偶先报错卡死 2021-07-08 18:08:16 +08:00
zhangqiang c723fa04af 【飘邈之旅】页签的入口文字要与图片统一成“飘邈之旅”字 2021-07-08 16:20:22 +08:00
ZhangBiao e250223aa2 【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a)
2021-07-08 15:55:04 +08:00
ZhangBiao 30f2a8cb1a 【鸿蒙阵】增加logerror 2021-07-08 15:51:10 +08:00
ZhangBiao 52a7b26e0a 【新副本】预设修改 2021-07-08 11:30:03 +08:00
ZhangBiao 3764ac753b 【新副本】界面时间显示调整 2021-07-08 10:15:39 +08:00
wangzhenxing f247221fcc 【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能) 2021-07-07 20:29:37 +08:00
JieLing 6729f1e78c Merge remote-tracking branch 'origin/china/test' into china/zf_test 2021-07-07 19:05:19 +08:00
ZhangBiao a31a51f08f 【新副本】resource提交 2021-07-07 18:42:45 +08:00
ZhangBiao f44a8c280f Merge branch 'china/dev' into 0优化/副本界面 2021-07-07 18:42:13 +08:00
jiaoyangna ad6f24b8d0 排序修改提交 2021-07-07 17:27:11 +08:00
jiaoyangna 8c8456b3a6 百宝商会文字错乱修改 2021-07-07 17:27:04 +08:00
jiaoyangna 273131cb4c 百宝商会文字错乱修改 2021-07-07 17:26:59 +08:00
ZhangBiao 6950b52db9 【新副本】基本完成 2021-07-07 17:05:32 +08:00
JLIOSM1 ab339f2b37 【IOS】添加IOS执行命令行的工具代码 2021-07-07 16:44:21 +08:00
zhangqiang 9c2dee5856 【缥缈之旅】没解锁天数完成了任务,礼包显示灰点 2021-07-07 15:56:29 +08:00
zhangqiang 803fcee6bf 【碎片图标】点击碎片图标弹出弹窗,再点击弹窗中图标,显示错误 2021-07-07 15:16:31 +08:00
wangzhenxing dad8dbf11b [公会红包]=============红包抢完显示白片修改 2021-07-07 15:09:06 +08:00
ZhangBiao 656c6a00d2 Merge branch 'china/dev' into 0优化/副本界面 2021-07-07 14:44:00 +08:00
ZhangBiao 3732c7c4ca 【新副本】界面提交 2021-07-07 14:43:37 +08:00
ZhangBiao a711f13642 【新副本】资源重新提交 2021-07-07 13:50:11 +08:00