JLIOSM1
|
cab9724de6
|
【ios】资源位置修改
|
2021-04-20 13:57:33 +08:00 |
zhangqiang
|
d7a74e8256
|
【归元优化】确认归元弹窗的神将头像改为固定显示在左侧第一位
|
2021-04-20 11:43:24 +08:00 |
zhangqiang
|
20e064b178
|
英雄左右快速切换 ui 重叠
|
2021-04-19 21:29:17 +08:00 |
zhangqiang
|
b90b306f49
|
去掉动画
|
2021-04-19 21:29:10 +08:00 |
zhangqiang
|
3508501530
|
动画修改
|
2021-04-19 21:29:01 +08:00 |
jiaoyangna
|
c790d3ba8b
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-19 21:26:14 +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 |
zhangqiang
|
3fb2bae218
|
英雄左右快速切换 ui 重叠
|
2021-04-19 19:36:43 +08:00 |
jiaoyangna
|
f3fa2c9a99
|
挂机界面提交
|
2021-04-19 18:20:57 +08:00 |
zhangqiang
|
46efdd02de
|
【英雄升星祭品】提交——02
|
2021-04-19 15:11:39 +08:00 |
jiaoyangna
|
d101c5ce7b
|
名字修改提交
|
2021-04-19 13:02:37 +08:00 |
ZhangBiao
|
3005d9bf30
|
【云游商人】提交
|
2021-04-19 11:38:35 +08:00 |
jiaoyangna
|
fe837c22f4
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
|
2021-04-17 17:20:52 +08:00 |
zhangqiang
|
21e35dc81b
|
去掉动画
|
2021-04-17 16:55:37 +08:00 |
zhangqiang
|
777a3f7b30
|
动画修改
|
2021-04-17 16:49:24 +08:00 |
ZhangBiao
|
11ea817c16
|
【云游商人】
|
2021-04-17 16:45:33 +08:00 |
ZhangBiao
|
07cda7e58e
|
【云游商人】提交
|
2021-04-16 17:25:11 +08:00 |
ZhangBiao
|
98237651c9
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
|
2021-04-16 16:22:13 +08:00 |
ZhangBiao
|
78e320eb26
|
【云游商人】
|
2021-04-16 16:21:34 +08:00 |
jiaoyangna
|
92104541fc
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-04-16 15:42:39 +08:00 |
ZhangBiao
|
762aef88e0
|
【云游商人】提交
|
2021-04-16 14:58:40 +08:00 |
wangzhenxing
|
c544767e29
|
[功能]===========新手引导提交,心魔试炼排行榜添加玩家信息
|
2021-04-16 14:09:36 +08:00 |
ZhangBiao
|
6064633a28
|
【云游商人】资源提交
|
2021-04-16 11:12:17 +08:00 |
jiaoyangna
|
5f29447434
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 20:37:00 +08:00 |
jiaoyangna
|
c844a72609
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-15 19:54:30 +08:00 |
gaoxin
|
fe74e55bc9
|
【十绝阵】文字显示修改 军团战 改为 十绝阵
|
2021-04-15 19:04:00 +08:00 |
ZhangBiao
|
72b4c2288f
|
Merge branch 'china/dev' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
|
2021-04-15 17:21:28 +08:00 |
jiaoyangna
|
3738137554
|
【挂机演示优化】挂机界面增加其他玩家
|
2021-04-15 15:51:24 +08:00 |
gaoxin
|
8f611f0340
|
【大闹天宫】敌人详情弹窗,有图片超框
|
2021-04-15 15:17:43 +08:00 |
gaoxin
|
196a319a4e
|
【跳过战斗】灵兽释放技能时,点击跳过战斗按钮无效
|
2021-04-15 15:11:25 +08:00 |
ZhangBiao
|
c8cd41670b
|
【至尊豪礼】提交
|
2021-04-14 17:20:55 +08:00 |
ZhangBiao
|
c686791e73
|
【至尊豪礼】资源提交
|
2021-04-14 14:48:30 +08:00 |
ZhangBiao
|
314301c3b0
|
【活动优化】每日礼包(一键购买)按钮 资源替换
|
2021-04-13 14:22:00 +08:00 |
gaoxin
|
2a94f1127f
|
【寻宝】文字显示还原
|
2021-04-12 19:17:28 +08:00 |
ZhangBiao
|
e818791d38
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:07:59 +08:00 |
ZhangBiao
|
4ae91eda8e
|
【森罗幻境】修改数独小游戏的数字图片,将?居中
|
2021-04-12 17:07:27 +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 |
ZhangBiao
|
0ded23ecde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 16:34:47 +08:00 |
ZhangBiao
|
216cf7839c
|
【森罗环境】将按钮的start改为中文“开始”
|
2021-04-12 16:34:38 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
JieLing
|
9e0710a861
|
Merge remote-tracking branch 'origin/master_xma_local' into xma/dev
|
2021-04-12 15:11:16 +08:00 |
ZhangBiao
|
276e0129fe
|
【十五日登陆】修改提交
(cherry picked from commit 8e0177d3ed)
|
2021-04-12 15:06:43 +08:00 |
ZhangBiao
|
8e0177d3ed
|
【十五日登陆】修改提交
|
2021-04-12 15:02:49 +08:00 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
zhangqiang
|
ccbc758738
|
【未获得装备属性展示】
|
2021-04-09 20:22:25 +08:00 |
gaoxin
|
7aace673ab
|
【本地化】天书密卷修复在其他语言下文字重叠的问题
|
2021-04-09 20:14:15 +08:00 |
gaoxin
|
cf78c74d3c
|
【本地化】修复试炼副本答题界面未翻译的问题
|
2021-04-09 20:04:17 +08:00 |
ZhangBiao
|
831d48f0ef
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 19:09:09 +08:00 |
ZhangBiao
|
e83e9ae889
|
【魂印】购买确认界面的魂印图标错误,没有添加圆形遮罩
|
2021-04-09 19:08:59 +08:00 |
gaoxin
|
e4144075ef
|
【乾坤宝盒】单抽光效在不同分辨率下显示错误
|
2021-04-09 18:28:32 +08:00 |
jiaoyangna
|
82794896a0
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:56:11 +08:00 |
jiaoyangna
|
8d2bdf6228
|
限时神装 皮肤预览修改提交
|
2021-04-09 16:56:07 +08:00 |
ZhangBiao
|
3827aa3a15
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:53:04 +08:00 |
ZhangBiao
|
5814ca39db
|
【青龙秘宝】文字超框修改
|
2021-04-09 16:51:49 +08:00 |
gaoxin
|
bfa2f1300f
|
【天宫寻宝】帮助按钮位置移动
|
2021-04-09 16:49:02 +08:00 |
gaoxin
|
196dfa34dd
|
【GM】添加红点数据查看工具
|
2021-04-09 16:14:24 +08:00 |
gaoxin
|
3418b63e02
|
【本地化】天宫寻宝文字关闭
|
2021-04-09 16:04:21 +08:00 |
ZhangBiao
|
5de102eb06
|
【天枢密卷】灯笼文字超框修改
|
2021-04-09 14:48:01 +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 |
ZhangBiao
|
115b2ee04d
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 09:18:03 +08:00 |
zhangqiang
|
19ba1ffc5a
|
【分解】神将达到上限,分解后,再获得神将依然提示已达上限,重登正常
|
2021-04-08 21:03:47 +08:00 |
gaoxin
|
075101090d
|
【首充】文字显示调整
|
2021-04-08 20:52:01 +08:00 |
ZhangBiao
|
b3aa8ebf2a
|
【神将置换】英雄名过长修改
|
2021-04-08 20:48:17 +08:00 |
ZhangBiao
|
56c0462062
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 19:58:51 +08:00 |
ZhangBiao
|
78c1b12067
|
【森罗幻境】小游戏转盘,灵兽碎片显示整只灵兽
|
2021-04-08 19:58:41 +08:00 |
gaoxin
|
10f502dc14
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 18:16:47 +08:00 |
gaoxin
|
500d54469d
|
【扫光】挂机,充值界面扫光光效添加
|
2021-04-08 18:16:28 +08:00 |
ZhangBiao
|
4977de55ba
|
【坐骑】界面文字适应修改
|
2021-04-08 18:01:29 +08:00 |
ZhangBiao
|
2da1f06bcb
|
【自选宝箱】还是修改
(cherry picked from commit 89c8179840)
|
2021-04-08 17:49:58 +08:00 |
ZhangBiao
|
f87aafafbc
|
【自选箱】遮盖文字修改
(cherry picked from commit adc2d56559)
|
2021-04-08 17:49:34 +08:00 |
jiaoyangna
|
dd98250771
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-08 17:30:08 +08:00 |
jiaoyangna
|
5740120f53
|
【ID1008675】
【图鉴优化】增加神将皮肤预览
|
2021-04-08 17:24:36 +08:00 |
ZhangBiao
|
3833c53f68
|
【十五日登录、福星高照】修改
|
2021-04-08 16:39:02 +08:00 |
ZhangBiao
|
89c8179840
|
【自选宝箱】还是修改
|
2021-04-08 15:36:27 +08:00 |
ZhangBiao
|
68539ff1ff
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 14:44:17 +08:00 |
ZhangBiao
|
adc2d56559
|
【自选箱】遮盖文字修改
|
2021-04-08 14:44:08 +08:00 |
ZhangBiao
|
bc15cb20f6
|
【十五日登陆】微调
|
2021-04-08 11:26:05 +08:00 |
zhangqiang
|
4b1f021ac0
|
【累计充值】
|
2021-04-08 10:18:24 +08:00 |
jiaoyangna
|
efd1c6fab9
|
逍遥预设提交
|
2021-04-07 20:28:12 +08:00 |
ZhangBiao
|
d423390397
|
【十五日登录】特效+无尽副本编队问题
|
2021-04-07 20:27:56 +08:00 |
ZhangBiao
|
31d0a4ea93
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-07 17:48:15 +08:00 |
ZhangBiao
|
83f173bc74
|
【天枢密卷】提交
|
2021-04-07 17:48:07 +08:00 |
jiaoyangna
|
f49bb447fc
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-07 17:47:00 +08:00 |
jiaoyangna
|
8696940dda
|
逍遥提交
|
2021-04-07 17:46:56 +08:00 |
ZhangBiao
|
21b97b3985
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-07 16:59:56 +08:00 |
ZhangBiao
|
6117dd2363
|
【牛气冲天】翻译修改
|
2021-04-07 16:59:47 +08:00 |
zhangqiang
|
69d3f4a331
|
【bug 主要是翻译】
|
2021-04-07 16:38:26 +08:00 |
jiaoyangna
|
6794c272c0
|
逍遥游提交
|
2021-04-07 16:30:20 +08:00 |
zhangqiang
|
b05c9a8c1c
|
【bug】 十绝阵翻译修改引用
|
2021-04-07 11:43:25 +08:00 |
jiaoyangna
|
034a8290e5
|
天书秘卷预设修改
|
2021-04-07 11:12:14 +08:00 |
jiaoyangna
|
2a0589b1d8
|
天书秘卷修改提交
|
2021-04-07 10:58:37 +08:00 |
zhangqiang
|
132e4c1260
|
【bug】奖励排行拉不到底部
|
2021-04-07 10:30:47 +08:00 |
gaoxin
|
d6319948f2
|
【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。
|
2021-04-06 22:30:21 +08:00 |
jiaoyangna
|
53d8603044
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-06 16:44:07 +08:00 |
jiaoyangna
|
db80db31c2
|
升星神将显示名字修改
|
2021-04-06 16:44:04 +08:00 |
ZhangBiao
|
1647e05beb
|
【森罗小游戏】文字位置修改
|
2021-04-06 16:32:52 +08:00 |
ZhangBiao
|
7a59fe9d6a
|
【十五日登陆】增加红点
(cherry picked from commit 120106c6d0d8957d7e7f0bbce687fafd42a70277)
|
2021-04-06 16:20:36 +08:00 |
jiaoyangna
|
6641fa8814
|
车迟斗法倒计时
|
2021-04-06 16:16:52 +08:00 |
jiaoyangna
|
0d581ebb97
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-06 16:14:34 +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 |
gaoxin
|
d90b9145b8
|
Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
|
2021-04-06 15:24:46 +08:00 |
jiaoyangna
|
6e68ac5949
|
【ID1008671】
【升星优化】升星选择祭品神将时,增加显示内容
|
2021-04-06 15:20:00 +08:00 |
jiaoyangna
|
4244050881
|
【车迟斗法优化】调整挑战抢夺倒计时的位置、大小和颜色
|
2021-04-06 14:43:41 +08:00 |
ZhangBiao
|
5ab1295c10
|
【好友】赠送好友友情点,每点一下都会播放动画
|
2021-04-06 11:17:22 +08:00 |
ZhangBiao
|
53f095011e
|
【牛气冲天】特效层级修改
(cherry picked from commit 53308beca2)
(cherry picked from commit 672b5acd10caeca26906c4c9ddfb840fd3b121df)
|
2021-04-02 19:29:39 +08:00 |
ZhangBiao
|
53308beca2
|
【牛气冲天】特效层级修改
|
2021-04-02 19:27:35 +08:00 |
ZhangBiao
|
d99899d37f
|
【十五日登陆】
|
2021-04-02 19:06:08 +08:00 |
ZhangBiao
|
4c0150b7d9
|
【十五日登陆】导入特效资源
|
2021-04-02 16:04:57 +08:00 |
jiaoyangna
|
db5a0557ea
|
签到界面宝箱弹出框修改
|
2021-04-02 14:04:21 +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 |
ZhangBiao
|
2688f37d72
|
【牛气冲天】增加特效
(cherry picked from commit f8b01c8e8d)
|
2021-04-02 10:53:29 +08:00 |
ZhangBiao
|
f8b01c8e8d
|
【牛气冲天】增加特效
|
2021-04-02 10:52:53 +08:00 |
ZhangBiao
|
f45c11825d
|
【拍脸】拍脸界面关闭遮罩
|
2021-04-02 10:30:40 +08:00 |
ZhangBiao
|
26b1480da9
|
【牛气冲天】奖励图标大小修改
(cherry picked from commit 02d431c4f6)
(cherry picked from commit cd40a6172dbdd86439ba395d791fbba796c5e8e9)
|
2021-04-02 10:15:21 +08:00 |
ZhangBiao
|
02d431c4f6
|
【牛气冲天】奖励图标大小修改
|
2021-04-02 10:13:47 +08:00 |
zhangqiang
|
3d8fd5a748
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-01 20:26:56 +08:00 |
zhangqiang
|
e4da98bff6
|
【bug修改】
|
2021-04-01 20:26:43 +08:00 |
ZhangBiao
|
4927a85f01
|
【自选宝箱】无特效修改
|
2021-04-01 20:22:15 +08:00 |
jiaoyangna
|
cff04dc520
|
签到 修改
|
2021-04-01 18:50:06 +08:00 |
ZhangBiao
|
74077e2484
|
【十五日登陆】
|
2021-04-01 17:44:44 +08:00 |
ZhangBiao
|
e86078ce69
|
【十五日登陆】
|
2021-04-01 16:04:13 +08:00 |
jiaoyangna
|
ae17483a8e
|
灵兽 修改提交
|
2021-04-01 14:56:47 +08:00 |
jiaoyangna
|
c70343585a
|
主题活动 修改
|
2021-04-01 12:30:37 +08:00 |
ZhangBiao
|
c1276ff0c4
|
【十五日登陆】界面
|
2021-03-31 17:00:35 +08:00 |
ZhangBiao
|
38e4f42b7e
|
【十五日登陆】
|
2021-03-31 15:52:11 +08:00 |
ZhangBiao
|
1c2f1d23c0
|
【十五日登陆】开坑
|
2021-03-31 15:02:04 +08:00 |
ZhangBiao
|
5142db7d00
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:33:11 +08:00 |
ZhangBiao
|
c287216995
|
【适配】限时神装
|
2021-03-31 14:33:01 +08:00 |
jiaoyangna
|
6af6f89c18
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:25:47 +08:00 |
jiaoyangna
|
43da7e2d51
|
十绝阵提交
|
2021-03-31 14:25:43 +08:00 |
zhangqiang
|
2bfccba248
|
【适配】魂印分解...
|
2021-03-31 14:03:18 +08:00 |
ZhangBiao
|
94714c1ce4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 13:32:44 +08:00 |
ZhangBiao
|
beee0ed0b3
|
【适配】无尽副本
|
2021-03-31 13:32:23 +08:00 |
zhangqiang
|
3b7b310c8b
|
【适配】
|
2021-03-31 12:00:55 +08:00 |
zhangqiang
|
7da79393e5
|
【适配】
|
2021-03-31 11:51:27 +08:00 |
gaoxin
|
64ca85735c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:40:09 +08:00 |
jiaoyangna
|
8c87d221fb
|
活动 动态加载改名
|
2021-03-31 11:26:55 +08:00 |
gaoxin
|
2ea4d35ab9
|
【屏幕适配】vip界面适配修改
|
2021-03-31 11:23:26 +08:00 |
zhangqiang
|
04543dd9bb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 11:06:01 +08:00 |
zhangqiang
|
9806a56460
|
修改提交
|
2021-03-31 11:05:20 +08:00 |
ZhangBiao
|
116ab83a04
|
【福星高照】适配
|
2021-03-31 10:45:36 +08:00 |
ZhangBiao
|
3a23cb6cae
|
【青龙秘宝】解锁秘宝特权时,可直接领取的奖励显示区域超框
|
2021-03-30 22:09:25 +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 |
gaoxin
|
599a98b3a8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 21:24:58 +08:00 |
gaoxin
|
23e5bb6f98
|
【五星成长礼】添加箭头动画
|
2021-03-30 21:23:42 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
ZhangBiao
|
62a064b33e
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
|
2021-03-30 20:21:32 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
gaoxin
|
c2a5c2dc17
|
【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i
|
2021-03-30 19:54:19 +08:00 |
zhangqiang
|
cfaeff6759
|
【特权优化】 vip 公会 vip 升级战力提升
|
2021-03-30 19:49:49 +08:00 |
ZhangBiao
|
d61c55d24d
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 18:55:35 +08:00 |
ZhangBiao
|
685ace078a
|
【福星高照】增加协议
|
2021-03-30 18:50:15 +08:00 |
gaoxin
|
8161aca202
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 18:42:38 +08:00 |
gaoxin
|
3cc0b51edd
|
【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题
|
2021-03-30 18:42:30 +08:00 |
jiaoyangna
|
c2fac79eca
|
活动 提交
|
2021-03-30 18:26:10 +08:00 |
jiaoyangna
|
d860db875d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 18:19:12 +08:00 |
jiaoyangna
|
7d9a5a62ba
|
天书秘卷 提交
|
2021-03-30 18:18:16 +08:00 |
gaoxin
|
202658d6d9
|
【特权优化】将界面顶部的特权等级移回
|
2021-03-30 18:10:39 +08:00 |
zhangqiang
|
aabe3e082f
|
【归元修改】资源提交
|
2021-03-30 17:31:44 +08:00 |
zhangqiang
|
9faf244e40
|
【归元修改】 神将 法宝 归元修改
|
2021-03-30 16:36:00 +08:00 |
ZhangBiao
|
ee778776a1
|
【福星高照】提交
|
2021-03-30 16:24:28 +08:00 |
jiaoyangna
|
a0552233ae
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-03-30 16:15:49 +08:00 |
ZhangBiao
|
289af5b209
|
【活动优化】青龙秘宝界面优化
|
2021-03-30 14:34:25 +08:00 |
jiaoyangna
|
e6ad1d141d
|
mainpanel 提交
|
2021-03-30 13:56:50 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
ZhangBiao
|
73981e7200
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 13:43:59 +08:00 |
ZhangBiao
|
a0fb7f5714
|
【天宫寻宝】按钮增加特效
|
2021-03-30 13:43:46 +08:00 |
zhangqiang
|
2122997c3d
|
【称号坐骑时装】修改
|
2021-03-30 11:38:20 +08:00 |
ZhangBiao
|
32146997e4
|
【寻宝优化】优化天宫寻宝界面
|
2021-03-30 11:25:07 +08:00 |
jiaoyangna
|
4e83f9a540
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-30 10:50:57 +08:00 |
jiaoyangna
|
ae51b547d5
|
活动提交
|
2021-03-30 10:48:34 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
zhangqiang
|
3115c6f586
|
【称号坐骑时装】界面修改
|
2021-03-29 18:42:47 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
gaoxin
|
918beb5c35
|
【法宝】界面特效资源位置全面屏显示错误
|
2021-03-29 15:37:25 +08:00 |
jiaoyangna
|
c16e912777
|
成长礼包,每日礼包修改提交
|
2021-03-29 15:16:32 +08:00 |
gaoxin
|
a599ef10f9
|
【红点添加】限时兑换添加红点提示
|
2021-03-29 14:37:15 +08:00 |
ZhangBiao
|
e0d05e175e
|
【福星高照】提交
|
2021-03-29 09:52:53 +08:00 |
ZhangBiao
|
739eb8771c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 20:09:19 +08:00 |
ZhangBiao
|
104aeb9078
|
【适配】三界除魔
|
2021-03-31 20:09:10 +08:00 |
gaoxin
|
5f16021a0e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 19:06:34 +08:00 |
gaoxin
|
9c080a0cac
|
【激素探索】按钮扫光光效修改
|
2021-03-31 19:06:16 +08:00 |
ZhangBiao
|
762e257982
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:57:43 +08:00 |
ZhangBiao
|
87863f89f8
|
【适配】巅峰赛对战纪录
|
2021-03-31 18:57:31 +08:00 |
jiaoyangna
|
c16ac5d054
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:54:56 +08:00 |
ZhangBiao
|
5dc50c34da
|
【适配】天枢密卷 鸿蒙阵
|
2021-03-31 18:54:01 +08:00 |
jiaoyangna
|
292515e12e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:41:47 +08:00 |
ZhangBiao
|
2204717b5a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:40:34 +08:00 |
ZhangBiao
|
c521889e83
|
【适配】达人活动 逍遥游
|
2021-03-31 18:40:22 +08:00 |
jiaoyangna
|
4365e8afff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:39:02 +08:00 |
jiaoyangna
|
f8245898b0
|
特权礼包修改提交
|
2021-03-31 18:38:57 +08:00 |
zhangqiang
|
c2df1a807b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 18:29:00 +08:00 |
zhangqiang
|
d131bdbadd
|
【适配】
|
2021-03-31 18:28:46 +08:00 |
ZhangBiao
|
9b533a698b
|
【适配】
|
2021-03-31 17:55:47 +08:00 |
ZhangBiao
|
c280b85426
|
【适配】
|
2021-03-31 17:49:06 +08:00 |
zhangqiang
|
60353d6dbd
|
【归元优化】bug
|
2021-03-31 17:40:51 +08:00 |
ZhangBiao
|
e3d9b0b140
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 17:30:26 +08:00 |
zhangqiang
|
c6425d9fe9
|
【称号坐骑时装】三界降魔
|
2021-03-31 17:30:05 +08:00 |
ZhangBiao
|
ab7d045495
|
【适配】法宝 竞技场
|
2021-03-31 17:29:51 +08:00 |
zhangqiang
|
4b7bed573c
|
【称号坐骑时装】小人立绘替换
|
2021-03-31 16:18:31 +08:00 |
jiaoyangna
|
c029a643ec
|
超值基金文字错乱修改
|
2021-03-31 15:24:05 +08:00 |
zhangqiang
|
5d407765a2
|
【适配】森罗幻境
|
2021-03-31 15:06:41 +08:00 |
jiaoyangna
|
fbe2dc4769
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 14:43:11 +08:00 |
jiaoyangna
|
2fa125f70e
|
特权礼包特效修改
|
2021-03-31 14:43:08 +08:00 |
zhangqiang
|
9637337c39
|
【称号坐骑时装】 修改提交
|
2021-03-27 20:01:39 +08:00 |
gaoxin
|
5ae49a698d
|
【特效】嫦娥,金吒特效修改
|
2021-03-27 19:02:40 +08:00 |
gaoxin
|
e060430d61
|
【公会红包】修复滑动导致按钮位置错误
|
2021-03-27 15:20:26 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
gaoxin
|
fd5ef82b5f
|
【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题
|
2021-03-26 10:13:05 +08:00 |
jiaoyangna
|
8aa411244e
|
灵兽秘卷修改提交
|
2021-03-25 16:21:34 +08:00 |
jiaoyangna
|
299a7ceff1
|
【天书秘卷】 修改
|
2021-03-25 15:34:05 +08:00 |
jiaoyangna
|
776353406d
|
灵兽提交
|
2021-03-25 14:05:58 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
zhangqiang
|
4939c4da92
|
【称号坐骑时装】部分资源提交
|
2021-03-24 16:31:14 +08:00 |
zhangqiang
|
d0da980a3f
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-24 10:37:22 +08:00 |
gaoxin
|
56d7244740
|
【适配】修复部分界面在全面屏下显示不全的问题
|
2021-03-23 19:08:21 +08:00 |
gaoxin
|
8644d27aaa
|
【界面优化】部分界面显示优化修改
|
2021-03-23 17:26:16 +08:00 |
jiaoyangna
|
fbed4d34ff
|
解锁条件修改
|
2021-03-23 17:10:04 +08:00 |
jiaoyangna
|
298946dd2d
|
Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-03-23 16:54:46 +08:00 |
jiaoyangna
|
44806a302d
|
红点提交
|
2021-03-23 16:52:19 +08:00 |
zhangqiang
|
3618464a15
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-23 16:22:57 +08:00 |
jiaoyangna
|
3334257425
|
添加天书秘卷入口
|
2021-03-23 15:37:39 +08:00 |
jiaoyangna
|
cfa63c1830
|
筛选提交
|
2021-03-23 15:23:37 +08:00 |
jiaoyangna
|
2e31e176cc
|
红点提交
|
2021-03-23 15:16:38 +08:00 |
gaoxin
|
1b9173f931
|
【bug】修复充值界面在全面屏下文字显示不全的问题-expertpanel
|
2021-03-23 14:25:11 +08:00 |
gaoxin
|
671edf8366
|
【bug】修复充值界面在全面屏下文字显示不全的问题
|
2021-03-23 14:22:25 +08:00 |
ZhangBiao
|
dfa2efdc76
|
【大闹天宫】查看圣物文字过小调整
|
2021-03-23 10:11:36 +08:00 |
ZhangBiao
|
83040f2c87
|
【主城】预设结构调整
|
2021-03-23 09:54:11 +08:00 |
gaoxin
|
52cace8d64
|
【公会】援助界面文字和进度条分离显示
|
2021-03-22 20:17:06 +08:00 |
ZhangBiao
|
207d85e2a2
|
【牛气冲天】提交
|
2021-03-22 20:08:18 +08:00 |
wangzhenxing
|
1e2db6040e
|
皮肤称号坐骑预设修改
|
2021-03-22 17:31:55 +08:00 |
zhangqiang
|
d9dcba2574
|
【称号坐骑皮肤-----------】开始
|
2021-03-22 16:16:25 +08:00 |
jiaoyangna
|
a4facd8d13
|
天书秘卷
|
2021-03-22 15:16:29 +08:00 |
zhangqiang
|
2c3d846d04
|
【化虚坛加名字】
|
2021-03-19 18:26:54 +08:00 |
zhangqiang
|
853db67d9a
|
【化虚坛去掉屏蔽神将】
|
2021-03-19 18:00:46 +08:00 |
ZhangBiao
|
65f994b37b
|
【牛气冲天】提交
|
2021-03-19 15:16:49 +08:00 |
jiaoyangna
|
ec8ff74e61
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-19 15:11:37 +08:00 |
jiaoyangna
|
beb93b5ed9
|
天书秘卷
|
2021-03-19 14:37:24 +08:00 |
gaoxin
|
1b3e9460fe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-19 14:19:13 +08:00 |
gaoxin
|
e9968d8517
|
【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置
|
2021-03-19 14:19:05 +08:00 |
jiaoyangna
|
7986167a58
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-19 11:46:12 +08:00 |
jiaoyangna
|
9b25228d56
|
【日常副本】页签左滑不复位
|
2021-03-19 11:46:00 +08:00 |
gaoxin
|
1320371eac
|
【优化】删除登录区服显示-选择区服界面文字位置修改
|
2021-03-19 11:43:20 +08:00 |
gaoxin
|
367f319b81
|
【优化】删除登录区服显示
|
2021-03-19 11:37:22 +08:00 |
gaoxin
|
3a43473a0c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-19 10:28:50 +08:00 |
gaoxin
|
c334f2df54
|
【bug】版号信息显示错误
|
2021-03-19 10:28:33 +08:00 |
ZhangBiao
|
cde26e679b
|
|
2021-03-18 20:34:49 +08:00 |
zhangqiang
|
e8acbe1c86
|
【自选箱提交】
|
2021-03-18 15:15:54 +08:00 |
ZhangBiao
|
487cd87339
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-18 14:42:34 +08:00 |
ZhangBiao
|
b479a8fa8b
|
首领来袭
|
2021-03-18 14:40:47 +08:00 |
zhangqiang
|
8200e72dd2
|
【神将碎片箱子】需要向下移,到框里
|
2021-03-18 14:25:05 +08:00 |
ZhangBiao
|
db3340d779
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-18 14:10:29 +08:00 |
ZhangBiao
|
97ae8966d7
|
【充值界面】
|
2021-03-18 14:10:23 +08:00 |
gaoxin
|
0f8f51eded
|
【bug】武将—>神将
|
2021-03-18 14:02:16 +08:00 |
gaoxin
|
a01f1024ec
|
【优化】挂机奖励提升内容位置调整
|
2021-03-18 13:47:03 +08:00 |
ZhangBiao
|
30c05503c1
|
【累充】
|
2021-03-18 11:23:15 +08:00 |
ZhangBiao
|
0d1c61ec89
|
【累计充值】
|
2021-03-18 10:47:20 +08:00 |
ZhangBiao
|
95ee2d301d
|
【主题活动】
|
2021-03-18 10:30:21 +08:00 |
ZhangBiao
|
2ba7583da3
|
【中文元修改】
|
2021-03-18 10:27:36 +08:00 |
jiaoyangna
|
98e2ad0e3b
|
【美元显示】解锁青龙秘宝
|
2021-03-18 09:56:02 +08:00 |
ZhangBiao
|
84788732a2
|
首充金额修改
|
2021-03-17 19:06:15 +08:00 |
gaoxin
|
7b28309e1c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 17:30:18 +08:00 |
gaoxin
|
40bfa7c586
|
【配置】国内相关修改
|
2021-03-17 17:30:13 +08:00 |
zhangqiang
|
f2b3df9721
|
【修改提交】
|
2021-03-17 17:27:53 +08:00 |
zhangqiang
|
d5f34e516c
|
【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉
|
2021-03-17 16:56:02 +08:00 |
jiaoyangna
|
adb3a1e750
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:20:22 +08:00 |
ZhangBiao
|
2e685100ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:17:50 +08:00 |
ZhangBiao
|
c8661ab384
|
【首领来袭】任务过小修改,
|
2021-03-17 16:17:41 +08:00 |
zhangqiang
|
38a6548a52
|
【充值】开服成长礼包道具太多,会重叠。
|
2021-03-17 16:15:55 +08:00 |
jiaoyangna
|
5963eb170b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:04:31 +08:00 |
zhangqiang
|
125a393167
|
【修bug】
|
2021-03-17 15:54:45 +08:00 |
jiaoyangna
|
95351b5bd1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 15:03:54 +08:00 |
ZhangBiao
|
4efb36a195
|
【八日登陆】资源修改
|
2021-03-17 14:37:56 +08:00 |
jiaoyangna
|
909ed03c04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 13:33:22 +08:00 |
ZhangBiao
|
bf3d732b69
|
【中文本地化】
|
2021-03-17 12:05:44 +08:00 |
jiaoyangna
|
31b808209e
|
主界面修改提交
|
2021-03-17 11:55:02 +08:00 |
jiaoyangna
|
dfd3c4acc6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 11:54:40 +08:00 |
ZhangBiao
|
15dec90220
|
【本地化】修改
|
2021-03-17 11:29:43 +08:00 |
jiaoyangna
|
36f4efedc8
|
主城优化修改
|
2021-03-17 10:38:07 +08:00 |
jiaoyangna
|
0cdd115646
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-16 18:32:52 +08:00 |
jiaoyangna
|
147d358e11
|
天书密卷
|
2021-03-16 17:37:32 +08:00 |
ZhangBiao
|
c2cab749f4
|
【首领来袭】位置调整
|
2021-03-16 17:09:18 +08:00 |
ZhangBiao
|
4528e23541
|
Merge branch 'china/dev' into 0活动开发聚集地/限时神装
|
2021-03-16 14:49:47 +08:00 |
ZhangBiao
|
86fdb9395b
|
Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
|
2021-03-15 10:51:17 +08:00 |
ZhangBiao
|
9be337324a
|
【限时神装】完成
|
2021-03-15 10:37:26 +08:00 |
ZhangBiao
|
17a9550df8
|
【首领来袭】
|
2021-03-13 15:52:50 +08:00 |
ZhangBiao
|
5334a7c7da
|
【首领来袭】
|
2021-03-13 12:57:31 +08:00 |
jiaoyangna
|
5be52f6b33
|
限时活动提交
(cherry picked from commit e3460c8b83)
|
2021-03-12 15:48:29 +08:00 |
ZhangBiao
|
8aad1eee56
|
【限时神装】
|
2021-03-12 14:31:53 +08:00 |
jiaoyangna
|
dd706075d2
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
|
2021-03-12 14:30:10 +08:00 |
ZhangBiao
|
24ea537bba
|
Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
|
2021-03-11 15:15:09 +08:00 |
ZhangBiao
|
4a3b79fce7
|
【锻器阁】添加材料图标不对称
|
2021-03-10 17:57:19 +08:00 |
zhangqiang
|
d8e37cdc66
|
【大闹天宫前端合并修改提交】
|
2021-03-10 17:44:56 +08:00 |
zhangqiang
|
88d1464fb3
|
【大闹天宫前端修改提交】
|
2021-03-10 17:42:17 +08:00 |