Commit Graph

35 Commits (02c9585cd95dcda170a96bc0b191ca3553f46a64)

Author SHA1 Message Date
louyahan faf06a93fc 士气章预览界面 2026-03-31 19:57:41 +08:00
louyahan 5e6e09c831 设置界面提交 2026-03-31 15:58:07 +08:00
louyahan f588957576 提交邮箱功能 2026-03-30 21:29:03 +08:00
Vinny 03b22cc414 图片分辨率 2026-03-24 18:17:32 +08:00
Vinny c7f7f8cf08 图片更新 2026-03-23 18:03:19 +08:00
louyahan e7ce640d32 修改战令弹窗 2026-03-18 15:28:22 +08:00
louyahan 1094e82d51 修改提升好感度弹窗 2026-03-15 21:14:47 +08:00
louyahan 8325082198 调整头像 2026-03-15 18:08:34 +08:00
yujia eadf6a6abd 弹窗修改 2026-03-15 15:02:09 +08:00
yujia af42cd5c4b 登录添加关闭 2026-03-15 15:00:58 +08:00
louyahan 8dc7160cdb 增加物品框 2026-03-09 19:05:43 +08:00
louyahan 7e0f1dd0b1 演习记录界面调整 2026-02-10 15:24:14 +08:00
Brucz 2be8c1ebce 派遣提示界面适配修改添加 2026-01-29 13:56:23 +08:00
Brucz 0232e36fe4 “UI预制体拼接Bug修复” 2026-01-14 19:11:30 +08:00
Brucz 039b82dca5 “【UI】 pvp对战记录界面修改添加 ” 2026-01-09 19:30:49 +08:00
Vinny b02ba5fd00 图片设置修改
# Conflicts:
#	ProjectNLD/Assets/Art/Character/Models/Item/I00001/Texture/T_I00001_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00001/Texture/T_I00001_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00002/Texture/T_I00002_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00002/Texture/T_I00002_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00003/Texture/T_I00003_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00003/Texture/T_I00003_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00004/Texture/T_I00004_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00005/Texture/T_I00005_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00005/Texture/T_I00005_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00006/Texture/T_I00006_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00006/Texture/T_I00006_d_02.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00006/Texture/T_I00006_slh.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00006/Texture/T_I00006_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00007/Texture/T_I00007_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00007/Texture/T_I00007_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00008/Texture/T_I00008_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00008/Texture/T_I00008_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00009/Texture/T_I00009_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00009/Texture/T_I00009_slh.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00009/Texture/T_I00009_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00010/Texture/T_I00010_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00010/Texture/T_I00010_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00011/Texture/T_I00011_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00012/Texture/T_I00012_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00013/Texture/T_I00013_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00014/Texture/T_I00014_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00014/Texture/T_I00014_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00015/Texture/T_I00015_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00015/Texture/T_I00015_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00016/Texture/T_I00016_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00016/Texture/T_I00016_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00017/Texture/T_I00017_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00017/Texture/T_I00017_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00018/Texture/T_I00018_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00018/Texture/T_I00018_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00019/Teture/T_I00019_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00019/Teture/T_I00019_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00020/Texture/T_I00020_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00020/Texture/T_I00020_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00021/Texture/T_I00021_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00022/Textuer/T_I00022_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00023/Texture/T_I00023_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00024/Texture/T_I00024_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00024/Texture/T_I00024_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00025/Texture/T_I00025_d_01.png.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00025/Texture/T_I00025_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00026/Texture/T_I00026_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00026/Texture/T_I00026_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00027/Texture/T_I00027_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00027/Texture/T_I00027_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00028/Texture/T_I00028_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00028/Texture/T_I00028_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00029/Texture/T_I00029_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00029/Texture/T_I00029_slh.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00030/Texture/T_I00030_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00030/Texture/T_I00030_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00031/Texture/T_I00031_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00031/Texture/T_I00031_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00032/Texture/T_I00032_d_01.png.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00032/Texture/T_I00032_slh_01.tga.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00033/Texture/T_I00033_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00033/Texture/T_I00033_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00034/Texture/T_I00034_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00035/Texture/T_I00035_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00035/Texture/T_I00035_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00036/Texture/T_I00036_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00037/Texture/T_I00037_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00038/Texture/T_I00038_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00038/Texture/T_I00038_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00039/Texture/T_I00039_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00040/Texture/T_I00040_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00040/Texture/T_I00040_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00041/Texture/T_I00041_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00041/Texture/T_I00041_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00042/Texture/T_I00042_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00042/Texture/T_I00042_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00043/Texture/T_I00043_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00044/Texture/T_I00044_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00044/Texture/T_I00044_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00045/Texture/T_I00045_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00045/Texture/T_Y00137_TY_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00046/Texture/T_I00046_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00047/Texture/T_I00047_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00048/Texture/T_I00048_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00048/Texture/T_I00048_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00049/Texture/T_I00049_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00049/Texture/T_I00049_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00050/Texture/T_I00050_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00051/Texture/T_I00051_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00052/Texture/T_I00052_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00053/Texture/T_I00053_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00054/Texture/T_I00054_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00055/Texture/T_I00055_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00056/Texture/T_I00056_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00057/Texture/T_I00057_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00058/Texture/T_I00058_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00059/Texture/T_I00059_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00060/Texture/T_I00060_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00061/Texture/T_I00061_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00062/Texture/T_I00062_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00063/Texture/T_I00063_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00064/Texture/T_I00064_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00065/Texture/T_I00065_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00066/Texture/T_I00066_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00067/Texture/T_I00067_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00068/Texture/T_I00068_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00069/Texture/T_I00069_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00070/Texture/T_I00070_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00071/Texture/T_I00071_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00072/Texture/T_I00072 _d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00073/Texture/T_I00073_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00074/Texture/T_I00074_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00075/Texture/T_I00075 _d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00075/Texture/T_I00075_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00076/Texture/T_I00076_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00076/Texture/T_I00076_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00077/Texture/T_I00077_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00077/Texture/T_I00077_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00078/Texture/T_I00078_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00078/Texture/T_I00078_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00079/Texture/T_I00079_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00079/Texture/T_I00079_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00080/Texture/T_I00080_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00080/Texture/T_I00080_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00081/Texture/T_I00081_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00081/Texture/T_I00081_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00082/Texture/T_I00082_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00082/Texture/T_I00082_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00083/Texture/T_I00083_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00083/Texture/T_I00083_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00084/Texture/T_I00084_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00085/Texture/T_I00085_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00086/Texture/T_I00086_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00086/Texture/T_I00086_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00087/Texture/T_I00087_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00087/Texture/T_I00087_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00088/Texture/T_I00088_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00088/Texture/T_I00088_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00091/Texture/T_I00091_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00092/Texture/T_I00092_d_01.png.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00092/Texture/T_I00092_d_02.png.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00092/Texture/T_I00092_d_03.png.meta
#	ProjectNLD/Assets/Art/Character/Models/Item/I00092/Texture/T_I00092_d_04.png.meta
#	ProjectNLD/Assets/Art/Character/Models/Summon/S00002/Texture/T_S00002_01_d.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Summon/S00003/Texture/T_I00005_d_01.jpg.meta
#	ProjectNLD/Assets/Art/Character/Models/Summon/S00003/Texture/T_I00005_slh_01.jpg.meta
#	ProjectNLD/Assets/Art/UI/Texture/ALLBG/FlareActivity/UI_Flare_MissionPannel_linshiBG_01.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMain_MainScene_0.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMain_MainScene_0_0.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMain_MainScene_0_1.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMain_MainScene_0_2.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMain_MainScene_0_3.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMain_MainScene_0_4.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMask_MainScene_0.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMask_MainScene_0_0.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMask_MainScene_0_1.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMask_MainScene_0_2.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMask_MainScene_0_3.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/MainScene/CombinedMask_MainScene_0_4.png.meta
2026-01-09 15:50:51 +08:00
Brucz 5e6bb4613f “【UI】卡尺详情,抽卡历史,天井币兑换界面添加” 2026-01-08 18:30:14 +08:00
Brucz 47a8fcde15 "【UI】抽卡资源添加,勋章资源修改添加" 2026-01-08 15:27:42 +08:00
Brucz 1cbef3f14b 【UI】主界面 出版信息添加 2026-01-08 13:00:59 +08:00
Brucz 4403eddcca "【UI】购买体力弹窗修改" 2026-01-07 19:55:47 +08:00
Brucz fa0fef6c2d “【UI】购买体力点数界面UI添加” 2026-01-07 19:36:36 +08:00
Brucz 3cbef2fab7 “【UI】Common 资源添加” 2026-01-07 16:47:13 +08:00
Brucz 0c85bd0450 “PVP修改添加” 2025-12-15 16:07:02 +08:00
Brucz fca9a6eeca "仓库界面修改 资源添加 物品稀有度添加" 2025-12-04 18:49:43 +08:00
Vinny 5860167db1 图片设置修改 2025-12-04 15:10:31 +08:00
Brucz 1130e3a94c “Playerinfo 修图 添加” 2025-11-28 15:15:12 +08:00
Brucz 5de0ad24f6 "通行证弹窗修改" 2025-11-27 12:49:19 +08:00
Brucz f47a8e7118 “编队修改添加” 2025-11-25 13:31:56 +08:00
Brucz 3bc7d364ee "仓库改动新 预制体添加上传" 2025-11-14 18:08:01 +08:00
Brucz ff1614df1d “派遣预制体修改” 2025-10-28 16:40:01 +08:00
Brucz 05d5970957 ”军团战斗内药品购买弹窗添加“ 2025-09-24 12:44:12 +08:00
Brucz 4526b16803 ”军团战二次确认弹窗添加“ 2025-09-24 12:44:09 +08:00
Brucz 2dae647941 "军团战斗内主界面单位操作,班队规则预制体添加" 2025-09-23 14:10:06 +08:00
马远征 360b0d7530 【贴图】电脑端使用BC7格式 2025-08-28 17:00:18 +08:00
Brucz fcbfc7cdb7 "PVP对手信息界面实装" 2025-08-27 13:31:43 +08:00