zhangqiang
|
6488dad50a
|
【献祭坛】 资源适配替换
|
2020-11-05 20:08:46 +08:00 |
gaoxin
|
1c25e4e21a
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/LuaFramework/Scenes/LogoHwRelease_IOS.unity.meta
# Assets/LuaFramework/Scenes/LogoHwTest_IOS.unity.meta
# Assets/LuaFramework/Scripts/Framework/App.cs
# Assets/LuaFramework/Scripts/Manager/NetworkManager.cs
# Assets/LuaFramework/Scripts/Network/SocketClient.cs
# Assets/ManagedResources/Atlas/DemonSlayerAtlas.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_banner.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon1.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_icon2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang1.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_zi.png.meta
# Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta
# Assets/ManagedResources/Audio/UI/common/UI_shaizi.mp3
# Assets/ManagedResources/DynamicAtlas/ArtFont/g_gonghui_banner.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao1.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/r_daren_xubao3.png.meta
# Assets/ManagedResources/DynamicAtlas/Skill/l_ls_11.png.meta
# Assets/ManagedResources/EffectResSkill.meta
# Assets/ManagedResources/EffectResUI.meta
# Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab
# Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_BaiHu.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_Lanlong.prefab.meta
# Assets/ManagedResources/Prefabs/Effect/HeadFrame/UI_Effect_TouXiang_QingLong.prefab.meta
# Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DemonSlayer.meta
# Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSingleResultPanel.prefab.meta
# Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab
# Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/SoundData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua.meta
# Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua.meta
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Skill.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleData.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleSetView.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua.meta
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua.meta
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/BattleData1.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua.meta
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-11-04 16:18:35 +08:00 |
JieLing
|
2620d55085
|
【资源】 修改资源路径
|
2020-11-02 20:00:07 +08:00 |
JieLing
|
04ba352791
|
【资源】 修改资源路径
|
2020-11-02 19:54:12 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
zhangqiang
|
0d9ed28c23
|
【灵兽系统】 资源替换 拖拽修改
|
2020-10-27 15:59:53 +08:00 |
yuanshuai
|
8015f4cfc7
|
【逍遥游】犀牛贺州地图资源提交
|
2020-10-26 16:21:42 +08:00 |
zhangqiang
|
6767828cdc
|
Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/Spine/ls_06_baize.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-10-23 14:38:50 +08:00 |
gaoxin
|
8f1601a573
|
重复资源删除
|
2020-10-19 20:19:45 +08:00 |
yuanshuai
|
1297d0682b
|
資源提交
|
2020-10-19 15:12:47 +08:00 |
gaoxin
|
fc3a8f78f2
|
逍遥游地图界面提交
|
2020-10-19 10:36:40 +08:00 |
yuanshuai
|
f25854797e
|
逍遥游 资源脚本预设提交
|
2020-10-16 18:39:49 +08:00 |
yuanshuai
|
8487c445a3
|
逍遥游资源预设脚本提交
|
2020-10-15 10:53:00 +08:00 |
yuanshuai
|
57c7fd0890
|
逍遥游脚本资源预设提交
|
2020-10-14 16:57:35 +08:00 |
zhangqiang
|
6a5eb99853
|
灵兽资源提交
|
2020-09-21 11:01:49 +08:00 |
wangxiaolong
|
209ba84534
|
添加冗余代码调用 + 修改私有方法名称
|
2020-09-16 14:45:10 +08:00 |
gaoxin
|
857e255001
|
特效资源位置移动
|
2020-09-10 20:16:54 +08:00 |
jiaoyangna
|
3e5e41b8ff
|
破阵诛仙提交
|
2020-09-10 13:40:07 +08:00 |
jiaoyangna
|
d84b25c7a6
|
限时召唤提交
|
2020-09-10 09:33:27 +08:00 |
jiaoyangna
|
ea62094ac2
|
图片提交
|
2020-09-08 17:52:47 +08:00 |
gaoxin
|
06afe99236
|
宽屏边缘用图片代替黑边
|
2020-09-05 19:02:20 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
gaoxin
|
e415076e53
|
主界面适配资源替换
|
2020-09-02 17:04:44 +08:00 |
zhangqiang
|
63ce11cda4
|
替换底图
|
2020-08-26 15:18:44 +08:00 |
JieLing
|
be1d62a888
|
修复登陆界面扫光显示错误的问题
|
2020-08-26 13:47:26 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
JieLing
|
2eeb381608
|
登陆界面资源替换
|
2020-08-25 17:56:55 +08:00 |
ZhangBiao
|
c6293a0566
|
月卡资源替换
|
2020-08-25 16:09:59 +08:00 |
JieLing
|
34b2d555b6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 15:01:25 +08:00 |
JieLing
|
42a73022ac
|
连续充值背景体寒
|
2020-08-25 15:01:02 +08:00 |
zhangqiang
|
77706e50cc
|
首冲有礼加特效
|
2020-08-25 14:46:57 +08:00 |
gaoxin
|
c6704e6ed4
|
【逍遥游】修复白片问题
|
2020-10-20 00:38:49 +08:00 |
gaoxin
|
19135670ce
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-19 20:40:14 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
bae7d6550e
|
竞技场界面修改
|
2020-10-16 19:36:21 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
zhangqiang
|
714545c75d
|
魂印效果图替换 修改公会副本
|
2020-08-25 10:40:13 +08:00 |
gaoxin
|
b1f7318f11
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:18:36 +08:00 |
gaoxin
|
02c213aca8
|
挂机地图新增
|
2020-08-24 17:17:21 +08:00 |
ZhangBiao
|
ec6cf58003
|
天尊降世入口资源替换
|
2020-08-24 17:04:45 +08:00 |
gaoxin
|
65aeee839d
|
战斗背景图修改
|
2020-08-24 16:34:35 +08:00 |
ZhangBiao
|
4b59561b3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
|
2020-08-24 16:08:01 +08:00 |
ZhangBiao
|
6013365ad1
|
剑影仙踪特效更新
|
2020-08-24 16:07:08 +08:00 |
gaoxin
|
74951cedd8
|
修复登录界面错误,修复战斗背景音乐缺失的问题
|
2020-08-24 14:35:45 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
ZhangBiao
|
8391f5638f
|
破阵诛仙 通天教主替换资源
|
2020-08-22 10:20:41 +08:00 |
zhangqiang
|
c67951f5fb
|
公会副本资源提交
|
2020-08-17 16:19:25 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
JieLing
|
7453825d63
|
Merge branch 'master_develop' into 0功能/资源加密方式二
# Conflicts:
# Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
# Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
# Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
# Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta
|
2020-08-14 17:41:21 +08:00 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |