zhangqiang
|
a3647d7cbe
|
【排行榜】与排行第一切磋后返回,不显示小人形象
|
2021-04-08 21:07:36 +08:00 |
zhangqiang
|
19ba1ffc5a
|
【分解】神将达到上限,分解后,再获得神将依然提示已达上限,重登正常
|
2021-04-08 21:03:47 +08:00 |
jiaoyangna
|
fa4cdf0f2d
|
主城添加判断等级判断
|
2021-04-08 20:55:49 +08:00 |
jiaoyangna
|
e14b9d4343
|
主城修改 提交
|
2021-04-08 20:52:59 +08:00 |
ZhangBiao
|
3edd56034a
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 20:48:31 +08:00 |
ZhangBiao
|
b3aa8ebf2a
|
【神将置换】英雄名过长修改
|
2021-04-08 20:48:17 +08:00 |
gaoxin
|
ba17f4fdc2
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 20:40:05 +08:00 |
gaoxin
|
eab8a42191
|
【灵兽特惠】金钱显示兼容
|
2021-04-08 20:40:00 +08:00 |
zhangqiang
|
393a05ee99
|
【大闹天宫】生死簿神将头像边框颜色与品质不符
|
2021-04-08 20:27:21 +08:00 |
gaoxin
|
4a1a95d9fd
|
【八日登录】修复第四天后的提示白片
|
2021-04-08 20:23:06 +08:00 |
gaoxin
|
f49bb49041
|
【每日豪礼】金钱显示走活动表
|
2021-04-08 20:20:09 +08:00 |
gaoxin
|
effab48074
|
【每日豪礼】金钱数量走表
|
2021-04-08 20:10:25 +08:00 |
gaoxin
|
4a3d61b159
|
【每日豪礼】金钱显示兼容处理
|
2021-04-08 20:07:19 +08:00 |
zhangqiang
|
d1f88d5b33
|
【红点】退出公会,入口依然显示红点
|
2021-04-08 20:03:19 +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 |
zhangqiang
|
cc6137697a
|
加打印
|
2021-04-08 19:45:04 +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 |
zhangqiang
|
2be3a11fe7
|
【尝试修复邮件红点】
|
2021-04-08 18:15:29 +08:00 |
ZhangBiao
|
4977de55ba
|
【坐骑】界面文字适应修改
|
2021-04-08 18:01:29 +08:00 |
jiaoyangna
|
dde0be7d87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-08 17:58:20 +08:00 |
jiaoyangna
|
c86307d328
|
图鉴添加皮肤页签
|
2021-04-08 17:58:17 +08:00 |
ZhangBiao
|
f49455e1a8
|
【自选宝箱】文字提示暂无外语版本,改回
(cherry picked from commit 0d3f84f5e1)
|
2021-04-08 17:50:12 +08:00 |
ZhangBiao
|
2da1f06bcb
|
【自选宝箱】还是修改
(cherry picked from commit 89c8179840)
|
2021-04-08 17:49:58 +08:00 |
ZhangBiao
|
fdbf4d054b
|
【自选宝箱】
(cherry picked from commit 16db37cf29)
|
2021-04-08 17:49:52 +08:00 |
ZhangBiao
|
a49fbd2183
|
【自选宝箱】文字提示
(cherry picked from commit cb5c940e25)
|
2021-04-08 17:49:44 +08:00 |
ZhangBiao
|
f87aafafbc
|
【自选箱】遮盖文字修改
(cherry picked from commit adc2d56559)
|
2021-04-08 17:49:34 +08:00 |
gaoxin
|
3ccf1e6c44
|
【语音】添加是否播放游戏语音的控制字段
|
2021-04-08 17:32:40 +08:00 |
gaoxin
|
795657a213
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 17:31:38 +08:00 |
gaoxin
|
680d3e2e7d
|
【金钱显示】修复累计充值第一个商品显示错误
|
2021-04-08 17:31:32 +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
|
d86700277c
|
【ID1008675】
【图鉴优化】增加神将皮肤预览
|
2021-04-08 17:30:04 +08:00 |
ZhangBiao
|
fe2e122607
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 17:24:52 +08:00 |
ZhangBiao
|
0d3f84f5e1
|
【自选宝箱】文字提示暂无外语版本,改回
|
2021-04-08 17:24:39 +08:00 |
jiaoyangna
|
5740120f53
|
【ID1008675】
【图鉴优化】增加神将皮肤预览
|
2021-04-08 17:24:36 +08:00 |
jiaoyangna
|
32f5e051ad
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 17:03:34 +08:00 |
jiaoyangna
|
7784e3a9d1
|
主题活动提交
(cherry picked from commit d9c500fb36)
|
2021-04-08 17:03:29 +08:00 |
zhangqiang
|
fa8e10ed9c
|
【大闹天宫】赛季重置是圣物新字显示bug
|
2021-04-08 16:58:39 +08:00 |
ZhangBiao
|
3833c53f68
|
【十五日登录、福星高照】修改
|
2021-04-08 16:39:02 +08:00 |
ZhangBiao
|
89c8179840
|
【自选宝箱】还是修改
|
2021-04-08 15:36:27 +08:00 |
ZhangBiao
|
a7328fdfaf
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-08 15:02:10 +08:00 |
ZhangBiao
|
16db37cf29
|
【自选宝箱】
|
2021-04-08 15:02:01 +08:00 |
zhangqiang
|
da4270b99b
|
【公会公告】
|
2021-04-08 14:59:19 +08:00 |
ZhangBiao
|
cb5c940e25
|
【自选宝箱】文字提示
|
2021-04-08 14:53:36 +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 |
gaoxin
|
45bb99f9c7
|
【公会】公会红包公告不会随语言切换
|
2021-04-08 12:00:50 +08:00 |
zhangqiang
|
8e7537a761
|
【首冲】钱显示修改
|
2021-04-08 11:47:22 +08:00 |
ZhangBiao
|
bc15cb20f6
|
【十五日登陆】微调
|
2021-04-08 11:26:05 +08:00 |
zhangqiang
|
972e585d8a
|
【300】
|
2021-04-08 11:08:54 +08:00 |
jiaoyangna
|
ce8ffa9607
|
充值界面充值跳转月卡页签之后切换其他页签 界面显示错误 修改
|
2021-04-08 10:50:19 +08:00 |
zhangqiang
|
4b1f021ac0
|
【累计充值】
|
2021-04-08 10:18:24 +08:00 |
zhangqiang
|
e84bdaf457
|
【每日好礼】
|
2021-04-07 21:07:42 +08:00 |
jiaoyangna
|
4926d16dc2
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-07 20:28:16 +08:00 |
jiaoyangna
|
efd1c6fab9
|
逍遥预设提交
|
2021-04-07 20:28:12 +08:00 |
ZhangBiao
|
d423390397
|
【十五日登录】特效+无尽副本编队问题
|
2021-04-07 20:27:56 +08:00 |
wangzhenxing
|
dada859ec6
|
[战斗]========battleutil 添加判断数组长度方法
|
2021-04-07 20:14:43 +08:00 |
zhangqiang
|
894a8bcfd4
|
【问题提交】
|
2021-04-07 19:52:25 +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
|
027de719b6
|
【福星高照、限时神装】
|
2021-04-07 17:20:23 +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 |
jiaoyangna
|
40351af4da
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-07 16:12:32 +08:00 |
jiaoyangna
|
17bc3ce580
|
逍遥boss 提交
|
2021-04-07 16:12:29 +08:00 |
ZhangBiao
|
33c598e2d9
|
【天数密卷】按钮文字旋转
|
2021-04-07 15:22:32 +08:00 |
ZhangBiao
|
bfaa5195b5
|
Revert "【表删除】报错处理"
This reverts commit b163fc3035.
|
2021-04-07 11:54:39 +08:00 |
zhangqiang
|
b05c9a8c1c
|
【bug】 十绝阵翻译修改引用
|
2021-04-07 11:43:25 +08:00 |
ZhangBiao
|
c9f0efe3f6
|
【无尽森罗】无法进入修改
|
2021-04-07 11:35:48 +08:00 |
jiaoyangna
|
586d7eca06
|
限时召唤提交
|
2021-04-07 11:24:49 +08:00 |
ZhangBiao
|
704dd1ffa5
|
【化虚坛】未翻译
|
2021-04-07 11:20:58 +08:00 |
ZhangBiao
|
58d20c0bd3
|
【限时活动】没东西有红点
|
2021-04-07 11:05:26 +08:00 |
zhangqiang
|
132e4c1260
|
【bug】奖励排行拉不到底部
|
2021-04-07 10:30:47 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
d6319948f2
|
【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。
|
2021-04-06 22:30:21 +08:00 |
jiaoyangna
|
f6f48149b1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-06 17:42:05 +08:00 |
jiaoyangna
|
04721fe715
|
【ID1008672】
【逍遥游优化】解锁上方的地图后,进入选择界面默认滚动至相应的入口位置
|
2021-04-06 17:42:02 +08:00 |
ZhangBiao
|
0387c7cf33
|
【森罗幻境】根据英雄战力排序
|
2021-04-06 17:26:59 +08:00 |
jiaoyangna
|
eac03c7d20
|
车迟斗法提交
|
2021-04-06 17:02:25 +08:00 |
jiaoyangna
|
0df3ee5ea8
|
车迟斗法描述修改
|
2021-04-06 16:50:51 +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
|
7a59fe9d6a
|
【十五日登陆】增加红点
(cherry picked from commit 120106c6d0d8957d7e7f0bbce687fafd42a70277)
|
2021-04-06 16:20:36 +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 |
gaoxin
|
cf5a2a46fa
|
【本地化】还原文本到代码种
|
2021-04-06 15:23:27 +08:00 |
gaoxin
|
fc28c2c0a3
|
Merge branch 'china/dev' into gx/china/dev_tr
|
2021-04-06 15:21:49 +08:00 |
gaoxin
|
08c5c7b423
|
【本地化】导出文本
|
2021-04-06 15:21:38 +08:00 |
jiaoyangna
|
bf4a9ffaa5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-06 15:20:17 +08:00 |
jiaoyangna
|
6e68ac5949
|
【ID1008671】
【升星优化】升星选择祭品神将时,增加显示内容
|
2021-04-06 15:20:00 +08:00 |
gaoxin
|
b163fc3035
|
【表删除】报错处理
|
2021-04-06 15:16:37 +08:00 |
zhangqiang
|
0b85a85e18
|
【大闹天宫】 间隔阶段重登提示有问题
|
2021-04-06 15:11:29 +08:00 |
jiaoyangna
|
75feb507d1
|
【ID1008659】
【图鉴优化】图鉴添加排序规则,按照神将由强至弱进行排序
|
2021-04-06 14:51:26 +08:00 |
ZhangBiao
|
119c499da3
|
【好友】删除后停留在原位
|
2021-04-06 14:26:47 +08:00 |