zhangqiang
|
c202e03703
|
【英雄详情升星】升星后的属性没有加团队属性
|
2021-04-29 10:09:27 +08:00 |
gaoxin
|
7df1514da8
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
|
2021-04-26 17:55:43 +08:00 |
zhangqiang
|
2b595bb8f5
|
【跳转】化虚坛跳转修改2
|
2021-04-25 14:20:07 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
zhangqiang
|
991fb61f57
|
【英雄升星祭品】提交——6
|
2021-04-20 20:59:43 +08:00 |
zhangqiang
|
a7dc372bb7
|
【英雄升星祭品】提交——5
|
2021-04-20 19:58:07 +08:00 |
zhangqiang
|
a4727e6de7
|
【升星优化】选择祭品神将页面,按照神将图鉴排序的反向规则进行排列,使珍贵的神将排序更为靠后,本体仍放在最后的位置
|
2021-04-20 11:13:03 +08:00 |
zhangqiang
|
3f903cf911
|
【神将合成】化虚坛和选择祭品界面添加长按头像功能
|
2021-04-20 10:17:57 +08:00 |
zhangqiang
|
3fb2bae218
|
英雄左右快速切换 ui 重叠
|
2021-04-19 19:36:43 +08:00 |
zhangqiang
|
4bb6004ace
|
【英雄升星祭品】提交——3
|
2021-04-19 18:05:15 +08:00 |
gaoxin
|
d6cad28914
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-19 16:14:18 +08:00 |
zhangqiang
|
46efdd02de
|
【英雄升星祭品】提交——02
|
2021-04-19 15:11:39 +08:00 |
zhangqiang
|
9706cd776d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-19 13:46:34 +08:00 |
zhangqiang
|
de76c697c4
|
【英雄升星祭品】提交——01
|
2021-04-19 13:46:24 +08:00 |
zhangqiang
|
1f6b8de581
|
【英雄详情】修改
|
2021-04-17 17:50:08 +08:00 |
zhangqiang
|
af8aed7701
|
图鉴错乱修改
|
2021-04-17 16:35:38 +08:00 |
jiaoyangna
|
5f29447434
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 20:37:00 +08:00 |
jiaoyangna
|
c844a72609
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-15 19:54:30 +08:00 |
gaoxin
|
56bf418509
|
Merge branch 'xma/dev' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua
|
2021-04-12 16:04:46 +08:00 |
jiaoyangna
|
034ed82f0f
|
皮肤错误修改
|
2021-04-12 14:02:03 +08:00 |
ZhangBiao
|
0b2c480b1d
|
【神将进阶】选择进阶神将名字无翻译
|
2021-04-09 21:21:48 +08:00 |
ZhangBiao
|
da0d4f49d6
|
【装备详情】界面调整
|
2021-04-09 20:31:45 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
jiaoyangna
|
38e64fb774
|
还原文字提交
|
2021-04-09 11:39:09 +08:00 |
jiaoyangna
|
c86307d328
|
图鉴添加皮肤页签
|
2021-04-08 17:58:17 +08:00 |
jiaoyangna
|
5740120f53
|
【ID1008675】
【图鉴优化】增加神将皮肤预览
|
2021-04-08 17:24:36 +08:00 |
zhangqiang
|
69d3f4a331
|
【bug 主要是翻译】
|
2021-04-07 16:38:26 +08:00 |
ZhangBiao
|
bfaa5195b5
|
Revert "【表删除】报错处理"
This reverts commit b163fc3035 .
|
2021-04-07 11:54:39 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
jiaoyangna
|
db80db31c2
|
升星神将显示名字修改
|
2021-04-06 16:44:04 +08:00 |
jiaoyangna
|
6e68ac5949
|
【ID1008671】
【升星优化】升星选择祭品神将时,增加显示内容
|
2021-04-06 15:20:00 +08:00 |
gaoxin
|
b163fc3035
|
【表删除】报错处理
|
2021-04-06 15:16:37 +08:00 |
gaoxin
|
1dc2b05f04
|
【表删除】EquipTalismanaRankup
|
2021-04-02 14:40:02 +08:00 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
gaoxin
|
6e34c88fa5
|
【人物信息栏】修复战力刷新不及时的问题
|
2021-03-30 20:46:47 +08:00 |
zhangqiang
|
d6c61b7a11
|
【归元修改】向后的发送战力改变
|
2021-03-30 20:20:42 +08:00 |
gaoxin
|
8161aca202
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 18:42:38 +08:00 |
gaoxin
|
3cc0b51edd
|
【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题
|
2021-03-30 18:42:30 +08:00 |
zhangqiang
|
127a019a1b
|
【归元修改】漏提
|
2021-03-30 18:13:05 +08:00 |
zhangqiang
|
aabe3e082f
|
【归元修改】资源提交
|
2021-03-30 17:31:44 +08:00 |
zhangqiang
|
9faf244e40
|
【归元修改】 神将 法宝 归元修改
|
2021-03-30 16:36:00 +08:00 |
zhangqiang
|
33b4da13b3
|
【英雄升级特效显示修改】
|
2021-03-30 10:38:59 +08:00 |
gaoxin
|
c5d1dab173
|
【养成】升级时,战力光效层级不正确
|
2021-03-23 16:34:19 +08:00 |
zhangqiang
|
c4c5bb1074
|
【神将没有升级材料依旧会出现小红点】
|
2021-03-23 15:53:59 +08:00 |
ZhangBiao
|
2f658f1157
|
【装备种类显示】
|
2021-03-19 21:30:22 +08:00 |
gaoxin
|
4c30b42f61
|
【bug】修复替换装备时按钮文字错误
|
2021-03-18 10:16:34 +08:00 |
gaoxin
|
64ee4697f5
|
【bug】点击替换装备,装备图标跟穿戴着的图标一样
|
2021-03-18 10:07:03 +08:00 |