Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
This commit is contained in:
commit
1776a9fa2b
@ -58,7 +58,7 @@ public class test : MonoBehaviour
|
||||
|
||||
|
||||
//加入房间
|
||||
void JoinRoom()
|
||||
public void JoinRoom()
|
||||
{
|
||||
JoinRoomRequest data = new JoinRoomRequest();
|
||||
data.RoomId = "168888";
|
||||
@ -233,7 +233,6 @@ public class test : MonoBehaviour
|
||||
//}
|
||||
|
||||
|
||||
|
||||
//开始计时
|
||||
void RoomStartTime()
|
||||
{
|
||||
@ -310,6 +309,23 @@ public class test : MonoBehaviour
|
||||
wEBScriptListener.SendMessageByte(sendData);
|
||||
}
|
||||
|
||||
public void NpcMove()
|
||||
{
|
||||
MoveRequest data = new MoveRequest();
|
||||
data.RoomId = "168888";
|
||||
data.SelectId = 10821;
|
||||
WSMessage msg = new WSMessage();
|
||||
msg.Module = "move";
|
||||
msg.ServiceName = "MoveNpc";
|
||||
msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
|
||||
byte[] sendData = ProtoBufffer.Serialize(msg);
|
||||
WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
|
||||
MoveRequest login = ProtoBufffer.DeSerialize<MoveRequest>(deinfo.Data.ToByteArray());
|
||||
Debug.Log("==========选择路线");
|
||||
//BroadcastFrameMsg.FramesFieldNumber
|
||||
|
||||
wEBScriptListener.SendMessageByte(sendData);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -336,6 +352,7 @@ public class test : MonoBehaviour
|
||||
//Location();
|
||||
//TaskTrigger();
|
||||
//TaskUpdateRequest();
|
||||
|
||||
}
|
||||
//int index = 0;
|
||||
//while (true)
|
||||
@ -411,6 +428,8 @@ public class test : MonoBehaviour
|
||||
Debug.Log("-=====--");
|
||||
LoginResponse user = ProtoBufffer.DeSerialize<LoginResponse>(bytes);
|
||||
Debug.Log(user);
|
||||
//这里是测试阶段用的,在登录之后调用加入房间,后续会删掉
|
||||
|
||||
break;
|
||||
|
||||
//进入房间
|
||||
@ -419,6 +438,8 @@ public class test : MonoBehaviour
|
||||
byte[] joinByte = joinRoomResponse.Data.ToByteArray();
|
||||
PlayerJoinResponse playerJoinResponse = ProtoBufffer.DeSerialize<PlayerJoinResponse>(joinByte);
|
||||
Debug.Log("玩家:"+playerJoinResponse.UserName+"加入房间:"+playerJoinResponse.RoomId.ToString());
|
||||
|
||||
|
||||
break;
|
||||
|
||||
//广播
|
||||
@ -496,6 +517,8 @@ public class test : MonoBehaviour
|
||||
|
||||
// 使用指定的世界坐标位置来实例化 NPC,而不是依赖 trans 位置
|
||||
GameObject.Instantiate(npc, position, Quaternion.identity); // 直接指定位置和旋转
|
||||
// Npc生成后调用选择路线,=================这里也会删掉,在等UI逻辑那边处理完
|
||||
|
||||
}
|
||||
if(npcData.Type == 2)//npc移动
|
||||
{
|
||||
@ -522,7 +545,7 @@ public class test : MonoBehaviour
|
||||
//更新任务
|
||||
case "task.UpdateTask":
|
||||
Debug.Log("-----------task.TaskTrigger");
|
||||
TaskUpdateRequest taskUpdateRequest = ProtoBufffer.DeSerialize<TaskUpdateRequest>(bytes);
|
||||
MoveRequest taskUpdateRequest = ProtoBufffer.DeSerialize<MoveRequest>(bytes);
|
||||
Debug.Log(taskUpdateRequest);
|
||||
|
||||
break;
|
||||
@ -534,13 +557,21 @@ public class test : MonoBehaviour
|
||||
Debug.Log(requestObject);
|
||||
|
||||
break;
|
||||
//对象触发操作
|
||||
case "move.MoveNpc":
|
||||
Debug.Log("-----------move.MoveNpc");
|
||||
MoveRequest moveRequest = ProtoBufffer.DeSerialize<MoveRequest>(bytes);
|
||||
Debug.Log(moveRequest);
|
||||
|
||||
break;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//case "prop.CreateNpc":
|
||||
// MoveResponse moveResponse = ProtoBufffer.DeSerialize<MoveResponse>(bytes);
|
||||
// Debug.Log("UserId:" + moveResponse.UserId + "£¬RoomId:" + moveResponse.RoomId + "£¬x:" + moveResponse.MoveData);
|
||||
// break;
|
||||
//case "prop.CreateNpc":
|
||||
// MoveResponse moveResponse = ProtoBufffer.DeSerialize<MoveResponse>(bytes);
|
||||
// Debug.Log("UserId:" + moveResponse.UserId + ",RoomId:" + moveResponse.RoomId + ",x:" + moveResponse.MoveData);
|
||||
// break;
|
||||
|
||||
|
||||
|
||||
|
@ -7853,7 +7853,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 810501276}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -18.09, y: 0.5, z: 35.56}
|
||||
m_LocalPosition: {x: 30, y: 0.5, z: 22.74}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -8431,6 +8431,86 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 494110, guid: a55bbac08a4e6d74385abd3f06679115, type: 3}
|
||||
m_PrefabInstance: {fileID: 909474842}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &911983645
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 911983646}
|
||||
- component: {fileID: 911983648}
|
||||
- component: {fileID: 911983647}
|
||||
m_Layer: 5
|
||||
m_Name: Text (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &911983646
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 911983645}
|
||||
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: 2090525126}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &911983647
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 911983645}
|
||||
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: 19
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u52A0\u5165\u623F\u95F4"
|
||||
--- !u!222 &911983648
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 911983645}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &916405896
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8631,6 +8711,86 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -1805113200021120539, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
--- !u!1 &945867066
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 945867067}
|
||||
- component: {fileID: 945867069}
|
||||
- component: {fileID: 945867068}
|
||||
m_Layer: 5
|
||||
m_Name: Text (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &945867067
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 945867066}
|
||||
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: 1485285565}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &945867068
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 945867066}
|
||||
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: 21
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9009\u62E9\u8DEF\u7EBF"
|
||||
--- !u!222 &945867069
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 945867066}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &947202399
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -9399,6 +9559,7 @@ RectTransform:
|
||||
- {fileID: 1074727860}
|
||||
- {fileID: 1469343111}
|
||||
- {fileID: 1081784991}
|
||||
- {fileID: 1359335859}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -10869,6 +11030,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: obj202
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8282288472169970500, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj224
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -6327141709703751677, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj153
|
||||
@ -10881,10 +11046,26 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: obj024
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -3237221884521187588, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj222
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -2654505143154747466, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj220
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1788689016301746583, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj205
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -241233108021658044, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj210
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -106440716057841632, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj221
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: school03
|
||||
@ -10897,14 +11078,46 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: obj204
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3184295249035706133, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj208
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4315024395822287230, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj198
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5427673003371859311, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj223
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7077992237008472060, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj206
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7322491252510880854, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj226
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7455878101187352886, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj225
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8052244126148009048, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj122
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8443362320608252490, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj207
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8661539485286681749, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj209
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8816389197232921522, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: obj219
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: eec919b17e074b747899fe01d7888a2c, type: 3}
|
||||
--- !u!1 &1124162635 stripped
|
||||
@ -18236,6 +18449,60 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 483202, guid: 4ba769e43d710974c9d003dcdf6bfdf7, type: 3}
|
||||
m_PrefabInstance: {fileID: 1355901648}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1359335858
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1359335859}
|
||||
- component: {fileID: 1359335860}
|
||||
m_Layer: 5
|
||||
m_Name: testBtns
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1359335859
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1359335858}
|
||||
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:
|
||||
- {fileID: 2090525126}
|
||||
- {fileID: 1485285565}
|
||||
m_Father: {fileID: 1039624185}
|
||||
m_RootOrder: 15
|
||||
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.7129, y: 0}
|
||||
m_SizeDelta: {x: 455.0954, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1359335860
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1359335858}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6ed0217619b01c044a6b3ddd7241cb18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
test: {fileID: 1526740601}
|
||||
chooseroadBtn: {fileID: 1485285566}
|
||||
joinroomBtn: {fileID: 2090525127}
|
||||
--- !u!1001 &1379519406
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -20413,6 +20680,128 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 474902, guid: 60098370fcf21a444b9d7237e0fb3e56, type: 3}
|
||||
m_PrefabInstance: {fileID: 1481704192}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1485285564
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1485285565}
|
||||
- component: {fileID: 1485285568}
|
||||
- component: {fileID: 1485285567}
|
||||
- component: {fileID: 1485285566}
|
||||
m_Layer: 5
|
||||
m_Name: chooseroadBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1485285565
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1485285564}
|
||||
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:
|
||||
- {fileID: 945867067}
|
||||
m_Father: {fileID: 1359335859}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -80, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1485285566
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1485285564}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1485285567}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1485285567
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1485285564}
|
||||
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: 0, g: 0, b: 0, a: 0.61960787}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &1485285568
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1485285564}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &1489380684
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -25828,6 +26217,128 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2090525125
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2090525126}
|
||||
- component: {fileID: 2090525129}
|
||||
- component: {fileID: 2090525128}
|
||||
- component: {fileID: 2090525127}
|
||||
m_Layer: 5
|
||||
m_Name: joinroomBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2090525126
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2090525125}
|
||||
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:
|
||||
- {fileID: 911983646}
|
||||
m_Father: {fileID: 1359335859}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 80, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2090525127
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2090525125}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2090525128}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &2090525128
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2090525125}
|
||||
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: 0, g: 0, b: 0, a: 0.61960787}
|
||||
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
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!222 &2090525129
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2090525125}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!64 &2092814551
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
39
xiaofang/Assets/Script/hylScripts/TestButton.cs
Normal file
39
xiaofang/Assets/Script/hylScripts/TestButton.cs
Normal file
@ -0,0 +1,39 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TestButton : MonoBehaviour
|
||||
{
|
||||
public test test;
|
||||
|
||||
public Button chooseroadBtn;
|
||||
public Button joinroomBtn;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
joinroomBtn.onClick.AddListener(JoinRoom);
|
||||
chooseroadBtn.onClick.AddListener(ChooseRoad);
|
||||
|
||||
}
|
||||
|
||||
public void JoinRoom()
|
||||
{
|
||||
test.JoinRoom();
|
||||
joinroomBtn.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public void ChooseRoad()
|
||||
{
|
||||
test.NpcMove();
|
||||
chooseroadBtn.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
11
xiaofang/Assets/Script/hylScripts/TestButton.cs.meta
Normal file
11
xiaofang/Assets/Script/hylScripts/TestButton.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6ed0217619b01c044a6b3ddd7241cb18
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1 +1 @@
|
||||
Subproject commit 0385375c1818fc57f42407a6c5301a26ded3a19a
|
||||
Subproject commit 2e42b278d4c6ac9e045925dcc6e04896a19cbfd8
|
Loading…
Reference in New Issue
Block a user