wangzhenxing
|
278282f73e
|
[图片]==============替换立绘图片资源
|
2021-04-23 17:45:39 +08:00 |
wangzhenxing
|
1b92e5fed4
|
删除重复得问号 加号图片
|
2021-04-23 11:20:17 +08:00 |
ZhangBiao
|
8117c5ebba
|
【云游商人】怎加红点
|
2021-04-22 10:59:32 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
ZhangBiao
|
37003eea1b
|
【限时神装】更换背景图
|
2021-04-19 20:28:06 +08:00 |
ZhangBiao
|
24a8cbe9b0
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-19 20:12:51 +08:00 |
jiaoyangna
|
a277c5e6fa
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-17 17:20:58 +08:00 |
ZhangBiao
|
48720f5dff
|
【新人商城】资源提交
(cherry picked from commit 8922b7eaba)
|
2021-04-17 14:03:35 +08:00 |
zhangqiang
|
1ee7063569
|
【限时招募】 提交
|
2021-04-16 18:13:09 +08:00 |
ZhangBiao
|
6064633a28
|
【云游商人】资源提交
|
2021-04-16 11:12:17 +08:00 |
ZhangBiao
|
c8cd41670b
|
【至尊豪礼】提交
|
2021-04-14 17:20:55 +08:00 |
ZhangBiao
|
c686791e73
|
【至尊豪礼】资源提交
|
2021-04-14 14:48:30 +08:00 |
ZhangBiao
|
8922b7eaba
|
【新人商城】资源提交
|
2021-04-14 12:00:06 +08:00 |
ZhangBiao
|
cce3a957f3
|
meta提交
|
2021-04-14 11:24:41 +08:00 |
ZhangBiao
|
f1864ae6cf
|
Revert "【每日累充】banner和按钮资源替换"
This reverts commit c34a3fcc24.
|
2021-04-13 16:54:48 +08:00 |
ZhangBiao
|
c34a3fcc24
|
【每日累充】banner和按钮资源替换
|
2021-04-13 13:46:09 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
jiaoyangna
|
c82b907b54
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:20:30 +08:00 |
jiaoyangna
|
acca43f54c
|
菩提树神图片提交
|
2021-04-09 16:20:26 +08:00 |
ZhangBiao
|
ce0a6a55d1
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 15:58:49 +08:00 |
ZhangBiao
|
a2065c13f2
|
【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画
|
2021-04-09 15:58:20 +08:00 |
gaoxin
|
17c39e0d74
|
【本地化】翻译资源导入
|
2021-04-09 15:25:29 +08:00 |
jiaoyangna
|
9496ef8943
|
meta 文件提交
(cherry picked from commit e0fec1aa3a)
|
2021-04-09 13:42:03 +08:00 |
jiaoyangna
|
e0fec1aa3a
|
meta 文件提交
|
2021-04-09 13:40:54 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
ZhangBiao
|
8893dd7d7b
|
【活动优化】日周月礼包增加角标及妖晶数量变更
|
2021-04-09 11:05:08 +08:00 |
gaoxin
|
9de990fafd
|
【本地化】资源名修正
|
2021-04-08 18:29:09 +08:00 |
ZhangBiao
|
3833c53f68
|
【十五日登录、福星高照】修改
|
2021-04-08 16:39:02 +08:00 |
zhangqiang
|
e84bdaf457
|
【每日好礼】
|
2021-04-07 21:07:42 +08:00 |
ZhangBiao
|
d423390397
|
【十五日登录】特效+无尽副本编队问题
|
2021-04-07 20:27:56 +08:00 |
zhangqiang
|
894a8bcfd4
|
【问题提交】
|
2021-04-07 19:52:25 +08:00 |
jiaoyangna
|
586d7eca06
|
限时召唤提交
|
2021-04-07 11:24:49 +08:00 |
ZhangBiao
|
c121c077a8
|
meta提交
|
2021-04-07 11:23:03 +08:00 |
jiaoyangna
|
e5699cb8c7
|
天书秘卷 图片提交
|
2021-04-07 11:11:44 +08:00 |
jiaoyangna
|
2a0589b1d8
|
天书秘卷修改提交
|
2021-04-07 10:58:37 +08:00 |
ZhangBiao
|
63bcee6168
|
Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-04-06 15:51:24 +08:00 |
ZhangBiao
|
4c0150b7d9
|
【十五日登陆】导入特效资源
|
2021-04-02 16:04:57 +08:00 |
ZhangBiao
|
d69d96a321
|
【十五日登陆】红点
|
2021-04-02 11:53:07 +08:00 |
gaoxin
|
1a4c96e88d
|
Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Framework/Framework.lua
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
# Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# data_execl/Language_data/LanguageLua.csv
# data_execl/Language_data/LanguageText.csv
|
2021-04-02 11:34:27 +08:00 |
ZhangBiao
|
e4122121a4
|
【十五日登陆】资源提交
|
2021-04-02 11:23:07 +08:00 |
jiaoyangna
|
ae17483a8e
|
灵兽 修改提交
|
2021-04-01 14:56:47 +08:00 |
jiaoyangna
|
0c43f05161
|
灵兽秘卷修改
|
2021-03-31 18:00:44 +08:00 |
ZhangBiao
|
86425e1c91
|
【十五日登陆】提交
|
2021-03-31 15:20:02 +08:00 |
ZhangBiao
|
1c2f1d23c0
|
【十五日登陆】开坑
|
2021-03-31 15:02:04 +08:00 |
jiaoyangna
|
43da7e2d51
|
十绝阵提交
|
2021-03-31 14:25:43 +08:00 |
jiaoyangna
|
b7a0cca0fe
|
成长基金修改提交
|
2021-03-30 22:19:54 +08:00 |
ZhangBiao
|
d4b843d972
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:03:59 +08:00 |
ZhangBiao
|
4dcdd67648
|
【极速探索优化】更改极速探索界面,突出激活探索特权的按钮
|
2021-03-30 22:01:58 +08:00 |