Преглед изворни кода

重新组织代码结构,便于同步开发。

Jees пре 4 месеци
родитељ
комит
bd827e3c07

+ 4 - 4
Assembly-CSharp.csproj

@@ -60,20 +60,20 @@
     <Analyzer Include="D:\Program Files\Unity\2022.3.51f1c1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Assets\Scripts\ProgressBar.cs" />
     <Compile Include="Assets\Packages\Loading Games\Toon City Pack\Demo\Scripts\StreetLight.cs" />
     <Compile Include="Assets\Scripts\Login\LoginLangController.cs" />
     <Compile Include="Assets\Scripts\TestMsgBox.cs" />
     <Compile Include="Assets\Scripts\EnviromentSetting.cs" />
     <Compile Include="Assets\Scripts\DogProperty.cs" />
+    <Compile Include="Assets\Scripts\ProgressBar\ProgressBar.cs" />
     <Compile Include="Assets\Packages\Loading Games\Toon City Pack\Demo\Scripts\BuildingLights.cs" />
-    <Compile Include="Assets\Scripts\HomeSunLight.cs" />
     <Compile Include="Assets\Packages\Loading Games\Toon City Pack\Demo\Scripts\Helicopter.cs" />
     <Compile Include="Assets\Scripts\SceneSwitcher.cs" />
     <Compile Include="Assets\Resources\Status\StatusController.cs" />
-    <Compile Include="Assets\Scripts\SunMovement.cs" />
     <Compile Include="Assets\Resources\MessageBox\MessageBoxController.cs" />
-    <Compile Include="Assets\Scripts\PlaygroundLightControl.cs" />
+    <Compile Include="Assets\Scripts\Login\SunMovement.cs" />
+    <Compile Include="Assets\Scripts\Home\HomeSunLight.cs" />
+    <Compile Include="Assets\Scripts\Playground\PlaygroundLightControl.cs" />
     <Compile Include="Assets\Packages\Loading Games\Toon City Pack\Demo\Scripts\TrafficLights.cs" />
     <Compile Include="Assets\Scripts\UserProperty.cs" />
     <Compile Include="Assets\Scripts\EnviromentController.cs" />

+ 92 - 6
Assets/Scenes/Login.unity

@@ -266,7 +266,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 81452430}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1863178294}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &81452430
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -393,8 +405,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 31.99995, y: 129.99998}
-  m_SizeDelta: {x: 400, y: 50}
+  m_AnchoredPosition: {x: 48, y: 160}
+  m_SizeDelta: {x: 350, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &497859297
 MonoBehaviour:
@@ -1109,8 +1121,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 31.99995, y: 167.99998}
-  m_SizeDelta: {x: 400, y: 50}
+  m_AnchoredPosition: {x: 48, y: 198}
+  m_SizeDelta: {x: 350, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &952681668
 MonoBehaviour:
@@ -1350,7 +1362,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 963194225}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 91112a7c65b63a74d9a65234c01d1166, type: 3}
   m_Name: 
@@ -1741,6 +1753,74 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1087578812}
   m_CullTransparentMesh: 1
+--- !u!1 &1109224424
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1109224427}
+  - component: {fileID: 1109224426}
+  - component: {fileID: 1109224425}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1109224425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1109224424}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1109224426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1109224424}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1109224427
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1109224424}
+  serializedVersion: 2
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1349309764
 GameObject:
   m_ObjectHideFlags: 0
@@ -2322,6 +2402,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding: {x: -8, y: -5, z: -8, w: -5}
   m_Softness: {x: 0, y: 0}
+--- !u!1 &1863178294 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9170027422479897858, guid: fd35a4f041d705948957f1725fa81c41, type: 3}
+  m_PrefabInstance: {fileID: 1589749813}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1879351056
 GameObject:
   m_ObjectHideFlags: 0
@@ -2608,3 +2693,4 @@ SceneRoots:
   - {fileID: 1589749813}
   - {fileID: 1389830019}
   - {fileID: 1349309768}
+  - {fileID: 1109224427}

+ 4 - 0
Assets/Scenes/Playground.unity

@@ -668,6 +668,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: StatusUI
       objectReference: {fileID: 0}
+    - target: {fileID: 5997909836355842307, guid: 00b97733408f83840b44ba387e9ae31b, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8435704930564478781, guid: 00b97733408f83840b44ba387e9ae31b, type: 3}
       propertyPath: m_Pivot.x
       value: 0

+ 0 - 2
Assets/Scripts/EnviromentController.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using Newtonsoft.Json;
 using System.IO;
-using TMPro;
-using System.Text.RegularExpressions;
 
 public class EnviromentController : MonoBehaviour
 {

+ 4 - 6
Assets/Scripts/EnviromentSetting.cs

@@ -1,13 +1,11 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using System.Text.Json;
 using UnityEditorInternal;
-using System;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
-using UnityEngine.UIElements;
-using System.Linq;
+
 
 public static class EnviromentSetting
 {
@@ -21,7 +19,7 @@ public static class EnviromentSetting
     // access Token
     public static string accessToken;
 
-    //系统语言
+    //系统语言 default=en
     public static string languageCode = "en";
 
     //操作系统

+ 8 - 0
Assets/Scripts/Home.meta

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

+ 0 - 0
Assets/Scripts/HomeSunLight.cs → Assets/Scripts/Home/HomeSunLight.cs


+ 0 - 0
Assets/Scripts/HomeSunLight.cs.meta → Assets/Scripts/Home/HomeSunLight.cs.meta


+ 0 - 0
Assets/Scripts/SunMovement.cs → Assets/Scripts/Login/SunMovement.cs


+ 0 - 0
Assets/Scripts/SunMovement.cs.meta → Assets/Scripts/Login/SunMovement.cs.meta


+ 8 - 0
Assets/Scripts/Playground.meta

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

+ 0 - 0
Assets/Scripts/PlaygroundLightControl.cs → Assets/Scripts/Playground/PlaygroundLightControl.cs


+ 0 - 0
Assets/Scripts/PlaygroundLightControl.cs.meta → Assets/Scripts/Playground/PlaygroundLightControl.cs.meta


+ 8 - 0
Assets/Scripts/ProgressBar.meta

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

+ 0 - 0
Assets/Scripts/ProgressBar.cs → Assets/Scripts/ProgressBar/ProgressBar.cs


+ 0 - 0
Assets/Scripts/ProgressBar.cs.meta → Assets/Scripts/ProgressBar/ProgressBar.cs.meta