root/BITFALL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

breakpoint

Browse Source
This commit is contained in:
CortexCore
2023-06-17 16:30:53 +08:00
parent cd02761be7
commit 877ba6e548
88 changed files with 8715 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/Artists/Prefabs/Entity.prefab
View File

@@ -152,7 +152,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2316171592450128199}
m_LocalRotation: {x: 0.70710665, y: 0.70710695, z: 0.00000033102063, w: -0.00000019861227}
m_LocalRotation: {x: 0.70710665, y: 0.70710695, z: 0.00000033102063, w: -0.0000001986123}
m_LocalPosition: {x: 0.79999834, y: 1.099999, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -233,7 +233,7 @@ ParentConstraint:
m_TranslationOffsets:
- {x: 0, y: 0, z: 0}
m_RotationOffsets:
- {x: -89.97203, y: 0, z: -180}
- {x: -89.980225, y: 0, z: -180}
m_AffectTranslationX: 1
m_AffectTranslationY: 1
m_AffectTranslationZ: 1
@@ -897,6 +897,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 68aea78d5db589148aa74a9b54d6ac31, type: 3}
m_Name:
m_EditorClassIdentifier:
netClient:
rid: 5474080454516408331
netProvider:
rid: 5474080454516408332
references:
version: 2
RefIds:
- rid: 5474080454516408331
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
- rid: 5474080454516408332
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
--- !u!114 &3044462450513940359
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1401,7 +1412,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7147149369621539321}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.00000011920929, y: 0.9000001, z: -0.00000020647656}
m_LocalPosition: {x: -0.00000007868051, y: 0.9000001, z: -0.00000011920929}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

89
Assets/Artists/Prefabs/Services/BITNet.prefab
View File

@@ -1,89 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8392035340861090216
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7599459500757629658}
- component: {fileID: 7546290009901106985}
- component: {fileID: 1634786267599951643}
m_Layer: 0
m_Name: BITNet
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: 9924c5997a91b6240b88431f1b30c68b, type: 3}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7599459500757629658
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8392035340861090216}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7546290009901106985
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8392035340861090216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f478b00e78634b04c8d5e2844ef94668, type: 3}
m_Name:
m_EditorClassIdentifier:
address: localhost
port: 27014
apiPort: 27013
webProvider:
rid: 5474080363716280323
clientProvider:
rid: 5474080363716280324
references:
version: 2
RefIds:
- rid: 5474080363716280323
type: {class: HttpClient, ns: BITKit.HttpNet, asm: BITKit}
- rid: 5474080363716280324
type: {class: FlibClientProvider, ns: BITFALL, asm: BITFALL}
data:
clientManager: {fileID: 1634786267599951643}
--- !u!114 &1634786267599951643
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8392035340861090216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 43dd04617c9f105449b227e016c972a4, type: 3}
m_Name:
m_EditorClassIdentifier:
protocol: 0
ip: 127.0.0.1
port: 9543
localTest: 0
logMode: 1
debugRpc: 0
authorize: 0
startConnect: 0
md5CRC: 0
reconnectCount: 10
reconnectInterval: 2000
heartLimit: 5
heartInterval: 1000
dontDestroyOnLoad: 0

55
Assets/Artists/Prefabs/Services/BulletService.prefab
View File

@@ -1,55 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6719114749252097002
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6175441137035486932}
- component: {fileID: 7284902202986547444}
m_Layer: 0
m_Name: BulletService
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6175441137035486932
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6719114749252097002}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.5131056, y: 1.0793136, z: 5.1427784}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7284902202986547444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6719114749252097002}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 17af089f9db44e8449d71f65830fdd25, type: 3}
m_Name:
m_EditorClassIdentifier:
layerMask:
serializedVersion: 2
m_Bits: 513
defaultMaterial: {fileID: 11400000, guid: 6ce8f51b55ed1b84db162e849100dc10, type: 2}
pool:
prefab: {fileID: 2956281190107464547, guid: cd8502ee01a85944bbccb38128facc13,
type: 3}
root: {fileID: 6175441137035486932}
instances: []

85
Assets/Artists/Prefabs/Services/BITFramework.prefab → Assets/Artists/Prefabs/Services/Framework.prefab
View File

@@ -14,9 +14,12 @@ GameObject:
- component: {fileID: 5459949338997660565}
- component: {fileID: -2281902509228225294}
- component: {fileID: 4083894557606377552}
- component: {fileID: -3428271289843395767}
- component: {fileID: 2356180584613640822}
- component: {fileID: -3918555459250571244}
- component: {fileID: -31602009599847191}
- component: {fileID: 1510713985089303888}
m_Layer: 0
m_Name: BITFramework
m_Name: Framework
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -89,14 +92,20 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
netProvider:
rid: 5474080437462106112
rid: 5474080454516408329
netClient:
rid: 5474080454516408330
steamService:
rid: 5474080454516408333
references:
version: 2
RefIds:
- rid: 5474080437462106112
type: {class: NetProviderProxy, ns: BITKit, asm: BITKit}
data:
monoBehaviour: {fileID: -3428271289843395767}
- rid: 5474080454516408329
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
- rid: 5474080454516408330
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
- rid: 5474080454516408333
type: {class: SteamServiceSingleton, ns: BITKit.Steamwork, asm: BITKit.Extension.Steamwork}
--- !u!114 &-2281902509228225294
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -126,12 +135,21 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 513
defaultMaterial: {fileID: 11400000, guid: 6ce8f51b55ed1b84db162e849100dc10, type: 2}
netProvider:
rid: 5474080454516408321
pool:
prefab: {fileID: 2956281190107464547, guid: cd8502ee01a85944bbccb38128facc13,
type: 3}
root: {fileID: 1621845164855518716}
instances: []
--- !u!114 &-3428271289843395767
references:
version: 2
RefIds:
- rid: 5474080454516408321
type: {class: NetProviderProxy, ns: BITKit, asm: BITKit}
data:
monoBehaviour: {fileID: 2356180584613640822}
--- !u!114 &2356180584613640822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -143,17 +161,58 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 221e26c9881bfb840bc82c3587308e3e, type: 3}
m_Name:
m_EditorClassIdentifier:
address:
port: 0
address: localhost
port: 27014
clientProvider:
rid: 5474080437462106113
rid: 5474080454516408320
references:
version: 2
RefIds:
- rid: 5474080437462106113
type: {class: FlibClientProvider, ns: BITFALL, asm: BITFALL}
- rid: 5474080454516408320
type: {class: GDNetClientProvider, ns: BITKit, asm: Assembly-CSharp-firstpass}
data:
clientManager: {fileID: 4861076022157066155}
--- !u!114 &-3918555459250571244
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 594564951014165300}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c754132856288ea4180e46d87fc46be9, type: 3}
m_Name:
m_EditorClassIdentifier:
vfxs:
- {fileID: 11400000, guid: ce6c3c9ba0efabc4ea63cfbcfc322a81, type: 2}
- {fileID: 11400000, guid: 02442f5995195f54b8bfc5883a53cf97, type: 2}
--- !u!114 &-31602009599847191
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 594564951014165300}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52fa20c3ba3f2664b9eb666a434b77de, type: 3}
m_Name:
m_EditorClassIdentifier:
prefab: {fileID: 5264291518813283261, guid: f18510934c4581d47819abfbf1bd3647, type: 3}
--- !u!114 &1510713985089303888
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 594564951014165300}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 41cd0b8fd16c600468c5a24f0a273777, type: 3}
m_Name:
m_EditorClassIdentifier:
appId: 1934920
--- !u!1 &3982569034385566475
GameObject:
m_ObjectHideFlags: 0

47
Assets/Artists/Prefabs/Services/NetEntitesManager.prefab
View File

@@ -1,47 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8252820290161347513
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2812012559937706607}
- component: {fileID: 436460019296838824}
m_Layer: 0
m_Name: NetEntitesManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2812012559937706607
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8252820290161347513}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &436460019296838824
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8252820290161347513}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5702c065f2169b44a9c38206d85b23a2, type: 3}
m_Name:
m_EditorClassIdentifier:
proxy: {fileID: 5264291518813283261, guid: f18510934c4581d47819abfbf1bd3647, type: 3}

46
Assets/Artists/Prefabs/Services/PlayerService.prefab
View File

@@ -1,46 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1991127922467399889
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6775606062948898590}
- component: {fileID: 6663671466603395034}
m_Layer: 0
m_Name: PlayerService
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6775606062948898590
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1991127922467399889}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6663671466603395034
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1991127922467399889}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 33fef1205fe84a84f82d9526c5b68af4, type: 3}
m_Name:
m_EditorClassIdentifier:

49
Assets/Artists/Prefabs/Services/VFXManager.prefab
View File

@@ -1,49 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5736021920723147558
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5204725430344918013}
- component: {fileID: 7038145435044639555}
m_Layer: 0
m_Name: VFXManager
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: 0591aad39cd6a4245addb81f6332d852, type: 3}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5204725430344918013
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736021920723147558}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7038145435044639555
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736021920723147558}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c754132856288ea4180e46d87fc46be9, type: 3}
m_Name:
m_EditorClassIdentifier:
vfxs:
- {fileID: 11400000, guid: ce6c3c9ba0efabc4ea63cfbcfc322a81, type: 2}
- {fileID: 11400000, guid: 02442f5995195f54b8bfc5883a53cf97, type: 2}

