Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
guo450212436
et
提交
33860994
E
et
项目概览
guo450212436
/
et
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
et
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
33860994
编写于
8月 12, 2020
作者:
T
tanghai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复UI的bug
上级
c943b282
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
17 addition
and
20 deletion
+17
-20
Unity/Assets/Hotfix/Scene/LoginHelper.cs
Unity/Assets/Hotfix/Scene/LoginHelper.cs
+1
-1
Unity/Assets/Hotfix/Scene/MapHelper.cs
Unity/Assets/Hotfix/Scene/MapHelper.cs
+1
-1
Unity/Assets/HotfixView/Module/UI/UIComponentSystem.cs
Unity/Assets/HotfixView/Module/UI/UIComponentSystem.cs
+2
-1
Unity/Assets/HotfixView/UI/UIHelper.cs
Unity/Assets/HotfixView/UI/UIHelper.cs
+2
-4
Unity/Assets/HotfixView/UI/UILoading/LoadingBeginEvent_CreateLoadingUI.cs
...fixView/UI/UILoading/LoadingBeginEvent_CreateLoadingUI.cs
+1
-1
Unity/Assets/HotfixView/UI/UILoading/LoadingFinishEvent_RemoveLoadingUI.cs
...ixView/UI/UILoading/LoadingFinishEvent_RemoveLoadingUI.cs
+1
-1
Unity/Assets/HotfixView/UI/UILoading/UILoadingEvent.cs
Unity/Assets/HotfixView/UI/UILoading/UILoadingEvent.cs
+0
-1
Unity/Assets/HotfixView/UI/UILobby/EnterMapFinish_RemoveLobbyUI.cs
...ets/HotfixView/UI/UILobby/EnterMapFinish_RemoveLobbyUI.cs
+1
-1
Unity/Assets/HotfixView/UI/UILobby/LoginFinish_CreateLobbyUI.cs
...Assets/HotfixView/UI/UILobby/LoginFinish_CreateLobbyUI.cs
+1
-1
Unity/Assets/HotfixView/UI/UILobby/UILobbyEvent.cs
Unity/Assets/HotfixView/UI/UILobby/UILobbyEvent.cs
+3
-4
Unity/Assets/HotfixView/UI/UILogin/UILoginEvent.cs
Unity/Assets/HotfixView/UI/UILogin/UILoginEvent.cs
+3
-4
Unity/Assets/Model/EventType.cs
Unity/Assets/Model/EventType.cs
+1
-0
未找到文件。
Unity/Assets/Hotfix/Scene/LoginHelper.cs
浏览文件 @
33860994
...
...
@@ -25,7 +25,7 @@ namespace ET
Log
.
Info
(
"登陆gate成功!"
);
await
Game
.
EventSystem
.
Publish
(
new
EventType
.
LoginFinish
());
await
Game
.
EventSystem
.
Publish
(
new
EventType
.
LoginFinish
()
{
ZoneScene
=
zoneScene
}
);
}
catch
(
Exception
e
)
{
...
...
Unity/Assets/Hotfix/Scene/MapHelper.cs
浏览文件 @
33860994
...
...
@@ -26,7 +26,7 @@ namespace ET
//Game.Scene.AddComponent<OperaComponent>();
Game
.
EventSystem
.
Publish
(
new
EventType
.
EnterMapFinish
());
Game
.
EventSystem
.
Publish
(
new
EventType
.
EnterMapFinish
()
{
ZoneScene
=
zoneScene
}
);
}
catch
(
Exception
e
)
{
...
...
Unity/Assets/HotfixView/Module/UI/UIComponentSystem.cs
浏览文件 @
33860994
...
...
@@ -14,10 +14,11 @@ namespace ET
/// </summary>
public
static
class
UIComponentSystem
{
public
static
async
ETTask
Create
(
this
UIComponent
self
,
string
uiType
)
public
static
async
ETTask
<
UI
>
Create
(
this
UIComponent
self
,
string
uiType
)
{
UI
ui
=
await
UIEventComponent
.
Instance
.
OnCreate
(
self
,
uiType
);
self
.
UIs
.
Add
(
uiType
,
ui
);
return
ui
;
}
public
static
void
Remove
(
this
UIComponent
self
,
string
uiType
)
...
...
Unity/Assets/HotfixView/UI/UIHelper.cs
浏览文件 @
33860994
...
...
@@ -4,14 +4,12 @@ namespace ET
{
public
static
async
ETTask
<
UI
>
Create
(
Scene
scene
,
string
uiType
)
{
UIComponent
uiComponent
=
scene
.
GetComponent
<
UIComponent
>();
return
await
UIEventComponent
.
Instance
.
OnCreate
(
uiComponent
,
uiType
);
return
await
scene
.
GetComponent
<
UIComponent
>().
Create
(
uiType
);
}
public
static
async
ETTask
Remove
(
Scene
scene
,
string
uiType
)
{
UIComponent
uiComponent
=
scene
.
GetComponent
<
UIComponent
>();
UIEventComponent
.
Instance
.
OnRemove
(
uiComponent
,
uiType
);
scene
.
GetComponent
<
UIComponent
>().
Remove
(
uiType
);
}
}
}
\ No newline at end of file
Unity/Assets/HotfixView/UI/UILoading/LoadingBeginEvent_CreateLoadingUI.cs
浏览文件 @
33860994
...
...
@@ -6,7 +6,7 @@ namespace ET
{
public
override
async
ETTask
Run
(
EventType
.
LoadingBegin
args
)
{
await
args
.
Scene
.
GetComponent
<
UIComponent
>().
Create
(
UIType
.
UILoading
);
await
UIHelper
.
Create
(
args
.
Scene
,
UIType
.
UILoading
);
}
}
}
Unity/Assets/HotfixView/UI/UILoading/LoadingFinishEvent_RemoveLoadingUI.cs
浏览文件 @
33860994
...
...
@@ -4,7 +4,7 @@
{
public
override
async
ETTask
Run
(
EventType
.
LoadingFinish
args
)
{
a
rgs
.
Scene
.
GetComponent
<
UIComponent
>().
Remove
(
UIType
.
UILoading
);
a
wait
UIHelper
.
Create
(
args
.
Scene
,
UIType
.
UILoading
);
}
}
}
Unity/Assets/HotfixView/UI/UILoading/UILoadingEvent.cs
浏览文件 @
33860994
...
...
@@ -27,7 +27,6 @@ namespace ET
public
override
void
OnRemove
(
UIComponent
uiComponent
)
{
uiComponent
.
Remove
(
UIType
.
UILoading
);
}
}
}
\ No newline at end of file
Unity/Assets/HotfixView/UI/UILobby/EnterMapFinish_RemoveLobbyUI.cs
浏览文件 @
33860994
...
...
@@ -4,7 +4,7 @@
{
public
override
async
ETTask
Run
(
EventType
.
EnterMapFinish
args
)
{
Game
.
Scene
.
GetComponent
<
UIComponent
>().
Remove
(
UIType
.
UILobby
);
await
UIHelper
.
Remove
(
args
.
ZoneScene
,
UIType
.
UILobby
);
}
}
}
Unity/Assets/HotfixView/UI/UILobby/LoginFinish_CreateLobbyUI.cs
浏览文件 @
33860994
...
...
@@ -6,7 +6,7 @@ namespace ET
{
public
override
async
ETTask
Run
(
EventType
.
LoginFinish
args
)
{
await
Game
.
Scene
.
GetComponent
<
UIComponent
>().
Create
(
UIType
.
UILobby
);
await
UIHelper
.
Create
(
args
.
ZoneScene
,
UIType
.
UILobby
);
}
}
}
Unity/Assets/HotfixView/UI/UILobby/UILobbyEvent.cs
浏览文件 @
33860994
...
...
@@ -8,9 +8,8 @@ namespace ET
{
public
override
async
ETTask
<
UI
>
OnCreate
(
UIComponent
uiComponent
)
{
ResourcesComponent
resourcesComponent
=
Game
.
Scene
.
GetComponent
<
ResourcesComponent
>();
resourcesComponent
.
LoadBundle
(
UIType
.
UILobby
.
StringToAB
());
GameObject
bundleGameObject
=
(
GameObject
)
resourcesComponent
.
GetAsset
(
UIType
.
UILobby
.
StringToAB
(),
UIType
.
UILobby
);
ResourcesComponent
.
Instance
.
LoadBundle
(
UIType
.
UILobby
.
StringToAB
());
GameObject
bundleGameObject
=
(
GameObject
)
ResourcesComponent
.
Instance
.
GetAsset
(
UIType
.
UILobby
.
StringToAB
(),
UIType
.
UILobby
);
GameObject
gameObject
=
UnityEngine
.
Object
.
Instantiate
(
bundleGameObject
);
UI
ui
=
EntityFactory
.
CreateWithParent
<
UI
,
string
,
GameObject
>(
uiComponent
,
UIType
.
UILobby
,
gameObject
);
...
...
@@ -20,7 +19,7 @@ namespace ET
public
override
void
OnRemove
(
UIComponent
uiComponent
)
{
uiComponent
.
Remove
(
UIType
.
UILobby
);
ResourcesComponent
.
Instance
.
UnloadBundle
(
UIType
.
UILobby
.
StringToAB
()
);
}
}
}
\ No newline at end of file
Unity/Assets/HotfixView/UI/UILogin/UILoginEvent.cs
浏览文件 @
33860994
...
...
@@ -8,9 +8,8 @@ namespace ET
{
public
override
async
ETTask
<
UI
>
OnCreate
(
UIComponent
uiComponent
)
{
ResourcesComponent
resourcesComponent
=
Game
.
Scene
.
GetComponent
<
ResourcesComponent
>();
await
resourcesComponent
.
LoadBundleAsync
(
UIType
.
UILogin
.
StringToAB
());
GameObject
bundleGameObject
=
(
GameObject
)
resourcesComponent
.
GetAsset
(
UIType
.
UILogin
.
StringToAB
(),
UIType
.
UILogin
);
await
ResourcesComponent
.
Instance
.
LoadBundleAsync
(
UIType
.
UILogin
.
StringToAB
());
GameObject
bundleGameObject
=
(
GameObject
)
ResourcesComponent
.
Instance
.
GetAsset
(
UIType
.
UILogin
.
StringToAB
(),
UIType
.
UILogin
);
GameObject
gameObject
=
UnityEngine
.
Object
.
Instantiate
(
bundleGameObject
);
UI
ui
=
EntityFactory
.
CreateWithParent
<
UI
,
string
,
GameObject
>(
uiComponent
,
UIType
.
UILogin
,
gameObject
);
...
...
@@ -21,7 +20,7 @@ namespace ET
public
override
void
OnRemove
(
UIComponent
uiComponent
)
{
uiComponent
.
Remove
(
UIType
.
UILogin
);
ResourcesComponent
.
Instance
.
UnloadBundle
(
UIType
.
UILogin
.
StringToAB
()
);
}
}
}
\ No newline at end of file
Unity/Assets/Model/EventType.cs
浏览文件 @
33860994
...
...
@@ -38,6 +38,7 @@
public
struct
EnterMapFinish
{
public
Scene
ZoneScene
;
}
public
struct
AfterUnitCreate
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录