Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
林新发
UnityXFramework
提交
d6e61dba
U
UnityXFramework
项目概览
林新发
/
UnityXFramework
通知
1399
Star
143
Fork
77
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
U
UnityXFramework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d6e61dba
编写于
12月 13, 2021
作者:
林新发
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增红点系统
上级
c532d4b6
变更
28
展开全部
隐藏空白更改
内联
并排
Showing
28 changed file
with
4154 addition
and
531 deletion
+4154
-531
Assembly-CSharp-Editor.csproj
Assembly-CSharp-Editor.csproj
+200
-197
Assembly-CSharp.csproj
Assembly-CSharp.csproj
+190
-199
Assets/GameRes/Config/i18nAppStrings.bytes
Assets/GameRes/Config/i18nAppStrings.bytes
+1
-0
Assets/GameRes/Config/resources.bytes
Assets/GameRes/Config/resources.bytes
+1
-0
Assets/GameRes/UIPrefabs/GameHall/GameHallPanel.prefab
Assets/GameRes/UIPrefabs/GameHall/GameHallPanel.prefab
+164
-2
Assets/GameRes/UIPrefabs/Redpoint.meta
Assets/GameRes/UIPrefabs/Redpoint.meta
+8
-0
Assets/GameRes/UIPrefabs/Redpoint/RedpointPanel.prefab
Assets/GameRes/UIPrefabs/Redpoint/RedpointPanel.prefab
+3099
-0
Assets/GameRes/UIPrefabs/Redpoint/RedpointPanel.prefab.meta
Assets/GameRes/UIPrefabs/Redpoint/RedpointPanel.prefab.meta
+7
-0
Assets/LuaFramework/Lua/Common/LuaClass.lua
Assets/LuaFramework/Lua/Common/LuaClass.lua
+43
-0
Assets/LuaFramework/Lua/Common/LuaClass.lua.meta
Assets/LuaFramework/Lua/Common/LuaClass.lua.meta
+7
-0
Assets/LuaFramework/Lua/Common/LuaUtil.lua
Assets/LuaFramework/Lua/Common/LuaUtil.lua
+55
-125
Assets/LuaFramework/Lua/Common/const.lua
Assets/LuaFramework/Lua/Common/const.lua
+2
-0
Assets/LuaFramework/Lua/Common/functions.lua
Assets/LuaFramework/Lua/Common/functions.lua
+0
-3
Assets/LuaFramework/Lua/Logic/Main.lua
Assets/LuaFramework/Lua/Logic/Main.lua
+3
-1
Assets/LuaFramework/Lua/Logic/Redpoint.meta
Assets/LuaFramework/Lua/Logic/Redpoint.meta
+8
-0
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointNode.lua
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointNode.lua
+21
-0
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointNode.lua.meta
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointNode.lua.meta
+7
-0
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointTree.lua
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointTree.lua
+159
-0
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointTree.lua.meta
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointTree.lua.meta
+7
-0
Assets/LuaFramework/Lua/LuaFileList.lua
Assets/LuaFramework/Lua/LuaFileList.lua
+9
-1
Assets/LuaFramework/Lua/View/GameHall/GameHallPanel.lua
Assets/LuaFramework/Lua/View/GameHall/GameHallPanel.lua
+22
-0
Assets/LuaFramework/Lua/View/Redpoint.meta
Assets/LuaFramework/Lua/View/Redpoint.meta
+8
-0
Assets/LuaFramework/Lua/View/Redpoint/RedpointPanel.lua
Assets/LuaFramework/Lua/View/Redpoint/RedpointPanel.lua
+123
-0
Assets/LuaFramework/Lua/View/Redpoint/RedpointPanel.lua.meta
Assets/LuaFramework/Lua/View/Redpoint/RedpointPanel.lua.meta
+7
-0
Assets/Scenes/Main.unity
Assets/Scenes/Main.unity
+1
-1
ProjectSettings/ProjectVersion.txt
ProjectSettings/ProjectVersion.txt
+2
-2
obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
...ebug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
+0
-0
obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
+0
-0
未找到文件。
Assembly-CSharp-Editor.csproj
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assembly-CSharp.csproj
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/GameRes/Config/i18nAppStrings.bytes
浏览文件 @
d6e61dba
...
...
@@ -10,4 +10,5 @@
<item
key=
"8"
value_zh=
"登录"
value_zh_tw=
"登錄"
english=
"Login"
/>
<item
key=
"9"
value_zh=
"正在拼命处理..."
value_zh_tw=
"正在拼命處理..."
english=
"Just a moment..."
/>
<item
key=
"10"
value_zh=
"背包"
value_zh_tw=
"背包"
english=
"Backpack"
/>
<item
key=
"11"
value_zh=
"红点系统"
value_zh_tw=
"红点系统"
english=
"Redpoint System"
/>
</resources>
\ No newline at end of file
Assets/GameRes/Config/resources.bytes
浏览文件 @
d6e61dba
...
...
@@ -13,4 +13,5 @@
<item
id=
"12"
editorPath=
"UIPrefabs/Common/TipsDlg.prefab"
version=
"2021/11/10"
desc=
"提示框"
/>
<item
id=
"13"
editorPath=
"UIPrefabs/Common/WaitBoard.prefab"
version=
"2021/11/10"
desc=
"请稍等挡板"
/>
<item
id=
"14"
editorPath=
"UIPrefabs/Backpack/BackpackPanel.prefab"
version=
"2021/11/10"
desc=
"背包界面"
/>
<item
id=
"15"
editorPath=
"UIPrefabs/Redpoint/RedpointPanel.prefab"
version=
"2021/12/13"
desc=
"红点系统界面"
/>
</items>
\ No newline at end of file
Assets/GameRes/UIPrefabs/GameHall/GameHallPanel.prefab
浏览文件 @
d6e61dba
...
...
@@ -13,7 +13,7 @@ GameObject:
-
component
:
{
fileID
:
1791895268946654070
}
-
component
:
{
fileID
:
1170740374806143586
}
m_Layer
:
5
m_Name
:
Button (1)
m_Name
:
redpointButton
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
...
...
@@ -31,6 +31,7 @@ RectTransform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
8611388025754645352
}
-
{
fileID
:
1174548104332698780
}
m_Father
:
{
fileID
:
8273410175273854391
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -296,6 +297,12 @@ MonoBehaviour:
obj
:
{
fileID
:
5884106356998082373
}
-
name
:
backpackBtn
obj
:
{
fileID
:
3190646328964235041
}
-
name
:
redpointBtn
obj
:
{
fileID
:
1170740374806143586
}
-
name
:
redpointObj
obj
:
{
fileID
:
2231633638448600168
}
-
name
:
redpointText
obj
:
{
fileID
:
6154726871490356
}
---
!u!1
&1346032198865300369
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -617,6 +624,82 @@ MonoBehaviour:
m_OnClick
:
m_PersistentCalls
:
m_Calls
:
[]
---
!u!1
&2231633638448600168
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1174548104332698780
}
-
component
:
{
fileID
:
9126638884412045276
}
-
component
:
{
fileID
:
3221664876434282796
}
m_Layer
:
5
m_Name
:
redpoint
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
0
---
!u!224
&1174548104332698780
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2231633638448600168
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
1976889614844958297
}
m_Father
:
{
fileID
:
1110375880910705116
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
32.01
,
y
:
33.2
}
m_SizeDelta
:
{
x
:
30
,
y
:
30
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&9126638884412045276
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2231633638448600168
}
m_CullTransparentMesh
:
1
---
!u!114
&3221664876434282796
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2231633638448600168
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
fe87c0e1cc204ed48ad3b37840f39efc
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
0
,
b
:
0
,
a
:
1
}
m_RaycastTarget
:
1
m_RaycastPadding
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
m_Maskable
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_Sprite
:
{
fileID
:
10913
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
m_PixelsPerUnitMultiplier
:
1
---
!u!1
&3114998995948484789
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1642,7 +1725,86 @@ MonoBehaviour:
m_HorizontalOverflow
:
1
m_VerticalOverflow
:
1
m_LineSpacing
:
1
m_Text
:
"
\u6A21\u5757
2"
m_Text
:
"
\u7EA2\u70B9\u7CFB\u7EDF
"
---
!u!1
&7894312354071083640
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1976889614844958297
}
-
component
:
{
fileID
:
7545332230806987131
}
-
component
:
{
fileID
:
6154726871490356
}
m_Layer
:
5
m_Name
:
numText
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&1976889614844958297
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7894312354071083640
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1174548104332698780
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
160
,
y
:
30
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&7545332230806987131
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7894312354071083640
}
m_CullTransparentMesh
:
1
---
!u!114
&6154726871490356
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7894312354071083640
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5f7201a12d95ffc409449d95f23cf332
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_RaycastPadding
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
m_Maskable
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_FontData
:
m_Font
:
{
fileID
:
10102
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_FontSize
:
22
m_FontStyle
:
1
m_BestFit
:
0
m_MinSize
:
2
m_MaxSize
:
40
m_Alignment
:
4
m_AlignByGeometry
:
0
m_RichText
:
1
m_HorizontalOverflow
:
1
m_VerticalOverflow
:
1
m_LineSpacing
:
1
m_Text
:
0
---
!u!1
&7965687883547056707
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/GameRes/UIPrefabs/Redpoint.meta
0 → 100644
浏览文件 @
d6e61dba
fileFormatVersion: 2
guid: 22aec878b5e67f94f9399f9b37a3bcd6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/GameRes/UIPrefabs/Redpoint/RedpointPanel.prefab
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/GameRes/UIPrefabs/Redpoint/RedpointPanel.prefab.meta
0 → 100644
浏览文件 @
d6e61dba
fileFormatVersion: 2
guid: ea6be000bc140ab4fb4f75272b4b60ca
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/LuaFramework/Lua/Common/LuaClass.lua
0 → 100644
浏览文件 @
d6e61dba
-- lua的面向对象封装
-- Author: 云风
local
_class
=
{}
function
class
(
super
)
local
class_type
=
{}
class_type
.
ctor
=
false
class_type
.
super
=
super
class_type
.
new
=
function
(
...
)
local
obj
=
{}
do
local
create
create
=
function
(
c
,
...
)
if
c
.
super
then
create
(
c
.
super
,
...
)
end
if
c
.
ctor
then
c
.
ctor
(
obj
,
...
)
end
end
create
(
class_type
,
...
)
end
setmetatable
(
obj
,
{
__index
=
_class
[
class_type
]
})
return
obj
end
local
vtbl
=
{}
_class
[
class_type
]
=
vtbl
setmetatable
(
class_type
,
{
__newindex
=
function
(
t
,
k
,
v
)
vtbl
[
k
]
=
v
end
})
if
super
then
setmetatable
(
vtbl
,
{
__index
=
function
(
t
,
k
)
local
ret
=
_class
[
super
][
k
]
vtbl
[
k
]
=
ret
return
ret
end
})
end
return
class_type
end
Assets/LuaFramework/Lua/Common/LuaClass.lua.meta
0 → 100644
浏览文件 @
d6e61dba
fileFormatVersion: 2
guid: 2a00b5c9a258411428f69ba9b8940d73
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/LuaFramework/Lua/Common/LuaUtil.lua
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/Common/const.lua
浏览文件 @
d6e61dba
...
...
@@ -9,5 +9,7 @@ PANEL_ID =
GAME_HALL_PANEL_ID
=
3
,
-- 背包界面
BACKPACK_PANEL_ID
=
4
,
-- 红点系统界面
REDPOINT_PANEL_ID
=
5
,
}
--endregion
Assets/LuaFramework/Lua/Common/functions.lua
浏览文件 @
d6e61dba
...
...
@@ -14,7 +14,6 @@ end
function
logGreen
(
str
)
if
is_editor
then
str
=
str
..
"</color>"
local
luaStackStr
=
debug.traceback
(
str
,
0
)
Util
.
LogGreen
(
luaStackStr
)
else
...
...
@@ -24,7 +23,6 @@ end
function
LogYellow
(
str
)
if
is_editor
then
str
=
str
..
"</color>"
local
luaStackStr
=
debug.traceback
(
str
,
0
)
Util
.
LogYellow
(
luaStackStr
)
else
...
...
@@ -34,7 +32,6 @@ end
function
LogBlue
(
str
)
if
is_editor
then
str
=
str
..
"</color>"
local
luaStackStr
=
debug.traceback
(
str
,
0
)
Util
.
LogBlue
(
luaStackStr
)
else
...
...
Assets/LuaFramework/Lua/Logic/Main.lua
浏览文件 @
d6e61dba
...
...
@@ -8,7 +8,9 @@ local TestLuaCfg = require "Config/TestLuaCfg"
function
Main
.
Init
()
log
(
"Lua Main.Init"
)
-- 红点系统
RedpointTree
.
Init
()
-- 输出配置表
LuaUtil
.
PrintTable
(
TestLuaCfg
)
end
...
...
Assets/LuaFramework/Lua/Logic/Redpoint.meta
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointNode.lua
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointNode.lua.meta
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointTree.lua
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/Logic/Redpoint/RedpointTree.lua.meta
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/LuaFileList.lua
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/View/GameHall/GameHallPanel.lua
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/View/Redpoint.meta
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/View/Redpoint/RedpointPanel.lua
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/LuaFramework/Lua/View/Redpoint/RedpointPanel.lua.meta
0 → 100644
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
Assets/Scenes/Main.unity
浏览文件 @
d6e61dba
此差异已折叠。
点击以展开。
ProjectSettings/ProjectVersion.txt
浏览文件 @
d6e61dba
m_EditorVersion: 2021.1.
9
f1c1
m_EditorVersionWithRevision: 2021.1.
9f1c1 (a9c352b271d7
)
m_EditorVersion: 2021.1.
7
f1c1
m_EditorVersionWithRevision: 2021.1.
7f1c1 (4e944ebb9621
)
obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
浏览文件 @
d6e61dba
无法预览此类型文件
obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
浏览文件 @
d6e61dba
无法预览此类型文件
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录