jiaoyangna
|
6b5b1f934e
|
Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian
|
2021-03-10 17:31:58 +08:00 |
jiaoyangna
|
a7353213aa
|
四灵提交
|
2021-03-10 17:31:40 +08:00 |
ZhangBiao
|
3c45f9eb24
|
【建木神树】提交
|
2021-03-10 16:04:26 +08:00 |
ZhangBiao
|
f6af5a6a72
|
【建木神树】红点
|
2021-03-10 15:54:42 +08:00 |
ZhangBiao
|
891dd5ca5b
|
【建木神树】
|
2021-03-10 15:01:18 +08:00 |
jiaoyangna
|
10b8db2d48
|
文字错乱修改
|
2021-03-09 17:44:50 +08:00 |
jiaoyangna
|
77391886e3
|
四灵修改提交
|
2021-03-09 17:22:42 +08:00 |
jiaoyangna
|
05769016cb
|
四灵修改提交
|
2021-03-09 17:18:45 +08:00 |
jiaoyangna
|
37dba071eb
|
跳转修改
|
2021-03-09 16:52:44 +08:00 |
jiaoyangna
|
3afbbe7a9e
|
白片修改
|
2021-03-09 16:49:46 +08:00 |
jiaoyangna
|
cb08764083
|
四灵修改提交
|
2021-03-09 16:48:05 +08:00 |
jiaoyangna
|
b904b531af
|
四灵提交
|
2021-03-09 16:21:39 +08:00 |
ZhangBiao
|
fdb71b6cad
|
【宝物详情】界面修改
|
2021-03-09 14:42:17 +08:00 |
ZhangBiao
|
72c97f8408
|
四灵试炼战斗类型提交
|
2021-03-09 10:57:36 +08:00 |
ZhangBiao
|
7fb0a9f84a
|
提交
|
2021-03-09 10:27:28 +08:00 |
jiaoyangna
|
2f9e47fd1f
|
红点修改提交
|
2021-03-08 17:54:22 +08:00 |
jiaoyangna
|
aad4fcb9ac
|
四灵修改提交
|
2021-03-08 17:32:16 +08:00 |
jiaoyangna
|
5b4a4cb49a
|
Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian
|
2021-03-08 16:53:07 +08:00 |
jiaoyangna
|
4517d1e9f5
|
本地化
|
2021-03-08 16:52:55 +08:00 |
jiaoyangna
|
46d1d9bce7
|
本地化提交
|
2021-03-08 16:52:07 +08:00 |
jiaoyangna
|
8bdf318144
|
文字修改提交
|
2021-03-08 16:35:47 +08:00 |
jiaoyangna
|
6150350a5c
|
修改提交
|
2021-03-08 16:30:32 +08:00 |
jiaoyangna
|
0114ac09df
|
协议提交
|
2021-03-08 15:20:46 +08:00 |
jiaoyangna
|
e33cabd49e
|
删除多余的预设
|
2021-03-08 15:07:33 +08:00 |
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 |