jiaoyangna
|
73ef0db2dc
|
预设提交
|
2021-03-08 15:03:11 +08:00 |
jiaoyangna
|
49c527a9bb
|
装备界面提交
|
2021-03-08 14:20:27 +08:00 |
jiaoyangna
|
1a6700d3a8
|
预设提交
|
2021-03-08 14:03:55 +08:00 |
jiaoyangna
|
dc0a2283d8
|
预设提交
|
2021-03-08 13:58:43 +08:00 |
jiaoyangna
|
975fd0876f
|
预设提交
|
2021-03-08 13:53:15 +08:00 |
jiaoyangna
|
4c390cf272
|
预设修改提交
|
2021-03-08 13:51:39 +08:00 |
jiaoyangna
|
555657dca7
|
Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian
|
2021-03-08 11:23:33 +08:00 |
jiaoyangna
|
9a946d5777
|
四灵试炼分支预设提交
|
2021-03-08 11:22:35 +08:00 |
jiaoyangna
|
cf3c571182
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# 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/RoleInfo/RoleEquipChangePopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 11:14:15 +08:00 |
jiaoyangna
|
02ca65089f
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Harmony.meta
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 10:27:14 +08:00 |
gaoxin
|
81a10ad759
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 22:35:42 +08:00 |
gaoxin
|
62c03bfebf
|
【本地化】热更新提示框文字超出显示范围
|
2021-03-07 22:35:37 +08:00 |
gaoxin
|
0e62748aff
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 21:22:36 +08:00 |
gaoxin
|
7662a5b154
|
【本地化】灵兽技能文字左移
|
2021-03-07 21:22:23 +08:00 |
gaoxin
|
96086a40a4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 20:48:17 +08:00 |
gaoxin
|
22dbfc310c
|
【本地化】我要变强推荐阵容显示修改,热更大小保留小数点后两位,十绝阵奖励显示修改
|
2021-03-07 20:48:05 +08:00 |
jiaoyangna
|
f5a1514674
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 20:42:55 +08:00 |
jiaoyangna
|
8431c1eb69
|
商店修改
|
2021-03-07 20:41:33 +08:00 |
gaoxin
|
0a251132e0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 19:32:10 +08:00 |
gaoxin
|
b82352796e
|
【本地化】鸿蒙阵修复文字重叠
|
2021-03-07 19:14:30 +08:00 |
gaoxin
|
25af0a837a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 19:06:17 +08:00 |
gaoxin
|
bbca0ca426
|
【本地化】装备切换界面套装属性翻译,成就提示文字超框显示修改
|
2021-03-07 19:06:13 +08:00 |
gaoxin
|
e874afa2ea
|
【本地化】十绝阵结算还是会重叠
|
2021-03-07 18:00:12 +08:00 |
gaoxin
|
76d4d549e8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:54:51 +08:00 |
gaoxin
|
4e93380a99
|
【本地化】法宝升级界面文字重叠
|
2021-03-07 17:54:46 +08:00 |
jiaoyangna
|
17b6ae35b1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:52:27 +08:00 |
jiaoyangna
|
c86865b3dd
|
装备提交
|
2021-03-07 17:52:23 +08:00 |
gaoxin
|
89ff803da0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:43:12 +08:00 |
gaoxin
|
f8dc9552c9
|
【本地化】十绝阵结算伤害文字重叠
|
2021-03-07 17:43:04 +08:00 |
DESKTOP-98AVA47\Administrator
|
270b53cab1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:36:23 +08:00 |
DESKTOP-98AVA47\Administrator
|
5039a17349
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab
|
2021-03-07 17:36:11 +08:00 |
gaoxin
|
fb8637c613
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:31:43 +08:00 |
gaoxin
|
9156962e89
|
【本地化】限时召唤英雄名称显示不全
|
2021-03-07 17:31:25 +08:00 |
jiaoyangna
|
594ce2b53a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab
|
2021-03-07 17:17:47 +08:00 |
jiaoyangna
|
bba9bf2b37
|
本地化提交
|
2021-03-07 17:17:23 +08:00 |
gaoxin
|
71bd8865fd
|
【本地化】青龙秘宝超框,成就完成提示超框
|
2021-03-07 17:15:33 +08:00 |
jiaoyangna
|
e02c48df84
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:00:55 +08:00 |
jiaoyangna
|
6d985b13e2
|
本地化
|
2021-03-07 17:00:50 +08:00 |
gaoxin
|
52a2b6ca63
|
【本地化】魂印分解界面文字重合修复
|
2021-03-07 17:00:15 +08:00 |
gaoxin
|
7c8cf16c98
|
【bug】修复图鉴界面打开报错
|
2021-03-07 16:43:07 +08:00 |
jiaoyangna
|
d62263859c
|
【本地化】竞技场界面时间修改
|
2021-03-07 16:28:45 +08:00 |
gaoxin
|
ea8c1a9e7d
|
【适配】热更界面屏幕适配修改
|
2021-03-07 16:20:11 +08:00 |
gaoxin
|
3175ef5eb2
|
【适配】鸿蒙阵屏幕适配修改
|
2021-03-07 16:19:53 +08:00 |
gaoxin
|
022444dffa
|
【bug】修复副本界面在全面屏下ui变小的问题
|
2021-03-07 15:46:19 +08:00 |
gaoxin
|
05c66c280a
|
【本地化】资源回滚
|
2021-03-07 15:41:26 +08:00 |
gaoxin
|
b8762232bc
|
【本地化】登录界面logo替换,不再扫光
|
2021-03-07 15:33:41 +08:00 |
jiaoyangna
|
64d267b232
|
乾坤宝盒时间调整
|
2021-03-07 15:32:28 +08:00 |
jiaoyangna
|
21a607b7c4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 15:16:47 +08:00 |
jiaoyangna
|
99dcf2ed40
|
灵兽等级显示错误修改
|
2021-03-07 15:16:40 +08:00 |
gaoxin
|
ac312d9227
|
【本地化】关闭一些界面显示
|
2021-03-07 14:58:16 +08:00 |