Commit Graph

9399 Commits (95382d530e02b279837c285fd2483acc34ed7f2a)

Author SHA1 Message Date
jiaoyangna aedad781aa 灵兽宝阁展示概率错误修改 2021-11-12 11:30:04 +08:00
jiaoyangna f2ff37ced8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 11:26:16 +08:00
jiaoyangna 021b0e03be 魂灵宝界面修改提交 2021-11-12 11:26:02 +08:00
gaoxin cdb02f6142 【修行】资源替换为主角 2021-11-12 11:17:46 +08:00
jiaoyangna bbb1c8e1a6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 11:14:39 +08:00
jiaoyangna 63b1f6456e 魂灵宝界面修改提交 2021-11-12 11:14:26 +08:00
gaoxin c00a3b603e 【Vip】修复等级奖励刷新不及时的问题 2021-11-12 10:07:44 +08:00
jiaoyangna 9a261f5c13 法宝界面文字大小修改 2021-11-12 09:55:00 +08:00
jiaoyangna a82622585e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 09:40:25 +08:00
jiaoyangna 6ed696b426 法宝界面文字大小修改 2021-11-12 09:40:13 +08:00
ZhangBiao 36f24a4d3c 【魂印界面】界面背景颜色随物品品质更改 2021-11-11 17:58:40 +08:00
ZhangBiao e2526cfce1 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 17:54:29 +08:00
ZhangBiao c5a7206184 【灵脉秘境】提交 2021-11-11 17:53:47 +08:00
jiaoyangna 89cf7cacfe 灵兽宝阁 假战斗报错修改 2021-11-11 17:36:53 +08:00
jiaoyangna 8c9e1b7a2f 脚本初提 2021-11-11 16:48:15 +08:00
ZhangBiao 8818b463ae 【灵脉秘境】提交 2021-11-11 16:36:52 +08:00
jiaoyangna a3f8c8aee9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 16:07:47 +08:00
jiaoyangna 6e294df15a 删除log 2021-11-11 16:07:33 +08:00
ZhangBiao 745cb6450c Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 15:09:24 +08:00
ZhangBiao 21e1c0366c 【优化】神将情报界面优化 2021-11-11 15:08:13 +08:00
ZhangBiao c37386fada 【优化】轩辕宝境界面优化 2021-11-11 14:59:15 +08:00
ZhangBiao 0769659e72 【优化】云游商人增加白金装备分解配方 2021-11-11 14:48:50 +08:00
ZhangBiao d0b2bdd412 【灵脉秘境】提交 2021-11-11 14:28:02 +08:00
gaoxin 436de6bf4f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 14:10:53 +08:00
gaoxin 3addb9905b 【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大 2021-11-11 14:10:48 +08:00
wangzhenxing f71bbbdf95 [战斗]===========第二期神魂被动提交 2021-11-11 14:01:32 +08:00
gaoxin c259e72874 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 13:49:23 +08:00
gaoxin 4ef85b5720 【【通关奖励】创建新号首次进入通关奖励,通关简单3-10的英雄碎片缺少数量显示,退出该界面在进入数量才显示出来】https://www.tapd.cn/33029060/bugtrace/bugs/view?bug_id=1133029060001019080 2021-11-11 13:49:10 +08:00
jiaoyangna 390d514bd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 13:41:59 +08:00
jiaoyangna 4455242293 【ID1019110】
【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框
2021-11-11 13:41:42 +08:00
gaoxin 9013148d1e 【玉虚论道】界面切边修改 2021-11-11 13:40:37 +08:00
gaoxin ecbee47ef8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 12:00:39 +08:00
gaoxin 5d266a04d9 【引导】添加剧情节点 2021-11-11 12:00:34 +08:00
jiaoyangna 278e309174 商店新字位置调整 2021-11-11 11:43:09 +08:00
ZhangBiao db15950d6a Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:56:10 +08:00
jiaoyangna d37ed44478 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:52:15 +08:00
jiaoyangna 56ba9ccba8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 10:49:14 +08:00
jiaoyangna d1cb61fc18 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:48:59 +08:00
ZhangBiao 3eca9bec47 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:11:04 +08:00
gaoxin f4ff8d4d77 【登录】非sdk登录时,不重新输入账号不可以再进入游戏 2021-11-11 10:07:14 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
jiaoyangna bdb08206df Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 18:35:53 +08:00
jiaoyangna ceb7ee3602 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-10 18:35:38 +08:00
gaoxin f46aac739e 【三界降魔】修复没有坐骑时报错得问题 2021-11-10 17:31:38 +08:00
gaoxin a78b4996dd 【抽卡】尝试修复报错黑屏 2021-11-10 16:57:44 +08:00
gaoxin 20df877296 【btview】按钮顺序调整,主城,主角,神将,关卡,副本,背包,公会 2021-11-10 16:40:38 +08:00
ZhangBiao 6d483802fa 【修行】特效穿透修改
(cherry picked from commit ee7b2b9919)
2021-11-10 15:22:43 +08:00
ZhangBiao ee7b2b9919 【修行】特效穿透修改 2021-11-10 15:20:18 +08:00
ZhangBiao cc316086e9 【新·物品】界面提交 2021-11-10 15:03:18 +08:00
ZhangBiao 1adee43039 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 14:54:18 +08:00
ZhangBiao f74ce2f895 【新·物品】界面提交 2021-11-10 14:53:35 +08:00
jiaoyangna 908e068f23 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 13:24:05 +08:00
jiaoyangna 1b95b2a04a 公会查看成员编队神将属性错误修改 2021-11-10 13:23:42 +08:00
gaoxin b661b04ad1 【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误 2021-11-10 13:22:32 +08:00
gaoxin 6d377cdf69 【新假战斗】修改假战斗的战斗类型 2021-11-10 11:42:20 +08:00
gaoxin 880c77888a 【新假战斗】加入主角技能 2021-11-10 11:03:18 +08:00
gaoxin c9e2ddcaf8 【新假战斗】 2021-11-10 09:48:42 +08:00
jiaoyangna 52475ee00b 跨服战预设黑条不显示开启条件修改 2021-11-10 08:29:19 +08:00
ZhangBiao 7efdfd5029 【新·装备】增加战力对比图标 2021-11-09 18:24:38 +08:00
ZhangBiao c627c5cd28 【新·魂灵宝】增加战力对比图片 2021-11-09 17:35:27 +08:00
ZhangBiao aa9cc34792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 17:06:59 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
gaoxin f23a455797 【魂印】详情界面优化 2021-11-09 15:48:56 +08:00
ZhangBiao 79f6f739ad 【天枢密卷】魂印文字过长修改 2021-11-09 14:44:39 +08:00
ZhangBiao 76c3c5c0bf 【新·魂灵宝】提交 2021-11-09 14:39:27 +08:00
ZhangBiao fdffaf846e 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
gaoxin 3131ffca2f 【资源和谐】后台控制完成 2021-11-09 10:49:37 +08:00
gaoxin 964f45b245 【资源】孟姜女不动 2021-11-09 10:28:26 +08:00
gaoxin 67da83d8b3 【资源】新和谐资源上传 2021-11-09 10:28:18 +08:00
gaoxin 37de3d19b0 【立绘】修复和谐资源不动的问题 2021-11-09 10:27:52 +08:00
ZhangBiao ed02f4a86f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 10:22:33 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 851e9c61be Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 10:04:36 +08:00
ZhangBiao ff7e9e9e85 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 18:10:19 +08:00
ZhangBiao ef4829639b 【森罗环境】点击框体退出修复 2021-11-08 18:10:08 +08:00
jiaoyangna 922c55e7e7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 17:23:07 +08:00
jiaoyangna 173221dd1a 【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
2021-11-08 17:22:51 +08:00
gaoxin 0595ecbb46 【七界试炼】添加战斗结果校验 2021-11-08 17:04:22 +08:00
jiaoyangna a68330c17f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 16:31:48 +08:00
jiaoyangna 419a9cedc9 森罗幻境神将修改 2021-11-08 16:31:34 +08:00
ZhangBiao 363839c48a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 16:00:06 +08:00
ZhangBiao 76b7b5caca 【log】提交 2021-11-08 15:59:56 +08:00
jiaoyangna 76895c45b4 巅峰赛星星被遮挡修改 2021-11-08 15:56:18 +08:00
jiaoyangna 865480c979 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:35:15 +08:00
jiaoyangna b8c763cbce 分割线修改提交 2021-11-08 15:32:54 +08:00
gaoxin 1aa36e8ac1 【和谐】孟姜女加入和谐资源配置 2021-11-08 15:29:23 +08:00
wangzhenxing d30fc43d9f 【战斗】============被动285修改 2021-11-08 15:28:04 +08:00
jiaoyangna 3f7dd0db96 大闹天宫选择助战界面星星修改提交 2021-11-08 15:21:41 +08:00
jiaoyangna 8bbdf8eed5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:18:45 +08:00
jiaoyangna 265aaca235 神将界面特效修改提交 2021-11-08 15:18:28 +08:00
gaoxin fe99284efe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:12:59 +08:00
gaoxin 5f0dc622a5 【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面 2021-11-08 15:12:48 +08:00
jiaoyangna dc5f09cc02 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:05:27 +08:00
jiaoyangna e457260b42 神将排序界面修改提交 2021-11-08 15:04:53 +08:00
gaoxin fc38e204ce 【森罗幻境】森罗幻境神魂特效穿透 2021-11-08 15:04:36 +08:00
gaoxin 3dffd71924 【跨服战】优化打开跨服战界面,请求过多导致界面不可点击的问题 2021-11-08 14:49:26 +08:00
jiaoyangna b6277b6378 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 14:25:00 +08:00
jiaoyangna 2575d18686 火焰提交 2021-11-08 14:24:43 +08:00
gaoxin bbb89af48e 【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错 2021-11-08 14:10:26 +08:00
wangzhenxing e99f8c285f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 14:02:57 +08:00
wangzhenxing 95b7fceb34 [神魂]======神魂升级后技能描述修改 2021-11-08 14:02:33 +08:00
jiaoyangna e59b318e3d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:44:12 +08:00
jiaoyangna 016be8951e 神魂位置错误修改 2021-11-08 13:43:45 +08:00
gaoxin 085960b153 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:39:34 +08:00
gaoxin 67f3ca9f52 【适配】1080*2550,进阶白骨精法宝,文字描述遮挡 2021-11-08 13:39:29 +08:00
jiaoyangna 75d677d29e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:38:19 +08:00
jiaoyangna 45d4104f72 装备界面添加特效 2021-11-08 13:38:03 +08:00
gaoxin f81b35a309 【好感度详情】适配显示错误 2021-11-08 13:24:16 +08:00
jiaoyangna f850fb91b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 13:13:31 +08:00
jiaoyangna a0cb4b46e9 图片修改提交 2021-11-08 13:12:51 +08:00
ZhangBiao a577d80d76 【神魂】增加特效 2021-11-08 13:02:00 +08:00
jiaoyangna 4cc608d818 图片提交 2021-11-08 11:39:18 +08:00
jiaoyangna c490e9c01c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:24:36 +08:00
jiaoyangna 1329112387 神魂未激活图片修改提交 2021-11-08 11:24:10 +08:00
gaoxin 3af307b30a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:20:35 +08:00
gaoxin 82dd1b6512 【我要变强】切换页签报错 2021-11-08 11:20:30 +08:00
jiaoyangna abf8548cc9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:14:14 +08:00
jiaoyangna b5eb09134f 特效修改提交 2021-11-08 11:13:42 +08:00
ZhangBiao 0fc2ec5b08 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:07:35 +08:00
ZhangBiao 2621f0f9f8 【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情 2021-11-08 11:07:11 +08:00
jiaoyangna 67c6e7d92d 玉虚论道编队修改 2021-11-08 11:06:57 +08:00
jiaoyangna 024b684999 排行榜神魂放大镜显示错误修改 2021-11-08 10:51:51 +08:00
jiaoyangna e8433d1026 玉虚论道记录神魂修改提交,神将界面修改提交 2021-11-08 10:30:12 +08:00
jiaoyangna cb41ba3991 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 10:20:34 +08:00
jiaoyangna 9fe5c809b8 灵兽界面技能描述白片修改提交 2021-11-08 10:20:19 +08:00
wangzhenxing 8bc936aff8 【神魂】=====伤害统计界面神魂显示修改 2021-11-05 18:24:05 +08:00
ZhangBiao 637defb9e2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:14:57 +08:00
ZhangBiao a953a78018 【升星有礼】觉醒后没有红点修改 2021-11-05 18:14:44 +08:00
gaoxin d4582cf244 【神魂】修复战斗中神魂特效不显示的问题 2021-11-05 18:13:32 +08:00
ZhangBiao 3418bac21d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:09:46 +08:00
ZhangBiao 104f5cbda8 【降妖夺宝】修改提交 2021-11-05 18:09:14 +08:00
jiaoyangna 72ddfad3c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:06:16 +08:00
jiaoyangna c8172c34a4 四灵试炼神魂修改提交 2021-11-05 18:06:01 +08:00
gaoxin 14f1d213e3 【神魂特效】资源名重复修改 2021-11-05 17:47:43 +08:00
jiaoyangna 5cb5137fde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:38:24 +08:00
jiaoyangna afcfc1b393 神魂星星修改提交 2021-11-05 17:38:10 +08:00
wangzhenxing 99452354bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:21:30 +08:00
wangzhenxing a92a76e3ab 【神魂】=====技能描述修改 2021-11-05 17:21:18 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
gaoxin 89957b0787 【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次 2021-11-05 17:12:35 +08:00
gaoxin 0408157db2 【坐骑】狐狸坐骑在三界除魔榜上位置不居中 2021-11-05 17:00:28 +08:00
ZhangBiao f91bd47007 【逍遥游】图标层级错误修改 2021-11-05 16:49:38 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
ZhangBiao 05779f9926 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 16:33:41 +08:00
ZhangBiao e714209ba7 【界面修改】坐骑、白骨精法宝 2021-11-05 16:24:14 +08:00
jiaoyangna ad3b903209 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 16:20:01 +08:00
jiaoyangna 2179a76560 森罗幻境,公会星星修改提交 2021-11-05 16:19:47 +08:00
ZhangBiao 60391c16b4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 15:51:05 +08:00
ZhangBiao ea4661b254 【无尽副本】修改 2021-11-05 15:50:49 +08:00
jiaoyangna 1c2758f26c 送神祠星级修改 2021-11-05 15:48:22 +08:00
jiaoyangna f8b43c4c30 修行星星修改提交 2021-11-05 15:23:21 +08:00
jiaoyangna 057ec06b4c 协议修改提交 2021-11-05 15:14:00 +08:00
jiaoyangna 501039ea65 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 15:03:05 +08:00
liujiaqi ccab15ab98 【资源】神魂icon 2021-11-07 14:55:20 +08:00
jiaoyangna 8740afa514 大脑天宫神魂星星修改 2021-11-05 15:02:33 +08:00
jiaoyangna 0bd44642dc 战斗结算界面星级修改 2021-11-05 14:44:10 +08:00
jiaoyangna 420356da83 添加特效 2021-11-05 14:33:09 +08:00
jiaoyangna e35ded2b5d 巅峰赛星级修改提交 2021-11-05 14:08:35 +08:00
jiaoyangna 42bb1c7443 四灵试炼修改提交 2021-11-05 13:59:19 +08:00
jiaoyangna 9d1e517743 四灵试炼层级报错修改 2021-11-05 13:53:56 +08:00
jiaoyangna 2985079325 编队星星修改提交 2021-11-05 13:37:29 +08:00
jiaoyangna cdd6baeb5f 巅峰赛星星修改提交 2021-11-05 13:35:14 +08:00
jiaoyangna 29e279755e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 13:21:39 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
wangzhenxing 6ace7b50ab [战斗]======被动154 200 360 修改 2021-11-05 13:17:17 +08:00
jiaoyangna 23ebadf81c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 11:52:40 +08:00
jiaoyangna a4ab833366 星星位置还原 2021-11-05 11:52:14 +08:00
ZhangBiao a4fa877f6b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 11:41:03 +08:00
ZhangBiao 56530dbc93 【无尽副本】提交 2021-11-05 11:40:48 +08:00
jiaoyangna 8378ea7966 星星位置修改提交 2021-11-05 11:39:55 +08:00
gaoxin 6b6d822603 【周卡】周卡数量显示位置优化 2021-11-05 11:27:48 +08:00
ZhangBiao 9e8d4b8d6d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 11:16:40 +08:00
ZhangBiao 7aa6cc1fda 【百宝商会】修改提交 2021-11-05 11:16:30 +08:00
gaoxin 2f65f4d391 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
jiaoyangna b78131766d 鸿蒙阵报错修改提交 2021-11-05 10:56:42 +08:00
jiaoyangna fcbbb799c6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:53:31 +08:00
jiaoyangna ccedbd3867 星星修改提交 2021-11-05 10:53:07 +08:00
ZhangBiao 08825e1e2f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:43:22 +08:00
ZhangBiao c5b9a4327a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:42:43 +08:00
jiaoyangna 2774ca08b1 玉虚论道编队报错修改提交 2021-11-05 10:42:37 +08:00
ZhangBiao ab6aa7dfbe 【优化】 百宝商会界面优化 2021-11-05 10:42:26 +08:00
jiaoyangna 568d9ddfc7 星星报错修改提交 2021-11-05 10:39:22 +08:00
jiaoyangna 59c6112306 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:29:43 +08:00
jiaoyangna 09137cb6a3 星星数量修改 2021-11-05 10:29:13 +08:00
ZhangBiao 43a8da3f2f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:25:08 +08:00
ZhangBiao 7f258a4aa2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:24:44 +08:00
jiaoyangna 8fd4b5e367 神魂提交 2021-11-05 10:24:41 +08:00
ZhangBiao 005ac1e5df 【光效穿透】编队界面上阵觉醒神将,长按神将打开神将情报,觉醒光效穿透 2021-11-05 10:24:32 +08:00
jiaoyangna 5ac1f04718 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:18:28 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
wangzhenxing c04ee81117 【玉虚论道】======战斗信息界面报错修改提交 2021-11-05 10:17:45 +08:00
ZhangBiao cf6837cbba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:04:43 +08:00
ZhangBiao cd8f61cbed 【无尽副本】行动力不减修复 2021-11-05 10:04:32 +08:00
gaoxin c232f35436 【轩辕宝镜 】修复还是可能会上阵重复神将的问题 2021-11-05 10:01:46 +08:00
wangzhenxing 51dfdede03 [战斗]===========被动371 368修改 2021-11-05 09:50:28 +08:00
ZhangBiao 4cb826b9e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 19:10:24 +08:00
ZhangBiao 08e6f334a4 【装备界面】特效调整 2021-11-04 19:10:06 +08:00
gaoxin e39bbe2dc1 【轩辕宝镜】修复如果玩家有两个相同的战力较高的神将,会导致少上阵一个位置的问题 2021-11-04 18:53:11 +08:00
gaoxin 671de83349 【天书密卷】修复返回按钮和页签遮挡问题 2021-11-04 18:10:18 +08:00
wangzhenxing 661ea27421 [战斗]======被动357修改 御甲buff修改 2021-11-04 16:57:06 +08:00
gaoxin 96c77fd033 【周卡】数量过长用万字省略 2021-11-04 16:48:34 +08:00
jiaoyangna 90c2171f2c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 16:21:03 +08:00
jiaoyangna ce86215f53 星星数少了修改 2021-11-04 16:20:50 +08:00
ZhangBiao 285068bb66 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 16:11:38 +08:00
ZhangBiao 5f28703681 【法宝界面】法宝描述超框修改 2021-11-04 16:11:27 +08:00
gaoxin 7f3d044ec3 【周卡】数据不存在时不再显示周卡页签 2021-11-04 16:10:40 +08:00
gaoxin ee463b3103 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 15:50:53 +08:00
gaoxin 2d669fd354 【周卡】修改礼包ID字段获取方式 2021-11-04 15:50:47 +08:00
jiaoyangna 7e2e3d8449 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 15:48:08 +08:00
jiaoyangna 028790a379 神魂星星修改提交 2021-11-04 15:47:49 +08:00
ZhangBiao f3e9bed33f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 15:45:13 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
ZhangBiao bccd6751eb 【无尽密保】文字显示错误修改 2021-11-04 15:44:13 +08:00
wangzhenxing b6ec2b0f89 【战斗】======被动360修改 2021-11-04 15:40:14 +08:00
wangzhenxing 113e1ebefa 【战斗】=====被动356 修改 2021-11-04 14:13:28 +08:00
gaoxin de71cd524b 【周卡】特效不能被裁切修改 2021-11-04 14:02:48 +08:00
gaoxin 4ba1a7ba68 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 00:18:46 +08:00
gaoxin 0237d3f351 【神魂】修复特效在3.5版本不显示的问题 2021-11-15 00:18:34 +08:00
gaoxin 761cdeffcf 【周卡】策划反馈优化 2021-11-15 00:03:12 +08:00
wangzhenxing 41044877f1 [战斗]=============被动357修改 2021-11-04 13:43:05 +08:00
jiaoyangna 5973a400ef Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 12:16:01 +08:00
jiaoyangna 84ee79fd1e meta 文件提交 2021-11-04 12:15:48 +08:00
ZhangBiao 4ce0eb548a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 11:43:34 +08:00
ZhangBiao dd0801e149 【界面优化】技能描述 2021-11-04 11:43:24 +08:00
gaoxin 4209ed1141 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 11:37:04 +08:00
gaoxin 01b322ad9b 【周卡】协议误删恢复 2021-11-04 11:36:47 +08:00
jiaoyangna 92c5dde48f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 11:35:30 +08:00
jiaoyangna f9f92262a8 巅峰赛神魂图标提交 2021-11-04 11:35:15 +08:00
ZhangBiao 4f19c5eaaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 11:30:20 +08:00
ZhangBiao 0aa460f151 【界面优化】技能具中 2021-11-04 11:30:10 +08:00
jiaoyangna 3a1139c0a0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 10:46:39 +08:00
jiaoyangna 154aa77cd3 神魂特效修改提交 2021-11-04 10:46:25 +08:00
wangzhenxing 878b12f574 【战斗】===============被动364-371 提交 307 360修改 2021-11-04 10:27:02 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00
jiaoyangna 4941110a7b 神魂提交 2021-11-03 18:38:13 +08:00
jiaoyangna b11e859557 神魂提交 2021-11-03 18:16:26 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
gaoxin 29df41d399 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-03 17:44:08 +08:00
gaoxin 5b3073f0eb 【周卡】修复0点刷新不及时问题 2021-11-03 17:44:02 +08:00
ZhangBiao 38544fd273 【逍遥游】触发仙缘界面中,事件图标显示不对 2021-11-03 17:12:20 +08:00
ZhangBiao fc6d13a4d7 【鸿蒙碑】升级鸿蒙碑不弹出战斗力变化提示,且升级后总战斗力数值错误,重新登录后战斗力会提升 2021-11-03 17:06:45 +08:00
jiaoyangna 358f9e13ba 底修改提交 2021-11-03 16:26:07 +08:00
gaoxin 24c550cee5 Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
#	Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
2021-11-03 16:09:31 +08:00
gaoxin 820b45cfa0 【宝物】修复神树和四灵变化后,没有重新计算宝物评分的问题 2021-11-03 15:16:48 +08:00
jiaoyangna 4eed456628 神魂图标修改 2021-11-03 13:25:08 +08:00
jiaoyangna 604b1d6819 神魂提交 2021-11-03 11:18:37 +08:00
jiaoyangna 0468c865db 神魂提交 2021-11-03 10:32:55 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00