parent: 16072e | patch | commitdiff
River Jiang
2020-10-21 c1d12cdfd23933a0db431a70ff5e145924864782
refs
author River Jiang <546213258@qq.com>
Wednesday, October 21, 2020 15:08 +0800
committer River Jiang <546213258@qq.com>
Wednesday, October 21, 2020 15:08 +0800
commitc1d12cdfd23933a0db431a70ff5e145924864782
tree 5a2c3dfb18a6cd8ed02f7d5b6492b349b6a245b8 tree | zip | gz
parent 16072ec5c78cf2f183ef5cbdddeb34416225a9ea view | diff
c4b8dbd94f555b599bc847b7fa8a2e1c6caf31e1 view | diff 
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
5 files renamed
14 files copied
1 files deleted
55 files added
68 files modified
16139 ■■■■■ changed files
And/GemBattle.apk diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/AndroidManifest.xml 35 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/AndroidManifest.xml.meta 7 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/SaaS_GameAnalytics_Android_SDK_V4.0.58.jar diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/SaaS_GameAnalytics_Android_SDK_V4.0.58.jar.meta 32 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.h 221 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.h.meta 27 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.mm 148 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.mm.meta 37 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/libTalkingDataGA.a diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/libTalkingDataGA.a.meta 27 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAAccount.cs 192 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAAccount.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGADemoScript.cs 194 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGADemoScript.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAItem.cs 55 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAItem.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAMission.cs 75 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAMission.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs 75 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataGA.cs 300 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataGA.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/01效果图-PVE战斗.jpg.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/03效果图-选择完成.jpg.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/04效果图-结算.jpg.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/05标注.jpg.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/06标注.jpg.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/07标注.jpg.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/PVEBg.png diff | view | raw | blame | history
Assets/Materials/PVE/PVEBg.png.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/RewardInfo.png diff | view | raw | blame | history
Assets/Materials/PVE/RewardInfo.png.meta 42 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/buffMask.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/check.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/diamond.png diff | view | raw | blame | history
Assets/Materials/PVE/diamond.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/drop.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/line.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/propDi_0.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/propDi_1.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/propDi_2.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/propDi_3.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/speed_1.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/speed_2.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/treasure_0.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/treasure_1.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/treasure_2.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/victoryTitle.png.meta 40 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/BuffIcon.prefab 500 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/BuffIcon.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/PropIcon.prefab 189 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/PropIcon.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/AdvancedTreasure.prefab 185 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/AdvancedTreasure.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/Gold.prefab 185 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/Gold.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/MiddleTreasure.prefab 185 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/MiddleTreasure.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/Money.prefab 185 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/Money.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/PrimaryTreasure.prefab 185 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/Props/PrimaryTreasure.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 4255 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessBuffData.cs 23 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Data/EndlessPortData.cs 77 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBuffSelectState.cs 19 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Enum/EndlessBuffSelectState.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/GameAnalytics_SDK_Main.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/GameAnalytics_SDK_Main.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Json/JsonDataCenter.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Common.cs 2068 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Game.cs 4156 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/NetMapping.cs 56 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Opcode.cs 48 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Net/NetExtends/Table.cs 181 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Economy/LootDrop.cs 178 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs 224 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 47 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWave.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs 21 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/EndlessViewObtainedProps.cs 115 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/EndlessViewObtainedProps.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs 101 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs 82 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs 106 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSwitchSpeed.cs 42 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessSwitchSpeed.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 33 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 31 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs 37 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs 96 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs.meta 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/donateshop.json 1 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/donateshop.json.meta 7 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_buff.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_enemy.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/endless_port.json 2 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/notice.json 1 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/notice.json.meta 7 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/scoreshop.json 1 ●●●●● diff | view | raw | blame | history
Assets/StreamingAssets/Table/scoreshop.json.meta 7 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/donateshop.json 1 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_buff.json 2 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_enemy.json 2 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json 2 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/notice.json 1 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/StreamingAssets/Table/scoreshop.json 1 ●●●●● diff | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers diff | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level0 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level2 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level3 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets0.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets.resS diff | view | raw | blame | history
readme.txt 3 ●●●●● diff | view | raw | blame | history