Commit Graph

9008 Commits (08ecd82227d5222da2971102117bb15a5401f68c)
 

Author SHA1 Message Date
jiaoyangna fb4a7afdc0 【ID1018360】
【四灵试炼】助战入口显示红点,里面没可操作的神将
2021-09-03 15:27:55 +08:00
jiaoyangna 5ffd4eab51 跑马灯修改提交 2021-09-03 15:14:18 +08:00
ZhangBiao 1fbfcb13ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-03 15:10:47 +08:00
ZhangBiao 21d6b01106 【修行】元婴期突破空白文字修改 2021-09-03 15:10:38 +08:00
gaoxin b7151b0354 【version】先遣测试服登录服修改 2021-09-03 14:07:18 +08:00
ZhangBiao 68791a5745 【战力】连续打开变负数修改 2021-09-03 11:10:24 +08:00
ZhangBiao 009a17a25a 【战力】漏提交 2021-09-03 10:19:51 +08:00
ZhangBiao 688da4bcb0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-03 09:52:08 +08:00
gaoxin 104100ad01 【还原图片优化工具】 2021-09-03 09:49:30 +08:00
ZhangBiao 5ea7acdef7 【幸运探宝】提交 2021-09-02 22:35:44 +08:00
ZhangBiao 72c42eb871 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 22:25:08 +08:00
ZhangBiao 08e8944e47 【战力问题】PVP增减伤引起的战力不统一问题修改 2021-09-02 22:24:58 +08:00
gaoxin 316adf6fbd 【登录】优化登录失败时,界面文字提示 2021-09-02 22:12:58 +08:00
ZhangBiao fbfa80611a 【幸运摊薄】时间显示 2021-09-02 20:58:11 +08:00
zhangshanxue 4b6bce3b32 Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq 2021-09-02 20:16:05 +08:00
jiaoyangna e35b64be86 generalpopup 冲突解决 2021-09-02 19:52:01 +08:00
zhangshanxue 03b62b4e44 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian/Prefab/fx_yangjian_shouji.prefab.meta
2021-09-02 19:45:05 +08:00
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