diff --git a/Assets/ChillConnect/FGUI/package/Game_04/com_open.cs b/Assets/ChillConnect/FGUI/package/Game_04/com_open.cs index 9af5510..1a14699 100644 --- a/Assets/ChillConnect/FGUI/package/Game_04/com_open.cs +++ b/Assets/ChillConnect/FGUI/package/Game_04/com_open.cs @@ -7,11 +7,9 @@ namespace FGUI.Game_04 { public partial class com_open : GComponent { - public GImage bg; - public GGraph anim; public GTextField text_level; public GGraph tips_node; - public Transition t1; + public Transition t0; public const string URL = "ui://g3iqdlgcopwg13"; public static com_open CreateInstance() @@ -23,11 +21,9 @@ namespace FGUI.Game_04 { base.ConstructFromXML(xml); - bg = (GImage)GetChildAt(0); - anim = (GGraph)GetChildAt(1); - text_level = (GTextField)GetChildAt(2); - tips_node = (GGraph)GetChildAt(3); - t1 = GetTransitionAt(0); + text_level = (GTextField)GetChildAt(3); + tips_node = (GGraph)GetChildAt(4); + t0 = GetTransitionAt(0); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Img_02/com_loadingBg.cs b/Assets/ChillConnect/FGUI/package/Img_02/com_loadingBg.cs index c176123..5f6dc52 100644 --- a/Assets/ChillConnect/FGUI/package/Img_02/com_loadingBg.cs +++ b/Assets/ChillConnect/FGUI/package/Img_02/com_loadingBg.cs @@ -9,6 +9,8 @@ namespace FGUI.Img_02 { public GImage bg; public GGraph bg_parent; + public GGraph leaves_anim; + public GGraph light_anim; public const string URL = "ui://g8449vzzopwg0"; public static com_loadingBg CreateInstance() @@ -22,6 +24,8 @@ namespace FGUI.Img_02 bg = (GImage)GetChildAt(0); bg_parent = (GGraph)GetChildAt(1); + leaves_anim = (GGraph)GetChildAt(2); + light_anim = (GGraph)GetChildAt(3); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs b/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs index ef547d2..cf58217 100644 --- a/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs +++ b/Assets/ChillConnect/FGUI/package/Lobby_03/com_hall.cs @@ -25,12 +25,12 @@ namespace FGUI.Lobby_03 public GButton btn_setting; public GButton btn_restore; public GGroup right_group; - public GButton btn_gold; public GComponent btn_money; - public GButton btn_head; - public GImage head_red; public GButton btn_start; public com_level com_level; + public GButton btn_gold; + public GButton btn_head; + public GGroup top_group; public const string URL = "ui://gytj501copwg9"; public static com_hall CreateInstance() @@ -60,12 +60,12 @@ namespace FGUI.Lobby_03 btn_setting = (GButton)GetChildAt(21); btn_restore = (GButton)GetChildAt(22); right_group = (GGroup)GetChildAt(23); - btn_gold = (GButton)GetChildAt(24); - btn_money = (GComponent)GetChildAt(25); - btn_head = (GButton)GetChildAt(26); - head_red = (GImage)GetChildAt(27); - btn_start = (GButton)GetChildAt(29); - com_level = (com_level)GetChildAt(30); + btn_money = (GComponent)GetChildAt(24); + btn_start = (GButton)GetChildAt(26); + com_level = (com_level)GetChildAt(27); + btn_gold = (GButton)GetChildAt(29); + btn_head = (GButton)GetChildAt(30); + top_group = (GGroup)GetChildAt(31); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/FGUI/package/Login_05/com_login_page.cs b/Assets/ChillConnect/FGUI/package/Login_05/com_login_page.cs index 81cfc26..a342ce5 100644 --- a/Assets/ChillConnect/FGUI/package/Login_05/com_login_page.cs +++ b/Assets/ChillConnect/FGUI/package/Login_05/com_login_page.cs @@ -13,8 +13,6 @@ namespace FGUI.Login_05 public GButton btn_error; public GTextField lab_int; public GTextField lab_reward; - public GGraph leaves_anim; - public GGraph light_anim; public GTextField lab_key; public const string URL = "ui://8u2p5uv6sebx6"; @@ -33,9 +31,7 @@ namespace FGUI.Login_05 btn_error = (GButton)GetChildAt(3); lab_int = (GTextField)GetChildAt(4); lab_reward = (GTextField)GetChildAt(5); - leaves_anim = (GGraph)GetChildAt(6); - light_anim = (GGraph)GetChildAt(7); - lab_key = (GTextField)GetChildAt(8); + lab_key = (GTextField)GetChildAt(6); } } } \ No newline at end of file diff --git a/Assets/ChillConnect/Manager/FXManager.cs b/Assets/ChillConnect/Manager/FXManager.cs index 35088cd..5b6a53e 100644 --- a/Assets/ChillConnect/Manager/FXManager.cs +++ b/Assets/ChillConnect/Manager/FXManager.cs @@ -167,9 +167,8 @@ None = -1, gamwin, fx_broad, - fx_login, fx_login_light, - fx_login_leaves, + fx_login_bird, fx_btn_play, fx_coin, fx_hand_pre, diff --git a/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json b/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json index 510b2a5..e0145b4 100644 --- a/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json +++ b/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json @@ -298,7 +298,7 @@ { "Type" : "Bool", "Key" : "Obfuscate_Method_Internal", - "Value" : "False", + "Value" : "True", "Values" : null }, { @@ -316,7 +316,7 @@ { "Type" : "Bool", "Key" : "Obfuscate_Method_Public", - "Value" : "False", + "Value" : "True", "Values" : null } ] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/fx_login.prefab b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/fx_login.prefab deleted file mode 100644 index a2b8dd5..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/fx_login.prefab +++ /dev/null @@ -1,123 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8199273842531755948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8108074089940185204} - - component: {fileID: 2016207299710351759} - - component: {fileID: 667631953045773237} - - component: {fileID: 1929929366198807263} - m_Layer: 0 - m_Name: fx_login - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8108074089940185204 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} - 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!33 &2016207299710351759 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} - m_Mesh: {fileID: 0} ---- !u!23 &667631953045773237 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1929929366198807263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: f3157be37207d5b4285c27b7f3c3df78, type: 2} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - _animationName: - loop: 0 - timeScale: 1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/fx_login.prefab.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/fx_login.prefab.meta deleted file mode 100644 index 9375088..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/fx_login.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a2c0d4a912e8c412cab984098e626209 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.atlas.txt b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.atlas.txt deleted file mode 100644 index f7f2df0..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.atlas.txt +++ /dev/null @@ -1,41 +0,0 @@ - -logo.png -size: 1604,345 -format: RGBA8888 -filter: Linear,Linear -repeat: none -ball - rotate: false - xy: 1183, 49 - size: 305, 117 - orig: 308, 119 - offset: 2, 1 - index: -1 -bg - rotate: false - xy: 2, 42 - size: 752, 301 - orig: 755, 303 - offset: 1, 1 - index: -1 -kingdom - rotate: false - xy: 756, 168 - size: 736, 175 - orig: 739, 177 - offset: 1, 1 - index: -1 -light - rotate: false - xy: 1494, 38 - size: 108, 305 - orig: 114, 311 - offset: 3, 3 - index: -1 -qiu - rotate: false - xy: 756, 2 - size: 425, 164 - orig: 425, 164 - offset: 0, 0 - index: -1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.json b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.json deleted file mode 100644 index 7a11e45..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"klJLYbeON6pMCwR4xmk1+E1TDpA","spine":"3.8.93","x":-377.47,"y":-166.37,"width":755,"height":331},"bones":[{"name":"root"},{"name":"bone","parent":"root","x":-3.03,"y":-25.43},{"name":"qiu","parent":"bone","x":161.19,"y":87.37},{"name":"light","parent":"bone","x":-415.27,"y":-39.4}],"slots":[{"name":"bg","bone":"bone","attachment":"bg"},{"name":"qiu","bone":"qiu","attachment":"qiu"},{"name":"ball","bone":"bone","attachment":"ball"},{"name":"kingdom","bone":"bone","attachment":"kingdom"},{"name":"caijian","bone":"root","attachment":"caijian"},{"name":"light","bone":"light","color":"ffffffdd","attachment":"light"}],"skins":[{"name":"default","attachments":{"ball":{"ball":{"x":-54.44,"y":94.56,"width":308,"height":119}},"bg":{"bg":{"x":3.06,"y":10.56,"width":755,"height":303}},"caijian":{"caijian":{"type":"clipping","end":"caijian","vertexCount":182,"vertices":[-350.64,-118.39,-367.84,-1,-363.79,2.29,-334.7,6.34,-329.38,4.82,-323.82,-37.94,-307.37,7.35,-301.05,10.64,-272.71,13.17,-265.88,11.14,-271.45,-2.52,-290.17,-49.07,-251.21,-90.56,-252.47,-81.96,-248.68,-80.19,-238.3,-78.67,-243.62,-23.01,-257.03,-24.28,-260.31,-19.98,-262.09,-5.81,-260.82,1.78,-256.27,2.03,-201.62,7.35,-197.06,2.79,-195.55,-8.09,-196.56,-17.7,-200.18,-19.95,-210.63,-21.15,-205.2,-76.02,-193.54,-75.82,-189.93,-79.84,-188.92,-94.11,-189.32,-99.54,-183.09,-97.33,-190.73,5.98,-186.51,8.8,-163.8,9.4,-157.57,7.79,-128.02,-39.64,-130.23,8.19,-124,12.82,-104.5,13.42,-99.68,10.81,-96.34,-42.54,-89.73,-42.02,-89.55,-25.84,-81.2,-4.79,-66.41,8.79,-46.4,17.14,-21,16.79,-3.6,11.57,-1.68,6.87,-4.64,-3.57,-8.64,-12.96,-12.99,-17.31,-15.1,-18.72,-19.14,-16.78,-28.55,-13.3,-39.39,-13.69,-49.19,-19.49,-54.1,-27.1,-55.64,-38.2,-53.97,-50.45,-48.55,-59.48,-39.78,-64.64,-30.23,-65.54,-25.46,-60.9,-25.72,-38.71,-20.81,-36.52,-5.33,-36.26,-0.82,-38.71,0.47,-81.15,9.76,-81.54,10.02,9.92,12.34,13.02,16.98,15.73,50.14,14.95,61.57,14.18,74.27,9.5,83.91,3.08,91.36,-5.53,96.17,-16.19,97.93,-36.49,101.72,-36.78,104.06,-25.54,110.04,-10.5,122.16,3.08,142.89,11.55,165.67,11.26,180.99,6.69,195.87,-5.18,203.87,-16.62,206.73,-37.93,206.16,-47.94,215.89,-49.94,224.61,13.98,228.47,17.41,250.49,16.7,273.66,11.83,276.95,6.11,289.82,-47.8,313.88,3.31,319.59,7.25,331.15,6.71,364.06,-0.09,367.05,-3.08,354.56,-115.58,352.53,-119.63,337.71,-119.16,320.71,-115.89,318.52,-113.7,324.61,-44.44,294.81,-108.24,291.54,-111.68,279.99,-110.74,270.01,-108.24,268.6,-105.75,254.88,-34.61,245.52,-100.29,243.96,-104.81,237.56,-105.75,221.34,-104.97,209.79,-100.44,215.92,-51.23,205.84,-49.27,204.3,-60.82,200.66,-73.28,191.63,-86.51,174.94,-97.72,159.06,-100.87,135.81,-98.12,117.25,-86.8,107.87,-74.45,103.22,-58.54,102.71,-43.84,102.02,-38.33,97.98,-37.99,96.17,-55.96,88.09,-75.57,77.08,-86.58,60.91,-93.8,47.32,-94.57,16.19,-94.23,9.91,-90.1,9.86,-82.4,0.09,-82.02,0.02,-87.99,-8.07,-91.82,-26.53,-96.08,-51.67,-94.38,-67.14,-87.56,-79.07,-76.49,-87.88,-57.74,-89.44,-44.4,-95.98,-44.67,-94.87,-90.72,-96.27,-94.22,-103.55,-96.04,-124.83,-96.46,-127.77,-93.1,-156.33,-48.58,-152.27,-94.08,-154.51,-98.14,-163.19,-100.1,-179.29,-101.08,-182.09,-99.54,-190.43,-101.92,-195.59,-102.12,-247.89,-107.26,-248.71,-105.16,-252.22,-94.98,-256.66,-100.13,-270.23,-110.19,-283.34,-111.71,-288.84,-109.02,-317.74,-70.53,-320.08,-70.99,-314.34,-109.02,-313.52,-113.7,-318.09,-115.69,-332.83,-118.38,-344.76,-119.55]}},"kingdom":{"kingdom":{"x":3.06,"y":-44.44,"width":739,"height":177}},"light":{"light":{"x":0.83,"y":-5.04,"scaleX":1.6158,"scaleY":1.2015,"width":114,"height":311}},"qiu":{"qiu":{"x":-150.13,"y":20.69,"width":425,"height":164}}}}],"animations":{"animation":{"slots":{"qiu":{"color":[{"color":"ffffff00"},{"time":0.0667,"color":"ffffff41"},{"time":0.2667,"color":"ffffffff"}]}},"bones":{"qiu":{"rotate":[{"angle":-4.09},{"time":0.5}],"translate":[{"x":-302.48,"y":131.48},{"time":0.5}],"scale":[{"x":0.438,"y":0.438},{"time":0.5}]},"light":{"rotate":[{"time":0.6667,"angle":12.17},{"time":1.5,"angle":-26.46},{"time":5.3333,"angle":-16.73}],"translate":[{"time":0.6667},{"time":1.5,"x":841.41,"curve":"stepped"},{"time":5.3333,"x":841.41}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.png b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.png deleted file mode 100644 index be1e25a..0000000 Binary files a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.png and /dev/null differ diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird.meta similarity index 77% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird.meta index 45f685f..b2bcc96 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd9394c1a12d8744a95c52bb879159a7 +guid: 51e3c9b2749879149b9e9913e338fea4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.atlas.txt b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.atlas.txt new file mode 100644 index 0000000..f09a240 --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.atlas.txt @@ -0,0 +1,69 @@ + +dly_bird.png +size: 358,160 +format: RGBA8888 +filter: Linear,Linear +repeat: none +images/f01 + rotate: true + xy: 272, 75 + size: 83, 84 + orig: 120, 150 + offset: 12, 49 + index: -1 +images/f02 + rotate: true + xy: 40, 65 + size: 93, 68 + orig: 120, 150 + offset: 10, 53 + index: -1 +images/f03 + rotate: true + xy: 2, 61 + size: 97, 36 + orig: 120, 150 + offset: 14, 45 + index: -1 +images/f04 + rotate: false + xy: 82, 2 + size: 93, 61 + orig: 120, 150 + offset: 17, 23 + index: -1 +images/f05 + rotate: true + xy: 110, 66 + size: 92, 76 + orig: 120, 150 + offset: 15, 9 + index: -1 +images/f06 + rotate: false + xy: 188, 3 + size: 80, 63 + orig: 120, 150 + offset: 13, 17 + index: -1 +images/f07 + rotate: false + xy: 2, 4 + size: 78, 55 + orig: 120, 150 + offset: 14, 45 + index: -1 +images/f08 + rotate: false + xy: 272, 7 + size: 84, 66 + orig: 120, 150 + offset: 8, 48 + index: -1 +images/f09 + rotate: false + xy: 188, 68 + size: 82, 90 + orig: 120, 150 + offset: 11, 50 + index: -1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.atlas.txt.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.atlas.txt.meta similarity index 75% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.atlas.txt.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.atlas.txt.meta index e341c06..f6952e4 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.atlas.txt.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2422ae538f32480596e2cc294351d03 +guid: 60232431992960c46aaf6d6b6150f4f2 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.json b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.json new file mode 100644 index 0000000..3b2d41b --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"6/pU/xtDm/bh9fTtA0xilmz3NnU","spine":"3.8.93"},"bones":[{"name":"root"},{"name":"1","parent":"root","length":10,"rotation":26.79,"y":603.84,"scaleX":-1.5549,"scaleY":1.5549},{"name":"a","parent":"1","length":10},{"name":"a2","parent":"1","length":10},{"name":"a3","parent":"1","length":10},{"name":"a4","parent":"1","length":10},{"name":"a5","parent":"1","length":10}],"slots":[{"name":"caijian","bone":"root","attachment":"caijian"},{"name":"a5","bone":"a5"},{"name":"a4","bone":"a4"},{"name":"a3","bone":"a3"},{"name":"a2","bone":"a2"}],"skins":[{"name":"default","attachments":{"a2":{"images/f01":{"width":120,"height":150},"images/f02":{"width":120,"height":150},"images/f03":{"width":120,"height":150},"images/f04":{"width":120,"height":150},"images/f05":{"width":120,"height":150},"images/f06":{"width":120,"height":150},"images/f07":{"width":120,"height":150},"images/f08":{"width":120,"height":150},"images/f09":{"width":120,"height":150}},"a3":{"images/f01":{"width":120,"height":150},"images/f02":{"width":120,"height":150},"images/f03":{"width":120,"height":150},"images/f04":{"width":120,"height":150},"images/f05":{"width":120,"height":150},"images/f06":{"width":120,"height":150},"images/f07":{"width":120,"height":150},"images/f08":{"width":120,"height":150},"images/f09":{"width":120,"height":150}},"a4":{"images/f01":{"width":120,"height":150},"images/f02":{"width":120,"height":150},"images/f03":{"width":120,"height":150},"images/f04":{"width":120,"height":150},"images/f05":{"width":120,"height":150},"images/f06":{"width":120,"height":150},"images/f07":{"width":120,"height":150},"images/f08":{"width":120,"height":150},"images/f09":{"width":120,"height":150}},"a5":{"images/f01":{"width":120,"height":150},"images/f02":{"width":120,"height":150},"images/f03":{"width":120,"height":150},"images/f04":{"width":120,"height":150},"images/f05":{"width":120,"height":150},"images/f06":{"width":120,"height":150},"images/f07":{"width":120,"height":150},"images/f08":{"width":120,"height":150},"images/f09":{"width":120,"height":150}},"caijian":{"caijian":{"type":"clipping","end":"caijian","vertexCount":23,"vertices":[-546.38,676.21,-361.76,673.05,-381.48,598.89,-387.01,485.27,-370.44,404.79,-351.5,362.19,-286.8,415.84,-256.82,435.57,-241.04,483.69,-210.27,460.02,-100.6,500.26,5.92,535.77,108.49,556.28,106.91,533.4,111.64,515.25,80.08,403.22,69.82,382.7,67.46,351.14,54.04,318,36.69,243.05,-17.15,58.11,-649.18,18.37,-595.34,676.04]}}}}],"animations":{"animation":{"slots":{"a2":{"color":[{"color":"bce2ffbd"}],"attachment":[{"name":"images/f09"},{"time":0.8,"name":"images/f09"},{"time":0.8667,"name":"images/f01"},{"time":0.9333,"name":"images/f02"},{"time":1,"name":"images/f03"},{"time":1.0667,"name":"images/f04"},{"time":1.1333,"name":"images/f05"},{"time":1.2,"name":"images/f06"},{"time":1.2667,"name":"images/f07"},{"time":1.3333,"name":"images/f08"},{"time":1.4,"name":"images/f09"},{"time":1.4667,"name":"images/f01"},{"time":1.5333,"name":"images/f02"},{"time":1.6,"name":"images/f03"},{"time":1.6667,"name":"images/f04"},{"time":1.7333,"name":"images/f05"},{"time":1.8,"name":"images/f06"},{"time":1.8667,"name":"images/f07"},{"time":1.9333,"name":"images/f08"},{"time":2,"name":"images/f09"},{"time":2.0667,"name":"images/f01"},{"time":2.1333,"name":"images/f02"},{"time":2.2,"name":"images/f03"},{"time":2.2667,"name":"images/f04"},{"time":2.3333,"name":"images/f05"},{"time":2.4,"name":"images/f06"},{"time":2.4667,"name":"images/f07"},{"time":2.5333,"name":"images/f08"},{"time":2.6,"name":"images/f09"},{"time":2.6667,"name":"images/f01"},{"time":2.7333,"name":"images/f02"},{"time":2.8,"name":"images/f03"},{"time":2.8667,"name":"images/f04"},{"time":2.9333,"name":"images/f05"},{"time":3,"name":"images/f06"},{"time":3.0667,"name":"images/f07"},{"time":3.1333,"name":"images/f08"},{"time":3.2,"name":"images/f09"},{"time":3.2667,"name":"images/f01"},{"time":3.3333,"name":"images/f02"},{"time":3.4,"name":"images/f03"},{"time":3.4667,"name":"images/f04"},{"time":3.5333,"name":"images/f05"},{"time":3.6,"name":"images/f06"},{"time":3.6667,"name":"images/f07"},{"time":3.7333,"name":"images/f08"},{"time":3.8,"name":"images/f09"},{"time":3.8667,"name":"images/f01"},{"time":3.9333,"name":"images/f02"},{"time":4,"name":"images/f03"},{"time":4.0667,"name":"images/f04"},{"time":4.1333,"name":"images/f05"},{"time":4.2,"name":"images/f06"},{"time":4.2667,"name":"images/f07"},{"time":4.3333,"name":"images/f08"},{"time":4.4,"name":"images/f09"},{"time":4.4667,"name":"images/f01"},{"time":4.5333,"name":"images/f02"},{"time":4.6,"name":"images/f03"},{"time":4.6667,"name":"images/f04"},{"time":4.7333,"name":"images/f05"},{"time":4.8,"name":"images/f06"},{"time":4.8667,"name":"images/f07"},{"time":4.9333,"name":"images/f08"},{"time":5,"name":"images/f09"},{"time":5.0667,"name":"images/f01"},{"time":5.1333,"name":"images/f02"},{"time":5.2,"name":"images/f03"},{"time":5.2667,"name":"images/f04"},{"time":5.3333,"name":"images/f05"},{"time":5.4,"name":"images/f06"},{"time":5.4667,"name":"images/f07"},{"time":5.5333,"name":"images/f08"},{"time":5.6,"name":"images/f09"},{"time":5.6667,"name":"images/f01"},{"time":5.7333,"name":"images/f02"},{"time":5.8,"name":"images/f03"},{"time":5.8667,"name":"images/f04"},{"time":5.9333,"name":"images/f05"},{"time":6,"name":"images/f06"},{"time":6.0667,"name":"images/f07"},{"time":6.1333,"name":"images/f08"},{"time":6.2,"name":"images/f09"},{"time":6.2667,"name":"images/f01"},{"time":6.3333,"name":"images/f02"},{"time":6.4,"name":"images/f03"}]},"a3":{"color":[{"color":"bce2ffbd"}],"attachment":[{"name":"images/f06"},{"time":0.8,"name":"images/f06"},{"time":0.8667,"name":"images/f07"},{"time":0.9333,"name":"images/f08"},{"time":1,"name":"images/f09"},{"time":1.0667,"name":"images/f01"},{"time":1.1333,"name":"images/f02"},{"time":1.2,"name":"images/f03"},{"time":1.2667,"name":"images/f04"},{"time":1.3333,"name":"images/f05"},{"time":1.4,"name":"images/f06"},{"time":1.4667,"name":"images/f07"},{"time":1.5333,"name":"images/f08"},{"time":1.6,"name":"images/f09"},{"time":1.6667,"name":"images/f01"},{"time":1.7333,"name":"images/f02"},{"time":1.8,"name":"images/f03"},{"time":1.8667,"name":"images/f04"},{"time":1.9333,"name":"images/f05"},{"time":2,"name":"images/f06"},{"time":2.0667,"name":"images/f07"},{"time":2.1333,"name":"images/f08"},{"time":2.2,"name":"images/f09"},{"time":2.2667,"name":"images/f01"},{"time":2.3333,"name":"images/f02"},{"time":2.4,"name":"images/f03"},{"time":2.4667,"name":"images/f04"},{"time":2.5333,"name":"images/f05"},{"time":2.6,"name":"images/f06"},{"time":2.6667,"name":"images/f07"},{"time":2.7333,"name":"images/f08"},{"time":2.8,"name":"images/f09"},{"time":2.8667,"name":"images/f01"},{"time":2.9333,"name":"images/f02"},{"time":3,"name":"images/f03"},{"time":3.0667,"name":"images/f04"},{"time":3.1333,"name":"images/f05"},{"time":3.2,"name":"images/f06"},{"time":3.2667,"name":"images/f07"},{"time":3.3333,"name":"images/f08"},{"time":3.4,"name":"images/f09"},{"time":3.4667,"name":"images/f01"},{"time":3.5333,"name":"images/f02"},{"time":3.6,"name":"images/f03"},{"time":3.6667,"name":"images/f04"},{"time":3.7333,"name":"images/f05"},{"time":3.8,"name":"images/f06"},{"time":3.8667,"name":"images/f07"},{"time":3.9333,"name":"images/f08"},{"time":4,"name":"images/f09"},{"time":4.0667,"name":"images/f01"},{"time":4.1333,"name":"images/f02"},{"time":4.2,"name":"images/f03"},{"time":4.2667,"name":"images/f04"},{"time":4.3333,"name":"images/f05"},{"time":4.4,"name":"images/f06"},{"time":4.4667,"name":"images/f07"},{"time":4.5333,"name":"images/f08"},{"time":4.6,"name":"images/f09"},{"time":4.6667,"name":"images/f01"},{"time":4.7333,"name":"images/f02"},{"time":4.8,"name":"images/f03"},{"time":4.8667,"name":"images/f04"},{"time":4.9333,"name":"images/f05"},{"time":5,"name":"images/f06"},{"time":5.0667,"name":"images/f07"},{"time":5.1333,"name":"images/f08"},{"time":5.2,"name":"images/f09"},{"time":5.2667,"name":"images/f01"},{"time":5.3333,"name":"images/f02"},{"time":5.4,"name":"images/f03"},{"time":5.4667,"name":"images/f04"},{"time":5.5333,"name":"images/f05"},{"time":5.6,"name":"images/f06"},{"time":5.6667,"name":"images/f07"},{"time":5.7333,"name":"images/f08"},{"time":5.8,"name":"images/f09"},{"time":5.8667,"name":"images/f01"},{"time":5.9333,"name":"images/f02"},{"time":6,"name":"images/f03"},{"time":6.0667,"name":"images/f04"},{"time":6.1333,"name":"images/f05"},{"time":6.2,"name":"images/f06"},{"time":6.2667,"name":"images/f07"},{"time":6.3333,"name":"images/f08"},{"time":6.4,"name":"images/f09"}]},"a4":{"color":[{"color":"bce2ffbd"}],"attachment":[{"name":"images/f07"},{"time":0.8,"name":"images/f07"},{"time":0.8667,"name":"images/f08"},{"time":0.9333,"name":"images/f09"},{"time":1,"name":"images/f01"},{"time":1.0667,"name":"images/f02"},{"time":1.1333,"name":"images/f03"},{"time":1.2,"name":"images/f04"},{"time":1.2667,"name":"images/f05"},{"time":1.3333,"name":"images/f06"},{"time":1.4,"name":"images/f07"},{"time":1.4667,"name":"images/f08"},{"time":1.5333,"name":"images/f09"},{"time":1.6,"name":"images/f01"},{"time":1.6667,"name":"images/f02"},{"time":1.7333,"name":"images/f03"},{"time":1.8,"name":"images/f04"},{"time":1.8667,"name":"images/f05"},{"time":1.9333,"name":"images/f06"},{"time":2,"name":"images/f07"},{"time":2.0667,"name":"images/f08"},{"time":2.1333,"name":"images/f09"},{"time":2.2,"name":"images/f01"},{"time":2.2667,"name":"images/f02"},{"time":2.3333,"name":"images/f03"},{"time":2.4,"name":"images/f04"},{"time":2.4667,"name":"images/f05"},{"time":2.5333,"name":"images/f06"},{"time":2.6,"name":"images/f07"},{"time":2.6667,"name":"images/f08"},{"time":2.7333,"name":"images/f09"},{"time":2.8,"name":"images/f01"},{"time":2.8667,"name":"images/f02"},{"time":2.9333,"name":"images/f03"},{"time":3,"name":"images/f04"},{"time":3.0667,"name":"images/f05"},{"time":3.1333,"name":"images/f06"},{"time":3.2,"name":"images/f07"},{"time":3.2667,"name":"images/f08"},{"time":3.3333,"name":"images/f09"},{"time":3.4,"name":"images/f01"},{"time":3.4667,"name":"images/f02"},{"time":3.5333,"name":"images/f03"},{"time":3.6,"name":"images/f04"},{"time":3.6667,"name":"images/f05"},{"time":3.7333,"name":"images/f06"},{"time":3.8,"name":"images/f07"},{"time":3.8667,"name":"images/f08"},{"time":3.9333,"name":"images/f09"},{"time":4,"name":"images/f01"},{"time":4.0667,"name":"images/f02"},{"time":4.1333,"name":"images/f03"},{"time":4.2,"name":"images/f04"},{"time":4.2667,"name":"images/f05"},{"time":4.3333,"name":"images/f06"},{"time":4.4,"name":"images/f07"},{"time":4.4667,"name":"images/f08"},{"time":4.5333,"name":"images/f09"},{"time":4.6,"name":"images/f01"},{"time":4.6667,"name":"images/f02"},{"time":4.7333,"name":"images/f03"},{"time":4.8,"name":"images/f04"},{"time":4.8667,"name":"images/f05"},{"time":4.9333,"name":"images/f06"},{"time":5,"name":"images/f07"},{"time":5.0667,"name":"images/f08"},{"time":5.1333,"name":"images/f09"},{"time":5.2,"name":"images/f01"},{"time":5.2667,"name":"images/f02"},{"time":5.3333,"name":"images/f03"},{"time":5.4,"name":"images/f04"},{"time":5.4667,"name":"images/f05"},{"time":5.5333,"name":"images/f06"},{"time":5.6,"name":"images/f07"},{"time":5.6667,"name":"images/f08"},{"time":5.7333,"name":"images/f09"},{"time":5.8,"name":"images/f01"},{"time":5.8667,"name":"images/f02"},{"time":5.9333,"name":"images/f03"},{"time":6,"name":"images/f04"},{"time":6.0667,"name":"images/f05"},{"time":6.1333,"name":"images/f06"},{"time":6.2,"name":"images/f07"},{"time":6.2667,"name":"images/f08"},{"time":6.3333,"name":"images/f09"},{"time":6.4,"name":"images/f01"}]},"a5":{"color":[{"color":"bce2ffbd"}],"attachment":[{"name":"images/f01"},{"time":0.8,"name":"images/f01"},{"time":0.8667,"name":"images/f02"},{"time":0.9333,"name":"images/f03"},{"time":1,"name":"images/f04"},{"time":1.0667,"name":"images/f05"},{"time":1.1333,"name":"images/f06"},{"time":1.2,"name":"images/f07"},{"time":1.2667,"name":"images/f08"},{"time":1.3333,"name":"images/f09"},{"time":1.4,"name":"images/f01"},{"time":1.4667,"name":"images/f02"},{"time":1.5333,"name":"images/f03"},{"time":1.6,"name":"images/f04"},{"time":1.6667,"name":"images/f05"},{"time":1.7333,"name":"images/f06"},{"time":1.8,"name":"images/f07"},{"time":1.8667,"name":"images/f08"},{"time":1.9333,"name":"images/f09"},{"time":2,"name":"images/f01"},{"time":2.0667,"name":"images/f02"},{"time":2.1333,"name":"images/f03"},{"time":2.2,"name":"images/f04"},{"time":2.2667,"name":"images/f05"},{"time":2.3333,"name":"images/f06"},{"time":2.4,"name":"images/f07"},{"time":2.4667,"name":"images/f08"},{"time":2.5333,"name":"images/f09"},{"time":2.6,"name":"images/f01"},{"time":2.6667,"name":"images/f02"},{"time":2.7333,"name":"images/f03"},{"time":2.8,"name":"images/f04"},{"time":2.8667,"name":"images/f05"},{"time":2.9333,"name":"images/f06"},{"time":3,"name":"images/f07"},{"time":3.0667,"name":"images/f08"},{"time":3.1333,"name":"images/f09"},{"time":3.2,"name":"images/f01"},{"time":3.2667,"name":"images/f02"},{"time":3.3333,"name":"images/f03"},{"time":3.4,"name":"images/f04"},{"time":3.4667,"name":"images/f05"},{"time":3.5333,"name":"images/f06"},{"time":3.6,"name":"images/f07"},{"time":3.6667,"name":"images/f08"},{"time":3.7333,"name":"images/f09"},{"time":3.8,"name":"images/f01"},{"time":3.8667,"name":"images/f02"},{"time":3.9333,"name":"images/f03"},{"time":4,"name":"images/f04"},{"time":4.0667,"name":"images/f05"},{"time":4.1333,"name":"images/f06"},{"time":4.2,"name":"images/f07"},{"time":4.2667,"name":"images/f08"},{"time":4.3333,"name":"images/f09"},{"time":4.4,"name":"images/f01"},{"time":4.4667,"name":"images/f02"},{"time":4.5333,"name":"images/f03"},{"time":4.6,"name":"images/f04"},{"time":4.6667,"name":"images/f05"},{"time":4.7333,"name":"images/f06"},{"time":4.8,"name":"images/f07"},{"time":4.8667,"name":"images/f08"},{"time":4.9333,"name":"images/f09"},{"time":5,"name":"images/f01"},{"time":5.0667,"name":"images/f02"},{"time":5.1333,"name":"images/f03"},{"time":5.2,"name":"images/f04"},{"time":5.2667,"name":"images/f05"},{"time":5.3333,"name":"images/f06"},{"time":5.4,"name":"images/f07"},{"time":5.4667,"name":"images/f08"},{"time":5.5333,"name":"images/f09"},{"time":5.6,"name":"images/f01"},{"time":5.6667,"name":"images/f02"},{"time":5.7333,"name":"images/f03"},{"time":5.8,"name":"images/f04"},{"time":5.8667,"name":"images/f05"},{"time":5.9333,"name":"images/f06"},{"time":6,"name":"images/f07"},{"time":6.0667,"name":"images/f08"},{"time":6.1333,"name":"images/f09"},{"time":6.2,"name":"images/f01"},{"time":6.2667,"name":"images/f02"},{"time":6.3333,"name":"images/f03"},{"time":6.4,"name":"images/f04"}]}},"bones":{"a":{"translate":[{"time":0.2,"x":-579.28,"y":7.49},{"time":5.3333,"x":651.9,"y":3.99}],"scale":[{"x":0.503,"y":0.503}]},"a2":{"translate":[{"x":-414.28,"y":-49.05,"curve":"stepped"},{"time":0.8,"x":-414.28,"y":-49.05},{"time":6.4,"x":850.24,"y":-54.12}],"scale":[{"x":0.503,"y":0.503}]},"a3":{"translate":[{"x":-640.56,"y":-28.03,"curve":"stepped"},{"time":0.8,"x":-640.56,"y":-28.03},{"time":6.4,"x":586.12,"y":-36.62}],"scale":[{"x":0.4,"y":0.4}]},"a4":{"translate":[{"x":-517.16,"y":-59.94,"curve":"stepped"},{"time":0.8,"x":-517.16,"y":-59.94},{"time":6.4,"x":725.94,"y":-66.81}],"scale":[{"x":0.4,"y":0.4}]},"a5":{"translate":[{"x":-741.96,"y":-55.32,"curve":"stepped"},{"time":0.8,"x":-741.96,"y":-55.32},{"time":6.4,"x":488.07,"y":-70.99}],"scale":[{"x":0.3,"y":0.3}]},"1":{"rotate":[{"angle":-6.53}],"translate":[{"y":-113.34}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.atlas.txt.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.json.meta similarity index 75% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.atlas.txt.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.json.meta index 0088cbf..23b5fd7 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.atlas.txt.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c7ca55518aa2b14a9be4b5e19779a81 +guid: fababb8aea7e6fd449fb30549325ef24 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.png b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.png new file mode 100644 index 0000000..02d06d8 Binary files /dev/null and b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.png differ diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.png.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.png.meta similarity index 88% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.png.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.png.meta index b795d9d..168e002 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.png.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5285472cd340e045ad275f9b3030f99 +guid: fe1146961cfad064ca56968a56a0074e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Atlas.asset b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Atlas.asset similarity index 70% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Atlas.asset rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Atlas.asset index 3c449a7..a7b1d71 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Atlas.asset +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: logo_Atlas + m_Name: dly_bird_Atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 0c7ca55518aa2b14a9be4b5e19779a81, type: 3} + atlasFile: {fileID: 4900000, guid: 60232431992960c46aaf6d6b6150f4f2, type: 3} materials: - - {fileID: 2100000, guid: bb1c40f26e5d0b34a88740c9bafe9232, type: 2} + - {fileID: 2100000, guid: 2ecc900cbc62b8e45b797f4d2437891d, type: 2} diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Atlas.asset.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Atlas.asset.meta similarity index 79% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Atlas.asset.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Atlas.asset.meta index 8795721..6b06bd8 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Atlas.asset.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 08c5fb47f235f1b47a303f4b4769daf6 +guid: a3eedf117df54504c85890c84800e259 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Material.mat b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Material.mat similarity index 90% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Material.mat rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Material.mat index fe7e54c..cf12f99 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Material.mat +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: logo_Material + m_Name: dly_bird_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -27,7 +27,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: b5285472cd340e045ad275f9b3030f99, type: 3} + m_Texture: {fileID: 2800000, guid: fe1146961cfad064ca56968a56a0074e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Material.mat.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Material.mat.meta similarity index 79% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Material.mat.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Material.mat.meta index 22db840..e0dfa3e 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Material.mat.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 551e995b8a11b4cf6a1baa7737d345eb +guid: 2ecc900cbc62b8e45b797f4d2437891d NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_SkeletonData.asset b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_SkeletonData.asset similarity index 80% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_SkeletonData.asset rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_SkeletonData.asset index 101031b..dabd65d 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_SkeletonData.asset +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_SkeletonData.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: logo_SkeletonData + m_Name: dly_bird_SkeletonData m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 08c5fb47f235f1b47a303f4b4769daf6, type: 2} + - {fileID: 11400000, guid: a3eedf117df54504c85890c84800e259, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 07f432f20bf02ea4b9e4344122be4952, type: 3} + skeletonJSON: {fileID: 4900000, guid: fababb8aea7e6fd449fb30549325ef24, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_SkeletonData.asset.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_SkeletonData.asset.meta similarity index 79% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_SkeletonData.asset.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_SkeletonData.asset.meta index 2b52b38..61a04d9 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_SkeletonData.asset.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/dly_bird_SkeletonData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9e6fd0a543df4030844c968c6b8b957 +guid: 3c2a09921a45d6f4188b1703d55df3ce NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/fx_login_leaves.prefab b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/fx_login_bird.prefab similarity index 78% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/fx_login_leaves.prefab rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/fx_login_bird.prefab index 59a6a9b..e6f94e4 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/fx_login_leaves.prefab +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/fx_login_bird.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8199273842531755948 +--- !u!1 &8312439525302220015 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8108074089940185204} - - component: {fileID: 2016207299710351759} - - component: {fileID: 667631953045773237} - - component: {fileID: 1929929366198807263} + - component: {fileID: 3261261825538874117} + - component: {fileID: 6377585763061322437} + - component: {fileID: 1442466328264428429} + - component: {fileID: 9051866785907087470} m_Layer: 0 - m_Name: fx_login_leaves + m_Name: fx_login_bird m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8108074089940185204 +--- !u!4 &3261261825538874117 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 8312439525302220015} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 10004.77, y: 9994.02, 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!33 &2016207299710351759 +--- !u!33 &6377585763061322437 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 8312439525302220015} m_Mesh: {fileID: 0} ---- !u!23 &667631953045773237 +--- !u!23 &1442466328264428429 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 8312439525302220015} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -61,8 +61,7 @@ MeshRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} + m_Materials: [] m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,19 +83,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1929929366198807263 +--- !u!114 &9051866785907087470 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 8312439525302220015} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: c9e6fd0a543df4030844c968c6b8b957, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 3c2a09921a45d6f4188b1703d55df3ce, type: 2} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -119,5 +118,5 @@ MonoBehaviour: materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: - loop: 0 + loop: 1 timeScale: 1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/fx_login_leaves.prefab.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/fx_login_bird.prefab.meta similarity index 74% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/fx_login_leaves.prefab.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/fx_login_bird.prefab.meta index 7203c47..07a9846 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/fx_login_leaves.prefab.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_bird/fx_login_bird.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44a193ca8499642f7ae6dedcecc39cb3 +guid: ce2f1cc1656634c4aa363cf2c56b8d15 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves.meta deleted file mode 100644 index bff480d..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1dbeeb84904cd49959ad012265291a31 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.atlas.txt b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.atlas.txt deleted file mode 100644 index 31a3464..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.atlas.txt +++ /dev/null @@ -1,34 +0,0 @@ - -dly_luoye.png -size: 65,42 -format: RGBA8888 -filter: Linear,Linear -repeat: none -1 - rotate: true - xy: 30, 22 - size: 18, 17 - orig: 18, 17 - offset: 0, 0 - index: -1 -2 - rotate: true - xy: 49, 20 - size: 20, 14 - orig: 20, 14 - offset: 0, 0 - index: -1 -3 - rotate: true - xy: 2, 2 - size: 38, 26 - orig: 38, 26 - offset: 0, 0 - index: -1 -4 - rotate: false - xy: 30, 3 - size: 17, 17 - orig: 17, 17 - offset: 0, 0 - index: -1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.json b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.json deleted file mode 100644 index eaf97aa..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"AA9p3rj5FWuaHOzkpPjQHroZ9Uw","spine":"3.8.93","x":651.54,"y":750.17,"width":267.48,"height":485.83},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":667.11,"rotation":90.08,"x":-78.23,"y":71.82},{"name":"bone151","parent":"bone","length":16.64,"x":1091.24,"y":-809.45,"scaleX":1.4417,"scaleY":-0.7967},{"name":"bone153","parent":"bone","length":19.28,"rotation":-9.46,"x":1012.01,"y":-986.72},{"name":"bone154","parent":"bone","length":16.06,"rotation":-15.75,"x":1021.51,"y":-881.96,"scaleY":-1},{"name":"bone155","parent":"bone","length":16.17,"rotation":-30.96,"x":688.24,"y":-882.63,"scaleY":-1},{"name":"bone157","parent":"bone","length":25.48,"rotation":-15.26,"x":1133.13,"y":-874.65,"scaleY":-1},{"name":"bone158","parent":"bone","length":25.48,"rotation":-15.26,"x":1133.29,"y":-758.27,"scaleY":-1}],"slots":[{"name":"45","bone":"bone155","color":"ebff71ff","attachment":"2"},{"name":"47","bone":"bone153","color":"ffe2b9ff","attachment":"1"},{"name":"49","bone":"bone151","color":"f5ff79ff","attachment":"4"},{"name":"46","bone":"bone154","color":"fff8aaff","attachment":"1"},{"name":"43","bone":"bone157","color":"fffce4ff","attachment":"3"},{"name":"48","bone":"bone158","color":"fffce4ff","attachment":"3"}],"skins":[{"name":"default","attachments":{"43":{"3":{"x":4.83,"y":-0.63,"scaleX":1.2,"scaleY":1.2,"rotation":-74.74,"width":38,"height":26}},"45":{"2":{"x":4.64,"y":1.1,"scaleX":1.2,"scaleY":1.2,"rotation":-59.04,"width":20,"height":14}},"46":{"1":{"x":2.88,"y":-1.49,"scaleX":1.2,"scaleY":1.2,"rotation":-74.25,"width":18,"height":17}},"47":{"1":{"x":4.08,"y":-0.48,"scaleX":1.2,"scaleY":1.2,"rotation":-80.54,"width":18,"height":17}},"48":{"3":{"x":4.83,"y":-0.63,"scaleX":1.2,"scaleY":1.2,"rotation":-74.74,"width":38,"height":26}},"49":{"4":{"x":4.89,"y":1.37,"scaleX":1.2,"scaleY":1.2,"rotation":-90,"width":17,"height":17}}}}],"animations":{"action":{"slots":{"43":{"color":[{"color":"e3f34fff"},{"time":3.5,"color":"e3f350ff"},{"time":4,"color":"e3f34f00"}]},"45":{"color":[{"time":0.9333,"color":"f5ff79ff","curve":"stepped"},{"time":3.8667,"color":"f5ff79ff"},{"time":4.2667,"color":"f5ff7900"}]},"46":{"color":[{"color":"f5ff79ff","curve":"stepped"},{"time":0.8333,"color":"f5ff79ff"},{"time":1.2667,"color":"f5ff7900","curve":"stepped"},{"time":1.3333,"color":"f5ff79cb"},{"time":1.6333,"color":"f5ff79ff","curve":"stepped"},{"time":4.4667,"color":"f5ff79ff"}]},"47":{"color":[{"color":"f5ff79ff","curve":"stepped"},{"time":4.1333,"color":"f5ff79ff"},{"time":4.4667,"color":"f5ff7900"}]},"48":{"color":[{"color":"f5ff79ff","curve":"stepped"},{"time":1.4333,"color":"f5ff79ff"},{"time":1.6333,"color":"f5ff7900","curve":"stepped"},{"time":1.8333,"color":"f5ff7900"},{"time":2.4667,"color":"f5ff79ff"}]},"49":{"color":[{"time":0.1667,"color":"edff89ff"},{"time":4.2,"color":"f5ff79ff"},{"time":4.4667,"color":"f5ff7900"}]}},"bones":{"bone157":{"rotate":[{"curve":"stepped"},{"time":1},{"time":4.2667,"angle":105.41}],"translate":[{},{"time":1,"x":-191.57,"y":118.8},{"time":4.2667,"x":-1094.94,"y":527.68}],"scale":[{"time":1},{"time":4.2667,"x":0.587}]},"bone155":{"rotate":[{"time":0.9333},{"time":4.2667,"angle":161.45}],"translate":[{"time":0.9333,"x":-437.11,"y":224.64},{"time":4.2667,"x":-923.84,"y":752.09}],"scale":[{"time":0.9333}]},"bone154":{"rotate":[{"angle":98.29},{"time":1.2667,"angle":65.78},{"time":1.3333,"angle":-140.71},{"time":4.4667,"angle":98.29}],"translate":[{"x":-614.09,"y":620.36},{"time":1.2667,"x":-877.34,"y":790.68},{"time":1.3333,"x":127.98,"y":220.99},{"time":4.4667,"x":-614.09,"y":620.36}],"scale":[{"x":1.573,"y":2.084},{"time":1.2667,"x":1.199,"y":1.237,"curve":"stepped"},{"time":1.3333,"x":1.199,"y":1.237},{"time":4.4667,"x":1.573,"y":2.084}]},"root":{"rotate":[{"curve":"stepped"},{"time":2.1333,"curve":"stepped"},{"time":4.2667}],"translate":[{"curve":"stepped"},{"time":2.1333,"curve":"stepped"},{"time":4.2667}],"scale":[{"curve":"stepped"},{"time":2.1333,"curve":"stepped"},{"time":4.2667}]},"bone":{"rotate":[{"curve":"stepped"},{"time":2.1333,"curve":"stepped"},{"time":4.2667}],"translate":[{"curve":"stepped"},{"time":2.1333,"curve":"stepped"},{"time":4.2667}],"scale":[{"curve":"stepped"},{"time":2.1333,"curve":"stepped"},{"time":4.2667}]},"bone153":{"rotate":[{},{"time":1.8333,"angle":-7.09},{"time":4.4667,"angle":-99.05}],"translate":[{"x":79.37,"y":289.52},{"time":4.4667,"x":-998.48,"y":1213.15}],"scale":[{"x":1.356,"y":1.356},{"time":4.4667,"x":1.436,"y":1.436}]},"bone151":{"rotate":[{"time":0.1667,"angle":132.96},{"time":4.4667,"angle":65.71}],"translate":[{"time":0.1667,"x":-289.46,"y":153.29},{"time":4.4667,"x":-993.31,"y":752.94}],"scale":[{"time":0.1667},{"time":4.4667,"y":0.623}]},"bone158":{"rotate":[{"angle":81.97},{"time":1.6333,"angle":30.65},{"time":1.8333,"angle":-122.84},{"time":2.4667,"angle":100.16},{"time":4.4667,"angle":81.97}],"translate":[{"x":-751.97,"y":330.07},{"time":1.6333,"x":-1036.26,"y":525.49},{"time":1.8333,"x":-85.99,"y":118.8},{"time":2.4667,"x":-295.33,"y":114.58},{"time":4.4667,"x":-751.97,"y":330.07}],"scale":[{"x":0.744,"y":0.744,"curve":"stepped"},{"time":1.6333,"x":0.744,"y":0.744},{"time":1.8333,"x":0.664,"y":0.664,"curve":"stepped"},{"time":2.4667,"x":0.664,"y":0.664},{"time":4.4667,"x":0.744,"y":0.744}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.png b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.png deleted file mode 100644 index 786af9a..0000000 Binary files a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.png and /dev/null differ diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.atlas.txt b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.atlas.txt deleted file mode 100644 index d71c5f6..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.atlas.txt +++ /dev/null @@ -1,13 +0,0 @@ - -dly_light.png -size: 1018,687 -format: RGBA8888 -filter: Linear,Linear -repeat: none -guang11 - rotate: false - xy: 2, 2 - size: 1014, 683 - orig: 1024, 683 - offset: 0, 0 - index: -1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.atlas.txt.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.atlas.txt.meta deleted file mode 100644 index 92de2f4..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9319f47d3c7b64437963597317e0a64e -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.json b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.json deleted file mode 100644 index cee87c1..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"iJbJMhtVgH4bPLmWgZN+q0wCbTc","spine":"3.8.93","x":-1650.35,"y":-437.02,"width":2530.61,"height":2785.38},"bones":[{"name":"root"},{"name":"light","parent":"root","length":144.43,"rotation":-54.27,"x":-818.65,"y":1333.44,"scaleX":1.0752,"scaleY":1.0752},{"name":"light2","parent":"root","length":144.43,"rotation":-54.27,"x":-818.65,"y":1333.44,"scaleX":1.0752,"scaleY":1.0752}],"slots":[{"name":"guang11","bone":"light","attachment":"guang11","blend":"screen"},{"name":"guang12","bone":"light2","attachment":"guang11","blend":"screen"}],"skins":[{"name":"default","attachments":{"guang11":{"guang11":{"x":520.71,"y":122.22,"scaleX":2.1062,"scaleY":2.1062,"rotation":-4.22,"width":1024,"height":683}},"guang12":{"guang11":{"x":520.71,"y":122.22,"scaleX":2.1062,"scaleY":2.1062,"rotation":-4.22,"width":1024,"height":683}}}}],"animations":{"animation":{"slots":{"guang11":{"color":[{"color":"ffffff00"},{"time":0.8333,"color":"ffffffff"},{"time":3.6667,"color":"ffffff00","curve":"stepped"},{"time":5.3333,"color":"ffffff00"}]},"guang12":{"color":[{"color":"ffffff00"},{"time":0.8333,"color":"fff5c161"},{"time":3.6667,"color":"fff5c100"},{"time":5.3333,"color":"ffffff00"}]}},"bones":{"light":{"rotate":[{"angle":-9.97},{"time":3.3333,"angle":21.51,"curve":"stepped"},{"time":5.3333,"angle":21.51}]},"light2":{"rotate":[{"angle":-9.97},{"time":3.3333,"angle":21.51,"curve":"stepped"},{"time":5.3333,"angle":21.51}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.json.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.json.meta deleted file mode 100644 index ae71b76..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a1ebba7b2bead4128ae875dca46d0109 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.png b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.png deleted file mode 100644 index f6c92b2..0000000 Binary files a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.png and /dev/null differ diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Atlas.asset b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Atlas.asset deleted file mode 100644 index 065564f..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Atlas.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: dly_light_Atlas - m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 9319f47d3c7b64437963597317e0a64e, type: 3} - materials: - - {fileID: 2100000, guid: 0cce576bce03f444785563c9662d4b77, type: 2} diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Atlas.asset.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Atlas.asset.meta deleted file mode 100644 index 0c7052d..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 097a931264a9748ffad44f2275f28ced -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material-Screen.mat b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material-Screen.mat deleted file mode 100644 index 3b09306..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material-Screen.mat +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: dly_light_Material-Screen - m_Shader: {fileID: 4800000, guid: 4e8caa36c07aacf4ab270da00784e4d9, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - : - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: f9230113f262040588bbb3d2d0a2ad52, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - : 0 - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 0 - - _StraightAlphaInput: 1 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007121922} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material-Screen.mat.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material-Screen.mat.meta deleted file mode 100644 index 70d4033..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material-Screen.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad915ca71248a42518ef831b2b43db22 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material.mat b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material.mat deleted file mode 100644 index f971ca7..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material.mat +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: dly_light_Material - m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: f9230113f262040588bbb3d2d0a2ad52, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 1 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material.mat.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material.mat.meta deleted file mode 100644 index cae92ee..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0cce576bce03f444785563c9662d4b77 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_SkeletonData.asset b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_SkeletonData.asset deleted file mode 100644 index d73e3b9..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_SkeletonData.asset +++ /dev/null @@ -1,33 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: dly_light_SkeletonData - m_EditorClassIdentifier: - atlasAssets: - - {fileID: 11400000, guid: 097a931264a9748ffad44f2275f28ced, type: 2} - scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: a1ebba7b2bead4128ae875dca46d0109, type: 3} - isUpgradingBlendModeMaterials: 0 - blendModeMaterials: - requiresBlendModeMaterials: 1 - applyAdditiveMaterial: 0 - additiveMaterials: [] - multiplyMaterials: [] - screenMaterials: - - pageName: dly_light.png - material: {fileID: 2100000, guid: ad915ca71248a42518ef831b2b43db22, type: 2} - skeletonDataModifiers: [] - fromAnimation: [] - toAnimation: [] - duration: [] - defaultMix: 0.2 - controller: {fileID: 0} diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_SkeletonData.asset.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_SkeletonData.asset.meta deleted file mode 100644 index 959eb20..0000000 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light_SkeletonData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8d7199117922940c084b377e059c3e98 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.atlas.txt b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.atlas.txt new file mode 100644 index 0000000..a6c23c1 --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.atlas.txt @@ -0,0 +1,27 @@ + +dly_star.png +size: 815,302 +format: RGBA8888 +filter: Linear,Linear +repeat: none +liuxing1 + rotate: false + xy: 2, 2 + size: 316, 298 + orig: 326, 311 + offset: 3, 4 + index: -1 +liuxing2 + rotate: false + xy: 621, 108 + size: 192, 192 + orig: 196, 196 + offset: 2, 3 + index: -1 +liuxing3 + rotate: false + xy: 320, 2 + size: 299, 298 + orig: 304, 304 + offset: 2, 4 + index: -1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.json.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.atlas.txt.meta similarity index 75% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.json.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.atlas.txt.meta index 8407091..483ebe3 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.json.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 649fcc5bc8af449eea846c729bf9539c +guid: 1f77c9e94343f6c4abe9c0e60e8b44e7 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.json b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.json new file mode 100644 index 0000000..26d820d --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"ndL9zQcw1YNnjUlHed7KDaaNTWM","spine":"3.8.93","x":-344.47,"y":849.5,"width":858.78,"height":351},"bones":[{"name":"root","x":-0.6,"y":0.6},{"name":"liuxing1","parent":"root","x":206.95,"y":910.54},{"name":"liuxing2","parent":"root","x":297.45,"y":862.02},{"name":"liuxing3","parent":"root","x":228.41,"y":739.8},{"name":"liuxing4","parent":"root","x":-1.68,"y":910.54},{"name":"liuxing5","parent":"root","x":-332.32,"y":862.02}],"slots":[{"name":"caijian","bone":"root","attachment":"caijian"},{"name":"liuxing3","bone":"liuxing3","attachment":"liuxing3"},{"name":"liuxing2","bone":"liuxing2","attachment":"liuxing2"},{"name":"liuxing5","bone":"liuxing5","attachment":"liuxing2"},{"name":"liuxing1","bone":"liuxing1","attachment":"liuxing1"},{"name":"liuxing4","bone":"liuxing4","attachment":"liuxing1"}],"skins":[{"name":"default","attachments":{"caijian":{"caijian":{"type":"clipping","end":"caijian","vertexCount":51,"vertices":[522.56,1080.95,350.57,1045.98,341.12,1094.18,355.3,1108.35,354.35,1142.37,343.01,1161.27,333.56,1198.13,325.06,1213.25,274.97,1210.41,261.74,1176.39,223,1145.21,223,1108.35,238.12,1094.18,234.34,1024.25,132.28,999.68,95.42,999.68,76.52,997.79,53.84,986.45,-186.19,913.68,-207.92,920.3,-223.04,919.35,-242.89,894.78,-292.03,880.61,-307.15,860.76,-297.7,840.92,-272.18,843.75,-230.6,856.98,-296.56,793.74,-350.67,717.46,-387.03,618.12,-398.56,524.98,-389.69,447.82,-378.16,395.48,-363.08,361.78,-291.24,418.54,-267.29,437.17,-247.77,480.63,-219.39,456.69,-118.27,500.15,-31.35,530.31,97.27,553.37,96.38,532.97,100.82,517.89,70.66,399.92,56.47,380.4,60.02,351.13,50.26,334.28,26.31,244.69,-732.08,173.73,-657.63,1256.93,642.15,1311.71]}},"liuxing1":{"liuxing1":{"color":"d7f7ffd9","x":144.95,"y":133.87,"width":326,"height":311}},"liuxing2":{"liuxing2":{"color":"d7f7ffd9","x":86.45,"y":84.88,"width":196,"height":196}},"liuxing3":{"liuxing3":{"color":"d7f7ffd9","x":116.49,"y":113.1,"width":304,"height":304}},"liuxing4":{"liuxing1":{"color":"d7f7ffd9","x":144.95,"y":133.87,"width":326,"height":311}},"liuxing5":{"liuxing2":{"color":"d7f7ffd9","x":86.45,"y":84.88,"width":196,"height":196}}}}],"animations":{"liziguang1":{"slots":{"liuxing1":{"color":[{"color":"ffffffd9"},{"time":0.2333,"color":"ffffffff"},{"time":1.3333,"color":"ffffff00","curve":"stepped"},{"time":1.4333,"color":"ffffff00"},{"time":1.5,"color":"ffffffd9"},{"time":1.7,"color":"ffffffff"},{"time":3.0667,"color":"ffffff00"}]},"liuxing2":{"color":[{"time":1.8667,"color":"ffffff00"},{"time":1.9333,"color":"ffffffde"},{"time":2.2667,"color":"ffffffff"},{"time":3.5333,"color":"ffffff00"}],"attachment":[{"time":0.2,"name":null}]},"liuxing3":{"color":[{"time":0.2667,"color":"ffffffce"},{"time":0.7333,"color":"ffffffff"},{"time":1.9667,"color":"ffffff00","curve":"stepped"},{"time":2.2333,"color":"ffffff00"},{"time":2.2667,"color":"ffffffce"},{"time":2.8333,"color":"ffffffff"},{"time":4.3333,"color":"ffffff21"}]},"liuxing4":{"color":[{"time":0.9,"color":"ffffffd9"},{"time":1.2,"color":"ffffffff"},{"time":2.1,"color":"ffffff00","curve":"stepped"},{"time":3.3333,"color":"ffffff00"},{"time":3.3667,"color":"ffffffd9"},{"time":3.5667,"color":"ffffffff"},{"time":4.4,"color":"ffffff00"}]},"liuxing5":{"color":[{"time":1.1,"color":"ffffffde"},{"time":1.3,"color":"ffffffff"},{"time":2.8333,"color":"ffffff00","curve":"stepped"},{"time":3.0667,"color":"ffffff00"},{"time":3.1,"color":"ffffffde"},{"time":3.3333,"color":"ffffffff"},{"time":4.4667,"color":"ffffff3e"}]}},"bones":{"liuxing1":{"translate":[{"x":347.71,"y":323.73},{"time":1.3333,"x":-637.87,"y":-417.25},{"time":1.4333,"x":347.71,"y":323.73},{"time":3.0667,"x":-637.87,"y":-417.25}]},"liuxing2":{"translate":[{"x":387.24,"y":393.15,"curve":"stepped"},{"time":1.9333,"x":387.24,"y":393.15},{"time":3.5333,"x":-634.46,"y":-355.22}]},"liuxing3":{"translate":[{"x":404.67,"y":409.6,"curve":"stepped"},{"time":0.2667,"x":404.67,"y":409.6},{"time":1.9667,"x":-383.28,"y":-398.09},{"time":2.2667,"x":404.67,"y":409.6},{"time":4.3333,"x":-412.34,"y":-447.31}]},"liuxing4":{"translate":[{"x":347.71,"y":323.73,"curve":"stepped"},{"time":0.9,"x":347.71,"y":323.73},{"time":2.1,"x":-637.87,"y":-417.25},{"time":3.3667,"x":347.71,"y":323.73},{"time":4.4,"x":-578.14,"y":-372.34}]},"liuxing5":{"translate":[{"x":387.24,"y":393.15,"curve":"stepped"},{"time":1.1,"x":387.24,"y":393.15},{"time":2.8333,"x":-634.46,"y":-355.22},{"time":3.1,"x":387.24,"y":393.15},{"time":4.4667,"x":-418.33,"y":-196.91}]}}}}} \ No newline at end of file diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.json.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.json.meta similarity index 75% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.json.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.json.meta index da8876a..815586d 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo.json.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07f432f20bf02ea4b9e4344122be4952 +guid: 5b73cb7bfcbba3b4a9924fc4289bbde9 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.png b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.png new file mode 100644 index 0000000..34b1dcf Binary files /dev/null and b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.png differ diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.png.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.png.meta similarity index 88% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.png.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.png.meta index fd9c8df..fca6531 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye.png.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67ccc0e9b2d79499eb759f586cb71290 +guid: 4548c2f5c52d8ab45b071fcec5fc2112 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Atlas.asset b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Atlas.asset similarity index 70% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Atlas.asset rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Atlas.asset index c0cc15e..55be218 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Atlas.asset +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: dly_luoye_Atlas + m_Name: dly_star_Atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: c2422ae538f32480596e2cc294351d03, type: 3} + atlasFile: {fileID: 4900000, guid: 1f77c9e94343f6c4abe9c0e60e8b44e7, type: 3} materials: - - {fileID: 2100000, guid: 551e995b8a11b4cf6a1baa7737d345eb, type: 2} + - {fileID: 2100000, guid: f23c40a8300b871418c61c5c05e15d3c, type: 2} diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_SkeletonData.asset.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Atlas.asset.meta similarity index 79% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_SkeletonData.asset.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Atlas.asset.meta index b045cef..e31670d 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_SkeletonData.asset.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3157be37207d5b4285c27b7f3c3df78 +guid: e5ab78eda0b98474ba825b24f23e481d NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Material.mat b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Material.mat similarity index 90% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Material.mat rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Material.mat index d84c7cc..b771e36 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Material.mat +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Material.mat @@ -7,13 +7,14 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: dly_luoye_Material + m_Name: dly_star_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: + - CLIPPED - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -26,7 +27,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 67ccc0e9b2d79499eb759f586cb71290, type: 3} + m_Texture: {fileID: 2800000, guid: 4548c2f5c52d8ab45b071fcec5fc2112, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Material.mat.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Material.mat.meta similarity index 79% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Material.mat.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Material.mat.meta index 3e2f604..81fad9e 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login/logo_Material.mat.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb1c40f26e5d0b34a88740c9bafe9232 +guid: f23c40a8300b871418c61c5c05e15d3c NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_SkeletonData.asset b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_SkeletonData.asset similarity index 80% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_SkeletonData.asset rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_SkeletonData.asset index 2d4f9a4..5e2ca13 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_SkeletonData.asset +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_SkeletonData.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: dly_luoye_SkeletonData + m_Name: dly_star_SkeletonData m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: f603146dd169d492bb1168429bb000ab, type: 2} + - {fileID: 11400000, guid: e5ab78eda0b98474ba825b24f23e481d, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 649fcc5bc8af449eea846c729bf9539c, type: 3} + skeletonJSON: {fileID: 4900000, guid: 5b73cb7bfcbba3b4a9924fc4289bbde9, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Atlas.asset.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_SkeletonData.asset.meta similarity index 79% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Atlas.asset.meta rename to Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_SkeletonData.asset.meta index 8ad1bbd..5f38fe4 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_leaves/dly_luoye_Atlas.asset.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_star_SkeletonData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f603146dd169d492bb1168429bb000ab +guid: a0b93913e8598424db4e18ebc78f3a4a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab index 24edf24..7f796c2 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8199273842531755948 +--- !u!1 &6290058413071618339 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,10 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8108074089940185204} - - component: {fileID: 2016207299710351759} - - component: {fileID: 667631953045773237} - - component: {fileID: 1929929366198807263} + - component: {fileID: 1660854741916232798} + - component: {fileID: 1336835003312910689} + - component: {fileID: 3777775948349899706} + - component: {fileID: 6611016082428027702} m_Layer: 0 m_Name: fx_login_light m_TagString: Untagged @@ -19,36 +19,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8108074089940185204 +--- !u!4 &1660854741916232798 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 6290058413071618339} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 10005.97, y: 9999.24, 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!33 &2016207299710351759 +--- !u!33 &1336835003312910689 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 6290058413071618339} m_Mesh: {fileID: 0} ---- !u!23 &667631953045773237 +--- !u!23 &3777775948349899706 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 6290058413071618339} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: 2100000, guid: f23c40a8300b871418c61c5c05e15d3c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,19 +84,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1929929366198807263 +--- !u!114 &6611016082428027702 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8199273842531755948} + m_GameObject: {fileID: 6290058413071618339} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} m_Name: m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 8d7199117922940c084b377e059c3e98, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: a0b93913e8598424db4e18ebc78f3a4a, type: 2} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -119,5 +119,5 @@ MonoBehaviour: materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: - loop: 0 + loop: 1 timeScale: 1 diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab.meta b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab.meta index 23a6989..42c8c99 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab.meta +++ b/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/fx_login_light.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d268b5d5790448b99e5a9c295b5590d +guid: 3f2a89583f856524991d3bf880f33f12 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png index 2995d8b..67d59cb 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes index f2c0c17..9a5ecd5 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Common_01_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png index 8fb137f..60a2cb1 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0_1.png b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0_1.png new file mode 100644 index 0000000..130f80e Binary files /dev/null and b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0_1.png differ diff --git a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.png.meta b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0_1.png.meta similarity index 86% rename from Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.png.meta rename to Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0_1.png.meta index 486aa2a..687e473 100644 --- a/Assets/Resources/ChillConnectAssets/Effect/spine/fx_login_light/dly_light.png.meta +++ b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_atlas0_1.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: f9230113f262040588bbb3d2d0a2ad52 +guid: 88a876efb1c5b1642a2a40e151984e72 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes index 89a4d49..1ea752b 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Game_04_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png index 8929d43..6e9ce74 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png and b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_atlas0.png differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes index 9501a4f..b75e8b7 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Img_02_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes index e6ab2f8..a58603a 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Lobby_03_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes index 428cb0e..7d7d882 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Login_05_fui.bytes differ diff --git a/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes b/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes index 6a557f0..8196752 100644 Binary files a/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes and b/Assets/Resources/ChillConnectAssets/FGUI/Setting_07_fui.bytes differ diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index e9f86a6..47acc4f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1162,7 +1162,7 @@ Transform: m_GameObject: {fileID: 1442936684} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.2563, y: -34.4, z: 401} + m_LocalPosition: {x: -0.2563, y: -34.2, z: 401} m_LocalScale: {x: 5.2, y: 5.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/ChillConnectRoot.cs b/Assets/Scripts/ChillConnectRoot.cs index eec0f43..4e391c0 100644 --- a/Assets/Scripts/ChillConnectRoot.cs +++ b/Assets/Scripts/ChillConnectRoot.cs @@ -10,12 +10,13 @@ public class ChillConnectRoot : MonoBehaviour { public void Awake() { -#if UNITY_EDITOR||GAME_RELEASE - GameObject.Find("IngameDebugConsole").SetActive(false); +#if UNITY_EDITOR || GAME_RELEASE + GameObject ingameDebugConsole = GameObject.Find("IngameDebugConsole"); + if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false); #endif // GameObject.Find("IngameDebugConsole").SetActive(false);//zhushi - // NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease); + // NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease); MaxADKit.Init(); diff --git a/Assets/Scripts/MainScene.cs b/Assets/Scripts/MainScene.cs index e9eeb12..9bdb09f 100644 --- a/Assets/Scripts/MainScene.cs +++ b/Assets/Scripts/MainScene.cs @@ -79,7 +79,7 @@ namespace ChillConnect AppDispatcher.Instance.AddListener(AppMsg.LoginInit, OnLoadingComplete); // DataMgr.InitPreferences(); - NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig); + // NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig); } private bool ispen = false; private void OnLoadingComplete(object param = null) diff --git a/Assets/Scripts/ModuleUI/GameLogin/GameLoginUI.cs b/Assets/Scripts/ModuleUI/GameLogin/GameLoginUI.cs index 8f565ba..b9ac1f9 100644 --- a/Assets/Scripts/ModuleUI/GameLogin/GameLoginUI.cs +++ b/Assets/Scripts/ModuleUI/GameLogin/GameLoginUI.cs @@ -67,12 +67,8 @@ namespace ChillConnect private void InitView() { - Action closeCallback = null; - var sk = FXManager.Instance.SetFx(ui.leaves_anim, Fx_Type.fx_login_leaves, ref closeCallback); - sk.state.SetAnimation(0, "action", true); - var sk1 = FXManager.Instance.SetFx(ui.light_anim, Fx_Type.fx_login_light, ref closeCallback); - sk1.state.SetAnimation(0, "animation", true); + ui.btn_login.SetClick(OnClickBtn, true); diff --git a/Assets/Scripts/ModuleUI/Hall/HallUI.cs b/Assets/Scripts/ModuleUI/Hall/HallUI.cs index 6730d24..7812606 100644 --- a/Assets/Scripts/ModuleUI/Hall/HallUI.cs +++ b/Assets/Scripts/ModuleUI/Hall/HallUI.cs @@ -293,7 +293,7 @@ namespace ChillConnect OnClickShop(); }); - ui.head_red.visible = PlayerPrefs.GetInt("player_head_red", 0) == 0; + // ui.head_red.visible = PlayerPrefs.GetInt("player_head_red", 0) == 0; ui.btn_head.SetClick(() => { // if (PlayerPrefs.GetInt("player_head_red", 0) == 0) PlayerPrefs.SetInt("player_head_red", 1); diff --git a/Assets/Scripts/ModuleUI/OpenBg/OpenBgUI.cs b/Assets/Scripts/ModuleUI/OpenBg/OpenBgUI.cs index 30ad88a..4340de0 100644 --- a/Assets/Scripts/ModuleUI/OpenBg/OpenBgUI.cs +++ b/Assets/Scripts/ModuleUI/OpenBg/OpenBgUI.cs @@ -61,8 +61,14 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { - var sk = FXManager.Instance.SetFx(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_login, ref closeCallback); - sk.state.SetAnimation(0, "animation", false); + // var sk = FXManager.Instance.SetFx(baseUI.GetChild("bg_parent") as GGraph, Fx_Type.fx_login, ref closeCallback); + // sk.state.SetAnimation(0, "animation", false); + + + var sk = FXManager.Instance.SetFx(ui.leaves_anim, Fx_Type.fx_login_bird, ref closeCallback); + sk.state.SetAnimation(0, "animation", true); + var sk1 = FXManager.Instance.SetFx(ui.light_anim, Fx_Type.fx_login_light, ref closeCallback); + sk1.state.SetAnimation(0, "liziguang1", true); } protected override void OnOpen(object args) diff --git a/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs b/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs index ed9225c..5bb5241 100644 --- a/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs +++ b/Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs @@ -48,7 +48,7 @@ namespace ChillConnect protected override void OnOpenBefore(object args) { if (args != null) need_show = (bool)args; - string stage = GameHelper.gameType == 0 ? "Level " + GameHelper.GetLevel() : ""; + string stage = GameHelper.gameType == 0 ? "Lv." + GameHelper.GetLevel() : ""; ui.text_level.text = stage; InitView(); @@ -90,23 +90,24 @@ namespace ChillConnect { - var sk = FXManager.Instance.SetFx(ui.anim, Fx_Type.fx_open, ref closeCallback); - sk.state.SetAnimation(0, "animation", false); + // var sk = FXManager.Instance.SetFx(ui.anim, Fx_Type.fx_open, ref closeCallback); + // sk.state.SetAnimation(0, "animation", false); - DOVirtual.DelayedCall(2.8f, () => - { - ui.bg.visible = false; - }); + // DOVirtual.DelayedCall(2.8f, () => + // { + // ui.bg.visible = false; + // }); + ui.t0.Play(); DOVirtual.DelayedCall(3.5f, () => { - ui.anim.visible = false; - if (need_show) { + // ui.anim.visible = false; + if (need_show&&GameHelper.IsGiftSwitch()) { if (GameHelper.IsShowLevelTips()) { - ui.tips_node.visible = false; + // ui.tips_node.visible = false; DOVirtual.DelayedCall(0.2f, ()=>{ - ui.tips_node.visible = true; + // ui.tips_node.visible = true; var meteor1 = FXManager.Instance.SetFx(ui.tips_node, Fx_Type.fx_tips, ref closeCallback); meteor1.state.SetAnimation(0, "animation", false); meteor1.state.Complete += a => diff --git a/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs b/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs index a93dd1b..1c09e63 100644 --- a/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs +++ b/Assets/Scripts/ModuleUI/Play/RainPlayUI.cs @@ -126,7 +126,7 @@ namespace ChillConnect else { ui.btn_failpack.visible = false; - // HallManager.Instance.UpdateEvent -= UpdateEvent; + // HallManager.Instance.UpdateEvent -= UpdateEvent; } } @@ -156,10 +156,10 @@ namespace ChillConnect if (Screen.safeArea.y != 0) { - // ui.top_group.y += 68; + ui.btn_gold.y += 68; } - ui.btn_add.y += 35; + if (GameHelper.IsGiftSwitch()) { @@ -282,7 +282,7 @@ namespace ChillConnect void timeEvent() { - if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime()) + if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch()) { if (!effect_show) ui.btn_add.type.selectedIndex = 1; @@ -572,20 +572,20 @@ namespace ChillConnect ui.btn_saveingpot.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); }); -#if !UNITY_EDITOR - string type = SystemInfo.deviceModel.ToLower().Trim(); - if (type.Substring(0, 3) != "iph") - { - ui.btn_add.x += -20; - ui.btn_add.y += -34; - } -#endif + // #if !UNITY_EDITOR + // string type = SystemInfo.deviceModel.ToLower().Trim(); + // if (type.Substring(0, 3) != "iph") + // { + // ui.btn_add.x += -20; + // ui.btn_add.y += -34; + // } + // #endif ui.btn_add.SetClick(() => { // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); return;//zhushi // GameHelper.ShowTips("Coming Soon!"); - if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime()) + if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch()) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); } @@ -654,7 +654,7 @@ namespace ChillConnect } checkThreeGift(); - if (!SaveData.GetSaveObject().have_slot) + if (!SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch()) { ui.btn_add.t0.Play(() => { @@ -1706,7 +1706,7 @@ namespace ChillConnect float complte_progress = showResurgence(); if (GameHelper.GetLevelstate() != 0) { - if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot) + if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch()) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); SaveData.GetSaveObject().game_fail_off_number = 0; @@ -1722,7 +1722,7 @@ namespace ChillConnect if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot) { - if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime()) + if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); else UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open); @@ -1752,7 +1752,7 @@ namespace ChillConnect } else { - if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot) + if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch()) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); SaveData.GetSaveObject().game_fail_off_number = 0; @@ -1767,7 +1767,7 @@ namespace ChillConnect if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot) { - if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime()) + if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch()) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); else UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);