249
Assets/Artists/Scenes/BITScene.unity
View File

@@ -407,7 +407,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &109367991
PrefabInstance:
@@ -884,7 +884,7 @@ PrefabInstance:
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
propertyPath: m_RootOrder
value: 24
value: 23
objectReference: {fileID: 0}
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
@@ -2053,7 +2053,7 @@ PrefabInstance:
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
propertyPath: m_RootOrder
value: 21
value: 20
objectReference: {fileID: 0}
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
@@ -2366,7 +2366,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 19
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &522866409
GameObject:
@@ -3105,7 +3105,7 @@ Transform:
m_Children:
- {fileID: 282301062}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &595285511
GameObject:
@@ -4001,7 +4001,7 @@ Transform:
m_Children:
- {fileID: 522866411}
m_Father: {fileID: 0}
m_RootOrder: 29
m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}
--- !u!114 &835177943
MonoBehaviour:
@@ -4410,7 +4410,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &963194229
MonoBehaviour:
@@ -4681,7 +4681,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &988449214
MonoBehaviour:
@@ -5722,7 +5722,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 34.397, y: -170.858, z: 13.288}
--- !u!114 &1051082604
MonoBehaviour:
@@ -5833,7 +5833,7 @@ Transform:
- {fileID: 1886431281}
- {fileID: 1049391285}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1076798597
GameObject:
@@ -5908,7 +5908,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1088581380
GameObject:
@@ -6487,7 +6487,7 @@ PrefabInstance:
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
propertyPath: m_RootOrder
value: 22
value: 21
objectReference: {fileID: 0}
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
@@ -6860,6 +6860,8 @@ MonoBehaviour:
cursor: 1
allowInput: 0
isAdditive: 0
netClient:
rid: 5474080454516408323
connectButton: {fileID: 1482044486}
localhostButton: {fileID: 1489141484}
disconnectButton: {fileID: 59175076}
@@ -6870,6 +6872,11 @@ MonoBehaviour:
inputActionGroup:
allowGlobalActivation: 0
isEnabled: 0
references:
version: 2
RefIds:
- rid: 5474080454516408323
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
--- !u!114 &1229624391
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7468,8 +7475,19 @@ MonoBehaviour:
cursor: 1
allowInput: 0
isAdditive: 0
netClient:
rid: 5474080454516408327
netProvider:
rid: 5474080454516408328
loadBar: {fileID: 794431912}
loadText: {fileID: 1950290476}
references:
version: 2
RefIds:
- rid: 5474080454516408327
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
- rid: 5474080454516408328
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
--- !u!114 &1316390899
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -8176,7 +8194,7 @@ Transform:
- {fileID: 1229624388}
- {fileID: 1316390897}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1514697182
PrefabInstance:
@@ -8398,7 +8416,7 @@ PrefabInstance:
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
propertyPath: m_RootOrder
value: 23
value: 22
objectReference: {fileID: 0}
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
@@ -8557,7 +8575,7 @@ PrefabInstance:
- target: {fileID: 2925653066038063199, guid: c7d364eea8941e847b69eba0d43e22b6,
type: 3}
propertyPath: m_RootOrder
value: 31
value: 29
objectReference: {fileID: 0}
- target: {fileID: 2925653066038063199, guid: c7d364eea8941e847b69eba0d43e22b6,
type: 3}
@@ -9007,7 +9025,7 @@ Transform:
- {fileID: 567279688}
- {fileID: 1854426442}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1677499543
PrefabInstance:
@@ -9024,7 +9042,7 @@ PrefabInstance:
- target: {fileID: 2925653066038063199, guid: c7d364eea8941e847b69eba0d43e22b6,
type: 3}
propertyPath: m_RootOrder
value: 32
value: 30
objectReference: {fileID: 0}
- target: {fileID: 2925653066038063199, guid: c7d364eea8941e847b69eba0d43e22b6,
type: 3}
@@ -9424,7 +9442,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1720213259
PrefabInstance:
@@ -9531,7 +9549,7 @@ Transform:
m_Children:
- {fileID: 1076798598}
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1762130623
PrefabInstance:
@@ -11174,7 +11192,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1948782258
PrefabInstance:
@@ -11935,6 +11953,10 @@ MonoBehaviour:
cursor: 0
allowInput: 1
isAdditive: 0
netClient:
rid: 5474080454516408324
netProvider:
rid: 5474080454516408326
inventoryAction: {fileID: 4731022410478041803, guid: e0e9267cab824e8489fc27d83f1d07b7,
type: 3}
returnAction: {fileID: 7656137919724235468, guid: e0e9267cab824e8489fc27d83f1d07b7,
@@ -11943,6 +11965,13 @@ MonoBehaviour:
allowGlobalActivation: 0
isEnabled: 0
nameLabel: {fileID: 440857355}
references:
version: 2
RefIds:
- rid: 5474080454516408324
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
- rid: 5474080454516408326
type: {class: GDNetServiceSingleton, ns: BITKit, asm: BITKit.Extension.GameDesigner}
--- !u!114 &2108612510
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12167,144 +12196,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2126687261}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1222469988293950491
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_RootOrder
value: 30
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2812012559937706607, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8252820290161347513, guid: 9aabcf83d34f3794ab780926fe571c74,
type: 3}
propertyPath: m_Name
value: NetEntitesManager
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9aabcf83d34f3794ab780926fe571c74, type: 3}
--- !u!1001 &1775590821995709921
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5204725430344918013, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5736021920723147558, guid: a14f3b822df215843adc179710c090a3,
type: 3}
propertyPath: m_Name
value: VFXManager
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a14f3b822df215843adc179710c090a3, type: 3}
--- !u!1001 &2425374285907649514
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12320,7 +12211,7 @@ PrefabInstance:
- target: {fileID: 1927291751145116269, guid: d35acde394701754dbb50a0f9421c492,
type: 3}
propertyPath: m_RootOrder
value: 26
value: 25
objectReference: {fileID: 0}
- target: {fileID: 1927291751145116269, guid: d35acde394701754dbb50a0f9421c492,
type: 3}
@@ -12384,7 +12275,7 @@ PrefabInstance:
- target: {fileID: 5681355521161477298, guid: 91b80a7cf885c984ea8d0d306d167dea,
type: 3}
propertyPath: m_RootOrder
value: 25
value: 24
objectReference: {fileID: 0}
- target: {fileID: 5681355521161477298, guid: 91b80a7cf885c984ea8d0d306d167dea,
type: 3}
@@ -12453,7 +12344,7 @@ PrefabInstance:
- target: {fileID: 2956281190107464546, guid: cd8502ee01a85944bbccb38128facc13,
type: 3}
propertyPath: m_RootOrder
value: 17
value: 16
objectReference: {fileID: 0}
- target: {fileID: 2956281190107464546, guid: cd8502ee01a85944bbccb38128facc13,
type: 3}
@@ -12527,7 +12418,7 @@ PrefabInstance:
- target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
type: 3}
propertyPath: m_RootOrder
value: 18
value: 17
objectReference: {fileID: 0}
- target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
type: 3}
@@ -12588,6 +12479,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2367504132869257504, guid: e5d265393747af741b4f5d719598831a,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.00000019861227
objectReference: {fileID: 0}
- target: {fileID: 3956412582329371354, guid: e5d265393747af741b4f5d719598831a,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.00000011920929
objectReference: {fileID: 0}
- target: {fileID: 3956412582329371354, guid: e5d265393747af741b4f5d719598831a,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.00000020647656
objectReference: {fileID: 0}
- target: {fileID: 4826102346843731729, guid: e5d265393747af741b4f5d719598831a,
type: 3}
propertyPath: m_Name
@@ -12601,7 +12507,7 @@ PrefabInstance:
- target: {fileID: 4826102346843731735, guid: e5d265393747af741b4f5d719598831a,
type: 3}
propertyPath: m_RootOrder
value: 14
value: 13
objectReference: {fileID: 0}
- target: {fileID: 4826102346843731735, guid: e5d265393747af741b4f5d719598831a,
type: 3}
@@ -12653,6 +12559,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6543478755785382772, guid: e5d265393747af741b4f5d719598831a,
type: 3}
propertyPath: m_RotationOffsets.Array.data[0].x
value: -89.97203
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e5d265393747af741b4f5d719598831a, type: 3}
--- !u!1001 &4967360553653707449
@@ -12665,7 +12576,7 @@ PrefabInstance:
- target: {fileID: 4967360553763134876, guid: afc3896ae91cb60479e82dc81a530310,
type: 3}
propertyPath: m_RootOrder
value: 13
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4967360553763134876, guid: afc3896ae91cb60479e82dc81a530310,
type: 3}
@@ -12899,7 +12810,7 @@ PrefabInstance:
- target: {fileID: 5088247503209915273, guid: f18510934c4581d47819abfbf1bd3647,
type: 3}
propertyPath: m_RootOrder
value: 15
value: 14
objectReference: {fileID: 0}
- target: {fileID: 5088247503209915273, guid: f18510934c4581d47819abfbf1bd3647,
type: 3}
@@ -13128,7 +13039,7 @@ PrefabInstance:
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
propertyPath: m_RootOrder
value: 20
value: 19
objectReference: {fileID: 0}
- target: {fileID: 4305911198204250499, guid: 08bf595b66a0f9347973cbccd7039436,
type: 3}
@@ -13202,7 +13113,7 @@ PrefabInstance:
- target: {fileID: 2925653066038063199, guid: c7d364eea8941e847b69eba0d43e22b6,
type: 3}
propertyPath: m_RootOrder
value: 28
value: 27
objectReference: {fileID: 0}
- target: {fileID: 2925653066038063199, guid: c7d364eea8941e847b69eba0d43e22b6,
type: 3}
@@ -13271,7 +13182,7 @@ PrefabInstance:
- target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890,
type: 3}
propertyPath: m_RootOrder
value: 33
value: 31
objectReference: {fileID: 0}
- target: {fileID: 8889410696358529550, guid: bc90096cf6047474a8195137fb77e890,
type: 3}
@@ -13340,7 +13251,7 @@ PrefabInstance:
- target: {fileID: 8345163905356490183, guid: 405a2254073206e42bbe8aad0088a501,
type: 3}
propertyPath: m_RootOrder
value: 27
value: 26
objectReference: {fileID: 0}
- target: {fileID: 8345163905356490183, guid: 405a2254073206e42bbe8aad0088a501,
type: 3}

