Commit Graph

9840 Commits (db5627ab24b45dbf5279e0e124bba7b7b3cc910f)

Author SHA1 Message Date
ZhangBiao aa52131d3f 【灵脉秘境】文字遮挡、跳转 2021-11-22 13:27:54 +08:00
ZhangBiao cb80384f02 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 12:11:41 +08:00
ZhangBiao 421f82b882 【灵脉秘境】战斗报错修改 2021-11-22 12:11:28 +08:00
wangzhenxing 87f7602f9b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 12:02:22 +08:00
wangzhenxing ed8ef42849 [战斗]========被动112 258修改 2021-11-22 12:01:55 +08:00
gaoxin b10dad4285 【法宝聚灵】背包和掉落界面不显示碎片框 2021-11-22 12:01:16 +08:00
jiaoyangna 047e5cbe72 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 11:46:56 +08:00
jiaoyangna 0d073eb323 属性界面修改提交i 2021-11-22 11:44:48 +08:00
gaoxin 3aa09bfbeb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 11:18:43 +08:00
gaoxin f78031984a 【背包】法宝聚灵页签添加 2021-11-22 11:18:28 +08:00
jiaoyangna 04ff9d99e4 碎片自选箱修改提交 2021-11-22 11:16:18 +08:00
jiaoyangna e61de063cf 法宝聚灵修改提交 2021-11-22 11:01:43 +08:00
jiaoyangna 7074527619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-22 10:39:10 +08:00
jiaoyangna cefbc9b8dc 属性加成错误显示修改 2021-11-22 10:38:54 +08:00
wangzhenxing f10d6ee2a1 [玉虚论道]======保存队伍时添加相同英雄检测 2021-11-22 10:18:39 +08:00
jiaoyangna 8c10c104d8 适配修改 2021-11-19 19:10:05 +08:00
jiaoyangna 6916a5f95a 适配修改提交 2021-11-19 19:08:11 +08:00
jiaoyangna 5684d23328 红点修改 2021-11-19 18:54:16 +08:00
jiaoyangna 4a36c62362 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-19 18:52:12 +08:00
jiaoyangna e722bf90d4 属性显示错误修改提交 2021-11-19 18:51:18 +08:00
jiaoyangna 18968609a6 属性显示错误修改 2021-11-19 18:49:52 +08:00
jiaoyangna ff71fb378e 属性显示错误修改 2021-11-19 18:48:18 +08:00
ZhangBiao c9faa2e74d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-19 18:43:01 +08:00
ZhangBiao a334b3536f 【灵脉秘境】界面设配调整 2021-11-19 18:42:50 +08:00
jiaoyangna 1b11728534 道具点击报错修改提交 2021-11-19 18:39:04 +08:00
jiaoyangna 2978dc203c 添加特效,添加点击事件 2021-11-19 18:32:22 +08:00
jiaoyangna 5ef8b89239 文字位置修改提交 2021-11-19 18:15:19 +08:00
jiaoyangna e8410fa0c1 资源提交 2021-11-19 18:06:17 +08:00
jiaoyangna 71fb3c9bc3 协议提交 2021-11-19 18:05:20 +08:00
jiaoyangna db0fcea43e Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-19 18:01:59 +08:00
ZhangBiao 85c8028bc5 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-19 17:57:09 +08:00
ZhangBiao f1737b1c5d 【灵脉秘境】提交 2021-11-19 17:48:56 +08:00
jiaoyangna de31ad6dfe 资源替换 2021-11-19 17:41:40 +08:00
wangzhenxing 2cf0c5afde [战斗]=======被动310,391修改 2021-11-19 17:39:43 +08:00
jiaoyangna c058e0ac74 底图修改提交 2021-11-19 17:39:38 +08:00
gaoxin d95530acc6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-19 17:29:45 +08:00
gaoxin 9ce1d26fa9 【战斗】添加一些战斗类型 2021-11-19 17:29:40 +08:00
jiaoyangna 91dfe3131d 灵兽宝阁进度icon点击显示错误修改
(cherry picked from commit 2de1c704f0)
2021-11-19 17:29:07 +08:00
jiaoyangna 2de1c704f0 灵兽宝阁进度icon点击显示错误修改 2021-11-19 17:28:20 +08:00
ZhangBiao 95f71667fe 【灵脉秘境】提交 2021-11-19 17:23:06 +08:00
gaoxin ab9408b485 【战斗】后端被动和主动技能id格式转换成数字,可能导致战斗不一致 2021-11-19 17:21:01 +08:00
jiaoyangna d62584866e 星星缺少修改 2021-11-19 17:17:28 +08:00
jiaoyangna 467dd1aebb 添加特效提交 2021-11-19 17:08:14 +08:00
ZhangBiao 9f356783e1 【灵脉秘境】提交 2021-11-19 17:01:10 +08:00
jiaoyangna bc62311af9 法宝之魂第二个界面提交 2021-11-19 16:52:15 +08:00
ZhangBiao 2ccc305041 Merge branch '0功能/灵脉秘境' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵脉秘境 2021-11-19 16:16:58 +08:00
skuld 2bd271390d bat Resource Commit:2021/12/02, 9:45:19 2021-12-02 09:45:20 +08:00
ZhangBiao 5e09e0b9a3 【灵脉秘境】切磋 2021-11-19 16:16:45 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
jiaoyangna b08dde6851 报错修改提交 2021-11-19 14:39:20 +08:00
jiaoyangna d69b3c8ca5 Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-11-19 14:35:42 +08:00
ZhangBiao 42842f88bf 【灵脉秘境】资源提交 2021-11-19 11:47:41 +08:00
ZhangBiao c9e465f662 【灵脉秘境】提交 2021-11-19 11:45:53 +08:00
jiaoyangna 9e99347a2b 法宝聚灵提交 2021-11-19 11:37:26 +08:00
jiaoyangna 808dcddc62 法宝聚灵界面1提交 2021-11-19 11:33:34 +08:00
wangzhenxing 1a623036fa [战斗]============禁甲图片提交 2021-11-19 11:30:42 +08:00
wangzhenxing 3d4211740c 【战斗表现】=========我方战中立绘缩放读取字段修改 2021-11-19 11:19:18 +08:00
wangzhenxing 9830c04a4b 【战斗】======御甲增加表现 2021-11-19 11:18:15 +08:00
wangzhenxing fc82b7bbc7 【战斗】======323 258 112 被动修改 2021-11-19 10:00:04 +08:00
ZhangBiao 9e507326fd 【灵脉秘境】提交 2021-11-19 09:38:41 +08:00
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
gaoxin f5f2e9c7ef 【账号校验】大小写修改 2021-11-18 14:20:03 +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
gaoxin 3565dc2b2a 【改名时上报事件】 2021-11-18 11:34:54 +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
gaoxin 0a924855ed 【账号ID校验】添加 2021-11-16 17:01:09 +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
gaoxin 63fedf2d3c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-16 16:31:24 +08:00
gaoxin 2a5c5962e8 【开天专服】打包场景添加 2021-11-16 16:31:12 +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