diff --git a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou.png b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou.png index 8313acbf24..87e53d7350 100644 Binary files a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou.png and b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou.png differ diff --git a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_01.png b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_01.png index 41d2c0b8ca..dd80bfcd6d 100644 Binary files a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_01.png and b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_01.png differ diff --git a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_02.png b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_02.png index 9ba6188e53..8a032e95b1 100644 Binary files a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_02.png and b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_baitou_02.png differ diff --git a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou.png b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou.png index 0238c05107..9239990dc8 100644 Binary files a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou.png and b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou.png differ diff --git a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_01.png b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_01.png index b1d1b1342c..6038b38bdd 100644 Binary files a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_01.png and b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_01.png differ diff --git a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_02.png b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_02.png index 309ca3d641..cd36c56ff7 100644 Binary files a/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_02.png and b/Assets/ManagedResources/Atlas/CreateNameAtlas/c_cjjs_heitou_02.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab index 47572b7c53..c53616876a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab @@ -39529,8 +39529,8 @@ RectTransform: 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: 92, y: 342.6} - m_SizeDelta: {x: 880, y: 1072} + m_AnchoredPosition: {x: 0, y: 436} + m_SizeDelta: {x: 841, y: 987} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3471754034931023599 CanvasRenderer: @@ -58678,9 +58678,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2673677434195106714} - - {fileID: 393671961303302240} + m_Children: [] m_Father: {fileID: 6829139039448462934} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -98353,263 +98351,3 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1001 &1154969973566155951 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 928230360286138979} - m_Modifications: - - target: {fileID: 8885000337053502330, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_Name - value: live2d_npc_map_nv - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -77.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalScale.x - value: 0.15 - objectReference: {fileID: 0} - - target: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - propertyPath: m_LocalScale.y - value: 0.15 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f56f817745ef2ae468a905aa1fcc5b11, type: 3} ---- !u!224 &393671961303302240 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1545259699646295247, guid: f56f817745ef2ae468a905aa1fcc5b11, - type: 3} - m_PrefabInstance: {fileID: 1154969973566155951} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3919068376537564716 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 928230360286138979} - m_Modifications: - - target: {fileID: 361818576339279413, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_Name - value: live2d_npc_map - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalPosition.z - value: -26666.668 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, type: 3} ---- !u!224 &2673677434195106714 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1403324941135273398, guid: 06dcefd8d6ad06f4593a1eed6b8bf983, - type: 3} - m_PrefabInstance: {fileID: 3919068376537564716} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index da977ed92f..8e0d94474d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -1,4 +1,4 @@ -GuideManager = {} +GuideManager = {} local this = GuideManager local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig) local GlobalSystemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) @@ -126,8 +126,8 @@ function this.ShowGuide(id, ...) guild_start_time = math.floor(GetTimeStamp()), }) if AppConst.isSDKLogin then - SDKMgr:NewRoleTutorial(tostring(id) ,tostring(math.floor(GetTimeStamp())) ,tostring(math.floor(GetTimeStamp())), - PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name,PlayerManager.nickName,tostring(PlayerManager.uid)) + -- SDKMgr:NewRoleTutorial(tostring(id) ,tostring(math.floor(GetTimeStamp())) ,tostring(math.floor(GetTimeStamp())), + -- PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name,PlayerManager.nickName,tostring(PlayerManager.uid)) --发送埋点数据 if id == -1 then CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FinishGuide,0) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua index 4f3f7fd36f..e245e27c71 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua @@ -12,8 +12,8 @@ local girlLiveRes = "live2d_npc_map_nv" local smallInfo = {[1] = {Pos = Vector3.New(-1, -81, 0), Scale = Vector3.New(0.25, 0.25, 0.25)}, [2] = {Pos = Vector3.New(-1, -81, 0), Scale = Vector3.New(0.15, 0.15, 0.15)},} -local bigInfo = {[1] = {Pos = Vector3.New(-89, -264, 0), Scale = Vector3.New(0.4, 0.4, 0.4)}, - [2] = {Pos = Vector3.New(-92, -244, 0), Scale = Vector3.New(0.4, 0.4, 0.4)},} +local bigInfo = {[1] = {Pos = Vector3.New(-43, -312, 0), Scale = Vector3.New(0.4, 0.4, 0.4)}, + [2] = {Pos = Vector3.New(-53, -309, 0), Scale = Vector3.New(0.4, 0.4, 0.4)},} local curLive local lastChoose