Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,195 Commits
1 Branch
0 Tags
68 GiB
Commit Graph

1732 Commits (c914d77de57ffdad7c94de2c6459121fd3c3a36e)

Author SHA1 Message Date
Brucz d16c2048e8 Merge remote-tracking branch 'origin/dev' into feature/dev_pictorial_lcg 2026-01-20 13:49:13 +08:00
zhangaotian 269d61cf16 【UI动画】补充遗漏 2026-01-20 13:13:53 +08:00
zhangaotian 27081843da 【UI动画】补充遗漏 2026-01-20 13:10:57 +08:00
zhangaotian 33ba063ca4 【货币栏】 相关界面修改为通用组件 2026-01-20 12:05:19 +08:00
Huliang dd556ee63d 【派遣】派遣3级界面和2级界面拆开 2026-01-19 14:00:28 +08:00
zhangaotian 0e7e404d79 【UI】优化播放动画逻辑 2026-01-16 15:50:28 +08:00
zhangaotian b09f5c964b 【UI】修改相关界面动画类型 2026-01-16 14:07:37 +08:00
liuchunguang 0ce259ef27 添加画报相关功能 2026-01-16 11:55:56 +08:00
Yuntao Hu 8cdecacf02 添加体力购买界面 2026-01-16 11:15:22 +08:00
zhangaotian 92f75c7318 【UI】动画相关 2026-01-15 19:48:10 +08:00
zhangaotian 82f1a81036 【UI】动画优化 2026-01-15 19:27:24 +08:00
zhangaotian da3649497e 重命名UI动画配置脚本 2026-01-15 14:58:40 +08:00
Huliang 9799e96fa5 【抽卡】天井新界面 2026-01-15 12:29:26 +08:00
zhangaotian 6d108def62 【UI】动画框架优化 
# Conflicts:
#	ProjectNLD/Assets/PhxhSDK
 2026-01-14 19:48:15 +08:00
Yurui 11828af8b9 [战斗UI]修改战斗内血条和指挥官UI层级 2026-01-14 18:40:43 +08:00
Yuntao Hu 97b31e1646 添加高账说明窗口 2026-01-14 17:19:34 +08:00
zhangaotian 34627eed7e 【UI】动画框架修改 2026-01-14 16:48:12 +08:00
Huliang 66198405a7 【抽卡】天井事件 2026-01-14 16:07:29 +08:00
Huliang 75f88718e8 【抽卡】天井新界面 2026-01-14 16:07:28 +08:00
Yuntao Hu 8a5abbcf5e 【高账】说明界面预制体 2026-01-14 16:01:33 +08:00
马远征 18f045d68c 【Input】输入系统解耦 2026-01-14 14:47:51 +08:00
liuchunguang e56cc687a5 抽卡添加五星效果 2026-01-14 14:35:19 +08:00
刘涛 e094a30d15 【特效】特效拆分首次创建和二次创建事件 2026-01-14 11:21:17 +08:00
Yurui 11aff7e1ca [战斗UI]优化战斗开始UI 2026-01-13 19:21:52 +08:00
马远征 e2173658b6 【Input】输入系统放入PHXHSDK 2026-01-13 18:31:40 +08:00
马远征 dfe4346eb2 【工具类】移入PhxhSDK 2026-01-13 18:00:32 +08:00
Yurui 8765e32e9e [营地]移除老旧代码 2026-01-13 16:19:38 +08:00
Yurui 1ce63c1a13 [红点]抽卡红点 2026-01-13 15:58:31 +08:00
Yurui 08889425e7 [红点]关卡红点 2026-01-13 15:32:12 +08:00
Yurui 77097cafe1 [UI]UI相机和战斗UI层级调整 2026-01-13 13:51:32 +08:00
zhangaotian b75b28d20b 【战斗】添加地格阻挡攻击改变事件 2026-01-12 18:42:26 +08:00
Yurui a81122dea8 [战斗内UI]代码优化 2026-01-12 17:18:55 +08:00
Huliang 031e11b676 【抽卡】抽卡记录 2026-01-12 16:38:32 +08:00
马远征 ac37187135 【UI】一些组件移入SDK 
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/GamePlay_Dll/GamePlay.dll
 2026-01-12 16:32:36 +08:00
马远征 12c8aa8c47 【UI】UI系统放入PHXHSDK 2026-01-12 15:21:30 +08:00
zhangaotian 66ff77018e 【bug】修改部分弹窗注册参数 2026-01-12 14:38:49 +08:00
zhangaotian d90fec9221 【Bug】PVP部分界面bug 2026-01-12 14:21:05 +08:00
liuchunguang 38e2fb8428 添加载具展示界面资源 2026-01-12 13:46:09 +08:00
zhangaotian 2ee1a9bf7c 【UI】打开界面检查栈顶界面 2026-01-12 13:33:36 +08:00
Yurui 5b25e3df04 [战斗内UI]名称修改 2026-01-12 13:32:57 +08:00
zhangaotian a5b66010c8 补提 合并冲突 2026-01-12 11:44:43 +08:00
zhangaotian c9749757c2 UI框架控制相机显隐修改 
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.cs
 2026-01-12 11:43:09 +08:00
Yuntao Hu ad7e65d326 【活动】新手七日活动功能测试 2026-01-11 14:56:10 +08:00
zhangaotian 6eb34f4116 【bug】更新dll 2026-01-09 19:56:29 +08:00
zhangaotian ec0e0a6dcc 【bug】跳转至商店 2026-01-09 18:32:56 +08:00
马远征 9acc0fb3e7 【文件】重命名 2026-01-09 18:20:22 +08:00
马远征 63e84cae4b 【架构】一些工具类移入PhxhSDK，拆分 UIManager 2026-01-09 18:05:03 +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
Yurui 962ad32acb [台词语音]主动放弃战斗语音播放错误修复 2026-01-09 13:45:37 +08:00
马远征 226d0c7b43 【UI】UIRoot放入PhxhSDK 2026-01-09 12:50:00 +08:00
马远征 099da5c347 【UI】screenshot 不再控制相机的开关 2026-01-09 12:49:58 +08:00
马远征 dc095149a7 【UI】层级和UIRoot整理 2026-01-09 12:49:55 +08:00
Yurui 5e12db17e3 扫荡界面不控制相机显隐 2026-01-09 12:35:57 +08:00
zhangaotian 2425c686b9 指挥官选择界面 2026-01-08 19:38:04 +08:00
Yurui d2eae5a7dd 靶场单位替换事件改名 2026-01-08 16:43:13 +08:00
Yurui edcda49f6e 修复结算界面相机被隐藏 2026-01-08 13:52:03 +08:00
Yurui 33acdeb5af 条件支持多事件 2026-01-08 13:35:18 +08:00
Yuntao Hu 3d1efff771 【打点】新增打点事件 2026-01-07 21:03:24 +08:00
Yuntao Hu 09cccf78d8 【打点】新增打点事件 2026-01-07 19:57:49 +08:00
Yuntao Hu 2854a3208f 【打点】新增打点事件 2026-01-07 16:40:54 +08:00
Yurui 9e05c4e931 靶场角色重置事件 2026-01-07 16:16:30 +08:00
zhangaotian 639d7d9a4e 通行证升级事件 2026-01-07 16:13:01 +08:00
Yuntao Hu f228f44aee 【打点】新增打点事件 2026-01-07 15:48:07 +08:00
Yuntao Hu 3aa91262a5 【打点】新增打点事件 2026-01-07 15:08:44 +08:00
Yuntao Hu d8224f3ec5 【打点】部分事件整理 2026-01-07 12:13:47 +08:00
刘涛 b904816d9b 【战斗】增加火车开始移动事件 2026-01-06 18:55:07 +08:00
Yurui eafe373cb1 修复bug 2026-01-06 17:03:27 +08:00
马远征 62baa1808b 【UI】代码整理 2026-01-06 16:52:35 +08:00
马远征 0580441849 【UI】新增Pause和Resume状态 2026-01-06 16:47:43 +08:00
刘涛 a1eb3ef3a4 修复bug 2026-01-06 16:06:08 +08:00
Yurui b3fd659542 靶场UI bug修复 2026-01-06 13:06:34 +08:00
Huliang 908aced421 【商店】语音字幕补充 2026-01-04 13:04:44 +08:00
Huliang 2f32088f04 【商店】语音字幕 2025-12-31 19:51:53 +08:00
zhangaotian ad90a5aeb9 修复部分界面bug 2025-12-31 18:44:41 +08:00
zhangaotian 415c24c124 部分界面显示bug 2025-12-31 18:14:09 +08:00
zhangaotian c9ee5dfedf 导出配置 通行证相关 2025-12-31 17:31:06 +08:00
马远征 378ba409e6 【UI】删除冗余代码 2025-12-30 16:28:32 +08:00
马远征 08cc3658ae 【UI】只有打开的界面才Update 2025-12-30 15:54:20 +08:00
Yurui 3147fe90f2 战斗UI优化 2025-12-30 15:17:34 +08:00
马远征 62224fc761 【UI】清除外部对 界面 Init 的调用 2025-12-30 14:42:28 +08:00
马远征 51366d1fd8 【组队】修复组队提示界面响应back的问题 2025-12-30 13:44:11 +08:00
Yurui 69045bcc74 提示UI不设置相机 2025-12-30 12:55:00 +08:00
马远征 ea5a21a4c8 【UI】修复一些界面开关相机的问题 2025-12-30 12:25:10 +08:00
马远征 465a90f384 【商店】修复商店购买物品界面关闭时，商店界面的camera关闭的bug 2025-12-30 11:35:04 +08:00
马远征 388081917d 【战斗】修复战斗内关闭主相机的bug 2025-12-29 20:18:23 +08:00
马远征 b428a10cc8 【UI】修改一些界面的配置 2025-12-29 20:18:21 +08:00
马远征 4b70b0b237 【UI】删除无用代码 2025-12-29 20:18:19 +08:00
Huliang 372bdcdb86 【音效】批量音效接入 2025-12-29 19:53:04 +08:00
马远征 215d1295e8 【UI】独立的开关相机模块 2025-12-29 19:18:37 +08:00
马远征 5de58efef6 【UI】修复UIbug 2025-12-29 18:42:39 +08:00
马远征 f3ccabc36a 【UI】代码整理 2025-12-29 15:22:53 +08:00
马远征 9a2ced00cc 【UI】独立出 home处理和close处理 2025-12-29 15:22:53 +08:00
Huliang 5f15bba838 【好感度】使用道具不足界面修改 2025-12-29 13:57:56 +08:00
马远征 eeaf318dba 【UI】一些定义移入PhxhSDK 2025-12-29 11:46:09 +08:00
马远征 594267fa4b 【Audio】AudioManager移入PhxhSDK 2025-12-28 16:20:09 +08:00
马远征 b115e138cb 【UI】整理UI的默认关闭、回主界面、后退函数 2025-12-28 16:18:29 +08:00
马远征 e2415153d6 【UI】整理后退操作 2025-12-28 16:18:29 +08:00
马远征 e02f727293 【UI】修复一些战斗界面错误响应 后退的bug 2025-12-26 18:34:36 +08:00
马远征 df668e6016 【UI】修复几个界面返回的bug 2025-12-26 17:49:49 +08:00
Huliang a9025fdd55 【图鉴】NPC 2025-12-26 12:47:29 +08:00
马远征 7e47d845ba 【UI】整理后退操作 2025-12-26 12:28:28 +08:00
马远征 f22d82d2c0 【UI】返回功能整理 2025-12-26 12:28:27 +08:00
Yuntao Hu 3d8cd4643c 【UI】OnAfterShow执行顺序调整 2025-12-25 20:33:30 +08:00
马远征 94eb0052ae 【UI】模糊截图 放入框架内 2025-12-25 15:01:45 +08:00
Yurui 7554fa8c1b 关卡目标进度统一接口获取 2025-12-25 14:27:41 +08:00
Yurui 7506f60c4f 条件系统增加获取进度接口 2025-12-25 14:02:59 +08:00
刘涛 32a9b7f47f 【战斗】增加备注 2025-12-25 12:47:52 +08:00
马远征 feb08e4e6d 【UI】重命名 2025-12-24 17:43:21 +08:00
zhangaotian b38b4803fb 关卡编辑器新增条件 2025-12-24 15:57:48 +08:00
zhangaotian 23e88571c2 修改条件名字 2025-12-24 15:19:41 +08:00
刘涛 7ee48b9f1f 【战斗】增加事件 2025-12-24 13:38:49 +08:00
马远征 34e45f6a1e 【UI】合并界面的Hide 和 Close 函数，修复部分界面层级问题，修复部分界面遮挡问题 2025-12-23 19:35:36 +08:00
马远征 21c09fc9e7 【UI】性能优化，遮挡逻辑修改 2025-12-23 19:35:35 +08:00
马远征 2a533f7676 【UI】前次界面的隐藏策略独立出来 
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
 2025-12-23 19:35:34 +08:00
