Skip to content

S
StockRunning
Commit 3bf39710 authored by czy's avatar czy
Browse files
Options

1

parent f1e7a7a1
Hide whitespace changes
Inline Side-by-side
Showing with 437 additions and 117 deletions
StockRunning/Assets/#A1_Scenes/DemoScenes.unity
View file @ 3bf39710
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &4
LightmapSettings:
......@@ -2558,63 +2558,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1356050993
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1384633641988006, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_Name
value: TinySauce
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4464613669252742, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0b960778462d34f7283156e4edafb7a2, type: 3}
--- !u!4 &1358820923 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
......@@ -4036,11 +3979,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6064464676328073066, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_Name
......
StockRunning/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 3bf39710
......@@ -252,13 +252,6 @@ public class BattleUI : MonoBehaviour
m_selectLevelObj.SetActive(false);
int varCurTime = (int)BattleCtrl.instance.levelManager.curLevel.bestTime;
m_gameBestTime.text = string.Format("{0:d2}:{1:d2}", varCurTime / 60, varCurTime % 60);
//结束----------------
TinySauce.OnGameFinished(true,BattleCtrl.instance.Score,string.Format("{0:d}",(BattleCtrl.instance.levelManager.CurLevelIndex+1)));
if (Facebook.Unity.FB.IsInitialized)
{
Facebook.Unity.FB.LogAppEvent($"Level_Complete_{BattleCtrl.instance.levelManager.CurLevelIndex + 1}");
}
//----------------
//string varKey = BattleCtrl.instance.levelManager.CurLevelIndex.ToString();
//if (LocalRecord.HasKey(varKey))
//{
......@@ -304,7 +297,7 @@ public class BattleUI : MonoBehaviour
m_successObj.SetActive(false);
m_startLogoObj.SetActive(true);
}
/// 加载关卡后调用
public void OnAfterLoadLevel()
{
......@@ -328,14 +321,6 @@ public class BattleUI : MonoBehaviour
{
m_clawMoveSpeed.text = string.Format("系数越小，越快\n{0:f3}", GameServices.configService.playerConfig.ClawMoveSpeed);
});
//开始----------------
TinySauce.OnGameStarted(string.Format("{0:d}", (BattleCtrl.instance.levelManager.CurLevelIndex + 1)));
if (Facebook.Unity.FB.IsInitialized)
{
Facebook.Unity.FB.LogAppEvent($"Level_Start_{BattleCtrl.instance.levelManager.CurLevelIndex + 1}");
}
//----------------
}
//设置战斗UI状态
public void SetBattleObjState(bool bool_)
......
StockRunning/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 3bf39710
......@@ -1307,7 +1307,6 @@ GameObject:
- component: {fileID: 1338799328}
- component: {fileID: 1338799327}
- component: {fileID: 1338799326}
- component: {fileID: 5407790272111460803}
m_Layer: 5
m_Name: PurseImage
m_TagString: Untagged
......@@ -1372,18 +1371,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5407790272111460803
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1338799325}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8ff94815dcde40a4f9fcd7c7fea2d493, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1529647316
GameObject:
m_ObjectHideFlags: 0
......@@ -10024,6 +10011,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3235784849534517948}
- component: {fileID: 8663326081962974003}
m_Layer: 5
m_Name: BgPurseImage
m_TagString: Untagged
......@@ -10052,6 +10040,18 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8663326081962974003
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4744510048724276499}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8ff94815dcde40a4f9fcd7c7fea2d493, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5156541820109564448
GameObject:
m_ObjectHideFlags: 0
......@@ -10874,7 +10874,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6064464676328073067
RectTransform:
m_ObjectHideFlags: 0
......@@ -15904,15 +15904,15 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 13cf4ffbaee8b5345aae4334d263f620, type: 3}
--- !u!1 &7905703235052740184 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4046205740538686783, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3}
m_PrefabInstance: {fileID: 6165904640569111399}
m_PrefabAsset: {fileID: 0}
--- !u!224 &8583335472386491063 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2490371539985674704, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3}
m_PrefabInstance: {fileID: 6165904640569111399}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7905703235052740184 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4046205740538686783, guid: 13cf4ffbaee8b5345aae4334d263f620,
type: 3}
m_PrefabInstance: {fileID: 6165904640569111399}
m_PrefabAsset: {fileID: 0}
StockRunning/Assets/Plugins/Android/AndroidManifest.xml
View file @ 3bf39710
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.unity3d.player" android:installLocation="preferExternal" tools:ignore="MissingLeanbackSupport">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
<uses-feature android:glEsVersion="0x00020000" />
<application android:name="androidx.multidex.MultiDexApplication" android:fullBackupContent="false" android:allowBackup="false" android:theme="@android:style/Theme.NoTitleBar" tools:ignore="GoogleAppIndexingWarning,MissingTvBanner" tools:replace="fullBackupContent,allowBackup">
<!-- UNITY -->
<activity android:name="com.unity3d.player.UnityPlayerActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density" android:hardwareAccelerated="false" android:label="@string/app_name" android:launchMode="singleTask" android:screenOrientation="fullSensor">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" android:installLocation="preferExternal" android:versionCode="1" android:versionName="1.0">
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
<application android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="true">
<activity android:name="com.unity3d.player.UnityPlayerActivity" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
<meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="false" />
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
</activity>
<!-- FULLSCREEN FIX -->
<meta-data android:name="android.max_aspect" android:value="2.16" />
<!-- 3rdParty MANIFEST -->
<activity android:name="com.facebook.unity.FBUnityLoginActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
<activity android:name="com.facebook.unity.FBUnityDialogsActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
<activity android:name="com.facebook.unity.FBUnityGamingServicesFriendFinderActivity" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
......
StockRunning/Assets/Plugins/Android/com.android.support.animated-vector-drawable-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: d77d30471fbf3ac429d6816085e902e1
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.appcompat-v7-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 9b129fbdc830d9045a01921bce80744e
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.cardview-v7-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 4a6f5b330717f434aad6de66cd92d573
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.customtabs-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: b490489356dc2794fbc91c6bcfd3d0e2
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-annotations-25.3.1.jar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 386f29d83fb0b2a4299a23d8a70ed5b7
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-compat-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 288492c978fafbc44952f13ed1de867a
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-core-ui-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: cb5609a60d2ecfd46be0dc7faf3d6e8e
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-core-utils-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 8f1881a8efa6d2445a0efe3fb5bf33dc
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-fragment-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: d7ac605d8ddacad4d88c424c7a18a47e
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-media-compat-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 0f1a1f8c27272004a96e818f371a7cd6
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-v4-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: a0ff15b8143c35a4e95e05be6dadcd60
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/Assets/Plugins/Android/com.android.support.support-vector-drawable-25.3.1.aar.meta 0 → 100644
View file @ 3bf39710
fileFormatVersion: 2
guid: 83b866c399b649a408e715d6407f93b7
labels:
- gpsr
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
StockRunning/ProjectSettings/ProjectSettings.asset
View file @ 3bf39710
......@@ -239,7 +239,7 @@ PlayerSettings:
clonedFromGUID: dee8735da6dd9984e83deefa6247737d
templatePackageId:
templateDefaultScene:
AndroidTargetArchitectures: 3
AndroidTargetArchitectures: 1
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
......@@ -636,12 +636,12 @@ PlayerSettings:
scriptingDefineSymbols:
1: CROSS_PLATFORM_INPUT
4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
7: VS_ATT;CROSS_PLATFORM_INPUT;MOBILE_INPUT
7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
13: CROSS_PLATFORM_INPUT
14: CROSS_PLATFORM_INPUT;MOBILE_INPUT
platformArchitecture: {}
scriptingBackend:
Android: 1
Android: 0
il2cppCompilerConfiguration: {}
managedStrippingLevel: {}
incrementalIl2cppBuild: {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment