gaoxin
|
b74274b75a
|
【引导】添加战斗失败触发类型38, 添加引导进入假战斗类型20
|
2021-12-22 18:25:36 +08:00 |
wangzhenxing
|
b7bfc1d867
|
【资源】======虎年坐骑提交
|
2021-12-22 16:15:51 +08:00 |
wangzhenxing
|
a7dac651c6
|
[资源]=======罗刹spine修改
|
2021-12-22 16:14:42 +08:00 |
gaoxin
|
39495bee28
|
【至尊降世】修复老活动跳转报错
|
2021-12-21 21:03:42 +08:00 |
gaoxin
|
9a1350e8d3
|
【超值基金】语法错误
|
2021-12-21 18:27:15 +08:00 |
jiaoyangna
|
85795f19cc
|
适配修改提交
|
2021-12-21 18:12:15 +08:00 |
jiaoyangna
|
99ca3a60eb
|
适配修改提交
|
2021-12-21 18:10:34 +08:00 |
jiaoyangna
|
e96d6e5744
|
适配修改
|
2021-12-21 17:37:19 +08:00 |
jiaoyangna
|
edbf25dc59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 17:21:26 +08:00 |
jiaoyangna
|
89fdc69afd
|
添加拍脸提交
|
2021-12-21 17:21:10 +08:00 |
ZhangBiao
|
0a8bdbe4b6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:51:55 +08:00 |
ZhangBiao
|
53f7d29337
|
【商城界面】提交
|
2021-12-21 16:51:40 +08:00 |
gaoxin
|
3054bbfdeb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:33:34 +08:00 |
gaoxin
|
86daa70b9c
|
【特权】添加充值金额解锁类型
|
2021-12-21 16:33:28 +08:00 |
ZhangBiao
|
51d281c1ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:33:19 +08:00 |
ZhangBiao
|
58ffbf416c
|
【商城界面】提示修改
|
2021-12-21 16:32:59 +08:00 |
gaoxin
|
605dd4e111
|
【战斗】跳过按钮解锁提示问题修改
|
2021-12-21 15:38:42 +08:00 |
gaoxin
|
dc8e1ac904
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 14:32:01 +08:00 |
gaoxin
|
0b5ca2a460
|
【引导】引导触发方式参数开放给功能引导使用,添加触发类型37 十连结果界面打开触发
|
2021-12-21 14:31:26 +08:00 |
ZhangBiao
|
462ac9c494
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 13:24:11 +08:00 |
ZhangBiao
|
b9bb2cf544
|
【修行】星数到达四位后只显示三位
|
2021-12-21 13:23:16 +08:00 |
jiaoyangna
|
e9a7188d7d
|
十连黑屏修改提交
|
2021-12-21 13:20:29 +08:00 |
jiaoyangna
|
f094d16e53
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 13:11:24 +08:00 |
jiaoyangna
|
f9689bafde
|
删除没用的log
|
2021-12-21 13:10:52 +08:00 |
ZhangBiao
|
d189833b3f
|
【超值基金】提交
|
2021-12-21 11:35:56 +08:00 |
jiaoyangna
|
2c2d6a5e56
|
添加竞技试炼提交
|
2021-12-20 22:11:33 +08:00 |
jiaoyangna
|
c6f99b2eab
|
竞技试炼修改提交
|
2021-12-20 22:05:18 +08:00 |
jiaoyangna
|
b60d319083
|
竞技试炼修改提交
|
2021-12-20 22:03:08 +08:00 |
jiaoyangna
|
e2eada47d1
|
删除log
|
2021-12-20 22:00:12 +08:00 |
jiaoyangna
|
522913c7bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 21:59:54 +08:00 |
skuld
|
867f90eecd
|
bat Resource Commit:2021/12/22, 0:37:08
|
2021-12-22 00:37:09 +08:00 |
skuld
|
e84f78fe3f
|
bat Resource Commit:2021/12/22, 0:35:40
|
2021-12-22 00:35:40 +08:00 |
jiaoyangna
|
a19e1d1b7d
|
返回主城打开竞技试炼
|
2021-12-20 21:59:33 +08:00 |
jiaoyangna
|
a1e4acd488
|
魂印修改提交
|
2021-12-20 17:27:07 +08:00 |
jiaoyangna
|
709ae04c7f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 17:16:24 +08:00 |
jiaoyangna
|
4c3c65347c
|
魂印修改提交
|
2021-12-20 17:15:06 +08:00 |
wangzhenxing
|
4a6ee9d9aa
|
[战斗]==========战斗记录界面死亡置灰修改
|
2021-12-20 17:00:12 +08:00 |
jiaoyangna
|
9a5ac42d5c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 16:55:01 +08:00 |
jiaoyangna
|
0051c48c65
|
点将台引导修改提交
|
2021-12-20 16:31:57 +08:00 |
ZhangBiao
|
44df57188d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 15:45:48 +08:00 |
ZhangBiao
|
4b27fa6a1b
|
【副本】灰色红点提交
|
2021-12-20 15:45:06 +08:00 |
jiaoyangna
|
d947607282
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 15:44:10 +08:00 |
jiaoyangna
|
b841b77467
|
关卡解锁跳转添加提交
|
2021-12-20 15:43:54 +08:00 |
wangzhenxing
|
885a6e2fa8
|
[功能]========结算记录界面添加阵亡标签
|
2021-12-20 15:32:28 +08:00 |
ZhangBiao
|
12b980590f
|
【名望】提交
|
2021-12-20 15:18:03 +08:00 |
ZhangBiao
|
777b353f4f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 15:02:41 +08:00 |
ZhangBiao
|
680b956474
|
【声望】修改
|
2021-12-20 15:02:14 +08:00 |
jiaoyangna
|
5ab2f2f40a
|
关卡tips 关卡条件修改提交
|
2021-12-20 14:56:43 +08:00 |
jiaoyangna
|
7a9b2b20c6
|
玉帝剧情新手引导修改提交
|
2021-12-20 14:17:49 +08:00 |
jiaoyangna
|
cddbe10d1a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 14:15:29 +08:00 |
jiaoyangna
|
d1fd74db04
|
【ID1019430】
【神将回退】光效穿透
|
2021-12-20 14:15:14 +08:00 |
ZhangBiao
|
745a9d1dae
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-20 14:07:56 +08:00 |
ZhangBiao
|
03745962a4
|
【资源文件】提交
|
2021-12-20 14:07:37 +08:00 |
ZhangBiao
|
6d93ab7dca
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-20 14:05:56 +08:00 |
ZhangBiao
|
8b7b5c8fa9
|
【连购礼包】无礼包修改
|
2021-12-20 14:05:42 +08:00 |
jiaoyangna
|
997aa4831f
|
至尊降世添加拍脸
|
2021-12-20 13:41:16 +08:00 |
jiaoyangna
|
7002f1ac42
|
关卡提示修改
|
2021-12-20 13:10:58 +08:00 |
jiaoyangna
|
84e181ef1a
|
ID1010877】
【优化】跳过提示文字优化
|
2021-12-20 13:07:24 +08:00 |
jiaoyangna
|
f306f0141d
|
删除log
|
2021-12-20 12:55:22 +08:00 |
jiaoyangna
|
76c682eb68
|
【神将回退】将魂足够升星时,进阶页签不显示红点
|
2021-12-20 12:05:11 +08:00 |
jiaoyangna
|
b7b71930f5
|
进阶预览黑屏修改提交
|
2021-12-20 11:33:36 +08:00 |
ZhangBiao
|
9fa6f3a2b3
|
【奖励详情】报错修改
|
2021-12-20 10:30:51 +08:00 |
wangzhenxing
|
e02f9a7881
|
[战斗]======角色播放 skill 动作逻辑提交
|
2021-12-20 10:02:38 +08:00 |
ZhangBiao
|
834cdf87da
|
【新将来袭】取消珍奇宝阁
|
2021-12-17 18:59:54 +08:00 |
ZhangBiao
|
795d19d63a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 18:53:34 +08:00 |
ZhangBiao
|
0377b2b642
|
【特惠商城】提交
|
2021-12-17 18:53:24 +08:00 |
jiaoyangna
|
415fc7cb35
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 18:46:19 +08:00 |
jiaoyangna
|
e6796ee70f
|
超值返利修改提交
|
2021-12-17 18:46:05 +08:00 |
ZhangBiao
|
034aff624f
|
【资源】提交
|
2021-12-17 18:36:47 +08:00 |
ZhangBiao
|
38966d1b16
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 18:35:40 +08:00 |
ZhangBiao
|
72b0f31d50
|
【特惠商城】提交
|
2021-12-17 18:25:45 +08:00 |
jiaoyangna
|
82712c6047
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 18:13:42 +08:00 |
jiaoyangna
|
f441e7a7ea
|
适配修改提交
|
2021-12-17 18:13:14 +08:00 |
luyao
|
44eb9decb8
|
【至尊降世】豪华月卡图标
|
2021-12-17 18:11:25 +08:00 |
jiaoyangna
|
196cb329b3
|
提示文字修改提交
|
2021-12-17 17:48:26 +08:00 |
jiaoyangna
|
4a9463fe5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:42:19 +08:00 |
jiaoyangna
|
6573b10a59
|
资源提交
|
2021-12-17 17:42:00 +08:00 |
wangzhenxing
|
ef680be056
|
[战斗]======护盾效果修改
|
2021-12-17 17:31:58 +08:00 |
ZhangBiao
|
88980286eb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:20:24 +08:00 |
ZhangBiao
|
08806bc18f
|
【寻仙招募】改为常驻后,奖励中的概率有效期去掉
|
2021-12-17 17:20:13 +08:00 |
jiaoyangna
|
5c042b2c60
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:19:58 +08:00 |
jiaoyangna
|
893cd69527
|
特效被切修改提交
|
2021-12-17 17:19:30 +08:00 |
ZhangBiao
|
df483145bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:13:57 +08:00 |
ZhangBiao
|
a9b7c21fad
|
【道具弹窗】跳转按钮错位
|
2021-12-17 17:13:45 +08:00 |
jiaoyangna
|
7e444d54c6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 16:55:50 +08:00 |
gaoxin
|
ce0c1db2f3
|
【关卡】解锁提示资源提交
|
2021-12-27 16:55:17 +08:00 |
jiaoyangna
|
a16931b9dc
|
文字位置修改提交
|
2021-12-17 16:55:23 +08:00 |
jiaoyangna
|
6b234c7f2f
|
文字重叠修改提交
|
2021-12-17 16:53:26 +08:00 |
jiaoyangna
|
3119f9b277
|
价格描述修改
|
2021-12-17 16:43:24 +08:00 |
jiaoyangna
|
16c00cbffc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 16:41:26 +08:00 |
jiaoyangna
|
ffd7d0ecbe
|
超值返利修改提交
|
2021-12-17 16:41:08 +08:00 |
ZhangBiao
|
8ad3346af9
|
【特惠商城】
|
2021-12-17 16:05:51 +08:00 |
ZhangBiao
|
80d4df7add
|
【命格】冲突提交
|
2021-12-17 15:49:55 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
wangzhenxing
|
9c07c341e5
|
【资源】===嫦娥新动作提交
|
2021-12-17 15:08:30 +08:00 |
ZhangBiao
|
0e732fa8b6
|
【新人商城】结束后关闭
|
2021-12-17 14:44:44 +08:00 |
ZhangBiao
|
2eb83d4c63
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 14:13:53 +08:00 |
ZhangBiao
|
d34d896f47
|
【成长礼包】提交
|
2021-12-17 14:13:41 +08:00 |
gaoxin
|
db2d3c8433
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-27 14:01:06 +08:00 |
gaoxin
|
1c9d3caa75
|
【罗浮】原罗浮商店跳转到逐胜商店
|
2021-12-27 14:00:47 +08:00 |