马远征 4bddaa0864 【UI】删除 UIManager里 stack 相关的转发函数； 2025-12-23 19:35:33 +08:00
zhangaotian c23ef8427a 关卡编辑器修改 2025-12-23 17:25:50 +08:00
zhangaotian 240da5a930 pvp结算ui界面路径 2025-12-23 15:59:44 +08:00
马远征 6ff6dc798d 【UI】界面显示时，可以控制入栈方式 2025-12-22 19:31:16 +08:00
Yuntao Hu 1c600fafcd 【高账】界面功能测试 
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
 2025-12-22 17:46:59 +08:00
马远征 31da61d8a4 【UI】ui 栈提取单独的模块 2025-12-22 16:57:31 +08:00
马远征 80d39fdd1c 【UI】简化ui layer实现 2025-12-22 16:57:30 +08:00
马远征 508e032ef8 【UI】删除无用代码 2025-12-22 16:57:29 +08:00
Yuntao Hu 9799b966a6 高账功能测试 2025-12-19 20:03:39 +08:00
Yurui a52f2bcd99 军团战战斗表现 2025-12-19 19:24:23 +08:00
马远征 e9b981cf3d 【UI】UI Layer由独立类去管理 2025-12-19 16:15:37 +08:00
马远征 40212d5463 【UI】合并 canvas root 和 ui layer 
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
 2025-12-19 15:41:50 +08:00
