UI优化备份

Assets/AtlasUtility/ReferenceTable.txt

@@ -15,11 +15,6 @@ fileID: 21300002, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid:
 fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4
 fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7
 fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3
-fileID: 21300000, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: c1bd930204518d34490b0a65ce52cfe2
-fileID: 21300002, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 82e315b06b317424fa171ba1079b64d3
-fileID: 21300004, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 368f403b73078e24fbc0ed5b0fea1b1c
-fileID: 21300006, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 65cd80b0cc4229943acab26732d161a6
-fileID: 21300008, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: a324ee6c20ae102438570789022106a8
 fileID: 21300000, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: 3becf28a881ca004aac96b8626844d1a
 fileID: 21300002, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: b23f84d78b2ee3443b11253a61f85f59
 fileID: 21300004, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c
@@ -135,3 +130,9 @@ fileID: 21300006, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid:
 fileID: 21300008, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid: d2b776327fb8f9244af6766cf0f5e859
 fileID: 21300000, guid: c8e673ebab81ff34e95ecff941a31312|fileID: 21300000, guid: 3a966c70f70c2044fbcf3c611eb7b0fa
 fileID: 21300002, guid: c8e673ebab81ff34e95ecff941a31312|fileID: 21300000, guid: b2b6e02f3768cb941af8c5519ca9506c
+fileID: 21300000, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: c1bd930204518d34490b0a65ce52cfe2
+fileID: 21300002, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 82e315b06b317424fa171ba1079b64d3
+fileID: 21300004, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 368f403b73078e24fbc0ed5b0fea1b1c
+fileID: 21300006, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 65cd80b0cc4229943acab26732d161a6
+fileID: 21300008, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: a324ee6c20ae102438570789022106a8
+fileID: 21300010, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: bf1c75459cdd88441a7928bb916f47ef

Assets/AtlasUtility/SerializeObject.prefab

@@ -56,11 +56,17 @@ MonoBehaviour:
   PackSize: 2048
   SlicePadding: 0
   PackPadding: 1
-  PackPath: Assets/AtlasUtility
+  PackPath: Assets/Resource/Sprite/SpriteUI
   SlicePath: Assets/AtlasUtility/Slice
-  PackName: Atlas
+  PackName: BtnAtlas1
   Atlas: {fileID: 0}
   Target: {fileID: 0}
-  TextureList: []
+  TextureList:
+  - {fileID: 2800000, guid: c1bd930204518d34490b0a65ce52cfe2, type: 3}
+  - {fileID: 2800000, guid: 82e315b06b317424fa171ba1079b64d3, type: 3}
+  - {fileID: 2800000, guid: 368f403b73078e24fbc0ed5b0fea1b1c, type: 3}
+  - {fileID: 2800000, guid: 65cd80b0cc4229943acab26732d161a6, type: 3}
+  - {fileID: 2800000, guid: a324ee6c20ae102438570789022106a8, type: 3}
+  - {fileID: 2800000, guid: bf1c75459cdd88441a7928bb916f47ef, type: 3}
   VirtualTextureList: []
   ReferenceTable: {fileID: 4900000, guid: e61ffc7d134032b48a4366dfa7284499, type: 3}

Assets/New Animation.anim

@@ -1,154 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!74 &7400000
-AnimationClip:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New Animation
-  serializedVersion: 6
-  m_Legacy: 0
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves: []
-  m_FloatCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: -343.3
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 0.33333334
-        value: 346.6
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 0.0000076294
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 0.33333334
-        value: 0.0000076294
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.y
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  m_PPtrCurves: []
-  m_SampleRate: 60
-  m_WrapMode: 0
-  m_Bounds:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0, y: 0, z: 0}
-  m_ClipBindingConstant:
-    genericBindings:
-    - path: 0
-      attribute: 1460864421
-      script: {fileID: 0}
-      classID: 224
-      customType: 0
-      isPPtrCurve: 0
-    - path: 0
-      attribute: 538195251
-      script: {fileID: 0}
-      classID: 224
-      customType: 0
-      isPPtrCurve: 0
-    pptrCurveMapping: []
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 0.33333334
-    m_OrientationOffsetY: 0
-    m_Level: 0
-    m_CycleOffset: 0
-    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
-    m_LoopBlend: 0
-    m_LoopBlendOrientation: 0
-    m_LoopBlendPositionY: 0
-    m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
-    m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
-    m_Mirror: 0
-  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: -343.3
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 0.33333334
-        value: 346.6
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 0.0000076294
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 0.33333334
-        value: 0.0000076294
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.y
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
-  m_HasMotionFloatCurves: 0
-  m_GenerateMotionCurves: 0
-  m_IsEmpty: 0
-  m_Events: []

