liujiaqi
|
87cfb4ed03
|
【技能】太极特效字更换为青丝
|
2020-12-06 14:02:48 +08:00 |
liujiaqi
|
1fa4626d47
|
【技能】3星技能文字
|
2020-12-06 10:56:02 +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 |
gaoxin
|
23253f96a2
|
【社稷大典】名字重复的资源处理
|
2020-11-01 16:23:08 +08:00 |
gaoxin
|
e0665012c2
|
【社稷大典】名字重复的资源处理
|
2020-11-01 16:09:49 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
liujiaqi
|
d7205653ad
|
10.30更新,灵兽技能文字资源
|
2020-10-30 17:55:06 +08:00 |
zhangqiang
|
d2f9ffd2db
|
线上活动 森罗幻境达人前端显示
|
2020-10-10 14:51:50 +08:00 |
zhangqiang
|
5f8b1027ee
|
线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-23 14:51:33 +08:00 |
jiaoyangna
|
3e5e41b8ff
|
破阵诛仙提交
|
2020-09-10 13:40:07 +08:00 |
zhangqiang
|
6e04bd3404
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:37:02 +08:00 |
zhangqiang
|
bf541ed4b0
|
寻宝达人替换资源
|
2020-09-09 10:36:55 +08:00 |
jiaoyangna
|
d84b25c7a6
|
限时召唤提交
|
2020-09-10 09:33:27 +08:00 |
jiaoyangna
|
ea62094ac2
|
图片提交
|
2020-09-08 17:52:47 +08:00 |
altair
|
bf38fd1ab6
|
修改技能图片
|
2020-09-07 11:54:03 +08:00 |
gaoxin
|
d05b5d43f1
|
android p 以上机型屏幕适配添加
|
2020-09-05 15:21:41 +08:00 |
zhangqiang
|
6b55198f12
|
周月礼包替图
|
2020-09-04 18:35:30 +08:00 |
zhangqiang
|
bbd5d3bda2
|
成长基金
|
2020-09-04 17:50:50 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
altair
|
888078a2ef
|
替换技能文字图片资源
|
2020-08-27 20:17:25 +08:00 |
altair
|
6fb7e80803
|
修改技能字
|
2020-08-27 16:50:52 +08:00 |
JieLing
|
611bf1a91a
|
删除错误资源
|
2020-08-27 12:01:33 +08:00 |
gaoxin
|
4b41b5def9
|
副本界面显示优化
|
2020-08-26 20:20:40 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
zhangqiang
|
c668a522dd
|
寻宝缺失资源提交
|
2020-09-29 10:46:57 +08:00 |
jiaoyangna
|
124fc753a0
|
达人图片提交
|
2020-09-29 10:32:57 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
gaoxin
|
74951cedd8
|
修复登录界面错误,修复战斗背景音乐缺失的问题
|
2020-08-24 14:35:45 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
liujiaqi
|
911d3fabf9
|
新英雄资源及技能名称资源替换
|
2020-08-18 20:35:51 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
ZhangBiao
|
2063690199
|
|
2020-08-14 23:34:23 +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
|
5e9448dd24
|
资源提交,
|
2020-08-14 17:35:18 +08:00 |
JieLing
|
ad3ee94a75
|
资源压缩方式修改,苹果资源压缩方式添加,
|
2020-08-14 17:29:06 +08:00 |
jiaoyangna
|
e88e7544c2
|
通关豪礼替换
|
2020-08-14 14:41:29 +08:00 |
jiaoyangna
|
3834e1960e
|
图片导入
|
2020-08-14 14:17:38 +08:00 |
JieLing
|
be59c59230
|
部分大图资源整理
|
2020-08-14 10:02:24 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
jl_ios
|
02b7e07d20
|
删除无用的sdk资源,bugly添加缺少的文件
|
2020-08-11 14:04:05 +08:00 |
gaoxin
|
48a39d2fae
|
游戏logo替换
|
2020-07-28 10:40:02 +08:00 |
JieLing
|
6807c6c1a6
|
meta文件提交
|
2020-07-25 15:15:16 +08:00 |
JieLing
|
89169b7291
|
资源文件名重复
|
2020-07-25 14:45:27 +08:00 |
jiaoyangna
|
b424927bbb
|
tupian tijiao
|
2020-07-23 16:01:26 +08:00 |
zhangqiang
|
b682f97e66
|
首充第一版修改
|
2020-07-15 10:36:57 +08:00 |