wangzhenxing
|
ac32149aa8
|
[立绘朝向]=====皮肤,敌方立绘朝向修改
|
2021-11-29 17:07:28 +08:00 |
wangzhenxing
|
ea7e7d31be
|
【战中表现】======身外化身表现优化
|
2021-11-29 16:19:43 +08:00 |
wangzhenxing
|
bc39b34a73
|
[战中表现]=====角色释放技能表现位置修改
|
2021-11-27 16:34:46 +08:00 |
wangzhenxing
|
0ce834e220
|
【立绘朝向】=====备战界面修改,战斗记录界面灵兽显示主角修改
|
2021-11-27 16:25:21 +08:00 |
wangzhenxing
|
cbcead2f50
|
【身外化身】=======化身位置修改
|
2021-11-27 15:45:21 +08:00 |
wangzhenxing
|
d639b2d29b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 15:15:00 +08:00 |
wangzhenxing
|
85a12ae9d8
|
[身外化身]========身外化身立绘朝向修改
|
2021-11-27 15:14:22 +08:00 |
gaoxin
|
d253668aef
|
【战斗】修复按钮被立绘遮挡
|
2021-11-27 15:13:35 +08:00 |
wangzhenxing
|
fd81a89c96
|
【战斗表现】========变身卡展示位置修改
|
2021-11-27 13:56:37 +08:00 |
gaoxin
|
060a380305
|
【战斗】跳过按钮进度显示优化
|
2021-11-26 19:41:10 +08:00 |
wangzhenxing
|
587a5cfc2e
|
[战斗]=======133 136 137效果修改
|
2021-11-26 18:05:16 +08:00 |
gaoxin
|
0ddf804234
|
【战斗】战斗结构调整
|
2021-11-26 17:20:28 +08:00 |
wangzhenxing
|
13e0ab29ba
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 16:56:01 +08:00 |
wangzhenxing
|
69e30d908c
|
[立绘朝向]===============我方立绘展示朝向修改
|
2021-11-26 16:55:13 +08:00 |
gaoxin
|
a9a402bd42
|
【战斗】再次优化护盾类特效的显示层级
|
2021-11-26 14:27:58 +08:00 |
gaoxin
|
6b199a8b5a
|
【战斗】敌方怒气穿透
|
2021-11-26 14:06:19 +08:00 |
gaoxin
|
21e7638a75
|
【特效】优化点对点特效的显示时间,优化特效层级错误的问题
|
2021-11-26 13:58:59 +08:00 |
gaoxin
|
71aa002b13
|
【战斗】前置特效添加延时
|
2021-11-26 13:58:24 +08:00 |
wangzhenxing
|
bb1402d5e7
|
[战斗]======立绘方向修改
|
2021-11-26 11:24:46 +08:00 |
gaoxin
|
f5f5a2477d
|
【战斗】怒气层级错误
|
2021-11-26 10:33:30 +08:00 |
wangzhenxing
|
7949e8c21c
|
【战斗】========灵兽卡面翻转提交
|
2021-11-25 18:47:53 +08:00 |
gaoxin
|
879cf506f5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:43:15 +08:00 |
gaoxin
|
4923314bbb
|
【战斗】屏幕震动加入伤害延时时间
|
2021-11-25 15:43:10 +08:00 |
wangzhenxing
|
b15eaf8b19
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 15:05:10 +08:00 |
wangzhenxing
|
ae8021cd6a
|
[战斗表现]========敌我方立绘镜像显示
|
2021-11-25 15:04:55 +08:00 |
gaoxin
|
b316f54e50
|
【战斗】护盾特效层级问题优化
|
2021-11-25 14:46:46 +08:00 |
gaoxin
|
a36714d286
|
【战斗】跳过提示文字:第二回合结束后可以跳过
|
2021-11-25 14:44:10 +08:00 |
gaoxin
|
bb15f0056e
|
【战斗】弹道特效不在根据贝塞尔曲线运动
|
2021-11-24 14:42:11 +08:00 |
gaoxin
|
d1ce54c9a9
|
【测试战斗】报错修复
|
2021-11-24 14:22:27 +08:00 |
gaoxin
|
f01889db21
|
【战斗】改为第三回合时战斗就可以跳过
|
2021-11-24 14:21:44 +08:00 |
gaoxin
|
5462a1ad3b
|
【战斗】弹道特效转向
|
2021-11-23 17:23:35 +08:00 |
gaoxin
|
3f343bb1b2
|
【战斗】关卡和每日副本战斗改为3回合后跳过,其他战斗直接可以跳过
|
2021-11-23 17:22:54 +08:00 |
wangzhenxing
|
9cce1aa31c
|
【战斗表现】======剧情特殊处理敌人名字位置
|
2021-11-23 15:13:43 +08:00 |
wangzhenxing
|
b8b1c74f03
|
[战斗]========被动391修改 我方流血显示修改
|
2021-11-23 10:46:52 +08:00 |
wangzhenxing
|
134b1aff71
|
【战斗表现】============我方复活后血条不显示修改
|
2021-11-22 17:21:59 +08:00 |
wangzhenxing
|
f67006e041
|
【战斗】============战斗超时pvp类型检测添加类型
|
2021-11-22 16:57:46 +08:00 |
gaoxin
|
66670029dc
|
【战斗】修复战斗跳过时,人物回收,但是延时方法依然会执行的问题
|
2021-11-22 16:42:14 +08:00 |
gaoxin
|
7f68c39f91
|
【灵脉】回放跳过时战斗卡住
|
2021-11-22 16:28:36 +08:00 |
gaoxin
|
d52ca13ff6
|
【战斗】关闭战斗类型打印
|
2021-11-22 16:13:06 +08:00 |
wangzhenxing
|
f980485ce2
|
[战斗表现]========足下阴影显示修改
|
2021-11-22 15:18:44 +08:00 |
ZhangBiao
|
85c8028bc5
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-19 17:57:09 +08:00 |
wangzhenxing
|
3d4211740c
|
【战斗表现】=========我方战中立绘缩放读取字段修改
|
2021-11-19 11:19:18 +08:00 |
ZhangBiao
|
6454e84172
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 19:07:50 +08:00 |
wangzhenxing
|
45bc2139a6
|
[战斗表现]=========我方前排血条位置修改
|
2021-11-18 18:37:14 +08:00 |
wangzhenxing
|
b74561d70b
|
[战斗表现]===============敌我前后排立绘缩放大小固定
|
2021-11-18 18:29:13 +08:00 |
wangzhenxing
|
ad0e844852
|
[战中表现]========我方单位立绘大小读取字段修改
|
2021-11-18 15:44:16 +08:00 |
ZhangBiao
|
de7a516a87
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 13:30:03 +08:00 |
ZhangBiao
|
e174e24bc1
|
【灵脉秘境】提交
|
2021-11-18 10:26:14 +08:00 |
wangzhenxing
|
6ee80e7a9f
|
[战斗表现]================战斗表现修改提交
|
2021-11-17 17:29:17 +08:00 |
wangzhenxing
|
1362e8b4f6
|
[战斗]=============第三批神魂技能提交
|
2021-11-17 15:01:24 +08:00 |
ZhangBiao
|
d8dd88b2e2
|
【灵脉秘境】提交
|
2021-11-16 18:30:08 +08:00 |
ZhangBiao
|
6012b533ca
|
【灵脉秘境】提交
|
2021-11-16 17:34:37 +08:00 |
gaoxin
|
b6ea250096
|
【新手战斗】选择女角色后,战斗中立绘替换为女角色
|
2021-11-15 18:34:25 +08:00 |
gaoxin
|
3a70720f9c
|
【新手战斗】第一场战斗关闭跳过
|
2021-11-15 17:26:04 +08:00 |
liujiaqi
|
1498cd7661
|
【新手战斗】报错修复
|
2021-11-19 17:20:28 +08:00 |
gaoxin
|
79d22b0545
|
【新手战斗】回合开始触发改为回合结束触发
|
2021-11-15 17:09:52 +08:00 |
gaoxin
|
9c50acee09
|
【引导战斗】添加第N回合开始时触发剧情
|
2021-11-15 16:46:41 +08:00 |
gaoxin
|
f7a1ddbc94
|
【假战斗】背景走表配置
|
2021-11-15 16:39:38 +08:00 |
gaoxin
|
451d8f4460
|
【战斗】伤害数字延时显示
|
2021-11-12 11:59:40 +08:00 |
gaoxin
|
b661b04ad1
|
【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误
|
2021-11-10 13:22:32 +08:00 |
gaoxin
|
880c77888a
|
【新假战斗】加入主角技能
|
2021-11-10 11:03:18 +08:00 |
gaoxin
|
c9e2ddcaf8
|
【新假战斗】
|
2021-11-10 09:48:42 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
wangzhenxing
|
8bc936aff8
|
【神魂】=====伤害统计界面神魂显示修改
|
2021-11-05 18:24:05 +08:00 |
gaoxin
|
d4582cf244
|
【神魂】修复战斗中神魂特效不显示的问题
|
2021-11-05 18:13:32 +08:00 |
jiaoyangna
|
420356da83
|
添加特效
|
2021-11-05 14:33:09 +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
|
51dfdede03
|
[战斗]===========被动371 368修改
|
2021-11-05 09:50:28 +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 |
wangzhenxing
|
6092ce28c0
|
【战斗】=========处理战斗伤害记录不显示敌方主角
|
2021-11-02 20:19:36 +08:00 |
wangzhenxing
|
46fe5a1b8d
|
【战斗】======战斗结果显示主角伤害治疗修改
|
2021-11-02 18:00:31 +08:00 |
wangzhenxing
|
d004e1d459
|
【神魂】======战斗中 和伤害记录界面加神魂显示
|
2021-10-29 15:14:01 +08:00 |
wangzhenxing
|
a38fe30800
|
[主角技能]=====注重主角立绘等级显示修改
|
2021-10-26 18:03:02 +08:00 |
gaoxin
|
a692f8d9d4
|
【本场最佳】主角名颜色根据修行等级改变
|
2021-10-26 14:45:28 +08:00 |
gaoxin
|
24ea182587
|
【最佳】加入主角伤害展示
|
2021-11-10 02:52:51 +08:00 |
wangzhenxing
|
7261a428fb
|
主角技能伤害提交
|
2021-10-21 17:47:49 +08:00 |
wangzhenxing
|
18da581061
|
[战斗]=====技能添加空判断
|
2021-10-21 10:41:57 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
wangzhenxing
|
31e8594a70
|
[战斗]=========御甲添加 图片字提示表现
|
2021-09-30 09:53:31 +08:00 |
wangzhenxing
|
cbb22260f3
|
Merge branch 'china/dev-c-battle' into china/dev
|
2021-09-23 11:02:19 +08:00 |
gaoxin
|
34f3f42a04
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
|
2021-09-22 15:36:10 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
ZhangBiao
|
2925de34e8
|
【七界试炼】结算界面提交
|
2021-09-17 14:38:05 +08:00 |
gaoxin
|
38fcf555dd
|
【山河社稷图】修复战斗不一致
|
2021-09-16 22:43:38 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36:16 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
wangzhenxing
|
4ee0741896
|
[战斗]==============被动338修改 护甲逻辑修改
|
2021-09-15 11:23:04 +08:00 |
wangzhenxing
|
dbf05190bc
|
Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua
|
2021-09-14 10:32:25 +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 |
wangzhenxing
|
3e36a537b3
|
[战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改
|
2021-09-01 18:40:32 +08:00 |
jiaoyangna
|
ab1a4ea627
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-26 17:42:25 +08:00 |
gaoxin
|
eebd99883b
|
【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题
|
2021-08-25 20:59:26 +08:00 |
jiaoyangna
|
0c7e38a715
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-25 15:25:54 +08:00 |
wangzhenxing
|
690db47d68
|
【战斗】=========复活,新灼烧特效预设提交
|
2021-08-25 14:37:10 +08:00 |
wangzhenxing
|
08d02a0b6d
|
[战斗]==========后续紫府神印提交
|
2021-08-12 15:11:38 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
zhangqiang
|
1cf142c82b
|
【跨服天梯】国内提交+1
|
2021-07-22 19:01:46 +08:00 |
wangzhenxing
|
f247221fcc
|
【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能)
|
2021-07-07 20:29:37 +08:00 |