Assets/New Animation.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bd0a14156aaf9ac4f8b548adf683c7a8
-timeCreated: 1502693532
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/New Animator Controller.controller

@@ -1,67 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New Animator Controller
-  serializedVersion: 5
-  m_AnimatorParameters: []
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: 1107907516412157236}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1102 &1102324197426563160
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: New Animation
-  m_Speed: 0.1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: bd0a14156aaf9ac4f8b548adf683c7a8, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
---- !u!1107 &1107907516412157236
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 1102324197426563160}
-    m_Position: {x: 312, y: 24, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 1102324197426563160}

Assets/New Animator Controller.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 313b259a8bf0b0c499bbac8e5354063b
-timeCreated: 1502693516
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/refresh@2x.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d79df0bb6cb344a7bbebf3cec16efece
-timeCreated: 1502699823
+timeCreated: 1502787484
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/refresh_click@2x.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e419fbec1a2884a95a6833b32222d50f
-timeCreated: 1502699823
+timeCreated: 1502787485
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/shutdown@2x.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6545997c9076d43e790229f103369e60
-timeCreated: 1502699822
+timeCreated: 1502787462
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Plugins/Alipay/IOS/AlipaySDK.bundle/shutdown_click@2x.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 693625444e87047ef9a633797af23d95
-timeCreated: 1502699823
+timeCreated: 1502787462
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,30 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Resource/Prefab/Object/Player.prefab

@@ -91,7 +91,7 @@ GameObject:
   m_IsActive: 1
 --- !u!1 &1497926776519098
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
@@ -105,6 +105,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1596732944731970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4007373572171746}
+  m_Layer: 0
+  m_Name: ShadowParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1666751815557130
 GameObject:
   m_ObjectHideFlags: 0
@@ -135,6 +150,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!4 &4007373572171746
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1596732944731970}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.1424791, y: -2.81, z: 3}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4717949673564384}
+  m_Father: {fileID: 4072475945792000}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4009153966016544
 Transform:
   m_ObjectHideFlags: 1
@@ -174,7 +203,7 @@ Transform:
   - {fileID: 4400762833459984}
   - {fileID: 4281633466977820}
   - {fileID: 4009153966016544}
-  - {fileID: 4717949673564384}
+  - {fileID: 4007373572171746}
   - {fileID: 4560986378048750}
   - {fileID: 4065049769947314}
   - {fileID: 4645389164054564}
@@ -240,11 +269,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1497926776519098}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.1424791, y: -2.81, z: 3}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.8209519, y: 2.4181993, z: 1.8209519}
   m_Children: []
-  m_Father: {fileID: 4072475945792000}
-  m_RootOrder: 3
+  m_Father: {fileID: 4007373572171746}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &61000764261009850
 BoxCollider2D:

Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -5518,7 +5518,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: bf1c75459cdd88441a7928bb916f47ef, type: 3}
+  m_Sprite: {fileID: 21300010, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resource/Sprite/SpriteUI/BtnAtlas1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d5fb26beef3dde488c316021ca5729f
-timeCreated: 1502590463
+timeCreated: 1502788257
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -9,6 +9,7 @@ TextureImporter:
     21300004: "\u7BA1\u7406\u6309\u94AE"
     21300006: "\u8BBE\u7F6E"
     21300008: "\u6210\u5C31\u6309\u94AE"
+    21300010: "\u8BD5\u8863\u95F4"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -64,7 +65,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 512
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -72,7 +73,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 512
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -80,7 +81,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 512
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -155,6 +156,19 @@ TextureImporter:
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8BD5\u8863\u95F4"
+      rect:
+        serializedVersion: 2
+        x: 208
+        y: 291
+        width: 154
+        height: 143
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
     outline: []
   spritePackingTag: 
   userData: 

Assets/Resource/Sprite/SpriteUI/抽奖图标.png.meta → Assets/Resource/Sprite/SpriteUI/礼包.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b302746e597587e4ea2e8d2e9765a58c
-timeCreated: 1502703150
+timeCreated: 1502788216
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -19,7 +19,7 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
-  isReadable: 0
+  isReadable: 1
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/试衣间.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: bf1c75459cdd88441a7928bb916f47ef
-timeCreated: 1502696177
+timeCreated: 1502788255
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -19,7 +19,7 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
-  isReadable: 0
+  isReadable: 1
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="-8" />
+  <Version value="-9" />
 
   <ID value="Default" />
   <TutorialA value="1" />

Assets/Script/Manage/Initializer.cs

@@ -120,7 +120,7 @@ public class Initializer : MonoBehaviour
         ManaTutorial.TutorialIndexE = ManaData.GetPlayerInt("TutorialIndexE");
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-10";
 
-        Bundle.LoadAtlas2Sprite();
+        Bundle.LoadAtlasSprites();
         GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1-11";
 
         for (int i = 0; i < RegistList.Count; i++)

Assets/Script/Manage/ManaIAP.cs

@@ -22,6 +22,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 {
     #region 变量
 
+    public static bool UseAlipayOnIOS = false;
     public static bool Complete;
     public static ManaIAP Instance;
     public static PayChannel PayChannel;
@@ -81,6 +82,18 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         }
     }
 
