Commit Graph

8986 Commits (c98f2c1f02ec4fe7b5f963fc6ae6759067be6dd9)
 

Author SHA1 Message Date
jiaoyangna 4d5876eb28 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
2021-09-02 19:33:48 +08:00
jiaoyangna 773d31f146 报错修改 2021-09-02 18:18:17 +08:00
jiaoyangna 3011fc531f 神树升级修改提交 2021-09-02 18:08:35 +08:00
ZhangBiao f6d05b433d 【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致 2021-09-02 18:07:49 +08:00
jiaoyangna 19f1815558 特效修改提交 2021-09-02 17:50:59 +08:00
jiaoyangna 13909e60aa 编队id修改 2021-09-02 17:29:44 +08:00
jiaoyangna 8ae3228319 无挑战次数描述修改 2021-09-02 16:38:51 +08:00
jiaoyangna 31dd32a19b 添加最大等级限制 2021-09-02 16:33:51 +08:00
jiaoyangna 96f2530ae8 加号修改 2021-09-02 16:20:33 +08:00
jiaoyangna 37c1c77737 添加道具 太初之气 加号 2021-09-02 16:17:26 +08:00
jiaoyangna ac0955bb13 宝器修改提交 2021-09-02 16:12:37 +08:00
jiaoyangna 186b2ca0c3 四灵修改提交 2021-09-02 16:09:04 +08:00
gaoxin aa26a94d60 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 16:00:46 +08:00
gaoxin 062c0ec16a 【sdk】修改获取channel时返回的默认值 2021-09-02 16:00:30 +08:00
gaoxin c7f750c8cb 【修改渲染平台的顺序】 2021-09-02 15:53:48 +08:00
gaoxin 45ddf4e09e 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 14:27:18 +08:00
jiaoyangna 1dd4e984cb 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-02 14:22:50 +08:00
jiaoyangna f087a9aa71 Revert "预设适配修改提交"
This reverts commit a592f4d5f3.
2021-09-02 14:20:26 +08:00
ZhangBiao d4f94b9d9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 13:44:51 +08:00
ZhangBiao 61c16f60f2 【优化】将竞技场赛季倒计时提示文字改为能看清的文字 2021-09-02 13:44:42 +08:00
gaoxin 5eea8ada97 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 13:44:18 +08:00
gaoxin f1dc1dd49a 【sdk】修改获取channel时返回的默认值 2021-09-02 13:43:58 +08:00
jiaoyangna 68ed8e3b40 位置修改 2021-09-02 11:42:43 +08:00
jiaoyangna 264328e859 适配修改 2021-09-02 11:38:49 +08:00
ZhangBiao 9fe8a5c0d2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 11:34:26 +08:00
ZhangBiao d3f7213de0 【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑 2021-09-02 11:34:15 +08:00
jiaoyangna a592f4d5f3 预设适配修改提交 2021-09-02 11:24:09 +08:00
jiaoyangna 88f88d1249 适配修改提交 2021-09-02 11:20:18 +08:00
ZhangBiao bbca72b6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 11:19:39 +08:00
ZhangBiao 6bbf30e344 【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000 2021-09-02 11:19:29 +08:00
liujiaqi e9bb0163de 【资源】杨戬施法特效 2021-09-02 10:42:28 +08:00
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 615aaa0d88 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 19:59:37 +08:00
jiaoyangna 5b8001ce28 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物

(cherry picked from commit 41831fad79)
2021-09-01 19:36:19 +08:00
jiaoyangna 41831fad79 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
2021-09-01 19:35:28 +08:00
gaoxin 9510528699 【修改渲染平台的顺序】 2021-09-01 19:29:25 +08:00
jiaoyangna 9ab223d577 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-01 19:20:34 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
jiaoyangna 75fc33c18b 回放资源修改提交 2021-09-01 18:17:14 +08:00
jiaoyangna f49deb2471 回放修改提交 2021-09-01 18:13:58 +08:00
jiaoyangna ae71f6941d 四灵修改提交 2021-09-01 18:10:51 +08:00
jiaoyangna 3b8fc3700f 排行榜修改提交 2021-09-01 17:21:33 +08:00
jiaoyangna f516731201 一键上阵修改提交 2021-09-01 17:12:25 +08:00
jiaoyangna bfe127012e 排行榜修改提交 2021-09-01 16:39:09 +08:00
jiaoyangna 19be216616 升级修改提交 2021-09-01 16:25:58 +08:00
jiaoyangna 3373e3daf4 升级修改提交 2021-09-01 16:07:33 +08:00
jiaoyangna 0f3e76e00f 层级修改 2021-09-01 14:52:13 +08:00
jiaoyangna 3372e2a965 已激活属性之间的空隙过大 2021-09-01 14:49:58 +08:00
jiaoyangna 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00