puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: puxuan:master
Branches Tags
puxuan:master
puxuan:dev_hero_2
puxuan:dev_dungeon
puxuan:dev_hero
puxuan:dev_sdk
puxuan:dev_android
puxuan:dev_3
puxuan:dev
puxuan:v.1.6.6_android
puxuan:v.1.6.5_android
puxuan:v.1.6.4_android
puxuan:v.1.6.3_android
puxuan:v.1.6.2_android
puxuan:v.1.6.1_android
puxuan:v.1.6.0_android
puxuan:v.1.5.9_android
puxuan:v.1.5.8_android
puxuan:v.1.5.7_android
puxuan:v.1.5.6_android
puxuan:v.1.5.4_android
puxuan:v.1.5.3_android
puxuan:v.1.5.2_android
puxuan:v.1.5.1_android
puxuan:v.1.3.10_ios
puxuan:v.1.5.0_android
puxuan:v.1.4.8_android
puxuan:v.1.4.7_android
puxuan:v.1.4.5_android
puxuan:v.1.4.4_android
puxuan:v.1.4.3_android
puxuan:v.1.4.2_android
puxuan:v.1.4.1_android
puxuan:v.1.4.0_android
puxuan:v.1.3.0_android
puxuan:v.1.2.9_android
puxuan:v.1.3.9_ios
puxuan:v.1.3.8_ios
puxuan:v.1.2.8_android
puxuan:v.1.2.7_android
puxuan:v.1.3.7_ios
puxuan:v.1.2.6_android
puxuan:v.1.3.6_ios
puxuan:v.1.3.5_ios
puxuan:v.1.2.5_android
puxuan:v.1.2.4_android
puxuan:v.1.3.4_ios
puxuan:v.1.2.3_android
puxuan:v.1.3.3_ios
puxuan:v.1.3.2_ios
puxuan:v.1.2.2_android
puxuan:v.1.2.1_android
puxuan:v.1.3.1_ios
puxuan:v.1.3.0_ios
puxuan:v.1.2.0_android
puxuan:v1.1.8_android
puxuan:v.1.2.8_ios
puxuan:v.1.1.7_android
puxuan:v.1.2.7_ios
puxuan:v.1.1.6_android
puxuan:v.1.2.6_ios
puxuan:v1.2.5_ios
puxuan:v1.1.5_android
puxuan:v1.1.4_android
puxuan:v1.2.4_ios
puxuan:v1.2.3_ios
puxuan:v1.1.3_android
puxuan:v1.1.2_android
puxuan:v1.2.2_ios
puxuan:v1.2.1_ios
puxuan:v1.1.1_android
puxuan:v1.2.0_ios
puxuan:v1.1.0_android
puxuan:v1.1.8_ios
puxuan:v1.0.8_android
puxuan:v1.1.7_ios
puxuan:v1.0.7_android
puxuan:v1.1.6_ios
puxuan:v1.0.6_android
puxuan:v1.1.4_ios
puxuan:v1.0.4_ios
puxuan:v1.0.4_android
puxuan:v1.1.3_ios
puxuan:v1.0.3_ios
puxuan:v1.0.3_andoird
puxuan:v1.1.2_ios
puxuan:v1.0.2_ios
puxuan:v1.0.2_andoird
puxuan:v1.1.1_ios
puxuan:v1.0.1_ios
puxuan:v1.0.1_android
puxuan:v1.1.0_ios
puxuan:v1.0.0_ios
puxuan:v1.0.0_android
puxuan:v0.3.2_android
puxuan:v0.1.2_ios
puxuan:v0.3.1_android
puxuan:v0.1.1_ios
puxuan:v0.3.0_android
puxuan:v0.1.0_ios
puxuan:v0.2.2_android
puxuan:v0.2.1_android
puxuan:v0.2.0_android
puxuan:v0.1.0_android
..
compare: puxuan:v.1.6.0_android
Branches Tags
puxuan:dev_hero_2
puxuan:dev_dungeon
puxuan:dev_hero
puxuan:dev_sdk
puxuan:dev_android
puxuan:dev_3
puxuan:dev
puxuan:master
puxuan:v.1.6.6_android
puxuan:v.1.6.5_android
puxuan:v.1.6.4_android
puxuan:v.1.6.3_android
puxuan:v.1.6.2_android
puxuan:v.1.6.1_android
puxuan:v.1.6.0_android
puxuan:v.1.5.9_android
puxuan:v.1.5.8_android
puxuan:v.1.5.7_android
puxuan:v.1.5.6_android
puxuan:v.1.5.4_android
puxuan:v.1.5.3_android
puxuan:v.1.5.2_android
puxuan:v.1.5.1_android
puxuan:v.1.3.10_ios
puxuan:v.1.5.0_android
puxuan:v.1.4.8_android
puxuan:v.1.4.7_android
puxuan:v.1.4.5_android
puxuan:v.1.4.4_android
puxuan:v.1.4.3_android
puxuan:v.1.4.2_android
puxuan:v.1.4.1_android
puxuan:v.1.4.0_android
puxuan:v.1.3.0_android
puxuan:v.1.2.9_android
puxuan:v.1.3.9_ios
puxuan:v.1.3.8_ios
puxuan:v.1.2.8_android
puxuan:v.1.2.7_android
puxuan:v.1.3.7_ios
puxuan:v.1.2.6_android
puxuan:v.1.3.6_ios
puxuan:v.1.3.5_ios
puxuan:v.1.2.5_android
puxuan:v.1.2.4_android
puxuan:v.1.3.4_ios
puxuan:v.1.2.3_android
puxuan:v.1.3.3_ios
puxuan:v.1.3.2_ios
puxuan:v.1.2.2_android
puxuan:v.1.2.1_android
puxuan:v.1.3.1_ios
puxuan:v.1.3.0_ios
puxuan:v.1.2.0_android
puxuan:v1.1.8_android
puxuan:v.1.2.8_ios
puxuan:v.1.1.7_android
puxuan:v.1.2.7_ios
puxuan:v.1.1.6_android
puxuan:v.1.2.6_ios
puxuan:v1.2.5_ios
puxuan:v1.1.5_android
puxuan:v1.1.4_android
puxuan:v1.2.4_ios
puxuan:v1.2.3_ios
puxuan:v1.1.3_android
puxuan:v1.1.2_android
puxuan:v1.2.2_ios
puxuan:v1.2.1_ios
puxuan:v1.1.1_android
puxuan:v1.2.0_ios
puxuan:v1.1.0_android
puxuan:v1.1.8_ios
puxuan:v1.0.8_android
puxuan:v1.1.7_ios
puxuan:v1.0.7_android
puxuan:v1.1.6_ios
puxuan:v1.0.6_android
puxuan:v1.1.4_ios
puxuan:v1.0.4_ios
puxuan:v1.0.4_android
puxuan:v1.1.3_ios
puxuan:v1.0.3_ios
puxuan:v1.0.3_andoird
puxuan:v1.1.2_ios
puxuan:v1.0.2_ios
puxuan:v1.0.2_andoird
puxuan:v1.1.1_ios
puxuan:v1.0.1_ios
puxuan:v1.0.1_android
puxuan:v1.1.0_ios
puxuan:v1.0.0_ios
puxuan:v1.0.0_android
puxuan:v0.3.2_android
puxuan:v0.1.2_ios
puxuan:v0.3.1_android
puxuan:v0.1.1_ios
puxuan:v0.3.0_android
puxuan:v0.1.0_ios
puxuan:v0.2.2_android
puxuan:v0.2.1_android
puxuan:v0.2.0_android
puxuan:v0.1.0_android

