Compare commits

...

939 Commits

Author SHA1 Message Date
1ed9371154 Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-31 22:23:55 +08:00
b1c4a5046f 滤镜增加一个抽象类FilterChainEffect,用于支持多pass调用 2024-12-31 18:31:47 +08:00
b9b081d037 滤镜增加一个抽象类FilterChainEffect,用于支持多pass调用 2024-12-31 18:31:47 +08:00
571b29b70f Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-31 09:37:12 +08:00
a5c096f141 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-31 09:37:12 +08:00
498819be7e Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-31 09:37:06 +08:00
d681a936fe Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-31 09:37:06 +08:00
3d13eb9512 Merge pull request 'master' (#76) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#76
2024-12-30 23:52:18 +08:00
6168fffba1 添加一个1990-esque滤镜 2024-12-30 23:10:07 +08:00
3dff9abf23 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-30 09:24:17 +08:00
0abbeba15a Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-30 09:24:17 +08:00
0cb4c85b4a Merge pull request '合特么的' (#74) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#74
2024-12-27 22:25:28 +08:00
f421fd4f1f Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-27 20:36:13 +08:00
06c1fbb904 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-27 20:36:13 +08:00
0b07d251b0 增加画面比例修改功能,以及配套的设置界面 2024-12-27 20:36:01 +08:00
d5626f7a94 增加画面比例修改功能,以及配套的设置界面 2024-12-27 20:36:01 +08:00
ecb3630751 filter相关代码移入appsetting文件夹 2024-12-27 16:46:18 +08:00
ALIENJACK\alien
f998fe6b76 filter相关代码移入appsetting文件夹 2024-12-27 16:46:18 +08:00
abbc2eac2e 增加一个画面比例模式设置项目,滤镜类型移入AppSettings类型下 2024-12-27 16:40:33 +08:00
ALIENJACK\alien
168ee1ed95 增加一个画面比例模式设置项目,滤镜类型移入AppSettings类型下 2024-12-27 16:40:33 +08:00
fdf88aa626 场景中只保留Initer脚本,启动时从脚本动态加载其他初始化所需对象(为了该死的低版本UNITY兼容) 2024-12-27 14:47:17 +08:00
ALIENJACK\alien
e9375e2277 场景中只保留Initer脚本,启动时从脚本动态加载其他初始化所需对象(为了该死的低版本UNITY兼容) 2024-12-27 14:47:17 +08:00
7464b0c05f Merge pull request 'master' (#73) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#73
2024-12-27 14:33:08 +08:00
0d410f9c5e Merge pull request 'master' (#73) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#73
2024-12-27 14:33:08 +08:00
588c8c13de Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FilterManager.cs
2024-12-27 14:31:36 +08:00
ALIENJACK\alien
6775c1279e Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FilterManager.cs
2024-12-27 14:31:36 +08:00
8dd334e5fb 滤镜增加通用参数RenderScale
优化滤镜机制
2024-12-27 14:11:31 +08:00
ALIENJACK\alien
59576be9ee 滤镜增加通用参数RenderScale
优化滤镜机制
2024-12-27 14:11:31 +08:00
05d980e127 AxiHttp网络异常处理,PSVita RenderTexture分辨率 2024-12-27 14:10:22 +08:00
bbcd4de0b8 AxiHttp网络异常处理,PSVita RenderTexture分辨率 2024-12-27 14:10:22 +08:00
3b7bdcf445 服务端跟随新用户槽位 更改管理 ,以及对象池 2024-12-27 14:00:52 +08:00
5caff2dbda 服务端跟随新用户槽位 更改管理 ,以及对象池 2024-12-27 14:00:52 +08:00
b7a4c5907a Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-27 13:31:18 +08:00
ALIENJACK\alien
37bbbd7cfd Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-27 13:31:18 +08:00
b7a663415f 123 2024-12-27 13:31:14 +08:00
ALIENJACK\alien
4bf783cd96 123 2024-12-27 13:31:14 +08:00
dbe77aae3d 完善移植工具后 不再依赖中间项目 2024-12-27 01:42:22 +08:00
ff3c511895 完善移植工具后 不再依赖中间项目 2024-12-27 01:42:22 +08:00
57a1f4a622 Merge pull request 'master' (#72) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#72
2024-12-27 01:26:31 +08:00
ab3b7e86f8 Merge pull request 'master' (#72) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#72
2024-12-27 01:26:31 +08:00
30373844c4 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-27 01:25:10 +08:00
59b62350ea Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-27 01:25:10 +08:00
779fdf9e12 PSVita 完整程序运行基线 归档 2024-12-27 01:24:06 +08:00
b012c50ac9 PSVita 完整程序运行基线 归档 2024-12-27 01:24:06 +08:00
e2570c2b52 增加滤镜RetroArchMattiasCRTGlow,
filtereffect派生类现在自动加载,
StripAttribute用于标记滤镜不在某些平台自动加载
2024-12-26 23:57:28 +08:00
37cd8b1d22 增加滤镜RetroArchMattiasCRTGlow,
filtereffect派生类现在自动加载,
StripAttribute用于标记滤镜不在某些平台自动加载
2024-12-26 23:57:28 +08:00
6e7d6a27cf shader实验中 2024-12-26 20:34:56 +08:00
ALIENJACK\alien
c254f0f5bb shader实验中 2024-12-26 20:34:56 +08:00
0cf0966c6f MattiasCRT增加几个质量变体,优化MattiasCRT render代码效率 2024-12-26 15:20:11 +08:00
ALIENJACK\alien
710359f538 MattiasCRT增加几个质量变体,优化MattiasCRT render代码效率 2024-12-26 15:20:11 +08:00
00664bdbfc 加bom 2024-12-26 14:14:13 +08:00
ALIENJACK\alien
9fb1812266 加bom 2024-12-26 14:14:13 +08:00
8a7a2ea8f2 修复编译错误 2024-12-26 10:40:59 +08:00
ALIENJACK\alien
7b29000a70 修复编译错误 2024-12-26 10:40:59 +08:00
1f6094e816 psv中文输入,PSV暂时屏蔽滤镜,httpapi搜索处理部分 2024-12-26 02:22:56 +08:00
62fbb6e11b psv中文输入,PSV暂时屏蔽滤镜,httpapi搜索处理部分 2024-12-26 02:22:56 +08:00
5b20413b7b 移植问题解决 2024-12-26 00:30:59 +08:00
fca038e67d 移植问题解决 2024-12-26 00:30:59 +08:00
9a325b9fde 低版本C#兼容 完善移植工具 2024-12-25 23:48:55 +08:00
64b9c02ef7 低版本C#兼容 完善移植工具 2024-12-25 23:48:55 +08:00
5d802ae03b 核心.net standard2.0 2024-12-25 23:13:07 +08:00
dc9d42de5c 核心.net standard2.0 2024-12-25 23:13:07 +08:00
c30b9b6eb3 移除StreamAssets 2024-12-25 22:42:02 +08:00
7ed77bb499 移除StreamAssets 2024-12-25 22:42:02 +08:00
6fb1f6d050 移植工具宏 2024-12-25 22:38:55 +08:00
4a75cae653 移植工具宏 2024-12-25 22:38:55 +08:00
8e5f460673 Merge pull request 'master' (#71) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#71
2024-12-25 22:33:20 +08:00
7f2792bbdc Merge pull request 'master' (#71) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#71
2024-12-25 22:33:20 +08:00
18cf409db0 加个异常 2024-12-25 22:32:54 +08:00
acd4c69ae4 加个异常 2024-12-25 22:32:54 +08:00
4eafeeccc7 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-25 20:48:37 +08:00
ALIENJACK\alien
d9a5f40190 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-25 20:48:37 +08:00
887031be32 重构代码,解耦上层逻辑强依赖virtualnes核心逻辑 2024-12-25 20:48:26 +08:00
ALIENJACK\alien
c0af4d4009 重构代码,解耦上层逻辑强依赖virtualnes核心逻辑 2024-12-25 20:48:26 +08:00
b5f567b336 完善 服务器 玩家更换slotidx 2024-12-25 20:25:55 +08:00
51a4419d25 完善 服务器 玩家更换slotidx 2024-12-25 20:25:55 +08:00
aa4a45ee79 Merge pull request 'master' (#70) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#70
2024-12-25 20:00:09 +08:00
3bbc24fc91 Merge pull request 'master' (#70) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#70
2024-12-25 20:00:09 +08:00
c6dab62926 增加房主创建房间成功后,将本地的手柄连接设置同步到服务器的机制 2024-12-25 19:56:11 +08:00
ALIENJACK\alien
13cadd90a0 增加房主创建房间成功后,将本地的手柄连接设置同步到服务器的机制 2024-12-25 19:56:11 +08:00
f722ca764c 实现按键自动请求空闲位置 2024-12-25 18:41:16 +08:00
ALIENJACK\alien
ecdfd507d9 实现按键自动请求空闲位置 2024-12-25 18:41:16 +08:00
aee34bc7a8 PSVita 输入法事件处理 2024-12-25 18:35:38 +08:00
886422e8ea PSVita 输入法事件处理 2024-12-25 18:35:38 +08:00
7f78240304 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs
2024-12-25 18:23:48 +08:00
ALIENJACK\alien
02693523a3 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs
2024-12-25 18:23:48 +08:00
8c991cb465 Add UTF8-BOM 2024-12-25 18:19:19 +08:00
ALIENJACK\alien
55b0752c2f Add UTF8-BOM 2024-12-25 18:19:19 +08:00
d81b0835c8 AppRoom部分接口变化 2024-12-25 18:18:42 +08:00
ALIENJACK\alien
a0c5da7a07 AppRoom部分接口变化 2024-12-25 18:18:42 +08:00
a53e7d65e5 fixed psv ime 2024-12-25 18:14:29 +08:00
a3cce34044 fixed psv ime 2024-12-25 18:14:29 +08:00
8d8c305eb6 PSVita输入框索尼lib,房间更换槽位接口,服务端Room fixed 2024-12-25 18:09:40 +08:00
4792b7da98 PSVita输入框索尼lib,房间更换槽位接口,服务端Room fixed 2024-12-25 18:09:40 +08:00
10f50f5422 Merge pull request 'master' (#69) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#69
2024-12-25 15:11:31 +08:00
4c42b40199 Merge pull request 'master' (#69) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#69
2024-12-25 15:11:31 +08:00
023a4acf13 滤镜预览功能适配滤镜机制修改 2024-12-25 14:43:25 +08:00
ALIENJACK\alien
bac3e514b6 滤镜预览功能适配滤镜机制修改 2024-12-25 14:43:25 +08:00
970fe7f201 滤镜机制参数修改,不再限制源纹理要求rendertexture类型 2024-12-25 14:42:50 +08:00
ALIENJACK\alien
91ca428269 滤镜机制参数修改,不再限制源纹理要求rendertexture类型 2024-12-25 14:42:50 +08:00
af1b90bc0c 移除冗余脚本 2024-12-25 14:41:35 +08:00
ALIENJACK\alien
f129651e99 移除冗余脚本 2024-12-25 14:41:35 +08:00
3a94186da4 修复报错 2024-12-25 14:28:34 +08:00
ALIENJACK\alien
35548687d0 修复报错 2024-12-25 14:28:34 +08:00
dd7a249db4 像素对齐 2024-12-25 13:52:00 +08:00
e21093d419 像素对齐 2024-12-25 13:52:00 +08:00
2df8901660 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-25 01:05:55 +08:00
5f1fbdd41f Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-25 01:05:55 +08:00
15b1109055 移除postprocess包 2024-12-25 01:05:18 +08:00
94fb19c4db 移除postprocess包 2024-12-25 01:05:18 +08:00
f48558cdec 移除postprocess方式的滤镜实现,改为graphics.Blit方式 2024-12-25 01:03:00 +08:00
34c7eef257 移除postprocess方式的滤镜实现,改为graphics.Blit方式 2024-12-25 01:03:00 +08:00
bb6815a18e 更换HaoYueNet网络库版本 更换新版本 2024-12-25 00:49:06 +08:00
80f4e950e0 更换HaoYueNet网络库版本 更换新版本 2024-12-25 00:49:06 +08:00
3470920dd9 axihttp fixed 2024-12-24 23:36:49 +08:00
063e256c35 axihttp fixed 2024-12-24 23:36:49 +08:00
1d44828d0c axihttp 线程管理 2024-12-24 23:35:32 +08:00
42a5e31557 axihttp 线程管理 2024-12-24 23:35:32 +08:00
f351983be1 fixed 2024-12-24 23:00:08 +08:00
de897936a2 fixed 2024-12-24 23:00:08 +08:00
4cbd78dd85 程序集 2024-12-24 22:50:18 +08:00
160867b037 程序集 2024-12-24 22:50:18 +08:00
b7b3f9dd8c axihttp图片下载问题 2024-12-24 22:48:55 +08:00
d57e3c3382 axihttp图片下载问题 2024-12-24 22:48:55 +08:00
61a7bf74f7 修复nes默认手柄键位未正确初始化的bug 2024-12-24 21:52:23 +08:00
4fbfd2cfc1 修复nes默认手柄键位未正确初始化的bug 2024-12-24 21:52:23 +08:00
e73b29913a 修复工程报错,以及RomItem下拉速度过快可能报错的bug 2024-12-24 21:46:31 +08:00
68155d69ff 修复工程报错,以及RomItem下拉速度过快可能报错的bug 2024-12-24 21:46:31 +08:00
f56525a51e slotidx预制体资源 2024-12-24 16:17:19 +08:00
294e6ac177 slotidx预制体资源 2024-12-24 16:17:19 +08:00
2f8c95628b 还原一些readyonly项 2024-12-23 01:16:23 +08:00
e5e7beb52c 还原一些readyonly项 2024-12-23 01:16:23 +08:00
cc9a571932 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-23 01:06:41 +08:00
f705b947c3 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-23 01:06:41 +08:00
72526d9ede 主项目 - 低版本C# 兼容 (考虑PSV) 2024-12-23 01:06:27 +08:00
8191ff4b57 主项目 - 低版本C# 兼容 (考虑PSV) 2024-12-23 01:06:27 +08:00
b834dd6754 取消对核心的低版本C#修改,使用dll standard2.0版本 2024-12-20 20:18:41 +08:00
7c1a2af6f0 取消对核心的低版本C#修改,使用dll standard2.0版本 2024-12-20 20:18:41 +08:00
0ad8768d67 主工程 VirtualNes.Core核心低版本C#兼容 2024-12-20 18:44:55 +08:00
af82cff70a 主工程 VirtualNes.Core核心低版本C#兼容 2024-12-20 18:44:55 +08:00
b303607a29 VirtualNes.Core核心低版本C#兼容 2024-12-20 17:57:29 +08:00
765b62c7cc VirtualNes.Core核心低版本C#兼容 2024-12-20 17:57:29 +08:00
ae256e3e97 VirtualNes.Core核心低版本C#兼容 2024-12-20 17:24:09 +08:00
ad5d2cf35a VirtualNes.Core核心低版本C#兼容 2024-12-20 17:24:09 +08:00
29e2554c22 服务器分配玩家位置 2024-12-20 13:52:34 +08:00
3e91952330 服务器分配玩家位置 2024-12-20 13:52:34 +08:00
e821866de4 客户端 2024-12-20 12:11:02 +08:00
7c5934bc6b 客户端 2024-12-20 12:11:02 +08:00
7789e86557 Merge pull request 'master' (#68) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#68
2024-12-20 12:09:49 +08:00
9f3c8ea7c5 Merge pull request 'master' (#68) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#68
2024-12-20 12:09:49 +08:00
495ad8de23 XMBTopGroup重命名为XMBInfoBar,不再局限于右上角UI管理
GamingChanger.cs和NormalChanger.cs不再属于legacy了,因为InputSystem已经作废了:)
2024-12-20 11:06:08 +08:00
ALIENJACK\alien
e5f0816061 XMBTopGroup重命名为XMBInfoBar,不再局限于右上角UI管理
GamingChanger.cs和NormalChanger.cs不再属于legacy了,因为InputSystem已经作废了:)
2024-12-20 11:06:08 +08:00
5b3366af31 XMBTopGroup.prefab从LaunchUI.prefab的嵌套结构中脱离
处理部分代码文件的编码文件
部分代码经过了rider调教
2024-12-20 10:52:39 +08:00
ALIENJACK\alien
6022cafe64 XMBTopGroup.prefab从LaunchUI.prefab的嵌套结构中脱离
处理部分代码文件的编码文件
部分代码经过了rider调教
2024-12-20 10:52:39 +08:00
26e68e419a 服务器重构玩家位置管理,使其可以一对多手柄位联机,以及切换位置等协议 2024-12-20 01:04:40 +08:00
abddf3c0b5 服务器重构玩家位置管理,使其可以一对多手柄位联机,以及切换位置等协议 2024-12-20 01:04:40 +08:00
2652967e46 Merge pull request 'master' (#67) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#67
2024-12-19 20:46:38 +08:00
417390227c Merge pull request 'master' (#67) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#67
2024-12-19 20:46:38 +08:00
072638e4dd Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-19 20:36:19 +08:00
ALIENJACK\alien
7092797481 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-19 20:36:19 +08:00
9a3852c539 本地手柄和游戏内手柄插槽抽象机制实现 2024-12-19 20:36:04 +08:00
ALIENJACK\alien
557dd0e870 本地手柄和游戏内手柄插槽抽象机制实现 2024-12-19 20:36:04 +08:00
30459102d1 程序集不使用GUID引用 2024-12-19 16:06:22 +08:00
6d4acb5698 程序集不使用GUID引用 2024-12-19 16:06:22 +08:00
d348013a59 完善移植工具 2024-12-19 16:00:45 +08:00
bdd5415839 完善移植工具 2024-12-19 16:00:45 +08:00
7f2dd8dfc7 采集 2024-12-19 15:13:03 +08:00
de1d81536b 采集 2024-12-19 15:13:03 +08:00
c17a7040b8 .. 2024-12-19 14:55:59 +08:00
4fdd142c13 .. 2024-12-19 14:55:59 +08:00
311be15212 移植工具 2024-12-19 14:34:18 +08:00
d38802dac0 移植工具 2024-12-19 14:34:18 +08:00
3d888d33ee Merge pull request 'master' (#66) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#66
2024-12-19 00:47:13 +08:00
69cfd7969f Merge pull request 'master' (#66) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#66
2024-12-19 00:47:13 +08:00
4d06b5c045 移植工具 2024-12-19 00:46:14 +08:00
f609feace5 移植工具 2024-12-19 00:46:14 +08:00
0cf4bf060f 兼容性替换工具 2024-12-19 00:00:51 +08:00
21d6063290 兼容性替换工具 2024-12-19 00:00:51 +08:00
17c79e9b9d psv中间跨版本项目,初运行状态 2024-12-17 01:30:13 +08:00
1ba9269d1c psv中间跨版本项目,初运行状态 2024-12-17 01:30:13 +08:00
8bf0c365e0 尝试TCP纯原生平替HTTP异步下载和接口请求,支持PSVita 2024-12-16 23:50:00 +08:00
6c6761c4e3 尝试TCP纯原生平替HTTP异步下载和接口请求,支持PSVita 2024-12-16 23:50:00 +08:00
1c80ed99cb Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 20:33:18 +08:00
ALIENJACK\alien
ea5fb508e3 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 20:33:18 +08:00
20ae6bdcee 更换自动创建房间事件 2024-12-13 20:33:09 +08:00
ALIENJACK\alien
07bb092839 更换自动创建房间事件 2024-12-13 20:33:09 +08:00
859a8020c1 其他玩家下线 清理其手柄位的键值 2024-12-13 19:19:11 +08:00
30dd2ee9aa 其他玩家下线 清理其手柄位的键值 2024-12-13 19:19:11 +08:00
8b04ea2be1 用户名修改客户端事件 2024-12-13 19:10:52 +08:00
183ec611e1 用户名修改客户端事件 2024-12-13 19:10:52 +08:00
bf6be5cd68 Merge pull request '游戏内滤镜设置增加取消滤镜功能' (#65) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#65
2024-12-13 18:38:11 +08:00
e9428e2cc6 Merge pull request '游戏内滤镜设置增加取消滤镜功能' (#65) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#65
2024-12-13 18:38:11 +08:00
3aa00176b3 房间逻辑 Tips 自动起昵称 2024-12-13 18:36:43 +08:00
fe616214a9 房间逻辑 Tips 自动起昵称 2024-12-13 18:36:43 +08:00
a5ac0e6e40 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 17:56:07 +08:00
ALIENJACK\alien
c5ff8fd4ae Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 17:56:07 +08:00
a70450bf5d 房间事件完善 和 提示Tips 2024-12-13 17:55:44 +08:00
1d3a602dd6 房间事件完善 和 提示Tips 2024-12-13 17:55:44 +08:00
37e6262659 玩家自行启动游戏时,如果还未登录成功,将会在登录成功后自动创建房间(从加入房间的入口创建游戏时不会触发这个逻辑) 2024-12-13 17:52:23 +08:00
ALIENJACK\alien
7123103fd6 玩家自行启动游戏时,如果还未登录成功,将会在登录成功后自动创建房间(从加入房间的入口创建游戏时不会触发这个逻辑) 2024-12-13 17:52:23 +08:00
1a1563278e Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 17:28:47 +08:00
ALIENJACK\alien
839a711637 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 17:28:47 +08:00
1d98d4727f Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 17:28:12 +08:00
feb5158ffe Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 17:28:12 +08:00
94973deeb0 登录成功失败事件 2024-12-13 17:28:02 +08:00
b6292f1d4d 登录成功失败事件 2024-12-13 17:28:02 +08:00
4868ba2a52 游戏内滤镜设置增加取消滤镜功能 2024-12-13 17:06:25 +08:00
ALIENJACK\alien
0506120ede 游戏内滤镜设置增加取消滤镜功能 2024-12-13 17:06:25 +08:00
f98145b6c0 Merge pull request 'shader include' (#64) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#64
2024-12-13 16:08:25 +08:00
f923d14100 Merge pull request 'shader include' (#64) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#64
2024-12-13 16:08:25 +08:00
53883936c0 shader include 2024-12-13 16:07:16 +08:00
ALIENJACK\alien
48c27553e1 shader include 2024-12-13 16:07:16 +08:00
3753705a16 Merge pull request 'master' (#63) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#63
2024-12-13 16:03:59 +08:00
9fa862441a Merge pull request 'master' (#63) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#63
2024-12-13 16:03:59 +08:00
c7d011f1d4 预览功能替换预览图片 2024-12-13 16:01:48 +08:00
ALIENJACK\alien
382322c8c8 预览功能替换预览图片 2024-12-13 16:01:48 +08:00
b6862cfef4 修复bug,删除冗余资源 2024-12-13 15:46:59 +08:00
ALIENJACK\alien
b5942edc22 修复bug,删除冗余资源 2024-12-13 15:46:59 +08:00
173a3a2076 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 15:42:55 +08:00
ALIENJACK\alien
cac6ec0f9b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 15:42:55 +08:00
2cc3544877 ui微调 2024-12-13 15:42:37 +08:00
51385dca36 ui微调 2024-12-13 15:42:37 +08:00
afdd10d6cc 添加一个滤镜 2024-12-13 15:42:26 +08:00
ALIENJACK\alien
ce0cf563d4 添加一个滤镜 2024-12-13 15:42:26 +08:00
d951af1f54 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 13:38:58 +08:00
ALIENJACK\alien
e23ea483c9 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-13 13:38:58 +08:00
1dc98d026d Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FixingPixelArtGrille/FixingPixelArtGrille.cs
2024-12-13 13:38:48 +08:00
ALIENJACK\alien
f9a2e82cd0 Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FixingPixelArtGrille/FixingPixelArtGrille.cs
2024-12-13 13:38:48 +08:00
73f3cefb54 加utf8-bom 2024-12-13 13:37:49 +08:00
ALIENJACK\alien
ed91d48cc8 加utf8-bom 2024-12-13 13:37:49 +08:00
8bda95fbab Merge pull request 'master' (#62) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#62
2024-12-12 09:47:11 +08:00
bdc26c7fe5 Merge pull request 'master' (#62) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#62
2024-12-12 09:47:11 +08:00
e8ce2e089e 实现PopMsg UI 2024-12-11 22:45:16 +08:00
3e1f5b9de8 实现PopMsg UI 2024-12-11 22:45:16 +08:00
176b392eb9 目录结构调整撞上了pull... 2024-12-11 21:29:19 +08:00
f8cbdc1df7 目录结构调整撞上了pull... 2024-12-11 21:29:19 +08:00
dd4d27be44 代码目录结构调整 2024-12-11 21:21:27 +08:00
2dc84085eb 代码目录结构调整 2024-12-11 21:21:27 +08:00
bbdfe5c713 房间完善,游戏列表统计 2024-12-11 11:12:14 +08:00
5b9cb9bc5e 房间完善,游戏列表统计 2024-12-11 11:12:14 +08:00
cbc9aed982 Merge pull request '项目设置中包含滤镜shader' (#61) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#61
2024-12-10 12:51:46 +08:00
54cf6e695b Merge pull request '项目设置中包含滤镜shader' (#61) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#61
2024-12-10 12:51:46 +08:00
b3bfeb8f7c 提交Unity6相关设置文件 2024-12-09 21:31:54 +08:00
e74c04adc9 提交Unity6相关设置文件 2024-12-09 21:31:54 +08:00
9dc988ac7e 项目设置中包含滤镜shader 2024-12-09 16:35:11 +08:00
ALIENJACK\alien
26cb57b2f1 项目设置中包含滤镜shader 2024-12-09 16:35:11 +08:00
4f4143868b psvita 归档 2024-12-08 21:50:52 +08:00
2094bda9db psvita 归档 2024-12-08 21:50:52 +08:00
b9466b214a netfix 2024-12-06 19:10:15 +08:00
a40052ade3 netfix 2024-12-06 19:10:15 +08:00
8defca7729 t stat
-:q::Qqq;Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
2024-12-06 18:13:07 +08:00
4d70b44c8e t stat
-:q::Qqq;Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
2024-12-06 18:13:07 +08:00
162761f0f1 进入房间bug desu 2024-12-06 18:12:31 +08:00
752ed0b955 进入房间bug desu 2024-12-06 18:12:31 +08:00
94af0664d2 Merge pull request 'master' (#60) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#60
2024-12-06 18:10:47 +08:00
ae3471fd5e Merge pull request 'master' (#60) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#60
2024-12-06 18:10:47 +08:00
836a519810 修复进入房间时,netreply中的帧数未重置的问题 2024-12-06 18:09:29 +08:00
ALIENJACK\alien
ee65797a6a 修复进入房间时,netreply中的帧数未重置的问题 2024-12-06 18:09:29 +08:00
c4393671a7 修复meta版本被unity6修改的问题,滤镜代码改为unity2020可用版本 2024-12-06 17:45:05 +08:00
ALIENJACK\alien
5ecdf999d3 修复meta版本被unity6修改的问题,滤镜代码改为unity2020可用版本 2024-12-06 17:45:05 +08:00
b1428efefb Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-06 17:19:17 +08:00
ALIENJACK\alien
94eda481f9 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-06 17:19:17 +08:00
f10fd2a81b Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-06 17:18:12 +08:00
ALIENJACK\alien
3eee3b1c63 Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline 2024-12-06 17:18:12 +08:00
aa6e1417cf unity 材质球修改了材质球序列化 2024-12-06 17:17:57 +08:00
ALIENJACK\alien
9049d905c8 unity 材质球修改了材质球序列化 2024-12-06 17:17:57 +08:00
5fe5fc38f0 join 2024-12-06 15:09:19 +08:00
a04495dfee join 2024-12-06 15:09:19 +08:00
d421777ab3 侧边栏UI增加可编辑值的选项类型,滤镜预设现在已支持参数的修改 2024-12-05 01:31:28 +08:00
d6fa9772b9 侧边栏UI增加可编辑值的选项类型,滤镜预设现在已支持参数的修改 2024-12-05 01:31:28 +08:00
31099c1900 优化侧边栏菜单 UI细节 2024-12-04 23:15:05 +08:00
c421466b84 优化侧边栏菜单 UI细节 2024-12-04 23:15:05 +08:00
0b7d6c640d 提交遗漏的文件 2024-12-04 21:27:21 +08:00
4722473896 提交遗漏的文件 2024-12-04 21:27:21 +08:00
6d7d72d0dc Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-04 16:05:35 +08:00
ALIENJACK\alien
cc281a9ea2 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-04 16:05:35 +08:00
7fc4c26993 当游戏暂停时,中断音频处理 2024-12-04 16:05:21 +08:00
ALIENJACK\alien
14f5621827 当游戏暂停时,中断音频处理 2024-12-04 16:05:21 +08:00
01742dd7a3 VitrualNes.Core 核心从Unity里迁移到.NetStandard 2.0独立项目 2024-12-04 15:17:28 +08:00
135517065e VitrualNes.Core 核心从Unity里迁移到.NetStandard 2.0独立项目 2024-12-04 15:17:28 +08:00
355f31da00 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-04 15:13:36 +08:00
ALIENJACK\alien
12a8b94050 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-04 15:13:36 +08:00
b887c54416 移除打包场景中的缺失项 2024-12-04 15:13:20 +08:00
ALIENJACK\alien
b5950fca9c 移除打包场景中的缺失项 2024-12-04 15:13:20 +08:00
89573f3e7c 移除废物 2024-12-04 15:08:35 +08:00
ALIENJACK\alien
69ae1ed949 移除废物 2024-12-04 15:08:35 +08:00
58a438c232 video cpu渲染模式描述 2024-12-04 14:34:00 +08:00
dc9963a431 video cpu渲染模式描述 2024-12-04 14:34:00 +08:00
5de505d57f readme 2024-12-04 14:28:49 +08:00
29f231a3be readme 2024-12-04 14:28:49 +08:00
eb66ec7995 Merge pull request 'master' (#59) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#59
2024-12-04 14:28:12 +08:00
5b5da2767e Merge pull request 'master' (#59) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#59
2024-12-04 14:28:12 +08:00
fbfb944487 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-04 14:25:23 +08:00
ALIENJACK\alien
ace25f4a3f Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-12-04 14:25:23 +08:00
d227473af7 videoProvider增加了cpu计算输出图像的开关 2024-12-04 14:25:09 +08:00
ALIENJACK\alien
4b855c5695 videoProvider增加了cpu计算输出图像的开关 2024-12-04 14:25:09 +08:00
ae808ac4cf 同步动态提前量 | 公网联机体验调整 | 跳帧规则 2024-12-04 13:54:30 +08:00
404c70ab09 同步动态提前量 | 公网联机体验调整 | 跳帧规则 2024-12-04 13:54:30 +08:00
56c3681062 移除Coffee UI特效包中的TMP支持shader,滤镜系统完善,virtuanes核心移除多余命名空间引用 2024-12-04 00:04:31 +08:00
075d6c1427 移除Coffee UI特效包中的TMP支持shader,滤镜系统完善,virtuanes核心移除多余命名空间引用 2024-12-04 00:04:31 +08:00
d218dbfba8 修复一个room房间进入过快可能导致报错的bug 2024-12-03 20:16:10 +08:00
ALIENJACK\alien
8239e70c9e 修复一个room房间进入过快可能导致报错的bug 2024-12-03 20:16:10 +08:00
f49a7e87d1 testflag 2024-12-03 20:05:12 +08:00
02e94317e4 testflag 2024-12-03 20:05:12 +08:00
c0cd7623df Merge pull request 'master' (#58) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#58
2024-12-03 19:49:20 +08:00
d1ded3446d Merge pull request 'master' (#58) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#58
2024-12-03 19:49:20 +08:00
c3a5d4f2fc 新增一个滤镜MattiasCRT,滤镜文件夹位置移动 2024-12-03 19:35:36 +08:00
ALIENJACK\alien
0783d7d90e 新增一个滤镜MattiasCRT,滤镜文件夹位置移动 2024-12-03 19:35:36 +08:00
f04b841544 修改遗漏的字体 2024-12-03 18:09:15 +08:00
ALIENJACK\alien
c3d0bce281 修改遗漏的字体 2024-12-03 18:09:15 +08:00
bae3c16c54 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity
2024-12-03 18:05:53 +08:00
ALIENJACK\alien
946141ed61 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity
2024-12-03 18:05:53 +08:00
2e4761aae9 PS3字体 2024-11-29 16:36:26 +08:00
4a56c1a74d PS3字体 2024-11-29 16:36:26 +08:00
8e60e2c0f7 侧边栏UI迭代,支持无限次级菜单套娃 2024-11-29 09:56:40 +08:00
ALIENJACK\alien
7233e17888 侧边栏UI迭代,支持无限次级菜单套娃 2024-11-29 09:56:40 +08:00
f77aca0111 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-29 09:56:02 +08:00
ALIENJACK\alien
2ecf190107 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-29 09:56:02 +08:00
2ab8b9db35 忽略 2024-11-28 20:18:00 +08:00
11eb77724e 忽略 2024-11-28 20:18:00 +08:00
f9e8ee6fe8 数据库结构 2024-11-28 19:56:31 +08:00
36293af2b1 数据库结构 2024-11-28 19:56:31 +08:00
561b789021 游戏收藏,客户端接口,服务端协议,webapi 2024-11-28 19:54:59 +08:00
4d3a19df2a 游戏收藏,客户端接口,服务端协议,webapi 2024-11-28 19:54:59 +08:00
de551cc3ba 统计 2024-11-28 18:01:27 +08:00
e9aac3072d 统计 2024-11-28 18:01:27 +08:00
208653f9a9 统计功能 2024-11-28 17:31:19 +08:00
4a97e69409 统计功能 2024-11-28 17:31:19 +08:00
2e71774bf5 用户通知 | 改名| 用户管理 | 以及前后端逻辑 2024-11-28 16:55:12 +08:00
029044cc0e 用户通知 | 改名| 用户管理 | 以及前后端逻辑 2024-11-28 16:55:12 +08:00
17a08e2f93 滤镜功能迭代 2024-11-28 16:33:00 +08:00
ALIENJACK\alien
fd853f3723 滤镜功能迭代 2024-11-28 16:33:00 +08:00
9d718ba0a1 Merge pull request 'master' (#57) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#57
2024-11-28 10:13:51 +08:00
1ffe9e79c0 Merge pull request 'master' (#57) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#57
2024-11-28 10:13:51 +08:00
adf8267fb6 修改滤镜设置图标 2024-11-28 10:11:59 +08:00
ALIENJACK\alien
490a5584d8 修改滤镜设置图标 2024-11-28 10:11:59 +08:00
3694b0e027 增加滤镜预览功能 2024-11-28 10:08:49 +08:00
ALIENJACK\alien
84d7112c90 增加滤镜预览功能 2024-11-28 10:08:49 +08:00
10fde01ac5 滤镜设置UI添加,修复bug 2024-11-27 13:30:56 +08:00
ALIENJACK\alien
d05b2018eb 滤镜设置UI添加,修复bug 2024-11-27 13:30:56 +08:00
872be73ace 完成滤镜系统初步抽象 2024-11-27 11:28:51 +08:00
ALIENJACK\alien
73a5b9d258 完成滤镜系统初步抽象 2024-11-27 11:28:51 +08:00
d3c7c21552 滤镜参数可调 2024-11-26 20:30:02 +08:00
ALIENJACK\alien
adde033fa1 滤镜参数可调 2024-11-26 20:30:02 +08:00
8fefe516bd Legacy改名,不再使用inputsystem 2024-11-26 17:18:20 +08:00
ALIENJACK\alien
e0a87a2737 Legacy改名,不再使用inputsystem 2024-11-26 17:18:20 +08:00
0a62f9c8f8 fuck InputSystem! 2024-11-26 16:54:51 +08:00
ALIENJACK\alien
d7269175cd fuck InputSystem! 2024-11-26 16:54:51 +08:00
dbce372194 引入滤镜 2024-11-22 18:59:48 +08:00
ALIENJACK\alien
08bdb552c9 引入滤镜 2024-11-22 18:59:48 +08:00
b8a2488a99 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-21 20:32:58 +08:00
ALIENJACK\alien
ae66360466 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-21 20:32:58 +08:00
cd6c4f36c1 UI输入系统已接入InputSystem 2024-11-21 20:32:41 +08:00
ALIENJACK\alien
c316d77f6a UI输入系统已接入InputSystem 2024-11-21 20:32:41 +08:00
8fd84454c4 引入inputsystem 2024-11-21 17:41:53 +08:00
ALIENJACK\alien
3d7142ec04 引入inputsystem 2024-11-21 17:41:53 +08:00
7e90fa098a Merge pull request 'master' (#56) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#56
2024-11-21 17:41:16 +08:00
e8953e593e Merge pull request 'master' (#56) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#56
2024-11-21 17:41:16 +08:00
14b8caae3c 新建一个Initer monobehaviour,用来提前加载app.init 2024-11-21 17:40:01 +08:00
ALIENJACK\alien
d907913bfc 新建一个Initer monobehaviour,用来提前加载app.init 2024-11-21 17:40:01 +08:00
3e742a4ad0 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/App.cs
2024-11-21 17:19:11 +08:00
ALIENJACK\alien
ecde8f6682 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/App.cs
2024-11-21 17:19:11 +08:00
cfb71d22a1 123 2024-11-21 17:18:51 +08:00
ALIENJACK\alien
38a825f49e 123 2024-11-21 17:18:51 +08:00
ed4bc456e2 打包前归档 2024-11-21 17:18:15 +08:00
25375047e2 打包前归档 2024-11-21 17:18:15 +08:00
e7a131e513 添加preserve 2024-11-21 17:08:44 +08:00
ALIENJACK\alien
88ba7c189c 添加preserve 2024-11-21 17:08:44 +08:00
fbbdab6320 修复背景颜色未设置时,返回默认颜色的代码错误
rename BgSetting_Color.cs->UI_BgSettingItem_Color.cs
2024-11-21 17:03:06 +08:00
ALIENJACK\alien
912ad6b045 修复背景颜色未设置时,返回默认颜色的代码错误
rename BgSetting_Color.cs->UI_BgSettingItem_Color.cs
2024-11-21 17:03:06 +08:00
52f8239fea 修复一些奇怪的命名空间引用 移除冗余的package 2024-11-21 16:53:05 +08:00
ALIENJACK\alien
34e9090446 修复一些奇怪的命名空间引用 移除冗余的package 2024-11-21 16:53:05 +08:00
1aff673c40 Merge pull request '修改destroy回调警告' (#55) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#55
2024-11-21 16:22:27 +08:00
6faa42c767 Merge pull request '修改destroy回调警告' (#55) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#55
2024-11-21 16:22:27 +08:00
498abe5f1f 修改destroy回调警告 2024-11-21 16:12:54 +08:00
ALIENJACK\alien
797ab0c843 修改destroy回调警告 2024-11-21 16:12:54 +08:00
7efac0581c Merge pull request 'master' (#54) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#54
2024-11-20 19:37:05 +08:00
a91d404944 Merge pull request 'master' (#54) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#54
2024-11-20 19:37:05 +08:00
d3b36cbfa1 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-20 19:33:25 +08:00
ALIENJACK\alien
5dae909fa2 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-20 19:33:25 +08:00
239b31468d 注释 2024-11-19 13:54:23 +08:00
b4680b74a3 注释 2024-11-19 13:54:23 +08:00
1267826229 注释 2024-11-19 13:52:37 +08:00
3ec227f690 注释 2024-11-19 13:52:37 +08:00
3bd9a728ed 状态栏显示帧数 2024-11-19 13:09:53 +08:00
ALIENJACK\alien
b54de1e162 状态栏显示帧数 2024-11-19 13:09:53 +08:00
39007d7854 修复bug 2024-11-19 12:08:21 +08:00
ALIENJACK\alien
36c461562e 修复bug 2024-11-19 12:08:21 +08:00
692b309951 修复uint*作为模拟器核心屏幕数据时,一些批量赋值的bug 2024-11-19 11:59:37 +08:00
ALIENJACK\alien
6b30c73c30 修复uint*作为模拟器核心屏幕数据时,一些批量赋值的bug 2024-11-19 11:59:37 +08:00
e8c1a7d3a0 服务器被动追帧+优化广播 2024-11-18 23:46:02 +08:00
8452be9fc8 服务器被动追帧+优化广播 2024-11-18 23:46:02 +08:00
3633328fa8 Merge pull request 'Rom列表搜索功能实现' (#53) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#53
2024-11-15 10:53:56 +08:00
e0e756b67c Merge pull request 'Rom列表搜索功能实现' (#53) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#53
2024-11-15 10:53:56 +08:00
3bd2b622bf UI调整 2024-11-15 10:53:19 +08:00
ALIENJACK\alien
3249a0b642 UI调整 2024-11-15 10:53:19 +08:00
afc21e4502 XMB shader现在是一个完备的ugui shader 2024-11-15 09:49:15 +08:00
ALIENJACK\alien
7db6220c30 XMB shader现在是一个完备的ugui shader 2024-11-15 09:49:15 +08:00
22fe8ee77a 动效调整 2024-11-14 20:23:51 +08:00
ALIENJACK\alien
d3f1f76e70 动效调整 2024-11-14 20:23:51 +08:00
eb3e9e571a 颜色预览shader修改 2024-11-14 20:10:01 +08:00
ALIENJACK\alien
56f2953a99 颜色预览shader修改 2024-11-14 20:10:01 +08:00
b2e454aa1a 颜色选择加入渐变 2024-11-14 20:07:24 +08:00
ALIENJACK\alien
2c36f91725 颜色选择加入渐变 2024-11-14 20:07:24 +08:00
4dd8b3afba 优化背景shader表现 2024-11-14 19:25:44 +08:00
ALIENJACK\alien
df32ff6a3a 优化背景shader表现 2024-11-14 19:25:44 +08:00
b3e8a9254f 实现背景颜色切换 2024-11-14 17:14:52 +08:00
ALIENJACK\alien
4ca053f624 实现背景颜色切换 2024-11-14 17:14:52 +08:00
de40250fc9 UI资源微调 2024-11-14 14:19:28 +08:00
ALIENJACK\alien
2a846aaf4e UI资源微调 2024-11-14 14:19:28 +08:00
3b09ddeec3 完美像素! 2024-11-14 12:02:11 +08:00
ALIENJACK\alien
a064078d0d 完美像素! 2024-11-14 12:02:11 +08:00
a30d43d079 ppu lpScreen改为指针版本 2024-11-14 11:17:17 +08:00
ALIENJACK\alien
43e7ba8332 ppu lpScreen改为指针版本 2024-11-14 11:17:17 +08:00
9fab25e3f7 移除debug代码 2024-11-13 19:25:46 +08:00
ALIENJACK\alien
3913595b18 移除debug代码 2024-11-13 19:25:46 +08:00
1e156c9b51 修复存档问题 2024-11-13 18:42:30 +08:00
ALIENJACK\alien
ae9fee30ef 修复存档问题 2024-11-13 18:42:30 +08:00
4f4e00df0d 移除操作 2024-11-13 14:03:11 +08:00
ALIENJACK\alien
e9dd949c10 移除操作 2024-11-13 14:03:11 +08:00
31e3b298d8 Rom列表搜索功能实现 2024-11-13 13:55:36 +08:00
ALIENJACK\alien
2493cd8520 Rom列表搜索功能实现 2024-11-13 13:55:36 +08:00
b1a7a234d7 log 2024-11-12 17:48:12 +08:00
c75ee229d4 log 2024-11-12 17:48:12 +08:00
0179f2f0ad Merge pull request 'master' (#52) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#52
2024-11-12 16:51:31 +08:00
58a432eb3c Merge pull request 'master' (#52) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#52
2024-11-12 16:51:31 +08:00
7a9952a40f 添加动态追帧机制 2024-11-12 14:55:45 +08:00
ALIENJACK\alien
4afcc2f1f1 添加动态追帧机制 2024-11-12 14:55:45 +08:00
94443e05b7 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-12 14:49:39 +08:00
ALIENJACK\alien
46a404f40b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-12 14:49:39 +08:00
06f67281b4 微调追帧策略 2024-11-12 14:47:57 +08:00
ALIENJACK\alien
bddb84c57d 微调追帧策略 2024-11-12 14:47:57 +08:00
fc24e50636 Merge pull request 'master' (#51) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#51
2024-11-12 12:51:53 +08:00
264d3609f1 Merge pull request 'master' (#51) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#51
2024-11-12 12:51:53 +08:00
ff3335c35a 同步bug修复 2024-11-12 12:49:58 +08:00
ALIENJACK\alien
0dd21f6d50 同步bug修复 2024-11-12 12:49:58 +08:00
452f91ea71 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-12 09:59:46 +08:00
ALIENJACK\alien
c6d3ac4aea Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-12 09:59:46 +08:00
6fbe29066a NetReplay 2024-11-12 09:59:09 +08:00
0e96b4619a NetReplay 2024-11-12 09:59:09 +08:00
bdf10da3f2 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-12 09:58:43 +08:00
ALIENJACK\alien
c311772589 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-12 09:58:43 +08:00
39c600f4ad 开放模拟器核心帧序号 2024-11-12 09:58:30 +08:00
ALIENJACK\alien
edc84fc3cf 开放模拟器核心帧序号 2024-11-12 09:58:30 +08:00
97b63e4382 NetReplay 2024-11-12 09:56:07 +08:00
36787e1018 NetReplay 2024-11-12 09:56:07 +08:00
ea68a6150d Merge pull request 'master' (#50) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#50
2024-11-11 20:21:01 +08:00
4dac834555 Merge pull request 'master' (#50) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#50
2024-11-11 20:21:01 +08:00
ea9171f074 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 20:19:59 +08:00
ALIENJACK\alien
11d7f681b0 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 20:19:59 +08:00
f4dfca94ad 增加追帧机制 2024-11-11 20:19:50 +08:00
ALIENJACK\alien
195afdafb8 增加追帧机制 2024-11-11 20:19:50 +08:00
a4c1b06a1a Merge pull request 'master' (#49) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#49
2024-11-11 20:18:22 +08:00
3d2e9e1f0a Merge pull request 'master' (#49) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#49
2024-11-11 20:18:22 +08:00
e186ae9ed0 修复bug 2024-11-11 20:09:54 +08:00
ALIENJACK\alien
9324e185ef 修复bug 2024-11-11 20:09:54 +08:00
a94ab8629e Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 19:42:19 +08:00
ALIENJACK\alien
5e94eb4d16 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 19:42:19 +08:00
a940f87b4f NetFix 2024-11-11 19:21:35 +08:00
5c0730c8f9 NetFix 2024-11-11 19:21:35 +08:00
6d2ee700d5 主界面UI调整 2024-11-11 18:18:59 +08:00
ALIENJACK\alien
7a7e089542 主界面UI调整 2024-11-11 18:18:59 +08:00
06ad3630ce Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 17:26:00 +08:00
ALIENJACK\alien
bca708282b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 17:26:00 +08:00
403441023d 修复Room列表颜色问题 2024-11-11 17:25:43 +08:00
ALIENJACK\alien
0aefa7f8ad 修复Room列表颜色问题 2024-11-11 17:25:43 +08:00
bbc4981a7f 修复OptionUI找寻一个可以被选中的Item时的死循环报错 2024-11-11 17:23:44 +08:00
ALIENJACK\alien
0887c62424 修复OptionUI找寻一个可以被选中的Item时的死循环报错 2024-11-11 17:23:44 +08:00
6ae02a4b2b 为二级UI增加左方向键返回功能,修复Room列表初始时的位置错误 2024-11-11 17:11:15 +08:00
ALIENJACK\alien
45539f3b92 为二级UI增加左方向键返回功能,修复Room列表初始时的位置错误 2024-11-11 17:11:15 +08:00
2dfbf98340 frame test 2024-11-11 16:39:41 +08:00
73f1f858fd frame test 2024-11-11 16:39:41 +08:00
6ab27375ac fix 2024-11-11 16:31:19 +08:00
abd61b4da1 fix 2024-11-11 16:31:19 +08:00
c6e71ac282 log 2024-11-11 16:12:54 +08:00
d0d5655681 log 2024-11-11 16:12:54 +08:00
f40690eee1 netreplay 2024-11-11 15:40:21 +08:00
a4f8a382ac netreplay 2024-11-11 15:40:21 +08:00
ab8a4bf7bc NetReplay 2024-11-11 13:58:27 +08:00
ea2e63cb58 NetReplay 2024-11-11 13:58:27 +08:00
42b583a1f6 recvInput 2024-11-11 11:39:38 +08:00
960aad4831 recvInput 2024-11-11 11:39:38 +08:00
c776b73cf8 Merge pull request '修复bug' (#48) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#48
2024-11-11 11:06:46 +08:00
4606a57157 Merge pull request '修复bug' (#48) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#48
2024-11-11 11:06:46 +08:00
01d0d7bace 修复bug 2024-11-11 10:48:30 +08:00
ALIENJACK\alien
9c4d57bdef 修复bug 2024-11-11 10:48:30 +08:00
8b37fe3a9e Merge pull request '修复bug' (#47) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#47
2024-11-11 10:10:39 +08:00
6ad26bba8e Merge pull request '修复bug' (#47) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#47
2024-11-11 10:10:39 +08:00
0d3e55f620 修复bug 2024-11-11 10:09:11 +08:00
ALIENJACK\alien
a18d52e0c7 修复bug 2024-11-11 10:09:11 +08:00
9563b60e25 Merge pull request 'master' (#46) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#46
2024-11-11 09:34:24 +08:00
5bd858e1a5 Merge pull request 'master' (#46) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#46
2024-11-11 09:34:24 +08:00
98fea5e87e Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 09:32:30 +08:00
ALIENJACK\alien
eefde2e9b6 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-11 09:32:30 +08:00
1a2a0c1a88 移除debug代码 2024-11-11 09:32:13 +08:00
ALIENJACK\alien
87d954bb71 移除debug代码 2024-11-11 09:32:13 +08:00
f0962a97e9 Merge pull request 'master' (#45) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#45
2024-11-08 17:18:01 +08:00
a09e2e86ab Merge pull request 'master' (#45) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#45
2024-11-08 17:18:01 +08:00
124b72ee82 修复bug 2024-11-08 16:23:26 +08:00
ALIENJACK\alien
357936866d 修复bug 2024-11-08 16:23:26 +08:00
1d832edf6f Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-08 16:23:10 +08:00
ALIENJACK\alien
4bba088077 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-08 16:23:10 +08:00
027fcbea53 shader参数开放 2024-11-08 14:56:33 +08:00
ALIENJACK\alien
9ff8879c9c shader参数开放 2024-11-08 14:56:33 +08:00
04d7bd51ee Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-08 13:53:18 +08:00
469031dabc Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-08 13:53:18 +08:00
1b2f63f263 room 2024-11-08 13:53:13 +08:00
1c0094d836 room 2024-11-08 13:53:13 +08:00
22c501bf0a Merge pull request 'master' (#44) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#44
2024-11-08 13:49:32 +08:00
c498ea7967 Merge pull request 'master' (#44) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#44
2024-11-08 13:49:32 +08:00
12421d4de1 修复联机流程bug 2024-11-08 13:48:53 +08:00
ALIENJACK\alien
d87d2da55a 修复联机流程bug 2024-11-08 13:48:53 +08:00
b0c44c154d 事件异常日志优化,XMBshader优化 2024-11-08 12:01:16 +08:00
ALIENJACK\alien
1f8f5c2773 事件异常日志优化,XMBshader优化 2024-11-08 12:01:16 +08:00
184e598259 Merge pull request '完善一些网络状态判断' (#43) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#43
2024-11-08 11:51:30 +08:00
7971b4a4ba Merge pull request '完善一些网络状态判断' (#43) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#43
2024-11-08 11:51:30 +08:00
f56b0fb684 完善一些网络状态判断 2024-11-08 11:49:33 +08:00
ALIENJACK\alien
6c8e2133ca 完善一些网络状态判断 2024-11-08 11:49:33 +08:00
f41e2e2ad5 Merge pull request '修复bug' (#42) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#42
2024-11-08 11:39:21 +08:00
0323836ed2 Merge pull request '修复bug' (#42) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#42
2024-11-08 11:39:21 +08:00
6b644fd6da 修复bug 2024-11-08 11:38:32 +08:00
ALIENJACK\alien
5f74e2892e 修复bug 2024-11-08 11:38:32 +08:00
2814c783d8 Merge pull request 'master' (#41) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#41
2024-11-08 11:34:30 +08:00
5863a6798f Merge pull request 'master' (#41) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#41
2024-11-08 11:34:30 +08:00
5e64ba8beb 进入房间相关代码流程实现 2024-11-08 11:31:12 +08:00
ALIENJACK\alien
814cc5ed5e 进入房间相关代码流程实现 2024-11-08 11:31:12 +08:00
325a1d0cdf Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-08 10:03:17 +08:00
ALIENJACK\alien
46a62ca9f7 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-11-08 10:03:17 +08:00
cb309e4ab0 test flag 2024-11-08 10:00:57 +08:00
43a7cca091 test flag 2024-11-08 10:00:57 +08:00
2bec46bed4 fix 2024-11-08 09:59:35 +08:00
1fa61bb5a0 fix 2024-11-08 09:59:35 +08:00
1184baf3a0 完善房间 2024-11-08 09:41:09 +08:00
eb73b30732 完善房间 2024-11-08 09:41:09 +08:00
f4876af218 迭代 2024-11-07 20:33:44 +08:00
ALIENJACK\alien
323f7a44df 迭代 2024-11-07 20:33:44 +08:00
3e4ed10fbc 迭代 2024-11-07 20:20:53 +08:00
ALIENJACK\alien
7b85fd8ce8 迭代 2024-11-07 20:20:53 +08:00
189e963f8f Merge pull request 'master' (#40) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#40
2024-11-07 19:42:12 +08:00
1c589ac3be Merge pull request 'master' (#40) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#40
2024-11-07 19:42:12 +08:00
88db341f9d 房间列表事件监听 2024-11-07 19:38:48 +08:00
ALIENJACK\alien
12716c77c8 房间列表事件监听 2024-11-07 19:38:48 +08:00
e3c9ac625c Room列表迭代 2024-11-07 19:23:59 +08:00
ALIENJACK\alien
dfee4fa002 Room列表迭代 2024-11-07 19:23:59 +08:00
9c168a5e29 房间列表获取,调用实装 2024-11-07 19:18:50 +08:00
ALIENJACK\alien
9f732c7719 房间列表获取,调用实装 2024-11-07 19:18:50 +08:00
0da54a5f22 IEmuCore接口增加获取gameObject的方法,完善游戏中和UI操作的操作集切换功能 2024-11-07 17:58:20 +08:00
ALIENJACK\alien
88313eee6b IEmuCore接口增加获取gameObject的方法,完善游戏中和UI操作的操作集切换功能 2024-11-07 17:58:20 +08:00
85580ee9e6 Merge pull request 'master' (#39) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#39
2024-09-24 18:01:58 +08:00
b66df94086 Merge pull request 'master' (#39) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#39
2024-09-24 18:01:58 +08:00
3586928f24 NesGamingScheme实现 2024-09-23 18:31:05 +08:00
ALIENJACK\alien
ad021664db NesGamingScheme实现 2024-09-23 18:31:05 +08:00
e84fb891ee Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandDispatcher.cs
2024-09-23 18:16:03 +08:00
ALIENJACK\alien
d5be477dd8 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandDispatcher.cs
2024-09-23 18:16:03 +08:00
262c7218df 抽象EmuCore和键位集 2024-09-23 18:15:34 +08:00
ALIENJACK\alien
7eac4e7586 抽象EmuCore和键位集 2024-09-23 18:15:34 +08:00
2e19107cd1 PSVitaKey 2024-09-23 13:21:51 +08:00
def785b3a3 PSVitaKey 2024-09-23 13:21:51 +08:00
3fb7a02644 room mgr fix 2024-09-20 18:27:13 +08:00
23db5358fb room mgr fix 2024-09-20 18:27:13 +08:00
fa9fcedfa4 RemoteRoms文件夹中的Rom文件现在会和服务器提供的hash进行比较,以确定该文件是否合法,不合法会被移除 2024-09-20 17:16:30 +08:00
ALIENJACK\alien
e1fb708d6e RemoteRoms文件夹中的Rom文件现在会和服务器提供的hash进行比较,以确定该文件是否合法,不合法会被移除 2024-09-20 17:16:30 +08:00
a5c0523634 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-20 17:10:44 +08:00
ALIENJACK\alien
abc68f68c3 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-20 17:10:44 +08:00
57ef02de51 稍微重构,以支持加载用户自己提供的Rom文件 2024-09-20 17:10:32 +08:00
ALIENJACK\alien
c47b241e42 稍微重构,以支持加载用户自己提供的Rom文件 2024-09-20 17:10:32 +08:00
8096fef072 hash | PSVita dir 2024-09-20 17:10:18 +08:00
2b051b7a27 hash | PSVita dir 2024-09-20 17:10:18 +08:00
5d5705c01b Room列表菜单添加 2024-09-18 15:53:58 +08:00
ALIENJACK\alien
f4adf4e20f Room列表菜单添加 2024-09-18 15:53:58 +08:00
ad0a341b5d 单个rom 信息查询 webapi 2024-09-18 12:54:13 +08:00
68f121df60 单个rom 信息查询 webapi 2024-09-18 12:54:13 +08:00
c37b31e512 Merge pull request 'master' (#38) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#38
2024-09-18 11:56:41 +08:00
68f19925d6 Merge pull request 'master' (#38) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#38
2024-09-18 11:56:41 +08:00
a84560d278 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-18 11:52:02 +08:00
ALIENJACK\alien
1df264be3b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-18 11:52:02 +08:00
a2df6d641d 是否画面提供者 2024-09-18 11:37:43 +08:00
46fdfee412 是否画面提供者 2024-09-18 11:37:43 +08:00
b82950245b 离开房间 2024-09-18 11:35:53 +08:00
8d432ddcd4 离开房间 2024-09-18 11:35:53 +08:00
fc54b480c7 主界面菜单尺寸调整 2024-09-18 10:58:38 +08:00
ALIENJACK\alien
1899fcdcd9 主界面菜单尺寸调整 2024-09-18 10:58:38 +08:00
d385366230 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-18 10:45:07 +08:00
ALIENJACK\alien
11739c11c5 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-18 10:45:07 +08:00
f3b1d27ae5 png 2024-09-18 10:44:41 +08:00
935518a2e1 png 2024-09-18 10:44:41 +08:00
ce8dfe1eb4 获取单个房间画面快照 2024-09-18 10:21:06 +08:00
1e32a111b5 获取单个房间画面快照 2024-09-18 10:21:06 +08:00
e77fa49631 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-18 10:02:35 +08:00
ALIENJACK\alien
181ce9a420 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-18 10:02:35 +08:00
201a881bcf Room 列表 2024-09-18 10:01:54 +08:00
1d283f5d20 Room 列表 2024-09-18 10:01:54 +08:00
c9c3a6bb4d .. 2024-09-14 18:13:46 +08:00
e438fd6b29 .. 2024-09-14 18:13:46 +08:00
1e94597bac merge 2024-09-14 17:50:39 +08:00
5347a81356 merge 2024-09-14 17:50:39 +08:00
55dc741aef netinput 2024-09-14 17:43:08 +08:00
bb93b43ba8 netinput 2024-09-14 17:43:08 +08:00
55936ead92 修bug 2024-09-14 17:40:01 +08:00
ALIENJACK\alien
6e34b02c29 修bug 2024-09-14 17:40:01 +08:00
8b7dc0f7ce Merge pull request 'master' (#37) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#37
2024-09-14 17:38:09 +08:00
7aa07500b2 Merge pull request 'master' (#37) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#37
2024-09-14 17:38:09 +08:00
fd0ac158cb 联网代码上传 2024-09-14 17:22:01 +08:00
ALIENJACK\alien
0babeed270 联网代码上传 2024-09-14 17:22:01 +08:00
b31dce5c6b 进入房间create rom 2024-09-14 15:56:15 +08:00
ALIENJACK\alien
fa8c642a69 进入房间create rom 2024-09-14 15:56:15 +08:00
70fcef886f 修改Nes进入游戏流程 2024-09-14 15:32:29 +08:00
ALIENJACK\alien
3aa6f7a951 修改Nes进入游戏流程 2024-09-14 15:32:29 +08:00
ee01724738 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-14 09:47:00 +08:00
ALIENJACK\alien
2771e887e1 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-14 09:47:00 +08:00
ad0959392d 快照机制完善 2024-09-14 09:46:49 +08:00
ALIENJACK\alien
dc16d85ae9 快照机制完善 2024-09-14 09:46:49 +08:00
2aa673ae88 房间逻辑推进 2024-09-13 18:07:27 +08:00
e0d6e0542d 房间逻辑推进 2024-09-13 18:07:27 +08:00
af25067081 Merge pull request 'master' (#36) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#36
2024-09-13 18:05:29 +08:00
3ca7b6a0c7 Merge pull request 'master' (#36) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#36
2024-09-13 18:05:29 +08:00
d87a07ea18 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-13 18:04:09 +08:00
ALIENJACK\alien
16b3d92ca9 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-13 18:04:09 +08:00
d4813b22a1 删除多余 2024-09-13 18:02:38 +08:00
ALIENJACK\alien
7834ae0d82 删除多余 2024-09-13 18:02:38 +08:00
14adef08ec 实现NesCore LoadState和SaveState 2024-09-13 17:39:48 +08:00
ALIENJACK\alien
12c02781a0 实现NesCore LoadState和SaveState 2024-09-13 17:39:48 +08:00
87019d7760 场景 2024-09-13 16:44:33 +08:00
01c3aff056 场景 2024-09-13 16:44:33 +08:00
4c399f7505 电量 2024-09-13 16:26:26 +08:00
2fe789686a 电量 2024-09-13 16:26:26 +08:00
f3382367cd 优化shader性能 2024-09-13 14:24:18 +08:00
ALIENJACK\alien
fea833734d 优化shader性能 2024-09-13 14:24:18 +08:00
6a869987c0 XMB背景shader移除自己声明的lerp方法,使用系统lerp方法 2024-09-13 13:57:02 +08:00
ALIENJACK\alien
e4bbc5eee1 XMB背景shader移除自己声明的lerp方法,使用系统lerp方法 2024-09-13 13:57:02 +08:00
338830ca96 fixed netreplay 2024-09-13 13:52:37 +08:00
3eb8059389 fixed netreplay 2024-09-13 13:52:37 +08:00
a33f3f2a10 远端差异帧 2024-09-13 13:46:04 +08:00
42b3a7995c 远端差异帧 2024-09-13 13:46:04 +08:00
dc8a794ad8 服务器当前帧 2024-09-13 13:41:04 +08:00
841fff9be2 服务器当前帧 2024-09-13 13:41:04 +08:00
0ce38b037a Merge pull request 'master' (#35) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#35
2024-09-13 13:30:20 +08:00
3927b897a2 Merge pull request 'master' (#35) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#35
2024-09-13 13:30:20 +08:00
e2616fdea0 添加游戏内UI,以及呼出侧边菜单栏的功能 2024-09-13 13:28:33 +08:00
ALIENJACK\alien
e9099ea49a 添加游戏内UI,以及呼出侧边菜单栏的功能 2024-09-13 13:28:33 +08:00
076efd01dc 侧边栏菜单迭代 2024-09-13 10:28:02 +08:00
ALIENJACK\alien
233e38e921 侧边栏菜单迭代 2024-09-13 10:28:02 +08:00
68ccd15ac1 服务端逻辑修改 2024-09-13 10:10:14 +08:00
d567cd9e71 服务端逻辑修改 2024-09-13 10:10:14 +08:00
8d8d7e3264 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-13 10:08:02 +08:00
5b8ed639f3 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-13 10:08:02 +08:00
942ed2b2ac 新增ping 2024-09-13 10:07:24 +08:00
a4caf1d3ad 新增ping 2024-09-13 10:07:24 +08:00
63cf91180f Merge pull request 'master' (#34) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#34
2024-09-13 10:05:03 +08:00
c27b8d514c Merge pull request 'master' (#34) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#34
2024-09-13 10:05:03 +08:00
16eeac3c17 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-12 17:48:07 +08:00
ALIENJACK\alien
b2d22a503d Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-12 17:48:07 +08:00
30c15fc890 删一下命名空间 2024-09-12 17:47:55 +08:00
ALIENJACK\alien
ec8f01065b 删一下命名空间 2024-09-12 17:47:55 +08:00
b54ee68afd UI迭代 2024-09-12 17:47:05 +08:00
ALIENJACK\alien
7209b52c93 UI迭代 2024-09-12 17:47:05 +08:00
0f5ce00fe2 UI调整,事件派发机制抽象结构调整 2024-09-12 16:20:11 +08:00
ALIENJACK\alien
040c23e001 UI调整,事件派发机制抽象结构调整 2024-09-12 16:20:11 +08:00
7af1511042 目录结构调整 2024-09-12 15:10:48 +08:00
ALIENJACK\alien
f8fc518a44 目录结构调整 2024-09-12 15:10:48 +08:00
69a71605be 重构UI菜单继承结构 2024-09-12 15:08:48 +08:00
ALIENJACK\alien
7d7b864c1b 重构UI菜单继承结构 2024-09-12 15:08:48 +08:00
7a60ea0d34 WebApi 检查版本和获取服务器IP 2024-09-12 14:35:44 +08:00
9fcd5d3c3e WebApi 检查版本和获取服务器IP 2024-09-12 14:35:44 +08:00
4d14b16f05 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-12 13:43:07 +08:00
ALIENJACK\alien
d2f48a56e7 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-12 13:43:07 +08:00
8dd490a685 OptionUI迭代 2024-09-12 13:42:57 +08:00
ALIENJACK\alien
d38a653280 OptionUI迭代 2024-09-12 13:42:57 +08:00
a8153a191b Server合并画面同步到RoomMgr 2024-09-12 13:42:24 +08:00
299d825f4a Server合并画面同步到RoomMgr 2024-09-12 13:42:24 +08:00
d48f9aa448 新增服务器P3 P4 | Protobuff | 顶部预制体 2024-09-12 13:41:19 +08:00
caaac4a202 新增服务器P3 P4 | Protobuff | 顶部预制体 2024-09-12 13:41:19 +08:00
7305abd8b2 Game_NES 改名RomListMenuItem 更通用 2024-09-12 11:34:32 +08:00
ALIENJACK\alien
e6dd0ec952 Game_NES 改名RomListMenuItem 更通用 2024-09-12 11:34:32 +08:00
091d8ae2de 调整主场景结构 2024-09-12 11:19:40 +08:00
ALIENJACK\alien
e90d74e63c 调整主场景结构 2024-09-12 11:19:40 +08:00
9ca023320d 修复UI表现 2024-09-12 11:02:30 +08:00
ALIENJACK\alien
86ec353733 修复UI表现 2024-09-12 11:02:30 +08:00
0278789fd8 Merge pull request '重构一下' (#33) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#33
2024-09-11 18:32:23 +08:00
8e61551d3d Merge pull request '重构一下' (#33) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#33
2024-09-11 18:32:23 +08:00
183709d5a6 重构一下 2024-09-11 18:31:25 +08:00
ALIENJACK\alien
828e87c3d0 重构一下 2024-09-11 18:31:25 +08:00
e0e66b3936 Merge pull request 'master' (#32) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#32
2024-09-11 18:12:50 +08:00
bf028d6302 Merge pull request 'master' (#32) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#32
2024-09-11 18:12:50 +08:00
7bd80130f8 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Plugins/Demigiant/DOTween/DOTween.dll.meta
2024-09-11 18:12:08 +08:00
ALIENJACK\alien
95bcf0e5bf Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Plugins/Demigiant/DOTween/DOTween.dll.meta
2024-09-11 18:12:08 +08:00
0e9f3a1ae2 dotween dll 提交 2024-09-11 18:11:23 +08:00
ALIENJACK\alien
8dea4ccee1 dotween dll 提交 2024-09-11 18:11:23 +08:00
bd45825bf5 完成基础房间逻辑封装 | NetRePlay 2024-09-11 18:10:47 +08:00
9e427d1532 完成基础房间逻辑封装 | NetRePlay 2024-09-11 18:10:47 +08:00
c8f5dfddda 增加了移除Cache和Rom文件的api 2024-09-11 16:48:23 +08:00
ALIENJACK\alien
c3804940a9 增加了移除Cache和Rom文件的api 2024-09-11 16:48:23 +08:00
e2b404f91b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-11 16:34:01 +08:00
ALIENJACK\alien
f36ec11af8 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-09-11 16:34:01 +08:00
0f03758ebe UI迭代 2024-09-11 16:33:48 +08:00
ALIENJACK\alien
c0585283a7 UI迭代 2024-09-11 16:33:48 +08:00
3996ac86ab 补充Mapper from VirtuaNESex 2024-09-11 16:04:55 +08:00
a66835c091 补充Mapper from VirtuaNESex 2024-09-11 16:04:55 +08:00
998773cde2 dotween dll meta 2024-09-04 11:39:22 +08:00
ALIENJACK\alien
8f23ef3b19 dotween dll meta 2024-09-04 11:39:22 +08:00
ab2b29df60 Merge pull request 'master' (#31) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#31
2024-08-30 18:18:44 +08:00
2510b2b7e3 Merge pull request 'master' (#31) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#31
2024-08-30 18:18:44 +08:00
aa37dcb006 修复Rom列表,对象池复用,状态未回转的bug 2024-08-30 16:28:05 +08:00
ALIENJACK\alien
9c80ed0a26 修复Rom列表,对象池复用,状态未回转的bug 2024-08-30 16:28:05 +08:00
dba72e1fd4 UI迭代 2024-08-30 16:23:27 +08:00
ALIENJACK\alien
96d0df5348 UI迭代 2024-08-30 16:23:27 +08:00
80fdb2dbba Ui迭代 2024-08-29 18:31:36 +08:00
ALIENJACK\alien
fc94396dfa Ui迭代 2024-08-29 18:31:36 +08:00
f41bc6ed24 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-29 17:31:07 +08:00
ALIENJACK\alien
5064465c2a Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-29 17:31:07 +08:00
1dcb8e5122 补充State 2024-08-29 17:30:56 +08:00
ALIENJACK\alien
273015f95b 补充State 2024-08-29 17:30:56 +08:00
783df7901e NEScore StateSave机制 实现 2024-08-29 17:20:01 +08:00
ALIENJACK\alien
5ce82c9406 NEScore StateSave机制 实现 2024-08-29 17:20:01 +08:00
ccf9361a48 补充Mapper 即时存档代码 | EEROM代码补充实现 2024-08-28 17:38:01 +08:00
6a5393d9bc 补充Mapper 即时存档代码 | EEROM代码补充实现 2024-08-28 17:38:01 +08:00
b5913d3f8e UI 迭代 2024-08-22 17:25:00 +08:00
ALIENJACK\alien
2f5b5d9841 UI 迭代 2024-08-22 17:25:00 +08:00
f0d02ee95b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-22 15:17:15 +08:00
ALIENJACK\alien
4ca885d9fc Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-22 15:17:15 +08:00
33287ffa34 UI迭代 2024-08-22 15:16:58 +08:00
ALIENJACK\alien
0290ebbd06 UI迭代 2024-08-22 15:16:58 +08:00
43842b7ee6 Merge pull request 'master' (#30) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#30
2024-08-22 14:26:10 +08:00
94d03a3b04 Merge pull request 'master' (#30) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#30
2024-08-22 14:26:10 +08:00
d4d6902f02 web Api 2024-08-22 14:24:11 +08:00
6a9ce55af8 web Api 2024-08-22 14:24:11 +08:00
781b1d615b 服务器房间准备流程,即时存档,准备,帧提前,等逻辑 基本编写 2024-08-21 17:59:55 +08:00
aef3d2045b 服务器房间准备流程,即时存档,准备,帧提前,等逻辑 基本编写 2024-08-21 17:59:55 +08:00
9045e7e458 UI 迭代 2024-08-21 16:28:23 +08:00
ALIENJACK\alien
71b4bdef6b UI 迭代 2024-08-21 16:28:23 +08:00
f273353cb0 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-21 13:02:14 +08:00
ALIENJACK\alien
4e5fa23425 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-21 13:02:14 +08:00
2e23e44e1b 服务器逻辑帧驱动实现,房间protobuf定义 2024-08-21 11:04:53 +08:00
a13669dc57 服务器逻辑帧驱动实现,房间protobuf定义 2024-08-21 11:04:53 +08:00
e49498c7f0 XMB Shader! 2024-08-16 18:19:12 +08:00
ALIENJACK\alien
3c16932e0f XMB Shader! 2024-08-16 18:19:12 +08:00
1e3fd32608 XBM迭代 2024-08-16 17:26:28 +08:00
ALIENJACK\alien
2a18dc593a XBM迭代 2024-08-16 17:26:28 +08:00
67902e9adf 调整目录结构
XMB UI控件迭代
2024-08-16 14:45:44 +08:00
ALIENJACK\alien
41e415dc46 调整目录结构
XMB UI控件迭代
2024-08-16 14:45:44 +08:00
58d5990a6a XMB 主菜单Item选中动画实现 2024-08-16 10:53:43 +08:00
ALIENJACK\alien
5467ecb012 XMB 主菜单Item选中动画实现 2024-08-16 10:53:43 +08:00
3ff506ce62 Fix texture channel for psvita 2024-08-16 10:39:51 +08:00
c30df0b284 Fix texture channel for psvita 2024-08-16 10:39:51 +08:00
f155a29ff5 统一入口管理PersistentDataPath目录 2024-08-16 10:36:00 +08:00
ALIENJACK\alien
bb9ddfb22c 统一入口管理PersistentDataPath目录 2024-08-16 10:36:00 +08:00
6eb32d2a02 Rom从RomLib读取后,一些Rom信息获取入口的善后工作 2024-08-16 10:29:51 +08:00
ALIENJACK\alien
72a1b76ba0 Rom从RomLib读取后,一些Rom信息获取入口的善后工作 2024-08-16 10:29:51 +08:00
57cb91262b Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-16 10:25:09 +08:00
ALIENJACK\alien
417bc25fe4 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-16 10:25:09 +08:00
a49e269367 引入Dotween插件
实现XMB主菜单效果
2024-08-16 10:24:40 +08:00
ALIENJACK\alien
b1da41756a 引入Dotween插件
实现XMB主菜单效果
2024-08-16 10:24:40 +08:00
289c95ace4 考虑PSV Unity低版本 修改代码 2024-08-16 10:20:00 +08:00
2d701d414d 考虑PSV Unity低版本 修改代码 2024-08-16 10:20:00 +08:00
b23d166559 fixed web api 2024-08-16 10:09:45 +08:00
b9efbbf1d2 fixed web api 2024-08-16 10:09:45 +08:00
16fb36e6d5 移除meta 2024-08-15 16:10:16 +08:00
ALIENJACK\alien
4d3ddcf4a6 移除meta 2024-08-15 16:10:16 +08:00
b4f41790c2 移除AlienUI Core 子模块 弃坑了 2024-08-15 16:09:35 +08:00
ALIENJACK\alien
d8095eaa84 移除AlienUI Core 子模块 弃坑了 2024-08-15 16:09:35 +08:00
95e1138a45 优化内存拷贝耗时 2024-08-15 11:07:54 +08:00
ALIENJACK\alien
7191f27cb0 优化内存拷贝耗时 2024-08-15 11:07:54 +08:00
360812e3fd 优化数组拷贝的性能 2024-08-15 10:33:29 +08:00
ALIENJACK\alien
c7445147b4 优化数组拷贝的性能 2024-08-15 10:33:29 +08:00
5259755402 包管理器增加了EditorCoroutine包 2024-08-14 16:46:57 +08:00
ALIENJACK\alien
8f683b0c3c 包管理器增加了EditorCoroutine包 2024-08-14 16:46:57 +08:00
2e26231961 Merge pull request 'master' (#29) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#29
2024-08-14 15:59:07 +08:00
1a1e5026f8 Merge pull request 'master' (#29) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#29
2024-08-14 15:59:07 +08:00
a948299b8c 引入AlienUICore作为子模块,用于以后制作UI 2024-08-14 15:24:37 +08:00
ALIENJACK\alien
0d609a0c06 引入AlienUICore作为子模块,用于以后制作UI 2024-08-14 15:24:37 +08:00
a58fda917f url解码 2024-08-14 13:20:52 +08:00
ALIENJACK\alien
2e67b7ccd9 url解码 2024-08-14 13:20:52 +08:00
935addd029 支持Http Rom仓库下载 2024-08-14 13:09:22 +08:00
ALIENJACK\alien
360ea2f579 支持Http Rom仓库下载 2024-08-14 13:09:22 +08:00
a28589c79b api 2024-08-14 10:36:59 +08:00
0eccfd3e6d api 2024-08-14 10:36:59 +08:00
ad4c015b04 shader修改 2024-08-14 09:42:47 +08:00
ALIENJACK\alien
62377ab9d4 shader修改 2024-08-14 09:42:47 +08:00
71b4d857d4 Rom下载系统 2024-08-13 18:35:20 +08:00
ALIENJACK\alien
fe6c427603 Rom下载系统 2024-08-13 18:35:20 +08:00
485de31de0 完成APU_FME7 2024-08-13 17:24:42 +08:00
ALIENJACK\alien
209c31fd72 完成APU_FME7 2024-08-13 17:24:42 +08:00
58a5a0d374 Merge pull request 'virtuaNES core 产生的屏幕数据现在使用Shader进行转换' (#28) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#28
2024-08-09 15:48:54 +08:00
680a8d4eee Merge pull request 'virtuaNES core 产生的屏幕数据现在使用Shader进行转换' (#28) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#28
2024-08-09 15:48:54 +08:00
08e4491199 virtuaNES core 产生的屏幕数据现在使用Shader进行转换 2024-08-09 15:47:44 +08:00
ALIENJACK\alien
4da4a243cb virtuaNES core 产生的屏幕数据现在使用Shader进行转换 2024-08-09 15:47:44 +08:00
1e7daca7f4 Merge pull request 'master' (#27) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#27
2024-08-08 10:00:59 +08:00
73e3a744ae Merge pull request 'master' (#27) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#27
2024-08-08 10:00:59 +08:00
63da551222 实现APU_N106 2024-08-07 18:31:11 +08:00
ALIENJACK\alien
70b6014fdb 实现APU_N106 2024-08-07 18:31:11 +08:00
24e79329d0 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	References/virtuanessrc097-master/NES/ApuEX/emu2413/emu2413.c
#	References/virtuanessrc097-master/NES/ApuEX/emu2413/emu2413.h
2024-08-07 17:55:52 +08:00
ALIENJACK\alien
b812a854aa Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline
# Conflicts:
#	References/virtuanessrc097-master/NES/ApuEX/emu2413/emu2413.c
#	References/virtuanessrc097-master/NES/ApuEX/emu2413/emu2413.h
2024-08-07 17:55:52 +08:00
ee21142f03 Emu2413 库实现 2024-08-07 17:45:38 +08:00
ALIENJACK\alien
8bbe264f24 Emu2413 库实现 2024-08-07 17:45:38 +08:00
8dc2afa1c8 References 2024-08-07 12:07:20 +08:00
1e914679bb References 2024-08-07 12:07:20 +08:00
8b03687775 md 2024-08-07 11:32:03 +08:00
06647adda3 md 2024-08-07 11:32:03 +08:00
c027ed7268 APU_MMC5移植完成,nes20db.xml移到工程根目录,避免打包 2024-08-07 11:30:18 +08:00
ALIENJACK\alien
d668f7d8df APU_MMC5移植完成,nes20db.xml移到工程根目录,避免打包 2024-08-07 11:30:18 +08:00
a80a2bf8e3 fixed 2024-08-07 11:23:39 +08:00
46946d4430 fixed 2024-08-07 11:23:39 +08:00
a01b5a4da7 fixed 2024-08-07 11:23:06 +08:00
8af94c51f8 fixed 2024-08-07 11:23:06 +08:00
49de4d5b2c 归档一次 2024-08-07 11:21:10 +08:00
913ba1a791 归档一次 2024-08-07 11:21:10 +08:00
f62edb1768 Merge pull request 'master' (#26) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#26
2024-08-07 11:19:45 +08:00
20f28469b2 Merge pull request 'master' (#26) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#26
2024-08-07 11:19:45 +08:00
1bb5ce1136 APU补全中 2024-08-06 19:50:33 +08:00
ALIENJACK\alien
8952b842b1 APU补全中 2024-08-06 19:50:33 +08:00
35caeaa14a 键位配置持久化 2024-08-06 18:52:11 +08:00
ALIENJACK\alien
b8c116aa28 键位配置持久化 2024-08-06 18:52:11 +08:00
21823f9686 实现输入 2024-08-06 18:09:32 +08:00
ALIENJACK\alien
580de2d245 实现输入 2024-08-06 18:09:32 +08:00
703cdde73f readme 2024-08-06 17:52:29 +08:00
ed93542f48 readme 2024-08-06 17:52:29 +08:00
026eeab2be Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-06 17:50:54 +08:00
82e0275b5e Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-08-06 17:50:54 +08:00
80a4440a1a merge 2024-08-06 17:50:51 +08:00
2eb1cf1e97 merge 2024-08-06 17:50:51 +08:00
f35e8ffab4 changed 163 175 176 178 192 2024-08-06 17:49:14 +08:00
44311f075b changed 163 175 176 178 192 2024-08-06 17:49:14 +08:00
900436c608 优化音频读取方式 2024-08-06 16:03:17 +08:00
ALIENJACK\alien
aad4c1775a 优化音频读取方式 2024-08-06 16:03:17 +08:00
a07df6d35b 添加忽略,添加PatternViewer的性能開關,当ROMDB转换了一个Mapper时,写日志 2024-08-06 14:24:55 +08:00
ALIENJACK\alien
66f0cc5bd7 添加忽略,添加PatternViewer的性能開關,当ROMDB转换了一个Mapper时,写日志 2024-08-06 14:24:55 +08:00
21e9243dd8 ROMDB提交,Mapper修復 2024-08-06 13:49:24 +08:00
ALIENJACK\alien
e4da00136d ROMDB提交,Mapper修復 2024-08-06 13:49:24 +08:00
2b995c48b5 Merge pull request '移除RenderTexutre,调整Resources和StreamAssets目录结构,加上"NES"父目录,以区分不同模拟器,加入ROMDB机制,修改ROM Mapper信息' (#25) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#25
2024-08-05 23:27:30 +08:00
c7f32874ae Merge pull request '移除RenderTexutre,调整Resources和StreamAssets目录结构,加上"NES"父目录,以区分不同模拟器,加入ROMDB机制,修改ROM Mapper信息' (#25) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#25
2024-08-05 23:27:30 +08:00
afc4f47263 fixed 2024-08-05 23:25:40 +08:00
16adace210 fixed 2024-08-05 23:25:40 +08:00
4ae4fbdc07 addon 2024-08-05 23:19:00 +08:00
250b230914 addon 2024-08-05 23:19:00 +08:00
7313a5e93c transfer Mapper 000~015 2024-08-05 23:16:39 +08:00
bb42d3f3bd transfer Mapper 000~015 2024-08-05 23:16:39 +08:00
250b533d46 移除RenderTexutre,调整Resources和StreamAssets目录结构,加上"NES"父目录,以区分不同模拟器,加入ROMDB机制,修改ROM Mapper信息 2024-08-05 18:42:58 +08:00
ALIENJACK\alien
e27c970d45 移除RenderTexutre,调整Resources和StreamAssets目录结构,加上"NES"父目录,以区分不同模拟器,加入ROMDB机制,修改ROM Mapper信息 2024-08-05 18:42:58 +08:00
c079ef5569 Merge pull request 'dev_4VirtualNes' (#24) from dev_4VirtualNes into master
Reviewed-on: sin365/AxibugEmuOnline#24
2024-08-05 18:01:41 +08:00
ba1ac5d5c2 Merge pull request 'dev_4VirtualNes' (#24) from dev_4VirtualNes into master
Reviewed-on: sin365/AxibugEmuOnline#24
2024-08-05 18:01:41 +08:00
3b5b5fe158 Merge branch 'dev_4VirtualNes' of http://git.axibug.com/sin365/AxibugEmuOnline into dev_4VirtualNes 2024-08-05 17:59:57 +08:00
dc5f55c003 Merge branch 'dev_4VirtualNes' of http://git.axibug.com/sin365/AxibugEmuOnline into dev_4VirtualNes 2024-08-05 17:59:57 +08:00
aa08afa3c7 readme + references 2024-08-05 17:58:53 +08:00
8b39e9aa02 readme + references 2024-08-05 17:58:53 +08:00
300213057e Merge pull request 'dev_4VirtualNes' (#23) from dev_4VirtualNes into master
Reviewed-on: sin365/AxibugEmuOnline#23
2024-08-05 17:49:41 +08:00
e4b2d67d5e Merge pull request 'dev_4VirtualNes' (#23) from dev_4VirtualNes into master
Reviewed-on: sin365/AxibugEmuOnline#23
2024-08-05 17:49:41 +08:00
a08596b6f3 Merge pull request 'Mapper199修改' (#22) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#22
2024-08-05 17:47:46 +08:00
5189cf0053 Merge pull request 'Mapper199修改' (#22) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#22
2024-08-05 17:47:46 +08:00
9175d27b4a Mapper199修改 2024-08-05 17:46:33 +08:00
52c4fca4d6 Merge pull request 'Mapper补全' (#21) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#21
2024-08-05 11:55:06 +08:00
08ef9ddfb9 Mapper补全 2024-08-05 11:52:43 +08:00
840c2d5662 Add Mapper Change case 2024-08-05 10:38:27 +08:00
38f197417b Addon Special Lost Mapper 35 111 2024-08-05 10:28:41 +08:00
4c7e5bd040 transfer 016-018 2024-08-05 01:44:13 +08:00
b91e3a0e65 transfer Mapper 18-43 2024-08-05 01:33:07 +08:00
a5ec002da9 transfer Mapper 43-68 2024-08-05 00:44:30 +08:00
a71d7656f8 transfer Mapper 69~85 2024-08-05 00:05:15 +08:00
80564aaf8d transfer Mapper 86~113 2024-08-04 23:37:02 +08:00
b375b6bed5 readme 2024-08-04 22:38:21 +08:00
c0ff26a134 Addon Special Lost Mapper 162,163,175,176,178,192,195,199,216 2024-08-04 22:31:39 +08:00
2884bc2a9e transfer Mapper114~164 2024-08-04 00:32:14 +08:00
ab27e5b535 transfer mapper 165-198 2024-08-03 23:15:19 +08:00
599e070a6b transfer Mapper 200-255.cs 2024-08-03 22:26:53 +08:00
b9f9ddf91f Merge pull request '优化模拟器提交过来的元素转换为Unity Texture2D数据的代码' (#20) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#20
2024-08-02 16:55:26 +08:00
74a3275915 音频 internal 翻译完毕 2024-08-02 16:50:16 +08:00
38f3bb36fc 优化模拟器提交过来的元素转换为Unity Texture2D数据的代码 2024-08-02 10:58:04 +08:00
cb30e36ad3 Merge pull request 'dev_4VirtualNes' (#19) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#19
2024-07-31 21:39:54 +08:00
043c0bb5fe 图像出现了 2024-07-31 17:40:32 +08:00
480db1b52b 123 2024-07-30 18:53:36 +08:00
938482c3bd 提交一个可以在vs2022中编译通过的virtuaNes cpp项目 2024-07-30 12:00:24 +08:00
1f317c1b00 迭代中 2024-07-30 11:57:09 +08:00
69b3a5e584 123 2024-07-29 09:25:19 +08:00
38c8fb7e50 Merge pull request 'dev_4VirtualNes' (#18) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#18
2024-07-27 00:57:58 +08:00
9863672a4a 迭代 2024-07-26 17:52:33 +08:00
9d343f2693 迭代 2024-07-25 18:34:52 +08:00
25e186e200 翻译中 2024-07-25 14:03:52 +08:00
9308b2545f 翻译中 2024-07-25 11:03:58 +08:00
ce40d0355a MyNes Standard2.0 核心归档 2024-07-24 15:03:33 +08:00
52f5dfa8d8 MyNes Standard2.0 核心归档 2024-07-24 15:03:33 +08:00
711f8ea2ff readme 2024-07-24 14:59:15 +08:00
e64a2943ff Merge pull request 'dev_4VirtualNes' (#17) from Alienjack/AxibugEmuOnline:dev_4VirtualNes into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#17
2024-07-24 14:51:31 +08:00
4e96b3bea2 翻译迭代中 2024-07-24 14:27:10 +08:00
bbb4ec82bc VirtuaNesCore翻译中 2024-07-23 18:31:59 +08:00
f9043951d5 Merge pull request 'master' (#15) from master into dev_4VirtualNes
Reviewed-on: sin365/AxibugEmuOnline#15
2024-07-22 14:23:56 +08:00
091d857b52 Merge pull request 'master' (#14) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#14
2024-07-22 14:23:05 +08:00
e714e996fe Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-07-22 13:10:00 +08:00
b843058eb8 Il2CppSetOptionAttribute 2024-07-22 13:09:42 +08:00
d7b8f13761 增加il2cppSetOption 2024-07-22 13:09:27 +08:00
f351d86a1e Merge pull request '123' (#13) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#13
2024-07-19 15:35:41 +08:00
6ba52f17fb 123 2024-07-19 15:17:26 +08:00
777bd31c44 Merge pull request 'master' (#12) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#12
2024-07-19 12:59:29 +08:00
c5cd6a3785 LoadGame接口提到AppEmu 2024-07-18 16:24:14 +08:00
e4af31a432 显示canvas 2024-07-18 15:35:14 +08:00
f81a3c6ade 移除多余代码 2024-07-18 15:31:15 +08:00
0b6f9bdc02 重构一下,让KeyMapper支持各种输入设备 2024-07-18 15:26:43 +08:00
e8565d3b13 控制器输入实现 2024-07-18 15:14:45 +08:00
d479edc24a 删除不要的代码 2024-07-18 13:59:42 +08:00
6c87338ec9 Merge pull request 'master' (#11) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#11
2024-07-17 14:33:17 +08:00
9538ca65b1 迭代 2024-07-17 13:18:45 +08:00
a91e116cad Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline 2024-07-17 12:50:34 +08:00
d66b02856e 核心模拟器做成prefab 2024-07-17 12:50:18 +08:00
644edec407 完美音效! 2024-07-17 12:43:43 +08:00
77a4e57f7b Merge pull request 'master' (#10) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#10
2024-07-16 18:00:05 +08:00
0f0346a63f gitignore setting 2024-07-16 17:51:00 +08:00
eac91e8173 android平台兼容性 2024-07-16 17:46:07 +08:00
4087aa5799 Merge pull request 'dev_basemynes' (#9) from dev_basemynes into master
Reviewed-on: sin365/AxibugEmuOnline#9
2024-07-16 16:33:39 +08:00
b057352fd0 Merge pull request 'dev_basemynes' (#8) from Alienjack/AxibugEmuOnline:dev_basemynes into dev_basemynes
Reviewed-on: sin365/AxibugEmuOnline#8
2024-07-16 16:32:27 +08:00
a471ef6de7 改到resources中读取rom 2024-07-16 16:30:20 +08:00
7a92d0d139 Merge branch 'dev_basemynes' of http://git.axibug.com/sin365/AxibugEmuOnline into dev_basemynes 2024-07-16 16:29:46 +08:00
d2d12e06d4 Merge branch 'dev_basemynes' of http://git.axibug.com/sin365/AxibugEmuOnline into dev_basemynes 2024-07-16 10:59:07 +08:00
3ca71bf78c nes游戏数据库 2024-07-16 10:59:01 +08:00
1e5b9515ba . 2024-07-15 16:48:11 +08:00
5a97440210 Merge pull request 'master' (#7) from master into dev_basemynes
Reviewed-on: sin365/AxibugEmuOnline#7
2024-07-15 16:44:23 +08:00
f111f60b59 readme 2024-07-15 16:41:43 +08:00
9234f7a0c7 Merge pull request 'readme' (#6) from dev_basemynes into master
Reviewed-on: sin365/AxibugEmuOnline#6
2024-07-15 16:37:47 +08:00
531519a271 .gitignore 2024-07-15 16:16:25 +08:00
4ad5e842ed Merge pull request 'dev_basemynes' (#5) from dev_basemynes into master
Reviewed-on: sin365/AxibugEmuOnline#5
2024-07-15 16:14:30 +08:00
ac3f78f8df 新增WebApi 2024-07-15 16:12:09 +08:00
7d21890ba4 webapi 2024-07-15 16:07:36 +08:00
31c378cfe6 优化音频流数据不够时的数据设置 2024-07-10 17:04:55 +08:00
e91080320d Merge pull request 'dev_basemynes' (#4) from alienjack/AxibugEmuOnline:dev_basemynes into dev_basemynes
Reviewed-on: sin365/AxibugEmuOnline#4
2024-07-10 15:06:15 +08:00
2214a7d0dd 流式音频采用DSP实现,VideoProvider和audioProvider改为monobehaviour 2024-07-10 15:02:14 +08:00
5166a7bcac readme 2024-07-09 17:27:36 +08:00
6a856ccb87 服务端房间功能 2024-07-09 17:22:09 +08:00
6a87aa5b19 忽略配置提交 2024-07-05 11:52:56 +08:00
5521aa812a 移除不必要的sln文件 2024-07-05 11:49:51 +08:00
97b799b258 绘制性能优化 2024-07-05 11:48:35 +08:00
164caf39f7 Merge pull request 'dev_basemynes' (#3) from alienjack/AxibugEmuOnline:dev_basemynes into dev_basemynes
Reviewed-on: sin365/AxibugEmuOnline#3
2024-07-05 11:30:21 +08:00
78e49db31a Merge branch 'dev_basemynes' of http://git.axibug.com/sin365/AxibugEmuOnline into dev_basemynes 2024-07-05 11:25:16 +08:00
8726917bdd 音频解决(缺少追赶机制) 2024-07-05 11:24:59 +08:00
c1c70691ce 迭代 2024-07-04 21:06:41 +08:00
054a68cc15 加协议 2024-07-04 17:39:47 +08:00
1beb69c7a6 迭代 2024-07-04 10:41:48 +08:00
f1f97234d9 Merge pull request 'dev_basemynes' (#2) from alienjack/AxibugEmuOnline:dev_basemynes into dev_basemynes
Reviewed-on: sin365/AxibugEmuOnline#2
2024-07-03 18:24:03 +08:00
450eaa8f31 修复语法错误 2024-07-03 18:22:22 +08:00
b92f9f2868 Merge branch 'dev_basemynes' of http://git.axibug.com/sin365/AxibugEmuOnline into dev_basemynes 2024-07-03 18:19:30 +08:00
03d6c09072 core替换为7.7版本 2024-07-03 18:15:28 +08:00
3b3a03f9b1 Merge pull request 'mynes.core dll改代码' (#1) from alienjack/AxibugEmuOnline:dev_basemynes into dev_basemynes
Reviewed-on: sin365/AxibugEmuOnline#1
2024-07-03 15:46:20 +08:00
e90cdc3e99 mynes.core dll改代码 2024-07-03 15:40:13 +08:00
3397 changed files with 672011 additions and 29795 deletions

8
.gitignore vendored
View File

@ -13,4 +13,10 @@
/AxibugEmuOnline.Client/ProjectSettings/ProjectVersion.txt
/AxibugEmuOnline.Client/ProjectSettings/AutoStreamingSettings.asset
/AxibugEmuOnline.Client/Logs
/virtuanessrc097-master/save
/virtuanessrc097-master
/AxibugEmuOnline.Server/config.cfg
/AxibugEmuOnline.Server/bin/
/AxibugEmuOnline.Client/.editorconfig
/AxibugEmuOnline.Client/*.user
/AxibugEmuOnline.Client/.idea

0
.gitmodules vendored Normal file
View File

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 43be319af7abfac409964f3b557a7558
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiCanvasScaler : UnityEngine.UI.CanvasScaler {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 473ebc56afd3a42478d4384e874c37fb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiContentSizeFitter : UnityEngine.UI.ContentSizeFitter {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8caea8d1f9c876b4f881e5f0b786490a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiEventSystem : UnityEngine.EventSystems.EventSystem {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1a44ffc6225f2f94e96923be40838c6b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiGraphicRaycaster : UnityEngine.UI.GraphicRaycaster {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1945ac5245ba5af46afb0b2c1176e625
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiHorizontalLayoutGroup : UnityEngine.UI.HorizontalLayoutGroup {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 250a43c57c3dd7743b159142e0e972dc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiImage : UnityEngine.UI.Image {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 51fcfe4c344a349498d3e605566e449c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiInputField : UnityEngine.UI.InputField {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c06c5945ce05264419dd9baf5052c6d2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiLayoutElement : UnityEngine.UI.LayoutElement {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 662c10b55acd55b41a61b98b4e6dbdae
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiRawImage : UnityEngine.UI.RawImage {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e197a80ecc5234d41a58d206698ab683
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiScrollRect : UnityEngine.UI.ScrollRect {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0bacff8c6cfbc6f4ea2f41852d636203
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiShadow : UnityEngine.UI.Shadow {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5397b0dcf716afa45b892bb200561edb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiSlider : UnityEngine.UI.Slider {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: bd0459cd2daa17e4bbbce2a219502891
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiStandaloneInputModule : UnityEngine.EventSystems.StandaloneInputModule {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c4e4880eab24b7e49b7db61357d9fbd2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiText : UnityEngine.UI.Text {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d1e4d2ce69fe5c345903d4219ba84715
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1 @@
namespace AxibugCom { public class AxiVerticalLayoutGroup : UnityEngine.UI.VerticalLayoutGroup {} }

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c6cc678483f4f2849bc6bbbcc66481a6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,120 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 47ae96bfd5393694da28c22ab2ccfb7c, type: 3}
m_Name: AxiComToolCache
m_EditorClassIdentifier:
caches:
- SrcFullName: UnityEngine.EventSystems.EventSystem
SrcName: EventSystem
GUID: 76c392e42b5098c458856cdf6ecaaaa1
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.EventSystems.StandaloneInputModule
SrcName: StandaloneInputModule
GUID: 4f231c4fb786f3946a6b90b886c48677
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.CanvasScaler
SrcName: CanvasScaler
GUID: 0cd44c1031e13a943bb63640046fad76
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.GraphicRaycaster
SrcName: GraphicRaycaster
GUID: dc42784cf147c0c48a680349fa168899
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.Image
SrcName: Image
GUID: fe87c0e1cc204ed48ad3b37840f39efc
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.RawImage
SrcName: RawImage
GUID: 1344c3c82d62a2a41a3576d8abb8e3ea
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.HorizontalLayoutGroup
SrcName: HorizontalLayoutGroup
GUID: 30649d3a9faa99c48a7b1166b86bf2a0
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.ContentSizeFitter
SrcName: ContentSizeFitter
GUID: 3245ec927659c4140ac4f8d17403cc18
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.LayoutElement
SrcName: LayoutElement
GUID: 306cc8c2b49d7114eaa3623786fc2126
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.Text
SrcName: Text
GUID: 5f7201a12d95ffc409449d95f23cf332
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.Shadow
SrcName: Shadow
GUID: cfabb0440166ab443bba8876756fdfa9
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.ScrollRect
SrcName: ScrollRect
GUID: 1aa08ab6e0800fa44ae55d278d1423e3
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.VerticalLayoutGroup
SrcName: VerticalLayoutGroup
GUID: 59f8146938fff824cb5fd77236b75775
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.Slider
SrcName: Slider
GUID: 67db9e8f0e2ae9c40bc1e2b64352a6b4
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}
- SrcFullName: UnityEngine.UI.InputField
SrcName: InputField
GUID: d199490a83bb2b844b9695cbf13b01ef
ToName:
ToPATH:
ToGUID:
monoScript: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d8f9e9475a806e04bb9d6946f20f4d0f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 113d55ba3dc10674b9bc51fc07159850
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 236513027b5ebe041b0e5b86aec0db42
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,436 @@
using UnityEngine;
using System.Collections.Generic;
using System;
using UnityEngine.Profiling;
public class Debugger : MonoBehaviour
{
/// <summary>
/// 是否允许调试
/// </summary>
public bool AllowDebugging = true;
private DebugType _debugType = DebugType.Console;
private List<LogData> _logInformations = new List<LogData>();
private int _currentLogIndex = -1;
private int _infoLogCount = 0;
private int _warningLogCount = 0;
private int _errorLogCount = 0;
private int _fatalLogCount = 0;
private bool _showInfoLog = true;
private bool _showWarningLog = true;
private bool _showErrorLog = true;
private bool _showFatalLog = true;
private Vector2 _scrollLogView = Vector2.zero;
private Vector2 _scrollCurrentLogView = Vector2.zero;
private Vector2 _scrollSystemView = Vector2.zero;
private bool _expansion = false;
private Rect _windowRect = new Rect(0, 0, 100, 60);
private int _fps = 0;
private Color _fpsColor = Color.white;
private int _frameNumber = 0;
private float _lastShowFPSTime = 0f;
private void Start()
{
DontDestroyOnLoad(this.gameObject);
if (AllowDebugging)
{
Application.logMessageReceived += LogHandler;
}
}
private void Update()
{
if (AllowDebugging)
{
_frameNumber += 1;
float time = Time.realtimeSinceStartup - _lastShowFPSTime;
if (time >= 1)
{
_fps = (int)(_frameNumber / time);
_frameNumber = 0;
_lastShowFPSTime = Time.realtimeSinceStartup;
}
}
}
private void OnDestory()
{
if (AllowDebugging)
{
Application.logMessageReceived -= LogHandler;
}
}
bool bUnityWaterFrist = false;
private void LogHandler(string condition, string stackTrace, LogType type)
{
if (condition.Contains("UnityWater") || stackTrace.Contains("UnityWater"))
{
if(bUnityWaterFrist)
return;
bUnityWaterFrist = true;
}
LogData log = new LogData();
log.time = DateTime.Now.ToString("HH:mm:ss");
log.message = condition;
log.stackTrace = stackTrace;
if (type == LogType.Assert)
{
log.type = "Fatal";
_fatalLogCount += 1;
}
else if (type == LogType.Exception || type == LogType.Error)
{
log.type = "Error";
_errorLogCount += 1;
}
else if (type == LogType.Warning)
{
log.type = "Warning";
_warningLogCount += 1;
}
else if (type == LogType.Log)
{
log.type = "Info";
_infoLogCount += 1;
}
_logInformations.Add(log);
if (_warningLogCount > 0)
{
_fpsColor = Color.yellow;
}
if (_errorLogCount > 0)
{
_fpsColor = Color.red;
}
}
private void OnGUI()
{
if (AllowDebugging)
{
if (_expansion)
{
_windowRect = GUI.Window(0, _windowRect, ExpansionGUIWindow, "DEBUGGER");
}
else
{
_windowRect = GUI.Window(0, _windowRect, ShrinkGUIWindow, "DEBUGGER");
}
}
}
private void ExpansionGUIWindow(int windowId)
{
GUI.DragWindow(new Rect(0, 0, 10000, 20));
#region title
GUILayout.BeginHorizontal();
GUI.contentColor = _fpsColor;
if (GUILayout.Button("FPS:" + _fps, GUILayout.Height(30)))
{
_expansion = false;
_windowRect.width = 100;
_windowRect.height = 60;
}
GUI.contentColor = (_debugType == DebugType.Console ? Color.white : Color.gray);
if (GUILayout.Button("Console", GUILayout.Height(30)))
{
_debugType = DebugType.Console;
}
GUI.contentColor = (_debugType == DebugType.Memory ? Color.white : Color.gray);
if (GUILayout.Button("Memory", GUILayout.Height(30)))
{
_debugType = DebugType.Memory;
}
GUI.contentColor = (_debugType == DebugType.System ? Color.white : Color.gray);
if (GUILayout.Button("System", GUILayout.Height(30)))
{
_debugType = DebugType.System;
}
GUI.contentColor = (_debugType == DebugType.Screen ? Color.white : Color.gray);
if (GUILayout.Button("Screen", GUILayout.Height(30)))
{
_debugType = DebugType.Screen;
}
GUI.contentColor = (_debugType == DebugType.Quality ? Color.white : Color.gray);
if (GUILayout.Button("Quality", GUILayout.Height(30)))
{
_debugType = DebugType.Quality;
}
GUI.contentColor = (_debugType == DebugType.Environment ? Color.white : Color.gray);
if (GUILayout.Button("Environment", GUILayout.Height(30)))
{
_debugType = DebugType.Environment;
}
GUI.contentColor = Color.white;
GUILayout.EndHorizontal();
#endregion
#region console
if (_debugType == DebugType.Console)
{
GUILayout.BeginHorizontal();
if (GUILayout.Button("Clear"))
{
_logInformations.Clear();
_fatalLogCount = 0;
_warningLogCount = 0;
_errorLogCount = 0;
_infoLogCount = 0;
_currentLogIndex = -1;
_fpsColor = Color.white;
}
GUI.contentColor = (_showInfoLog ? Color.white : Color.gray);
_showInfoLog = GUILayout.Toggle(_showInfoLog, "Info [" + _infoLogCount + "]");
GUI.contentColor = (_showWarningLog ? Color.white : Color.gray);
_showWarningLog = GUILayout.Toggle(_showWarningLog, "Warning [" + _warningLogCount + "]");
GUI.contentColor = (_showErrorLog ? Color.white : Color.gray);
_showErrorLog = GUILayout.Toggle(_showErrorLog, "Error [" + _errorLogCount + "]");
GUI.contentColor = (_showFatalLog ? Color.white : Color.gray);
_showFatalLog = GUILayout.Toggle(_showFatalLog, "Fatal [" + _fatalLogCount + "]");
GUI.contentColor = Color.white;
GUILayout.EndHorizontal();
_scrollLogView = GUILayout.BeginScrollView(_scrollLogView, "Box", GUILayout.Height(165));
for (int i = 0; i < _logInformations.Count; i++)
{
bool show = false;
Color color = Color.white;
switch (_logInformations[i].type)
{
case "Fatal":
show = _showFatalLog;
color = Color.red;
break;
case "Error":
show = _showErrorLog;
color = Color.red;
break;
case "Info":
show = _showInfoLog;
color = Color.white;
break;
case "Warning":
show = _showWarningLog;
color = Color.yellow;
break;
default:
break;
}
if (show)
{
GUILayout.BeginHorizontal();
if (GUILayout.Toggle(_currentLogIndex == i, ""))
{
_currentLogIndex = i;
}
GUI.contentColor = color;
GUILayout.Label("[" + _logInformations[i].type + "] ");
GUILayout.Label("[" + _logInformations[i].time + "] ");
GUILayout.Label(_logInformations[i].message);
GUILayout.FlexibleSpace();
GUI.contentColor = Color.white;
GUILayout.EndHorizontal();
}
}
GUILayout.EndScrollView();
_scrollCurrentLogView = GUILayout.BeginScrollView(_scrollCurrentLogView, "Box", GUILayout.Height(100));
if (_currentLogIndex != -1)
{
GUILayout.Label(_logInformations[_currentLogIndex].message + "\r\n\r\n" + _logInformations[_currentLogIndex].stackTrace);
}
GUILayout.EndScrollView();
}
#endregion
#region memory
else if (_debugType == DebugType.Memory)
{
GUILayout.BeginHorizontal();
GUILayout.Label("Memory Information");
GUILayout.EndHorizontal();
GUILayout.BeginVertical("Box");
#if UNITY_5
GUILayout.Label("总内存:" + Profiler.GetTotalReservedMemory() / 1000000 + "MB");
GUILayout.Label("已占用内存:" + Profiler.GetTotalAllocatedMemory() / 1000000 + "MB");
GUILayout.Label("空闲中内存:" + Profiler.GetTotalUnusedReservedMemory() / 1000000 + "MB");
GUILayout.Label("总Mono堆内存" + Profiler.GetMonoHeapSize() / 1000000 + "MB");
GUILayout.Label("已占用Mono堆内存" + Profiler.GetMonoUsedSize() / 1000000 + "MB");
#endif
#if UNITY_7
GUILayout.Label("总内存:" + Profiler.GetTotalReservedMemoryLong() / 1000000 + "MB");
GUILayout.Label("已占用内存:" + Profiler.GetTotalAllocatedMemoryLong() / 1000000 + "MB");
GUILayout.Label("空闲中内存:" + Profiler.GetTotalUnusedReservedMemoryLong() / 1000000 + "MB");
GUILayout.Label("总Mono堆内存" + Profiler.GetMonoHeapSizeLong() / 1000000 + "MB");
GUILayout.Label("已占用Mono堆内存" + Profiler.GetMonoUsedSizeLong() / 1000000 + "MB");
#endif
GUILayout.EndVertical();
GUILayout.BeginHorizontal();
if (GUILayout.Button("卸载未使用的资源"))
{
Resources.UnloadUnusedAssets();
}
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
if (GUILayout.Button("使用GC垃圾回收"))
{
GC.Collect();
}
GUILayout.EndHorizontal();
}
#endregion
#region system
else if (_debugType == DebugType.System)
{
GUILayout.BeginHorizontal();
GUILayout.Label("System Information");
GUILayout.EndHorizontal();
_scrollSystemView = GUILayout.BeginScrollView(_scrollSystemView, "Box");
GUILayout.Label("操作系统:" + SystemInfo.operatingSystem);
GUILayout.Label("系统内存:" + SystemInfo.systemMemorySize + "MB");
GUILayout.Label("处理器:" + SystemInfo.processorType);
GUILayout.Label("处理器数量:" + SystemInfo.processorCount);
GUILayout.Label("显卡:" + SystemInfo.graphicsDeviceName);
GUILayout.Label("显卡类型:" + SystemInfo.graphicsDeviceType);
GUILayout.Label("显存:" + SystemInfo.graphicsMemorySize + "MB");
GUILayout.Label("显卡标识:" + SystemInfo.graphicsDeviceID);
GUILayout.Label("显卡供应商:" + SystemInfo.graphicsDeviceVendor);
GUILayout.Label("显卡供应商标识码:" + SystemInfo.graphicsDeviceVendorID);
GUILayout.Label("设备模式:" + SystemInfo.deviceModel);
GUILayout.Label("设备名称:" + SystemInfo.deviceName);
GUILayout.Label("设备类型:" + SystemInfo.deviceType);
GUILayout.Label("设备标识:" + SystemInfo.deviceUniqueIdentifier);
GUILayout.EndScrollView();
}
#endregion
#region screen
else if (_debugType == DebugType.Screen)
{
GUILayout.BeginHorizontal();
GUILayout.Label("Screen Information");
GUILayout.EndHorizontal();
GUILayout.BeginVertical("Box");
GUILayout.Label("DPI" + Screen.dpi);
GUILayout.Label("分辨率:" + Screen.currentResolution.ToString());
GUILayout.EndVertical();
GUILayout.BeginHorizontal();
if (GUILayout.Button("全屏"))
{
Screen.SetResolution(Screen.currentResolution.width, Screen.currentResolution.height, !Screen.fullScreen);
}
GUILayout.EndHorizontal();
}
#endregion
#region Quality
else if (_debugType == DebugType.Quality)
{
GUILayout.BeginHorizontal();
GUILayout.Label("Quality Information");
GUILayout.EndHorizontal();
GUILayout.BeginVertical("Box");
string value = "";
if (QualitySettings.GetQualityLevel() == 0)
{
value = " [最低]";
}
else if (QualitySettings.GetQualityLevel() == QualitySettings.names.Length - 1)
{
value = " [最高]";
}
GUILayout.Label("图形质量:" + QualitySettings.names[QualitySettings.GetQualityLevel()] + value);
GUILayout.EndVertical();
GUILayout.BeginHorizontal();
if (GUILayout.Button("降低一级图形质量"))
{
QualitySettings.DecreaseLevel();
}
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
if (GUILayout.Button("提升一级图形质量"))
{
QualitySettings.IncreaseLevel();
}
GUILayout.EndHorizontal();
}
#endregion
#region Environment
else if (_debugType == DebugType.Environment)
{
GUILayout.BeginHorizontal();
GUILayout.Label("Environment Information");
GUILayout.EndHorizontal();
GUILayout.BeginVertical("Box");
GUILayout.Label("项目名称:" + Application.productName);
#if UNITY_5
GUILayout.Label("项目ID" + Application.bundleIdentifier);
#endif
#if UNITY_7
GUILayout.Label("项目ID" + Application.identifier);
#endif
GUILayout.Label("项目版本:" + Application.version);
GUILayout.Label("Unity版本" + Application.unityVersion);
GUILayout.Label("公司名称:" + Application.companyName);
GUILayout.EndVertical();
GUILayout.BeginHorizontal();
if (GUILayout.Button("退出程序"))
{
Application.Quit();
}
GUILayout.EndHorizontal();
}
#endregion
}
private void ShrinkGUIWindow(int windowId)
{
GUI.DragWindow(new Rect(0, 0, 10000, 20));
GUI.contentColor = _fpsColor;
if (GUILayout.Button("FPS:" + _fps, GUILayout.Width(80), GUILayout.Height(30)))
{
_expansion = true;
_windowRect.width = 600;
_windowRect.height = 360;
}
GUI.contentColor = Color.white;
}
}
public struct LogData
{
public string time;
public string type;
public string message;
public string stackTrace;
}
public enum DebugType
{
Console,
Memory,
System,
Screen,
Quality,
Environment
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c8eba012c3ef41a4bb9f3bfa27a8ea21
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,123 @@
using AxibugEmuOnline.Client.ClientCore;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using UnityEditor;
using UnityEngine;
using UnityEngine.SceneManagement;
using static AxibugEmuOnline.Client.HttpAPI;
public class PSVLauncher : MonoBehaviour
{
public UnityEngine.UI.Button btnInfo;
public UnityEngine.UI.Button InitAPP;
public UnityEngine.UI.Button btnHttpTest;
public UnityEngine.UI.Button btnHttpTest10;
public UnityEngine.UI.Button btnTaskTest;
public UnityEngine.UI.Button btnTaskTest2;
public UnityEngine.UI.Button btnPSVHUD;
public UnityEngine.UI.Button btnStart;
void Awake()
{
DontDestroyOnLoad(this);
btnInfo.onClick.AddListener(() =>
{
Debug.Log($"SystemInfo.deviceUniqueIdentifier ->" + SystemInfo.deviceUniqueIdentifier);
Debug.Log($"systemLanguage ->" + UnityEngine.PSVita.Utility.systemLanguage);
Debug.Log($"skuFlags ->" + UnityEngine.PSVita.Utility.skuFlags);
}
);
InitAPP.onClick.AddListener(() =>
{
App.Init(new AxibugEmuOnline.Client.Initer());
});
btnHttpTest.onClick.AddListener(() => StartCoroutine(StartNetInit()));
btnHttpTest10.onClick.AddListener(() =>
{
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
StartCoroutine(StartNetInit());
}
);
btnTaskTest.onClick.AddListener(() =>
{
PSVThread.DoTask(() => DoWork(null));
//Task task = new Task(() =>
//{
// Thread.Sleep(1000);
// Debug.Log($"{Thread.CurrentThread.ManagedThreadId}->{1000}");
// Thread.Sleep(1000);
// Debug.Log($"{Thread.CurrentThread.ManagedThreadId}->{2000}");
//});
//task.Start();
});
btnPSVHUD.onClick.AddListener(() => {
UnityEngine.PSVita.Diagnostics.enableHUD = true;
});
btnTaskTest2.onClick.AddListener(() =>
{
ThreadPool.QueueUserWorkItem(DoWork);
}
);
btnStart.onClick.AddListener(()
=>
{
SceneManager.LoadScene("AxibugEmuOnline.Client");
});
}
static void DoWork(object state)
{
// 这里是线程池中的工作代码
Debug.Log($"thread id: {Thread.CurrentThread.ManagedThreadId} start");
// 模拟一些工作
Thread.Sleep(2000);
Debug.Log($"thread id: {Thread.CurrentThread.ManagedThreadId} end");
}
static IEnumerator StartNetInit()
{
int platform = 0;
AxiHttpProxy.SendWebRequestProxy request = AxiHttpProxy.Get($"{"http://emu.axibug.com/api"}/CheckStandInfo?platform={platform}&version={Application.version}");
yield return request.SendWebRequest;
if (!request.downloadHandler.isDone)
yield break;
if (request.downloadHandler.Err != null)
{
Debug.LogError(request.downloadHandler.Err);
yield break;
}
AxiHttpProxy.ShowAxiHttpDebugInfo(request.downloadHandler);
Resp_CheckStandInfo resp = JsonUtility.FromJson<Resp_CheckStandInfo>(request.downloadHandler.text);
//需要更新
if (resp.needUpdateClient == 1)
{
//TODO
}
yield return null;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f98de16d25b8f5148866d0c02a514502
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,33 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: VideoTexture
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 960
m_Height: 544
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 20
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3d77df0fa731c3b458e8a1d50eb1a1b3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e745b95dbce117b48b4bd17df06ed302
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 292b282919a768c4fa6b8adb858daa95
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,26 @@
#if UNITY_EDITOR
using System;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
[CreateAssetMenu(fileName = "CrossMapCfg", menuName = "Tools/AxiPrefabCachec", order = 0)]
public class AxiPrefabCache : ScriptableObject
{
public List<AxiPrefabCache_Com2GUID> caches = new List<AxiPrefabCache_Com2GUID>();
}
[Serializable]
public class AxiPrefabCache_Com2GUID
{
public string SrcFullName;
public string SrcName;
public string GUID;
public string ToName;
public string ToPATH;
public string ToGUID;
public MonoScript monoScript;
}
#endif

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 47ae96bfd5393694da28c22ab2ccfb7c

View File

@ -0,0 +1,416 @@
#if UNITY_EDITOR
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEditor.SceneManagement;
using UnityEngine;
public class AxiProjectTools : EditorWindow
{
static string cachecfgPath = "Assets/AxiComToolCache.asset";
static string toolSenceName = "AxiProjectTools";
static string outCsDir = Application.dataPath + "/AxiCom/";
static Dictionary<string, AxiPrefabCache_Com2GUID> ComType2GUID = new Dictionary<string, AxiPrefabCache_Com2GUID>();
static void GoTAxiProjectToolsSence()
{
string[] sceneGuids = AssetDatabase.FindAssets("t:scene");
foreach (string guid in sceneGuids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
if (path.Contains(toolSenceName))
{
EditorSceneManager.OpenScene(path);
return;
}
}
}
[MenuItem("Axibug移植工具/[1]UGUI组件")]
public static void Part1()
{
GoTAxiProjectToolsSence();
ComType2GUID.Clear();
string[] sceneGuids = AssetDatabase.FindAssets("t:scene");
foreach (string guid in sceneGuids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
if (path.Contains(toolSenceName))
continue;
EditorSceneManager.OpenScene(path);
// 创建一个列表来存储根节点
List<GameObject> rootNodes = new List<GameObject>();
// 遍历场景中的所有对象
GameObject[] allObjects = FindObjectsOfType<GameObject>();
foreach (GameObject obj in allObjects)
{
// 检查对象是否有父对象
if (obj.transform.parent == null)
{
// 如果没有父对象,则它是一个根节点
rootNodes.Add(obj);
}
}
foreach (var node in rootNodes)
LoopPrefabNode(path, node, 0);
}
string[] prefabGuids = AssetDatabase.FindAssets("t:Prefab");
foreach (string guid in prefabGuids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
GetPrefab(path);
}
AxiPrefabCache cache = ScriptableObject.CreateInstance<AxiPrefabCache>();
foreach (var data in ComType2GUID)
cache.caches.Add(data.Value);
AssetDatabase.CreateAsset(cache, cachecfgPath);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
GoTAxiProjectToolsSence();
Debug.Log("<Color=#FFF333>处理完毕 [1]采集所有预制体和场景下的UGUI组件</color>");
}
static void GetPrefab(string path)
{
GameObject prefab = AssetDatabase.LoadAssetAtPath<GameObject>(path);
LoopPrefabNode(path, prefab.gameObject, 0);
}
static void LoopPrefabNode(string rootPath, GameObject trans, int depth)
{
string nodename = $"{rootPath}>{trans.name}";
#if UNITY_2018_4_OR_NEWER
GameObject prefabRoot = trans.gameObject;
int comCount = prefabRoot.GetComponentCount();
for (int i = 0; i < comCount; i++)
{
var com = prefabRoot.GetComponentAtIndex(i);
if (com == null)
continue;
MonoBehaviour monoCom = com as MonoBehaviour;
if (monoCom == null)
continue;
Type monoType = monoCom.GetType();
if (!monoType.Assembly.FullName.Contains("UnityEngine.UI"))
continue;
// 获取MonoScript资源
MonoScript monoScript = MonoScript.FromMonoBehaviour(monoCom);
if (monoScript != null)
{
// 获取MonoScript资源的GUID
string guid = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(monoScript));
Debug.Log($"{nodename} | <color=#FFF333>[{monoType.Name}]</color> <color=#FF0000>{guid}</color><color=#00FF00>({monoType.FullName})</color>");
ComType2GUID[monoType.FullName] =
new AxiPrefabCache_Com2GUID()
{
SrcFullName = monoType.FullName,
SrcName = monoType.Name,
GUID = guid,
};
}
else
{
Debug.LogError("!!!! 没得");
}
}
//遍历
foreach (Transform child in trans.transform)
LoopPrefabNode(nodename, child.gameObject, depth + 1);
#else
Debug.Log("低版本不要执行本函数");
#endif
}
[MenuItem("Axibug移植工具/[2]")]
public static void Part2()
{
if (UnityEngine.Windows.Directory.Exists(outCsDir))
UnityEngine.Windows.Directory.Delete(outCsDir);
Directory.CreateDirectory(outCsDir);
AxiPrefabCache cache = AssetDatabase.LoadAssetAtPath<AxiPrefabCache>(cachecfgPath);
foreach (var data in cache.caches)
{
string toName = "Axi" + data.SrcName;
string toPath = outCsDir + toName + ".cs";
string codeStr = "namespace AxibugCom { public class " + toName + " : " + data.SrcFullName + " {} }";
try
{
System.IO.File.WriteAllText(toPath, codeStr);
data.ToName = toName;
data.ToPATH = toPath;
}
catch (Exception ex)
{
Debug.LogError("写入失败" + ex.ToString());
}
}
Debug.Log("写入完毕");
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
Debug.Log("<Color=#FFF333>处理完毕 [2]生成中间脚本代码</color>");
}
[MenuItem("Axibug移植工具/[3]")]
public static void Part3()
{
AxiPrefabCache cache = AssetDatabase.LoadAssetAtPath<AxiPrefabCache>(cachecfgPath);
List<MonoScript> allMonoScripts = FindAllAssetsOfType<MonoScript>();
foreach (var data in cache.caches)
{
MonoScript monoScript = allMonoScripts.FirstOrDefault(w => w.name == data.ToName);
if (monoScript == null)
{
Debug.LogError("没找到" + data.ToName);
continue;
}
string guid = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(monoScript));
data.ToGUID = guid;
data.monoScript = monoScript;
}
Debug.Log("写入完毕");
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
Debug.Log("<Color=#FFF333>处理完毕 [3]收集生成的脚本</color>");
}
static List<T> FindAllAssetsOfType<T>() where T : UnityEngine.Object
{
List<T> assets = new List<T>();
string[] allGuids = AssetDatabase.FindAssets("");
foreach (string guid in allGuids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
if (path.EndsWith(".cs") || path.EndsWith(".js") || path.EndsWith(".boo")) // Unity支持多种脚本语言但现代Unity主要使用C#
{
T asset = AssetDatabase.LoadAssetAtPath<T>(path);
if (asset != null)
{
assets.Add(asset);
}
}
}
return assets;
}
[MenuItem("Axibug移植工具/[4]")]
public static void Part4()
{
AxiPrefabCache cache = AssetDatabase.LoadAssetAtPath<AxiPrefabCache>(cachecfgPath);
Dictionary<string, string> tempReplaceDict = new Dictionary<string, string>();
foreach (var data in cache.caches)
{
tempReplaceDict[data.GUID] = data.ToGUID;
}
ProcessAllPrefabs("*.prefab", tempReplaceDict);
ProcessAllPrefabs("*.unity", tempReplaceDict);
ProcessAllPrefabs("*.anim", tempReplaceDict);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
Debug.Log("<Color=#FFF333>处理完毕 [4]替换所有预制体和场景中的组件</color>");
}
static void ProcessAllPrefabs(string form, Dictionary<string, string> tempReplaceDict, bool reverse = false)
{
List<GameObject> prefabs = new List<GameObject>();
var resourcesPath = Application.dataPath;
var absolutePaths = Directory.GetFiles(resourcesPath, form, SearchOption.AllDirectories);
for (int i = 0; i < absolutePaths.Length; i++)
{
Debug.Log("prefab name: " + absolutePaths[i]);
foreach (var VARIABLE in tempReplaceDict)
{
string oldValue = reverse ? VARIABLE.Value : VARIABLE.Key;
string newValue = reverse ? VARIABLE.Key : VARIABLE.Value;
ReplaceValue(absolutePaths[i], oldValue, newValue);
}
EditorUtility.DisplayProgressBar("处理预制体……", "处理预制体中……", (float)i / absolutePaths.Length);
}
EditorUtility.ClearProgressBar();
}
/// <summary>
/// 替换值
/// </summary>
/// <param name="strFilePath">文件路径</param>
static void ReplaceValue(string strFilePath, string oldLine, string newLine)
{
if (File.Exists(strFilePath))
{
string[] lines = File.ReadAllLines(strFilePath);
for (int i = 0; i < lines.Length; i++)
{
lines[i] = lines[i].Replace(oldLine, newLine);
}
File.WriteAllLines(strFilePath, lines);
}
}
[MenuItem("Axibug移植工具/[5]UnPack所有嵌套预制体和场景中的预制体")]
public static void UnpackPrefabs()
{
#if UNITY_2018_4_OR_NEWER
GoTAxiProjectToolsSence();
string[] allAssetPaths = AssetDatabase.GetAllAssetPaths();
int prefabCount = 0;
foreach (string path in allAssetPaths)
{
if (Path.GetExtension(path).Equals(".prefab"))
{
Debug.Log($"Unpacking {path}");
UnpackPrefab(path);
prefabCount++;
}
}
Debug.Log($"{prefabCount}个预制体Unpack");
string[] sceneGuids = AssetDatabase.FindAssets("t:scene");
foreach (string guid in sceneGuids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
if (path.Contains(toolSenceName))
continue;
EditorSceneManager.OpenScene(path);
Scene currentScene = SceneManager.GetActiveScene();
GameObject[] rootObjects = currentScene.GetRootGameObjects();
foreach (GameObject rootObj in rootObjects)
{
// 遍历场景中的所有对象
TraverseHierarchy(rootObj);
}
// Save the scene // 获取当前打开的场景
currentScene = EditorSceneManager.GetActiveScene();
// 保存场景到文件(默认路径和名称)
bool success = EditorSceneManager.SaveScene(currentScene, currentScene.path);
Debug.Log($"{currentScene.name}场景中 所有物体Unpack");
}
GoTAxiProjectToolsSence();
Debug.Log("<Color=#FFF333>处理完毕 [5]UnPack所有预制体</color>");
#else
Debug.Log("低版本不要执行本函数");
#endif
}
static void UnpackPrefab(string prefabPath)
{
#if UNITY_2018_4_OR_NEWER
GameObject prefabInstance = AssetDatabase.LoadAssetAtPath<GameObject>(prefabPath);
if (prefabInstance == null)
{
Debug.LogError($"Failed to load prefab at path: {prefabPath}");
return;
}
var obj = GameObject.Instantiate(prefabInstance, null);
TraverseHierarchy(obj);
PrefabUtility.SaveAsPrefabAsset(obj, prefabPath);
GameObject.DestroyImmediate(obj);
#else
Debug.Log("低版本不要执行本函数");
#endif
}
static void TraverseHierarchy(GameObject obj)
{
#if UNITY_2018_4_OR_NEWER
// 检查该对象是否是预制体的实例
if (PrefabUtility.IsPartOfPrefabInstance(obj))
{
// 将预制体实例转换为普通游戏对象
PrefabUtility.UnpackPrefabInstance(obj, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
Debug.Log("Prefab instance converted to game object: " + obj.name);
}
// 递归遍历子对象
for (int i = 0; i < obj.transform.childCount; i++)
{
TraverseHierarchy(obj.transform.GetChild(i).gameObject);
}
#else
Debug.Log("低版本不要执行本函数");
#endif
}
[MenuItem("Axibug移植工具/[6]Sprite")]
public static void FixMultipleMaterialSprites()
{
string[] guids = AssetDatabase.FindAssets("t:sprite");
List<Sprite> spritesToFix = new List<Sprite>();
foreach (string guid in guids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
Sprite sprite = AssetDatabase.LoadAssetAtPath<Sprite>(path);
// 检查是否有多个材质
if (IsUsingMultipleMaterials(sprite))
{
spritesToFix.Add(sprite);
Debug.Log("Found sprite with multiple materials: " + path);
}
}
// 修复每个找到的Sprite
foreach (var sprite in spritesToFix)
{
FixSprite(sprite);
}
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
Debug.Log("<Color=#FFF333>处理完毕 [6]修复Sprite</color>");
}
private static bool IsUsingMultipleMaterials(Sprite sprite)
{
if (sprite == null) return false;
// 获取精灵的材质
var textureImporter = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(sprite)) as TextureImporter;
return textureImporter != null && textureImporter.spriteImportMode == SpriteImportMode.Multiple;
}
private static void FixSprite(Sprite sprite)
{
// 获取Sprite的路径
string path = AssetDatabase.GetAssetPath(sprite);
var textureImporter = AssetImporter.GetAtPath(path) as TextureImporter;
if (textureImporter != null)
{
// 保存当前切割信息
SpriteMetaData[] originalMetaData = textureImporter.spritesheet;
// 临时禁用Sprite导入
textureImporter.spriteImportMode = SpriteImportMode.None;
textureImporter.SaveAndReimport();
// 重新启用Sprite导入并保持原样切割参数
textureImporter.spriteImportMode = SpriteImportMode.Multiple;
textureImporter.spritesheet = originalMetaData; // 恢复原来的切割信息
// 重新导入以应用更改
textureImporter.SaveAndReimport();
}
}
}
#endif

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 01c95f5e03a338749b54784eb6420d04

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 11a59d59d152c214bb99a09f4d795c21
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,316 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 10
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 1
m_PVRFilteringGaussRadiusAO: 1
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &1760378052
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1760378055}
- component: {fileID: 1760378054}
- component: {fileID: 1760378053}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1760378053
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760378052}
m_Enabled: 1
--- !u!20 &1760378054
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760378052}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1760378055
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760378052}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1948026923
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1948026925}
- component: {fileID: 1948026924}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &1948026924
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1948026923}
m_Enabled: 1
serializedVersion: 11
m_Type: 1
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ForceVisible: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
m_LightUnit: 1
m_LuxAtDistance: 1
m_EnableSpotReflector: 1
--- !u!4 &1948026925
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1948026923}
serializedVersion: 2
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1760378055}
- {fileID: 1948026925}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f578c65afd0d1c84b9b59664106fab66
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fd41663b74cbfcc45a028bc891a8c4fc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,18 @@
{
"name": "AxibugEmuOnline.Editor",
"rootNamespace": "AxibugEmuOnline.Editors",
"references": [
"AxibugEmuOnline.Client"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a37804d4d608e1e4bb8204f442ab0e60
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,50 @@
using AxibugEmuOnline.Client;
using UnityEditor;
using UnityEngine;
using System.Collections.Generic;
namespace AxibugEmuOnline.Editors
{
[CustomEditor(typeof(CommandDispatcher))]
public class CommandDispatcherEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
if (!Application.isPlaying) return;
var dispacather = target as CommandDispatcher;
IReadOnlyList<CommandExecuter> normal; IReadOnlyList<CommandExecuter> solo;
dispacather.GetRegisters(out normal, out solo);
EditorGUILayout.BeginVertical(EditorStyles.helpBox);
EditorGUILayout.LabelField("NORMAL");
foreach (var item in normal)
{
Draw(item);
}
EditorGUILayout.EndVertical();
EditorGUILayout.BeginVertical(EditorStyles.helpBox);
EditorGUILayout.LabelField("SOLO");
foreach (var item in solo)
{
Draw(item);
}
EditorGUILayout.EndVertical();
EditorGUILayout.LabelField(dispacather.Current.Name);
Repaint();
}
private void Draw(CommandExecuter item)
{
EditorGUILayout.BeginHorizontal(EditorStyles.helpBox);
using (new EditorGUI.DisabledGroupScope(!item.Enable))
EditorGUILayout.ObjectField(item.gameObject, typeof(GameObject), false);
EditorGUILayout.EndHorizontal();
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 57378be70cec95341aea522ad2d8e30d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 69eb869b06dab98439f07da4549fb7cb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 86a02c697fd26264cb5ee552b582449b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,3 @@
{
"name": "AxiReplay"
}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0a45db2096af23647aaafe5b70ccb4d7
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,11 @@
using System;
namespace AxiReplay
{
internal interface IReplayReader : IDisposable
{
bool NextFrame(out ReplayStep data);
bool TakeFrame(int addFrame, out ReplayStep data);
bool NextFramebyFrameIdx(int FrameID, out ReplayStep data);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 896ff07370157db46b612575616020ed
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,12 @@
using System;
namespace AxiReplay
{
internal interface IReplayWriter : IDisposable
{
void NextFrame(UInt64 frameInput);
void NextFramebyFrameIdx(int FrameID, UInt64 frameInput);
void TakeFrame(int addFrame, UInt64 frameInput);
void SaveData(string path, bool bNeedDump = false, string dumpFilePath = null);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6a8fcda365e5a7f428f88bc130eb913b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,147 @@
using System.Collections.Generic;
namespace AxiReplay
{
public class NetReplay
{
/// <summary>
/// 客户端当前帧
/// </summary>
public int mCurrClientFrameIdx = 0;
/// <summary>
/// 服务器远端当前帧
/// </summary>
public int mRemoteFrameIdx { get; private set; }
/// <summary>
/// 服务器远端当前提前量
/// </summary>
public int mRemoteForwardCount { get; private set; }
/// <summary>
/// Remote 2 Client Frame Gap
/// </summary>
public int mDiffFrameCount => mRemoteFrameIdx - mCurrClientFrameIdx;
/// <summary>
/// 网络数据队列
/// </summary>
Queue<ReplayStep> mNetReplayQueue = new Queue<ReplayStep>();
/// <summary>
/// 当前数据
/// </summary>
ReplayStep mCurrReplay;
/// <summary>
/// 下一个数据数据
/// </summary>
ReplayStep mNextReplay;
bool bNetInit = false;
public NetReplay()
{
ResetData();
}
public void ResetData()
{
mNetReplayQueue.Clear();
mCurrReplay = default(ReplayStep);
mCurrReplay.FrameStartID = int.MinValue;
bNetInit = false;
}
public void InData(ReplayStep inputData, int ServerFrameIdx)
{
mNetReplayQueue.Enqueue(inputData);
mRemoteFrameIdx = inputData.FrameStartID;
if (!bNetInit)
{
bNetInit = true;
mNextReplay = mNetReplayQueue.Dequeue();
}
}
public bool TryGetNextFrame(out ReplayStep data, out int frameDiff, out bool inputDiff)
{
if (!bNetInit)
{
data = default(ReplayStep);
frameDiff = default(int);
inputDiff = false;
return false;
}
TakeFrame(1, out data, out frameDiff, out inputDiff);
return frameDiff > 0;
}
public bool TryGetNextFrame(int targetFrame, out ReplayStep data, out int frameDiff, out bool inputDiff)
{
if (!bNetInit)
{
data = default(ReplayStep);
frameDiff = default(int);
inputDiff = false;
return false;
}
return TakeFrameToTargetFrame(targetFrame, out data, out frameDiff, out inputDiff);
}
void TakeFrame(int addFrame, out ReplayStep data, out int bFrameDiff, out bool inputDiff)
{
int targetFrame = mCurrClientFrameIdx + addFrame;
TakeFrameToTargetFrame(targetFrame, out data, out bFrameDiff, out inputDiff);
}
bool TakeFrameToTargetFrame(int targetFrame, out ReplayStep data, out int bFrameDiff, out bool inputDiff)
{
bool result;
inputDiff = false;
if (targetFrame == mNextReplay.FrameStartID && targetFrame <= mRemoteFrameIdx && mNetReplayQueue.Count > 0)
{
//当前帧追加
mCurrClientFrameIdx = targetFrame;
ulong oldInput = mCurrReplay.InPut;
mCurrReplay = mNextReplay;
if (oldInput != mCurrReplay.InPut)
inputDiff = true;
mNextReplay = mNetReplayQueue.Dequeue();
result = true;
}
else
result = false;
bFrameDiff = mRemoteFrameIdx - mCurrClientFrameIdx;
data = mCurrReplay;
return result;
}
public int GetSkipFrameCount()
{
if(!bNetInit)
return 0;
//本地队列差异高于服务器提前量的值
int moreNum = mDiffFrameCount - mRemoteForwardCount;
//if (mDiffFrameCount < 0 || mDiffFrameCount > 10000)
// return 0;
////游戏刚开始的一小段时间,直接追满
//if (mCurrClientFrameIdx < 60)
// return moreNum;
int skip = 0;
if (mDiffFrameCount > short.MaxValue) skip = 0;
else if (moreNum <= 1) skip = 0;
else if (moreNum <= 3) skip = 2;
else if (moreNum <= 6) skip = 2;
else if (moreNum <= 20) skip = moreNum / 2; //20帧以内平滑跳帧数
else skip = moreNum;//完全追上
return skip;
//var frameGap = mDiffFrameCount;
//if (frameGap > 10000) return 0;
//if (frameGap <= 2) skip = 0;
//if (frameGap > 2 && frameGap < 6) skip = 1 + 1;
//else if (frameGap > 7 && frameGap < 12) skip = 2 + 1;
//else if (frameGap > 13 && frameGap < 20) skip = 3 + 1;
//else skip = frameGap - 2;
//return skip;
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 452b58ff73a0853449845fd9e1134cc2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,101 @@
using System;
using System.Runtime.InteropServices;
using System.Text;
namespace AxiReplay
{
[StructLayout(LayoutKind.Explicit, Size = 44)]
public struct ReplayHandler
{
[FieldOffset(0)]
public int Format;
[FieldOffset(sizeof(int) * 1)]
public int RomID;
[FieldOffset(sizeof(int) * 2)]
public int RomType;
[FieldOffset(sizeof(int) * 3)]
public int DataOffset;
[FieldOffset(sizeof(int) * 4)]
public int TitleOffset;
[FieldOffset(sizeof(int) * 5)]
public int NoteOffset;
[FieldOffset(sizeof(int) * 6)]
public int AllFrame;
[FieldOffset(sizeof(int) * 7)]
public int AllTime;
[FieldOffset(sizeof(int) * 8)]
public int SingleLenght;
[FieldOffset(sizeof(int) * 9)]
public long CreateTime;
}
[StructLayout(LayoutKind.Explicit)]
public struct ReplayStep
{
[FieldOffset(0)]
public UInt64 All64Data;
[FieldOffset(0)]
public Int32 FrameStartID;
[FieldOffset(4)]
public UInt64 InPut;
}
public static class ReplayData
{
public static int HandlerLenght = sizeof(int) * 9 + sizeof(long);
public enum ReplayFormat : byte
{
None = 0,
FM32IPBYTE,
FM32IP16,
FM32IP32,
FM32IP64,
}
public static void GetStringByteData(string str, out byte[] data, out int lenghtWithEnd, Encoding encoding)
{
data = encoding.GetBytes(str);
lenghtWithEnd = data.Length + 1;
}
public static byte[] GetHandlerData(ReplayHandler replayhandler)
{
int size = Marshal.SizeOf(typeof(ReplayHandler));
byte[] arr = new byte[size];
IntPtr ptr = Marshal.AllocHGlobal(size);
try
{
Marshal.StructureToPtr(replayhandler, ptr, false);
Marshal.Copy(ptr, arr, 0, size);
}
finally
{
Marshal.FreeHGlobal(ptr);
}
return arr;
}
public static ReplayHandler GetReplayHandlerFromData(byte[] data)
{
if (data == null || data.Length < ReplayData.HandlerLenght)
{
throw new ArgumentException("Invalid data length or null data.");
}
IntPtr ptr = Marshal.AllocHGlobal(ReplayData.HandlerLenght);
try
{
// 将byte数组的内容复制到非托管内存中
Marshal.Copy(data, 0, ptr, ReplayData.HandlerLenght);
// 从非托管内存将内容转换回ReplayHandler结构体
return (ReplayHandler)Marshal.PtrToStructure(ptr, typeof(ReplayHandler));
}
finally
{
// 释放非托管内存
Marshal.FreeHGlobal(ptr);
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 42df5a138f4f4ae488815f35d8e748da
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,174 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using static AxiReplay.ReplayData;
namespace AxiReplay
{
public class ReplayReader : IReplayReader
{
public ReplayData.ReplayFormat mFormat { get; private set; }
public Encoding TexEncoding { get; private set; }
ReplayHandler handler;
string mTitle;
string mNote;
int mAllFrame;
int mAllTime;
long mData;
int mSingleInputLenght;
int mSingleDataLenght;
FileStream mStream;
BinaryReader mBinaryReader;
int mCurrFrame = -1;
byte[] mNextOutbytes;
public ReplayStep currStep;
public ReplayStep nextStep;
bool bEnd;
List<string> dbgList = new List<string>();
bool bdbg = false;
string dumpPath;
public ReplayReader(string path, bool bWithDump = false, string dumppath = null)
{
dbgList.Clear();
bdbg = bWithDump;
dumpPath = dumppath;
mStream = new FileStream(path, FileMode.Open, FileAccess.Read);
mBinaryReader = new BinaryReader(mStream);
byte[] Outbytes;
Outbytes = mBinaryReader.ReadBytes(ReplayData.HandlerLenght);
handler = ReplayData.GetReplayHandlerFromData(Outbytes);
mFormat = (ReplayFormat)handler.Format;
switch (mFormat)
{
case ReplayData.ReplayFormat.FM32IP64: mSingleInputLenght = sizeof(UInt64); break;
case ReplayData.ReplayFormat.FM32IP32: mSingleInputLenght = sizeof(UInt32); break;
case ReplayData.ReplayFormat.FM32IP16: mSingleInputLenght = sizeof(UInt16); break;
case ReplayData.ReplayFormat.FM32IPBYTE: mSingleInputLenght = sizeof(byte); break;
}
//Frame+Lenght
mSingleDataLenght = (sizeof(UInt32)) + mSingleInputLenght;
nextStep = new ReplayStep();
nextStep.FrameStartID = -1;
bEnd = false;
dbgList.Add($"Format => {handler.Format}");
dbgList.Add($"DataOffset => {handler.DataOffset}");
dbgList.Add($"CreateTime => {handler.CreateTime}");
dbgList.Add($"AllFrame => {handler.AllFrame}");
dbgList.Add($"SingleLenght => {handler.SingleLenght}");
mNextOutbytes = new byte[mSingleDataLenght];
if (bWithDump)
{
int TestFrameIdx = -1;
while (!bEnd)
{
UpdateNextFrame(TestFrameIdx++);
}
File.WriteAllLines(dumppath, dbgList);
}
else
{
UpdateNextFrame(0);
}
}
void UpdateNextFrame(int targetFrame)
{
//如果已经超过
while (targetFrame >= nextStep.FrameStartID)
{
if (nextStep.FrameStartID >= handler.AllFrame)
{
bEnd = true;
break;
}
mBinaryReader.Read(mNextOutbytes, 0, mSingleDataLenght);
switch (mFormat)
{
case ReplayFormat.FM32IP64:
{
nextStep.FrameStartID = BitConverter.ToInt32(mNextOutbytes, 0);
nextStep.InPut = BitConverter.ToUInt64(mNextOutbytes, sizeof(UInt32));
}
break;
case ReplayFormat.FM32IP32:
{
nextStep.All64Data = BitConverter.ToUInt64(mNextOutbytes, 0);
}
break;
case ReplayFormat.FM32IP16:
{
nextStep.All64Data = BitConverter.ToUInt64(mNextOutbytes, 0);
}
break;
case ReplayFormat.FM32IPBYTE:
{
nextStep.All64Data = BitConverter.ToUInt64(mNextOutbytes, 0);
}
break;
}
dbgList.Add($"{nextStep.FrameStartID} | {nextStep.InPut}");
targetFrame++;
}
}
int byFrameIdx = 0;
/// <summary>
/// 往前推进1帧的Input(返回是否变化)
/// </summary>
public bool NextFrame(out ReplayStep data)
{
return TakeFrame(1, out data);
}
/// <summary>
/// 往前推进指定帧数量的Input (返回是否变化)
/// </summary>
/// <param name="addFrame"></param>
public bool TakeFrame(int addFrame, out ReplayStep data)
{
bool Changed = false;
mCurrFrame += addFrame;
if (mCurrFrame >= nextStep.FrameStartID)
{
Changed = currStep.InPut != nextStep.InPut;
currStep = nextStep;
data = currStep;
UpdateNextFrame(mCurrFrame);
}
else
{
data = currStep;
}
return Changed;
}
/// <summary>
/// 往前推进帧的,指定帧下标
/// </summary>
public bool NextFramebyFrameIdx(int FrameID, out ReplayStep data)
{
bool res = TakeFrame(FrameID - byFrameIdx, out data);
byFrameIdx = FrameID;
return res;
}
public void Dispose()
{
mStream.Dispose();
mBinaryReader.Dispose();
//TODO
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 66e0e18d1f5981745a3078e8460cb0e6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,158 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
namespace AxiReplay
{
public class ReplayWriter : IReplayWriter
{
public ReplayData.ReplayFormat mFormat { get; private set; }
public Encoding TexEncoding { get; private set; }
ReplayHandler handler;
string mTitle;
string mNote;
int mAllFrame;
int mAllTime;
long mData;
int mSingleInputLenght;
int mSingleDataLenght;
MemoryStream mStream;
BinaryWriter mBinaryWriter;
int mCurrFrame;
UInt64 mCurrInput;
ReplayStep wirteStep;
List<string> dbgList = new List<string>();
public ReplayWriter(string Title, string Note, ReplayData.ReplayFormat format, Encoding encoding)
{
mTitle = Title;
mNote = Note;
TexEncoding = encoding;
mFormat = format;
switch (mFormat)
{
case ReplayData.ReplayFormat.FM32IP64: mSingleInputLenght = sizeof(UInt64); break;
case ReplayData.ReplayFormat.FM32IP32: mSingleInputLenght = sizeof(UInt32); break;
case ReplayData.ReplayFormat.FM32IP16: mSingleInputLenght = sizeof(UInt16); break;
case ReplayData.ReplayFormat.FM32IPBYTE: mSingleInputLenght = sizeof(byte); break;
}
mSingleDataLenght = (sizeof(UInt32)) + mSingleInputLenght;
mStream = new MemoryStream();
mBinaryWriter = new BinaryWriter(mStream);
mCurrFrame = -1;
mCurrInput = int.MaxValue;
wirteStep = new ReplayStep();
dbgList.Clear();
}
int byFrameIdx = 0;
/// <summary>
/// 往前推进帧的,指定帧下标
/// </summary>
/// <param name="frameInput"></param>
public void NextFramebyFrameIdx(int FrameID, UInt64 frameInput)
{
TakeFrame(FrameID - byFrameIdx, frameInput);
byFrameIdx = FrameID;
}
/// <summary>
/// 往前推进1帧的Input
/// </summary>
/// <param name="frameInput"></param>
public void NextFrame(UInt64 frameInput)
{
TakeFrame(1, frameInput);
}
/// <summary>
/// 往前推进指定帧数量的Input
/// </summary>
/// <param name="frameInput"></param>
public void TakeFrame(int addFrame, UInt64 frameInput)
{
if (addFrame < 0)
{
}
mCurrFrame += addFrame;
if (mCurrInput == frameInput)
return;
mCurrInput = frameInput;
wirteStep.FrameStartID = mCurrFrame;
wirteStep.InPut = mCurrInput;
dbgList.Add($"{mCurrFrame} | {mCurrInput}");
switch (mFormat)
{
case ReplayData.ReplayFormat.FM32IP64:
mBinaryWriter.Write(wirteStep.FrameStartID);
mBinaryWriter.Write(wirteStep.InPut);
break;
case ReplayData.ReplayFormat.FM32IP32:
mBinaryWriter.Write(BitConverter.GetBytes(wirteStep.All64Data), 0, 4 + 4);
break;
case ReplayData.ReplayFormat.FM32IP16:
mBinaryWriter.Write(BitConverter.GetBytes(wirteStep.All64Data), 0, 4 + 2);
break;
case ReplayData.ReplayFormat.FM32IPBYTE:
mBinaryWriter.Write(BitConverter.GetBytes(wirteStep.All64Data), 0, 4 + 1);
break;
}
}
public void SaveData(string path, bool bWithDump = false, string dumppath = null)
{
byte[] titleData; int titleLenghtWithEnd;
ReplayData.GetStringByteData(mTitle, out titleData, out titleLenghtWithEnd, TexEncoding);
byte[] noteData; int noteLenghtWithEnd;
ReplayData.GetStringByteData(mNote, out noteData, out noteLenghtWithEnd, TexEncoding);
ReplayHandler handler = new ReplayHandler();
handler.Format = (int)this.mFormat;
handler.DataOffset = ReplayData.HandlerLenght;
handler.CreateTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
handler.AllFrame = wirteStep.FrameStartID;
handler.SingleLenght = mSingleDataLenght;
using (FileStream fs = new FileStream(path, FileMode.Create))
{
using (BinaryWriter bw = new BinaryWriter(fs))
{
//写入Handler
bw.Write(ReplayData.GetHandlerData(handler));
//写入Data
bw.Write(mStream.ToArray());
}
}
if (bWithDump)
{
List<string> temp = new List<string>();
temp.Add($"Format => {handler.Format}");
temp.Add($"DataOffset => {handler.DataOffset}");
temp.Add($"CreateTime => {handler.CreateTime}");
temp.Add($"AllFrame => {handler.AllFrame}");
temp.Add($"SingleLenght => {handler.SingleLenght}");
dbgList.InsertRange(0, temp);
File.WriteAllLines(dumppath, dbgList);
}
}
public void Dispose()
{
mStream.Dispose();
mBinaryWriter.Dispose();
//TODO
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: dc53a3d9a3e1749438b6ad1cef7b39bc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1a06e18767c1031478a76b8f96e60fe6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 464892be6eabb2d43a4f71878bcfea72
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 96837540e9d9b4d199c332f11ef9047a
folderAsset: yes
timeCreated: 1487124681
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,498 @@
# Changelog
## [v3.2.0](https://github.com/mob-sakai/UIEffect/tree/v3.2.0) (2019-07-17)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.1.0...v3.2.0)
**Breaking changes:**
- UICapturedImage: Immediate capturing option is removed as it does not work on many platforms [\#161](https://github.com/mob-sakai/UIEffect/issues/161)
**Implemented enhancements:**
- Add demo for Unity 2018+ and TMPro 1.2+ [\#166](https://github.com/mob-sakai/UIEffect/issues/166)
**Fixed bugs:**
- UIDissolve's "Reverse Play" option works only in OnEnable [\#183](https://github.com/mob-sakai/UIEffect/issues/183)
- CanvasGroup.alpha does not affect [\#180](https://github.com/mob-sakai/UIEffect/issues/180)
- UIShiny effect remain on screen after calling Stop\(\) [\#165](https://github.com/mob-sakai/UIEffect/issues/165)
- Material caching is not working properly [\#163](https://github.com/mob-sakai/UIEffect/issues/163)
- Add a null check to TMPro sprite asset material checking [\#176](https://github.com/mob-sakai/UIEffect/pull/176) ([Oskiii](https://github.com/Oskiii))
## [v3.1.0](https://github.com/mob-sakai/UIEffect/tree/v3.1.0) (2019-03-10)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.4...v3.1.0)
## Support TextMeshPro!
* All components are supported
* Advanced blur is supported for Unity 2017.1+
![](https://user-images.githubusercontent.com/12690315/53533025-8495d800-3b3c-11e9-9e94-320f3ec7ad74.png)
For details to use, see [Usage with TextMeshPro](https://github.com/mob-sakai/UIEffect#usage-with-textmeshpro)
**NOTE: Unity 5.x will not be supported in the near future**
**Implemented enhancements:**
- Support TextMeshPro [\#137](https://github.com/mob-sakai/UIEffect/issues/137)
- add reverse animation option to UIDissolve [\#153](https://github.com/mob-sakai/UIEffect/pull/153) ([antpaw](https://github.com/antpaw))
## [v3.0.4](https://github.com/mob-sakai/UIEffect/tree/v3.0.4) (2019-02-15)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.3...v3.0.4)
**Implemented enhancements:**
- add initial play animation delay option to UIShiny [\#147](https://github.com/mob-sakai/UIEffect/pull/147) ([antpaw](https://github.com/antpaw))
**Fixed bugs:**
- UIEffectCapturedImage.effectColor does not work as expected [\#148](https://github.com/mob-sakai/UIEffect/issues/148)
- fix warnings [\#146](https://github.com/mob-sakai/UIEffect/pull/146) ([antpaw](https://github.com/antpaw))
## [v3.0.3](https://github.com/mob-sakai/UIEffect/tree/v3.0.3) (2019-01-21)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.2...v3.0.3)
**Fixed bugs:**
- UIHsvModifier works only on gamma-space [\#145](https://github.com/mob-sakai/UIEffect/issues/145)
## [v3.0.2](https://github.com/mob-sakai/UIEffect/tree/v3.0.2) (2019-01-15)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.1...v3.0.2)
**Fixed bugs:**
- UIEffect & UIHsvModifier & UITransitionEffect Strange action [\#144](https://github.com/mob-sakai/UIEffect/issues/144)
## [v3.0.1](https://github.com/mob-sakai/UIEffect/tree/v3.0.1) (2018-11-07)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.0...v3.0.1)
**Fixed bugs:**
- Compile error in 2018.3 [\#139](https://github.com/mob-sakai/UIEffect/issues/139)
## [v3.0.0](https://github.com/mob-sakai/UIEffect/tree/v3.0.0) (2018-10-09)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.3...v3.0.0)
### New architecture: easier, faster and more beautiful.
* Simple & easy-to-use
* 20% faster
* High precision parameter
### Immediate capturing (UIEffectCapturedImage option)
* Capture the previous frame immediately without any camera.
* You no longer have to wait one frame to capture!
* *NOTE: LWRP, WebGL and Unity 5.x for iOS/Mac are not supported.*
### Advanced blur (UIEffect option)
* Remove common artifacts in the blur effect for uGUI.
![](https://user-images.githubusercontent.com/12690315/42547121-80134788-84fb-11e8-97a0-048bba9634ea.png)
* It is effective for small padding size atlases, including dynamic fonts!
**Breaking changes:**
- UIEffectCapturedImage: Remove 'TargetTexture' feature [\#136](https://github.com/mob-sakai/UIEffect/issues/136)
- Remove 'additional shadow' in UIShadow component [\#110](https://github.com/mob-sakai/UIEffect/issues/110)
- Remove 'custom effect' feature in UIEffect component [\#98](https://github.com/mob-sakai/UIEffect/issues/98)
- Remove 'shadow effect' feature in UIEffect component [\#97](https://github.com/mob-sakai/UIEffect/issues/97)
- Remove 'hue effect' in UIEffect component [\#91](https://github.com/mob-sakai/UIEffect/issues/91)
- Remove 'cutoff' and 'mono' effect in UIEffect component [\#78](https://github.com/mob-sakai/UIEffect/issues/78)
- New architecture: Shared texture for effect parameter [\#63](https://github.com/mob-sakai/UIEffect/issues/63)
- Change: Change `ToneMode` to `EffectMode` [\#61](https://github.com/mob-sakai/UIEffect/issues/61)
- Separate shadow effect to other component [\#52](https://github.com/mob-sakai/UIEffect/issues/52)
- Use the graphic color as effect color, to reduce parameters [\#50](https://github.com/mob-sakai/UIEffect/issues/50)
**Implemented enhancements:**
- UITransitionEffect: "Pass ray on hidden" option [\#135](https://github.com/mob-sakai/UIEffect/issues/135)
- Add component menu in editor [\#133](https://github.com/mob-sakai/UIEffect/issues/133)
- UITransitionEffect: Add Show/Hide method [\#132](https://github.com/mob-sakai/UIEffect/issues/132)
- UIEffectCapturedImage: Immediate capturing [\#130](https://github.com/mob-sakai/UIEffect/issues/130)
- Improve blurring for atlas [\#95](https://github.com/mob-sakai/UIEffect/issues/95)
- Use Canvas.willRenderCanvases event instead of Update method [\#87](https://github.com/mob-sakai/UIEffect/issues/87)
**Closed issues:**
- Add tooltip [\#92](https://github.com/mob-sakai/UIEffect/issues/92)
- UIShiny: change parameter name `highlight` to `gloss` [\#93](https://github.com/mob-sakai/UIEffect/issues/93)
## [v2.8.3](https://github.com/mob-sakai/UIEffect/tree/v2.8.3) (2018-09-29)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.2...v2.8.3)
**Fixed bugs:**
- UIEffectCapturedImage: Black screen with Unity 2018.1+ editor on Windows [\#131](https://github.com/mob-sakai/UIEffect/issues/131)
## [v2.8.2](https://github.com/mob-sakai/UIEffect/tree/v2.8.2) (2018-09-26)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.1...v2.8.2)
**Fixed bugs:**
- UICapturedEffectImage does not work with 'ScreenSpace - Overlay' in edit mode [\#128](https://github.com/mob-sakai/UIEffect/issues/128)
- The UIEffectCapturedImage is upside down with 'ScreenSpace - Overlay' mode [\#127](https://github.com/mob-sakai/UIEffect/issues/127)
- When "UI-Effect.mat" is created automatically, Unity hangs up. [\#126](https://github.com/mob-sakai/UIEffect/issues/126)
- UICapturedEffectImage does not work with Lightweight Render Pipeline LWRP [\#125](https://github.com/mob-sakai/UIEffect/issues/125)
## [v2.8.1](https://github.com/mob-sakai/UIEffect/tree/v2.8.1) (2018-08-17)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.0...v2.8.1)
**Fixed bugs:**
- \(Demo\) "Transition capture & dissolve" is incorrect [\#119](https://github.com/mob-sakai/UIEffect/issues/119)
## [v2.8.0](https://github.com/mob-sakai/UIEffect/tree/v2.8.0) (2018-08-14)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.7.1...v2.8.0)
* Create a screen transition!
![8 -08-2018 19-29-38](https://user-images.githubusercontent.com/12690315/43832265-dbdecc98-9b41-11e8-8ab5-9f49420a6a16.gif)
* Some updates make UIEffectCapturedImage easier to use!
**Implemented enhancements:**
- UIEffectCapturedImage: Supports 'ScreenSpace - Overlay' [\#115](https://github.com/mob-sakai/UIEffect/issues/115)
- UIEffectCapturedImage: Keep aspect ratio [\#114](https://github.com/mob-sakai/UIEffect/issues/114)
- UIEffectCapturedImage: 'Capture on enable' option [\#113](https://github.com/mob-sakai/UIEffect/issues/113)
- UITransitionEffect: Change transition texture [\#111](https://github.com/mob-sakai/UIEffect/issues/111)
**Closed issues:**
- UIEffectCapturedImage: change parameter name `keepCanvasSize` to `fitToScreen` [\#116](https://github.com/mob-sakai/UIEffect/issues/116)
## [v2.7.1](https://github.com/mob-sakai/UIEffect/tree/v2.7.1) (2018-08-06)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.7.0...v2.7.1)
**Fixed bugs:**
- In v2.7.0, UIEffectCapturedImage is flipped vertically on Windows [\#112](https://github.com/mob-sakai/UIEffect/issues/112)
## [v2.7.0](https://github.com/mob-sakai/UIEffect/tree/v2.7.0) (2018-07-26)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.2...v2.7.0)
UIHsvModifier: Modify hue, saturation, and value as you like!
![](https://user-images.githubusercontent.com/12690315/43200006-d6e2bf54-904e-11e8-9f22-0c0f9ce5912f.gif)
* Note: `Hue` mode in UIEffect component will be obsolete in the near future. Please use UIHsvModifier component instead.
* Note: `Cutoff` and `Mono` mode in UIEffect component will be obsolete in the near future. Please use UITransitionEffect component instead.
**Implemented enhancements:**
- UIEffectCapturedImage: Support target RenderTexture to use external component [\#108](https://github.com/mob-sakai/UIEffect/issues/108)
- Transition effect as other component [\#105](https://github.com/mob-sakai/UIEffect/issues/105)
- Use multi-pass blurring to capture screenshot [\#96](https://github.com/mob-sakai/UIEffect/issues/96)
- Feature: HSV modifier [\#44](https://github.com/mob-sakai/UIEffect/issues/44)
**Fixed bugs:**
- UIEffectCapturedImage: ColorMode is not working [\#109](https://github.com/mob-sakai/UIEffect/issues/109)
- UIDissolve is not maskable [\#101](https://github.com/mob-sakai/UIEffect/issues/101)
## [v2.6.2](https://github.com/mob-sakai/UIEffect/tree/v2.6.2) (2018-07-18)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.1...v2.6.2)
**Fixed bugs:**
- Shader has compile errors in D3D9 or D3D11\_9X\(WSA\) [\#99](https://github.com/mob-sakai/UIEffect/issues/99)
## [v2.6.1](https://github.com/mob-sakai/UIEffect/tree/v2.6.1) (2018-06-14)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.0...v2.6.1)
**Fixed bugs:**
- Errors occurred on build \(v2.6.0\) [\#90](https://github.com/mob-sakai/UIEffect/issues/90)
## [v2.6.0](https://github.com/mob-sakai/UIEffect/tree/v2.6.0) (2018-06-14)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.5.2...v2.6.0)
Blurring effect has been improved about 6 times faster!
![](https://user-images.githubusercontent.com/12690315/41393724-08420b1e-6fe2-11e8-8741-721789c2d029.png)
You can change noise texture for dissolve effect from inspector or script!
![](https://user-images.githubusercontent.com/12690315/41397570-99bda636-6fef-11e8-827b-932d7a8e74c1.gif)
**Implemented enhancements:**
- Improve blurring performance [\#88](https://github.com/mob-sakai/UIEffect/issues/88)
- Separate the effect with a character [\#86](https://github.com/mob-sakai/UIEffect/issues/86)
- Change dissolve texture [\#75](https://github.com/mob-sakai/UIEffect/issues/75)
**Closed issues:**
- Change BlurMode correctly [\#84](https://github.com/mob-sakai/UIEffect/issues/84)
- Refactoring to prepare v3.0.0 [\#83](https://github.com/mob-sakai/UIEffect/issues/83)
- Change ColorMode correctly [\#51](https://github.com/mob-sakai/UIEffect/issues/51)
## [v2.5.2](https://github.com/mob-sakai/UIEffect/tree/v2.5.2) (2018-06-07)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.5.1...v2.5.2)
**Fixed bugs:**
- When `UIEFFECT\_SEPARATE` symbol is defined, UIDissolve does not work well [\#85](https://github.com/mob-sakai/UIEffect/issues/85)
## [v2.5.1](https://github.com/mob-sakai/UIEffect/tree/v2.5.1) (2018-05-31)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.5.0...v2.5.1)
**Fixed bugs:**
- Fix demo [\#82](https://github.com/mob-sakai/UIEffect/issues/82)
## [v2.5.0](https://github.com/mob-sakai/UIEffect/tree/v2.5.0) (2018-05-31)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.4.1...v2.5.0)
Shiny effect has been update!
![v2.5.0](https://user-images.githubusercontent.com/12690315/40654533-8877c99c-6379-11e8-8ae7-b91995fc230b.gif)
* NOTE: `UIEffect.shadow***` will be obsolete in the near future. Please use `UIShadow` component instead.
* NOTE: `UIEffect.custom***` will be obsolete in the near future. Please use `UICustomEffect` component (experimental) instead.
**Implemented enhancements:**
- UIDissolve: Play effect from script/inspector [\#81](https://github.com/mob-sakai/UIEffect/issues/81)
- UIShiny: Play effect from script/inspector [\#80](https://github.com/mob-sakai/UIEffect/issues/80)
- During play mode, you can change the effect type, color type, and blur type \(in Editor\) [\#73](https://github.com/mob-sakai/UIEffect/issues/73)
- Add shadow effect as other component [\#72](https://github.com/mob-sakai/UIEffect/issues/72)
- UIShiny : Visual update [\#68](https://github.com/mob-sakai/UIEffect/issues/68)
- Add Custom effect as other component [\#60](https://github.com/mob-sakai/UIEffect/issues/60)
**Fixed bugs:**
- UIDissolve: When width=1 and location=0, image is lacked [\#79](https://github.com/mob-sakai/UIEffect/issues/79)
**Closed issues:**
- UIEffect inherit UIEffectBase [\#74](https://github.com/mob-sakai/UIEffect/issues/74)
- Change directory structure [\#56](https://github.com/mob-sakai/UIEffect/issues/56)
## [v2.4.1](https://github.com/mob-sakai/UIEffect/tree/v2.4.1) (2018-05-29)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.4.0...v2.4.1)
**Fixed bugs:**
- UIEffectCapturedImage: The result image is flipped vertically [\#69](https://github.com/mob-sakai/UIEffect/issues/69)
## [v2.4.0](https://github.com/mob-sakai/UIEffect/tree/v2.4.0) (2018-05-21)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.2...v2.4.0)
UIDissolve has been updated!
![v2.4.0](https://user-images.githubusercontent.com/12690315/40294019-a0bfb8aa-5d0e-11e8-8451-873502db6a99.gif)
![editor](https://user-images.githubusercontent.com/12690315/40294212-9e1b1ce2-5d0f-11e8-88ce-78a8c0523dc2.png)
**Implemented enhancements:**
- UIDissolve: Add color mode option. [\#64](https://github.com/mob-sakai/UIEffect/issues/64)
## [v2.3.2](https://github.com/mob-sakai/UIEffect/tree/v2.3.2) (2018-05-21)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.1...v2.3.2)
**Closed issues:**
- Fixed: UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically \(other method\) [\#65](https://github.com/mob-sakai/UIEffect/issues/65)
## [v2.3.1](https://github.com/mob-sakai/UIEffect/tree/v2.3.1) (2018-05-10)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.0...v2.3.1)
**Fixed bugs:**
- UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically \(on Windows\) [\#62](https://github.com/mob-sakai/UIEffect/issues/62)
## [v2.3.0](https://github.com/mob-sakai/UIEffect/tree/v2.3.0) (2018-05-08)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.2.0...v2.3.0)
New components has been available!
* **UIShiny** : Shiny effect WITHOUT Mask component. This will suppress extra draw calls and improve performance.
* **UIDissolve** : Dissolve effect WITHOUT material instancing. This will suppress extra draw calls and improve performance.
* **UIFlip** : Flip graphic horizontal/vertical.
![v2.3.0](https://user-images.githubusercontent.com/12690315/40706142-cb98d2d0-6427-11e8-96fc-5cc5fd9c553a.gif)
**Implemented enhancements:**
- Feature: Flip horizontal/vertical [\#47](https://github.com/mob-sakai/UIEffect/issues/47)
- Feature: Dissolve [\#45](https://github.com/mob-sakai/UIEffect/issues/45)
- Feature: Shining effect [\#9](https://github.com/mob-sakai/UIEffect/issues/9)
## [v2.2.0](https://github.com/mob-sakai/UIEffect/tree/v2.2.0) (2018-04-12)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.1.0...v2.2.0)
**Implemented enhancements:**
- Feature: Customize shader/material. You can create a custom ui shader and control it with UIEffct. [\#46](https://github.com/mob-sakai/UIEffect/issues/46)
- Feature: UIEffectCapturedImage supports keep canvas size. [\#54](https://github.com/mob-sakai/UIEffect/issues/54)
- Feature: UIEffectCapturedImage supports `Quality Type` to easy setup. [\#53](https://github.com/mob-sakai/UIEffect/issues/53)
**Fixed bugs:**
- Bug: Color effect on shadow is incorrect. [\#55](https://github.com/mob-sakai/UIEffect/issues/55)
**Closed issues:**
- Change: Reduce the pixelation effect when tone level = 1. [\#57](https://github.com/mob-sakai/UIEffect/issues/57)
## [v2.1.0](https://github.com/mob-sakai/UIEffect/tree/v2.1.0) (2018-04-04)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.0.0...v2.1.0)
**Implemented enhancements:**
- Feature: UIEffectCapturedImage support iterative operation [\#48](https://github.com/mob-sakai/UIEffect/issues/48)
## [v2.0.0](https://github.com/mob-sakai/UIEffect/tree/v2.0.0) (2018-01-25)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.6.1...v2.0.0)
**Breaking changes:**
- Important: Unity 5.3.x & 5.4.x are no longer supported. [\#40](https://github.com/mob-sakai/UIEffect/issues/40)
**Implemented enhancements:**
- Improve: Reduce the materials. Too many effect materials are exist. [\#15](https://github.com/mob-sakai/UIEffect/issues/15)
**Closed issues:**
- Change: Change namespace to Coffee.UIExtensions [\#6](https://github.com/mob-sakai/UIEffect/issues/6)
## [v1.6.1](https://github.com/mob-sakai/UIEffect/tree/v1.6.1) (2018-01-25)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.6.0...v1.6.1)
**Fixed bugs:**
- Bug: Cannot access protected member `UnityEngine.UI.BaseMeshEffect.graphic` [\#41](https://github.com/mob-sakai/UIEffect/issues/41)
## [v1.6.0](https://github.com/mob-sakai/UIEffect/tree/v1.6.0) (2018-01-18)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.5.1...v1.6.0)
**Fixed bugs:**
- Bug: Pixelization is incorrect. [\#34](https://github.com/mob-sakai/UIEffect/issues/34)
**Closed issues:**
- Change: UIEffect inherit BaseMeshEffect. [\#35](https://github.com/mob-sakai/UIEffect/issues/35)
- Change: Blur level range to \[0-1\] [\#32](https://github.com/mob-sakai/UIEffect/issues/32)
- Change: ShadowMode -\> ShadowStyle [\#18](https://github.com/mob-sakai/UIEffect/issues/18)
## [v1.5.1](https://github.com/mob-sakai/UIEffect/tree/v1.5.1) (2018-01-18)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.5.0...v1.5.1)
**Fixed bugs:**
- Bug: An error occurs when no effect is specified for UICapturedImage. [\#36](https://github.com/mob-sakai/UIEffect/issues/36)
## [v1.5.0](https://github.com/mob-sakai/UIEffect/tree/v1.5.0) (2018-01-16)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.4.4...v1.5.0)
**Implemented enhancements:**
- Feature: ShadowMode 'Shadow 3' [\#11](https://github.com/mob-sakai/UIEffect/issues/11)
- Feature: Hue [\#8](https://github.com/mob-sakai/UIEffect/issues/8)
- Feature: Gradient [\#7](https://github.com/mob-sakai/UIEffect/issues/7)
## [v1.4.4](https://github.com/mob-sakai/UIEffect/tree/v1.4.4) (2018-01-16)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.4.3...v1.4.4)
**Fixed bugs:**
- Bug: Error has occur on edit prefab. [\#27](https://github.com/mob-sakai/UIEffect/issues/27)
## [v1.4.3](https://github.com/mob-sakai/UIEffect/tree/v1.4.3) (2018-01-15)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.4.2...v1.4.3)
**Fixed bugs:**
- Bug: Color effect is incorrect. [\#19](https://github.com/mob-sakai/UIEffect/issues/19)
## [v1.4.2](https://github.com/mob-sakai/UIEffect/tree/v1.4.2) (2018-01-14)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.4.1...v1.4.2)
**Implemented enhancements:**
- Feature: ColorMode `Override` [\#12](https://github.com/mob-sakai/UIEffect/issues/12)
**Fixed bugs:**
- Bug: Error has occur OnAfterDeserialize in editor. [\#16](https://github.com/mob-sakai/UIEffect/issues/16)
## [v1.4.1](https://github.com/mob-sakai/UIEffect/tree/v1.4.1) (2018-01-10)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.4.0...v1.4.1)
## [v1.4.0](https://github.com/mob-sakai/UIEffect/tree/v1.4.0) (2018-01-07)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.3.0...v1.4.0)
**Implemented enhancements:**
- Feature: Exclude unused shader variants from build. [\#5](https://github.com/mob-sakai/UIEffect/issues/5)
## [v1.3.0](https://github.com/mob-sakai/UIEffect/tree/v1.3.0) (2018-01-06)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.2.0...v1.3.0)
## [v1.2.0](https://github.com/mob-sakai/UIEffect/tree/v1.2.0) (2018-01-05)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.1.0...v1.2.0)
**Implemented enhancements:**
- Feature: Fast multiple shadow effect. [\#2](https://github.com/mob-sakai/UIEffect/issues/2)
**Fixed bugs:**
- Pixelaration shifts to the lower right. [\#4](https://github.com/mob-sakai/UIEffect/issues/4)
## [v1.1.0](https://github.com/mob-sakai/UIEffect/tree/v1.1.0) (2017-08-17)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v1.0.0...v1.1.0)
**Implemented enhancements:**
- Feature: Pixelization effect [\#1](https://github.com/mob-sakai/UIEffect/issues/1)
## [v1.0.0](https://github.com/mob-sakai/UIEffect/tree/v1.0.0) (2017-03-01)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/a9c4ec4e72a055ca5e5c24f6a75c6720f0f6fd7f...v1.0.0)
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1fe75f65a37454bf5aa2dab183b4305a
timeCreated: 1522651812
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 37c4bd2925c96431b827a2031f76add8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: b00cb7cc19de648f38332743361bdacb
folderAsset: yes
timeCreated: 1547811341
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,169 @@
#if TMP_PRESENT
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro.EditorUtilities;
using UnityEditor;
using Coffee.UIExtensions;
using System.IO;
using System.Linq;
using System;
namespace Coffee.UIEffect.Editors
{
public class TMP_SDFShaderGUI : TMPro.EditorUtilities.TMP_SDFShaderGUI
{
static GUIStyle s_PanelTitle;
Material currentMaterial;
public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
{
currentMaterial = materialEditor.target as Material;
base.OnGUI(materialEditor, properties);
}
protected override void DoGUI()
{
if (currentMaterial.HasProperty("_FaceColor"))
{
base.DoGUI();
}
else
{
DrawSpritePanel();
}
var name = currentMaterial.shader.name;
if (name.EndsWith("(UIEffect)"))
{
DrawEffectPanel();
}
else if (name.EndsWith("(UIDissolve)"))
{
DrawDissolvePanel();
}
else if (name.EndsWith("(UIShiny)"))
{
DrawShinyPanel();
}
else if (name.EndsWith("(UITransition)"))
{
DrawTransitionPanel();
}
}
void DrawSpritePanel()
{
if (BeginTmpPanel("Sprite", true))
{
EditorGUI.indentLevel += 1;
DoTexture2D("_MainTex", "Texture");
DoColor("_Color", "Color");
EditorGUI.indentLevel -= 1;
}
EndTmpPanel();
}
void DrawDissolvePanel()
{
if (BeginTmpPanel("Dissolve", true))
{
EditorGUI.indentLevel += 1;
DoTexture2D("_NoiseTex", "Texture");
DrawEnum<ColorMode>(currentMaterial);
EditorGUI.indentLevel -= 1;
}
EndTmpPanel();
}
void DrawShinyPanel()
{
}
void DrawTransitionPanel()
{
if (BeginTmpPanel("Transition", true))
{
EditorGUI.indentLevel += 1;
DoTexture2D("_NoiseTex", "Texture");
DrawEnum<UITransitionEffect.EffectMode>(currentMaterial);
EditorGUI.indentLevel -= 1;
}
EndTmpPanel();
}
void DrawEffectPanel()
{
if (BeginTmpPanel("Effect", true))
{
EditorGUI.indentLevel += 1;
DrawEnum<EffectMode>(currentMaterial);
DrawEnum<ColorMode>(currentMaterial);
DrawEnum<BlurMode>(currentMaterial);
DrawToggleKeyword(currentMaterial, "Advanced Blur", "EX");
EditorGUI.indentLevel -= 1;
}
EndTmpPanel();
}
static void DrawEnum<T>(Material mat)
{
Type type = typeof(T);
string[] names = System.Enum.GetNames(type);
int[] values = System.Enum.GetValues(type) as int[];
int mode = 0;
for (int i = 0; i < names.Length; i++)
{
if (mat.IsKeywordEnabled(names[i].ToUpper()))
mode = values[i];
}
var newMode = EditorGUILayout.IntPopup(ObjectNames.NicifyVariableName(type.Name), mode, names, values);
if (mode != newMode)
{
Array.IndexOf<int>(values, mode);
mat.DisableKeyword(names[Array.IndexOf<int>(values, mode)].ToUpper());
if (newMode != 0)
mat.EnableKeyword(names[Array.IndexOf<int>(values, newMode)].ToUpper());
}
}
static void DrawToggleKeyword(Material mat, string label, string keyword)
{
bool value = mat.IsKeywordEnabled(keyword);
if (EditorGUILayout.Toggle(label, value) != value)
{
if (value)
mat.DisableKeyword(keyword);
else
mat.EnableKeyword(keyword);
}
}
static bool BeginTmpPanel(string panel, bool expanded)
{
if (s_PanelTitle == null)
{
s_PanelTitle = new GUIStyle(EditorStyles.label) { fontStyle = FontStyle.Bold };
}
EditorGUILayout.BeginVertical(EditorStyles.helpBox);
Rect position = EditorGUI.IndentedRect(GUILayoutUtility.GetRect(20f, 18f));
position.x += 20;
position.width += 6f;
expanded = GUI.Toggle(position, expanded, panel, s_PanelTitle);
EditorGUI.indentLevel++;
EditorGUI.BeginDisabledGroup(false);
return expanded;
}
static void EndTmpPanel()
{
EditorGUI.EndDisabledGroup();
EditorGUI.indentLevel--;
EditorGUILayout.EndVertical();
}
}
}
#endif

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0163d601911a448eea37923cb9fd6760
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
Copyright 2017 mob-sakai
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5c8ea34522dd786479be28b1347542b7
timeCreated: 1515125149
licenseType: Free
TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 39ac2ac7853a94fbc9d9e3d1151b9dfe
folderAsset: yes
timeCreated: 1515203270
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,170 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 8
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Dissolve
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21162286589123374
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Dissolve-Fill
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: FILL
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21841578701121694
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Dissolve-Subtract
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: SUBTRACT
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21939717441729078
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Dissolve-Add
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: ADD
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17b17d6effbe14075a3bbdf1fda1f6e1
timeCreated: 1526828325
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,89 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-HSV
m_Shader: {fileID: 4800000, guid: 7fc74090480c84f8b977cfcd55cdfe82, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c8243c28075b3431084ded42f46ad567
timeCreated: 1531885800
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,40 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Shiny
m_Shader: {fileID: 4800000, guid: 20ffe76c2439c403aabdd25bd94bf011, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9dc7e810a87b444ab96919f3215c2fe5
timeCreated: 1523859834
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,786 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 8
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21030718755001428
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Nega
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: NEGA
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21035471806006108
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Cutoff
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: CUTOFF
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransitionTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21048363040754768
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-DetailBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: DETAILBLUR
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21103468552951452
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-FastBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FASTBLUR
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21131850011850196
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Dissolve
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: DISSOLVE
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransitionTexture:
m_Texture: {fileID: 2800000, guid: a74d3d4a498866d44b094d3d3717604d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21165426070421698
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Sepia
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: SEPIA
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21217090983920726
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Add
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: ADD
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21383746192470066
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Fade
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FADE
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransitionTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21397352971802982
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-DetailBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: DETAILBLUR
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21433706607038904
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Hue
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: HUE
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21436055995319614
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Grayscale
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: GRAYSCALE
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21553036001917316
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-MediumBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: MEDIUMBLUR
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21582814526197946
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Grayscale-Fill-MediumBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FILL GRAYSCALE MEDIUMBLUR
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21593680702607820
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Cutoff-Fill
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: CUTOFF FILL
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21613091319250600
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Fill
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FILL
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21640785413581468
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Fill-DetailBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: DETAILBLUR FILL
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21660598935221184
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Fill-MediumBlur
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FILL MEDIUMBLUR
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21730298716655380
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Subtract
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: SUBTRACT
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21748420970599250
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Fade
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FADE
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21811646848630374
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Pixel
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: PIXEL
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!21 &21972152714168334
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI-Effect-Transition-Grayscale-Fill
m_Shader: {fileID: 4800000, guid: 85ad24dd0759947ddb117625e108d49c, type: 3}
m_ShaderKeywords: FILL GRAYSCALE
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 77a4cc77ec7394415a18f9e5a4b8083e
timeCreated: 1532512709
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aee96bc531e6eba468ec405e536f515f
timeCreated: 1516545204
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1a1a8e44196ca754a9a7b9cb80e17573
timeCreated: 1516545204
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: 3e04c247fb2604af186173fce0bc62de
timeCreated: 1524468976
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: 1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 2
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 10
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More