Commit Graph

1645 Commits (master_zzxx)
 

Author SHA1 Message Date
PC-202302260912\Administrator 948de05a97 Merge remote-tracking branch 'origin/master_ob2' into master_ob2
# Conflicts:
#	protos/ActivityProto.proto
2023-06-26 17:38:49 +08:00
PC-202302260912\Administrator 78bf032968 天降礼包协议 2023-06-26 17:36:49 +08:00
PC-202302260912\Administrator cd5dbd0fa6 protobuf工程修改 2023-06-26 17:14:46 +08:00
PC-202302260912\Administrator c2379bfecd 天降礼包协议 2023-06-26 11:57:40 +08:00
PC-202302260912\Administrator b247048d2e 天降礼包协议 2023-06-25 19:00:48 +08:00
PC-202302260912\Administrator 3e7a7cc6cc 协议描述修改 2023-06-13 11:07:20 +08:00
duhui 80ec97fbec 心愿 2023-06-01 16:39:11 +08:00
duhui cb06b7ca65 心愿 2023-06-01 16:30:42 +08:00
duhui dc67bb0326 心愿 2023-06-01 15:54:33 +08:00
duhui 7dc6b632b9 格式调整 2023-05-26 21:03:20 +08:00
duhui 4fa6528edc Merge branch 'dev_dh_bt' into bt/shenbing 2023-03-29 16:09:37 +08:00
duhui 169877cd13 线上修复 2023-03-29 15:18:39 +08:00
duhui d273cfded7 神兵 2023-03-29 15:12:19 +08:00
duhui c967cbc5da 神兵 2023-03-28 16:55:27 +08:00
duhui f259469870 神兵展示信息 2023-03-28 16:39:13 +08:00
duhui de905e7ef9 神兵编队信息 2023-03-28 14:23:03 +08:00
duhui 005d782cc6 神兵 2023-03-27 17:52:34 +08:00
duhui ff0ba201f7 神兵 2023-03-27 17:51:57 +08:00
duhui 3d9c08a234 神兵 2023-03-27 17:33:12 +08:00
duhui 185e73830e 神兵 2023-03-27 17:12:23 +08:00
duhui 8ef5e1fefc 神兵 2023-03-27 16:57:55 +08:00
duhui a434c0b1d0 神兵 2023-03-27 15:59:36 +08:00
duhui bebeecbc8c 神兵 2023-03-27 15:54:23 +08:00
duhui 75e0e64f48 神兵注释 2023-03-24 15:10:04 +08:00
duhui 5308e15038 神兵 2023-03-24 11:26:12 +08:00
duhui 6ce381f3e8 多对塔 2023-03-15 10:19:00 +08:00
duhui d1ca9f1af7 多对塔 2023-03-14 10:37:35 +08:00
duhui 10f06af84e 多对塔 2023-03-07 17:36:32 +08:00
duhui 0326bfb981 多对塔 2023-03-07 17:35:54 +08:00
duhui 52e0f94c80 多对塔 2023-03-07 17:16:06 +08:00
duhui a003aa1d51 法相 2023-02-19 17:02:07 +08:00
duhui 7339f521ab 法相 2023-02-19 16:54:40 +08:00
duhui 293572750c 法相 2023-02-18 16:50:32 +08:00
duhui d369d5f848 神将置换 2023-02-16 14:47:24 +08:00
duhui c3e7efd604 法相 2023-02-16 11:06:08 +08:00
duhui 0407591e79 法相 2023-02-16 10:12:58 +08:00
duhui 4822643a4a 法相 2023-02-15 18:13:08 +08:00
duhui c40505460a 法相 2023-02-15 15:55:59 +08:00
duhui c18e89d48b 法相 2023-02-14 21:17:04 +08:00
duhui 8a72be98b9 转盘抽卡累计次数 2022-10-28 14:12:21 +08:00
duhui 22046bfc32 gm转盘修改 2022-10-26 16:17:12 +08:00
duhui cbaddf7692 幸运转盘协议修改,兼容gm转盘 2022-09-15 14:10:23 +08:00
duhui 32ed71ccba Merge branch 'master_test_gn' into dev_dh_bt 2022-09-14 15:59:40 +08:00
duhui 8ba87b1dcf gm修改器购买礼包 2022-09-14 15:57:59 +08:00
duhui f48f2a6bae 建木神树修改 2022-09-05 13:34:50 +08:00
duhui 380d5d9efa 摘星阁,装备重置,删错了 2022-09-02 10:26:10 +08:00
duhui f25e2a0165 摘星阁,装备重置 2022-09-02 10:13:10 +08:00
duhui fe652a9fc6 摘星阁,装备重置 2022-09-02 09:53:14 +08:00
yuanshuai 8096e988c2 ... 2022-09-01 10:09:34 +08:00
duhui fc9fc83e2e Merge branch 'master_prb_gn' into dev_equip 2022-08-30 16:58:14 +08:00