jiaoyangna
|
73283bd818
|
回退修改提交
|
2021-12-16 10:09:48 +08:00 |
jiaoyangna
|
4dc37c659c
|
回退修改提交
|
2021-12-15 10:58:49 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# 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/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
ZhangBiao
|
fbb58dbfdc
|
【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名
|
2021-11-22 18:44:32 +08:00 |
jiaoyangna
|
da218cfc3c
|
添加战力
|
2021-11-22 15:02:42 +08:00 |
jiaoyangna
|
197b6f0d45
|
滑动修改提交
|
2021-11-22 14:10:54 +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 |
gaoxin
|
670320141c
|
【战斗】初始怒气和爆伤减免的顺序交换
|
2021-11-18 17:17:53 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
gaoxin
|
fe13249728
|
【人物属性】新增爆伤减免属性,战斗适用
|
2021-11-17 16:01:14 +08:00 |
gaoxin
|
12fe3eb3e4
|
【战斗力】公式参数走表,装备,法宝战斗力计算公式修改
|
2021-11-17 15:55: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 |
gaoxin
|
ce5042eb86
|
【克制属性】添加
|
2021-11-16 16:59:59 +08:00 |
jiaoyangna
|
1e4a7a57be
|
法宝之魂 提交
|
2021-11-16 15:24:17 +08:00 |
gaoxin
|
6033aa6128
|
【战斗力】修复条件属性计算不完全的问题
|
2021-11-12 18:18:50 +08:00 |
jiaoyangna
|
e457260b42
|
神将排序界面修改提交
|
2021-11-08 15:04:53 +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 |
ZhangBiao
|
fc6d13a4d7
|
【鸿蒙碑】升级鸿蒙碑不弹出战斗力变化提示,且升级后总战斗力数值错误,重新登录后战斗力会提升
|
2021-11-03 17:06:45 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
ZhangBiao
|
68525db92e
|
【界面优化】提交
|
2021-11-02 11:06:13 +08:00 |
ZhangBiao
|
3b02c6296c
|
【宝器属性】穿戴宝器后,游戏退出重进宝器属性没有加上,导致战力值下降
|
2021-10-29 14:20:21 +08:00 |
jiaoyangna
|
96a7a33743
|
恭送神将同步编队战力
|
2021-10-28 13:39:52 +08:00 |
jiaoyangna
|
314398f5ba
|
保存支援神将后,若神魂效果为首次激活,需要神将条件和对应数量神魂效果变为绿色,激活神魂等级图标和神魂效果,并获得战斗力提升,若神将正处于主线编队,同时弹出主线战斗力变化提示。
|
2021-10-27 18:53:36 +08:00 |
jiaoyangna
|
9f59cb3b64
|
神魂提交
|
2021-10-27 17:04:33 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
jiaoyangna
|
acc912a0e7
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-10-22 15:52:33 +08:00 |
gaoxin
|
da665cc148
|
【编队】取消公会战相关编队判断,获取编队信息时不再检测公会战防守编队信息
|
2021-10-21 10:22:00 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
jiaoyangna
|
b50e5ee2bf
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-18 10:38:49 +08:00 |
jiaoyangna
|
097d5cf1cc
|
神魂初版提交
|
2021-10-18 10:36:32 +08:00 |
jiaoyangna
|
842c9b7592
|
白金装备属性加成添加
|
2021-10-14 12:39:40 +08:00 |
jiaoyangna
|
8b13f803c8
|
ID1018691】
【好感度】背包里所有5星好感度都满了,好感度入口还显示红点
|
2021-10-09 11:06:59 +08:00 |
jiaoyangna
|
c72d3af853
|
【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
|
2021-10-08 19:32:16 +08:00 |
gaoxin
|
73709000a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-29 17:34:38 +08:00 |
gaoxin
|
971a457224
|
【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题
|
2021-09-29 17:34:20 +08:00 |
jiaoyangna
|
a62e656d7b
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-29 15:49:39 +08:00 |
gaoxin
|
0abe5663c6
|
【战斗力】debug时不再计算老版本的战斗力
|
2021-09-29 14:55:14 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
gaoxin
|
94782f7cf4
|
【ID1018635】 【唯一限制魂印】同时戴舍身济世和历战之躯,恭送掉该神将数据只会清一个,另一个依然是无法佩戴
|
2021-09-27 20:18:10 +08:00 |
gaoxin
|
ed3f38f9cb
|
【战斗力】修复部分数据刷新不及时
|
2021-09-27 18:33:58 +08:00 |
gaoxin
|
eacf753e55
|
【战斗力】修复部分设置人物属性全部为脏数据时没有设置战斗力脏数据
|
2021-09-27 17:35:36 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
gaoxin
|
65efa9336c
|
【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题
|
2021-09-23 20:59:44 +08:00 |
gaoxin
|
f6c336e52f
|
【战斗力】添加一些log
|
2021-09-23 15:52:19 +08:00 |
gaoxin
|
579b566935
|
【四象心法】加入新的战斗力计算
|
2021-09-22 15:42:28 +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 |
yuanshuai
|
db18313495
|
Merge branch '0功能/四象心法' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
# Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto.proto
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/ChatProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-22 15:12:32 +08:00 |
gaoxin
|
e3f11c86ed
|
【战斗力】界面展示优化
|
2021-09-17 15:24:10 +08:00 |