3
Assets/Artists/Scripts/BulletManager/BITFALL.Bullet.asmdef
View File

@@ -11,7 +11,8 @@
"GUID:f263169dea78d2249ba035c363b9cb8e",
"GUID:ea5474181b324dd49a5976cd68f44f18",
"GUID:d8b63aba1907145bea998dd612889d6b",
"GUID:900280954c76a0d41bc47cef37f91107"
"GUID:900280954c76a0d41bc47cef37f91107",
"GUID:49b49c76ee64f6b41bf28ef951cb0e50"
],
"includePlatforms": [],
"excludePlatforms": [],

9
Assets/Artists/Scripts/BulletManager/BulletService.cs
View File

@@ -31,7 +31,11 @@ namespace BITFALL
[Header(Constant.Header.Settings)]
public LayerMask layerMask;
[Header(Constant.Header.Prefabs)]
public ObjectMaterialScriptableObject defaultMaterial;
[SerializeField] private ObjectMaterialScriptableObject defaultMaterial;
[Header(Constant.Header.Providers)]
[SerializeField, SerializeReference, SubclassSelector]
private INetProvider netProvider;
[Header(Constant.Header.Settings)]
public UnityPool<BITBullet> pool = new();
[Header(Constant.Header.InternalVariables)]
@@ -39,8 +43,6 @@ namespace BITFALL
void Start()
{
Spawn += SpawnBullet;
DI.Get<ClientBase>().AddRpcHandle(this);
}
void OnDestroy()
{
@@ -141,6 +143,7 @@ namespace BITFALL
//DI.Get<ClientBase>().SendRT(nameof(RpcSpawnBullet), x);
//FGame.ClientAllRpc(nameof(RpcSpawnBullet), x);
//DI.Get<INetMessager>().Send<SpawnBullet>(x);
netProvider.ServerCommand(x);
}
}
}