Yurui 1c417308c9 军团战战斗中隐藏UI 2025-12-19 14:09:36 +08:00
马远征 3a1dd5fe41 【UI】重命名root挂点名，准备与ui layer 合并； 2025-12-19 11:54:18 +08:00
Yuntao Hu 37751ab7d6 【UI】移除了部分不再使用的界面 2025-12-17 20:02:28 +08:00
zhangaotian ef0214de08 增加事件 2025-12-17 15:30:23 +08:00
Yurui 3f3174e95a PVP作弊事件 2025-12-17 14:36:51 +08:00
Huliang 98cfeeefa1 【UI】挂载按钮音效调用 2025-12-17 13:08:59 +08:00
刘涛 1d7810a664 【战斗】屏蔽无用资源 2025-12-16 13:46:47 +08:00
zhangaotian de7f62e14e 删除无用条件 2025-12-11 13:02:19 +08:00
zhangaotian c4480d184f 删除无用条件情况 2025-12-11 12:47:09 +08:00
马远征 d6f6b525da 【tip】修复错误提示时，无法停止点击音效的bug 2025-12-10 19:16:19 +08:00
zhangaotian a291d09019 出战稀有度参数改成枚举 2025-12-10 19:01:02 +08:00
马远征 3db083e833 【Audio】删除对特定业务的依赖 2025-12-10 19:00:51 +08:00
zhangaotian aa6685a304 迁移地图数据 修复关卡条件参数 2025-12-10 16:38:23 +08:00
马远征 6096225844 【Event】放入PhxhSDK 2025-12-10 16:28:16 +08:00
Yurui 54716bafd2 UI代码整理 2025-12-10 14:24:49 +08:00
zhangaotian c618134875 关卡编辑器任务相关修改 2025-12-10 13:23:46 +08:00
zhangaotian 94d2241a8a 还原部分数据 待配置迁移完成 2025-12-09 19:54:21 +08:00
zhangaotian 842f980344 优化编辑器下条件相关配置 2025-12-09 18:00:34 +08:00
zhangaotian 48bf554e3b 打包报错修改 2025-12-09 16:38:54 +08:00
zhangaotian 2aab4f5c00 关卡数据和编辑器修改 2025-12-09 16:22:10 +08:00
Yurui dd99814c76 关卡任务相关数据从关卡json数据读取 2025-12-09 16:11:25 +08:00
刘涛 218243919d 【战斗】增加火车到达事件 2025-12-09 14:57:05 +08:00
zhangaotian e2df98e934 关卡任务数据相关 2025-12-09 13:05:36 +08:00
Yurui 40f83c71d5 修改重复注册UI 2025-12-08 13:03:13 +08:00
刘涛 a0c35156d8 【框架】增加ui兼容性 2025-12-05 12:20:34 +08:00
马远征 e1a6a84a83 【Audio】支持外部声音播放器注册，修复剧情无音乐的bug 2025-12-05 10:50:03 +08:00
Yurui ef0d78e11a 靶场简略信息界面 2025-12-04 19:54:18 +08:00
Yurui 46b960e61b 靶场 2025-12-03 17:20:35 +08:00
Yurui eaf9f4f931 靶场相关 2025-12-03 15:10:54 +08:00
zhangaotian e1aa6cfadc 通行证特别补给弹窗 2025-12-02 13:22:54 +08:00
刘涛 8a2533e4d6 【战斗】增加事件 2025-12-01 19:18:50 +08:00
zhangaotian e6f023af4a 通行证等级升级特效相关 2025-12-01 18:24:24 +08:00
zhangaotian 4218c19fc4 通行证相关预制体修改 2025-12-01 16:50:30 +08:00
刘涛 7afc64f6bb 【关卡】增加关卡加载完成事件 2025-12-01 13:26:50 +08:00
Yurui 1ebe17ee9c 增加受伤条件事件 2025-11-28 18:29:05 +08:00
马远征 cc084e1f05 【Audio】移入SDK 2025-11-27 19:12:05 +08:00
马远征 c314b62fa3 【Audio】修复播放池内有不播放的音频的bug 2025-11-27 19:12:04 +08:00
zhangaotian 297900f687 通行证展示界面相关 2025-11-27 19:04:26 +08:00
Yuntao Hu 4369920e79 删除不再使用的技能升级预制体 2025-11-27 18:59:34 +08:00
Yurui 8c5ca31bda 移除无用UI脚本 2025-11-27 17:52:46 +08:00
马远征 97e6eb6207 【Audio】整理代码 2025-11-27 17:19:01 +08:00
马远征 be663592c3 【Audio】停止池里的音频超时释放； 2025-11-27 15:04:50 +08:00
马远征 1d8d6f62f8 【Audio】修复频繁播放speak时报错的bug 2025-11-27 15:03:59 +08:00
马远征 8b2562d3ae 【Audio】音频进入停止池时，game object 不激活 2025-11-27 11:02:18 +08:00
Vinny 2a1868ad69 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-11-26 16:03:25 +08:00
Vinny 97f9f98788 修复载具shader 2025-11-26 16:03:15 +08:00
马远征 89f8b5fa8d 【Audio】代码优化 2025-11-26 15:43:40 +08:00
Vinny d2f29a9fbf Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-11-26 15:04:32 +08:00
Vinny dd3606d883 提交render obejct 透视 2025-11-26 15:03:24 +08:00
刘涛 70b6e612c7 【战斗】增加换弹完成事件 2025-11-26 14:31:56 +08:00
Yurui e638ca1415 pvp结算UI 2025-11-25 19:50:02 +08:00
Yuntao Hu 1e4a59bde3 新增自选宝箱窗口 2025-11-25 19:40:15 +08:00
马远征 7946af79c0 【Audio】修复多个audio listener 问题 2025-11-25 13:42:17 +08:00
Brucz f47a8e7118 “编队修改添加” 2025-11-25 13:31:56 +08:00
Yurui 7f08309327 退出关卡重新进入按钮 2025-11-24 15:18:35 +08:00
马远征 2fd41cf3f0 【Audio】修复播放的音频没有加入播放池的bug 2025-11-24 12:55:54 +08:00
马远征 9338b80b15 【Audio】整理AudioManager 2025-11-24 12:10:54 +08:00
Yurui 3c31969525 修改撤离条件 2025-11-21 14:43:18 +08:00
Yurui c3cbbcf1fa TopCamera始终打开 2025-11-21 13:23:26 +08:00
刘涛 8f693201fa 【战斗】增加事件 2025-11-20 19:53:02 +08:00
Vinny 5afcce7ef6 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-11-20 14:37:29 +08:00
Vinny ef435dac00 修改闪光在暂停时持续闪烁的问题 2025-11-20 14:37:15 +08:00
马远征 bfe034739a 【Audio】Audio Manager，play方法整理 2025-11-20 14:02:51 +08:00
马远征 28e0ddd031 【Audio】代码整理 2025-11-20 12:02:23 +08:00
Yurui b8d4880e7b 战斗UI层级优化 2025-11-19 19:42:30 +08:00
马远征 8cd1fbcbef 【Audio】整理接口 2025-11-19 19:19:58 +08:00
马远征 68afdbe484 【Audio】删除is speak 属性 2025-11-19 17:58:01 +08:00
马远征 904e5087fd 【Audio】删除冗余函数，修复bug 2025-11-19 17:18:11 +08:00
zhangaotian 0f0b8661be 删除旧充值界面 2025-11-19 17:13:59 +08:00
zhangaotian 86bb7e300e 添加预购事件 2025-11-19 16:54:53 +08:00
马远征 fc574f818d 【Audio】合并AudioManager 2025-11-19 16:01:43 +08:00
刘涛 02a1f235f1 【战斗】撤离相关代码预提交 2025-11-18 19:24:59 +08:00
Yuntao Hu 8b46567752 上报应用激活事件 2025-11-18 16:43:35 +08:00
马远征 440ba306a7 【Audio】直接访问volumn setting 2025-11-18 15:25:02 +08:00