No commits in common. "master" and "v.1.6.0_android" have entirely different histories.
master ... v.1.6.0_an

13 changed files with 210 additions and 497 deletions
Show Stats Expand all files Collapse all files

4
Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs
View File

@ -13,8 +13,8 @@ namespace BFEditor.Build
public class BuildProjectWindow : EditorWindow public class BuildProjectWindow : EditorWindow
{ {
private static int versionCode = 18; private static int versionCode = 17;
private static string versionName = "1.6.5"; private static string versionName = "1.6.0";
BFPlatformOptions platform = BFPlatformOptions.AndroidDev; BFPlatformOptions platform = BFPlatformOptions.AndroidDev;
const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android"; const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android";
const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android"; const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android";

BIN
Assets/lua/app/config/activity.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/activity_boss_rush_rank.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/activity_bounty_level.lua.bytes
View File

Binary file not shown.

46
Assets/lua/app/config/activity_exchange.lua.bytes
View File

File diff suppressed because one or more lines are too long

54
Assets/lua/app/config/activity_rank.lua.bytes
View File

File diff suppressed because one or more lines are too long

BIN
Assets/lua/app/config/arena_bounty_level.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/arena_rank.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/arena_time.lua.bytes
View File

Binary file not shown.

595
Assets/lua/app/config/bounty_level.lua.bytes
View File

File diff suppressed because one or more lines are too long

BIN
Assets/lua/app/config/bounty_time.lua.bytes
View File

Binary file not shown.

4
BFVersions/android/dz_google_apk/unityLibrary/build.gradle
View File

@ -123,8 +123,8 @@ android {
buildToolsVersion '30.0.2' buildToolsVersion '30.0.2'
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_1_8
} }
defaultConfig { defaultConfig {

4
BFVersions/android/google_common/launcher/build.gradle
View File

@ -14,8 +14,8 @@ android {
buildToolsVersion '30.0.2' buildToolsVersion '30.0.2'
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_1_8
} }
defaultConfig { defaultConfig {