Commit Graph

9399 Commits (95382d530e02b279837c285fd2483acc34ed7f2a)

Author SHA1 Message Date
ZhangBiao 6454e84172 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 19:07:50 +08:00
ZhangBiao fc704b98c3 【灵脉秘境】资源提交 2021-11-18 19:07:19 +08:00
ZhangBiao c994c9e636 【灵脉秘境】提交 2021-11-18 18:43:22 +08:00
wangzhenxing 45bc2139a6 [战斗表现]=========我方前排血条位置修改 2021-11-18 18:37:14 +08:00
wangzhenxing b74561d70b [战斗表现]===============敌我前后排立绘缩放大小固定 2021-11-18 18:29:13 +08:00
gaoxin 670320141c 【战斗】初始怒气和爆伤减免的顺序交换 2021-11-18 17:17:53 +08:00
ZhangBiao 7d0a24a3cc 【灵脉秘境】提交 2021-11-18 17:15:16 +08:00
gaoxin cd291429f1 【坐骑碎片合成】删除无用代码 2021-11-18 16:05:26 +08:00
gaoxin 77c3376d82 【坐骑碎片合成】 2021-11-18 16:03:34 +08:00
wangzhenxing e705049135 【战斗】=======362修改 填加388-391被动 2021-11-18 16:02:16 +08:00
ZhangBiao 015341b7a6 【灵脉秘境】提交 2021-11-18 15:49:39 +08:00
ZhangBiao f79de8970c 【灵脉秘境】提交 2021-11-18 15:45:21 +08:00
wangzhenxing ad0e844852 [战中表现]========我方单位立绘大小读取字段修改 2021-11-18 15:44:16 +08:00
ZhangBiao 58d7a71faf 【灵脉秘境】提交 2021-11-18 15:14:39 +08:00
ZhangBiao a2a5d0f192 【灵脉秘境】提交 2021-11-18 14:39:50 +08:00
ZhangBiao 7f0720554f 【灵脉秘境】提交 2021-11-18 14:31:57 +08:00
ZhangBiao 79d2113bc2 【灵脉秘境】提交 2021-11-18 14:10:57 +08:00
ZhangBiao de7a516a87 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-18 13:30:03 +08:00
ZhangBiao 0722edb107 【灵脉秘境】提交 2021-11-18 13:29:26 +08:00
ZhangBiao 8125ed131e 【灵脉秘境】提交 2021-11-18 13:17:28 +08:00
ZhangBiao 03cdea5c83 【灵脉秘境】纪录提交 2021-11-18 11:35:20 +08:00
wangzhenxing 666f33e9c9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-18 11:08:11 +08:00
wangzhenxing 071b7e62de [战斗]======被动362 修改 2021-11-18 11:06:19 +08:00
gaoxin ecedea90f8 Merge branch '0功能/新增克制属性' into china/dev 2021-11-18 10:49:34 +08:00
ZhangBiao e174e24bc1 【灵脉秘境】提交 2021-11-18 10:26:14 +08:00
wangzhenxing d87d9f621e [战斗表现]=======战斗界面卡牌显示修改 2021-11-17 18:37:43 +08:00
ZhangBiao 790fe1c88f 【灵脉秘境】提交 2021-11-17 18:28:59 +08:00
wangzhenxing bf5f664fb8 [战斗]==========困难副本 禁疗不算控制 2021-11-17 17:36:20 +08:00
gaoxin 37000619e3 【战斗】加入克制属性的计算 2021-11-17 17:29:46 +08:00
wangzhenxing 6ee80e7a9f [战斗表现]================战斗表现修改提交 2021-11-17 17:29:17 +08:00
ZhangBiao f2298b3b3e 【灵脉秘境】提价o 2021-11-17 17:24:51 +08:00
gaoxin 1aa2efc1b1 【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误 2021-11-17 16:58:06 +08:00
gaoxin b1954f543f 【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误 2021-11-17 16:57:29 +08:00
gaoxin 8bb710452c 【战斗力】装备战斗力计算方式修改 2021-11-17 16:50:16 +08:00
ZhangBiao 2b2a77a129 【灵脉秘境】提交 2021-11-17 16:14:47 +08:00
gaoxin fe13249728 【人物属性】新增爆伤减免属性,战斗适用 2021-11-17 16:01:14 +08:00
gaoxin 12fe3eb3e4 【战斗力】公式参数走表,装备,法宝战斗力计算公式修改 2021-11-17 15:55:37 +08:00
wangzhenxing 1362e8b4f6 [战斗]=============第三批神魂技能提交 2021-11-17 15:01:24 +08:00
ZhangBiao b6ce191bff 【装备界面】无法卸下调整 2021-11-17 12:34:39 +08:00
ZhangBiao 751b680be9 【灵脉】提交 2021-11-17 11:13:36 +08:00
ZhangBiao 0a7d343e20 【灵脉】提交 2021-11-17 11:12:49 +08:00
jiaoyangna 2911c5b77c 乾坤宝囊限时商店修改提交
(cherry picked from commit e8df9ca87e)
2021-11-17 10:36:57 +08:00
ZhangBiao d8dd88b2e2 【灵脉秘境】提交 2021-11-16 18:30:08 +08:00
ZhangBiao 6012b533ca 【灵脉秘境】提交 2021-11-16 17:34:37 +08:00
jiaoyangna ec48fa55f0 Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-11-16 17:34:22 +08:00
jiaoyangna 23a55ef0dc 天宫寻宝特效修改提交
(cherry picked from commit 791ac14e2e)
2021-11-16 17:28:24 +08:00
jiaoyangna 791ac14e2e 天宫寻宝特效修改提交 2021-11-16 17:27:49 +08:00
jiaoyangna cd5c2f585a 【ID1019160】
【神将】初始4星情报界面有魂印图标,点击提示6星解锁

(cherry picked from commit ee46920fe5)
2021-11-16 17:17:35 +08:00
jiaoyangna ee46920fe5 【ID1019160】
【神将】初始4星情报界面有魂印图标,点击提示6星解锁
2021-11-16 17:17:00 +08:00
jiaoyangna e3db539691 【ID1019147】
【寻宝】神魂等级效果在寻宝详情界面穿透

(cherry picked from commit 3921d6326f)
2021-11-16 17:00:00 +08:00
gaoxin ce5042eb86 【克制属性】添加 2021-11-16 16:59:59 +08:00
jiaoyangna 3921d6326f 【ID1019147】
【寻宝】神魂等级效果在寻宝详情界面穿透
2021-11-16 16:59:30 +08:00
jiaoyangna 6e2deee6f1 【ID1019165】
【灵兽列表】部分星星显示位置错误

(cherry picked from commit a9709ad212)
2021-11-16 16:41:30 +08:00
jiaoyangna a9709ad212 【ID1019165】
【灵兽列表】部分星星显示位置错误
2021-11-16 16:40:34 +08:00
jiaoyangna 2ec40af5e5 【ID1019177】
【鸿蒙阵】共鸣区上阵激活神魂将,下拉必现

(cherry picked from commit 7f5a36cf4b)
2021-11-16 16:29:16 +08:00
jiaoyangna 7f5a36cf4b 【ID1019177】
【鸿蒙阵】共鸣区上阵激活神魂将,下拉必现
2021-11-16 16:28:36 +08:00
jiaoyangna 1e4a7a57be 法宝之魂 提交 2021-11-16 15:24:17 +08:00
wangzhenxing 1361867887 【坐骑】=======四不像提交 2021-11-16 13:31:28 +08:00
ZhangBiao ec1d668524 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-16 13:11:47 +08:00
ZhangBiao 5eaf88defb 【GM】修改GM 2021-11-16 11:53:19 +08:00
ZhangBiao d717519d93 【灵脉秘境】提交 2021-11-16 11:21:37 +08:00
jiaoyangna aa6a031fdf 法宝聚灵提交 2021-11-16 09:33:10 +08:00
ZhangBiao a4151f51b2 【灵脉秘境】提交 2021-11-15 18:38:53 +08:00
gaoxin b6ea250096 【新手战斗】选择女角色后,战斗中立绘替换为女角色 2021-11-15 18:34:25 +08:00
jiaoyangna e6f4e50656 法宝聚灵 2021-11-15 18:24:39 +08:00
gaoxin 3a70720f9c 【新手战斗】第一场战斗关闭跳过 2021-11-15 17:26:04 +08:00
liujiaqi 1498cd7661 【新手战斗】报错修复 2021-11-19 17:20:28 +08:00
ZhangBiao 336ea6b8d3 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 17:19:01 +08:00
gaoxin 79d22b0545 【新手战斗】回合开始触发改为回合结束触发 2021-11-15 17:09:52 +08:00
ZhangBiao 254a420fb7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 16:59:01 +08:00
ZhangBiao 2c0032b829 【神魂】头像框错误修改 2021-11-15 16:58:49 +08:00
gaoxin 9c50acee09 【引导战斗】添加第N回合开始时触发剧情 2021-11-15 16:46:41 +08:00
ZhangBiao d815fbb69f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 16:44:59 +08:00
ZhangBiao b7c354befe 【神魂】神魂头像框修改 2021-11-15 16:44:46 +08:00
gaoxin f7a1ddbc94 【假战斗】背景走表配置 2021-11-15 16:39:38 +08:00
ZhangBiao 9fca63f5a1 【成长基金】配合后端修改 2021-11-15 15:44:02 +08:00
gaoxin 1e5f397ac1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-15 13:11:18 +08:00
gaoxin 5be38dacb1 【新手剧情】起名界面添加回调 2021-11-15 13:10:59 +08:00
wangzhenxing 7790f90d8f 【战斗】=======被动处理伤害修改 2021-11-15 10:34:13 +08:00
ZhangBiao ff3fcf3db9 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-15 09:56:59 +08:00
ZhangBiao 07a87548aa 【灵脉秘境】提交 2021-11-15 09:56:02 +08:00
gaoxin f1f407fdd6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 18:19:01 +08:00
gaoxin ee6e1265d8 【活动】修复红点会显示灰色的问题 2021-11-12 18:18:56 +08:00
gaoxin 6033aa6128 【战斗力】修复条件属性计算不完全的问题 2021-11-12 18:18:50 +08:00
wangzhenxing 7dfa28321c [战斗]======被动376 377修改 2021-11-12 17:38:28 +08:00
gaoxin 83583747ad Merge branch '0功能/和谐资源后台控制' into china/dev 2021-11-12 16:39:53 +08:00
skuld b63ad78128 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-28 16:30:29 +08:00
skuld 9f64c64712 【森罗环境】商店无法拖动修改 2021-11-28 16:30:11 +08:00
gaoxin 69f0ebc6d0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 15:56:04 +08:00
gaoxin 93640449f3 【引导】副本前引导添加 2021-11-12 15:55:53 +08:00
wangzhenxing 41dc490d28 【战斗】=============== 被动处理伤害方法只处理减伤 2021-11-12 15:54:54 +08:00
jiaoyangna 075de29090 编队界面看神将情报错误修改
(cherry picked from commit c8e7d0cdd4)
2021-11-12 15:52:09 +08:00
jiaoyangna c8e7d0cdd4 编队界面看神将情报错误修改 2021-11-12 15:51:26 +08:00
wangzhenxing 4756c0b19e [战斗]========363被动替换逻辑修改 2021-11-12 15:31:01 +08:00
gaoxin 02114f269f 【资源】神魂功能开启资源位置修改 2021-11-12 15:00:16 +08:00
gaoxin fb47648fd7 【技能特效】唐僧技能再优化 2021-11-12 14:53:03 +08:00
gaoxin 1d22b10e61 【引导】通过关卡时引导添加 2021-11-12 14:52:30 +08:00
gaoxin f6a6512c4b 【技能】唐僧特效优化 2021-11-12 13:29:42 +08:00
gaoxin 9f2507879b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-12 11:59:46 +08:00
gaoxin 451d8f4460 【战斗】伤害数字延时显示 2021-11-12 11:59:40 +08:00
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