+    public static void InitializeShare()
+    {
+        if (Application.isMobilePlatform || Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
+
+            ShareSdk.Initialize();
+
+            ShareSdk.shareHandler = ShareCallback;
+        }
+    }
+
     public static void InitializeIAP()
     {
         if (Application.isEditor)
@@ -89,47 +102,59 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         }
 
         PayChannel = ManaReso.Load<TextAsset>("Setting", Folder.Config).text.ToEnum<PayChannel>();
-        
-        if (PayChannel == PayChannel.AliPay)
+
+        if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            foreach (var attribute in ManaData.GetIAPConfig())
+            if (UseAlipayOnIOS)
             {
-                ProductList.Add(attribute[1].Value);
-
-                ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
-                PackNameDic.Add(attribute[1].Value, attribute[5].Value);
+                InitializeAlipay();
+            }
+            else
+            {
+                InitializeUnityIAP();
             }
-
-            AliplayManager.Instance.Init();
         }
-        else if (PayChannel == PayChannel.UnityIAP)
+        else
         {
-            ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
-
-            foreach (var attribute in ManaData.GetIAPConfig())
+            if (PayChannel == PayChannel.AliPay)
             {
-                cb.AddProduct(attribute[1].Value, ProductType.Consumable);
-
-                ProductList.Add(attribute[1].Value);
-
-                ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
-                PackNameDic.Add(attribute[1].Value, attribute[5].Value);
+                InitializeAlipay();
             }
+            else if (PayChannel == PayChannel.UnityIAP)
+            {
+                InitializeUnityIAP();
+            }
+        }
+    }
+
+    public static void InitializeAlipay()
+    {
+        foreach (var attribute in ManaData.GetIAPConfig())
+        {
+            ProductList.Add(attribute[1].Value);
 
-            UnityPurchasing.Initialize(Instance, cb);
+            ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
+            PackNameDic.Add(attribute[1].Value, attribute[5].Value);
         }
+
+        AliplayManager.Instance.Init();
     }
 
-    public static void InitializeShare()
+    public static void InitializeUnityIAP()
     {
-        if (Application.isMobilePlatform || Application.platform == RuntimePlatform.IPhonePlayer)
+        ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
+
+        foreach (var attribute in ManaData.GetIAPConfig())
         {
-            ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
+            cb.AddProduct(attribute[1].Value, ProductType.Consumable);
 
-            ShareSdk.Initialize();
+            ProductList.Add(attribute[1].Value);
 
-            ShareSdk.shareHandler = ShareCallback;
+            ProductIdDic.Add(attribute[5].Value, attribute[1].Value);
+            PackNameDic.Add(attribute[1].Value, attribute[5].Value);
         }
+
+        UnityPurchasing.Initialize(Instance, cb);
     }
 
 

Assets/Script/Manage/ManaSign.cs

