diff --git a/Forest/Assets/Scripts/Framework/BI/BI.cs b/Forest/Assets/Scripts/Framework/BI/BI.cs deleted file mode 100644 index 32033da..0000000 --- a/Forest/Assets/Scripts/Framework/BI/BI.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; - -namespace Framework.BI -{ - public class StorageEvent - { - public List EventList { get; set; } - public List EventStringList { get; set; } - - public StorageEvent() - { - EventList = new List(); - EventStringList = new List(); - } - - public StorageEvent(List eventList, List eventStringList) - { - EventList = eventList; - EventStringList = eventStringList; - } - } -} \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/BI/BI.cs.meta b/Forest/Assets/Scripts/Framework/BI/BI.cs.meta deleted file mode 100644 index 1ad868a..0000000 --- a/Forest/Assets/Scripts/Framework/BI/BI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 26fe57136a139b143adb61d2c369f697 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Gameplay/Level/Operation.meta b/Forest/Assets/Scripts/Framework/Camera.meta similarity index 77% rename from Forest/Assets/Scripts/Gameplay/Level/Operation.meta rename to Forest/Assets/Scripts/Framework/Camera.meta index dc64584..bdbcc5a 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/Operation.meta +++ b/Forest/Assets/Scripts/Framework/Camera.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c695725f8dddec4a9b762ca20abcd38 +guid: 4f9d31ed566734befa902f69b0264d6b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Forest/Assets/Scripts/Framework/GameBuild/CameraAdapter.cs b/Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs similarity index 100% rename from Forest/Assets/Scripts/Framework/GameBuild/CameraAdapter.cs rename to Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs diff --git a/Forest/Assets/Scripts/Framework/GameBuild/CameraAdapter.cs.meta b/Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Framework/GameBuild/CameraAdapter.cs.meta rename to Forest/Assets/Scripts/Framework/Camera/CameraAdapter.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/CameraController.cs b/Forest/Assets/Scripts/Framework/Camera/CameraController.cs similarity index 100% rename from Forest/Assets/Scripts/Gameplay/CameraController.cs rename to Forest/Assets/Scripts/Framework/Camera/CameraController.cs diff --git a/Forest/Assets/Scripts/Gameplay/CameraController.cs.meta b/Forest/Assets/Scripts/Framework/Camera/CameraController.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/CameraController.cs.meta rename to Forest/Assets/Scripts/Framework/Camera/CameraController.cs.meta diff --git a/Forest/Assets/Scripts/Framework/Manager/CameraManager.cs b/Forest/Assets/Scripts/Framework/Camera/CameraManager.cs similarity index 100% rename from Forest/Assets/Scripts/Framework/Manager/CameraManager.cs rename to Forest/Assets/Scripts/Framework/Camera/CameraManager.cs diff --git a/Forest/Assets/Scripts/Framework/Manager/CameraManager.cs.meta b/Forest/Assets/Scripts/Framework/Camera/CameraManager.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Framework/Manager/CameraManager.cs.meta rename to Forest/Assets/Scripts/Framework/Camera/CameraManager.cs.meta diff --git a/Forest/Assets/Scripts/Framework/AppNetConfig.cs b/Forest/Assets/Scripts/Framework/Forest_AppNetConfig.cs similarity index 89% rename from Forest/Assets/Scripts/Framework/AppNetConfig.cs rename to Forest/Assets/Scripts/Framework/Forest_AppNetConfig.cs index c097713..13f959d 100644 --- a/Forest/Assets/Scripts/Framework/AppNetConfig.cs +++ b/Forest/Assets/Scripts/Framework/Forest_AppNetConfig.cs @@ -17,7 +17,7 @@ public enum NetRequestStatus Success, } -public class AppNetConfig : MonoBehaviour +public class Forest_AppNetConfig : MonoBehaviour { /// /// 请求服务器返回信息类 @@ -41,6 +41,7 @@ public class AppNetConfig : MonoBehaviour public string client_type; public string game_data; } + /// /// 请求上传数据类 /// @@ -99,7 +100,6 @@ public class AppNetConfig : MonoBehaviour private void SaveNewUserData() { - DebugUtil.LogWarning("新玩家"); var jsonData = JsonConvert.SerializeObject(AppInfoManager.Instance.RemoteAppUserInfo); UploadDataToServer(jsonData); } @@ -131,7 +131,7 @@ public class AppNetConfig : MonoBehaviour { var uniqueID = AppInfoManager.Instance.GetUniqueID(); var uniqueType = AppInfoManager.Instance.GetUniqueType(); - DebugUtil.Log("使用{0}获取数据, ID:{1}", AppInfoManager.Instance.CurLoginState, uniqueID); + DebugUtil.Log("Use {0} Get Data, ID:{1}", AppInfoManager.Instance.CurLoginState, uniqueID); HTTPRequest request = new HTTPRequest(new Uri(URL), HTTPMethods.Post, OnGetFinished); request.SetHeader("Content-Type", "application/json"); _createSign = GenerateHash("get_data", uniqueID); @@ -147,7 +147,7 @@ public class AppNetConfig : MonoBehaviour var jsonData = JsonConvert.SerializeObject(_postData); if (string.IsNullOrEmpty(jsonData)) - DebugUtil.LogError("Json转化后，postDataJson为空"); + DebugUtil.LogError("GetDataFromServer : Error Json Convert，postDataJson is null"); var bytes = Encoding.UTF8.GetBytes(jsonData); request.RawData = bytes; @@ -178,14 +178,16 @@ public class AppNetConfig : MonoBehaviour //查不到第三方信息 但是本地有 绑定 if (loginIDState == AppInfoManager.NetConfigID.ThirdID && _deviceLoginSuccess) { - DebugUtil.Log("查不到第三方信息 但是本地有, 保存数据, 服务器返回消息：{0}", jsonData); + DebugUtil.Log( + "Can't find ThirdID, but local have! Bind ThirdID, Server return Message : {0}", + jsonData); BindThirdID(); _thirdLoginSuccess = true; } //其余情况以设备id注册新玩家 else { - DebugUtil.Log("无设备ID和第三方ID, 新玩家, 先保存数据"); + DebugUtil.Log("New User (No DeviceID and ThirdID)"); _isNewUser = true; EventManager.Instance.Send(EventManager.EventName.NewUserLogin); } @@ -198,29 +200,31 @@ public class AppNetConfig : MonoBehaviour _serverData.data = data["game_data"]?.ToString(); if (!string.IsNullOrEmpty(_serverData.data)) { + //第一次使用第三方id获取成功，设备id无登录 if (loginIDState == AppInfoManager.NetConfigID.ThirdID && !_deviceLoginSuccess) { _thirdLoginSuccess = true; AppInfoManager.Instance.ThirdIdGetSuccess(_serverData.data); - DebugUtil.Log("第一次使用第三方id获取成功，设备id无登录"); + DebugUtil.Log("First ThirdID GetData Success, No DeviceID"); } //后续登录 和 设备id获取得到第三方id的情况 else if (loginIDState == AppInfoManager.NetConfigID.ThirdID && _deviceLoginSuccess) { _thirdLoginSuccess = true; AppInfoManager.Instance.ThirdIdGetSuccessWithDevice(_serverData.data); - DebugUtil.Log("使用第三方id获取成功"); + DebugUtil.Log("ThirdID GetData Success"); } //本地有设备id缓存 并且没登录过第三方 else if (loginIDState == AppInfoManager.NetConfigID.DeviceID && !_thirdLoginSuccess) { _deviceLoginSuccess = true; AppInfoManager.Instance.DeviceIdGetSuccess(_serverData.data); - DebugUtil.Log("使用设备id获取成功，进行有无第三方id判断"); + DebugUtil.Log("DeviceID GetData Success, Judge ThirdID"); } + //设备id获取成功但是第三方也成功登录的情况 else { - DebugUtil.Log("设备id获取成功但是第三方也成功登录的情况"); + DebugUtil.Log("DeviceID and ThirdID GetData Success"); } } } @@ -258,7 +262,7 @@ public class AppNetConfig : MonoBehaviour { var clientID = AppInfoManager.Instance.AppUserInfo.UserInfo.UserID; var thirdID = AppInfoManager.Instance.AppUserInfo.UserInfo.ThirdId; - DebugUtil.Log("上传的玩家数据, clientID:{0}, thirdID: {1}，gameData:{2}", clientID, thirdID, data); + DebugUtil.Log("Upload Data, clientID:{0}, thirdID: {1}，gameData:{2}", clientID, thirdID, data); var request = new HTTPRequest(new Uri(URL), HTTPMethods.Post, NewOnUploadFinished); request.SetHeader("Content-Type", "application/json"); @@ -274,7 +278,7 @@ public class AppNetConfig : MonoBehaviour }; string jsonData = JsonConvert.SerializeObject(_uploadPostData); if (string.IsNullOrEmpty(jsonData)) - DebugUtil.LogError("Json转化后, uploadPostDat为空"); + DebugUtil.LogError("UploadDataToServer : Error Json Convert，uploadPostDat is null"); DebugUtil.Log("UploadData.Post信息：{0}", jsonData); var bytes = Encoding.UTF8.GetBytes(jsonData); request.RawData = bytes; @@ -295,13 +299,13 @@ public class AppNetConfig : MonoBehaviour case HTTPRequestStates.Finished: { var jsonData = response.DataAsText; - DebugUtil.Log("Upload从服务器获取到的数据：{0}", jsonData); + DebugUtil.Log("Upload Sever Return jsonData：{0}", jsonData); JObject jObj = JObject.Parse(jsonData); _serverData.code = (int)jObj["code"]; _serverData.message = jObj["message"]?.ToString(); if (_serverData.code == 0) { - DebugUtil.Log("服务器保存数据成功 !!!!"); + DebugUtil.Log("Server Save Successfully !!!!"); if (_isNewUser) GetDataFromServer(); } diff --git a/Forest/Assets/Scripts/Framework/AppNetConfig.cs.meta b/Forest/Assets/Scripts/Framework/Forest_AppNetConfig.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Framework/AppNetConfig.cs.meta rename to Forest/Assets/Scripts/Framework/Forest_AppNetConfig.cs.meta diff --git a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildLoadingExecutor.cs b/Forest/Assets/Scripts/Framework/GameBuild/GameBuildLoadingExecutor.cs deleted file mode 100644 index 809b063..0000000 --- a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildLoadingExecutor.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Cysharp.Threading.Tasks; -using Framework.Manager; -using Gameplay.LoadingExecutor; -using UnityEngine.AddressableAssets; -using UnityEngine.SceneManagement; - -namespace Framework.GameBuild -{ - public class GameBuildLoadingExecutor : LoadingExecutorWithUILoadingController - { - protected override async UniTask _DoLoading() - { - await Addressables.LoadSceneAsync(Constants.Constants.SceneBuildPath, LoadSceneMode.Single).ToUniTask(); - _destProgress = 100f; - } - } -} \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildLoadingExecutor.cs.meta b/Forest/Assets/Scripts/Framework/GameBuild/GameBuildLoadingExecutor.cs.meta deleted file mode 100644 index 7a4fa58..0000000 --- a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildLoadingExecutor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c2689db812d4c4839b9d01b980ec14ff -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildStateStart.cs b/Forest/Assets/Scripts/Framework/GameBuild/GameBuildStateStart.cs deleted file mode 100644 index 792e106..0000000 --- a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildStateStart.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Framework.State; -using Gameplay.LoadingExecutor; - -namespace Framework.GameBuild -{ - public class GameBuildStateStart : IState - { - public void OnEnter() - { - LoadingExecutorManager.Instance.ExecuteLoading( - new GameBuildLoadingExecutor()); - } - - public void OnUpdate(float deltaTime) - { - } - - public void OnExit() - { - } - } -} \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildStateStart.cs.meta b/Forest/Assets/Scripts/Framework/GameBuild/GameBuildStateStart.cs.meta deleted file mode 100644 index 56b9f0e..0000000 --- a/Forest/Assets/Scripts/Framework/GameBuild/GameBuildStateStart.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7aa43c76d684c4426855c04cf4b98f0d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Gameplay/Login.meta b/Forest/Assets/Scripts/Framework/Login.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login.meta rename to Forest/Assets/Scripts/Framework/Login.meta diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginManager.cs b/Forest/Assets/Scripts/Framework/Login/LoginManager.cs similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login/LoginManager.cs rename to Forest/Assets/Scripts/Framework/Login/LoginManager.cs diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginManager.cs.meta b/Forest/Assets/Scripts/Framework/Login/LoginManager.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login/LoginManager.cs.meta rename to Forest/Assets/Scripts/Framework/Login/LoginManager.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginStatus.cs b/Forest/Assets/Scripts/Framework/Login/LoginStatus.cs similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login/LoginStatus.cs rename to Forest/Assets/Scripts/Framework/Login/LoginStatus.cs diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginStatus.cs.meta b/Forest/Assets/Scripts/Framework/Login/LoginStatus.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login/LoginStatus.cs.meta rename to Forest/Assets/Scripts/Framework/Login/LoginStatus.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginStatusApple.cs b/Forest/Assets/Scripts/Framework/Login/LoginStatusApple.cs similarity index 97% rename from Forest/Assets/Scripts/Gameplay/Login/LoginStatusApple.cs rename to Forest/Assets/Scripts/Framework/Login/LoginStatusApple.cs index 25d521b..069125d 100644 --- a/Forest/Assets/Scripts/Gameplay/Login/LoginStatusApple.cs +++ b/Forest/Assets/Scripts/Framework/Login/LoginStatusApple.cs @@ -71,7 +71,7 @@ public class LoginStatusApple : LoginStatus private void GetDataFromSever() { AppInfoManager.Instance.CurLoginState = AppInfoManager.NetConfigID.ThirdID; - AppNetConfig.State = NetRequestStatus.Start; + Forest_AppNetConfig.State = NetRequestStatus.Start; } private void OnLoginFail(int code, string msg) diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginStatusApple.cs.meta b/Forest/Assets/Scripts/Framework/Login/LoginStatusApple.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login/LoginStatusApple.cs.meta rename to Forest/Assets/Scripts/Framework/Login/LoginStatusApple.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginStatusFaceBook.cs b/Forest/Assets/Scripts/Framework/Login/LoginStatusFaceBook.cs similarity index 97% rename from Forest/Assets/Scripts/Gameplay/Login/LoginStatusFaceBook.cs rename to Forest/Assets/Scripts/Framework/Login/LoginStatusFaceBook.cs index fb78fce..9193bf1 100644 --- a/Forest/Assets/Scripts/Gameplay/Login/LoginStatusFaceBook.cs +++ b/Forest/Assets/Scripts/Framework/Login/LoginStatusFaceBook.cs @@ -63,7 +63,7 @@ namespace Gameplay.Login private void GetDataFromSever() { AppInfoManager.Instance.CurLoginState = AppInfoManager.NetConfigID.ThirdID; - AppNetConfig.State = NetRequestStatus.Start; + Forest_AppNetConfig.State = NetRequestStatus.Start; } private void OnLoginFail(int code, string msg) diff --git a/Forest/Assets/Scripts/Gameplay/Login/LoginStatusFaceBook.cs.meta b/Forest/Assets/Scripts/Framework/Login/LoginStatusFaceBook.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Login/LoginStatusFaceBook.cs.meta rename to Forest/Assets/Scripts/Framework/Login/LoginStatusFaceBook.cs.meta diff --git a/Forest/Assets/Scripts/Framework/Manager/AppInfoManager.cs b/Forest/Assets/Scripts/Framework/Manager/AppInfoManager.cs index 9810f08..9750900 100644 --- a/Forest/Assets/Scripts/Framework/Manager/AppInfoManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/AppInfoManager.cs @@ -80,7 +80,7 @@ public class AppInfoManager : Singlenton, IInitable, IUpdatable ? NetConfigID.ThirdID : NetConfigID.DeviceID; LoginManager.Instance.IsLogin = !string.IsNullOrEmpty(_appUserInfo.UserInfo.ThirdId); - AppNetConfig.State = NetRequestStatus.Start; + Forest_AppNetConfig.State = NetRequestStatus.Start; _init = true; DebugUtil.Log("当前的向服务器请求的账号是: {0}，登录状态: {1}", CurLoginState, LoginManager.Instance.IsLogin); @@ -160,7 +160,7 @@ public class AppInfoManager : Singlenton, IInitable, IUpdatable DebugUtil.Log("设备id登录成功，有第三方id数据:{0}，进行获取", _tempIdToken); _appUserInfo.UserInfo.ThirdId = _tempIdToken; CurLoginState = NetConfigID.ThirdID; - AppNetConfig.State = NetRequestStatus.Start; + Forest_AppNetConfig.State = NetRequestStatus.Start; } //无 直接比对数据 else @@ -319,7 +319,7 @@ public class AppInfoManager : Singlenton, IInitable, IUpdatable if (_init && !GetRemoteInfo && RemoteTickTime > RemoteInterval) { RemoteTickTime = 0.0f; - AppNetConfig.State = NetRequestStatus.Start; + Forest_AppNetConfig.State = NetRequestStatus.Start; DebugUtil.Log("... 尝试再次从服务器读取玩家数据 ..."); } } diff --git a/Forest/Assets/Scripts/Framework/BI/BIManager.cs b/Forest/Assets/Scripts/Framework/Manager/BIManager.cs similarity index 93% rename from Forest/Assets/Scripts/Framework/BI/BIManager.cs rename to Forest/Assets/Scripts/Framework/Manager/BIManager.cs index 4ed1aaa..b04e8c6 100644 --- a/Forest/Assets/Scripts/Framework/BI/BIManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/BIManager.cs @@ -6,6 +6,24 @@ using System; namespace Framework.BI { + public class StorageEvent + { + public List EventList { get; set; } + public List EventStringList { get; set; } + + public StorageEvent() + { + EventList = new List(); + EventStringList = new List(); + } + + public StorageEvent(List eventList, List eventStringList) + { + EventList = eventList; + EventStringList = eventStringList; + } + } + public class BIManager : Singlenton, IInitable { public enum Reason diff --git a/Forest/Assets/Scripts/Framework/BI/BIManager.cs.meta b/Forest/Assets/Scripts/Framework/Manager/BIManager.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Framework/BI/BIManager.cs.meta rename to Forest/Assets/Scripts/Framework/Manager/BIManager.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Game/Main.cs b/Forest/Assets/Scripts/Gameplay/Game/Forest_Main.cs similarity index 90% rename from Forest/Assets/Scripts/Gameplay/Game/Main.cs rename to Forest/Assets/Scripts/Gameplay/Game/Forest_Main.cs index 51d258b..a41c50e 100644 --- a/Forest/Assets/Scripts/Gameplay/Game/Main.cs +++ b/Forest/Assets/Scripts/Gameplay/Game/Forest_Main.cs @@ -5,7 +5,7 @@ using PhxhSDK; namespace Gameplay.Game { - public class Main : MonoBehaviour + public class Forest_Main : MonoBehaviour { public static PhxhSDK.Game Game { @@ -26,10 +26,9 @@ namespace Gameplay.Game AdSDKManager.Instance.ConfigureBeforeInit(unityAdsGameID); AdSDKManager.Instance.Init(); IAPManager.Instance.Init(); - _InitReport(); DontDestroyOnLoad(gameObject); - _game = new MyGame(); + _game = new Forest_MyGame(); if (_game == null) { DebugUtil.LogError("Framework.Main: no game instance created"); @@ -38,10 +37,6 @@ namespace Gameplay.Game _game.Init(); } - private void _InitReport() - { - } - private void Start() { BIManager.Instance.TrackEventOnce(cfg.BI.EventFirst.fte_open); diff --git a/Forest/Assets/Scripts/Gameplay/Game/Main.cs.meta b/Forest/Assets/Scripts/Gameplay/Game/Forest_Main.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Game/Main.cs.meta rename to Forest/Assets/Scripts/Gameplay/Game/Forest_Main.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/MyGame.cs b/Forest/Assets/Scripts/Gameplay/Game/MyGame.cs similarity index 94% rename from Forest/Assets/Scripts/Gameplay/MyGame.cs rename to Forest/Assets/Scripts/Gameplay/Game/MyGame.cs index e4c996b..429cddd 100644 --- a/Forest/Assets/Scripts/Gameplay/MyGame.cs +++ b/Forest/Assets/Scripts/Gameplay/Game/MyGame.cs @@ -5,12 +5,11 @@ using Gameplay.Game; using Gameplay.Login; using Gameplay.Manager; using Framework.Manager; -using Framework.Constants; using Gameplay.LoadingExecutor; namespace Gameplay { - public class MyGame : PhxhSDK.Game + public class Forest_MyGame : PhxhSDK.Game { protected override void _RegisterSubSystems() { diff --git a/Forest/Assets/Scripts/Gameplay/MyGame.cs.meta b/Forest/Assets/Scripts/Gameplay/Game/MyGame.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/MyGame.cs.meta rename to Forest/Assets/Scripts/Gameplay/Game/MyGame.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/Operation/UndoOperation.cs b/Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/Operation/UndoOperation.cs rename to Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs diff --git a/Forest/Assets/Scripts/Gameplay/Level/Operation/UndoOperation.cs.meta b/Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/Operation/UndoOperation.cs.meta rename to Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs.meta diff --git a/Forest/Assets/Scripts/Framework/BI.meta b/Forest/Assets/Scripts/Gameplay/State.meta similarity index 77% rename from Forest/Assets/Scripts/Framework/BI.meta rename to Forest/Assets/Scripts/Gameplay/State.meta index fb27c2f..1df5769 100644 --- a/Forest/Assets/Scripts/Framework/BI.meta +++ b/Forest/Assets/Scripts/Gameplay/State.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9aa1071553b4ea34abc5619c1f640127 +guid: 86a901e94234d4099a196d78c682d9db folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs b/Forest/Assets/Scripts/Gameplay/State/GameStateStart.cs similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs rename to Forest/Assets/Scripts/Gameplay/State/GameStateStart.cs diff --git a/Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs.meta b/Forest/Assets/Scripts/Gameplay/State/GameStateStart.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs.meta rename to Forest/Assets/Scripts/Gameplay/State/GameStateStart.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/LevelState.cs b/Forest/Assets/Scripts/Gameplay/State/LevelState.cs similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/LevelState.cs rename to Forest/Assets/Scripts/Gameplay/State/LevelState.cs diff --git a/Forest/Assets/Scripts/Gameplay/Level/LevelState.cs.meta b/Forest/Assets/Scripts/Gameplay/State/LevelState.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/LevelState.cs.meta rename to Forest/Assets/Scripts/Gameplay/State/LevelState.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs index 102f636..6b56149 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs @@ -1,4 +1,6 @@ -using cfg.BI; +//// 旧的主界面 + +/*using cfg.BI; using UnityEngine; using Framework.BI; using Framework.UI; @@ -134,4 +136,4 @@ public class UIMainPanelController : UIWindow UnregisterEvent(); UIManager.Instance.CloseWindow(UIConstants.UIMainPanelBg); } -} \ No newline at end of file +}*/ \ No newline at end of file