Commit Graph

5206 Commits (8e5664f85c8d8329540a33edd903670c0b5e48b6)

Author SHA1 Message Date
jiaoyangna b7447f8d0e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 15:18:07 +08:00
jiaoyangna 39cf4372c5 心愿 up修改 2021-07-05 15:18:03 +08:00
ZhangBiao 729a016a45 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 15:13:46 +08:00
ZhangBiao 84b4277e44 【礼盒、特惠神装】bug修改 2021-07-05 15:13:37 +08:00
zhangqiang 73a4eee31b 【缥缈之旅】提交8 2021-07-05 15:04:46 +08:00
ZhangBiao 56d0cce1e4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 13:47:36 +08:00
ZhangBiao 673f8c24d5 【礼盒、神装】刷新 2021-07-05 13:47:27 +08:00
zhangqiang 8ba8c98345 【魂印穿戴】无尽副本注释魂印绑定英雄 2021-07-05 12:09:20 +08:00
jiaoyangna 1fedb95da6 主题活动 心愿招募 描述修改 2021-07-05 11:37:29 +08:00
jiaoyangna 0e7d7d6c93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 11:29:48 +08:00
jiaoyangna c038859400 【ID1017091】
【神将来源】跳转首充,来源界面自动关闭,再次打开情报界面自动弹出
2021-07-05 11:29:05 +08:00
ZhangBiao c2384f1fbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 11:28:28 +08:00
ZhangBiao 5173faa482 【主界面】右侧伸缩条 2021-07-05 11:28:18 +08:00
zhangqiang ac7ab00c7e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-05 10:58:59 +08:00
zhangqiang a938b217a1 【缥缈之旅】提交7 2021-07-05 10:58:41 +08:00
ZhangBiao 48e3b63a08 【特惠神装】界面逻辑修改 2021-07-05 10:57:47 +08:00
jiaoyangna 9fa4e26f7e 仙缘汇聚箱修改提交 2021-07-05 09:55:02 +08:00
JieLing bf5c15a096 Merge branch 'china/dev' into china/test 2021-07-03 20:12:09 +08:00
zhangqiang b519d3270c 【缥缈之旅】提交6 2021-07-03 20:02:13 +08:00
zhangqiang de844aea18 【缥缈之旅】提交5 2021-07-03 19:23:15 +08:00
wangzhenxing 7d9edd42dd [ui]==============心魔试炼适配修改提交 2021-07-03 18:28:18 +08:00
zhangqiang 6d5d480543 【缥缈之旅】提交4 2021-07-03 17:46:44 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
zhangqiang 6af4522342 【缥缈之旅】提交3 2021-07-03 16:49:13 +08:00
gaoxin 5458cd2889 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-03 15:27:09 +08:00
gaoxin f75b844961 【拍脸】修复偶现栈空报错 2021-07-03 15:26:58 +08:00
wangzhenxing 802f41cadd Merge branch 'china/dev-c-battle' into china/dev 2021-07-03 14:18:37 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
wangzhenxing 94dde31cf9 [战斗]====中毒伤害图片字提交 2021-07-02 19:12:09 +08:00
ZhangBiao 3d462c708f 【站内信】排序 2021-07-02 16:27:36 +08:00
jiaoyangna eed42686ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:50:45 +08:00
jiaoyangna d49f3c8e54 Revert "每日商店特效删除"
This reverts commit 64382c68c3.
2021-07-02 14:50:31 +08:00
wangzhenxing 338ab55daa 【战斗】=========新增336被动 2021-07-02 14:49:28 +08:00
ZhangBiao 21f8259143 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:48:41 +08:00
ZhangBiao 01a6f7f277 【抽卡概率】增加显示概率 2021-07-02 14:48:29 +08:00
jiaoyangna 26fc32d583 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 14:28:57 +08:00
jiaoyangna 64382c68c3 每日商店特效删除 2021-07-02 14:28:46 +08:00
zhangqiang 211dc5838f 【特惠神装拍脸】修改 2021-07-02 14:22:42 +08:00
jiaoyangna 338a583705 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 12:11:32 +08:00
jiaoyangna 82f1650edf 神将来源定位描述错误修改 2021-07-02 12:11:29 +08:00
ZhangBiao f4c2bd581c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 11:54:45 +08:00
ZhangBiao ffb80c8750 【特惠神装、心愿抽卡】适配、增加上方英雄长按 2021-07-02 11:54:33 +08:00
jiaoyangna 19247e296e 神将来源跳转修改提交 2021-07-02 11:23:07 +08:00
wangzhenxing 6e0c8e55c8 [战斗]==========被动335修改 困难副本 星级条件13修改 2021-07-02 11:20:52 +08:00
jiaoyangna c85f18a814 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-02 11:14:03 +08:00
jiaoyangna 9b01d308e8 孙悟空添加新人商城 2021-07-02 11:13:59 +08:00
ZhangBiao 8cc655f107 【特惠神装】增加特效 2021-07-02 11:03:16 +08:00
jiaoyangna 26ef0d21d0 图鉴神将来源修改提交 2021-07-02 10:16:12 +08:00
wangzhenxing d00d69ff68 [战斗]============第二期紫府神印提交 2021-07-02 09:56:06 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
zhangqiang 1be2dc60eb 【缥缈之旅】提交1 2021-07-01 20:13:47 +08:00
ZhangBiao 70b42de2ac Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 20:09:56 +08:00
ZhangBiao c9eec4864a 【特惠神装】完成 2021-07-01 20:09:34 +08:00
ZhangBiao a37fd67704 【特惠神装】基本完成 2021-07-01 19:56:28 +08:00
jiaoyangna 0d7eacc772 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-01 18:12:41 +08:00
jiaoyangna 4f34d6ed42 神将来源返回时打开 2021-07-01 18:12:20 +08:00
ZhangBiao bb70e92ca4 【心愿抽卡】界面微调
(cherry picked from commit bbe3fec745)
2021-07-01 18:02:21 +08:00
ZhangBiao bbe3fec745 【心愿抽卡】界面微调 2021-07-01 17:31:55 +08:00
ZhangBiao 92fa3e34d8 【Log】清除颜色Log 2021-07-01 17:30:20 +08:00
ZhangBiao d2a10051e5 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 16:36:16 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
jiaoyangna a1584af31c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-01 15:55:07 +08:00
ZhangBiao 3b674faa07 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 15:44:19 +08:00
ZhangBiao fb7c5c69fd 【森罗幻境】提交 2021-07-01 15:43:50 +08:00
ZhangBiao 36ccbe968b 【森罗幻境】排行榜信息冗余修改 2021-07-01 15:42:23 +08:00
jiaoyangna b395550303 【ID1016634】
【无尽副本】有没领取的任务,在线刷新无尽副本后,任务显示可领取
2021-07-01 15:40:44 +08:00
jiaoyangna 8b187bfd5f 获取途径报错修改 2021-07-01 15:27:04 +08:00
jiaoyangna 5e02167ef9 帧率修改 2021-07-01 15:15:15 +08:00
jiaoyangna e7544da64e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-01 15:08:15 +08:00
jiaoyangna aabb8357e2 Merge branch '0功能/神将来源' into china/dev 2021-07-01 15:08:08 +08:00
zhangqiang b792491a5a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-01 15:02:22 +08:00
zhangqiang deb6eeca03 【跳转】增加惊喜礼盒跳转 2021-07-01 15:01:57 +08:00
ZhangBiao 47f6335b55 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 14:44:48 +08:00
ZhangBiao dc4581433e 【主城】右侧下拉调修复 2021-07-01 14:43:14 +08:00
jiaoyangna dcfd444fb2 删log 2021-07-01 13:57:19 +08:00
jiaoyangna d828d272ec 【ID1009619】
【帧率设置】在游戏内可以修改游戏帧率
2021-07-01 13:56:18 +08:00
gaoxin 67dd2abbcb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-01 12:31:01 +08:00
gaoxin 99b2c98128 【成长基金】修复红点不消失的问题 2021-07-01 12:30:56 +08:00
wangzhenxing 8cea14036c Merge branch 'china/dev' into china/dev-c-battle 2021-07-01 11:59:44 +08:00
wangzhenxing 1be7c40f2f [战斗]==========困难副本 13类型 检测修改 2021-07-01 11:51:30 +08:00
wangzhenxing 7f8247acaf [战斗]==========困难副本 13类型 检测修改 2021-07-01 11:47:40 +08:00
jiaoyangna 652d754a13 玲珑宝镜修改提交 2021-07-01 10:28:11 +08:00
JieLing ab2a923477 【公告】修复子包打开第二次后不再显示公告 2021-06-30 22:19:37 +08:00
jiaoyangna 8abe558f6c 关闭界面时 称号预设未关闭 错误 问题修改 2021-06-30 21:14:53 +08:00
jiaoyangna fbfb637231 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 20:39:20 +08:00
jiaoyangna bb9b58d489 Merge branch '0功能/神将来源' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-06-30 19:57:49 +08:00
wangzhenxing f50ffa0746 Merge branch 'china/dev' into china/dev-c-battle 2021-06-30 19:53:11 +08:00
jiaoyangna bfd653a98f 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:48:05 +08:00
jiaoyangna 349404d50e 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:28:43 +08:00
JieLing 0ce9da20af Merge branch 'china/local' into china/test 2021-06-30 19:21:56 +08:00
jiaoyangna b4bb2eddff 关闭界面时 称号预设未关闭 错误 问题修改 2021-06-30 19:19:40 +08:00
jiaoyangna 2cbb0b0a59 添加特效 2021-06-30 18:46:15 +08:00
ZhangBiao 555ccd253f 【特惠神装】提交 2021-06-30 18:38:20 +08:00
zhangqiang 34fbfe02d1 【线上问题】十绝阵挑战次数显示负数 2021-06-30 18:28:51 +08:00
jiaoyangna 3fadc63852 商店物品添加特效 2021-06-30 18:12:24 +08:00
wangzhenxing 2578107be4 【战斗】============战斗图片字显示修改 2021-06-30 18:06:56 +08:00
wangzhenxing b99c52d22c 【bug】========【ID1016790】
灼烧 中毒等buff 在携带者被杀死的情况不提示清除
2021-06-30 18:03:13 +08:00
wangzhenxing b3650db6ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 18:01:13 +08:00
wangzhenxing 4ad64a41f2 [bug]==========福利红包红点修改 2021-06-30 18:00:52 +08:00
jiaoyangna 36cb3db3af 底图修改提交 2021-06-30 16:17:50 +08:00
jiaoyangna a4281ed031 四元阵跳转修改 2021-06-30 16:07:37 +08:00
jiaoyangna e44449391d 神将来源修改提交 2021-06-30 15:47:13 +08:00
gaoxin dad2ee5518 【充值】添加第四个透传参数 平台(ANDROID或IOS) 2021-06-30 15:40:46 +08:00
JieLing 101c79640d 【公告】提审服也要显示公告 2021-06-30 15:36:10 +08:00
jiaoyangna b5324c165a 神将来源碎皮合成修改提交 2021-06-30 15:27:27 +08:00
ZhangBiao eeee396c3a 【特惠神装】提交 2021-06-30 14:39:31 +08:00
ZhangBiao cebee6a95b 【邮件】置顶邮件报错修改 2021-06-30 14:26:05 +08:00
jiaoyangna 6e0eccfde5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 14:11:00 +08:00
jiaoyangna a556ee7e2d 关闭界面时 称号预设未关闭 错误 问题修改 2021-06-30 14:10:30 +08:00
ZhangBiao 4507a0d139 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 13:51:56 +08:00
ZhangBiao 00ad684deb 【心愿抽卡】QA 2021-06-30 13:51:47 +08:00
gaoxin de8479ba3d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-30 13:46:34 +08:00
gaoxin fdba4e7aa3 【充值】添加第四个透传参数 平台(ANDROID或IOS) 2021-06-30 13:46:28 +08:00
ZhangBiao 04d4f6a5c3 【特惠神装】开坑 2021-06-30 13:26:34 +08:00
ZhangBiao 55bdc21a99 【心愿抽卡】增加初始化操作 2021-06-30 12:01:39 +08:00
ZhangBiao 782b20fa0c 【心愿抽卡】初始化抽卡总次数 2021-06-30 11:56:23 +08:00
jiaoyangna ed1cf199a2 神将来源修改 2021-06-30 11:50:11 +08:00
jiaoyangna 58994f5a38 神将来源修改 2021-06-30 11:42:22 +08:00
jiaoyangna 6429cba1d4 代码报错修改 2021-06-30 11:37:33 +08:00
jiaoyangna de0b9be884 添加首充和至尊降世的 显示 2021-06-30 11:36:07 +08:00
ZhangBiao 194c610b14 Merge branch 'china/dev' into 0功能/心愿抽卡 2021-06-30 11:00:00 +08:00
ZhangBiao 83fd6716e4 【心愿抽卡】增加长按查看操作 2021-06-30 10:58:35 +08:00
ZhangBiao 7d366000be 【心愿抽卡】完成 2021-06-30 10:52:05 +08:00
wangzhenxing aeed1703bd 【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交 2021-06-30 10:40:52 +08:00
ZhangBiao 37e854190b 【心愿抽卡】增加所有抽卡类型和输出 2021-06-30 10:36:48 +08:00
ZhangBiao ecb43803f4 【心愿抽卡】提交 2021-06-30 10:23:57 +08:00
jiaoyangna f834e2e17d 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-30 10:12:44 +08:00
JieLing af5fa192b6 【提审切换】使用正式的参数配置 2021-06-30 09:53:32 +08:00
JieLing 068bf059a5 【用户协议】添加功能开启配置 2021-06-30 09:52:40 +08:00
JieLing 9a3c8508c4 Merge branch '0功能/用户协议' into china/quick
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-06-30 09:35:51 +08:00
gaoxin 9f69b1ba8f 【登录】容错处理添加 2021-06-30 09:20:33 +08:00
gaoxin a7c947d8b4 【登录】serverversion改为从后端获取 2021-06-30 09:18:03 +08:00
JieLing aae1e82a1c 【登录】获取服务器列表和登录时的Channel差异化处理,分开配置,用于区分相同服务器列表的不同包 2021-06-30 09:16:28 +08:00
ZhangBiao fc5a91522a 【心愿抽卡】提交 2021-06-29 20:29:22 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
ZhangBiao 262b52c4aa 【心愿抽卡】代码基本完成 2021-06-29 18:10:15 +08:00
ZhangBiao cc16057438 【心愿抽卡】接协议 2021-06-29 15:25:05 +08:00
ZhangBiao 69581dcaa1 【心愿抽卡】开坑 2021-06-29 11:30:26 +08:00
zhangqiang 85d9610f41 【神将升级】升级到等级上限没有给后端发协议 2021-06-28 19:37:43 +08:00
jiaoyangna 6805994f8f 玲珑宝镜修改提交 2021-06-28 18:50:18 +08:00
jiaoyangna 9973defbd8 添加时间 2021-06-28 18:40:04 +08:00
jiaoyangna 8f226ad066 玲珑宝镜提交 2021-06-28 18:25:21 +08:00
JieLing 863dabcd1e Merge branch 'china/local' into china/test 2021-06-28 13:35:29 +08:00
gaoxin f743b57c76 【GM】演算后端战斗接口添加GM地址配置 2021-06-28 13:34:53 +08:00
zhangqiang 946841a8fb 【大闹天宫】一键上阵报错2 2021-06-28 13:34:47 +08:00
JieLing 618c8b635f Merge commit '8085adfe259dc0167b67c5786871493bd8ce9a1d' into china/local 2021-06-28 13:34:31 +08:00
gaoxin e46c1eb833 【GM】演算后端战斗接口添加GM地址配置 2021-06-28 11:50:10 +08:00
zhangqiang 57060f5bee 【大闹天宫】一键上阵报错2 2021-06-28 11:27:50 +08:00
ZhangBiao 65887aa135 【站内信】提交 2021-06-28 10:44:15 +08:00
jiaoyangna 10e4552c4f Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-06-28 10:31:22 +08:00
JieLing da2bf20585 Merge branch 'china/local' into china/test 2021-06-26 19:15:40 +08:00
JieLing 0b9c21f61f Merge branch 'china/dev' into china/local 2021-06-26 18:58:06 +08:00
zhangqiang 0412d20463 【大闹天宫】一键上阵报错(原因 鸿蒙阵共鸣神将没有赋值大闹天宫血量) 2021-06-26 18:56:58 +08:00
gaoxin b53554a4a8 【剧情】修复新手战斗结束时孙悟空位置显示错误 2021-06-26 17:00:20 +08:00
jiaoyangna 35523560c0 乾坤宝盒 提交 2021-06-26 15:28:47 +08:00
jiaoyangna 0423ac27de 乾坤宝盒修改提交 2021-06-26 15:28:41 +08:00
gaoxin 2d8d632436 【登录】修复服务器列表界面,推荐服tips错误显示已有角色的问题 2021-06-26 15:16:23 +08:00
jiaoyangna 19c4cc832e 首充修改提交 2021-06-26 15:16:02 +08:00
jiaoyangna 040fd77db0 首充修改 2021-06-26 15:15:43 +08:00
jiaoyangna 7542d5e607 首充修改提交 2021-06-26 15:15:27 +08:00
jiaoyangna de4bcd80b5 ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-26 15:15:19 +08:00
ZhangBiao 4e2463723a 【灵兽】特效添加 2021-06-26 14:50:52 +08:00
wangzhenxing 129768154c [bug]============【心愿抽卡】道具不足时抽卡,显示特效 2021-06-26 14:04:45 +08:00
jiaoyangna 0bb076913b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-25 18:28:46 +08:00
jiaoyangna b3679b70f3 首充修改提交 2021-06-25 18:28:42 +08:00
gaoxin c2d3a481ff 【登录】修复服务器列表界面,推荐服tips错误显示已有角色的问题 2021-06-25 16:44:08 +08:00
gaoxin 757ec35f44 【登录】容错处理添加 2021-06-25 16:02:22 +08:00
jiaoyangna a19795a39c 首充修改 2021-06-25 15:44:43 +08:00
zhangqiang c2d6f137b6 【战力不一致】我要变强界面和主城战力不一致 2021-06-25 15:35:03 +08:00
zhangqiang a87f40756d 【鸿蒙阵】将五星神将放入鸿蒙阵,期间进行升星操作,这时候把神将下阵,由等级控制的前五个天赋会被保留,重登显示正常 2021-06-25 15:14:12 +08:00
ZhangBiao 86679edd3e 【站内信】 2021-06-24 18:13:39 +08:00
ZhangBiao 08ded6e512 【皮肤】战斗结算,mvp名字,战斗统计头像 2021-06-24 18:01:05 +08:00
zhangqiang c7f8a84c99 【特效】主城/挂机界面自己小人脚底添加光圈 2021-06-24 16:15:39 +08:00
ZhangBiao 097cf4055f 【灵兽界面优化】优化界面效果 2021-06-24 14:47:54 +08:00
jiaoyangna 6b70f85740 Merge branch 'china/dev' into china/dev-c 2021-06-24 14:05:01 +08:00
ZhangBiao c89826edc5 【用户协议】提交 2021-06-24 11:56:09 +08:00
ZhangBiao 6c5d6a4be4 【用户隐私协议】提交 2021-06-24 11:38:43 +08:00
jiaoyangna 748f9be757 首充修改提交 2021-06-24 11:12:34 +08:00
ZhangBiao 57426134aa 【Android】登录界面调整 2021-06-24 09:50:55 +08:00
JieLing 7783e0723e 【Android】打开网页功能 2021-06-23 19:39:46 +08:00
jiaoyangna f7d97ef4aa Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-23 18:51:43 +08:00
jiaoyangna 234f3cb48f ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-23 18:51:35 +08:00
jiaoyangna 08588974a9 心愿抽卡单抽动画修改 2021-06-23 16:43:41 +08:00
wangzhenxing 5e8bab74af [战斗]==========被动26, 327 107, 331 修改提交 2021-06-23 16:28:57 +08:00
jiaoyangna 622ea5c6a2 乾坤宝盒 提交 2021-06-23 16:13:26 +08:00
jiaoyangna 4abdfba82a 乾坤宝盒修改提交 2021-06-23 16:11:30 +08:00
jiaoyangna 7f7a534a2f 主题活动修改提交
(cherry picked from commit e7352701e7)
2021-06-23 15:12:42 +08:00
jiaoyangna fef55ac7ad 假人骑牛修改
(cherry picked from commit 1c89a4218c)
2021-06-23 15:12:36 +08:00
jiaoyangna 84cda5fdaf 随机人物修改提交
(cherry picked from commit e5a491b7b9)
2021-06-23 15:12:28 +08:00
jiaoyangna e7352701e7 主题活动修改提交 2021-06-23 15:11:32 +08:00
jiaoyangna 1c89a4218c 假人骑牛修改 2021-06-23 11:05:53 +08:00
jiaoyangna e5a491b7b9 随机人物修改提交 2021-06-23 10:20:03 +08:00
JieLing 574341ed13 Merge branch 'china/local' into china/test 2021-06-22 17:52:36 +08:00
gaoxin c0a561e75e 【公告】修改公告在分子包时配置的字段 2021-06-22 17:52:01 +08:00
gaoxin 24c2de4c6d 【公告】修改公告在分子包时配置的字段 2021-06-22 17:51:14 +08:00
gaoxin 2d5667f9ec 【登录】serverversion改为从后端获取 2021-06-22 15:01:02 +08:00
JieLing 6370bc7c3b Merge branch 'china/local' into china/test 2021-06-22 11:08:58 +08:00
jiaoyangna 9163e4e517 大圣购买修改 2021-06-22 11:08:04 +08:00
jiaoyangna 274f315d2b 大圣购买修改 2021-06-22 10:08:42 +08:00
ZhangBiao 252aff3423 【月卡激活】如果购买的礼包不弹恭喜获得,就不会提示已激活月卡,待下次任意界面弹恭喜获得才会提示 2021-06-21 17:37:34 +08:00
ZhangBiao fe16795d8c 【主城】右上伸缩条闪烁修改 2021-06-21 16:57:22 +08:00
wangzhenxing d943d3044b Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-06-21 15:29:16 +08:00
JieLing 05f9f121d1 Merge branch 'china/local' into china/test 2021-06-21 14:14:19 +08:00
JieLing ca982b566c Merge branch 'china/dev' into china/local 2021-06-21 14:13:11 +08:00
gaoxin 3f320f1e89 【降妖夺宝】修复协程导致报错 2021-06-21 14:12:33 +08:00
zhangqiang 057e32fe52 【福星高照】领取完所有奖励后,按钮红点不消失 2021-06-21 13:52:41 +08:00
jiaoyangna be75375dd6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 10:53:42 +08:00
jiaoyangna 0f309447c2 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:53:24 +08:00
ZhangBiao cf38744969 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 10:52:04 +08:00
ZhangBiao 428df0c41d 【降妖夺宝】限时商市道具光效穿透 2021-06-21 10:51:55 +08:00
zhangqiang 8152d96e1e 【福星高照】领取完所有奖励后,按钮红点不消失 2021-06-21 10:42:27 +08:00
jiaoyangna 3feebf1ef6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 10:22:25 +08:00
jiaoyangna c2f6c54063 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 10:22:21 +08:00
ZhangBiao 65794931b3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 09:51:52 +08:00
ZhangBiao 8c0980e750 【降妖夺宝】十连上方资源显示修改 2021-06-21 09:51:44 +08:00
jiaoyangna 46efd9b960 关闭帮助界面 2021-06-19 17:50:23 +08:00
jiaoyangna f4fe155533 大圣修改 2021-06-19 17:47:35 +08:00
JieLing 63e5f8a705 Merge branch 'china/local' into china/test 2021-06-19 17:29:38 +08:00
JieLing 21999e73a7 Merge branch 'china/dev' into china/local 2021-06-19 17:29:01 +08:00
JieLing b0be50ccb8 Merge branch 'china/local' into china/test 2021-06-19 17:26:46 +08:00
jiaoyangna b85b94fa68 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 17:07:20 +08:00
jiaoyangna 15361c2ef5 大圣跳转 2021-06-19 17:07:17 +08:00
wangzhenxing 5184ced8c8 [战斗]==============免疫buff清除提示修改 2021-06-19 16:41:00 +08:00
JieLing be2a601edb Merge branch 'china/dev' into china/local 2021-06-19 16:22:21 +08:00
jiaoyangna 8342399870 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:50:56 +08:00
jiaoyangna 46621252d9 惊喜礼包拍脸修改 2021-06-19 15:50:39 +08:00
gaoxin d11833e088 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:46:05 +08:00
gaoxin 04c89ccaa9 【月卡】月卡激活提示修改到关闭奖励界面之后 2021-06-19 15:45:13 +08:00
jiaoyangna b6b55590b3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:29:41 +08:00
jiaoyangna 67e5cbf8c9 大圣 不能查看详情修改 2021-06-19 15:29:31 +08:00
gaoxin 6d4d1fc49b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:28:27 +08:00
gaoxin b423005b6e 【活动】页签使用原图大小 2021-06-19 15:28:22 +08:00
jiaoyangna 2e693575a6 抽卡提示只在神将抽里出现 2021-06-19 15:00:37 +08:00
jiaoyangna bf1e1f69e6 添加以领取标志 2021-06-18 19:13:51 +08:00
jiaoyangna 89facf0425 添加红点检测 2021-06-18 19:04:44 +08:00
jiaoyangna 883fdceb78 Merge branch '0功能/升星预览' into china/dev-c 2021-06-18 19:00:51 +08:00
jiaoyangna 45a1079d88 大圣提交 2021-06-18 18:55:04 +08:00
ZhangBiao 9e5819433e 【新将来袭】 2021-06-18 18:45:56 +08:00
ZhangBiao a957834228 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-18 18:38:29 +08:00
ZhangBiao 70a90b0148 【新将来袭】在线刷新修改 2021-06-18 18:38:17 +08:00
jiaoyangna 60b2cf1cf6 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
2021-06-18 18:27:01 +08:00
gaoxin f85dc798d3 【公告】公告id添加对不同渠道的处理 2021-06-18 18:25:51 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
ZhangBiao 683964cd8a 【惊喜礼盒】资源更换 2021-06-18 17:52:09 +08:00
ZhangBiao 165a724ba3 【升星有理】 2021-06-18 17:29:00 +08:00
ZhangBiao 15172dab87 【升星有礼】 2021-06-18 17:17:52 +08:00
ZhangBiao 3744d8b901 【降妖夺宝】剩余时间限时修改 2021-06-18 17:06:20 +08:00
ZhangBiao a277f4578c 【升星有礼】重构提交 2021-06-18 17:00:52 +08:00
jiaoyangna 12e0a2d0bb 拍脸修改提交 2021-06-18 15:53:42 +08:00
jiaoyangna 993bba8e0a 拍脸修改提交
(cherry picked from commit 8012c5691a)
2021-06-18 15:17:35 +08:00
jiaoyangna 8012c5691a 拍脸修改提交 2021-06-18 15:17:10 +08:00
jiaoyangna e593381b77 降妖夺宝修改提交
(cherry picked from commit 106647a69c)
2021-06-18 14:48:23 +08:00
jiaoyangna 106647a69c 降妖夺宝修改提交 2021-06-18 14:47:39 +08:00
ZhangBiao 6e617123b7 【新将来袭降妖夺宝】 2021-06-18 14:47:13 +08:00
jiaoyangna 09095e5b16 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
2021-06-18 11:08:40 +08:00
jiaoyangna 8b55bf1dc1 隐藏不显示的预设 2021-06-18 11:03:51 +08:00
jiaoyangna 65c09118ed 拍脸修改提交 2021-06-18 10:59:35 +08:00
jiaoyangna c07ddcc6a8 拍脸修改提交
(cherry picked from commit 4635361d8b)
2021-06-18 10:50:21 +08:00
jiaoyangna 10c86e509a 超凡入圣修改提交 2021-06-18 10:50:04 +08:00
jiaoyangna 4635361d8b 拍脸修改提交 2021-06-18 10:48:49 +08:00
zhangqiang 667e53769a 【巅峰赛】8强界面不显示玩家名字 2021-06-17 20:53:33 +08:00
ZhangBiao f02639f80b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 20:31:55 +08:00
ZhangBiao 958f2774e5 【新将来袭、降妖夺宝】重构提交 2021-06-17 20:31:47 +08:00
jiaoyangna 004121df8b 拍脸提交 2021-06-17 19:59:09 +08:00
jiaoyangna 208c11555c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 18:17:42 +08:00
jiaoyangna c102ce2478 拍脸修改提交 2021-06-17 18:17:38 +08:00
ZhangBiao c9bf69310c 【升级豪礼】代码丢了,不是按照等级显示,需要重新修改 2021-06-17 18:05:39 +08:00
ZhangBiao bd4796a4af 【惊喜礼盒】右侧文字格式修改 2021-06-17 18:04:10 +08:00
jiaoyangna e5cacccd8a Merge branch 'china/dev-inner' into china/dev-c 2021-06-17 17:57:44 +08:00
jiaoyangna 687a9ea45d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 17:57:39 +08:00
jiaoyangna 4c1cd67e6e Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:56:51 +08:00
ZhangBiao 9b6e14eeb1 【惊喜礼盒】完成! 2021-06-17 17:43:56 +08:00
jiaoyangna 5c09522231 Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:19:27 +08:00
jiaoyangna 4f115efb05 活动提交 2021-06-17 17:18:42 +08:00
ZhangBiao 87f3fa8f64 【惊喜礼盒】提交 2021-06-17 17:09:36 +08:00
gaoxin ac7501a1d5 【战斗】修复群体性的免疫效果不会正常消失的问题 2021-06-17 16:01:48 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
jiaoyangna 6f5cd1d44a 惊喜礼包推送 2021-06-17 15:21:22 +08:00
jiaoyangna bc20fa57fc 惊喜礼包推送修改提交 2021-06-17 15:05:44 +08:00
jiaoyangna b1e3d0a163 Merge branch '0功能/升星预览' into china/dev-c 2021-06-17 15:05:03 +08:00
wangzhenxing 27b3d6e5c7 【战斗】=============被动56,被动283,被动324修改 不灭修改 2021-06-17 14:12:34 +08:00
gaoxin 12bd0b64a1 Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-17 10:26:13 +08:00
zhangqiang 8f97c36580 【鸿蒙阵】共鸣是breakId 计算修改 2021-06-17 10:10:22 +08:00
JieLing 6431157671 Merge remote-tracking branch 'origin/gx/china/stream' into china/zf_test 2021-06-17 10:01:56 +08:00
gaoxin b8f9d894d9 【登录】修复logo为空时显示默认logo的问题 2021-06-16 20:38:42 +08:00
ZhangBiao 814fb29c45 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-16 19:56:18 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
JieLing 964c216ecc Merge branch 'gx/china/stream' into china/zf_test 2021-06-16 18:33:49 +08:00
jiaoyangna 9f2e0dbfd0 【ID1009503】 每日豪礼文字重新包装 2021-06-16 18:05:57 +08:00
jiaoyangna c3c44cd4d7 【ID1009503】
每日豪礼文字重新包装
2021-06-16 18:04:19 +08:00
jiaoyangna b96df9fc63 玲珑修改提交 2021-06-16 17:55:19 +08:00
jiaoyangna a35b9d404b 数字修改提交 2021-06-16 15:14:36 +08:00
zhangqiang aa666a5158 【公会】带神印的成员信息报错 2021-06-16 14:50:19 +08:00
jiaoyangna e9dc207f46 玲珑提交 2021-06-16 13:42:32 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
zhangqiang feb6480759 【章节剧情】点击跳过没有返回挂机界面 2021-06-16 10:53:21 +08:00
JieLing b7e78d9d5f Revert Revert "【包配置】将登录图配置放到streaming文件夹" 2021-06-16 10:44:12 +08:00
wangzhenxing b1425236af [战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交 2021-06-16 10:27:56 +08:00
gaoxin b3fca866e8 Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
2021-06-16 10:09:15 +08:00
gaoxin 0e2ec48bdc Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
2021-06-16 10:08:52 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
gaoxin 67e44741f6 Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850.
2021-06-16 10:08:34 +08:00
ZhangBiao e0e8974850 【山河试炼】增加主城红点检测 2021-06-15 20:39:05 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
JieLing 91bf6b36af Merge branch 'china/local' into china/test 2021-06-15 18:10:18 +08:00
JieLing 84a42dd0ef Merge branch 'china/dev' into china/local 2021-06-15 18:09:51 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
zhangqiang 75cbaba02e 【章节剧情】点击跳过没有返回挂机界面 2021-06-15 12:17:13 +08:00
jiaoyangna f45fa022ea 玲珑宝镜修改提交 2021-06-15 11:41:37 +08:00
ZhangBiao 173fef6dca Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-15 11:40:56 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
gaoxin 13d7b61e35 【神将信息】修复切换到装备界面返回无法切换页签的问题 2021-06-15 11:17:15 +08:00
ZhangBiao 6152c52f2c 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
gaoxin 46c1fb1070 【森罗】修复转盘游戏点击报错 2021-06-11 20:40:10 +08:00
gaoxin 2140a69391 【森罗】修复转盘游戏点击报错 2021-06-11 20:15:44 +08:00
jiaoyangna fe1570f667 神将详情界面修改提交 2021-06-11 16:09:42 +08:00
ZhangBiao 4edff2eee8 【升级限量礼包】无剩余礼包逻辑缺失修复
(cherry picked from commit ca9a0199b7)
2021-06-11 14:10:10 +08:00
ZhangBiao 173773517f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 14:05:17 +08:00
ZhangBiao ca9a0199b7 【升级限量礼包】无剩余礼包逻辑缺失修复 2021-06-11 14:05:03 +08:00
wangzhenxing 588ca169c9 [战斗]======被动200去掉注释 2021-06-11 11:51:52 +08:00
zhangqiang a9ce0d077e 【章节剧情】点击跳过没有返回挂机界面 2021-06-11 10:58:51 +08:00
jiaoyangna ed4472a298 挂机卡死修改提交 2021-06-11 10:48:11 +08:00
jiaoyangna e89a0d26c8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 10:31:16 +08:00
jiaoyangna 2419089ff4 【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
2021-06-11 10:30:57 +08:00
jiaoyangna 11bb03fd2b 【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
2021-06-11 10:18:38 +08:00
gaoxin 28c7d285a0 Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7.
2021-06-11 02:36:08 +08:00
gaoxin 03d56901d7 【包配置】将登录图配置放到streaming文件夹 2021-06-11 01:48:39 +08:00
gaoxin 77acfd6bcd 【登录】版号信息走表配置 2021-06-11 01:45:09 +08:00
jiaoyangna e764f74e6d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 23:01:07 +08:00
jiaoyangna 65860bb337 删除剧情对话挂机地图音效 2021-06-10 22:59:26 +08:00
gaoxin 4ee928c2d4 Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c 2021-06-10 22:56:18 +08:00
jiaoyangna b76f517cbb [战斗]===============被动200修改 同阵营这个被动只会触发一次 2021-06-10 22:08:51 +08:00
wangzhenxing 4165e6acd5 【战斗】=======注释之前被动200修改 2021-06-10 22:02:35 +08:00
wangzhenxing 77121e01e3 [战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个 2021-06-10 21:57:00 +08:00
jiaoyangna 83553d8aef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 20:17:03 +08:00
jiaoyangna 04633b4ece 无尽副本快速返回主城报错 2021-06-10 20:16:44 +08:00
zhangqiang 23f90ccf52 【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差 2021-06-10 18:37:16 +08:00
zhangqiang 5d57464da8 【森罗音效】福星高照老头的音效,界面关闭不停 2021-06-10 17:56:07 +08:00
jiaoyangna 529067bb2f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 17:44:20 +08:00
jiaoyangna e087d4c57c ID1016424】
【无尽副本】反复从无尽地图返回主城报错
2021-06-10 17:43:52 +08:00
zhangqiang 4915842ee2 【山河社稷图】奖励排序 2021-06-10 17:05:51 +08:00
jiaoyangna ddd0ece70b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:38:43 +08:00
jiaoyangna 819278dd3d 【ID1016436】
【无尽副本】战斗结算界面有经验
2021-06-10 16:38:19 +08:00
zhangqiang 3506d2bb2c 【页签图标替换】局部 + 修行提示文字修改 2021-06-10 16:33:43 +08:00
jiaoyangna 8115705d1a 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:30:49 +08:00
gaoxin 4382e822e0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:10:18 +08:00
gaoxin aa4f3df8b0 【拍脸】优化短时间触发拍脸有可能导致报错的问题 2021-06-10 16:10:12 +08:00
jiaoyangna f5a9a1368d 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:08:26 +08:00
jiaoyangna d72a7b79e0 玲珑宝镜修改提交 2021-06-10 15:36:59 +08:00