@@ -159,7 +159,7 @@ public class Sign
     {
         if (IsLottery)
         {
-            Icon.sprite = ManaReso.LoadSprite("抽奖图标", Folder.UI);
+            Icon.sprite = ManaReso.LoadSprite("礼包", Folder.Atlas);
             Icon.Resize(true, 0.3f, 0.3f);
 
             return;

Assets/Script/Manage/ManaTutorial.cs

@@ -1054,6 +1054,8 @@ public class ManaTutorial : Regist
             "N_Button",
             () =>
             {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
                 ManaPlayer.Player.EnterDressRoom();
 
                 EndD();

Assets/Script/Object/Player.cs

@@ -94,7 +94,7 @@ public class CloseUnit
         Sprites = SpriteParse(attribute[13].Value);
         SpriteAlpha = Auxiliary.FloatParse(attribute[14].Value, 1);
         ArmatureName = attribute[15].Value;
-        
+
         ManaPlayer.CloseIDDic.Add(ArmatureName, ID);
         ManaPlayer.CloseUnitDic.Add(ID, this);
 
@@ -141,6 +141,7 @@ public class CloseUnit
         BuyBtn = ChildDic["BuyBtn"].GetComponent<Button>();
         BuyBtnLab = ChildDic["BuyBtnLab"].GetComponent<Text>();
 
+        BuyBtnLab.GetComponent<TextPlus>().SetY = true;
 
         Icon2.sprite = Sprites[0];
 
@@ -668,7 +669,7 @@ public class Player : Regist , IPointerClickHandler
 
                     ChildDic["Shadow"].GetStreamScale().Pause();
                     ChildDic["Shadow"].GetStreamScale().InOrigin = true;
-                    ChildDic["Shadow"].SetActive(false);
+                    ChildDic["ShadowParent"].SetActive(false);
 
                     ManaReso.Get("B_SignIn0").TweenForCG();
                     ManaReso.Get("I_BlackMask").TweenForCG();
@@ -709,7 +710,7 @@ public class Player : Regist , IPointerClickHandler
                         ManaGarden.PlantList[i].Flower.RetrieveElf();
                     }
 
-                    ChildDic["Shadow"].SetActive(true);
+                    ChildDic["ShadowParent"].SetActive(true);
 
                     transform.SetParent(ManaReso.Get("DressRoom"));
 

Assets/Script/Tool/Auxiliary.cs

@@ -123,6 +123,8 @@ public class Auxiliary : Regist
     private void Awake()
     {
         Instance = this;
+
+
     }
 
     private void Update()

Assets/Script/Tool/Bundle.cs

@@ -16,7 +16,6 @@ public class Bundle : MonoBehaviour
     public static Bundle Instance;
 
     public static bool Complete;
-    public static bool Atlas2Complete;
 
     public static AssetBundle Atlas;
     public static AssetBundle Atlas2;
@@ -160,15 +159,8 @@ public class Bundle : MonoBehaviour
         throw new Exception();
     }
 
-    public static void LoadAtlas2Sprite()
+    public static void LoadAtlasSprites()
     {
-        if (Atlas2Complete)
-        {
-            return;
-        }
-
-        Atlas2Complete = true;
-
         if (Initializer.Instance.DebugMode)
         {
             for (int i = 0; i < Instance.Atlas2List.Count; i++)
@@ -187,6 +179,13 @@ public class Bundle : MonoBehaviour
                 ManaReso.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
             }
 
+            sprites = Atlas.LoadAllAssets<Sprite>();
+
+            for (int i = 0; i < sprites.Length; i++)
+            {
+                ManaReso.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
+            }
+
             sprites = Scene.LoadAssetWithSubAssets<Sprite>("FlowerItemAtlas1");
 
             for (int i = 0; i < sprites.Length; i++)

Assets/Script/Tool/UI/TextPlus.cs

@@ -43,6 +43,8 @@ public class TextPlus : Text
     private ImagePlus ImagePlus_;
 
     public bool Draw;
+    public bool SetY = false;
+    public float Y = 0;
     public float LineHeight;
     public VertexHelper ToFill;
 
@@ -455,7 +457,7 @@ public class TextPlus : Text
         {
             first = true;
         }
-
+        
         UIVertex v0 = new UIVertex();
         UIVertex v1 = new UIVertex();
         UIVertex v2 = new UIVertex();
@@ -489,6 +491,11 @@ public class TextPlus : Text
         {
             Vector3 middleRight = (TextVertex[1 + (imageInfo.Left - 1) * 6].position + TextVertex[2 + (imageInfo.Left - 1) * 6].position) / 2;
 
+            if (SetY)
+            {
+                middleRight.y = Y;
+            }
+
             v0.position = middleRight + new Vector3(0, height / 2);
             v1.position = middleRight + new Vector3(width, height / 2);
             v2.position = middleRight + new Vector3(width, -height / 2);

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   apiCompatibilityLevel: 1
-  stripEngineCode: 1
+  stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   iPhoneBuildNumber: 0

ToList.txt

@@ -1,31 +1,12 @@
-Partial类的用法
-
-
-图文混排出现Bug
-
-新的抽奖图标和配置
-
-将抽奖图标从Bundle中移除
-
-
-图集有新图片 需要再设置一次引用
-
 存档不能更新?
 
-Player的影子只在试衣间中显示
-
-
-画面卡顿的问题(开始教程有画面撕裂现象)
-
 花隐形的bug(小游戏C? 小游戏B?)
 
-CloseUnity的图文混排位置
-
-
-苹果的本地化(在PlayerBuilder中设置)
 
 分享appid
 
+苹果的本地化
+
 
 还原PlayerConfig