5
Assets/Artists/Scripts/Entity/KinematicMovement/EntityKinematicMovement.cs
View File

@@ -82,7 +82,7 @@ namespace BITFALL.Entites
{
lookInput = MathV.TransientRotationAxis(transform.eulerAngles);
}
public override async void OnStart()
public override void OnStart()
{
foreach (var state in characterStates)
{
@@ -99,9 +99,6 @@ namespace BITFALL.Entites
inputActionGroup.RegisterCallback(crouchAction, OnCrouch);
entity.AddListener<IMovementCancelAction>(CancelMovement);
client = await DI.GetAsync<ClientBase>();
client.AddRpcHandle(this);
}
public override void OnSpawn()
{

17
Assets/Artists/Scripts/Entity/KinematicMovement/MovementService.cs → Assets/Artists/Scripts/Entity/KinematicMovement/KinematicMovementService.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -7,20 +8,22 @@ using BITKit;
using BITKit.Entities;
using BITKit.SubSystems;
using Net.Share;
using Unity.Mathematics;
namespace BITFALL
{
public class MovementService : SubBITSystem
public class KinematicMovementService : MonoBehaviour
{
public override void OnCreate()
[SerializeField, SerializeReference, SubclassSelector]
private INetProvider netProvider;
private void Start()
{
BITNet.AddRpcHandle(this);
}
[Rpc]
public void SyncMovement(int entityId, Net.Vector3 currentVelocity, Net.Vector3 currentPos,Net.Quaternion currentRot,bool isGrounded)
public void SyncMovement(int entityId, float3 currentVelocity, float3 currentPos,quaternion currentRot,bool isGrounded)
{
try
{
EntitiesManager
UnityEntitiesManager
.GetOrAdd(entityId)
.Get<IEntityMovement>()
.SyncMovement(currentVelocity, currentPos, currentRot,isGrounded);
@@ -28,7 +31,7 @@ namespace BITFALL
catch (System.Exception e)
{
StringBuilder stringBuilder = new();
var entity = EntitiesManager.GetOrAdd(entityId);
var entity = UnityEntitiesManager.GetOrAdd(entityId);
stringBuilder.AppendLine($"Entity:{entityId}@{entity}");
var movement = entity.Get<IEntityMovement>();
stringBuilder.AppendLine($"Movement@{movement}");

32
Assets/Artists/Scripts/Entity/NetEntitesManager.cs
View File

@@ -1,32 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Net.Share;
using BITKit;
using BITKit.Entities;
using Net.Client;
namespace BITFALL.Entites
{
[CreateOnStart(BITAppForUnity.Path.Services,nameof(NetEntitesManager))]
public class NetEntitesManager : MonoBehaviour
{
public Entity proxy;
async void Start()
{
EntitiesManager.CreateFactory = CreateFactory;
var client = await DI.GetAsync<ClientBase>();
client.AddRpcHandle(this);
}
[Rpc]
public void RpcEntityHeartbeat(int entityId)
{
var entity = EntitiesManager.GetOrAdd(entityId, CreateFactory);
}
IEntity CreateFactory(int id)
{
var entity = Instantiate(proxy);
entity.Id = id;
return entity;
}
}
}

8
Assets/Artists/Scripts/Entity/Player/EntityGDNetPlayer.cs
View File

@@ -11,11 +11,15 @@ namespace BITFALL.Entites
{
public class EntityGDNetPlayer : EntityComponent
{
[SerializeField, SerializeReference, SubclassSelector]
private INetClient netClient;
[SerializeField, SerializeReference, SubclassSelector]
private INetProvider netProvider;
public override void OnStart()
{
entity.Id = Guid.NewGuid().GetHashCode();
BITNet.OnConnected+=OnConnected;
BITNet.OnDisconnect += OnDisconnect;
netClient.OnConnected+=OnConnected;
netClient.OnDisconnected += OnDisconnect;
IEntity.LocalPlayer = entity;
IEntity.OnSpawnLocalPlayer(entity);
}

1
Assets/Artists/Scripts/Entity/Player/NetAnimatorService.cs
View File

@@ -13,7 +13,6 @@ namespace BITFALL.Entites
{
public override void OnCreate()
{
BITNet.AddRpcHandle(this);
}
}
}

3
Assets/Artists/Scripts/Player/BITFALL.PlayerServices.Runtime.asmdef
View File

@@ -8,8 +8,7 @@
"GUID:eaaac13fa1ccdfb4ca5d246fb1d9c561",
"GUID:be17a8778dbfe454890ed8279279e153",
"GUID:49b49c76ee64f6b41bf28ef951cb0e50",
"GUID:9400d40641bab5b4a9702f65bf5c6eb5",
"GUID:53336df3122d0cb41a64b6109d19b016"
"GUID:1bb4187526a9431478feccaef064696a"
],
"includePlatforms": [],
"excludePlatforms": [],

18
Assets/Artists/Scripts/Player/Core/BITFALL.PlayerService.Core.asmdef
View File

@@ -1,18 +0,0 @@
{
"name": "BITFALL.PlayerService.Core",
"rootNamespace": "",
"references": [
"GUID:14fe60d984bf9f84eac55c6ea033a8f4",
"GUID:f263169dea78d2249ba035c363b9cb8e",
"GUID:9400d40641bab5b4a9702f65bf5c6eb5"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": true
}

48
Assets/Artists/Scripts/Player/Core/IPlayerService.cs
View File

@@ -1,48 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Net.Server;
using System.Data.SqlTypes;
using System.IO;
using Net.Serialize;
using BITKit;
using Net.Share;
using Unity.Plastic.Antlr3.Runtime.Misc;
namespace BITFALL.Services
{
[System.Serializable]
public record PlayerModel
{
public int Id;
public string Name;
public string PlayerId;
}
public class PlayerModelBinary : NetMessageReader<PlayerModel>
{
public override PlayerModel ReadBinary(BinaryReader reader)
{
return new PlayerModel
{
Id = reader.ReadInt32(),
Name = reader.ReadString(),
PlayerId = reader.ReadString()
};
}
public override void WriteBinary(BinaryWriter writer, PlayerModel value)
{
writer.Write(value.Id);
writer.Write(value.Name);
writer.Write(value.PlayerId);
}
}
public interface IPlayerService
{
}
public struct PlayerReadyCommand
{
public int PlayerId;
}
}

36
Assets/Artists/Scripts/Player/UnityPlayerService.cs
View File

@@ -4,29 +4,57 @@ using System.Collections.Generic;
using BITFALL.Services;
using BITKit;
using BITKit.HttpNet;
using BITKit.Steamwork;
using BITKit.SubSystems;
using Net.Client;
using Net.Server;
using Net.Share;
using UnityEngine;
using Cysharp.Threading.Tasks;
using INetClient = BITKit.INetClient;
namespace BITFALL
{
public class UnityPlayerService : MonoBehaviour, IPlayerService
{
public event Action<int> OnPlayerReady;
//申明服务
[SerializeField, SerializeReference, SubclassSelector]
private INetProvider netProvider;
[SerializeField, SerializeReference, SubclassSelector]
private INetClient netClient;
[SerializeField, SerializeReference, SubclassSelector]
private ISteamService steamService;
//接口实现
public event Action<PlayerModel> OnVerifyPlayer;
public event Action<PlayerModel> OnPlayerVerified;
private void Start()
{
netProvider.AddRpcHandle(this);
BITNet.OnConnected += OnConnect;
netClient.OnConnected += OnConnect;
netProvider.AddCommandListener<PlayerVerifiedCommand>(OnPlayerVerifiedCallback);
}
private void OnConnect()
{
OnPlayerReady?.Invoke(0);
var command = new PlayerVerifiedCommand()
{
PlayerModel = new PlayerModel
{
Id =netClient.Id,
SteamId =steamService.SteamId,
Name = steamService.Name,
}
};
BIT4Log.Log<UnityPlayerService>("正在发送玩家验证清单");
OnVerifyPlayer?.Invoke(command.PlayerModel);
netProvider.ServerCommand(command);
}
private void OnPlayerVerifiedCallback(PlayerVerifiedCommand command)
{
BIT4Log.Log<UnityPlayerService>($"玩家\t{command.PlayerModel.Name}\t已验证");
OnPlayerVerified?.Invoke(command.PlayerModel);
}
}
}

3
Assets/Artists/Scripts/UX/BITFALL.UX.asmdef
View File

@@ -18,8 +18,7 @@
"GUID:eaaac13fa1ccdfb4ca5d246fb1d9c561",
"GUID:66d2ae14764cc7d49aad4b16930747c0",
"GUID:e531122bce810cf4a9184a5c27251bf8",
"GUID:9400d40641bab5b4a9702f65bf5c6eb5",
"GUID:53336df3122d0cb41a64b6109d19b016"
"GUID:49b49c76ee64f6b41bf28ef951cb0e50"
],
"includePlatforms": [],
"excludePlatforms": [],

9
Assets/Artists/Scripts/UX/HUD.cs
View File

@@ -6,12 +6,15 @@ using UnityEngine.InputSystem;
using BITKit;
using BITKit.UX;
using BITKit.Entities;
using Net.Share;
using Net.Client;
namespace BITFALL.UX
{
public class HUD : UXPanel, ISelectableCallback
{
[Header(Constant.Header.Providers)]
[SerializeField, SerializeReference, SubclassSelector]
private INetClient netClient;
[SerializeField, SerializeReference, SubclassSelector]
private INetProvider netProvider;
[Header(Constant.Header.Input)]
public InputActionReference inventoryAction;
public InputActionReference returnAction;
@@ -24,7 +27,7 @@ namespace BITFALL.UX
inputActionGroup.RegisterCallback(returnAction, OnReturn);
inputActionGroup.RegisterCallback(inventoryAction, OnInventry);
BITNet.OnConnected += OnConnected;
netClient.OnConnected += OnConnected;
}
public override void Set(bool active)
{

16
Assets/Artists/Scripts/UX/Loading.cs
View File

@@ -6,12 +6,16 @@ using UnityEngine.InputSystem;
using BITKit;
using BITKit.UX;
using BITKit.Entities;
using Net.Client;
using Net.Share;
namespace BITFALL.UX
{
public class Loading : UXPanel
{
[Header(Constant.Header.Providers)]
[SerializeField, SerializeReference, SubclassSelector]
private INetClient netClient;
[SerializeField, SerializeReference, SubclassSelector]
private INetProvider netProvider;
[Header(Constant.Header.Components)]
public UXBar loadBar;
public UXLabel loadText;
public override void OnStart()
@@ -19,15 +23,15 @@ namespace BITFALL.UX
base.OnStart();
//DI.Get<ClientBase>().AddStateHandler(NetworkState.Connected, OnConnected);
//DI.Get<ClientBase>().AddStateHandler(NetworkState.TryToConnect, OnStartConnect);
BITNet.OnTryToConnect += OnStartConnect;
netClient.OnStartConnect += OnStartConnect;
Data.AddListener<IProgress>(OnLoadProgress);
BITNet.OnStartConnect += OnStartConnect;
}
void OnStartConnect()
private void OnStartConnect()
{
loadBar.SetDirect(0,"正在开始加载");
UXFramework.Enter<Loading>();
}
void OnLoadProgress(IProgress progress)
private void OnLoadProgress(IProgress progress)
{
loadBar.Set(progress.Progress);
loadText.Set(progress.Message);

42
Assets/Artists/Scripts/UX/Menu.cs
View File

@@ -7,10 +7,16 @@ using BITKit.UX;
using Net;
using Net.Client;
using Net.Share;
using INetClient = BITKit.INetClient;
namespace BITFALL.UX
{
public class Menu : UXPanel
{
[Header(Constant.Header.Providers)]
[SerializeField, SerializeReference, SubclassSelector]
private INetClient netClient;
[SerializeField, SerializeReference, SubclassSelector]
[Header(Constant.Header.Components)]
public UXButton connectButton;
public UXButton localhostButton;
@@ -23,10 +29,9 @@ namespace BITFALL.UX
public override void OnStart()
{
base.OnStart();
BITNet.OnConnected += OnConnected;
BITNet.OnConnectLost += OnDisconnect;
BITNet.OnConnectLost += OnDisconnect;
BITNet.OnConnectFailed += OnDisconnect;
netClient.OnConnected += OnConnected;
netClient.OnConnectedFailed += OnDisconnect;
inputActionGroup.RegisterCallback(returnAction, OnReturn);
@@ -39,17 +44,17 @@ namespace BITFALL.UX
}
public void StartIntelnetConnect()
{
DI.Get<BITNet>().ConnectToServer();
netClient.Connect();
}
public void StartLocalConnect()
{
DI.Get<BITNet>().ConnectToLocal();
netClient.Connect("localhost");
}
public void Disconnect()
{
DI.Get<BITNet>().Disconnect();
netClient.Disconnect();
}
public void OnConnected()
private void OnConnected()
{
connectButton.SetEnabled(true);
localhostButton.SetEnabled(true);
@@ -60,19 +65,19 @@ namespace BITFALL.UX
disconnectButton.SetActive(true);
backgroundImage.SetActive(false);
}
public void OnConnectFailed()
private void OnConnectFailed()
{
UXFramework.Enter<Menu>();
connectButton.SetEnabled(true);
localhostButton.SetEnabled(true);
OnDisconnected();
}
public void OnStartConnect()
private void OnStartConnect()
{
connectButton.SetEnabled(false);
localhostButton.SetEnabled(false);
}
public void OnDisconnected()
private void OnDisconnected()
{
returnButton.SetActive(false);
connectButton.SetActive(true);
@@ -80,19 +85,18 @@ namespace BITFALL.UX
disconnectButton.SetActive(false);
backgroundImage.SetActive(true);
}
void OnDisconnect()
private void OnDisconnect()
{
BIT4Log.Log<Menu>("正在尝试返回到主菜单");
UXFramework.Enter<Menu>();
OnDisconnected();
}
void OnReturn(InputAction.CallbackContext context)
private void OnReturn(InputAction.CallbackContext context)
{
/* if (ClientManager.Instance.client.Connected)
if (context.ReadValueAsButton())
{
UXFramework.Enter<HUD>();
} */
if (!netClient.IsConnected) return;
if (context.ReadValueAsButton())
{
UXFramework.Enter<HUD>();
}
}
}
}

7
Assets/Artists/UX/MainMenu.uxml
View File

@@ -8,12 +8,7 @@
<ui:Button text="进入战区" display-tooltip-when-elided="true" name="play-button" class="navigation" />
<ui:Button text="饰品库存" display-tooltip-when-elided="true" name="inventory-button" class="navigation" />
<ui:Button text="情报中心" display-tooltip-when-elided="true" name="information-button" class="navigation" />
<ui:VisualElement style="position: absolute; top: 0; bottom: 0; right: 32px; justify-content: center;">
<ui:Button display-tooltip-when-elided="true" name="exit-button" class="return-button dark">
<ui:VisualElement name="icon-image" />
<ui:Label text="退出" display-tooltip-when-elided="true" name="context-label" />
</ui:Button>
</ui:VisualElement>
<ui:Button text="退出" display-tooltip-when-elided="true" name="exit-button" class="navigation" style="flex-grow: 1; position: absolute; top: 0; right: 0; bottom: 0;" />
</ui:VisualElement>
<ui:VisualElement name="windows" class="root" style="left: 64px; top: 128px; right: 64px; bottom: 64px;">
<ui:VisualElement name="play-window">