jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
ZhangBiao
|
b650ba81e8
|
界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
|
2020-08-20 16:48:30 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
jiaoyangna
|
905d77b0c6
|
Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-14 13:01:17 +08:00 |
jiaoyangna
|
c9c3cb2fa4
|
operatingmanager commit
|
2020-08-14 13:01:12 +08:00 |
ZhangBiao
|
7a1e1599d8
|
|
2020-08-14 10:14:53 +08:00 |
ZhangBiao
|
416d6eb16c
|
每日签到
|
2020-08-13 22:30:09 +08:00 |
wangzhenxing
|
442877d3e0
|
珍奇宝阁预设代码提交
|
2020-08-13 16:38:20 +09:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
ed53f7e760
|
Merge branch 'master_develop' into master_develop2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# data_execl/base_data/BeStronger.xlsx
# data_execl/base_data/EquipTalismana.xlsx
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-07 06:54:04 +08:00 |
ZhangBiao
|
989703a0e4
|
乾坤宝盒单抽bug修复、四元阵赠送“元神玉”
|
2020-08-04 20:30:26 +08:00 |
ZhangBiao
|
c2024a15cb
|
bug修复
|
2020-08-03 20:01:59 +08:00 |
ZhangBiao
|
0cd5ffca9d
|
魂印特效关闭
|
2020-08-03 16:11:04 +08:00 |
jiaoyangna
|
8b3bcecb59
|
activity commit
|
2020-08-03 10:18:04 +08:00 |
ZhangBiao
|
dd06fc4652
|
充值入口恢复,加 充值switch
|
2020-07-31 13:35:15 +08:00 |
ZhangBiao
|
44ace7a129
|
充值入口恢复
|
2020-07-31 10:33:05 +08:00 |
jiaoyangna
|
d00afc69cf
|
添加特效
|
2020-08-06 15:14:47 +08:00 |
gaoxin
|
47beef7399
|
尝试修改抽卡报错
|
2020-07-29 15:43:42 +08:00 |
ZhangBiao
|
97b7118e11
|
|
2020-07-28 22:05:24 +08:00 |
ZhangBiao
|
dea2d14d3f
|
乾坤宝盒时间修复
|
2020-07-28 22:00:11 +08:00 |
jiaoyangna
|
43ee7dd577
|
限时召唤提交
|
2020-07-28 20:09:41 +08:00 |
ZhangBiao
|
6c316bf7de
|
|
2020-07-28 17:25:50 +08:00 |
ZhangBiao
|
1f474fd636
|
|
2020-07-28 17:17:55 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
ZhangBiao
|
f26718899e
|
bug修复
|
2020-07-28 10:24:52 +08:00 |
ZhangBiao
|
48ac527f1a
|
限时召唤 乾坤宝盒 页面整合
|
2020-07-28 09:48:02 +08:00 |
ZhangBiao
|
e3eb566008
|
乾坤宝盒奖励概率错误修改
|
2020-07-27 09:59:50 +08:00 |
gaoxin
|
6bfa7d318b
|
注释代码
|
2020-07-26 17:28:44 +08:00 |
gaoxin
|
eff6ee6d08
|
临时关闭星级成长礼显示
|
2020-07-26 16:44:31 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
jiaoyangna
|
e4525199d8
|
开启乾坤宝囊和限时召唤
|
2020-07-25 17:24:19 +08:00 |
ZhangBiao
|
f1755d0efa
|
--(24暂时关闭)
|
2020-07-24 16:52:36 +08:00 |
ZhangBiao
|
d398804a83
|
--(24暂时关闭)
|
2020-07-24 16:38:04 +08:00 |
ZhangBiao
|
b3ddd8fc96
|
|
2020-07-24 15:22:17 +08:00 |
ZhangBiao
|
0ad52a3855
|
活动暂时关闭
|
2020-07-24 13:39:02 +08:00 |
ZhangBiao
|
1f5440c2e6
|
bug修复
|
2020-07-24 12:11:00 +08:00 |
ZhangBiao
|
7b795f0daa
|
森罗bug
|
2020-07-23 19:05:43 +08:00 |
ZhangBiao
|
f1ab5780e4
|
切换界面黑屏问题解决
|
2020-07-22 14:34:00 +08:00 |
ZhangBiao
|
054f1558bc
|
bug修复
|
2020-07-20 16:42:20 +08:00 |
ZhangBiao
|
055c5f6926
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-20 10:02:21 +08:00 |
ZhangBiao
|
c0d053c65c
|
免费抽刷新时间
|
2020-07-20 10:02:12 +08:00 |
zhangqiang
|
480e810478
|
添加文字
|
2020-07-17 20:06:48 +08:00 |
jiaoyangna
|
9876ec5f5a
|
红点检测修改
|
2020-07-17 18:20:31 +08:00 |
ZhangBiao
|
06e87b8c66
|
bug修改
|
2020-07-14 11:43:30 +08:00 |
ZhangBiao
|
39bd3e8523
|
限时召唤ui调整
|
2020-07-14 11:34:40 +08:00 |
ZhangBiao
|
eddaa95312
|
宝囊
|
2020-07-14 11:05:47 +08:00 |
ZhangBiao
|
4c6369e51d
|
乾坤宝囊修改
|
2020-07-13 20:07:06 +08:00 |
gaoxin
|
db1118aa9c
|
修复打包后不能充值得bug
|
2020-07-13 16:48:50 +08:00 |
jiaoyangna
|
40fa614a52
|
限时召唤】点十连,单抽的免费不显示了
|
2020-07-13 12:01:39 +08:00 |
jiaoyangna
|
6ff6b5315b
|
分解、重置相关功能修改
|
2020-07-13 11:15:53 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +08:00 |
ZhangBiao
|
b89c0582c0
|
宝囊
|
2020-07-10 17:55:11 +08:00 |
2han9B1a0
|
ce1d7014f3
|
|
2020-07-09 19:59:23 +08:00 |
2han9B1a0
|
12b0fa9f73
|
特权修改,宝囊商店
|
2020-07-09 18:20:53 +08:00 |
2han9B1a0
|
8e853b2758
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-09 11:53:10 +08:00 |
2han9B1a0
|
47b34f9d6e
|
宝囊
|
2020-07-09 11:52:40 +08:00 |
jiaoyangna
|
37c7c839c4
|
限时召唤提交
|
2020-07-09 10:04:20 +08:00 |
2han9B1a0
|
12d9208f90
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-08 21:19:49 +08:00 |
2han9B1a0
|
7c7684a714
|
冲突提交
|
2020-07-08 21:19:34 +08:00 |
2han9B1a0
|
39d035b21a
|
no message
|
2020-07-08 21:09:45 +08:00 |
jiaoyangna
|
21778b4a74
|
限时提交
|
2020-07-08 19:16:04 +08:00 |
2han9B1a0
|
d5bc2b4ef1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-08 16:24:27 +08:00 |
jiaoyangna
|
9b138fe566
|
限时召唤提交
|
2020-07-08 16:23:04 +08:00 |
2han9B1a0
|
1b89e68c95
|
包囊
|
2020-07-08 16:23:02 +08:00 |
jiaoyangna
|
070fb43964
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua
|
2020-07-08 16:20:26 +08:00 |
jiaoyangna
|
1df7a8006a
|
【ID1008244】
【限时招募】阶段奖励进度条显示不准
|
2020-07-08 16:19:46 +08:00 |
2han9B1a0
|
51089bd2c8
|
福利界面报错
|
2020-07-08 11:46:43 +08:00 |
2han9B1a0
|
272cfdc71a
|
乾坤包囊
|
2020-07-08 09:41:56 +08:00 |
2han9B1a0
|
4aed395ed3
|
乾坤包囊
|
2020-07-08 09:40:36 +08:00 |
jiaoyangna
|
c15b84b096
|
Merge branch 'master_develop' into equip
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
|
2020-07-07 18:13:34 +08:00 |
jiaoyangna
|
c6bfa772e5
|
装备提交
|
2020-07-07 16:35:57 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
2han9B1a0
|
abfbfc423b
|
心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
|
2020-07-03 11:27:25 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |