jiaoyangna
|
9f59cb3b64
|
神魂提交
|
2021-10-27 17:04:33 +08:00 |
jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +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 |
jiaoyangna
|
f5dc4a20b2
|
神魂出版提交
|
2021-10-22 15:47:59 +08:00 |
ZhangBiao
|
1f5f4f15c3
|
【弹窗优化】提交
|
2021-10-22 14:22:12 +08:00 |
jiaoyangna
|
06a8251a40
|
神魂界面提交
|
2021-10-20 18:02:09 +08:00 |
ZhangBiao
|
e2cb67caf3
|
【修行】点击加成按钮后 游戏崩溃修改
|
2021-10-20 14:27:43 +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
|
9e46ffd910
|
神将天赋界面修改提交
|
2021-10-14 17:14:51 +08:00 |
jiaoyangna
|
60b53f2d7b
|
神将详情,装备修改提交
|
2021-10-12 15:32:07 +08:00 |
jiaoyangna
|
e70329e605
|
神将详情显示错误修改
|
2021-10-12 14:54:12 +08:00 |
jiaoyangna
|
e7cfacdccd
|
神奖详情界面修改提交
|
2021-10-12 14:26:19 +08:00 |
jiaoyangna
|
b0f9b28036
|
神将详情报错修改提交
|
2021-10-12 12:17:33 +08:00 |
jiaoyangna
|
1a165839fd
|
点击神将详情界面查看属性按钮报错修改必现
|
2021-10-12 12:16:31 +08:00 |
gaoxin
|
2eb04261bc
|
Merge branch '0优化/装备对比' into china/dev
|
2021-09-30 15:01:40 +08:00 |
gaoxin
|
4d907f1530
|
【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息
|
2021-09-30 15:01:19 +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 |
gaoxin
|
e56affc4b4
|
【装备对比】装备穿戴界面显示修改
|
2021-09-28 19:45:21 +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 |
ZhangBiao
|
a4ee19a351
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-27 17:02:59 +08:00 |
ZhangBiao
|
5939c5b2f8
|
【七界试炼】跳转提交
|
2021-09-27 17:02:43 +08:00 |
wangzhenxing
|
70ebab2fe1
|
【功能】====装备合成添加特效
|
2021-09-27 16:25:20 +08:00 |
jiaoyangna
|
9137d9f592
|
新手引导调整
|
2021-09-27 14:22:23 +08:00 |
jiaoyangna
|
4e17b829ba
|
红点修改提交,挂机界面预览修改提交
|
2021-09-27 10:58:41 +08:00 |
jiaoyangna
|
683e71ae89
|
好感度入口调整
|
2021-09-27 09:45:57 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
gaoxin
|
f282fe046b
|
【白金装备】修改白金装备字体显示
|
2021-09-26 18:41:47 +08:00 |
gaoxin
|
b21e7efe0d
|
【角色信息】修复跳转到角色信息界面,点击左右箭头报错
|
2021-09-26 17:38:23 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
14b967185b
|
好感度提交
|
2021-09-26 10:18:51 +08:00 |
jiaoyangna
|
a8eeec83f6
|
Merge branch 'china/dev' into 0功能/好感度
# 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/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-22 20:53:08 +08:00 |
jiaoyangna
|
529094b6ad
|
好感度第一次提交
|
2021-09-22 20:47:13 +08:00 |
gaoxin
|
472409a1b3
|
【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
|
2021-09-17 17:00:59 +08:00 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
gaoxin
|
247d9a85d0
|
【战斗力】删除无用的属性计算
|
2021-09-17 15:10:06 +08:00 |
gaoxin
|
a7ce05450b
|
【战斗力】 功能属性加入战斗力初始化
|
2021-09-17 15:08:37 +08:00 |
jiaoyangna
|
8293c56b37
|
建木神树图片修改提交
(cherry picked from commit f127a0e858 )
|
2021-09-16 17:11:29 +08:00 |
jiaoyangna
|
f127a0e858
|
建木神树图片修改提交
|
2021-09-16 17:10:39 +08:00 |
ZhangBiao
|
1e17301cc8
|
【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能
|
2021-09-16 16:16:50 +08:00 |
gaoxin
|
2494b16f89
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-16 13:37:16 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
jiaoyangna
|
cb6c480956
|
宝物强化界面消耗本体去掉加号
|
2021-09-13 17:30:01 +08:00 |
jiaoyangna
|
d55dd4c59d
|
共鸣宝物报错强化修改提交
|
2021-09-13 16:17:38 +08:00 |
gaoxin
|
7df51e8929
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
|
2021-09-11 16:52:33 +08:00 |
zhangshanxue
|
053650b3e7
|
Merge branch 'china/test' into china/xq
|
2021-09-06 16:36:25 +08:00 |
gaoxin
|
59ec0d6f20
|
【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题
|
2021-09-06 16:35:46 +08:00 |