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

13164 Commits (d297510fed4fd37845784ee1d9a3cf79edddb7f6)

Author SHA1 Message Date
马远征 d297510fed 【gameplay】加入子仓库 2025-04-30 13:53:24 +08:00
刘涛 083786a6ce 【框架】更新mono引用 2025-04-30 12:31:31 +08:00
刘涛 f13f56277a 【框架】拆分mono 
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/AnimationReceiver.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/AnimationReceiver.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpAnimGlobalSet.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpAnimGlobalSet.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpCameraPointRecorder.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpCameraPointRecorder.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpCharacterEffectPoints.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpCharacterEffectPoints.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpEditorUI.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpEditorUI.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpFakeFightScene.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpFakeFightScene.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpFightStory.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpFightStory.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpObjRef.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpObjRef.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpPlayerSkillEventWrapper.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpPlayerSkillEventWrapper.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpPoolManager.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpPoolManager.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpScriptRender.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpScriptRender.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpStoryPlayer.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpStoryPlayer.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpUIMainScene.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/CmpUIMainScene.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/GridEditor.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/GridEditor.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/InformationShower.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/InformationShower.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/LTCombie.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/LTCombie.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/PostProcessInstructor.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/PostProcessInstructor.cs.meta
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/WebController.cs
#	ProjectNLD/Assets/Code/Scripts/GameWrapper/WebController.cs.meta
 2025-04-30 12:31:20 +08:00
刘涛 bae2afb05f 【框架】更新DLL 2025-04-30 12:31:15 +08:00
刘涛 b3b0b9b576 【框架】更新部分mono引用 2025-04-30 12:31:03 +08:00
刘涛 7f03c24c9b 【框架】替换dll 2025-04-30 12:30:43 +08:00
刘涛 8f358c6b43 更新DLL 2025-04-29 19:46:54 +08:00
刘涛 4b5a9be5ed 【框架】更新dll 2025-04-29 19:10:43 +08:00
刘涛 97fb75b2f7 【拆分mono】临时拆分 UI_CurrencyList 2025-04-29 19:04:55 +08:00
chenyuqi f078f1641a 【拆分Mono】移除战斗开始界面废弃结点 2025-04-29 19:03:26 +08:00
刘涛 14c859dcdf 【拆分mono】临时拆分 UI_CurrencyList 2025-04-29 18:45:52 +08:00
chenyuqi 63e1a2311d 【拆分Mono】提交战斗内血条Mono拆分 2025-04-29 17:58:56 +08:00
刘涛 d02f3b3025 更新测试代码 2025-04-29 17:54:49 +08:00
刘涛 cdff131f6f 【框架】增加一个测试方法 2025-04-29 17:49:20 +08:00
mishimi1101 0a9f583e6d 新增模型材质 2025-04-29 17:25:47 +08:00
chenyuqi b49984039e 【拆分Mono】提交战斗内血条部分修改 2025-04-29 17:24:58 +08:00
zhangaotian cc175cbef2 编队bug修改 2025-04-29 17:16:28 +08:00
Brucz 202286007f “战斗 多余图集删除” 2025-04-29 17:09:55 +08:00
zhangaotian 0d960ff3c8 修改TeamPreviewNode拆分逻辑 2025-04-29 16:50:55 +08:00
chenyuqi d5664a33a7 【拆分Mono】提交废弃代码删除 2025-04-29 16:27:43 +08:00
chenyuqi 698f459bb1 【拆分Mono】提交UINode部分子类修改 2025-04-29 16:27:03 +08:00
chenyuqi 0803384ced 【拆分Mono】任务结点Mono拆分 2025-04-29 15:48:30 +08:00
polaris 32db2dbc9f 角色选中闪烁 2025-04-29 15:43:57 +08:00
zhangaotian 61472f3ebd 修改CameraController拆分逻辑 2025-04-29 15:31:17 +08:00
chenyuqi baf80c59b8 【拆分Mono】提交UINode部分脚本拆分 2025-04-29 15:29:36 +08:00
chenyuqi 074ab30011 【拆分Mono】提交UINode部分子类修改 2025-04-29 15:10:33 +08:00
zhangaotian 5606320219 【拆分Mono】 微信支付 2025-04-29 14:35:46 +08:00
刘涛 8af5e523b2 【框架】增加工程构建代码 2025-04-29 14:19:27 +08:00
Yurui a5e50a9e1d [799]修改击杀所有敌人条件的触发事件 2025-04-29 13:32:13 +08:00
zhangaotian 4f6ba3aece 调整CameraController逻辑 2025-04-29 13:16:46 +08:00
Yurui ace6a0c7de 【794】跳转主界面移除其他界面不排除主界面 2025-04-29 13:09:34 +08:00
Yurui acdcda8b91 Revert "【794】正常跳转不调用CloseAllNoemalExcept" 
This reverts commit a112c9c76d.
 2025-04-29 13:09:03 +08:00
刘涛 7e514902b4 【框架】SROptions移动到gameplay内部 2025-04-29 13:01:21 +08:00
Yurui 3950351573 【799】全部击杀条件不排除建筑 2025-04-29 12:56:59 +08:00
Yurui a112c9c76d 【794】正常跳转不调用CloseAllNoemalExcept 2025-04-29 12:38:34 +08:00
Yurui 893a059134 【794】功能锁跳转按钮等动画播放完成后才能点击 2025-04-29 12:08:49 +08:00
zhangaotian c928905d50 删除多余代码 2025-04-29 11:53:12 +08:00
Songk123 68d0ed7981 特效配置表调整 2025-04-29 11:50:24 +08:00
马远征 0df222c2a7 【meta】 2025-04-29 11:50:18 +08:00
马远征 85c83766d3 【meta】更新 2025-04-29 11:50:12 +08:00
tengwei d851d84c98 【769】营地战车贴图闪烁 2025-04-29 11:50:05 +08:00
zhangaotian 7a64f7a81f 【拆分dll】TeamPreviewNode 相关 2025-04-28 20:05:03 +08:00
Brucz 09db6b7e23 “好感度界面UI预制体添加” 2025-04-28 19:10:42 +08:00
polaris 04e3131015 调高度 2025-04-28 19:04:48 +08:00
刘涛 9161f96106 【工具】增加项目构建器临时代码 2025-04-28 18:44:45 +08:00
Yurui 36a7be6e2d 视频资源检查合并 2025-04-28 18:32:27 +08:00
zhangaotian ffab79033e 【拆分dll】MapManager 相关数据 2025-04-28 17:47:28 +08:00
Brucz e40507469e “好感度丢失资源添加” 2025-04-28 17:44:58 +08:00
Yurui d0b2c8331f Main mono拆分 2025-04-28 17:38:49 +08:00
Brucz e3fa5980e8 “好感度界面UI预制体i制作” 
# Conflicts:
#	ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/UI_FavorItemUsing.prefab
#	ProjectNLD/Assets/Art_Out/UI/Prefab/Favor/UI_FavorPanel.prefab
#	ProjectNLD/Assets/Editor/UIEditor/UIEditorScene.unity
 2025-04-28 17:37:34 +08:00